[geeklog-cvs] geeklog-1.3/public_html/staticpages index.php,1.12,1.13

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/staticpages
In directory geeklog_prod:/tmp/cvs-serv21960/public_html/staticpages

Modified Files:
	index.php 
Log Message:
Oops, forgot to check this in ... More changes so that wrapping a page in a block can be set for each page individually.


Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/staticpages/index.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** index.php	7 Sep 2003 20:50:13 -0000	1.12
--- index.php	29 Dec 2003 13:21:45 -0000	1.13
***************
*** 63,67 ****
  if (!($error)) {
      $A = DB_fetchArray ($result);
!     $_CONF["pagetitle"] = stripslashes ($A['sp_title']);
      if ($A['sp_format'] == 'allblocks' OR $A['sp_format'] == 'leftblocks') {
          $retval .= COM_siteHeader ('menu');
--- 63,67 ----
  if (!($error)) {
      $A = DB_fetchArray ($result);
!     $_CONF['pagetitle'] = stripslashes ($A['sp_title']);
      if ($A['sp_format'] == 'allblocks' OR $A['sp_format'] == 'leftblocks') {
          $retval .= COM_siteHeader ('menu');
***************
*** 71,75 ****
          }
      }
!     if (($_SP_CONF['in_block'] == 1) && ($A['sp_format'] != 'blankpage')) {
          $retval .= COM_startBlock (stripslashes ($A['sp_title']));
      }
--- 71,75 ----
          }
      }
!     if (($A['sp_inblock'] == 1) && ($A['sp_format'] != 'blankpage')) {
          $retval .= COM_startBlock (stripslashes ($A['sp_title']));
      }
***************
*** 84,88 ****
          $retval .= '<p align="center"><br>' . $LANG_STATIC['lastupdated']
                  . ' ' . $curtime[0]; 
!         if (SEC_hasAccess ($A['owner_id'], $A['group_id'], $A['perm_owner'], $A['perm_group'], $A['perm_members'], $A['perm_anon']) == 3) {
              $retval .= '<br><a href="' . COM_buildURL ($_CONF['site_admin_url']
                      . '/plugins/staticpages/index.php?mode=edit&sp_id='
--- 84,90 ----
          $retval .= '<p align="center"><br>' . $LANG_STATIC['lastupdated']
                  . ' ' . $curtime[0]; 
!         if ((SEC_hasAccess ($A['owner_id'], $A['group_id'], $A['perm_owner'],
!                 $A['perm_group'], $A['perm_members'], $A['perm_anon']) == 3) &&
!                 SEC_hasRights ('staticpages.edit')) {
              $retval .= '<br><a href="' . COM_buildURL ($_CONF['site_admin_url']
                      . '/plugins/staticpages/index.php?mode=edit&sp_id='
***************
*** 92,96 ****
          $retval .= '</p>';
      }
!     if (($_SP_CONF['in_block'] == 1) && ($A['sp_format'] != 'blankpage')) {
          $retval .= COM_endBlock ();
      }
--- 94,98 ----
          $retval .= '</p>';
      }
!     if (($A['sp_inblock'] == 1) && ($A['sp_format'] != 'blankpage')) {
          $retval .= COM_endBlock ();
      }