[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

[Michael Jervis]

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv25857/system

Modified Files:
	lib-admin.php lib-comment.php lib-security.php lib-story.php 
Log Message:
Ensure every template class has site_url, site_admin_url, layout_url and xhtml variables set. My eyes, they bleed...

Index: lib-comment.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-comment.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** lib-comment.php	2 Jan 2008 13:00:46 -0000	1.62
--- lib-comment.php	20 Feb 2008 20:07:59 -0000	1.63
***************
*** 75,78 ****
--- 75,79 ----
      $commentbar->set_var( 'xhtml', XHTML );
      $commentbar->set_var( 'site_url', $_CONF['site_url'] );
+     $commentbar->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
      $commentbar->set_var( 'layout_url', $_CONF['layout_url'] );
  
***************
*** 225,228 ****
--- 226,230 ----
      $template->set_var( 'xhtml', XHTML );
      $template->set_var( 'site_url', $_CONF['site_url'] );
+     $template->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
      $template->set_var( 'layout_url', $_CONF['layout_url'] );
      $template->set_var( 'lang_authoredby', $LANG01[42] );
***************
*** 507,510 ****
--- 509,513 ----
      $template->set_var( 'xhtml', XHTML );
      $template->set_var( 'site_url', $_CONF['site_url'] );
+     $template->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
      $template->set_var( 'layout_url', $_CONF['layout_url'] );
      $template->set_var( 'commentbar',
***************
*** 648,651 ****
--- 651,655 ----
          $loginreq->set_var('login_message', $LANG_LOGIN[2]);
          $loginreq->set_var('site_url', $_CONF['site_url']);
+         $loginreq->set_var('site_admin_url', $_CONF['site_admin_url']);
          $loginreq->set_var('lang_login', $LANG_LOGIN[3]);
          $loginreq->set_var('lang_newuser', $LANG_LOGIN[4]);
***************
*** 723,726 ****
--- 727,731 ----
                  $start->set_var( 'xhtml', XHTML );
                  $start->set_var( 'site_url', $_CONF['site_url'] );
+                 $start->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
                  $start->set_var( 'layout_url', $_CONF['layout_url'] );
                  $start->set_var( 'hide_if_preview', 'style="display:none"' );
***************
*** 766,769 ****
--- 771,776 ----
              $comment_template->set_var( 'xhtml', XHTML );
              $comment_template->set_var('site_url', $_CONF['site_url']);
+             $comment_template->set_var('site_admin_url', $_CONF['site_admin_url']);
+             $comment_template->set_var('layout_url', $_CONF['layout_url']);
              $comment_template->set_var('start_block_postacomment', COM_startBlock($LANG03[1]));
              $comment_template->set_var('lang_username', $LANG03[5]);

Index: lib-story.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-story.php,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** lib-story.php	16 Feb 2008 22:18:14 -0000	1.122
--- lib-story.php	20 Feb 2008 20:07:59 -0000	1.123
***************
*** 100,103 ****
--- 100,104 ----
      $article->set_var( 'layout_url', $_CONF['layout_url'] );
      $article->set_var( 'site_url', $_CONF['site_url'] );
+     $article->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
      $article->set_var( 'site_name', $_CONF['site_name'] );
      $article->set_var( 'story_date', $story->DisplayElements('date') );

Index: lib-admin.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-admin.php,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** lib-admin.php	2 Jan 2008 12:35:58 -0000	1.126
--- lib-admin.php	20 Feb 2008 20:07:59 -0000	1.127
***************
*** 84,87 ****
--- 84,88 ----
      $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']);
      $admin_templates->set_var('form_url', $form_url);
***************
*** 273,276 ****
--- 274,278 ----
      $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']);
      $admin_templates->set_var('form_url', $form_url);
***************
*** 578,582 ****
      $admin_templates->set_var('menu_fields', $menu_fields);
      $admin_templates->set_var('lang_instructions', $text);
!     $admin_templates->set_var( 'xhtml', XHTML );
      $admin_templates->parse('top_menu', 'top_menu');
      $retval = $admin_templates->finish($admin_templates->get_var('top_menu'));
--- 580,587 ----
      $admin_templates->set_var('menu_fields', $menu_fields);
      $admin_templates->set_var('lang_instructions', $text);
!     $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']);
      $admin_templates->parse('top_menu', 'top_menu');
      $retval = $admin_templates->finish($admin_templates->get_var('top_menu'));

Index: lib-security.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-security.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** lib-security.php	17 Feb 2008 18:31:56 -0000	1.61
--- lib-security.php	20 Feb 2008 20:07:59 -0000	1.62
***************
*** 430,433 ****
--- 430,436 ----
  
      $perm_templates->set_var ( 'xhtml', XHTML );
+     $perm_templates->set_var ('site_url', $_CONF['site_url']);
+     $perm_templates->set_var ('site_admin_url', $_CONF['site_admin_url']);
+     $perm_templates->set_var ('layout_url', $_CONF['layout_url']);
      $perm_templates->set_var ('owner', $LANG_ACCESS['owner']);
      $perm_templates->set_var ('group', $LANG_ACCESS['group']);