[geeklog-cvs] Geeklog-1.x/public_html article.php, 1.94, 1.95 index.php, 1.97, 1.98 lib-common.php, 1.679, 1.680 pdfgenerator.php, 1.12, 1.13 profiles.php, 1.53, 1.54 stats.php, 1.52, 1.53 submit.php, 1.120, 1.121 users.php, 1.162, 1.163 usersettings.php, 1.169, 1.170
Michael Jervis
mjervis at qs1489.pair.com
Wed Feb 20 15:08:01 EST 2008
- Previous message (by thread): [geeklog-cvs] Geeklog-1.x/system/classes navbar.class.php, 1.4, 1.5 search.class.php, 1.64, 1.65
- Next message (by thread): [geeklog-cvs] Geeklog-1.x/system lib-admin.php, 1.126, 1.127 lib-comment.php, 1.62, 1.63 lib-security.php, 1.61, 1.62 lib-story.php, 1.122, 1.123
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv25857/public_html
Modified Files:
article.php index.php lib-common.php pdfgenerator.php
profiles.php stats.php submit.php users.php usersettings.php
Log Message:
Ensure every template class has site_url, site_admin_url, layout_url and xhtml variables set. My eyes, they bleed...
Index: submit.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/submit.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** submit.php 29 Dec 2007 15:47:42 -0000 1.120
--- submit.php 20 Feb 2008 20:07:58 -0000 1.121
***************
*** 81,87 ****
$loginreq->set_file('loginreq', 'submitloginrequired.thtml');
$loginreq->set_var( 'xhtml', XHTML );
- $loginreq->set_var('login_message', $LANG_LOGIN[2]);
$loginreq->set_var('site_url', $_CONF['site_url']);
$loginreq->set_var('layout_url', $_CONF['layout_url']);
$loginreq->set_var('lang_login', $LANG_LOGIN[3]);
$loginreq->set_var('lang_newuser', $LANG_LOGIN[4]);
--- 81,88 ----
$loginreq->set_file('loginreq', 'submitloginrequired.thtml');
$loginreq->set_var( 'xhtml', XHTML );
$loginreq->set_var('site_url', $_CONF['site_url']);
+ $loginreq->set_var('site_admin_url', $_CONF['site_admin_url']);
$loginreq->set_var('layout_url', $_CONF['layout_url']);
+ $loginreq->set_var('login_message', $LANG_LOGIN[2]);
$loginreq->set_var('lang_login', $LANG_LOGIN[3]);
$loginreq->set_var('lang_newuser', $LANG_LOGIN[4]);
***************
*** 163,166 ****
--- 164,168 ----
$storyform->set_var ( 'xhtml', XHTML );
$storyform->set_var ('site_url', $_CONF['site_url']);
+ $storyform->set_var ('site_admin_url', $_CONF['site_admin_url']);
$storyform->set_var ('layout_url', $_CONF['layout_url']);
$storyform->set_var ('lang_username', $LANG12[27]);
Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/index.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** index.php 25 Nov 2007 08:11:08 -0000 1.97
--- index.php 20 Feb 2008 20:07:58 -0000 1.98
***************
*** 163,166 ****
--- 163,169 ----
$topspan->set_file (array ('topspan'=>'topcenterblock-span.thtml'));
$topspan->set_var( 'xhtml', XHTML );
+ $topspan->set_var( 'site_url', $_CONF['site_url'] );
+ $topspan->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
+ $topspan->set_var( 'layout_url', $_CONF['layout_url'] );
$topspan->parse ('output', 'topspan');
$display .= $topspan->finish ($topspan->get_var('output'));
Index: pdfgenerator.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/pdfgenerator.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** pdfgenerator.php 25 Nov 2007 06:55:07 -0000 1.12
--- pdfgenerator.php 20 Feb 2008 20:07:58 -0000 1.13
***************
*** 202,205 ****
--- 202,206 ----
$pdf->set_var('layout_url', $_CONF['layout_url']);
$pdf->set_var('site_url', $_CONF['site_url']);
+ $pdf->set_var('site_admin_url', $_CONF['site_admin_url']);
$pdf->set_var('lang_loading_document', $LANG_PDF[5]);
$pdf->set_var('lang_please_wait', $LANG_PDF[6]);
***************
*** 228,231 ****
--- 229,233 ----
$pdf->set_var('layout_url', $_CONF['layout_url']);
$pdf->set_var('site_url', $_CONF['site_url']);
+ $pdf->set_var('site_admin_url', $_CONF['site_admin_url']);
$pdf->set_var('lang_error_msg', $LANG_PDF[4]);
$pdf->set_var('lang_pdf_generator', $LANG_PDF[9]);
Index: users.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/users.php,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** users.php 16 Feb 2008 21:24:28 -0000 1.162
--- users.php 20 Feb 2008 20:07:59 -0000 1.163
***************
*** 82,85 ****
--- 82,87 ----
$login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('site_url', $_CONF['site_url']);
+ $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
+ $login->set_var ('layout_url', $_CONF['layout_url']);
$login->set_var ('lang_login', $LANG_LOGIN[3]);
$login->set_var ('lang_newuser', $LANG_LOGIN[4]);
***************
*** 691,694 ****
--- 693,698 ----
$user_templates->set_var( 'xhtml', XHTML );
$user_templates->set_var('site_url', $_CONF['site_url']);
+ $user_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
+ $user_templates->set_var('layout_url', $_CONF['layout_url']);
$user_templates->set_var('start_block', COM_startBlock($LANG04[22]));
$user_templates->set_var('lang_instructions', $LANG04[23]);
***************
*** 742,745 ****
--- 746,751 ----
$user_templates->set_var( 'xhtml', XHTML );
$user_templates->set_var('site_url', $_CONF['site_url']);
+ $user_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
+ $user_templates->set_var('layout_url', $_CONF['layout_url']);
$user_templates->set_var('start_block_forgetpassword', COM_startBlock($LANG04[25]));
$user_templates->set_var('lang_instructions', $LANG04[26]);
Index: profiles.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/profiles.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** profiles.php 25 Nov 2007 06:55:07 -0000 1.53
--- profiles.php 20 Feb 2008 20:07:58 -0000 1.54
***************
*** 168,173 ****
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
$login->set_var ( 'xhtml', XHTML );
- $login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('site_url', $_CONF['site_url']);
$login->set_var ('lang_login', $LANG_LOGIN[3]);
$login->set_var ('lang_newuser', $LANG_LOGIN[4]);
--- 168,175 ----
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
$login->set_var ( 'xhtml', XHTML );
$login->set_var ('site_url', $_CONF['site_url']);
+ $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
+ $login->set_var ('layout_url', $_CONF['layout_url']);
+ $login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('lang_login', $LANG_LOGIN[3]);
$login->set_var ('lang_newuser', $LANG_LOGIN[4]);
***************
*** 361,366 ****
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
$login->set_var ( 'xhtml', XHTML );
- $login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('site_url', $_CONF['site_url']);
$login->set_var ('lang_login', $LANG_LOGIN[3]);
$login->set_var ('lang_newuser', $LANG_LOGIN[4]);
--- 363,370 ----
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
$login->set_var ( 'xhtml', XHTML );
$login->set_var ('site_url', $_CONF['site_url']);
+ $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
+ $login->set_var ('layout_url', $_CONF['layout_url']);
+ $login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('lang_login', $LANG_LOGIN[3]);
$login->set_var ('lang_newuser', $LANG_LOGIN[4]);
***************
*** 389,392 ****
--- 393,398 ----
$mail_template->set_var( 'xhtml', XHTML );
$mail_template->set_var('site_url', $_CONF['site_url']);
+ $mail_template->set_var('site_admin_url', $_CONF['site_admin_url']);
+ $mail_template->set_var('layout_url', $_CONF['layout_url']);
$mail_template->set_var('start_block_mailstory2friend', COM_startBlock($LANG08[17]));
$mail_template->set_var('lang_fromname', $LANG08[20]);
Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.679
retrieving revision 1.680
diff -C2 -d -r1.679 -r1.680
*** lib-common.php 19 Feb 2008 17:46:07 -0000 1.679
--- lib-common.php 20 Feb 2008 20:07:58 -0000 1.680
***************
*** 1028,1031 ****
--- 1028,1032 ----
. '/images/bg.' . $_IMAGE_TYPE );
$header->set_var( 'site_url', $_CONF['site_url'] );
+ $header->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
$header->set_var( 'layout_url', $_CONF['layout_url'] );
$header->set_var( 'site_mail', "mailto:{$_CONF['site_mail']}" );
***************
*** 1300,1303 ****
--- 1301,1305 ----
$footer->set_var( 'xhtml', XHTML );
$footer->set_var( 'site_url', $_CONF['site_url']);
+ $footer->set_var( 'site_admin_url', $_CONF['site_admin_url']);
$footer->set_var( 'layout_url',$_CONF['layout_url']);
$footer->set_var( 'site_mail', "mailto:{$_CONF['site_mail']}" );
***************
*** 1478,1481 ****
--- 1480,1484 ----
$block->set_var( 'xhtml', XHTML );
$block->set_var( 'site_url', $_CONF['site_url'] );
+ $block->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
$block->set_var( 'layout_url', $_CONF['layout_url'] );
$block->set_var( 'block_title', stripslashes( $title ));
***************
*** 1540,1543 ****
--- 1543,1547 ----
$block->set_var( 'xhtml', XHTML );
$block->set_var( 'site_url', $_CONF['site_url'] );
+ $block->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
$block->set_var( 'layout_url', $_CONF['layout_url'] );
$block->parse( 'endHTML', 'block' );
***************
*** 2106,2109 ****
--- 2110,2114 ----
$sections->set_var( 'xhtml', XHTML );
$sections->set_var( 'site_url', $_CONF['site_url'] );
+ $sections->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
$sections->set_var( 'layout_url', $_CONF['layout_url'] );
$sections->set_var( 'block_name', str_replace( '_', '-', 'section_block' ));
***************
*** 2256,2259 ****
--- 2261,2265 ----
$usermenu->set_var( 'xhtml', XHTML );
$usermenu->set_var( 'site_url', $_CONF['site_url'] );
+ $usermenu->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
$usermenu->set_var( 'layout_url', $_CONF['layout_url'] );
$usermenu->set_var( 'block_name', str_replace( '_', '-', 'user_block' ));
***************
*** 2334,2337 ****
--- 2340,2344 ----
$login->set_var( 'xhtml', XHTML );
$login->set_var( 'site_url', $_CONF['site_url'] );
+ $login->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
$login->set_var( 'layout_url', $_CONF['layout_url'] );
$login->set_var( 'lang_username', $LANG01[21] );
***************
*** 2446,2449 ****
--- 2453,2457 ----
$adminmenu->set_var( 'xhtml', XHTML );
$adminmenu->set_var( 'site_url', $_CONF['site_url'] );
+ $adminmenu->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
$adminmenu->set_var( 'layout_url', $_CONF['layout_url'] );
$adminmenu->set_var( 'block_name', str_replace( '_', '-', 'admin_block' ));
***************
*** 5028,5031 ****
--- 5036,5040 ----
$list->set_var( 'xhtml', XHTML );
$list->set_var('site_url', $_CONF['site_url']);
+ $list->set_var('site_admin_url', $_CONF['site_admin_url']);
$list->set_var('layout_url', $_CONF['layout_url']);
Index: usersettings.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/usersettings.php,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -d -r1.169 -r1.170
*** usersettings.php 16 Feb 2008 11:40:04 -0000 1.169
--- usersettings.php 20 Feb 2008 20:07:59 -0000 1.170
***************
*** 1088,1091 ****
--- 1088,1093 ----
$login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('site_url', $_CONF['site_url']);
+ $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
+ $login->set_var ('layout_url', $_CONF['layout_url']);
$login->set_var ('lang_login', $LANG_LOGIN[3]);
$login->set_var ('lang_newuser', $LANG_LOGIN[4]);
Index: stats.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/stats.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** stats.php 25 Nov 2007 06:55:07 -0000 1.52
--- stats.php 20 Feb 2008 20:07:58 -0000 1.53
***************
*** 48,53 ****
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
$login->set_var ( 'xhtml', XHTML );
- $login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('site_url', $_CONF['site_url']);
$login->set_var ('lang_login', $LANG_LOGIN[3]);
$login->set_var ('lang_newuser', $LANG_LOGIN[4]);
--- 48,55 ----
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
$login->set_var ( 'xhtml', XHTML );
$login->set_var ('site_url', $_CONF['site_url']);
+ $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
+ $login->set_var ('layout_url', $_CONF['layout_url']);
+ $login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('lang_login', $LANG_LOGIN[3]);
$login->set_var ('lang_newuser', $LANG_LOGIN[4]);
Index: article.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/article.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** article.php 25 Nov 2007 06:55:07 -0000 1.94
--- article.php 20 Feb 2008 20:07:58 -0000 1.95
***************
*** 265,268 ****
--- 265,269 ----
$story_template->set_var( 'xhtml', XHTML );
$story_template->set_var('site_url', $_CONF['site_url']);
+ $story_template->set_var('site_admin_url', $_CONF['site_admin_url']);
$story_template->set_var('layout_url', $_CONF['layout_url']);
$story_template->set_var('story_id', $story->getSid());
- Previous message (by thread): [geeklog-cvs] Geeklog-1.x/system/classes navbar.class.php, 1.4, 1.5 search.class.php, 1.64, 1.65
- Next message (by thread): [geeklog-cvs] Geeklog-1.x/system lib-admin.php, 1.126, 1.127 lib-comment.php, 1.62, 1.63 lib-security.php, 1.61, 1.62 lib-story.php, 1.122, 1.123
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the geeklog-cvs
mailing list