[geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.122,1.123 topic.php,1.43,1.44

[blaine at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv26876/public_html/admin

Modified Files:
	story.php topic.php 
Log Message:
Package of changes to support the Story Archive Feature.

Index: story.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** story.php	31 Jul 2004 13:19:06 -0000	1.122
--- story.php	1 Aug 2004 21:37:50 -0000	1.123
***************
*** 384,389 ****
          $story_templates->set_var('is_checked4', 'checked="checked"');
      } else {
!         $story_templates->set_var('archivedisabled', 'disabled');
      }
      $story_templates->set_var('lang_title', $LANG24[13]);
      if ($A['postmode'] == 'plaintext') {
--- 384,394 ----
          $story_templates->set_var('is_checked4', 'checked="checked"');
      } else {
!         $story_templates->set_var('showarchivedisabled', true);
      }
+     $story_templates->set_var('lang_archivetitle', $LANG24[58]);
+     $story_templates->set_var('lang_option', $LANG24[59]);
+     $story_templates->set_var('lang_enabled', $LANG24[60]);
+     $story_templates->set_var('lang_optionarchive', $LANG24[61]);
+     $story_templates->set_var('lang_optiondelete', $LANG24[62]);
      $story_templates->set_var('lang_title', $LANG24[13]);
      if ($A['postmode'] == 'plaintext') {

Index: topic.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/topic.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** topic.php	13 Jul 2004 20:48:21 -0000	1.43
--- topic.php	1 Aug 2004 21:37:50 -0000	1.44
***************
*** 170,173 ****
--- 170,185 ----
      }
  
+     $topic_templates->set_var ('lang_archivetopic', $LANG27[25]);
+     $topic_templates->set_var ('lang_archivetext', $LANG27[26]);
+     $topic_templates->set_var ('archive_disabled', '');
+     if ($A['archive_flag'] == 1) {
+         $topic_templates->set_var ('archive_checked', 'checked="checked"');
+     } else {
+         $topic_templates->set_var ('archive_checked', '');
+         // Only 1 topic can be the archive topic - so check if there already is one
+         if (DB_count($_TABLES['topics'],'archive_flag', '1') > 0) {
+             $topic_templates->set_var ('archive_disabled', 'disabled');
+         }
+     }
      $topic_templates->parse('output', 'editor');
      $retval .= $topic_templates->finish($topic_templates->get_var('output'));
***************
*** 194,198 ****
  * @return   string                  HTML redirect or error message
  */
! function savetopic($tid,$topic,$imageurl,$sortnum,$limitnews,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$is_default)
  {
      global $_CONF, $_TABLES, $LANG27, $MESSAGE;
--- 206,210 ----
  * @return   string                  HTML redirect or error message
  */
! function savetopic($tid,$topic,$imageurl,$sortnum,$limitnews,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$is_default,$is_archive)
  {
      global $_CONF, $_TABLES, $LANG27, $MESSAGE;
***************
*** 237,242 ****
              $is_default = 0;
          }
  
!         DB_save($_TABLES['topics'],'tid, topic, imageurl, sortnum, limitnews, is_default, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon',"'$tid', '$topic', '$imageurl','$sortnum','$limitnews',$is_default,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon");
          $retval = COM_refresh ($_CONF['site_admin_url'] . '/topic.php?msg=13');
      } else {
--- 249,258 ----
              $is_default = 0;
          }
+         // Only 1 topic can be the archive topic - so check if there already is one
+         if (DB_count($_TABLES['topics'],'archive_flag', '1') > 0) {
+             $is_archive = 0;
+         }
  
!         DB_save($_TABLES['topics'],'tid, topic, imageurl, sortnum, limitnews, is_default, archive_flag, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon',"'$tid', '$topic', '$imageurl','$sortnum','$limitnews',$is_default,'$is_archive',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon");
          $retval = COM_refresh ($_CONF['site_admin_url'] . '/topic.php?msg=13');
      } else {
***************
*** 396,400 ****
                             $HTTP_POST_VARS['perm_members'],
                             $HTTP_POST_VARS['perm_anon'],
!                            $HTTP_POST_VARS['is_default']);
  } else if ($mode == 'edit') {
      $display .= COM_siteHeader('menu');
--- 412,417 ----
                             $HTTP_POST_VARS['perm_members'],
                             $HTTP_POST_VARS['perm_anon'],
!                            $HTTP_POST_VARS['is_default'],
!                            $HTTP_POST_VARS['is_archive']);
  } else if ($mode == 'edit') {
      $display .= COM_siteHeader('menu');