[geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/staticpages index.php, 1.82, 1.83

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/staticpages
In directory qs1489.pair.com:/tmp/cvs-serv37487

Modified Files:
	index.php 
Log Message:
configurable target after save for static pages
comments for static pages

Index: index.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/staticpages/index.php,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** index.php	5 Aug 2007 08:05:08 -0000	1.82
--- index.php	9 Aug 2007 08:02:53 -0000	1.83
***************
*** 61,65 ****
  {
      global $_CONF, $_TABLES, $_USER, $_GROUPS, $_SP_CONF, $mode, $sp_id,
!            $LANG21, $LANG_STATIC, $LANG_ACCESS, $LANG_ADMIN, $LANG24,
             $LANG_postmodes, $MESSAGE;
  
--- 61,65 ----
  {
      global $_CONF, $_TABLES, $_USER, $_GROUPS, $_SP_CONF, $mode, $sp_id,
!            $LANG21, $LANG_STATIC, $LANG_ACCESS, $LANG_ADMIN, $LANG24, $LANG25,
             $LANG_postmodes, $MESSAGE;
  
***************
*** 133,136 ****
--- 133,143 ----
          }
          $sp_template->set_var('layout_url', $_CONF['layout_url']);
+         $sp_template->set_var('lang_mode', $LANG25[1]);
+         $sp_template->set_var(
+             'comment_options',
+             COM_optionList($_TABLES['commentcodes'],
+             'code,name',
+             $A['commentcode'])
+         );
  
          $sp_template->set_var('lang_accessrights', $LANG_ACCESS['accessrights']);
***************
*** 468,471 ****
--- 475,479 ----
  * @param sp_onmenu       string  Flag to place entry on menu
  * @param sp_label        string  Menu Entry
+ * @param commentcode     int     Comment Code
  * @param owner_id        int     Permission bits
  * @param group_id        int
***************
*** 484,488 ****
  */
  function submitstaticpage ($sp_id, $sp_uid, $sp_title, $sp_content, $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,
--- 492,496 ----
  */
  function submitstaticpage ($sp_id, $sp_uid, $sp_title, $sp_content, $sp_hits,
!                            $sp_format, $sp_onmenu, $sp_label, $commentcode, $owner_id,
                             $group_id, $perm_owner, $perm_group, $perm_members,
                             $perm_anon, $sp_php, $sp_nf, $sp_old_id,
***************
*** 572,578 ****
  
          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_centerblock,sp_help,sp_tid,sp_where,sp_inblock,postmode',
!                 "'$sp_id',$sp_uid,'$sp_title','$sp_content',NOW(),$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_centerblock,'$sp_help','$sp_tid',$sp_where,"
                  ."'$sp_inblock','$postmode'");
--- 580,586 ----
  
          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,commentcode,owner_id,group_id,'
                  .'perm_owner,perm_group,perm_members,perm_anon,sp_php,sp_nf,sp_centerblock,sp_help,sp_tid,sp_where,sp_inblock,postmode',
!                 "'$sp_id',$sp_uid,'$sp_title','$sp_content',NOW(),$sp_hits,'$sp_format',$sp_onmenu,'$sp_label',$commentcode,$owner_id,$group_id,"
                  ."$perm_owner,$perm_group,$perm_members,$perm_anon,'$sp_php','$sp_nf',$sp_centerblock,'$sp_help','$sp_tid',$sp_where,"
                  ."'$sp_inblock','$postmode'");
***************
*** 580,585 ****
              DB_delete ($_TABLES['staticpage'], 'sp_id', $sp_old_id);
          }
!         echo COM_refresh ($_CONF['site_admin_url']
!                           . '/plugins/staticpages/index.php');
      } else {
          $retval .= COM_siteHeader ('menu', $LANG_STATIC['staticpageeditor']);
--- 588,597 ----
              DB_delete ($_TABLES['staticpage'], 'sp_id', $sp_old_id);
          }
! 
!         echo PLG_afterSaveSwitch (
!             $_SP_CONF['aftersave'],
!             COM_buildURL ("{$_CONF['site_url']}/staticpages/index.php?page=$sp_id"),
!             'staticpages'
!         );
      } else {
          $retval .= COM_siteHeader ('menu', $LANG_STATIC['staticpageeditor']);
***************
*** 654,658 ****
              $_POST['sp_content'], COM_applyFilter ($_POST['sp_hits'], true),
              COM_applyFilter ($_POST['sp_format']), $_POST['sp_onmenu'],
!             $_POST['sp_label'], COM_applyFilter ($_POST['owner_id'], true),
              COM_applyFilter ($_POST['group_id'], true), $_POST['perm_owner'],
              $_POST['perm_group'], $_POST['perm_members'], $_POST['perm_anon'],
--- 666,671 ----
              $_POST['sp_content'], COM_applyFilter ($_POST['sp_hits'], true),
              COM_applyFilter ($_POST['sp_format']), $_POST['sp_onmenu'],
!             $_POST['sp_label'], COM_applyFilter ($_POST['commentcode'], true),
!             COM_applyFilter ($_POST['owner_id'], true),
              COM_applyFilter ($_POST['group_id'], true), $_POST['perm_owner'],
              $_POST['perm_group'], $_POST['perm_members'], $_POST['perm_anon'],