[geeklog-cvs] geeklog-1.3/public_html/staticpages index.php,1.19,1.20

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html/staticpages
In directory www:/tmp/cvs-serv30101/public_html/staticpages

Modified Files:
	index.php 
Log Message:
Allow static page block templates to be overridden.


Index: index.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/staticpages/index.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** index.php	24 Jul 2004 13:19:53 -0000	1.19
--- index.php	2 Aug 2004 18:38:52 -0000	1.20
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Static Page Geeklog Plugin 1.4                                            |
  // +---------------------------------------------------------------------------+
  // | index.php                                                                 |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Static Page Geeklog Plugin 1.4.1                                          |
  // +---------------------------------------------------------------------------+
  // | index.php                                                                 |
***************
*** 98,102 ****
      }
      if (($A['sp_inblock'] == 1) && ($A['sp_format'] != 'blankpage')) {
!         $retval .= COM_startBlock (stripslashes ($A['sp_title']));
      }
  
--- 98,103 ----
      }
      if (($A['sp_inblock'] == 1) && ($A['sp_format'] != 'blankpage')) {
!         $retval .= COM_startBlock (stripslashes ($A['sp_title']), '',
!                         COM_getBlockTemplate ('_staticpages_block', 'header'));
      }
  
***************
*** 123,127 ****
      }
      if (($A['sp_inblock'] == 1) && ($A['sp_format'] != 'blankpage')) {
!         $retval .= COM_endBlock ();
      }
  
--- 124,129 ----
      }
      if (($A['sp_inblock'] == 1) && ($A['sp_format'] != 'blankpage')) {
!         $retval .= COM_endBlock (COM_getBlockTemplate ('_staticpages_block',
!                                                        'footer'));
      }
  
***************
*** 224,228 ****
      if ($failflg) {
          $retval = COM_siteHeader ('menu');
!         $retval .= COM_startBlock ($LANG_LOGIN[1]);
          $login = new Template ($_CONF['path_layout'] . 'submit');
          $login->set_file (array ('login' => 'submitloginrequired.thtml'));
--- 226,231 ----
      if ($failflg) {
          $retval = COM_siteHeader ('menu');
!         $retval .= COM_startBlock ($LANG_LOGIN[1], '',
!                             COM_getBlockTemplate ('_msg_block', 'header'));
          $login = new Template ($_CONF['path_layout'] . 'submit');
          $login->set_file (array ('login' => 'submitloginrequired.thtml'));
***************
*** 233,243 ****
          $login->parse ('output', 'login');
          $retval .= $login->finish ($login->get_var ('output'));
!         $retval .= COM_endBlock ();
          $retval .= COM_siteFooter (true);
      } else {
          $retval = COM_siteHeader ('menu');
! 	    $retval .= COM_startBlock ($LANG_ACCESS['accessdenied']);
      	$retval .= $LANG_STATIC['deny_msg'];
! 	    $retval .= COM_endBlock ();
      	$retval .= COM_siteFooter (true);
      }
--- 236,247 ----
          $login->parse ('output', 'login');
          $retval .= $login->finish ($login->get_var ('output'));
!         $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
          $retval .= COM_siteFooter (true);
      } else {
          $retval = COM_siteHeader ('menu');
! 	    $retval .= COM_startBlock ($LANG_ACCESS['accessdenied'], '',
!                             COM_getBlockTemplate ('_msg_block', 'header'));
      	$retval .= $LANG_STATIC['deny_msg'];
! 	    $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
      	$retval .= COM_siteFooter (true);
      }