[geeklog-cvs] geeklog: Updated COM_createHTMLDocument function and calls to us...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Mon May 7 15:44:45 EDT 2012
changeset 8684:86654bff5054
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/86654bff5054
user: Tom <websitemaster at cogeco.net>
date: Mon May 07 15:37:45 2012 -0400
description:
Updated COM_createHTMLDocument function and calls to use an array to pass variables. This will make it easier to add any new "variables" in the future.
diffstat:
plugins/calendar/functions.inc | 4 +-
plugins/links/functions.inc | 2 +-
plugins/polls/functions.inc | 2 +-
plugins/staticpages/functions.inc | 6 +-
plugins/staticpages/services.inc.php | 12 ++--
public_html/404.php | 2 +-
public_html/admin/auth.inc.php | 2 +-
public_html/admin/block.php | 16 +++---
public_html/admin/database.php | 4 +-
public_html/admin/group.php | 16 +++---
public_html/admin/mail.php | 4 +-
public_html/admin/moderation.php | 2 +-
public_html/admin/plugins.php | 10 ++--
public_html/admin/plugins/calendar/index.php | 24 +++++-----
public_html/admin/plugins/links/category.php | 10 ++--
public_html/admin/plugins/links/index.php | 12 ++--
public_html/admin/plugins/polls/index.php | 12 ++--
public_html/admin/plugins/spamx/index.php | 4 +-
public_html/admin/plugins/staticpages/index.php | 8 +-
public_html/admin/sectest.php | 4 +-
public_html/admin/story.php | 10 ++--
public_html/admin/syndication.php | 18 +++---
public_html/admin/topic.php | 24 +++++-----
public_html/admin/trackback.php | 24 +++++-----
public_html/admin/user.php | 24 +++++-----
public_html/article.php | 6 +-
public_html/calendar/event.php | 4 +-
public_html/calendar/index.php | 12 ++--
public_html/directory.php | 10 ++--
public_html/getimage.php | 2 +-
public_html/index.php | 2 +-
public_html/lib-common.php | 59 +++++++++++++++++++-----
public_html/links/index.php | 8 +-
public_html/polls/index.php | 8 +-
public_html/profiles.php | 18 +++---
public_html/search.php | 4 +-
public_html/stats.php | 4 +-
public_html/submit.php | 4 +-
public_html/users.php | 33 +++++++------
public_html/usersettings.php | 12 ++--
system/classes/config.class.php | 6 +-
system/lib-comment.php | 14 ++--
system/lib-security.php | 2 +-
system/lib-story.php | 16 +++---
system/lib-user.php | 6 +-
45 files changed, 259 insertions(+), 227 deletions(-)
diffs (truncated from 2027 to 300 lines):
diff -r f8d36af1b0c3 -r 86654bff5054 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc Sat May 05 19:47:00 2012 +0200
+++ b/plugins/calendar/functions.inc Mon May 07 15:37:45 2012 -0400
@@ -443,7 +443,7 @@
. $LANG12[23]
. COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
. plugin_submit_calendar ($A['calendar_type']);
- $retval = COM_createHTMLDocument($retval, 'menu', $LANG_CAL_1[27]);
+ $retval = COM_createHTMLDocument($retval, array('pagetitle' => $LANG_CAL_1[27]));
return $retval;
}
@@ -513,7 +513,7 @@
if (! empty($msg)) {
$retval .= COM_errorLog($msg, 2)
. plugin_submit_calendar($A['calendar_type']);
- $retval = COM_createHTMLDocument($retval, 'menu', $LANG_CAL_1[27]);
+ $retval = COM_createHTMLDocument($retval, array('pagetitle' => $LANG_CAL_1[27]));
return $retval;
}
diff -r f8d36af1b0c3 -r 86654bff5054 plugins/links/functions.inc
--- a/plugins/links/functions.inc Sat May 05 19:47:00 2012 +0200
+++ b/plugins/links/functions.inc Mon May 07 15:37:45 2012 -0400
@@ -1062,7 +1062,7 @@
COM_updateSpeedlimit('submit');
$retval .= COM_errorLog($msg, 2)
. plugin_submit_links();
- $retval = COM_createHTMLDocument($retval, 'menu');
+ $retval = COM_createHTMLDocument($retval);
return $retval;
}
diff -r f8d36af1b0c3 -r 86654bff5054 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc Sat May 05 19:47:00 2012 +0200
+++ b/plugins/polls/functions.inc Mon May 07 15:37:45 2012 -0400
@@ -120,7 +120,7 @@
if ($ret > 0) { // failure //FIXME: some failures should not return to comment form
$retval .= CMT_commentForm ($title, $comment, $id, $pid, 'polls',
$LANG03[14], $postmode);
- $retval = COM_createHTMLDocument($retval, 'menu', $LANG03[1]);
+ $retval = COM_createHTMLDocument($retval, array('pagetitle' => $LANG03[1]));
} else { // success
$retval = COM_refresh ($_CONF['site_url']
. "/polls/index.php?pid=$id");
diff -r f8d36af1b0c3 -r 86654bff5054 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc Sat May 05 19:47:00 2012 +0200
+++ b/plugins/staticpages/functions.inc Mon May 07 15:37:45 2012 -0400
@@ -204,7 +204,7 @@
if ($ret > 0) { // failure //FIXME: some failures should not return to comment form
$retval .= CMT_commentForm($title, $comment, $id, $pid, 'staticpages',
$LANG03[14], $postmode);
- $retval = COM_createHTMLDocument($retval, 'menu', $LANG03[1]);
+ $retval = COM_createHTMLDocument($retval, array('pagetitle' => $LANG03[1]));
} else { // success
$url = COM_buildUrl($_CONF['site_url'] . '/staticpages/index.php?page='
. $id);
@@ -492,7 +492,7 @@
$rightblock = -1;
}
- $retval = COM_createHTMLDocument($retval, $what, $page_title, $headercode, $rightblock);
+ $retval = COM_createHTMLDocument($retval, array('what' => $what, 'pagetitle' => $page_title, 'headercode' => $headercode, 'rightblock' => $rightblock));
}
return $retval;
@@ -1127,7 +1127,7 @@
} elseif ($S['sp_format'] != 'blankpage') {
$rightblock = -1;
}
- $retval = COM_createHTMLDocument($retval, $what, '', '', $rightblock);
+ $retval = COM_createHTMLDocument($retval, array('what' => $what, 'rightblock' => $rightblock));
}
// increment hit counter for page
diff -r f8d36af1b0c3 -r 86654bff5054 plugins/staticpages/services.inc.php
--- a/plugins/staticpages/services.inc.php Sat May 05 19:47:00 2012 +0200
+++ b/plugins/staticpages/services.inc.php Mon May 07 15:37:45 2012 -0400
@@ -73,7 +73,7 @@
COM_getBlockTemplate('_msg_block', 'header'));
$output .= $LANG_STATIC['access_denied_msg'];
$output .= COM_endBlock(COM_getBlockTemplate('_msg_block', 'footer'));
- $output = COM_createHTMLDocument($output, 'menu', $LANG_STATIC['access_denied']);
+ $output = COM_createHTMLDocument($output, array('pagetitle' => $LANG_STATIC['access_denied']));
return PLG_RET_AUTH_FAILED;
}
@@ -316,7 +316,7 @@
if (!$args['gl_svc']) {
$output .= staticpageeditor ($sp_id);
}
- $output = COM_createHTMLDocument($output, 'menu', $LANG_STATIC['staticpageeditor']);
+ $output = COM_createHTMLDocument($output, array('pagetitle' => $LANG_STATIC['staticpageeditor']));
$svc_msg['error_desc'] = 'Duplicate ID';
return PLG_RET_ERROR;
} elseif (!empty ($sp_title) && !empty ($sp_content) && TOPIC_checkTopicSelectionControl() && TOPIC_hasMultiTopicAccess('topic') == 3) {
@@ -522,7 +522,7 @@
if (!$args['gl_svc']) {
$output .= staticpageeditor ($sp_id);
}
- $output = COM_createHTMLDocument($output, 'menu', $LANG_STATIC['staticpageeditor']);
+ $output = COM_createHTMLDocument($output, array('pagetitle' => $LANG_STATIC['staticpageeditor']));
return PLG_RET_ERROR;
}
}
@@ -559,7 +559,7 @@
COM_getBlockTemplate ('_msg_block', 'header'));
$output .= $LANG_STATIC['access_denied_msg'];
$output .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
- $output = COM_createHTMLDocument($output, 'menu', $LANG_STATIC['access_denied']);
+ $output = COM_createHTMLDocument($output, array('pagetitle' => $LANG_STATIC['access_denied']));
if ($_USER['uid'] > 1) {
return PLG_RET_PERMISSION_DENIED;
} else {
@@ -759,7 +759,7 @@
if ($failflg) {
$output .= SEC_loginRequiredForm();
if ($mode !== 'autotag') {
- $output = COM_createHTMLDocument($output, 'menu', '', '', true);
+ $output = COM_createHTMLDocument($output, array('rightblock' => true));
}
} else {
$output .= COM_startBlock($LANG_ACCESS['accessdenied'], '',
@@ -768,7 +768,7 @@
$output .= COM_endBlock(COM_getBlockTemplate('_msg_block',
'footer'));
if ($mode !== 'autotag') {
- $output = COM_createHTMLDocument($output, 'menu', '', '', true);
+ $output = COM_createHTMLDocument($output, array('rightblock' => true));
}
}
}
diff -r f8d36af1b0c3 -r 86654bff5054 public_html/404.php
--- a/public_html/404.php Sat May 05 19:47:00 2012 +0200
+++ b/public_html/404.php Mon May 07 15:37:45 2012 -0400
@@ -48,7 +48,7 @@
$display .= sprintf($LANG_404[2], $url);
$display .= $LANG_404[3];
$display .= COM_endBlock();
-$display = COM_createHTMLDocument($display, 'menu', $LANG_404[1]);
+$display = COM_createHTMLDocument($display, array('pagetitle' => $LANG_404[1]));
COM_output($display);
diff -r f8d36af1b0c3 -r 86654bff5054 public_html/admin/auth.inc.php
--- a/public_html/admin/auth.inc.php Sat May 05 19:47:00 2012 +0200
+++ b/public_html/admin/auth.inc.php Mon May 07 15:37:45 2012 -0400
@@ -120,7 +120,7 @@
}
$display .= COM_endBlock();
- $display = COM_createHTMLDocument($display, 'menu');
+ $display = COM_createHTMLDocument($display);
COM_output($display);
exit;
}
diff -r f8d36af1b0c3 -r 86654bff5054 public_html/admin/block.php
--- a/public_html/admin/block.php Sat May 05 19:47:00 2012 +0200
+++ b/public_html/admin/block.php Mon May 07 15:37:45 2012 -0400
@@ -58,7 +58,7 @@
if (!SEC_hasRights('block.edit')) {
$display .= COM_showMessageText($MESSAGE[29], $MESSAGE[30]);
- $display = COM_createHTMLDocument($display, 'menu', $MESSAGE[30]);
+ $display = COM_createHTMLDocument($display, array('pagetitle' => $MESSAGE[30]));
COM_accessLog("User {$_USER['username']} tried to illegally access the block administration screen");
COM_output($display);
exit;
@@ -545,7 +545,7 @@
if (empty($title) || !TOPIC_checkTopicSelectionControl()) {
$retval .= COM_showMessageText($LANG21[64], $LANG21[63])
. editblock($bid);
- $retval = COM_createHTMLDocument($retval, 'menu', $LANG21[63]);
+ $retval = COM_createHTMLDocument($retval, array('pagetitle' => $LANG21[63]));
return $retval;
}
@@ -566,7 +566,7 @@
if (($access < 3) || !TOPIC_hasMultiTopicAccess('topic') || !SEC_inGroup($group_id)) {
$retval .= COM_showMessageText($MESSAGE[29], $MESSAGE[30]);
- $retval = COM_createHTMLDocument($retval, 'menu', $MESSAGE[30]);
+ $retval = COM_createHTMLDocument($retval, array('pagetitle' => $MESSAGE[30]));
COM_accessLog("User {$_USER['username']} tried to illegally create or edit block $bid.");
return $retval;
@@ -619,7 +619,7 @@
if (!(stristr($phpblockfn,'phpblock_'))) {
$retval .= COM_showMessageText($LANG21[38], $LANG21[37])
. editblock($bid);
- $retval = COM_createHTMLDocument($retval, 'menu', $LANG21[37]);
+ $retval = COM_createHTMLDocument($retval, array('pagetitle' => $LANG21[37]));
return $retval;
}
$content = '';
@@ -694,7 +694,7 @@
}
$retval .= COM_showMessageText($msgtxt, $LANG21[32])
. editblock($bid);
- $retval = COM_createHTMLDocument($retval, 'menu', $LANG21[32]);
+ $retval = COM_createHTMLDocument($retval, array('pagetitle' => $LANG21[32]));
}
return $retval;
@@ -908,17 +908,17 @@
$_POST['perm_members'], $_POST['perm_anon'],
$is_enabled, $allow_autotags);
} elseif ($mode == 'edit') {
- $display = COM_createHTMLDocument(editblock($bid), 'menu', $LANG21[3]);
+ $display = COM_createHTMLDocument(editblock($bid), array('pagetitle' => $LANG21[3]));
} elseif ($mode == 'move') {
if(SEC_checkToken()) {
$display .= moveBlock();
}
$display .= listblocks();
- $display = COM_createHTMLDocument($display, 'menu', $LANG21[19]);
+ $display = COM_createHTMLDocument($display, array('pagetitle' => $LANG21[19]));
} else { // 'cancel' or no mode at all
$display .= COM_showMessageFromParameter();
$display .= listblocks();
- $display = COM_createHTMLDocument($display, 'menu', $LANG21[19]);
+ $display = COM_createHTMLDocument($display, array('pagetitle' => $LANG21[19]));
}
COM_output($display);
diff -r f8d36af1b0c3 -r 86654bff5054 public_html/admin/database.php
--- a/public_html/admin/database.php Sat May 05 19:47:00 2012 +0200
+++ b/public_html/admin/database.php Mon May 07 15:37:45 2012 -0400
@@ -55,7 +55,7 @@
// If user isn't a Root user or if the backup feature is disabled, bail.
if (!SEC_inGroup('Root') OR ($_CONF['allow_mysqldump'] == 0)) {
$display .= COM_showMessageText($MESSAGE[29], $MESSAGE[30]);
- $display = COM_createHTMLDocument($display, 'menu', $LANG_DB_BACKUP['last_ten_backups']);
+ $display = COM_createHTMLDocument($display, array('pagetitle' => $LANG_DB_BACKUP['last_ten_backups']));
COM_accessLog("User {$_USER['username']} tried to illegally access the database backup screen.");
COM_output($display);
exit;
@@ -810,7 +810,7 @@
$display .= listbackups();
}
-$display = COM_createHTMLDocument($display, 'menu', $pagetitle);
+$display = COM_createHTMLDocument($display, array('pagetitle' => $pagetitle));
COM_output($display);
diff -r f8d36af1b0c3 -r 86654bff5054 public_html/admin/group.php
--- a/public_html/admin/group.php Sat May 05 19:47:00 2012 +0200
+++ b/public_html/admin/group.php Mon May 07 15:37:45 2012 -0400
@@ -62,7 +62,7 @@
// Make sure user has rights to access this page
if (!SEC_hasRights('group.edit')) {
$display .= COM_showMessageText($MESSAGE[29], $MESSAGE[30]);
- $display = COM_createHTMLDocument($display, 'menu', $MESSAGE[30]);
+ $display = COM_createHTMLDocument($display, array('pagetitle' => $MESSAGE[30]));
COM_accessLog("User {$_USER['username']} tried to illegally access the group administration screen.");
COM_output($display);
exit;
@@ -560,7 +560,7 @@
$retval .= COM_showMessageText($LANG_ACCESS['groupexistsmsg'],
$LANG_ACCESS['groupexists'])
. editgroup($grp_id);
- $retval = COM_createHTMLDocument($retval, 'menu', $LANG_ACCESS['groupeditor']);
+ $retval = COM_createHTMLDocument($retval, array('pagetitle' => $LANG_ACCESS['groupeditor']));
return $retval;
}
@@ -600,7 +600,7 @@
// "this shouldn't happen"
COM_errorLog("Internal error: invalid group id");
$retval .= COM_showMessage(95);
- $retval = COM_createHTMLDocument($retval, 'menu', $LANG_ACCESS['groupeditor']);
+ $retval = COM_createHTMLDocument($retval, array('pagetitle' => $LANG_ACCESS['groupeditor']));
return $retval;
}
@@ -681,7 +681,7 @@
$retval .= COM_showMessageText($LANG_ACCESS['missingfieldsmsg'],
$LANG_ACCESS['missingfields'])
. editgroup($grp_id);
- $retval = COM_createHTMLDocument($retval, 'menu', $LANG_ACCESS['groupeditor']);
+ $retval = COM_createHTMLDocument($retval, array('pagetitle' => $LANG_ACCESS['groupeditor']));
return $retval;
}
@@ -1213,15 +1213,15 @@
$grp_id = COM_applyFilter ($_REQUEST['grp_id'], true);
}
$display .= editgroup ($grp_id);
- $display = COM_createHTMLDocument($display, 'menu', $LANG_ACCESS['groupeditor']);
+ $display = COM_createHTMLDocument($display, array('pagetitle' => $LANG_ACCESS['groupeditor']));
} elseif ($mode == 'listusers') {
$grp_id = COM_applyFilter ($_REQUEST['grp_id'], true);
$display .= listusers ($grp_id);
- $display = COM_createHTMLDocument($display, 'menu', $LANG_ACCESS['groupmembers']);
+ $display = COM_createHTMLDocument($display, array('pagetitle' => $LANG_ACCESS['groupmembers']));
} elseif ($mode == 'editusers') {
$grp_id = COM_applyFilter ($_REQUEST['grp_id'], true);
$display .= editusers ($grp_id);
- $display = COM_createHTMLDocument($display, 'menu', $LANG_ACCESS['usergroupadmin']);
More information about the geeklog-cvs
mailing list