[geeklog-cvs] geeklog-1.3/public_html/admin/plugins/staticpages index.php,1.26,1.27
dhaun at geeklog.net
dhaun at geeklog.net
Sun Dec 28 13:54:02 EST 2003
Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin/plugins/staticpages
In directory geeklog_prod:/tmp/cvs-serv1354/public_html/admin/plugins/staticpages
Modified Files:
index.php
Log Message:
Static Pages 1.4: "wrap in block" option for each page and some fixes.
Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/plugins/staticpages/index.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** index.php 1 Sep 2003 19:01:06 -0000 1.26
--- index.php 28 Dec 2003 18:54:00 -0000 1.27
***************
*** 58,62 ****
function form ($A, $error = false)
{
! global $_TABLES, $PHP_SELF, $_CONF, $HTTP_POST_VARS, $_USER, $LANG_STATIC,$_SP_CONF, $LANG_ACCESS, $mode, $sp_id;
if (!empty($sp_id) && $mode=='edit') {
--- 58,62 ----
function form ($A, $error = false)
{
! global $_TABLES, $PHP_SELF, $_CONF, $HTTP_POST_VARS, $_USER, $LANG_STATIC, $_SP_CONF, $LANG_ACCESS, $mode, $sp_id;
if (!empty($sp_id) && $mode=='edit') {
***************
*** 69,77 ****
$A['perm_members'] = 2;
$A['perm_anon'] = 2;
$access = 3;
}
$retval = '';
! if (empty($A['owner_id'])) {
$error = COM_startBlock($LANG_ACCESS['accessdenied']);
$error .= $LANG_STATIC['deny_msg'];
--- 69,78 ----
$A['perm_members'] = 2;
$A['perm_anon'] = 2;
+ $A['sp_inblock'] = $_SP_CONF['in_block'];
$access = 3;
}
$retval = '';
! if (empty ($A['owner_id'])) {
$error = COM_startBlock($LANG_ACCESS['accessdenied']);
$error .= $LANG_STATIC['deny_msg'];
***************
*** 121,127 ****
$sp_template->set_var('start_block_editor', COM_startBlock($LANG_STATIC['staticpageeditor']));
$sp_template->set_var('lang_save', $LANG_STATIC['save']);
$sp_template->set_var('lang_preview', $LANG_STATIC['preview']);
if (SEC_hasRights('staticpages.delete')) {
! $sp_template->set_var('delete_option',"<input type=\"submit\" value=\"{$LANG_STATIC['delete']}\" name=\"mode\">");
} else {
$sp_template->set_var('delete_option','');
--- 122,129 ----
$sp_template->set_var('start_block_editor', COM_startBlock($LANG_STATIC['staticpageeditor']));
$sp_template->set_var('lang_save', $LANG_STATIC['save']);
+ $sp_template->set_var('lang_cancel', $LANG_STATIC['cancel']);
$sp_template->set_var('lang_preview', $LANG_STATIC['preview']);
if (SEC_hasRights('staticpages.delete')) {
! $sp_template->set_var ('delete_option', '<input type="submit" value="' . $LANG_STATIC['delete'] . '" name="mode">');
} else {
$sp_template->set_var('delete_option','');
***************
*** 203,207 ****
$sp_template->set_var('php_checked','');
}
! $sp_template->set_var('exit_msg',$LANG_STATIC['exit_msg']);
if ($A['sp_nf'] == 1) {
$sp_template->set_var('exit_checked','checked');
--- 205,209 ----
$sp_template->set_var('php_checked','');
}
!
if ($A['sp_nf'] == 1) {
$sp_template->set_var('exit_checked','checked');
***************
*** 209,214 ****
--- 211,225 ----
$sp_template->set_var('exit_checked','');
}
+ $sp_template->set_var('exit_msg',$LANG_STATIC['exit_msg']);
$sp_template->set_var('exit_info',$LANG_STATIC['exit_info']);
+ if ($A['sp_inblock'] == 1) {
+ $sp_template->set_var ('inblock_checked', 'checked');
+ } else {
+ $sp_template->set_var ('inblock_checked', '');
+ }
+ $sp_template->set_var ('inblock_msg', $LANG_STATIC['inblock_msg']);
+ $sp_template->set_var ('inblock_info', $LANG_STATIC['inblock_info']);
+
$curtime = COM_getUserDateTimeFormat();
***************
*** 284,292 ****
if (!empty ($sp_id) && $mode == 'edit') {
! $perms = SP_getPerms ('', '3');
! if (!empty ($perms)) {
! $perms = ' AND ' . $perms;
! }
! $result = DB_query ("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE sp_id = '$sp_id'" . $perms);
$A = DB_fetchArray ($result);
$A['sp_old_id'] = $A['sp_id'];
--- 295,299 ----
if (!empty ($sp_id) && $mode == 'edit') {
! $result = DB_query ("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE sp_id = '$sp_id'" . COM_getPermSQL ('AND', 0, 3));
$A = DB_fetchArray ($result);
$A['sp_old_id'] = $A['sp_id'];
***************
*** 298,306 ****
$A['sp_where'] = 1; // default new pages to "top of page"
} elseif (!empty ($sp_id) && $mode == 'clone') {
! $perms = SP_getPerms ('', '3');
! if (!empty ($perms)) {
! $perms = ' AND ' . $perms;
! }
! $result = DB_query ("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE sp_id = '$sp_id'" . $perms);
$A = DB_fetchArray ($result);
$A['sp_id'] = COM_makesid ();
--- 305,309 ----
$A['sp_where'] = 1; // default new pages to "top of page"
} elseif (!empty ($sp_id) && $mode == 'clone') {
! $result = DB_query ("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE sp_id = '$sp_id'" . COM_getPermSQL ('AND', 0, 3));
$A = DB_fetchArray ($result);
$A['sp_id'] = COM_makesid ();
***************
*** 348,356 ****
}
! $perms = SP_getPerms ('', '3');
! if (!empty ($perms)) {
! $perms = ' WHERE ' . $perms;
! }
!
$result = DB_query ("SELECT COUNT(*) AS count FROM {$_TABLES['staticpage']}" . $perms);
$C = DB_fetchArray ($result);
--- 351,355 ----
}
! $perms = COM_getPermSQL ('WHERE', 0, 3);
$result = DB_query ("SELECT COUNT(*) AS count FROM {$_TABLES['staticpage']}" . $perms);
$C = DB_fetchArray ($result);
***************
*** 450,456 ****
* @param sp_tid string topid id (for center block)
* @param sp_where int position of center block
*
*/
! function submitstaticpage ($sp_id, $sp_uid, $sp_title, $sp_content, $unixdate, $sp_hits, $sp_format, $sp_onmenu, $sp_label, $owner_id, $group_id, $perm_owner, $perm_group, $perm_members, $perm_anon, $sp_php, $sp_nf, $sp_old_id, $sp_centerblock, $sp_tid, $sp_where)
{
global $_CONF, $LANG12, $LANG_STATIC, $_SP_CONF, $_TABLES;
--- 449,456 ----
* @param sp_tid string topid id (for center block)
* @param sp_where int position of center block
+ * @param sp_inblock int Flag: wrap page in a block (or not)
*
*/
! function submitstaticpage ($sp_id, $sp_uid, $sp_title, $sp_content, $unixdate, $sp_hits, $sp_format, $sp_onmenu, $sp_label, $owner_id, $group_id, $perm_owner, $perm_group, $perm_members, $perm_anon, $sp_php, $sp_nf, $sp_old_id, $sp_centerblock, $sp_tid, $sp_where, $sp_inblock)
{
global $_CONF, $LANG12, $LANG_STATIC, $_SP_CONF, $_TABLES;
***************
*** 523,527 ****
list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
! DB_save ($_TABLES['staticpage'], 'sp_id,sp_uid,sp_title,sp_content,sp_date,sp_hits,sp_format,sp_onmenu,sp_label,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon,sp_php,sp_nf,sp_centerblock,sp_tid,sp_where', "'$sp_id',$sp_uid,'$sp_title','$sp_content','$date',$sp_hits,'$sp_format',$sp_onmenu,'$sp_label',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,'$sp_php','$sp_nf',$sp_centerblock,'$sp_tid',$sp_where");
if ($delete_old_page && !empty ($sp_old_id)) {
DB_delete ($_TABLES['staticpage'], 'sp_id', $sp_old_id);
--- 523,527 ----
list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
! DB_save ($_TABLES['staticpage'], 'sp_id,sp_uid,sp_title,sp_content,sp_date,sp_hits,sp_format,sp_onmenu,sp_label,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon,sp_php,sp_nf,sp_centerblock,sp_tid,sp_where,sp_inblock', "'$sp_id',$sp_uid,'$sp_title','$sp_content','$date',$sp_hits,'$sp_format',$sp_onmenu,'$sp_label',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,'$sp_php','$sp_nf',$sp_centerblock,'$sp_tid',$sp_where,'$sp_inblock'");
if ($delete_old_page && !empty ($sp_old_id)) {
DB_delete ($_TABLES['staticpage'], 'sp_id', $sp_old_id);
***************
*** 565,569 ****
$sp_hits, $sp_format, $sp_onmenu, $sp_label, $owner_id, $group_id,
$perm_owner, $perm_group, $perm_members, $perm_anon, $sp_php,
! $sp_nf, $sp_old_id, $sp_centerblock, $sp_tid, $sp_where);
} else {
$display .= COM_siteHeader ('menu');
--- 565,569 ----
$sp_hits, $sp_format, $sp_onmenu, $sp_label, $owner_id, $group_id,
$perm_owner, $perm_group, $perm_members, $perm_anon, $sp_php,
! $sp_nf, $sp_old_id, $sp_centerblock, $sp_tid, $sp_where, $sp_inblock);
} else {
$display .= COM_siteHeader ('menu');
More information about the geeklog-cvs
mailing list