[geeklog-cvs] geeklog: Bug#1220: Implement an overridable COM_newTemplate func...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Thu Mar 17 12:07:06 EDT 2011
changeset 8175:cd05fcfc8ba3
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/cd05fcfc8ba3
user: Joe Mucchiello
date: Wed Mar 16 22:27:44 2011 -0400
description:
Bug#1220: Implement an overridable COM_newTemplate function
diffstat:
plugins/calendar/functions.inc | 12 +--
plugins/links/functions.inc | 6 +-
plugins/polls/functions.inc | 12 +--
plugins/staticpages/functions.inc | 19 +----
public_html/admin/block.php | 12 +--
public_html/admin/group.php | 12 +--
public_html/admin/mail.php | 6 +-
public_html/admin/moderation.php | 6 +-
public_html/admin/plugins.php | 10 +--
public_html/admin/plugins/calendar/index.php | 6 +-
public_html/admin/plugins/links/category.php | 6 +-
public_html/admin/plugins/links/index.php | 6 +-
public_html/admin/plugins/polls/index.php | 6 +-
public_html/admin/plugins/spamx/index.php | 6 +-
public_html/admin/plugins/staticpages/index.php | 7 +-
public_html/admin/story.php | 8 +-
public_html/admin/syndication.php | 15 +---
public_html/admin/topic.php | 12 +--
public_html/admin/trackback.php | 56 +++------------
public_html/admin/user.php | 18 +----
public_html/article.php | 12 +--
public_html/calendar/event.php | 21 +-----
public_html/calendar/index.php | 19 +----
public_html/index.php | 6 +-
public_html/lib-common.php | 85 ++++++++++--------------
public_html/links/index.php | 6 +-
public_html/profiles.php | 12 +--
public_html/submit.php | 6 +-
public_html/users.php | 18 +----
public_html/usersettings.php | 13 +---
system/classes/config.class.php | 13 +---
system/classes/listfactory.class.php | 8 +--
system/classes/navbar.class.php | 12 +--
system/classes/search.class.php | 6 +-
system/classes/template.class.php | 46 +++++++++++++-
system/lib-admin.php | 19 +----
system/lib-comment.php | 36 +--------
system/lib-security.php | 12 +--
system/lib-story.php | 6 +-
system/lib-trackback.php | 14 +---
system/lib-user.php | 19 +----
41 files changed, 166 insertions(+), 464 deletions(-)
diffs (truncated from 1685 to 300 lines):
diff -r 83d92f7701de -r cd05fcfc8ba3 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc Wed Mar 16 17:58:24 2011 +0000
+++ b/plugins/calendar/functions.inc Wed Mar 16 22:27:44 2011 -0400
@@ -743,12 +743,8 @@
$retval = '';
$retval .= COM_startBlock ($LANG_CAL_1[26], 'submitevent.html');
- $eventform = new Template ($_CONF['path'] . 'plugins/calendar/templates/');
+ $eventform = COM_newTemplate($_CONF['path'] . 'plugins/calendar/templates/');
$eventform->set_file ('eventform', 'submitevent.thtml');
- $eventform->set_var ('xhtml', XHTML);
- $eventform->set_var ('site_url', $_CONF['site_url']);
- $eventform->set_var ('site_admin_url', $_CONF['site_admin_url']);
- $eventform->set_var ('layout_url', $_CONF['layout_url']);
if ($mode != 'personal') {
$eventform->set_var ('explanation', $LANG_CAL_1[27]);
$eventform->set_var ('submit_url', '/submit.php');
@@ -931,12 +927,8 @@
'text' => $LANG_ADMIN['admin_home'])
);
- $cal_templates = new Template($_CONF['path'] . 'plugins/calendar/templates/admin');
+ $cal_templates = COM_newTemplate($_CONF['path'] . 'plugins/calendar/templates/admin');
$cal_templates->set_file(array('form' => 'batchdelete.thtml'));
- $cal_templates->set_var('xhtml', XHTML);
- $cal_templates->set_var('site_url', $_CONF['site_url']);
- $cal_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
- $cal_templates->set_var('layout_url', $_CONF['layout_url']);
$cal_templates->set_var('usr_time', $usr_time);
$cal_templates->set_var('lang_text_start', $LANG_CAL_ADMIN[28]);
$cal_templates->set_var('lang_text_end', $LANG_CAL_ADMIN[29]);
diff -r 83d92f7701de -r cd05fcfc8ba3 plugins/links/functions.inc
--- a/plugins/links/functions.inc Wed Mar 16 17:58:24 2011 +0000
+++ b/plugins/links/functions.inc Wed Mar 16 22:27:44 2011 -0400
@@ -949,12 +949,8 @@
$retval = COM_startBlock ($LANG_LINKS_SUBMIT[1], 'submitlink.html');
- $linkform = new Template($_CONF['path'] . 'plugins/links/templates');
+ $linkform = COM_newTemplate($_CONF['path'] . 'plugins/links/templates');
$linkform->set_file('linkform', 'submitlink.thtml');
- $linkform->set_var('xhtml', XHTML);
- $linkform->set_var('site_url', $_CONF['site_url']);
- $linkform->set_var('site_admin_url', $_CONF['site_admin_url']);
- $linkform->set_var('layout_url', $_CONF['layout_url']);
$linkform->set_var('lang_title', $LANG12[10]);
$linkform->set_var('lang_link', $LANG_LINKS_SUBMIT[2]);
$linkform->set_var('lang_category', $LANG_LINKS_SUBMIT[3]);
diff -r 83d92f7701de -r cd05fcfc8ba3 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc Wed Mar 16 17:58:24 2011 +0000
+++ b/plugins/polls/functions.inc Wed Mar 16 22:27:44 2011 -0400
@@ -484,16 +484,12 @@
$nquestions = DB_numRows($questions );
if ($nquestions > 0) {
- $poll = new Template($_CONF['path']
+ $poll = COM_newTemplate($_CONF['path']
. 'plugins/polls/templates/');
$poll->set_file(array('panswer' => 'pollanswer.thtml',
'block' => 'pollblock.thtml',
'pquestions' => 'pollquestions.thtml',
'comments' => 'pollcomments.thtml'));
- $poll->set_var('xhtml', XHTML);
- $poll->set_var('site_url', $_CONF['site_url']);
- $poll->set_var('site_admin_url', $_CONF['site_admin_url']);
- $poll->set_var('layout_url', $_CONF['layout_url']);
$poll->set_var('poll_id', $pid );
$poll->set_var('poll_topic', $P['topic'] );
$poll->set_var('num_votes', COM_numberFormat($P['voters']));
@@ -808,16 +804,12 @@
}
if ($nquestions > 0){
- $poll = new Template($_CONF['path'] . 'plugins/polls/templates/' );
+ $poll = COM_newTemplate($_CONF['path'] . 'plugins/polls/templates/' );
$poll->set_file(array('result' => 'pollresult.thtml',
'question' => 'pollquestion.thtml',
'comments' => 'pollcomments.thtml',
'votes_bar' => 'pollvotes_bar.thtml',
'votes_num' => 'pollvotes_num.thtml' ));
- $poll->set_var('xhtml', XHTML);
- $poll->set_var('site_url', $_CONF['site_url']);
- $poll->set_var('site_admin_url', $_CONF['site_admin_url']);
- $poll->set_var('layout_url', $_CONF['layout_url']);
$poll->set_var('poll_topic', $P['topic']);
$poll->set_var('poll_id', $pid);
$poll->set_var('num_votes', COM_numberFormat($P['voters']));
diff -r 83d92f7701de -r cd05fcfc8ba3 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc Wed Mar 16 17:58:24 2011 +0000
+++ b/plugins/staticpages/functions.inc Wed Mar 16 22:27:44 2011 -0400
@@ -320,13 +320,9 @@
}
$template_path = staticpages_templatePath();
- $spage = new Template($template_path);
+ $spage = COM_newTemplate($template_path);
$spage->set_file(array('page' => 'staticpage.thtml',
'comments' => 'spcomments.thtml'));
- $spage->set_var('xhtml', XHTML);
- $spage->set_var('site_url', $_CONF['site_url']);
- $spage->set_var('site_admin_url', $_CONF['site_admin_url']);
- $spage->set_var('layout_url', $_CONF['layout_url']);
if (XHTML != '') {
$spage->set_var('xmlns', ' xmlns="http://www.w3.org/1999/xhtml"');
}
@@ -482,13 +478,8 @@
$_IMAGE_TYPE;
$template_path = staticpages_templatePath();
- $print = new Template($template_path);
+ $print = COM_newTemplate($template_path);
$print->set_file(array('print' => 'printable.thtml'));
- $print->set_var('xhtml', XHTML);
- $print->set_var('site_url', $_CONF['site_url']);
- $print->set_var('site_admin_url', $_CONF['site_admin_url']);
- $print->set_var('layout_url', $_CONF['layout_url']);
- $print->set_var('site_name', $_CONF['site_name']);
$print->set_var('site_slogan', $_CONF['site_slogan']);
$print->set_var('direction', $LANG_DIRECTION);
@@ -994,12 +985,8 @@
}
$template_path = staticpages_templatePath();
- $spage = new Template($template_path);
+ $spage = COM_newTemplate($template_path);
$spage->set_file(array('page' => 'centerblock.thtml'));
- $spage->set_var('xhtml', XHTML);
- $spage->set_var('site_url', $_CONF['site_url']);
- $spage->set_var('site_admin_url', $_CONF['site_admin_url']);
- $spage->set_var('layout_url', $_CONF['layout_url']);
if ($_CONF['hideprintericon'] == 0) {
$icon_url = $_CONF['layout_url'] . '/images/print.'
diff -r 83d92f7701de -r cd05fcfc8ba3 public_html/admin/block.php
--- a/public_html/admin/block.php Wed Mar 16 17:58:24 2011 +0000
+++ b/public_html/admin/block.php Wed Mar 16 22:27:44 2011 -0400
@@ -110,12 +110,8 @@
$token = SEC_createToken();
$retval .= SEC_getTokenExpiryNotice($token);
- $block_templates = new Template($_CONF['path_layout'] . 'admin/block');
+ $block_templates = COM_newTemplate($_CONF['path_layout'] . 'admin/block');
$block_templates->set_file('editor','defaultblockeditor.thtml');
- $block_templates->set_var('xhtml', XHTML);
- $block_templates->set_var('site_url', $_CONF['site_url']);
- $block_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
- $block_templates->set_var('layout_url', $_CONF['layout_url']);
$block_templates->set_var('block_id', $A['bid']);
// standard Admin strings
$block_templates->set_var('lang_blocktitle', $LANG_ADMIN['title']);
@@ -257,12 +253,8 @@
$token = SEC_createToken();
- $block_templates = new Template($_CONF['path_layout'] . 'admin/block');
+ $block_templates = COM_newTemplate($_CONF['path_layout'] . 'admin/block');
$block_templates->set_file('editor','blockeditor.thtml');
- $block_templates->set_var('xhtml', XHTML);
- $block_templates->set_var('site_url', $_CONF['site_url']);
- $block_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
- $block_templates->set_var('layout_url', $_CONF['layout_url']);
$block_start = COM_startBlock($LANG21[3], '',
COM_getBlockTemplate('_admin_block', 'header'));
$block_start .= LB . SEC_getTokenExpiryNotice($token);
diff -r 83d92f7701de -r cd05fcfc8ba3 public_html/admin/group.php
--- a/public_html/admin/group.php Wed Mar 16 17:58:24 2011 +0000
+++ b/public_html/admin/group.php Wed Mar 16 22:27:44 2011 -0400
@@ -104,12 +104,8 @@
return $retval;
}
- $group_templates = new Template($_CONF['path_layout'] . 'admin/group');
+ $group_templates = COM_newTemplate($_CONF['path_layout'] . 'admin/group');
$group_templates->set_file('editor', 'groupeditor.thtml');
- $group_templates->set_var('xhtml', XHTML);
- $group_templates->set_var('site_url', $_CONF['site_url']);
- $group_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
- $group_templates->set_var('layout_url', $_CONF['layout_url']);
$group_templates->set_var('lang_save', $LANG_ADMIN['save']);
$group_templates->set_var('lang_cancel', $LANG_ADMIN['cancel']);
@@ -1051,12 +1047,8 @@
$retval .= ADMIN_createMenu($menu_arr, $LANG_ACCESS['editgroupmsg'],
$_CONF['layout_url'] . '/images/icons/group.' . $_IMAGE_TYPE);
- $groupmembers = new Template($_CONF['path_layout'] . 'admin/group');
+ $groupmembers = COM_newTemplate($_CONF['path_layout'] . 'admin/group');
$groupmembers->set_file(array('groupmembers' => 'groupmembers.thtml'));
- $groupmembers->set_var('xhtml', XHTML);
- $groupmembers->set_var('site_url', $_CONF['site_url']);
- $groupmembers->set_var('site_admin_url', $_CONF['site_admin_url']);
- $groupmembers->set_var('layout_url', $_CONF['layout_url']);
$groupmembers->set_var('group_listing_url', $group_listing_url);
$groupmembers->set_var('phpself', $_CONF['site_admin_url'] . '/group.php');
$groupmembers->set_var('lang_adminhome', $LANG_ACCESS['adminhome']);
diff -r 83d92f7701de -r cd05fcfc8ba3 public_html/admin/mail.php
--- a/public_html/admin/mail.php Wed Mar 16 17:58:24 2011 +0000
+++ b/public_html/admin/mail.php Wed Mar 16 22:27:44 2011 -0400
@@ -85,12 +85,8 @@
$icon = $_CONF['layout_url'] . '/images/icons/mail.' . $_IMAGE_TYPE;
$retval .= ADMIN_createMenu($menu_arr, $desc, $icon);
- $mail_templates = new Template($_CONF['path_layout'] . 'admin/mail');
+ $mail_templates = COM_newTemplate($_CONF['path_layout'] . 'admin/mail');
$mail_templates->set_file(array('form' => 'mailform.thtml'));
- $mail_templates->set_var('xhtml', XHTML);
- $mail_templates->set_var('site_url', $_CONF['site_url']);
- $mail_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
- $mail_templates->set_var('layout_url', $_CONF['layout_url']);
$mail_templates->set_var('startblock_email', COM_startBlock($LANG31[1],
'', COM_getBlockTemplate('_admin_block', 'header')));
$mail_templates->set_var('php_self', $_CONF['site_admin_url']
diff -r 83d92f7701de -r cd05fcfc8ba3 public_html/admin/moderation.php
--- a/public_html/admin/moderation.php Wed Mar 16 17:58:24 2011 +0000
+++ b/public_html/admin/moderation.php Wed Mar 16 22:27:44 2011 -0400
@@ -83,14 +83,10 @@
$retval = '';
- $admin_templates = new Template($_CONF['path_layout'] . 'admin/moderation');
+ $admin_templates = COM_newTemplate($_CONF['path_layout'] . 'admin/moderation');
$admin_templates->set_file (array ('cc' => 'moderation.thtml',
'ccrow' => 'ccrow.thtml',
'ccitem' => 'ccitem.thtml'));
- $admin_templates->set_var('xhtml', XHTML);
- $admin_templates->set_var('site_url', $_CONF['site_url']);
- $admin_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
- $admin_templates->set_var('layout_url', $_CONF['layout_url']);
$retval .= COM_startBlock ('Geeklog ' . VERSION . ' -- ' . $LANG29[34], '',
COM_getBlockTemplate ('_admin_block', 'header'));
diff -r 83d92f7701de -r cd05fcfc8ba3 public_html/admin/plugins.php
--- a/public_html/admin/plugins.php Wed Mar 16 17:58:24 2011 +0000
+++ b/public_html/admin/plugins.php Wed Mar 16 22:27:44 2011 -0400
@@ -105,12 +105,8 @@
$A = DB_fetchArray($result);
- $plg_templates = new Template($_CONF['path_layout'] . 'admin/plugins');
+ $plg_templates = COM_newTemplate($_CONF['path_layout'] . 'admin/plugins');
$plg_templates->set_file('editor', 'editor.thtml');
- $plg_templates->set_var('xhtml', XHTML);
- $plg_templates->set_var('site_url', $_CONF['site_url']);
- $plg_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
- $plg_templates->set_var('layout_url', $_CONF['layout_url']);
$plg_templates->set_var('start_block_editor', COM_startBlock ('', '', COM_getBlockTemplate ('_admin_block', 'header')));
$plg_templates->set_var('title', $LANG32[13]);
$plg_templates->set_var('pi_icon', PLG_getIcon($pi_name));
@@ -183,10 +179,8 @@
$params = PLG_getParams($pi_name);
// Do template stuff
- $plg_templates = new Template($_CONF['path_layout'] . 'admin/plugins');
+ $plg_templates = COM_newTemplate($_CONF['path_layout'] . 'admin/plugins');
$plg_templates->set_file('editor', 'info.thtml');
- $plg_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
- $plg_templates->set_var('xhtml', XHTML);
$plg_templates->set_var('start_block_editor', COM_startBlock ('',
'', COM_getBlockTemplate ('_admin_block', 'header')));
$plg_templates->set_var('pi_icon', PLG_getIcon($pi_name));
diff -r 83d92f7701de -r cd05fcfc8ba3 public_html/admin/plugins/calendar/index.php
--- a/public_html/admin/plugins/calendar/index.php Wed Mar 16 17:58:24 2011 +0000
+++ b/public_html/admin/plugins/calendar/index.php Wed Mar 16 22:27:44 2011 -0400
@@ -88,12 +88,8 @@
$retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
}
- $event_templates = new Template($_CONF['path'] . 'plugins/calendar/templates/admin');
+ $event_templates = COM_newTemplate($_CONF['path'] . 'plugins/calendar/templates/admin');
$event_templates->set_file('editor','eventeditor.thtml');
- $event_templates->set_var( 'xhtml', XHTML );
- $event_templates->set_var('site_url', $_CONF['site_url']);
- $event_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
- $event_templates->set_var('layout_url',$_CONF['layout_url']);
$event_templates->set_var('lang_allowed_html',
COM_allowedHTML('calendar.edit'));
$event_templates->set_var('lang_postmode', $LANG_CAL_ADMIN[3]);
diff -r 83d92f7701de -r cd05fcfc8ba3 public_html/admin/plugins/links/category.php
--- a/public_html/admin/plugins/links/category.php Wed Mar 16 17:58:24 2011 +0000
+++ b/public_html/admin/plugins/links/category.php Wed Mar 16 22:27:44 2011 -0400
@@ -216,13 +216,9 @@
COM_getBlockTemplate('_admin_block', 'header'));
$retval .= SEC_getTokenExpiryNotice($token);
- $T = new Template($_CONF['path'] . 'plugins/links/templates/admin');
+ $T = COM_newTemplate($_CONF['path'] . 'plugins/links/templates/admin');
$T->set_file(array('page' => 'categoryeditor.thtml'));
- $T->set_var('xhtml', XHTML);
- $T->set_var('site_url', $_CONF['site_url']);
- $T->set_var('site_admin_url', $_CONF['site_admin_url']);
- $T->set_var('layout_url', $_CONF['layout_url']);
$T->set_var('lang_pagetitle', $LANG_LINKS_ADMIN[28]);
$T->set_var('lang_link_list', $LANG_LINKS_ADMIN[53]);
$T->set_var('lang_new_link', $LANG_LINKS_ADMIN[51]);
diff -r 83d92f7701de -r cd05fcfc8ba3 public_html/admin/plugins/links/index.php
--- a/public_html/admin/plugins/links/index.php Wed Mar 16 17:58:24 2011 +0000
+++ b/public_html/admin/plugins/links/index.php Wed Mar 16 22:27:44 2011 -0400
@@ -94,12 +94,8 @@
More information about the geeklog-cvs
mailing list