[geeklog-cvs] geeklog-1.3/public_html/admin/plugins/staticpages index.php,1.16,1.17

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin/plugins/staticpages
In directory internal.geeklog.net:/tmp/cvs-serv449/public_html/admin/plugins/staticpages

Modified Files:
	index.php 
Log Message:
Fixed problem that could delete all your static pages when saving a new one ...


Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/plugins/staticpages/index.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** index.php	10 Mar 2003 10:50:00 -0000	1.16
--- index.php	10 Mar 2003 15:53:44 -0000	1.17
***************
*** 342,346 ****
  function submitstaticpage ($sp_id, $sp_uid, $sp_title, $sp_content, $unixdate, $sp_hits, $sp_format, $sp_onmenu, $sp_label, $owner_id, $group_id, $perm_owner, $perm_group, $perm_members, $perm_anon, $sp_php, $sp_nf, $sp_old_id)
  {
! 	global $_CONF, $LANG12, $LANG_STATIC, $_SP_CONF, $_TABLES;
  
      $sp_id = str_replace (' ', '', $sp_id);
--- 342,346 ----
  function submitstaticpage ($sp_id, $sp_uid, $sp_title, $sp_content, $unixdate, $sp_hits, $sp_format, $sp_onmenu, $sp_label, $owner_id, $group_id, $perm_owner, $perm_group, $perm_members, $perm_anon, $sp_php, $sp_nf, $sp_old_id)
  {
!     global $_CONF, $LANG12, $LANG_STATIC, $_SP_CONF, $_TABLES;
  
      $sp_id = str_replace (' ', '', $sp_id);
***************
*** 357,362 ****
              $duplicate_id = true;
          }
!     } else {
!         $delete_old_page = true;
      }
  
--- 357,364 ----
              $duplicate_id = true;
          }
!     } elseif (!empty ($sp_old_id)) {
!         if ($sp_id != $sp_old_id) {
!             $delete_old_page = true;
!         }
      }
  
***************
*** 368,374 ****
          echo $retval;
      } elseif (!empty ($sp_title) && !empty ($sp_content)) {
! 		$date = date ("Y-m-d H:i:s", $unixdate);
  
! 		if (empty ($sp_hits)) $sp_hits = 0;
  
          if ($sp_onmenu== 'on') {
--- 370,376 ----
          echo $retval;
      } elseif (!empty ($sp_title) && !empty ($sp_content)) {
!         $date = date ("Y-m-d H:i:s", $unixdate);
  
!         if (empty ($sp_hits)) $sp_hits = 0;
  
          if ($sp_onmenu== 'on') {
***************
*** 378,382 ****
          }
  
! 		// Clean up the text
          if ($_SP_CONF['censor'] == 1) {
              $sp_content = COM_checkWords ($sp_content); 
--- 380,384 ----
          }
  
!         // Clean up the text
          if ($_SP_CONF['censor'] == 1) {
              $sp_content = COM_checkWords ($sp_content); 
***************
*** 399,408 ****
          list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
  		DB_save ($_TABLES['staticpage'], 'sp_id,sp_uid,sp_title,sp_content,sp_date,sp_hits,sp_format,sp_onmenu,sp_label,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon,sp_php,sp_nf', "'$sp_id',$sp_uid,'$sp_title','$sp_content','$date',$sp_hits,'$sp_format',$sp_onmenu,'$sp_label',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,'$sp_php','$sp_nf'");
!         if ($delete_old_page) {
              DB_delete ($_TABLES['staticpage'], 'sp_id', $sp_old_id);
          }
          echo COM_refresh ($_CONF['site_admin_url']
                            . '/plugins/staticpages/index.php');
! 	} else {
          $retval .= COM_siteHeader ();
          $retval .= COM_errorLog ($LANG_STATIC['no_title_or_content'], 2);
--- 401,410 ----
          list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
  		DB_save ($_TABLES['staticpage'], 'sp_id,sp_uid,sp_title,sp_content,sp_date,sp_hits,sp_format,sp_onmenu,sp_label,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon,sp_php,sp_nf', "'$sp_id',$sp_uid,'$sp_title','$sp_content','$date',$sp_hits,'$sp_format',$sp_onmenu,'$sp_label',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,'$sp_php','$sp_nf'");
!         if ($delete_old_page && !empty ($sp_old_id)) {
              DB_delete ($_TABLES['staticpage'], 'sp_id', $sp_old_id);
          }
          echo COM_refresh ($_CONF['site_admin_url']
                            . '/plugins/staticpages/index.php');
!     } else {
          $retval .= COM_siteHeader ();
          $retval .= COM_errorLog ($LANG_STATIC['no_title_or_content'], 2);
***************
*** 410,414 ****
          $retval .= COM_siteFooter ();
          echo $retval;
! 	}
  }
  
--- 412,416 ----
          $retval .= COM_siteFooter ();
          echo $retval;
!     }
  }