From dhaun at geeklog.net  Sat Mar  1 11:40:28 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 1 Mar 2003 10:40:28 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.203,1.204 search.php,1.49,1.50
Message-ID: <200303011640.h21GeSi25055@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv25007

Modified Files:
	lib-common.php search.php 
Log Message:
Fixed incorrect error message when following the "more by ..." links from article.php and search was blocked for anonymous users. Also changed COM_whatsRelated to not display those links in this case (bug #671000).


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.203
retrieving revision 1.204
diff -C2 -d -r1.203 -r1.204
*** lib-common.php	24 Feb 2003 15:40:06 -0000	1.203
--- lib-common.php	1 Mar 2003 16:40:25 -0000	1.204
***************
*** 4650,4665 ****
      $rel = COM_extractLinks( $fulltext );
  
!     // add a link to "search by author"
!     if( $_CONF["contributedbyline"] == 1 )
      {
!         $author = DB_getItem( $_TABLES['users'], 'username', "uid = $uid" );
!         $rel[] = "<a href=\"{$_CONF['site_url']}/search.php?mode=search&amp;type=stories&amp;author=$uid\">{$LANG24[37]} $author</a>";
!     }
  
!     // add a link to "search by topic"
!     $topic = DB_getItem( $_TABLES['topics'], 'topic', "tid = '$tid'" );
!     $rel[] = "<a href=\"{$_CONF['site_url']}/search.php?mode=search&amp;type=stories&amp;topic=$tid\">{$LANG24[38]} $topic</a>";
  
!     $related = COM_checkHTML( COM_checkWords( COM_makeList( $rel )));
  
      return( $related );
--- 4650,4672 ----
      $rel = COM_extractLinks( $fulltext );
  
!     if( !empty( $_USER['username'] ) || (( $_CONF['loginrequired'] == 0 ) &&
!            ( $_CONF['searchloginrequired'] == 0 ))) {
!         // add a link to "search by author"
!         if( $_CONF["contributedbyline"] == 1 )
      {
!             $author = DB_getItem( $_TABLES['users'], 'username', "uid = $uid" );
!             $rel[] = "<a href=\"{$_CONF['site_url']}/search.php?mode=search&amp;type=stories&amp;author=$uid\">{$LANG24[37]} $author</a>";
!         }
  
!         // add a link to "search by topic"
!         $topic = DB_getItem( $_TABLES['topics'], 'topic', "tid = '$tid'" );
!         $rel[] = "<a href=\"{$_CONF['site_url']}/search.php?mode=search&amp;type=stories&amp;topic=$tid\">{$LANG24[38]} $topic</a>";
!     }
  
!     $related = '';
!     if( sizeof( $rel ) > 0 )
!     {
!         $related = COM_checkHTML( COM_checkWords( COM_makeList( $rel )));
!     }
  
      return( $related );

Index: search.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/search.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** search.php	9 Feb 2003 21:27:01 -0000	1.49
--- search.php	1 Mar 2003 16:40:25 -0000	1.50
***************
*** 1100,1113 ****
          $query = strip_tags ($query);
  
!         if (!advsearchAllowed ($query)) {
!             // if advanced search is not allowed for the current user
!             // then just ignore the advanced options
!             $type = 'all';
!             unset ($datestart);
!             unset ($dateend);
!             unset ($author);
!             unset ($topic);
          }
! 
          // check for minimal length of the query
          if ((strlen ($query) < 3) && (empty ($topic) || ($topic == '0')) &&
--- 1100,1112 ----
          $query = strip_tags ($query);
  
!         // check for an advanced search
!         if (!advsearchAllowed ($query) && (($type != 'all') ||
!                 (isset ($datestart) && !empty ($datestart)) ||
!                 (isset ($dateend) && !empty ($dateend)) ||
!                 (isset ($author) && ($author > 0)) ||   
!                 (isset ($topic) && !empty ($topic)))) {
!             $display .= loginRequired ();
          }
!         else
          // check for minimal length of the query
          if ((strlen ($query) < 3) && (empty ($topic) || ($topic == '0')) &&




From dhaun at geeklog.net  Wed Mar  5 09:24:51 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Wed, 5 Mar 2003 08:24:51 -0600
Subject: [geeklog-cvs] geeklog-1.3/language slovenian.php,NONE,1.1
Message-ID: <200303051424.h25EOpi21301@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory internal.geeklog.net:/tmp/cvs-serv21285

Added Files:
	slovenian.php 
Log Message:
Slovenian language file, provided by gape


--- NEW FILE: slovenian.php ---
<?php

###############################################################################
# english.php
# This is the english language page for GeekLog!
# Special thanks to Mischa Polivanov for his work on this project
#
# Copyright (C) 2000 Jason Whittenburg
# jwhitten at securitygeeks.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
[...1084 lines suppressed...]
    7 => "Statistika strani",
    8 => "Osebne nastavitve",
    9 => "I??i",
    10 => "Napredno iskanje"
);

$LANG_404 = array(
    1 => "404 Error",
    2 => "Gee, I've looked everywhere but I can not find <b>http://{$HTTP_SERVER_VARS["HTTP_HOST"]}{$HTTP_SERVER_VARS["REQUEST_URI"]}</b>.",
    3 => "<p>We're sorry, but the file you have requested does not exist. Please feel free to check the <a href=\"{$_CONF['site_url']}\">main page</a> or the <a href=\"{$_CONF['site_url']}/search.php\">search page</a> to see if you can find what you lost."
);

$LANG_LOGIN = array (
    1 => 'Login required',
    2 => 'Sorry, to access this area you need to be logged in as a user.',
    3 => 'Login',
    4 => 'New User'
);

?>




From dhaun at geeklog.net  Wed Mar  5 09:25:52 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Wed, 5 Mar 2003 08:25:52 -0600
Subject: [geeklog-cvs] geeklog-1.3/language slovak.php,NONE,1.1
Message-ID: <200303051425.h25EPqi21356@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory internal.geeklog.net:/tmp/cvs-serv21337

Added Files:
	slovak.php 
Log Message:
Slovak language file, provided by Rado


--- NEW FILE: slovak.php ---
<?php

###############################################################################
# english.php
# This is the english language page for GeekLog!
# Special thanks to Mischa Polivanov for his work on this project
#
# Copyright (C) 2000 Jason Whittenburg
# jwhitten at securitygeeks.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
[...1078 lines suppressed...]
    7 => "?tatistiky sajty",
    8 => "Prisp?sobenie",
    9 => "H?adaj",
    10 => "Fajnov? vyh?ad?vanie"
);

$LANG_404 = array(
    1 => "404 Error",
    2 => "Gee, I've looked everywhere but I can not find <b>http://{$HTTP_SERVER_VARS["HTTP_HOST"]}{$HTTP_SERVER_VARS["REQUEST_URI"]}</b>.",
    3 => "<p>We're sorry, but the file you have requested does not exist. Please feel free to check the <a href=\"{$_CONF['site_url']}\">main page</a> or the <a href=\"{$_CONF['site_url']}/search.php\">search page</a> to see if you can find what you lost."
);

$LANG_LOGIN = array (
    1 => 'Login required',
    2 => 'Sorry, to access this area you need to be logged in as a user.',
    3 => 'Login',
    4 => 'New User'
);

?>




From dhaun at geeklog.net  Wed Mar  5 09:26:55 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Wed, 5 Mar 2003 08:26:55 -0600
Subject: [geeklog-cvs] geeklog-1.3/language romanian.php,NONE,1.1
Message-ID: <200303051426.h25EQti21411@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory internal.geeklog.net:/tmp/cvs-serv21384

Added Files:
	romanian.php 
Log Message:
Romanian language file, provided by Dan Gheorghitza


--- NEW FILE: romanian.php ---
<?php

###############################################################################
# romanian.php 
# This is the romanian language page for GeekLog!
#
# Copyright (C) 2003 dan gheorghitza
# dangk12 at yahoo.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
[...1075 lines suppressed...]
    7 => "Statistici",
    8 => "Personalizeaza",
    9 => "Cauta",
    10 => "cautare avansata"
);

$LANG_404 = array(
    1 => "Eroare 404",
    2 => "Oh, nu! Ne-am uitat peste tot, dar n-am gasit <b>http://{$HTTP_SERVER_VARS["HTTP_HOST"]}{$HTTP_SERVER_VARS["REQUEST_URI"]}</b>.",
    3 => "<p>Ne pare rau, dar pagina care o cautati nu exista. Va rugam, verificati <a href=\"{$_CONF['site_url']}\">pagina principala</a> sau <a href=\"{$_CONF['site_url']}/search.php\">pagina de cautare</a> sa vedeti daca gasiti ceea ce cautati."
);

$LANG_LOGIN = array (
    1 => 'Inregistrare necesara',
    2 => 'Ne pare rau, pentru a avea acces la aceasta zona trebuie sa fiti membru/utilizator inregistrat.',
    3 => 'Inregistrare',
    4 => 'Membru Nou'
);

?>




From dhaun at geeklog.net  Wed Mar  5 09:34:46 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Wed, 5 Mar 2003 08:34:46 -0600
Subject: [geeklog-cvs] geeklog-1.3/system lib-security.php,1.11,1.12
Message-ID: <200303051434.h25EYki21633@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/system
In directory internal.geeklog.net:/tmp/cvs-serv21595

Modified Files:
	lib-security.php 
Log Message:
Integrated Vincent Furia's improvements to SEC_getUserGroups() and SEC_getUserRights().


Index: lib-security.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/lib-security.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** lib-security.php	26 Oct 2002 18:28:09 -0000	1.11
--- lib-security.php	5 Mar 2003 14:34:44 -0000	1.12
***************
*** 9,16 ****
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
  // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 9,17 ----
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
  // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
+ // |          Vincent Furia    - vmf at abtech.org                                |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 76,95 ****
  *
  * @param        int     $uid            User ID to get information for. If empty current user.
- * @param        string  $usergroups     DO NOT USE (for recursion) comma delimited string of groups user belongs to
- * @param        int     $cur_grp_id     DO NOT USE (for recursion) Current group the function is working with in tree
  * @return	array	Associative Array grp_name -> ug_main_grp_id
  *
  */
! function SEC_getUserGroups($uid='',$usergroups='',$cur_grp_id='')
  {
      global $_TABLES, $_USER, $_SEC_VERBOSE;
  
-     if (empty($usergroups)) {
-         $usergroups = array();
-     }
-     
      if ($_SEC_VERBOSE) {
          COM_errorLog("****************in getusergroups(uid=$uid,usergroups=$usergroups,cur_grp_id=$cur_grp_id)***************",1);
      }
  
      if (empty($uid)) {
--- 77,92 ----
  *
  * @param        int     $uid            User ID to get information for. If empty current user.
  * @return	array	Associative Array grp_name -> ug_main_grp_id
  *
  */
! function SEC_getUserGroups($uid='')
  {
      global $_TABLES, $_USER, $_SEC_VERBOSE;
  
      if ($_SEC_VERBOSE) {
          COM_errorLog("****************in getusergroups(uid=$uid,usergroups=$usergroups,cur_grp_id=$cur_grp_id)***************",1);
      }
+     
+     $groups = array();
  
      if (empty($uid)) {
***************
*** 101,114 ****
      }
  
!     if (empty($cur_grp_id)) {
!         $result = DB_query("SELECT ug_main_grp_id,grp_name FROM {$_TABLES["group_assignments"]},{$_TABLES["groups"]}"
              . " WHERE grp_id = ug_main_grp_id AND ug_uid = $uid",1);
-     } else {
-         $result = DB_query("SELECT ug_main_grp_id,grp_name FROM {$_TABLES["group_assignments"]},{$_TABLES["groups"]}"
-             . " WHERE grp_id = ug_main_grp_id AND ug_grp_id = $cur_grp_id",1);
-     }
  
      if ($result == -1) {
!         return $usergroups;
      }
  
--- 98,106 ----
      }
  
!     $result = DB_query("SELECT ug_main_grp_id,grp_name FROM {$_TABLES["group_assignments"]},{$_TABLES["groups"]}"
              . " WHERE grp_id = ug_main_grp_id AND ug_uid = $uid",1);
  
      if ($result == -1) {
!         return $groups;
      }
  
***************
*** 119,135 ****
      }
  
!     for ($i = 1; $i <= $nrows; $i++) {
!         $A = DB_fetchArray($result);
  
! 	if ($_SEC_VERBOSE) {
!             COM_errorLog('user is in group ' . $A['grp_name'],1);
          }
!         $usergroups[$A['grp_name']] = $A['ug_main_grp_id'];
!         $usergroups = SEC_getUserGroups($uid,$usergroups,$A['ug_main_grp_id']);
      }
  
!     if (is_array($usergroups)) {
!         ksort($usergroups);
!     }
  
      if ($_SEC_VERBOSE) {
--- 111,136 ----
      }
  
!     while ($nrows > 0) {
!         $cgroups = array();
  
!         for ($i = 1; $i <= $nrows; $i++) {
!             $A = DB_fetchArray($result);
!     
!             if ($_SEC_VERBOSE) {
!                 COM_errorLog('user is in group ' . $A['grp_name'],1);
!             }
!             if (!in_array($A['ug_main_grp_id'], $groups)) {
!                 array_push($cgroups, $A['ug_main_grp_id']);
!             }
!             $groups[$A['grp_name']] = $A['ug_main_grp_id'];
          }
!         
!         $glist = join(',', $cgroups);
!         $result = DB_query("SELECT ug_main_grp_id,grp_name FROM {$_TABLES["group_assignments"]},{$_TABLES["groups"]}"
!                 . " WHERE grp_id = ug_main_grp_id AND ug_grp_id IN ($glist)",1);
!         $nrows = DB_numRows($result);
      }
  
!     ksort($groups);
  
      if ($_SEC_VERBOSE) {
***************
*** 137,141 ****
      }
  
!     return $usergroups;
  }
  
--- 138,142 ----
      }
  
!     return $groups;
  }
  
***************
*** 436,439 ****
--- 437,444 ----
      global $_TABLES, $_USER, $_SEC_VERBOSE;
  
+     if ($_SEC_VERBOSE) {
+         COM_errorLog("**********inside SEC_getUserPermissions(grp_id=$grp_id)**********",1);
+     }
+ 
      // Get user ID if we don't already have it
      if (empty($uid)) {
***************
*** 445,507 ****
      }
  
!     if ($_SEC_VERBOSE) {
!         COM_errorLog("**********inside SEC_getUserPermissions(grp_id=$grp_id)**********",1);
!     }
! 
!     if (empty($grp_id)) {
!         // Okay, this was the first time this function SEC_was called.
!         // Let's get all the groups this user belongs to and get the permissions for each group.
!         // NOTE: permissions are given to groups and NOT individuals
! 
! 	// print "<BR>uid = " . $_USER[uid];
! 
!         $result = DB_query("SELECT ug_main_grp_id FROM {$_TABLES["group_assignments"]} WHERE ug_uid = $uid",1);
!         if ($result <> -1) {
!             $nrows = DB_numRows($result);
!             if ($_SEC_VERBOSE) {
!                 COM_errorLog("got $nrows row(s) in SEC_getUserPermissions",1);
!             }
!             for ($i = 1; $i <= $nrows; $i++) {
!                 $A = DB_fetchArray($result);
!                 $retval .= SEC_getUserPermissions($A['ug_main_grp_id'],$uid);
!             }
          }
      } else {
!         // In this case we are going up the group tree for this user building a list of rights
!         // along the way.  First, get the rights for this group.
! 
!         $result = DB_query("SELECT ft_name FROM {$_TABLES["access"]},{$_TABLES["features"]} WHERE "
!             . "ft_id = acc_ft_id AND acc_grp_id = $grp_id",1);
!         $nrows = DB_numRows($result);
! 
!         if ($_SEC_VERBOSE) COM_errorLog("got $nrows rights for group $grp_id in SEC_getUserPermissions",1);
! 
!         for ($j = 1; $j <= $nrows; $j++) {
!             $A = DB_fetchArray($result);
!             if ($_SEC_VERBOSE) {
!                 COM_errorLog('Adding right ' . $A['ft_name'] . ' in SEC_getUserPermissions',1);
!             }
!             $retval .= $A['ft_name'] . ',';
!         }
  
!         // Now see if there are any groups tied to this one further up the tree.  If so
!         // see if they have additional rights
  
!         $result = DB_query("SELECT ug_main_grp_id FROM {$_TABLES["group_assignments"]} WHERE ug_grp_id = $grp_id",1);
!         $nrows = DB_numRows($result);
          if ($_SEC_VERBOSE) {
!             COM_errorLog("got $nrows groups tied to group $grp_id in SEC_getUserPermissions",1);
!         }
!         for ($i = 1; $i <= $nrows; $i++) {
!             // Now for each group, see if there are any rights assigned to it. If so, add to our
!             // comma delimited string
! 
!             $A = DB_fetchArray($result);
!             $retval .= SEC_getUserPermissions($A['ug_main_grp_id'],$uid);
          }
      }
!     if ($_SEC_VERBOSE) {
!         COM_errorLog("**********leaving SEC_getUserPermissions(grp_id=$grp_id)**********",1);
!     }
      return $retval;
  }
--- 450,475 ----
      }
  
!     if ($uid == $_USER['uid']) {
!         if (!isset($_GROUPS)) {
!             $_GROUPS = SEC_getUserGroups($uid);
          }
+         $groups = $_GROUPS;
      } else {
!         $groups = SEC_getUserGroups($uid);
!     }
  
!     $glist = join(',', $groups);
!     $result = DB_query("SELECT DISTINCT ft_name FROM {$_TABLES["access"]},{$_TABLES["features"]} "
!                      . "WHERE ft_id = acc_ft_id AND acc_grp_id IN ($glist)");
  
!     $nrows = DB_numrows($result);
!     for ($j = 1; $j <= $nrows; $j++) {
!         $A = DB_fetchArray($result);
          if ($_SEC_VERBOSE) {
!             COM_errorLog('Adding right ' . $A['ft_name'] . ' in SEC_getUserPermissions',1);
          }
+         $retval .= $A['ft_name'] . ',';
      }
!     
      return $retval;
  }




From blaine at geeklog.net  Sat Mar  8 20:20:37 2003
From: blaine at geeklog.net (blaine at geeklog.net)
Date: Sat, 8 Mar 2003 19:20:37 -0600
Subject: [geeklog-cvs] geeklog-1.3/system/classes upload.class.php,1.24,1.25
Message-ID: <200303090120.h291Kbi14308@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/system/classes
In directory internal.geeklog.net:/tmp/cvs-serv14296/system/classes

Modified Files:
	upload.class.php 
Log Message:
Added new function to allow changing the maximum number of files per form supported. Default was 5 with no support to change.

Index: upload.class.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/classes/upload.class.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** upload.class.php	2 Feb 2003 21:14:07 -0000	1.24
--- upload.class.php	9 Mar 2003 01:20:35 -0000	1.25
***************
*** 614,617 ****
--- 614,630 ----
      
      /**
+     * Sets the max number of files that can be uploaded per form
+     *
+     * @param     int       $maxfiles    Maximum number of files to allow. Default is 5
+     * @return    boolean   True if set, false otherwise
+     *
+     */
+     function setMaxFileUploads($maxfiles)
+     {
+         $this->_maxFileUploadsPerForm = $maxfiles;
+         return true;
+     }    
+     
+     /**
      * Extra security option that forces all attempts to upload a file to be done
      * so from a set of VERY specific IP's.  This is only good for those who are




From dhaun at geeklog.net  Sun Mar  9 06:47:24 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 9 Mar 2003 05:47:24 -0600
Subject: [geeklog-cvs] geeklog-1.3/sql mysql_tableanddata.php,1.42,1.43
Message-ID: <200303091147.h29BlOi30786@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/sql
In directory internal.geeklog.net:/tmp/cvs-serv30721/sql

Modified Files:
	mysql_tableanddata.php 
Log Message:
Integrated Static Pages 1.3


Index: mysql_tableanddata.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/sql/mysql_tableanddata.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** mysql_tableanddata.php	23 Feb 2003 18:16:32 -0000	1.42
--- mysql_tableanddata.php	9 Mar 2003 11:47:22 -0000	1.43
***************
*** 534,551 ****
  $_SQL[40] = "
  CREATE TABLE {$_TABLES['staticpage']} (
!   sp_id varchar(20) DEFAULT '' NOT NULL,
!   sp_uid mediumint(8) DEFAULT '1' NOT NULL,
!   sp_title varchar(128) DEFAULT '' NOT NULL,
!   sp_content text DEFAULT '' NOT NULL,
!   sp_hits mediumint(8) unsigned DEFAULT '0' NOT NULL,
!   sp_date datetime NOT NULL,
!   sp_format varchar(20) NOT NULL,
!   sp_onmenu tinyint(1) unsigned NOT NULL DEFAULT '0',
!   sp_label varchar(64),
!   INDEX staticpage_sp_id(sp_id),
!   INDEX staticpage_sp_uid(sp_uid),
!   INDEX staticpage_sp_date(sp_date),
!   INDEX staticpage_sp_onmenu(sp_onmenu),
!   PRIMARY KEY (sp_id)
  ) TYPE=MyISAM
  ";
--- 534,558 ----
  $_SQL[40] = "
  CREATE TABLE {$_TABLES['staticpage']} (
!   sp_id varchar(20) NOT NULL default '',
!   sp_uid mediumint(8) NOT NULL default '1',
!   sp_title varchar(128) NOT NULL default '',
!   sp_content text NOT NULL,
!   sp_hits mediumint(8) unsigned NOT NULL default '0',
!   sp_date datetime NOT NULL default '0000-00-00 00:00:00',
!   sp_format varchar(20) NOT NULL default '',
!   sp_onmenu tinyint(1) unsigned NOT NULL default '0',
!   sp_label varchar(64) default NULL,
!   group_id mediumint(8) unsigned NOT NULL default '1',
!   owner_id mediumint(8) unsigned NOT NULL default '1',
!   perm_owner tinyint(1) unsigned NOT NULL default '3',
!   perm_group tinyint(1) unsigned NOT NULL default '3',
!   perm_members tinyint(1) unsigned NOT NULL default '2',
!   perm_anon tinyint(1) unsigned NOT NULL default '2',
!   sp_php tinyint(1) unsigned NOT NULL default '0',
!   sp_nf tinyint(1) unsigned default '0',
!   PRIMARY KEY  (sp_id),
!   KEY staticpage_sp_uid (sp_uid),
!   KEY staticpage_sp_date (sp_date),
!   KEY staticpage_sp_onmenu (sp_onmenu)
  ) TYPE=MyISAM
  ";
***************
*** 571,574 ****
--- 578,582 ----
  $_DATA[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (17,14) ";
  $_DATA[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (18,14) ";
+ $_DATA[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (22,14) ";
  
  $_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (3,'user_block','gldefault','User Functions','all',2,'','','0000-00-00 00:00:00',1,'',1,2,3,3,2,2) ";
***************
*** 645,648 ****
--- 653,657 ----
  $_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core) VALUES (20,'link.submit','May skip the link submission queue',1) ";
  $_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core) VALUES (21,'event.submit','May skip the event submission queue',1) ";
+ $_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core) VALUES (22,'staticpages.PHP','Ability use PHP in static pages',0) ";
  
  $_DATA[] = "INSERT INTO {$_TABLES['frontpagecodes']} (code, name) VALUES (0,'Show Only in Topic') ";
***************
*** 827,832 ****
  $_DATA[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('lastemailedstories','') ";
  $_DATA[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('rdf_sids','')";
- $_DATA[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('staticpages','1')";
- $_DATA[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('sp_group_id','15')";
  
  $_INDEX[] = "ALTER TABLE {$_TABLES['comments']} ADD INDEX comments_date(date)";
--- 836,839 ----




From dhaun at geeklog.net  Sun Mar  9 06:47:24 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 9 Mar 2003 05:47:24 -0600
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.70,1.71
Message-ID: <200303091147.h29BlOi30763@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory internal.geeklog.net:/tmp/cvs-serv30721/docs

Modified Files:
	history 
Log Message:
Integrated Static Pages 1.3


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** history	20 Feb 2003 19:04:58 -0000	1.70
--- history	9 Mar 2003 11:47:22 -0000	1.71
***************
*** 1,4 ****
--- 1,10 ----
  GeekLog History/Changes:
  
+ (1.3.8)
+ -------
+ 
+ - Integrated Tom Willet's version of the Static Pages plugin. This new version
+   is now called Static Pages 1.3.
+   Use Geeklog's install script to upgrade from any previous version (1.1 or 1.2)
  - Fixed a typo in lib-sessions.php that caused the creation of unnecessary
    sessions (pointed out by Kobaz).
***************
*** 47,51 ****
--- 53,61 ----
    Account information has been moved to template files (new "preferences"
    directory).
+ 
  - Updated French language file, provided by Jaques.
+ - New Slovenian language file, provided by gape
+ - New Slovak language file, provided by Rado
+ - New Romanian language file, provided by Dan Gheorghitza
  
  




From dhaun at geeklog.net  Sun Mar  9 06:47:24 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 9 Mar 2003 05:47:24 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/install install.php,1.42,1.43
Message-ID: <200303091147.h29BlOi30776@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install
In directory internal.geeklog.net:/tmp/cvs-serv30721/public_html/admin/install

Modified Files:
	install.php 
Log Message:
Integrated Static Pages 1.3


Index: install.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install/install.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** install.php	17 Feb 2003 21:18:44 -0000	1.42
--- install.php	9 Mar 2003 11:47:22 -0000	1.43
***************
*** 47,51 ****
  }
  if (!defined ('VERSION')) {
!     define('VERSION', '1.3.7');
  }
  
--- 47,51 ----
  }
  if (!defined ('VERSION')) {
!     define('VERSION', '1.3.8');
  }
  
***************
*** 138,142 ****
          $db_templates->set_var('upgrade',1);
          // They already have a lib-database file...they can't change their tables names
!         $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6');
          $versiondd = '<tr><td align="right"><b>Current Geeklog Version:</b></td><td><select name="version">';
          for ($j = 1; $j <= count($old_versions); $j++) {
--- 138,142 ----
          $db_templates->set_var('upgrade',1);
          // They already have a lib-database file...they can't change their tables names
!         $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7');
          $versiondd = '<tr><td align="right"><b>Current Geeklog Version:</b></td><td><select name="version">';
          for ($j = 1; $j <= count($old_versions); $j++) {
***************
*** 211,214 ****
--- 211,240 ----
  }
  
+ 
+ /*
+ * Checks for Static Pages Version
+ *
+ * @return   1 if Static Pages 1.1 by Phill or 1.2 by Tom, 0 if original Static Pages
+ *
+ */
+ function get_SP_Ver()
+ {
+     global $_TABLES;
+ 
+     $result = DB_query ("SELECT * FROM {$_TABLES['staticpage']}");
+     $A = DB_fetchArray ($result);
+     $fields = array ();
+     foreach ($A as $name => $value) {
+         $fields[] = $name;
+     }
+     if (in_array ('sp_pos',$fields,true)) {  
+         $retval = 1;
+     } else {
+         $retval = 0;
+     }
+ 
+     return $retval;
+ }
+ 
  function INST_doDatabaseUpgrades($current_gl_version, $table_prefix) {
      global $_TABLES, $_CONF, $_DB_dbms, $_DB_table_prefix;
***************
*** 361,364 ****
--- 387,424 ----
  
              $current_gl_version = '1.3.7';
+             $_SQL = '';
+             break;
+         case '1.3.7':
+             // upgrade Static Pages plugin
+             $spversion = get_SP_ver ();
+             if ($spversion == 0) { // original version
+                 DB_query ("ALTER TABLE {$_TABLES['staticpage']} "
+                     . "ADD COLUMN group_id mediumint(8) unsigned DEFAULT '1',"
+                     . "ADD COLUMN owner_id mediumint(8) unsigned DEFAULT '1',"
+                     . "ADD COLUMN perm_owner tinyint(1) unsigned DEFAULT '3',"
+                     . "ADD COLUMN perm_group tinyint(1) unsigned DEFAULT '3',"
+                     . "ADD COLUMN perm_members tinyint(1) unsigned DEFAULT '2',"
+                     . "ADD COLUMN perm_anon tinyint(1) unsigned DEFAULT '2',"
+                     . "ADD COLUMN sp_php tinyint(1) unsigned DEFAULT '0',"
+                     . "ADD COLUMN sp_nf tinyint(1) unsigned DEFAULT '0'");
+                 DB_query ("INSERT INTO {$_TABLES['features']} (ft_name, ft_descr) VALUES ('staticpages.php','Ability to use PHP in static pages')");
+                 $php_id = DB_insertId ();
+                 $group_id = DB_getItem ($_TABLES['groups'], 'grp_id', "grp_name = 'Static Page Admin'");
+                 DB_query ("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($php_id, $group_id)");
+             } else { // extended version by Phill or Tom
+                 DB_query ("ALTER TABLE {$_TABLES['staticpage']} "
+                     . "DROP COLUMN sp_pos,"
+                     . "DROP COLUMN sp_search_keywords,"
+                     . "ADD COLUMN sp_nf tinyint(1) unsigned DEFAULT '0'");
+             }
+             DB_query ("UPDATE {$_TABLES['plugins']} SET pi_version = '1.3' WHERE pi_name = 'staticpages'");
+ 
+             // remove Static Pages 'lock' flag
+             DB_query ("DELETE FROM {$_TABLES['vars']} WHERE name = 'staticpages'");
+ 
+             // remove Static Pages Admin group id
+             DB_query ("DELETE FROM {$_TABLES['vars']} WHERE name = 'sp_group_id'");
+ 
+             $current_gl_version = '1.3.8';
              $_SQL = '';
              break;




From dhaun at geeklog.net  Sun Mar  9 06:47:24 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 9 Mar 2003 05:47:24 -0600
Subject: [geeklog-cvs] geeklog-1.3/plugins/staticpages/templates/admin editor.thtml,1.4,1.5
Message-ID: <200303091147.h29BlOi30770@internal.geeklog.net>

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

Modified Files:
	editor.thtml 
Log Message:
Integrated Static Pages 1.3


Index: editor.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/templates/admin/editor.thtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** editor.thtml	18 Aug 2002 18:10:35 -0000	1.4
--- editor.thtml	9 Mar 2003 11:47:22 -0000	1.5
***************
*** 40,43 ****
--- 40,90 ----
                                          </tr>
                                          <tr>
+                                             <td colspan="2"><hr></td>
+                                         </tr>
+                                         <tr>
+                                             <td align="right" valign="top">{php_msg}</td>
+                                             <td><input type="{php_type}" name="sp_php" value="1" {php_checked}>&nbsp;&nbsp;{php_warn}</td>
+                                         </tr>
+                                         <tr>
+                                             <td align="right" valign="top">{exit_msg}</td>
+                                             <td><input type="checkbox" name="sp_nf" value="1" {exit_checked}>&nbsp;&nbsp;{exit_info}</td>
+                                         </tr>
+                                         <tr>
+                                             <td colspan="2"><hr></td>
+                                         </tr>
+                                         <tr>
+                                             <td colspan="2"><b>{lang_accessrights}<b></td>
+                                         </tr>
+                                         <tr>
+                                             <td align="right">{lang_owner}:</td>
+                                             <td>{owner_username}<input type="hidden" name="owner_id" value="{owner_id}"></td>
+                                         </tr>
+                                         <tr>
+                                             <td align="right">{lang_group}:</td>
+                                             <td>
+                                                 {group_dropdown}
+                                             </td>
+                                         </tr>
+                                         <tr>
+                                             <td colspan="2"><b>{lang_permissions}</b>:</td>
+                                         </tr>
+                                         <tr>
+                                             <td colspan="2"></td>
+                                         </tr>
+                                         <tr>
+                                             <td colspan="2">{lang_perm_key}</td>
+                                         </tr>
+                                         <tr>
+                                             <td colspan="2">
+                                             {permissions_editor}
+                                             </td>
+                                         </tr>
+                                         <tr>
+                                             <td colspan="2">{permissions_msg}<td>
+                                         </tr>
+                                         <tr>
+                                             <td colspan="2"><hr><td>
+                                         </tr>
+                                         <tr>
                                              <td align="right">{lang_hits}:</td>
                                              <td><input type="hidden" name="sp_hits" value="{sp_hits}">{sp_hits}</td>




From dhaun at geeklog.net  Sun Mar  9 06:47:24 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 9 Mar 2003 05:47:24 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html index.php,1.41,1.42
Message-ID: <200303091147.h29BlOi30773@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv30721/public_html

Modified Files:
	index.php 
Log Message:
Integrated Static Pages 1.3


Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/index.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** index.php	14 Feb 2003 04:36:31 -0000	1.41
--- index.php	9 Mar 2003 11:47:22 -0000	1.42
***************
*** 81,115 ****
      if (DB_getItem ($_TABLES['plugins'], 'pi_enabled', "pi_name = 'staticpages'") == 1) {
  
!         $spsql = "SELECT sp_content,sp_label,sp_format FROM {$_TABLES['staticpage']} WHERE sp_title = 'frontpage'";
!         $spresult = DB_fetchArray (DB_query ($spsql));
  
!         if ($spresult['sp_label'] == 'nonews') { // replace news entirely
!             $shownews = false;
!             switch ($spresult['sp_format']) {
!                 case 'noblocks':
!                     $display .= COM_siteHeader ('none');
!                     break;
!                 case 'allblocks':
!                 case 'leftblocks':
!                     $display .= COM_siteHeader ('menu');
!                     break;
!             }
  
!             $display .= stripslashes ($spresult['sp_content']);
  
!             if ($spresult['sp_format'] == 'allblocks') {
!                 $display .= COM_siteFooter (true);
!             } else if ($spresult['sp_format'] != 'blankpage') {
!                 $display .= COM_siteFooter ();
              }
!         } else { // display static page content before the news
              $display .= COM_siteHeader();
-             if (($_SP_CONF['in_block'] == 1) && !empty ($spresult['sp_label'])) {
-                 $display .= COM_startBlock ($spresult['sp_label']);
-             }
-             $display .= stripslashes ($spresult['sp_content']);
-             if (($_SP_CONF['in_block'] == 1) && !empty ($spresult['sp_label'])) {
-                 $display .= COM_endBlock ();
-             }
          }
      } else {
--- 81,133 ----
      if (DB_getItem ($_TABLES['plugins'], 'pi_enabled', "pi_name = 'staticpages'") == 1) {
  
!         $spsql = "SELECT sp_content,sp_label,sp_format,sp_php FROM {$_TABLES['staticpage']} WHERE sp_title = 'frontpage' AND " . SP_getPerms ();
!         $result = DB_query ($spsql);
  
!         if (DB_numRows ($result) > 0) {
!             $spresult = DB_fetchArray ($result);
  
!             if ($spresult['sp_label'] == 'nonews') { // replace news entirely
!                 $shownews = false;
!                 switch ($spresult['sp_format']) {
!                     case 'noblocks':
!                         $display .= COM_siteHeader ('none');
!                         break;
!                     case 'allblocks':
!                     case 'leftblocks':
!                         $display .= COM_siteHeader ('menu');
!                         break;
!                 }
  
!                 // Check for type (ie html or php)
!                 if ($spresult['sp_php'] == 1) {
!                     $display .= eval (stripslashes ($spresult['sp_content']));
!                 } else {
!                     $display .= stripslashes ($spresult['sp_content']);
!                 }
! 
!                 if ($spresult['sp_format'] == 'allblocks') {
!                     $display .= COM_siteFooter (true);
!                 } else if ($spresult['sp_format'] != 'blankpage') {
!                     $display .= COM_siteFooter ();
!                 }
!             } else { // display static page content before the news
!                 $display .= COM_siteHeader ();
!                 if (($_SP_CONF['in_block'] == 1) && !empty ($spresult['sp_label'])) {
!                     $display .= COM_startBlock ($spresult['sp_label']);
!                 }
! 
!                 // Check for type (ie html or php)
!                 if ($spresult['sp_php'] == 1) {
!                     $display .= eval (stripslashes ($spresult['sp_content']));
!                 } else {
!                     $display .= stripslashes ($spresult['sp_content']);
!                 }
! 
!                 if (($_SP_CONF['in_block'] == 1) && !empty ($spresult['sp_label'])) {
!                     $display .= COM_endBlock ();
!                 }
              }
!         } else {
              $display .= COM_siteHeader();
          }
      } else {
***************
*** 122,126 ****
  // Show any Plugin formatted blocks
  // Requires a plugin to have a function called plugin_centerblock_<plugin_name>
! $display .= PLG_showCenterblock();
  
  if ($shownews) {
--- 140,144 ----
  // Show any Plugin formatted blocks
  // Requires a plugin to have a function called plugin_centerblock_<plugin_name>
! $display .= PLG_showCenterblock ();
  
  if ($shownews) {
***************
*** 282,285 ****
--- 300,305 ----
  $display .= COM_siteFooter(true); // The true value enables right hand blocks.
  
+ } else {
+     $display = COM_showMessage ($HTTP_GET_VARS['msg']) . $display;
  }
  




From dhaun at geeklog.net  Sun Mar  9 06:47:24 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 9 Mar 2003 05:47:24 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/staticpages index.php,1.9,1.10
Message-ID: <200303091147.h29BlOi30781@internal.geeklog.net>

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

Modified Files:
	index.php 
Log Message:
Integrated Static Pages 1.3


Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/staticpages/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** index.php	7 Oct 2002 14:15:13 -0000	1.9
--- index.php	9 Mar 2003 11:47:22 -0000	1.10
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Static Page Geeklog Plugin 0.1                                            |
  // +---------------------------------------------------------------------------+
  // | index.php                                                                 |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Static Page Geeklog Plugin 1.3                                            |
  // +---------------------------------------------------------------------------+
  // | index.php                                                                 |
***************
*** 9,15 ****
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 9,16 ----
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
+ // |          Tom Willett      - twillett at users.sourceforge.net                |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 32,79 ****
  // $Id$
  
! require_once('../lib-common.php');
  
  $error = 0;
  
! if (!empty($_USER['uid'])) {
!         $result = DB_query("SELECT noboxes FROM {$_TABLES['userindex']} WHERE uid = '{$_USER['uid']}'");
!         $U = DB_fetchArray($result);
  }
  
! COM_setArgNames(array('page'));
! $page = COM_getArgument('page');
  
! if (empty($page)) {
! 	$error = 1;
  }
  
! $count = DB_count($_TABLES['staticpage'],'sp_id',$page);
  
  if ($count == 0 || $count > 1) {
! 	$error = 1;
  }
  
  if (!($error)) {
! 	$result = DB_query("SELECT * FROM {$_TABLES['staticpage']} WHERE sp_id = '$page'");
! 	$A = DB_fetchArray($result);
! 	$_CONF["pagetitle"] = stripslashes($A['sp_title']);
! 	if ($A['sp_format'] == 'allblocks' OR $A["sp_format"] == 'leftblocks') {
! 		$retval .= COM_siteHeader('menu');
! 	} else {
          if ($A['sp_format'] <> 'blankpage') {
! 		    $retval .= COM_siteHeader('none');
          }
! 	}
      if ($_SP_CONF['in_block'] == 1) {
          $retval .= COM_startBlock (stripslashes ($A['sp_title']));
      }
! 	$retval .= stripslashes($A['sp_content']);
      if ($A['sp_format'] <> 'blankpage') {
! 	    $curtime = COM_getUserDateTimeFormat($A['sp_date']);
! 	    $retval .= '<p align="center"><br>' . $LANG_STATIC[lastupdated] . ' ' . $curtime[0]; 
! 	    if (SEC_hasRights('staticpages.edit,staticpages.delete','OR')) {
! 		    $retval .= '<br><a href="' . COM_buildURL ($_CONF['site_admin_url'] . '/plugins/staticpages/index.php?mode=edit&amp;sp_id=' . $page) . '">';
! 		    $retval .= $LANG_STATIC[edit] . "</a>";
! 	    }
          $retval .= '</p>';
      }
--- 33,89 ----
  // $Id$
  
! require_once ('../lib-common.php');
! 
  
  $error = 0;
  
! if (!empty ($_USER['uid'])) {
!     $result = DB_query ("SELECT noboxes FROM {$_TABLES['userindex']} WHERE uid = '{$_USER['uid']}'");
!     $U = DB_fetchArray ($result);
  }
  
! COM_setArgNames (array ('page'));
! $page = COM_getArgument ('page');
  
! if (empty ($page)) {
!     $error = 1;
  }
  
! $result = DB_query ("SELECT * FROM {$_TABLES['staticpage']} WHERE (sp_id = '$page') AND " . SP_getPerms ());
! $count = DB_numRows ($result);
  
  if ($count == 0 || $count > 1) {
!     $error = 1;
  }
  
  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');
!     } else {
          if ($A['sp_format'] <> 'blankpage') {
!             $retval .= COM_siteHeader ('none');
          }
!     }
      if ($_SP_CONF['in_block'] == 1) {
          $retval .= COM_startBlock (stripslashes ($A['sp_title']));
      }
!     //Check for type (ie html or php)
!     if ($A['sp_php'] == 1) {
!         $retval .= eval (stripslashes ($A['sp_content']));
!     } else {
!         $retval .= stripslashes ($A['sp_content']);
!     }
      if ($A['sp_format'] <> 'blankpage') {
!         $curtime = COM_getUserDateTimeFormat ($A['sp_date']);
!         $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&amp;sp_id='
!                     . $page) . '">';
!             $retval .= $LANG_STATIC['edit'] . "</a>";
!         }
          $retval .= '</p>';
      }
***************
*** 82,105 ****
      }
  
!     if ($A['sp_format'] <> 'blankpage') 
!     {
! 
      	if ($A['sp_format'] == 'allblocks' && $U['noboxes'] != 1) {
!             $retval .= COM_siteFooter(true);
!     	} 
!         else 
!         {
!             $retval .= COM_siteFooter();
          }
-         
      }
!    
      // increment hit counter for page...is SQL compliant?  
!     DB_query("UPDATE {$_TABLES['staticpage']} SET sp_hits = sp_hits + 1 WHERE sp_id = '$page'"); 
  } else {
! 	$retval .= COM_startBlock('error');
! 	$retval .= 'page does not exist';
! 	$retval .= COM_endBlock();
! } 
  
  echo $retval;
--- 92,128 ----
      }
  
!     if ($A['sp_format'] <> 'blankpage') {
      	if ($A['sp_format'] == 'allblocks' && $U['noboxes'] != 1) {
!             $retval .= COM_siteFooter (true);
!     	} else {
!             $retval .= COM_siteFooter ();
          }
      }
! 
      // increment hit counter for page...is SQL compliant?  
!     DB_query ("UPDATE {$_TABLES['staticpage']} SET sp_hits = sp_hits + 1 WHERE sp_id = '$page'"); 
  } else {
!     $failflg = DB_getItem ($_TABLES['staticpage'], 'sp_nf', "sp_id='$page'");
!     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'));
!         $login->set_var ('login_message', $LANG_LOGIN[2]);
!         $login->set_var ('site_url', $_CONF['site_url']);
!         $login->set_var ('lang_login', $LANG_LOGIN[3]);
!         $login->set_var ('lang_newuser', $LANG_LOGIN[4]);
!         $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);
!     }
! }
  
  echo $retval;




From dhaun at geeklog.net  Sun Mar  9 06:47:24 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 9 Mar 2003 05:47:24 -0600
Subject: [geeklog-cvs] geeklog-1.3/plugins/staticpages config.php,1.2,1.3 functions.inc,1.17,1.18
Message-ID: <200303091147.h29BlOi30761@internal.geeklog.net>

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

Modified Files:
	config.php functions.inc 
Log Message:
Integrated Static Pages 1.3


Index: config.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/config.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.php	23 Jul 2002 10:12:35 -0000	1.2
--- config.php	9 Mar 2003 11:47:22 -0000	1.3
***************
*** 1,15 ****
  <?php
  
! $_SP_CONF['version'] = '1.1';
  
  // If you experience timeout issues, you may need to set both of the
  // following values to 0 as they are intensive
  
! //NOTE: using filter_html will render any blank pages useless
  $_SP_CONF['filter_html'] = 0;
  $_SP_CONF['censor'] = 1;
  
  // set to 1 if static pages should be wrapped in a block
! $_SP_CONF['in_block'] = 0;
  
  ?>
--- 1,15 ----
  <?php
  
! $_SP_CONF['version'] = '1.3';
  
  // If you experience timeout issues, you may need to set both of the
  // following values to 0 as they are intensive
  
! // NOTE: using filter_html will render any blank pages useless
  $_SP_CONF['filter_html'] = 0;
  $_SP_CONF['censor'] = 1;
  
  // set to 1 if static pages should be wrapped in a block
! $_SP_CONF['in_block'] = 1;
  
  ?>

Index: functions.inc
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/functions.inc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** functions.inc	30 Nov 2002 20:42:42 -0000	1.17
--- functions.inc	9 Mar 2003 11:47:22 -0000	1.18
***************
*** 3,17 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Static Pages Plugin 0.1 for Geeklog - The Ultimate Weblog                 |
  // +---------------------------------------------------------------------------+
  // | functions.inc                                                             |
  // | This file does two things: 1) it implements the necessary Geeklog Plugin  |
  // | API method and 2) implements all the common code needed by the Static     |
  // | Pages' PHP files.                                                         |
- // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 3,19 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Static Pages Plugin 1.3 for Geeklog - The Ultimate Weblog                 |
  // +---------------------------------------------------------------------------+
  // | functions.inc                                                             |
+ // |                                                                           |
  // | This file does two things: 1) it implements the necessary Geeklog Plugin  |
  // | API method and 2) implements all the common code needed by the Static     |
  // | Pages' PHP files.                                                         |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
+ // |          Tom Willett      - twillett at users.sourceforge.net                |
+ // |          Blaine Lang      - langmail at sympatico.ca                         |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 36,49 ****
  $langfile = $_CONF['path'] . 'plugins/staticpages/language/' . $_CONF['language'] . '.php';
  
! if (file_exists ($langfile)) 
! {
      include ($langfile);
! }
! else 
! {
      include ($_CONF['path'] . 'plugins/staticpages/language/english.php');
  }
  
! include($_CONF['path'] . 'plugins/staticpages/config.php');
  
  // +---------------------------------------------------------------------------+
--- 38,48 ----
  $langfile = $_CONF['path'] . 'plugins/staticpages/language/' . $_CONF['language'] . '.php';
  
! if (file_exists ($langfile)) {
      include ($langfile);
! } else {
      include ($_CONF['path'] . 'plugins/staticpages/language/english.php');
  }
  
! include ($_CONF['path'] . 'plugins/staticpages/config.php');
  
  // +---------------------------------------------------------------------------+
***************
*** 62,71 ****
      global $_CONF, $_TABLES;
  
!     $result = DB_query("SELECT sp_id, sp_label FROM {$_TABLES['staticpage']} WHERE sp_onmenu = 1 ORDER BY sp_label");
!     $nrows = DB_numRows($result);
!     $menuitems = array();
      for ($i = 1; $i <= $nrows; $i++) {
!         $A = DB_fetchArray($result);
!         $menuitems[$A['sp_label']] = COM_buildURL ($_CONF['site_url'] . "/staticpages/index.php?page={$A['sp_id']}");
      }
      return $menuitems;
--- 61,72 ----
      global $_CONF, $_TABLES;
  
!     $result = DB_query ('SELECT sp_id, sp_label, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon FROM ' . $_TABLES['staticpage'] . ' WHERE sp_onmenu = 1');
!     $nrows = DB_numRows ($result);
!     $menuitems = array ();
      for ($i = 1; $i <= $nrows; $i++) {
!         $A = DB_fetchArray ($result);
!         if (SEC_hasAccess ($A['owner_id'], $A['group_id'], $A['perm_owner'], $A['perm_group'], $A['perm_members'], $A['perm_anon'])) {
!             $menuitems[$A['sp_label']] = COM_buildURL ($_CONF['site_url'] . "/staticpages/index.php?page={$A['sp_id']}");
!     	}
      }
      return $menuitems;
***************
*** 73,80 ****
  
  /**
! * Geeklog is checking to see if this plugin supports comments, tell it no!
! * NOTE: to support comments you must use the same date/time based ID for your
  * widget.  In other words, to make primary keys for your plugin you should call
! * makesid().  Comments are keyed off of that...it is a limitation on how geeklog
  * does comments.
  *
--- 74,82 ----
  
  /**
! * Geeklog is checking to see if this plugin supports comments, tell it no.
! *
! * NOTE: to support comments you must used the same date/time based ID for your
  * widget.  In other words, to make primary keys for your plugin you should call
! * makesid().  Comments are keyed off of that...it is a limitation on how Geeklog
  * does comments.
  *
***************
*** 87,93 ****
  
  /**
! * Shows the statistics for the static pages plugin on stats.php.  If
! * $showsitestats is 1 then we are to only print the overall stats in the 'site
! * statistics' box otherwise we show the detailed stats for the static pages
  *
  * @showsitestate        int         Flag to let us know which stats to get
--- 89,95 ----
  
  /**
! * Shows the statistics for the Static Pages plugin on stats.php.
! * If $showsitestats is 1 then we are to only print the overall stats in the
! * 'site statistics box' otherwise we show the detailed stats
  *
  * @showsitestate        int         Flag to let us know which stats to get
***************
*** 95,99 ****
  function plugin_showstats_staticpages($showsitestats) 
  {
!     // Code to come later
  }
  
--- 97,134 ----
  function plugin_showstats_staticpages($showsitestats) 
  {
!     global $LANG_STATIC, $_CONF, $_TABLES;
! 
!     $stat_templates = new Template ($_CONF['path_layout'] . 'stats');
!     $stat_templates->set_file (array ('itemstats'=>'itemstatistics.thtml',
!                                       'statrow'=>'singlestat.thtml'));
!     if ($showsitestats == 1) {
!         $result = DB_query ("SELECT count(*) AS cnt FROM {$_TABLES['staticpage']} WHERE " . SP_getPerms ());
!         $A = DB_fetchArray ($result);
!         $total_pages = $A['cnt'];
!         $retval = '<table border="0" width="100%" cellspacing="0" cellpadding="0">';
!         $retval .= '<tr><td>' . $LANG_STATIC['staticpages'] . '</td>';
!         $retval .= '<td align="right">' . $total_pages . '&nbsp;&nbsp;</td></tr></table>';
!     } else {
!         $result = DB_query ("SELECT sp_id,sp_title,sp_hits FROM {$_TABLES['staticpage']} WHERE sp_hits > 0 AND" . SP_getPerms() . ' ORDER BY sp_hits DESC LIMIT 10');
!         $nrows  = DB_numRows ($result);
!         $retval .= COM_startBlock ($LANG_STATIC['stats_headline']);
!         if ($nrows > 0) {
!             $stat_templates->set_var ('item_label', $LANG_STATIC['stats_page_title']);
!             $stat_templates->set_var ('stat_name', $LANG_STATIC['stats_hits']);
!             for ($i = 0; $i < $nrows; $i++) {
!                 $A = DB_fetchArray ($result);
!                 $stat_templates->set_var ('item_url', COM_buildURL ($_CONF['site_url'] . '/staticpages/index.php?page=' . $A['sp_id']));
!                 $stat_templates->set_var ('item_text', stripslashes ($A['sp_title']));
!                 $stat_templates->set_var ('item_stat', $A['sp_hits']);
!                 $stat_templates->parse ('stat_row','statrow',true); 
!             }
!             $stat_templates->parse ('output','itemstats');
!             $retval .= $stat_templates->finish ($stat_templates->get_var ('output'));
!         } else {
!             $retval .= $LANG_STATIC['stats_no_hits'];
!         }	
!         $retval .= COM_endBlock();
!     }
!     return $retval;
  }
  
***************
*** 108,114 ****
--- 143,151 ----
  
      $tmp['staticpages'] = $LANG_STATIC['staticpages'];
+ 
      return $tmp;
  }
  
+ 
  /**
  * this searches for static pages matching the user query and returns an array of
***************
*** 123,135 ****
  * @author           string          Get all results by this author
  *
  */
  function plugin_dopluginsearch_staticpages($query, $datestart, $dateend, $topic, $type, $author) 
  {
! 	global $_TABLES, $_CONF, $LANG_STATIC;
  
      if (empty($type)) {
          $type = 'all';
      }
!     
      // Bail if we aren't supppose to do our search
      if ($type <> 'all' AND $type <> 'staticpages') {
--- 160,173 ----
  * @author           string          Get all results by this author
  *
+ * Oct 05/2002: Blaine Lang, Corrected bug with SQL Search string. 
  */
  function plugin_dopluginsearch_staticpages($query, $datestart, $dateend, $topic, $type, $author) 
  {
!     global $_TABLES, $_CONF, $LANG_STATIC;
  
      if (empty($type)) {
          $type = 'all';
      }
! 
      // Bail if we aren't supppose to do our search
      if ($type <> 'all' AND $type <> 'staticpages') {
***************
*** 140,194 ****
      }
  
!     // Build search SQL
! 	$sql = "SELECT sp_id,sp_content,sp_title,sp_hits,sp_uid,UNIX_TIMESTAMP(sp_date) as day FROM {$_TABLES['staticpage']} WHERE ";
      $sql .= "((sp_content like '%$query%' OR sp_content like '$query%' OR sp_content like '%$query') ";
!     $sql .= "OR (sp_title like '%$query%' OR sp_title like '$query%' OR sp_title like '%$query')) ";
  
!     if (!empty($datestart) && !empty($dateend)) {
!         $delim = substr($datestart, 4, 1);
!         $DS = explode($delim,$datestart);
!         $DE = explode($delim,$dateend);
!         $startdate = mktime(0,0,0,$DS[1],$DS[2],$DS[0]);
!         $enddate = mktime(0,0,0,$DE[1],$DE[2],$DE[0]) + 3600;
!         $sql .= "AND (UNIX_TIMESTAMP(sp_date) BETWEEN '$startdate' AND '$enddate') ";
      }
  
!     if (!empty($author)) {
          $sql .= "AND (sp_uid = '$author') ";
      }
!     $sql    .= "ORDER BY sp_date desc";
  
      // Perform search
!     $result = DB_query($sql);
!     
!     // OK, now return coma delimited string of table header labels
      require_once($_CONF['path_system'] . 'classes/plugin.class.php');
      $plugin_results = new Plugin();
      $plugin_results->plugin_name = 'staticpages';
      $plugin_results->searchlabel = $LANG_STATIC['results'];
!     $plugin_results->addSearchHeading($LANG_STATIC['title']);
!     $plugin_results->addSearchHeading($LANG_STATIC['date']);
!     $plugin_results->addSearchHeading($LANG_STATIC['author']);
!     $plugin_results->addSearchHeading($LANG_STATIC['hits']);
!     $plugin_results->num_searchresults = DB_numRows($result);
  
      // NOTE if any of your data items need to be links then add them here! 
      // make sure data elements are in an array and in the same order as your
      // headings above!
! 	for ($i = 1; $i <= $plugin_results->num_searchresults; $i++) {
!         $A = DB_fetchArray($result);
!         $thetime = COM_getUserDateTimeFormat($A['day']);
!         $A['sp_title'] = stripslashes ($A['sp_title']);
!         $row = array('<a href="' . COM_buildURL ($_CONF['site_url'] . '/staticpages/index.php?page=' . $A['sp_id']) . '">' . $A['sp_title'] . '</a>',
                      $thetime[0],
!                     DB_getItem($_TABLES['users'],'username',"uid = '{$A["sp_uid"]}'"),
                      $A['sp_hits']);
!         $plugin_results->addSearchResult($row);
! 	}
!     $plugin_results->num_itemssearched = DB_count($_TABLES['staticpage']);
  
      return $plugin_results;
  }
  
  /**
  * This will put an option for static pages in the command and control block on
--- 178,238 ----
      }
  
!     // Build search SQL - Modified to exclude static PHP pages from search.
!     $sql = "SELECT *,UNIX_TIMESTAMP(sp_date) as day FROM " . $_TABLES['staticpage'] . " WHERE (sp_php != '1' AND";
      $sql .= "((sp_content like '%$query%' OR sp_content like '$query%' OR sp_content like '%$query') ";
!     $sql .= "OR (sp_title like '%$query%' OR sp_title like '$query%' OR sp_title like '%$query'))";
  
!     if (!empty ($datestart) && !empty ($dateend)) {
!         $delim = substr ($datestart, 4, 1);
!         $DS = explode ($delim, $datestart);
!         $DE = explode ($delim, $dateend);
!         $startdate = mktime (0, 0, 0, $DS[1], $DS[2], $DS[0]);
!         $enddate = mktime (23, 59, 59, $DE[1], $DE[2], $DE[0]);
!         $sql .= " AND (UNIX_TIMESTAMP(sp_date) BETWEEN '$startdate' AND '$enddate')";
      }
  
!     if (!empty ($author)) {
          $sql .= "AND (sp_uid = '$author') ";
      }
!     $sql    .= ") ORDER BY sp_date desc";
  
      // Perform search
!     $result = DB_query ($sql);
! 
!     // OK, now return coma delmited string of table header labels
      require_once($_CONF['path_system'] . 'classes/plugin.class.php');
      $plugin_results = new Plugin();
      $plugin_results->plugin_name = 'staticpages';
      $plugin_results->searchlabel = $LANG_STATIC['results'];
!     $plugin_results->addSearchHeading ($LANG_STATIC['title']);
!     $plugin_results->addSearchHeading ($LANG_STATIC['date']);
!     $plugin_results->addSearchHeading ($LANG_STATIC['author']);
!     $plugin_results->addSearchHeading ($LANG_STATIC['hits']);
!     $mycount = DB_numRows ($result);
  
      // NOTE if any of your data items need to be links then add them here! 
      // make sure data elements are in an array and in the same order as your
      // headings above!
!     for ($i = 1; $i <= $mycount; $i++) {
!         $A = DB_fetchArray ($result);
! 
!         if (SEC_hasAccess ($A['owner_id'], $A['group_id'], $A['perm_owner'], $A['perm_group'], $A['perm_members'], $A['perm_anon'])) {
!             $rcnt++;
!             $thetime = COM_getUserDateTimeFormat ($A['day']);
!             $A['sp_title'] = stripslashes ($A['sp_title']);
!             $row = array ('<a href="' . COM_buildURL ($_CONF['site_url'] . '/staticpages/index.php?page=' . $A['sp_id']) . '">' . $A['sp_title'] . '</a>',
                      $thetime[0],
!                     '<a href="' . $_CONF['site_url'] . '/users.php?mode=profile&amp;uid=' . $A['sp_uid'] . '">' . DB_getItem ($_TABLES['users'], 'username', "uid = '{$A['sp_uid']}'") . '</a>',
                      $A['sp_hits']);
!             $plugin_results->addSearchResult ($row);
!         }
!     }
!     $plugin_results->num_searchresults = $rcnt;
!     $plugin_results->num_itemssearched = DB_count ($_TABLES['staticpage']);
  
      return $plugin_results;
  }
  
+ 
  /**
  * This will put an option for static pages in the command and control block on
***************
*** 200,208 ****
      global $LANG_STATIC, $_CONF;
  
!     if (SEC_hasRights('staticpages.edit,staticpages.delete','OR')) {
!         return array($LANG_STATIC['staticpages'],$_CONF['site_admin_url'] . '/plugins/staticpages/index.php',$_CONF['site_url'] . '/staticpages/images/staticpages.gif');
      }
  
!     return (false);
  }
  
--- 244,254 ----
      global $LANG_STATIC, $_CONF;
  
!     if (SEC_hasRights ('staticpages.edit,staticpages.delete', 'OR')) {
!         return array ($LANG_STATIC['staticpages'],
!                 $_CONF['site_admin_url'] . '/plugins/staticpages/index.php',
!                 $_CONF['site_url'] . '/staticpages/images/staticpages.gif');
      }
  
!     return false;
  }
  
***************
*** 215,224 ****
      global $_CONF, $LANG_STATIC, $_TABLES;
  
!     if (SEC_hasRights('staticpages.edit,staticpages.delete','OR')) {
!         return array($LANG_STATIC[staticpages], $_CONF['site_admin_url'] . '/plugins/staticpages/index.php', DB_count($_TABLES['staticpage']));
      }	
  }
  
  /**
  * Removes the datastructures for this plugin from the Geeklog database
  *
--- 261,317 ----
      global $_CONF, $LANG_STATIC, $_TABLES;
  
!     if (SEC_hasRights ('staticpages.edit,staticpages.delete', 'OR')) {
!         $result = DB_query ("SELECT count(*) AS cnt FROM {$_TABLES['staticpage']} WHERE " . SP_getPerms ('','3'));
!         $A = DB_fetchArray ($result);
!         $total_pages = $A['cnt'];
!         return array ($LANG_STATIC[staticpages], $_CONF['site_admin_url'] . '/plugins/staticpages/index.php', $total_pages);
      }	
  }
  
  /**
+ * Return SQL where statement with appropriate permissions
+ *
+ * Takes User id and permission and returns SQL where clause which will return the appropriate objects.
+ * This assumes that the table has the following security structure:
+ * owner_id        | mediumint(8)          
+ * group_id        | mediumint(8)          
+ * perm_owner      | tinyint(1) unsigned   
+ * perm_group      | tinyint(1) unsigned   
+ * perm_members    | tinyint(1) unsigned  
+ * perm_anon       | tinyint(1) unsigned  
+ * This will work with the standard GL tables
+ *
+ * @table	str	Table name (used in joins)
+ * @access	int	Access if blank read access  2 = read 3 = read/edit
+ * @u_id int     User ID if blank current user
+ *
+ * @return string	Where clause of sql statement
+ *
+ */
+ function SP_getPerms($table='',$access='2',$u_id='')
+ {
+ 	global $_USER, $_GROUPS;
+ 	
+ 	if ($table != '') { $table .= '.'; }
+ 	if ($u_id == '') {
+ 		$uid = $_USER['uid'];
+ 		$GROUPS = $_GROUPS;
+ 	} else {
+ 		$uid = $u_id;
+ 		$GROUPS = SEC_getUserGroups($uid);
+ 	}
+ 	$where = "((" . $table . "perm_anon >= $access)";
+ 	// check to see if anonymous user
+ 	if ($uid > 1) {
+ 		$where .= " OR (" . $table . "perm_members >= $access)";
+ 		foreach ($GROUPS as $group) {
+ 			$where .= " OR ((" . $table . "group_id = $group) AND (" . $table . "perm_group >= $access))";
+ 		}
+ 		$where .= " OR ((" . $table . "owner_id = $uid) AND (" . $table . "perm_owner >= $access))";
+ 	}
+ 	return $where . ")"; 
+ }
+ 
+ /**
  * Removes the datastructures for this plugin from the Geeklog database
  *
***************
*** 245,249 ****
  
      // Remove the static page admin group
!     $grp_id = DB_getItem($_TABLES['vars'], 'value', "name = 'sp_group_id'");
  
      if (empty($steps) OR $steps['insertgroup'] == 1) {
--- 338,342 ----
  
      // Remove the static page admin group
!     $grp_id = DB_getItem($_TABLES['groups'], 'grp_id', "grp_name = 'Static Page Admin'");
  
      if (empty($steps) OR $steps['insertgroup'] == 1) {
***************
*** 256,259 ****
--- 349,353 ----
      $edit_id = DB_getItem($_TABLES['features'], 'ft_id', "ft_name = 'staticpages.edit'");
      $delete_id = DB_getItem($_TABLES['features'], 'ft_id', "ft_name = 'staticpages.delete'");
+     $php_id = DB_getItem($_TABLES['features'], 'ft_id', "ft_name = 'staticpages.PHP'");
  
      if (empty($steps) OR $steps['addededittogroup'] == 1) {
***************
*** 271,274 ****
--- 365,375 ----
      }
  
+     if (empty($steps) OR $steps['addedphptogroup'] == 1) {
+         // Remove access to those features 
+         COM_errorLog('Attempting to remove rights to staticpage.PHP from all groups',1);
+         DB_query("DELETE FROM {$_TABLES['access']} WHERE acc_ft_id = $php_id");
+         COM_errorLog('...success',1);
+     }
+ 
      if (empty($steps) OR $steps['addedrootuserstogroup'] == 1) {
          // Remove root users from the group
***************
*** 290,297 ****
      }
  
!     if (empty($steps) OR $steps['savedgroupid']) {
!         COM_errorLog('Attempting to remove the group id from the vars table',1);
!         DB_query("DELETE FROM {$_TABLES['vars']} WHERE name = 'sp_group_id'");
!         COM_errorLog('success',1);
      }
  
--- 391,398 ----
      }
  
!     if (empty($steps) OR $steps['insertedphpfeature'] == 1) {
!         COM_errorLog('Attempting to remove the staticpage.PHP feature',1);
!         DB_query("DELETE FROM {$_TABLES['features']} WHERE ft_id = $php_id");
!         COM_errorLog('...success',1);
      }
  
***************
*** 301,305 ****
      COM_errorLog('Attempting to unregister the plugin from Geeklog',1);
      DB_query("DELETE FROM {$_TABLES['plugins']} WHERE pi_name = 'staticpages'");
-     DB_query("DELETE FROM {$_TABLES['vars']} WHERE name = 'staticpages'");
      COM_errorLog('...success',1);
  
--- 402,405 ----




From dhaun at geeklog.net  Sun Mar  9 06:47:24 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 9 Mar 2003 05:47:24 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/plugins/staticpages index.php,1.14,1.15 install.php,1.8,1.9
Message-ID: <200303091147.h29BlOi30783@internal.geeklog.net>

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

Modified Files:
	index.php install.php 
Log Message:
Integrated Static Pages 1.3


Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/plugins/staticpages/index.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** index.php	29 Jan 2003 17:08:52 -0000	1.14
--- index.php	9 Mar 2003 11:47:22 -0000	1.15
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Static Pages Geeklog Plugin 0.1                                           |
  // +---------------------------------------------------------------------------+
  // | index.php                                                                 |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Static Pages Geeklog Plugin 1.3                                           |
  // +---------------------------------------------------------------------------+
  // | index.php                                                                 |
***************
*** 9,15 ****
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 9,17 ----
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
+ // |          Phill Gillespie  - phill at mediaaustralia.com.au                   |
+ // |          Tom Willett      - twillett at users.sourceforge.net
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 55,62 ****
  function form($A, $error=false) 
  {
! 	global $_TABLES, $PHP_SELF, $_CONF, $HTTP_POST_VARS, $_USER, $LANG_STATIC,$_SP_CONF;
  
      $retval = '';
  
      if ($error) {
          $retval .= $error . "<br><br>";
--- 57,81 ----
  function form($A, $error=false) 
  {
! 	global $_TABLES, $PHP_SELF, $_CONF, $HTTP_POST_VARS, $_USER, $LANG_STATIC,$_SP_CONF, $LANG_ACCESS, $mode, $sp_id;
  
+ 	if (!empty($sp_id) && $mode=='edit') {
+     	$access = SEC_hasAccess($A['owner_id'],$A['group_id'],$A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']);
+ 	} else {
+     	$A['owner_id'] = $_USER['uid'];
+ 		$A['group_id'] = DB_getItem($_TABLES['groups'],'grp_id',"grp_name = 'Static Page Admin'");
+ 		$A['perm_owner'] = 3;
+ 		$A['perm_group'] = 3;
+ 		$A['perm_members'] = 2;
+ 		$A['perm_anon'] = 2;
+ 		$access = 3;
+ 	}
      $retval = '';
  
+     if (empty($A['owner_id'])) {
+ 	    $error = COM_startBlock($LANG_ACCESS['accessdenied']);
+     	$error .= $LANG_STATIC['deny_msg'];
+ 	    $error .= COM_endBlock();
+     }
+     
      if ($error) {
          $retval .= $error . "<br><br>";
***************
*** 64,71 ****
          $sp_template = new Template($_CONF['path'] . 'plugins/staticpages/templates/admin');
          if (($_CONF['advanced_editor'] == 1) && file_exists ($_CONF['path'] . 'plugins/staticpages/templates/admin/editor_advanced.thtml')) {
!             $sp_template->set_file('form','editor_advanced.thtml');
          } else {
!             $sp_template->set_file('form','editor.thtml');
          }
          $sp_template->set_var('site_url', $_CONF['site_url']);
          $sp_template->set_var('site_admin_url', $_CONF['site_admin_url']);
--- 83,118 ----
          $sp_template = new Template($_CONF['path'] . 'plugins/staticpages/templates/admin');
          if (($_CONF['advanced_editor'] == 1) && file_exists ($_CONF['path'] . 'plugins/staticpages/templates/admin/editor_advanced.thtml')) {
!             $sp_template->set_file ('form', 'editor_advanced.thtml');
          } else {
!             $sp_template->set_file ('form', 'editor.thtml');
          }
+         $sp_template->set_var('lang_accessrights', $LANG_ACCESS['accessrights']);
+     	$sp_template->set_var('lang_owner', $LANG_ACCESS['owner']);
+ 		$sp_template->set_var('owner_username', DB_getItem($_TABLES['users'],'username',"uid = {$A['owner_id']}"));
+ 		$sp_template->set_var('owner_id', $A['owner_id']);
+    		$sp_template->set_var('lang_group', $LANG_ACCESS['group']);
+     	$usergroups = SEC_getUserGroups();
+     	if ($access == 3) {
+ 			$groupdd .= '<select name="group_id">';
+         	for ($i = 0; $i < count($usergroups); $i++) {
+             	$groupdd .= '<option value="' . $usergroups[key($usergroups)] . '"';
+             	if ($A['group_id'] == $usergroups[key($usergroups)]) {
+                 	$groupdd .= ' SELECTED';
+             	}
+             	$groupdd .= '>' . key($usergroups) . '</option>';
+             	next($usergroups);
+         	}
+         	$groupdd .= '</select>';
+     	} else {
+         	// they can't set the group then
+         	$groupdd .= DB_getItem($_TABLES['groups'],'grp_name',"grp_id = {$A['group_id']}");
+         	$groupdd .= '<input type="hidden" name="group_id" value="' . $A['group_id'] . '">';
+     	}
+     	$sp_template->set_var('group_dropdown', $groupdd);
+     	$sp_template->set_var('permissions_editor', SEC_getPermissionsHTML($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']));
+     	$sp_template->set_var('lang_permissions', $LANG_ACCESS['permissions']);
+     	$sp_template->set_var('lang_perm_key', $LANG_ACCESS['permissionskey']);
+     	$sp_template->set_var('permissions_editor', SEC_getPermissionsHTML($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']));
+ 		$sp_template->set_var('permissions_msg', $LANG_ACCESS['permmsg']);
          $sp_template->set_var('site_url', $_CONF['site_url']);
          $sp_template->set_var('site_admin_url', $_CONF['site_admin_url']);
***************
*** 81,86 ****
          $sp_template->set_var('username', DB_getItem($_TABLES['users'],'username',"uid = {$A["sp_uid"]}"));
          $sp_template->set_var('sp_uid', $A['sp_uid']);
  
! 		$curtime = COM_getUserDateTimeFormat();
  
          $sp_template->set_var('lang_lastupdated', $LANG_STATIC['date']);
--- 128,156 ----
          $sp_template->set_var('username', DB_getItem($_TABLES['users'],'username',"uid = {$A["sp_uid"]}"));
          $sp_template->set_var('sp_uid', $A['sp_uid']);
+         if (SEC_hasRights ('staticpages.PHP')) {
+             if ($A['sp_php'] == 1) {
+     	        $sp_template->set_var('php_checked','checked');
+     	        $sp_template->set_var('php_type','checkbox');
+             } else {
+                 $sp_template->set_var('php_checked','');
+             }
+             $sp_template->set_var('php_type','checkbox');
+             $sp_template->set_var('php_warn',$LANG_STATIC['php_warn']);
+             $sp_template->set_var('php_msg',$LANG_STATIC['php_msg']);
+         } else {
+   	    $sp_template->set_var('php_type','hidden');
+             $sp_template->set_var('php_warn','');
+             $sp_template->set_var('php_msg','');
+             $sp_template->set_var('php_checked','');
+         }
+         $sp_template->set_var('exit_msg',$LANG_STATIC['exit_msg']);
+         if ($A['sp_nf'] == 1) {
+             $sp_template->set_var('exit_checked','checked');
+         } else {
+             $sp_template->set_var('exit_checked','');
+         }
+         $sp_template->set_var('exit_info',$LANG_STATIC['exit_info']);
  
!         $curtime = COM_getUserDateTimeFormat();
  
          $sp_template->set_var('lang_lastupdated', $LANG_STATIC['date']);
***************
*** 156,160 ****
  
  	if (!empty($sp_id) && $mode == 'edit') {
! 		$result = DB_query("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE sp_id = '$sp_id'");
  		$A = DB_fetchArray($result);
  	} elseif ($mode == 'edit') {
--- 226,230 ----
  
  	if (!empty($sp_id) && $mode == 'edit') {
! 		$result = DB_query("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE sp_id = '$sp_id' AND " . SP_getPerms('','3'));
  		$A = DB_fetchArray($result);
  	} elseif ($mode == 'edit') {
***************
*** 195,199 ****
  	//$limit = (50 * $page) - 50;
  	//$result = DB_query("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} ORDER BY sp_date DESC LIMIT $limit,50");
! 	$result = DB_query("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} ORDER BY sp_date DESC");
  	$nrows = DB_numRows($result);
  	if ($nrows > 0) {
--- 265,269 ----
  	//$limit = (50 * $page) - 50;
  	//$result = DB_query("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} ORDER BY sp_date DESC LIMIT $limit,50");
! 	$result = DB_query("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE " . SP_getPerms('','3') . " ORDER BY sp_date DESC");
  	$nrows = DB_numRows($result);
  	if ($nrows > 0) {
***************
*** 248,254 ****
  * @sp_hits      int         Number of page views
  * @sp_format    string      HTML or plain text
  *
  */
! function submitstaticpage($sp_id,$sp_uid,$sp_title,$sp_content,$unixdate,$sp_hits,$sp_format, $sp_onmenu, $sp_label)
  {
  	global $_CONF, $LANG12, $LANG_STATIC, $_SP_CONF, $_TABLES;
--- 318,333 ----
  * @sp_hits      int         Number of page views
  * @sp_format    string      HTML or plain text
+ * @sp_onmenu    int         Flag to place entry on menu
+ * @sp_label     string      Menu Entry
+ * @owner_id     int         Permission bits
+ * @group_id     int
+ * @perm_owner   int
+ * @perm_members int
+ * @perm_anon    int
+ * @sp_php       int         Flag to indicate PHP usage
+ * @sp_nf        int         Flag to indicate type of not found message
  *
  */
! 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)
  {
  	global $_CONF, $LANG12, $LANG_STATIC, $_SP_CONF, $_TABLES;
***************
*** 284,288 ****
  		//$sp_label = addslashes(htmlspecialchars(strip_tags(COM_checkWords($sp_label))));
  
! 		DB_save($_TABLES['staticpage'],'sp_id,sp_uid,sp_title,sp_content,sp_date,sp_hits,sp_format,sp_onmenu,sp_label',"'$sp_id',$sp_uid,'$sp_title','$sp_content','$date',$sp_hits,'$sp_format',$sp_onmenu,'$sp_label'",$_CONF['site_admin_url'] . '/plugins/staticpages/index.php');
  
  	} else {
--- 363,372 ----
  		//$sp_label = addslashes(htmlspecialchars(strip_tags(COM_checkWords($sp_label))));
  
!         //If user does not have php edit perms, then set php flag to 0.
!         if (!SEC_hasRights('staticpages.PHP')) {
! 	        $sp_php='0';
!         }
!         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'",$_CONF['site_admin_url'] . '/plugins/staticpages/index.php');
  
  	} else {
***************
*** 315,319 ****
      $display .= COM_siteFooter();
  } else if (($mode == $LANG_STATIC['save']) && !empty ($LANG_STATIC['save'])) {
!     submitstaticpage($sp_id,$sp_uid,$sp_title,$sp_content,$unixdate,$sp_hits,$sp_format,$sp_onmenu,$sp_label);
  } else {
      $display .= COM_siteHeader('menu');
--- 399,404 ----
      $display .= COM_siteFooter();
  } else if (($mode == $LANG_STATIC['save']) && !empty ($LANG_STATIC['save'])) {
!     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);
!     COM_errorlog("Saved Static Page " . $sp_id,1);
  } else {
      $display .= COM_siteHeader('menu');

Index: install.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/plugins/staticpages/install.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** install.php	27 Nov 2002 19:45:24 -0000	1.8
--- install.php	9 Mar 2003 11:47:22 -0000	1.9
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Static Pages Plugin 0.2 for Geeklog - The Ultimate Weblog                 |
  // +---------------------------------------------------------------------------+
  // | install.php                                                               |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Static Pages Plugin 1.3 for Geeklog - The Ultimate Weblog                 |
  // +---------------------------------------------------------------------------+
  // | install.php                                                               |
***************
*** 10,16 ****
  // | plugin for Geeklog.                                                       |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2002 by the following authors:                              |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 10,17 ----
  // | plugin for Geeklog.                                                       |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2002,2003 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
+ // |          Tom Willett      - twillett at users.sourceforge.net
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 77,82 ****
          . "sp_onmenu tinyint(1) unsigned NOT NULL DEFAULT '0',"
          . "sp_label varchar(64),"
!         . "PRIMARY KEY (sp_id)"
!         . ")";
  
      COM_errorLog("Attempting to create table staticpage for Static Page plugin", 1);
--- 78,94 ----
          . "sp_onmenu tinyint(1) unsigned NOT NULL DEFAULT '0',"
          . "sp_label varchar(64),"
!         . "group_id mediumint(8) unsigned NOT NULL default '1',"
!         . "owner_id mediumint(8) unsigned NOT NULL default '1',"
!         . "perm_owner tinyint(1) unsigned NOT NULL default '3',"
!         . "perm_group tinyint(1) unsigned NOT NULL default '3',"
!         . "perm_members tinyint(1) unsigned NOT NULL default '2',"
!         . "perm_anon tinyint(1) unsigned NOT NULL default '2',"
!         . "sp_php tinyint(1) unsigned NOT NULL default '0',"
!         . "sp_nf tinyint(1) unsigned default '0',"
!         . "PRIMARY KEY (sp_id),"
!         . "KEY staticpage_sp_uid (sp_uid),"
!         . "KEY staticpage_sp_date (sp_date),"
!         . "KEY staticpage_sp_onmenu (sp_onmenu)"
!         . ") TYPE=MyISAM";
  
      COM_errorLog("Attempting to create table staticpage for Static Page plugin", 1);
***************
*** 97,117 ****
          plugin_uninstall_staticpages($steps);
          return false;
-         exit;
      }
      COM_errorLog('...success',1);
      $steps['insertgroup'] = 1;
  
!     // Save the grp id for later uninstall
!     COM_errorLog('About to save group_id to vars table for use during uninstall',1);
!     DB_query("INSERT INTO {$_TABLES['vars']} VALUES ('sp_group_id', LAST_INSERT_ID())",1);
!     if (DB_error()) {
!         plugin_uninstall_staticpages($steps);
!         return false;
!         exit;
!     }
!     COM_errorLog('...success',1);
!     $steps['savedgroupid'] = 1;
! 
!     $group_id = DB_getItem($_TABLES['vars'], 'value', "name = 'sp_group_id'");
  
      // Add static page features
--- 109,117 ----
          plugin_uninstall_staticpages($steps);
          return false;
      }
      COM_errorLog('...success',1);
      $steps['insertgroup'] = 1;
  
!     $group_id = DB_getItem($_TABLES['groups'], 'grp_id', "grp_name = 'Static Page Admin'");
  
      // Add static page features
***************
*** 122,126 ****
          plugin_uninstall_staticpages($steps);
          return false;
-         exit;
      }
      $edit_id = DB_insertId();
--- 122,125 ----
***************
*** 134,138 ****
          plugin_uninstall_staticpages($steps);
          return false;
-         exit;
      }
      $delete_id = DB_insertId();
--- 133,136 ----
***************
*** 140,143 ****
--- 138,152 ----
      $steps['insertedfeaturedelete'] = 1;
  
+     COM_errorLog('Attempting to add staticpages.PHP feature',1);
+     DB_query("INSERT INTO {$_TABLES['features']} (ft_name, ft_descr) "
+         . "VALUES ('staticpages.PHP','Ability use PHP in static pages')",1);
+     if (DB_error()) {
+         plugin_uninstall_staticpages($steps);
+         return false;
+     }
+     $php_id = DB_insertId();
+     COM_errorLog('...success',1);
+     $steps['insertedphpfeature'] = 1;
+     
      // Now add the features to the group
      COM_errorLog('Attempting to give Static Page Admin group access to staticpages.edit feature',1);
***************
*** 146,150 ****
          plugin_uninstall_staticpages($steps);
          return false;
-         exit;
      }
      COM_errorLog('...success',1);
--- 155,158 ----
***************
*** 156,164 ****
          plugin_uninstall_staticpages($steps);
          return false;
-         exit;
      }
      COM_errorLog('...success',1);
      $steps['addeddeletetogroup'] = 1;
  
      // OK, now give Root users access to this plugin now! NOTE: Root group should always be 1
      COM_errorLog('Attempting to give all users in Root group access static page admin group',1);
--- 164,180 ----
          plugin_uninstall_staticpages($steps);
          return false;
      }
      COM_errorLog('...success',1);
      $steps['addeddeletetogroup'] = 1;
  
+     COM_errorLog('Attempting to give Static Page Admin group access to staticpages.PHP feature',1);
+     DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($php_id, $group_id)",1);
+     if (DB_error()) {
+         plugin_uninstall_staticpages($steps);
+         return false;
+     }
+     COM_errorLog('...success',1);
+     $steps['addedphptogroup']=1;
+     
      // OK, now give Root users access to this plugin now! NOTE: Root group should always be 1
      COM_errorLog('Attempting to give all users in Root group access static page admin group',1);
***************
*** 167,171 ****
          plugin_uninstall_staticpages($steps);
          return false;
-         exit;
      }
      COM_errorLog('...success',1);
--- 183,186 ----
***************
*** 174,183 ****
      // Register the plugin with Geeklog
      if (DB_count($_TABLES['plugins'],'pi_name','staticpages') > 0) {
!         COM_errorLog('Attempting to remove staticpage rentry prior to adding an updated entry',1);
          DB_query("DELETE FROM {$_TABLES['plugins']} WHERE pi_name = 'staticpages'");
          if (DB_error()) {
              plugin_uninstall_staticpages($steps);
              return false;
-             exit;
          }
          COM_errorLog('...success',1);
--- 189,197 ----
      // Register the plugin with Geeklog
      if (DB_count($_TABLES['plugins'],'pi_name','staticpages') > 0) {
!         COM_errorLog('Attempting to remove staticpage entry prior to adding an updated entry',1);
          DB_query("DELETE FROM {$_TABLES['plugins']} WHERE pi_name = 'staticpages'");
          if (DB_error()) {
              plugin_uninstall_staticpages($steps);
              return false;
          }
          COM_errorLog('...success',1);
***************
*** 190,200 ****
      DB_delete($_TABLES['plugins'],'pi_name','staticpages');
      DB_query("INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version, pi_gl_version, pi_homepage, pi_enabled) "
!         . "VALUES ('staticpages', '{$_SP_CONF['version']}', '1.3.7', 'http://www.tonybibbs.com', 1)");
!     DB_query("INSERT INTO {$_TABLES['vars']} VALUES ('staticpages','1')");
  
      if (DB_error()) {
          plugin_uninstall_staticpages($steps);
          return false;
-         exit;
      }
      COM_errorLog('...success',1);
--- 204,212 ----
      DB_delete($_TABLES['plugins'],'pi_name','staticpages');
      DB_query("INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version, pi_gl_version, pi_homepage, pi_enabled) "
!         . "VALUES ('staticpages', '{$_SP_CONF['version']}', '1.3.8', 'http://www.tonybibbs.com', 1)");
  
      if (DB_error()) {
          plugin_uninstall_staticpages($steps);
          return false;
      }
      COM_errorLog('...success',1);
***************
*** 204,252 ****
  }
  
- /* 
- MAIN:  OK, I wanted to keep this simple so this is how this works.  When ran for the first
- time, this file will attempt to install the datastructures immediately.  When that is complete,
- it will insert a record into the Geeklog vars table (name = 'staticpages', value = 1) which will
- lock this file from being executed at by anyone.
- 
- If you want to remove this plugin you would set the value in that record to 0 and then this script
- will uninstall the plugin.  All this is outlined in the INSTALL and UNINSTALL documents.
- */
- 
  $display = COM_siteHeader();
  
! if (DB_count($_TABLES['vars'], 'name', 'staticpages') == 0) {
!     // Record in vars table doesn' exit, install this plugin
!     if (plugin_install_staticpages()) {
!         $display .= COM_startBlock($LANG_STATIC['installation_complete']);
!         $display .= $LANG_STATIC['installation_complete_msg'];
!         $display .= COM_endBlock();
      } else {
!         // Error occured
!         $display .= COM_startBlock($LANG_STATIC['installation_failed']);
!         $display .= $LANG_STATIC['installation_failed_msg'];
!         $display .= COM_endBlock();
!     }   
! } else {
!     // This plugin is installed, see if it is locked or not
!     if (DB_getItem($_TABLES['vars'],'value',"name = 'staticpages'") == 1) {
!         // This is locked, do nothing
!         $display .= COM_startBlock($LANG_STATIC['system_locked']);
!         $display .= $LANG_STATIC['system_locked_msg'];
!         $display .= COM_endBlock();
      } else {
!         // Uninstall plugin
!         if (plugin_uninstall_staticpages()) {
!             // Uninstall worked
!             $display .= COM_startBlock($LANG_STATIC['uninstall_complete']);
!             $display .= $LANG_STATIC['uninstall_complete_msg'];
!             $display .= COM_endBlock();
!         } else {
!             // Uninstall failed
!             $display .= COM_startBlock($LANG_STATIC['uninstall_failed']);
!             $display .= $LANG_STATIC['uninstall_failed_msg'];
!             $display .= COM_endBlock();
!         }
      }
  }
  
--- 216,248 ----
  }
  
  $display = COM_siteHeader();
  
! if ($action == 'uninstall') {
!     if (plugin_uninstall_staticpages ()) {
!         $display .= COM_showMessage (45);
      } else {
!         $timestamp = strftime($_CONF['daytime']);
!         $display .= COM_startBlock ($MESSAGE[40] . ' - ' . $timestamp)
!                  . '<p><img src="' . $_CONF['layout_url']
!                  . '/images/sysmessage.gif" border="0" align="top" alt="">'
!                  . $LANG08[6] . '</p>' . COM_endBlock ();
!     }
! } else if (DB_count ($_TABLES['plugins'], 'pi_name', 'staticpages') == 0) {
!     // plugin not installed - do it now
!     if (plugin_install_staticpages ()) {
!         $display = COM_refresh ($_CONF['site_admin_url']
!                                 . '/plugins.php?msg=44');
      } else {
!         $timestamp = strftime($_CONF['daytime']);
!         $display .= COM_startBlock ($MESSAGE[40] . ' - ' . $timestamp)
!                  . '<p><img src="' . $_CONF['layout_url']
!                  . '/images/sysmessage.gif" border="0" align="top" alt="">'
!                  . $LANG08[6] . '</p>' . COM_endBlock ();
      }
+ } else {
+     // plugin already installed
+     $display .= COM_startBlock ($LANG32[6])
+              . '<p>' . $LANG32[7] . '</p>'
+              . COM_endBlock ();
  }
  




From dhaun at geeklog.net  Sun Mar  9 06:47:24 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 9 Mar 2003 05:47:24 -0600
Subject: [geeklog-cvs] geeklog-1.3/plugins/staticpages/language README,1.2,1.3 danish.php,1.1,1.2 english.php,1.3,1.4 german.php,1.4,1.5 polish.php,1.1,1.2 spanish.php,1.1,1.2
Message-ID: <200303091147.h29BlOi30769@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language
In directory internal.geeklog.net:/tmp/cvs-serv30721/plugins/staticpages/language

Modified Files:
	README danish.php english.php german.php polish.php 
	spanish.php 
Log Message:
Integrated Static Pages 1.3


Index: README
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README	29 Apr 2002 09:56:41 -0000	1.2
--- README	9 Mar 2003 11:47:22 -0000	1.3
***************
*** 3,11 ****
  language settings in your user settings or the default language in config.php.
  
! IMPORTANT: If there is no language file for your language, then the plugin
! will not work. In that case, simply copy one of the existing language files
! and give it the same name as the language file you're using in
! /path/to/geeklog/language. So e.g. if your language setting is 'dutch', you
! need to have a file 'dutch.php' in this directory. If there is none, you
! could make a copy of 'english.php' and name that copy 'dutch.php'.
  
--- 3,7 ----
  language settings in your user settings or the default language in config.php.
  
! If there is no language file for your language, then the plugin will revert
! to english.php.
  

Index: danish.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/danish.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** danish.php	29 Dec 2002 10:27:11 -0000	1.1
--- danish.php	9 Mar 2003 11:47:22 -0000	1.2
***************
*** 7,10 ****
--- 7,11 ----
  # Copyright (C) 2001 Tony Bibbs
  # tony at tonybibbs.com
+ # Translation   Steen Br?lling  
  #
  # This program is free software; you can redistribute it and/or
***************
*** 33,55 ****
  
  $LANG_STATIC= array(
! 	newpage => "Ny Side",
! 	adminhome => "Admin Hjem",
! 	staticpages => "Faste Sider",
! 	staticpageeditor => "Faste Sider Redigering",
! 	writtenby => "Skrevet af",
! 	date => "Seneste Opdatering",
! 	title => "Titel",
! 	content => "Indhold",
! 	hits => "Hits",
! 	staticpagelist => "Faste Sider Liste",
! 	usealtheader => "Brug Alt. Header",
! 	url => "URL",
! 	edit => "Rediger",
! 	lastupdated => "Sidst Opdateret",
! 	pageformat => "Side Format",
! 	leftrightblocks => "Venstre & H?jre Kasser",
! 	blankpage => "Blank Side",
! 	noblocks => "Ingen Kasser",
! 	leftblocks => "Venstre Kasser",
      addtomenu => 'Tilf?j til Menu',
      label => 'Titel',
--- 34,56 ----
  
  $LANG_STATIC= array(
!     newpage => "Ny Side",
!     adminhome => "Admin Hjem",
!     staticpages => "Faste Sider",
!     staticpageeditor => "Faste Sider Redigering",
!     writtenby => "Skrevet af",
!     date => "Seneste Opdatering",
!     title => "Titel",
!     content => "Indhold",
!     hits => "Hits",
!     staticpagelist => "Faste Sider Liste",
!     usealtheader => "Brug Alt. Header",
!     url => "URL",
!     edit => "Rediger",
!     lastupdated => "Sidst Opdateret",
!     pageformat => "Side Format",
!     leftrightblocks => "Venstre & H?jre Kasser",
!     blankpage => "Blank Side",
!     noblocks => "Ingen Kasser",
!     leftblocks => "Venstre Kasser",
      addtomenu => 'Tilf?j til Menu',
      label => 'Titel',
***************
*** 61,90 ****
      access_denied => 'Adgang N?gtet',
      access_denied_msg => 'Du fors?ger at f? adgang til Fast Side administrationssiderne. Dette fors?g er blevet logget',
-     installation_complete => 'Installation Komplet',
-     installation_complete_msg => 'Datastrukturen for Fast Side Plugin for GeekLog er med succes installeret i databasen! Hvis du f?r behov for at afinstallere denne plugin, l?s da venligst README filen som fulgte med denne plugin.',
-     installation_failed => 'Installationen Mislykkedes',
-     installation_failed_msg => 'Installationen af Fast Side Plugin mislykkedes. L?s venligst din GeekLog error.log fil for at diagnosticere problemet',
-     system_locked => 'System L?st',
-     system_locked_msg => 'Fst Side Plugin er allerede installeret, og er l?st. Hvis du vil afinstallere denne plugin, l?s da venligst README filen som fulgte med denne plugin',
-     uninstall_complete => 'Afinstallation Komplet',
-     uninstall_complete_msg => 'Datastrukturen for Fast Side Plugin er med succes fjernet fra din GeekLog database.',
-     uninstall_failed => 'Afinstallationen Mislykkedes',
-     uninstall_failed_msg => 'Afinstallationen af Fast Side Plugin mislykkedes. L?s venligst din GeekLog error.log fil for at diagnosticere problemet',
      all_html_allowed => 'Alle HTML koder er tilladte',
      results => 'Fast Side Resultat',
      author => 'Forfatter',
! 	no_such_page_logged_in => 'Desv?rre '.$_USER['username'].'..',
! 	no_such_page_anon => 'Log venligst ind..',
! 	no_page_access_msg => "Dette kan skyldes at du ikke er logget ind, eller ikke er oprettet som bruger af {$_CONF["site_name"]}. Bliv venligst <a href=\"{$_CONF['site_url']}/users.php?mode=new\">oprettet som bruger</a> af {$_CONF["site_name"]} for at f? fuld brugeradgang",
! 	upgrade_completed => 'Opgradering til version 1.2 skete med succes',
! 	upgrade_completed_msg => 'Din Fast Side Plugin er opgraderet. Nyd det!',
! 	upgrade_failed => 'Desv?rre, opgraderingen til version 1.2 mislykkedes',
! 	upgrade_failed_msg => 'Det er sket en fejl under fors?get p? at opgradere din Fast Side Plugin. L?s venligst din GeekLog error.log fil for at diagnosticere problemet',
! 	php_checkbox_checked => '<tr><td align="right"><b>PHP:</b></td><td><input type="checkbox" name="sp_php" value="1" checked> Er der PHP p? denne side? (brug ikke PHP medmindre det er n?dvendigt)</td></tr><tr><td colspan="2"><hr></td></tr>',
! 	php_checkbox_unchecked => '<tr><td align="right"><b>PHP:</b></td><td><input type="checkbox" name="sp_php" value="1"> PHP kode p? din side vil blive tolket korrekt. Brug kun med omtanke!</td></tr><tr><td colspan="2"><hr></td></tr>',
!     pos_label => 'Pos: ',
!     search_keywords_label => 'S?gen?gleord:',
!     search_keywords_msg => 'NB: Hvis en side er standard HTML (ikke PHP), vil b?de \'Indhold\' & \'S?gen?gleord\' blive gennems?gt. Hvis en side er med PHP kode, vil kun \'S?gen?gleord\' blive gennems?gt.'
  );
  
! ?>
\ No newline at end of file
--- 62,82 ----
      access_denied => 'Adgang N?gtet',
      access_denied_msg => 'Du fors?ger at f? adgang til Fast Side administrationssiderne. Dette fors?g er blevet logget',
      all_html_allowed => 'Alle HTML koder er tilladte',
      results => 'Fast Side Resultat',
      author => 'Forfatter',
!     no_title_or_content => 'You must at least fill in the <b>Title</b> and <b>Content</b> fields.',
!     no_such_page_logged_in => 'Desv?rre '.$_USER['username'].'..',
!     no_such_page_anon => 'Log venligst ind..',
!     no_page_access_msg => "Dette kan skyldes at du ikke er logget ind, eller ikke er oprettet som bruger af {$_CONF["site_name"]}. Bliv venligst <a href=\"{$_CONF['site_url']}/users.php?mode=new\">oprettet som bruger</a> af {$_CONF["site_name"]} for at f? fuld brugeradgang",
!     php_msg => 'PHP: ',
!     php_warn => 'Warning: PHP code in your page will be evaluated if you enable this option. Use with caution !!',
!     exit_msg => 'Exit Type: ',
!     exit_info => 'Enable for Login Required Message.  Leave unchecked for normal security check and message.',
!     deny_msg => 'Access to this page is denied.  Either the page has been moved/removed or you do not have sufficient permissions.',
!     stats_headline => 'Top Ten Static Pages',
!     stats_page_title => 'Page Title',
!     stats_hits => 'Hits',
!     stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.'
  );
  
! ?>

Index: english.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/english.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** english.php	10 Nov 2002 14:15:26 -0000	1.3
--- english.php	9 Mar 2003 11:47:22 -0000	1.4
***************
*** 33,55 ****
  
  $LANG_STATIC= array(
! 	newpage => "New Page",
! 	adminhome => "Admin Home",
! 	staticpages => "Static Pages",
! 	staticpageeditor => "Static Page Editor",
! 	writtenby => "Written By",
! 	date => "Last Updated",
! 	title => "Title",
! 	content => "Content",
! 	hits => "Hits",
! 	staticpagelist => "Static Page List",
! 	usealtheader => "Use Alt. Header",
! 	url => "URL",
! 	edit => "Edit",
! 	lastupdated => "Last Updated",
! 	pageformat => "Page Format",
! 	leftrightblocks => "Left & Right Blocks",
! 	blankpage => "Blank Page",
! 	noblocks => "No Blocks",
! 	leftblocks => "Left Blocks",
      addtomenu => 'Add To Menu',
      label => 'Label',
--- 33,55 ----
  
  $LANG_STATIC= array(
!     newpage => "New Page",
!     adminhome => "Admin Home",
!     staticpages => "Static Pages",
!     staticpageeditor => "Static Page Editor",
!     writtenby => "Written By",
!     date => "Last Updated",
!     title => "Title",
!     content => "Content",
!     hits => "Hits",
!     staticpagelist => "Static Page List",
!     usealtheader => "Use Alt. Header",
!     url => "URL",
!     edit => "Edit",
!     lastupdated => "Last Updated",
!     pageformat => "Page Format",
!     leftrightblocks => "Left & Right Blocks",
!     blankpage => "Blank Page",
!     noblocks => "No Blocks",
!     leftblocks => "Left Blocks",
      addtomenu => 'Add To Menu',
      label => 'Label',
***************
*** 61,78 ****
      access_denied => 'Access Denied',
      access_denied_msg => 'You are illegally trying access one of the Static Pages administration pages.  Please note that all attempts to illegally access this page are logged',
-     installation_complete => 'Installation Complete',
-     installation_complete_msg => 'The data structures for the Static Pages plugin for Geeklog have been successfully installed into your database!  If you ever need to uninstall this plugin, please read the README document that came with this plugin.',
-     installation_failed => 'Installation Failed',
-     installation_failed_msg => 'The installation of the Static Pages plugin failed.  Please see your Geeklog error.log file for diagnostic information',
-     system_locked => 'System Locked',
-     system_locked_msg => 'The Static Pages plugin has already been installed and is locked.  If you are trying to uninstall this plugin, please read the README document that shipped with this plugin',
-     uninstall_complete => 'Uninstall Complete',
-     uninstall_complete_msg => 'The datastructures for the Static Pages plugin have been successfully removed from your Geeklog database.',
-     uninstall_failed => 'Uninstall Failed',
-     uninstall_failed_msg => 'The uninstall of the Static Pages plugin failed.  Please see your Geeklog error.log file for diagnostic information',
      all_html_allowed => 'All HTML is allowed',
      results => 'Static Pages Results',
      author => 'Author',
!     no_title_or_content => 'You must at least fill in the <b>Title</b> and <b>Content</b> fields.'
  );
  
--- 61,80 ----
      access_denied => 'Access Denied',
      access_denied_msg => 'You are illegally trying access one of the Static Pages administration pages.  Please note that all attempts to illegally access this page are logged',
      all_html_allowed => 'All HTML is allowed',
      results => 'Static Pages Results',
      author => 'Author',
!     no_title_or_content => 'You must at least fill in the <b>Title</b> and <b>Content</b> fields.',
!     no_such_page_logged_in => 'Sorry '.$_USER['username'].'..',
!     no_such_page_anon => 'Please log in..',
!     no_page_access_msg => "This could be because you're not logged in, or not a member of {$_CONF["site_name"]}. Please <a href=\"{$_CONF['site_url']}/users.php?mode=new\"> become a member</a> of {$_CONF["site_name"]} to receive full membership access",
!     php_msg => 'PHP: ',
!     php_warn => 'Warning: PHP code in your page will be evaluated if you enable this option. Use with caution !!',
!     exit_msg => 'Exit Type: ',
!     exit_info => 'Enable for Login Required Message.  Leave unchecked for normal security check and message.',
!     deny_msg => 'Access to this page is denied.  Either the page has been moved/removed or you do not have sufficient permissions.',
!     stats_headline => 'Top Ten Static Pages',
!     stats_page_title => 'Page Title',
!     stats_hits => 'Hits',
!     stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.'
  );
  

Index: german.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/german.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** german.php	10 Nov 2002 14:15:26 -0000	1.4
--- german.php	9 Mar 2003 11:47:22 -0000	1.5
***************
*** 35,80 ****
  
  $LANG_STATIC= array(
! 	newpage => "Neue Seite",
! 	adminhome => "Admin Home",
! 	staticpages => "Statische Seiten",
! 	staticpageeditor => "Editor f&uuml;r Statische Seiten",
! 	writtenby => "Autor",
! 	date => "Letztes Update",
! 	title => "Titel",
! 	content => "Inhalt",
! 	hits => "Treffer",
! 	staticpagelist => "Liste der Statischen Seiten",
! 	usealtheader => "Alt. Header verwenden",
! 	url => "URL",
! 	edit => "&Auml;ndern",
! 	lastupdated => "Letztes Update",
! 	pageformat => "Seitenformat",
! 	leftrightblocks => "Bl&ouml;cke links &amp; rechts",
! 	blankpage => "Leere Seite",
! 	noblocks => "Keine Bl&ouml;cke",
! 	leftblocks => "Bl&ouml;cke links",
!     addtomenu => 'Ins Men&uuml; aufnehmen',
      label => 'Label',
      nopages => 'Es sind keine statischen Seiten vorhanden.',
      save => 'Speichern',
      preview => 'Vorschau',
!     delete => 'Loeschen',
      cancel => 'Abbruch',
      access_denied => 'Zugriff verweigert',
!     access_denied_msg => 'Du hast unerlaubter Weise versucht, auf eine der Admin-Seiten f&uuml;r Statische Seiten zuzugreifen. Hinweis: Alle derartigen Versuche werden protokolliert',
!     installation_complete => 'Installation komplett',
!     installation_complete_msg => 'Die Datenstrukturen f&uuml;r das Statische-Seiten-Plugin f&uuml;r Geeklog wurden erfolgreich in die Datenbank eingetragen! Wenn Du dieses Plugin wieder deinstallieren will, lies bitte die README-Datei, die dem Plugin beiliegt.',
!     installation_failed => 'Installation fehlgeschlagen',
!     installation_failed_msg => 'Die Installation des Statische-Seiten-Plugins ist fehlgeschlagen. Die Geeklog-Datei error.log sollte weitere Informationen zu dem Problem enthalten',
!     system_locked => 'Bereits installiert',
!     system_locked_msg => 'Das Statische-Seiten-Plugin wurde bereits installiert. Solltest Du versucht haben, das Plugin zu deinstallieren, lies bitte die README-Datei, die dem Plugin beiliegt.',
!     uninstall_complete => 'Deinstallation komplett',
!     uninstall_complete_msg => 'Die Datenstrukturen f&uuml;r das Statische-Seiten-Plugin wurden erfolgreich aus der Geeklog-Datenbank entfernt.',
!     uninstall_failed => 'Deinstallation fehlgeschlagen',
!     uninstall_failed_msg => 'Die Deinstallation des Statische-Seiten-Plugins ist fehlgeschlagen. Die Geeklog-Datei error.log sollte weitere Informationen zu dem Problem enthalten',
      all_html_allowed => 'Alle HTML-Tags sind erlaubt',
      results => 'Gefundene Statische Seiten',
      author => 'Autor',
!     no_title_or_content => 'Bitte mindestens die Felder <b>Titel</b> und <b>Inhalt</b> ausf&uuml;llen.'
  );
  
--- 35,82 ----
  
  $LANG_STATIC= array(
!     newpage => "Neue Seite",
!     adminhome => "Admin Home",
!     staticpages => "Statische Seiten",
!     staticpageeditor => "Editor f?r Statische Seiten",
!     writtenby => "Autor",
!     date => "Letztes Update",
!     title => "Titel",
!     content => "Inhalt",
!     hits => "Treffer",
!     staticpagelist => "Liste der Statischen Seiten",
!     usealtheader => "Alt. Header verwenden",
!     url => "URL",
!     edit => "?ndern",
!     lastupdated => "Letztes Update",
!     pageformat => "Seitenformat",
!     leftrightblocks => "Bl?cke links &amp; rechts",
!     blankpage => "Leere Seite",
!     noblocks => "Keine Bl?cke",
!     leftblocks => "Bl?cke links",
!     addtomenu => 'Ins Men? aufnehmen',
      label => 'Label',
      nopages => 'Es sind keine statischen Seiten vorhanden.',
      save => 'Speichern',
      preview => 'Vorschau',
!     delete => 'L?schen',
      cancel => 'Abbruch',
      access_denied => 'Zugriff verweigert',
!     access_denied_msg => 'Du hast unerlaubter Weise versucht, auf eine der Admin-Seiten f?r Statische Seiten zuzugreifen. Hinweis: Alle derartigen Versuche werden protokolliert',
      all_html_allowed => 'Alle HTML-Tags sind erlaubt',
      results => 'Gefundene Statische Seiten',
      author => 'Autor',
!     no_title_or_content => 'Bitte mindestens die Felder <b>Titel</b> und <b>Inhalt</b> ausf?llen.',
!     no_such_page_logged_in => 'Sorry '.$_USER['username'].'..',
!     no_such_page_anon => 'Please log in..',
!     no_page_access_msg => "This could be because you're not logged in, or not a member of {$_CONF["site_name"]}. Please <a href=\"{$_CONF['site_url']}/users.php?mode=new\"> become a member</a> of {$_CONF["site_name"]} to receive full membership access.",
!     php_msg => 'PHP: ',
!     php_warn => 'Hinweis: Wenn dieser Schalter aktiviert ist, wird in der Seite enthaltener PHP-Code ausgef?hrt. <em>Bitte mit Bedacht verwenden!</em>',
!     exit_msg => 'Hinweistext: ',
!     exit_info => 'Art des Hinweistextes, wenn kein Zugriff auf die Seite erlaubt ist: Aktiviert = "Anmeldung erforderlich", nicht aktiviert = "Zugriff verweigert".',
!     deny_msg => 'Zugriff auf diese Seite ist nicht m?glich. Die Seite wurde entweder umbenannt oder gel?scht oder Du hast nicht die n?tigen Zugriffsrechte.',
!     stats_headline => 'Top Ten der Statische Seiten',
!     stats_page_title => 'Titel',
!     stats_hits => 'Angezeigt',
!     stats_no_hits => 'Es gibt keine Statischen Seiten oder sie wurden von niemandem gelesen.'
  );
  

Index: polish.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/polish.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** polish.php	28 Nov 2002 15:37:26 -0000	1.1
--- polish.php	9 Mar 2003 11:47:22 -0000	1.2
***************
*** 33,55 ****
  
  $LANG_STATIC= array(
! 	newpage => "Nowa Strona",
! 	adminhome => "Centrum Admina",
! 	staticpages => "Strony Statyczne",
! 	staticpageeditor => "Edytor Stron Statycznych",
! 	writtenby => "Autor",
! 	date => "Ostatnia Aktualizacja",
! 	title => "Tytu?",
! 	content => "Zawarto??",
! 	hits => "Ods?on",
! 	staticpagelist => "Lista Stron Statycznych",
! 	usealtheader => "U?yj Alt. Nag??wka",
! 	url => "URL",
! 	edit => "Edycja",
! 	lastupdated => "Ostatnia Aktualizacja",
! 	pageformat => "Format Strony",
! 	leftrightblocks => "Lewe & Prawe Bloki",
! 	blankpage => "Nowe Okno",
! 	noblocks => "Bez Blok?w",
! 	leftblocks => "Lewe Bloki",
      addtomenu => 'Dodaj Do Menu',
      label => 'Etykieta',
--- 33,55 ----
  
  $LANG_STATIC= array(
!     newpage => "Nowa Strona",
!     adminhome => "Centrum Admina",
!     staticpages => "Strony Statyczne",
!     staticpageeditor => "Edytor Stron Statycznych",
!     writtenby => "Autor",
!     date => "Ostatnia Aktualizacja",
!     title => "Tytu?",
!     content => "Zawarto??",
!     hits => "Ods?on",
!     staticpagelist => "Lista Stron Statycznych",
!     usealtheader => "U?yj Alt. Nag??wka",
!     url => "URL",
!     edit => "Edycja",
!     lastupdated => "Ostatnia Aktualizacja",
!     pageformat => "Format Strony",
!     leftrightblocks => "Lewe & Prawe Bloki",
!     blankpage => "Nowe Okno",
!     noblocks => "Bez Blok?w",
!     leftblocks => "Lewe Bloki",
      addtomenu => 'Dodaj Do Menu',
      label => 'Etykieta',
***************
*** 61,89 ****
      access_denied => 'Odmowa Dost?pu',
      access_denied_msg => 'Pr?bujesz nielegalnie  dosta? si? do panelu administruj?cego Stronami Statycznymi.  Prosz? mie? na uwadze, ?e wszelkie nieutoryzowane pr?by wej?cia s? logowane',
-     installation_complete => 'Instalacja Zako?czona',
-     installation_complete_msg => 'Dane na potrzeby pluginu Static Pages zosta?y pomy?lnie zainstalowane w Twojej bazie!  Je?eli kiedykolwiek zaistnieje potrzeba odinstalowania tego pluginu, prosz? przeczyta? dokument README dostarczony razem z tym pluginem.',
-     installation_failed => 'Instalacja Nie Powiod?a Si?',
-     installation_failed_msg => 'Instalacja pluginu Static Pages nie powiod?a si?. Prosz? sprawdzi? w pliku erroor.log komunikat b??du',
-     system_locked => 'System Zablokowany',
-     system_locked_msg => 'Plugin Static Pages jest ju? zainstalowany i zablokowany.  Je?li pr?bujesz odinstalowa? plugin, prosz? przeczyta? dokument README',
-     uninstall_complete => 'Odinstalowanie Zako?czone',
-     uninstall_complete_msg => 'Dane na potrzeby pluginu Static Pages zosta?y pomy?lnie usuni?te z Twojej bazy.',
-     uninstall_failed => 'Odinstalowanie Nie Powiod?o Si?',
-     uninstall_failed_msg => 'Odinstalowanie pluginu Static Pages nie powiod?o si?. Prosz? sprawdzi? w pliku erroor.log komunikat b??du',
      all_html_allowed => 'Wszystkie Znaczniki HTML s? dozwolone',
      results => 'Wyniki Dla Stron Statycznych',
      author => 'Autor',
! 	no_such_page_logged_in => 'Sorry '.$_USER['username'].'..',
! 	no_such_page_anon => 'Prosze si? zalogowa?..',
! 	no_page_access_msg => "Mo?e to by? spowodowane tym, ?e nie jeste? zalogowana/-y lub zarejestrowanan/-y w Serwisie {$_CONF["site_name"]}. Prosz? <a href=\"{$_CONF['site_url']}/users.php?mode=new\"> zarejestrowa? si?</a> of {$_CONF["site_name"]} aby otrzyma? przywileje u?ytkownik?w zarejestrowanych",
! 	upgrade_completed => 'Aktualizacja do wersji 1.2 zako?czona pomy?lnie',
! 	upgrade_completed_msg => 'Tw?j plugin Static Pages zosta? uaktualniony. Niech ci dobrze s?u?y!',
! 	upgrade_failed => 'Sorry Aktualizacja do wersji 1.2 nie powiod?a si?',
! 	upgrade_failed_msg => 'Pojawi? si? b??d podczas aktualizacji pluginu Static Pages.  Prosz? sprawdzi? w pliku erroor.log komunikat b??du',
! 	php_checkbox_checked => '<tr><td align="right"><b>PHP:</b></td><td><input type="checkbox" name="sp_php" value="1" checked> Czy kod strony zawiera PHP ? (Nie u?ywaj chyba, ?e musisz.)</td></tr><tr><td colspan="2"><hr></td></tr>',
! 	php_checkbox_unchecked => '<tr><td align="right"><b>PHP:</b></td><td><input type="checkbox" name="sp_php" value="1"> Kod PHP twojej strony zostanie sprawdzony. U?ywaj tej opcji ostro?nie !!</td></tr><tr><td colspan="2"><hr></td></tr>',
!     pos_label => 'Poz: ',
!     search_keywords_label => 'S?owa Kluczowe:',
!     search_keywords_msg => 'UWAGA: Je?li strona to standardowy html (nie php), WSZYSTKIE pola \'Zawarto??\' & \'S?owa Kluczowe\' s? przeszukiwane. Je?li strona ma uaktywniony php, TYLKO pole \'S?owa Kluczowe\' jest przeszukiwane.'
  );
  
--- 61,80 ----
      access_denied => 'Odmowa Dost?pu',
      access_denied_msg => 'Pr?bujesz nielegalnie  dosta? si? do panelu administruj?cego Stronami Statycznymi.  Prosz? mie? na uwadze, ?e wszelkie nieutoryzowane pr?by wej?cia s? logowane',
      all_html_allowed => 'Wszystkie Znaczniki HTML s? dozwolone',
      results => 'Wyniki Dla Stron Statycznych',
      author => 'Autor',
!     no_title_or_content => 'You must at least fill in the <b>Title</b> and <b>Content</b> fields.',
!     no_such_page_logged_in => 'Sorry '.$_USER['username'].'..',
!     no_such_page_anon => 'Prosze si? zalogowa?..',
!     no_page_access_msg => "Mo?e to by? spowodowane tym, ?e nie jeste? zalogowana/-y lub zarejestrowanan/-y w Serwisie {$_CONF["site_name"]}. Prosz? <a href=\"{$_CONF['site_url']}/users.php?mode=new\"> zarejestrowa? si?</a> of {$_CONF["site_name"]} aby otrzyma? przywileje u?ytkownik?w zarejestrowanych",
!     php_msg => 'PHP: ',
!     php_warn => 'Warning: PHP code in your page will be evaluated if you enable this option. Use with caution !!',
!     exit_msg => 'Exit Type: ',
!     exit_info => 'Enable for Login Required Message.  Leave unchecked for normal security check and message.',    
!     deny_msg => 'Access to this page is denied.  Either the page has been moved/removed or you do not have sufficient permissions.',
!     stats_headline => 'Top Ten Static Pages',
!     stats_page_title => 'Page Title',
!     stats_hits => 'Hits',
!     stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.'
  );
  

Index: spanish.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/spanish.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** spanish.php	27 Nov 2002 19:41:39 -0000	1.1
--- spanish.php	9 Mar 2003 11:47:22 -0000	1.2
***************
*** 33,55 ****
  
  $LANG_STATIC= array(
! 	newpage => "Nueva P?gina",
! 	adminhome => "Administraci?n",
! 	staticpages => "P?ginas Est?ticas",
! 	staticpageeditor => "Editor de p?ginas est?ticas",
! 	writtenby => "Escrito por",
! 	date => "?ltima edici?n",
! 	title => "T?tulo",
! 	content => "Contenido",
! 	hits => "Hits",
! 	staticpagelist => "Lista de P?ginas Est?ticas",
! 	usealtheader => "Usar cabecera alternativa",
! 	url => "URL",
! 	edit => "Editar",
! 	lastupdated => "?ltima Edici?n",
! 	pageformat => "Formato de P?gina",
! 	leftrightblocks => "Cajas a Derecha e Izquierda",
! 	blankpage => "P?gina en blanco",
! 	noblocks => "Sin Cajas",
! 	leftblocks => "Cajas a Izquierda",
      addtomenu => 'A?adir al men?',
      label => 'Etiqueta',
--- 33,55 ----
  
  $LANG_STATIC= array(
!     newpage => "Nueva P?gina",
!     adminhome => "Administraci?n",
!     staticpages => "P?ginas Est?ticas",
!     staticpageeditor => "Editor de p?ginas est?ticas",
!     writtenby => "Escrito por",
!     date => "?ltima edici?n",
!     title => "T?tulo",
!     content => "Contenido",
!     hits => "Hits",
!     staticpagelist => "Lista de P?ginas Est?ticas",
!     usealtheader => "Usar cabecera alternativa",
!     url => "URL",
!     edit => "Editar",
!     lastupdated => "?ltima Edici?n",
!     pageformat => "Formato de P?gina",
!     leftrightblocks => "Cajas a Derecha e Izquierda",
!     blankpage => "P?gina en blanco",
!     noblocks => "Sin Cajas",
!     leftblocks => "Cajas a Izquierda",
      addtomenu => 'A?adir al men?',
      label => 'Etiqueta',
***************
*** 61,77 ****
      access_denied => 'Acceso Denegado',
      access_denied_msg => 'Est?s intentando acceder a una p?gina de administraci?n de P?ginas Est?ticas. Ten en cuenta que cualquier acceso a esta p?gina se registra',
-     installation_complete => 'Instalaci?n Completada',
-     installation_complete_msg => 'Las estructuras de datos necesarias para las P?ginas Est?ticas de Geeklog se han creado correctamente en la base de datos. Si necesitas desinstalar este plugin por favor lee el fichero README',
-     installation_failed => 'Instalaci?n Fallida',
-     installation_failed_msg => 'La instalaci?n del plugin de P?ginas Est?ticas fall?. Por favor lee la informaci?n de diagn?stico del fichero error.log de Geeklog.',
-     system_locked => 'Sistema Bloqueado',
-     system_locked_msg => 'El plugin de P?ginas Est?ticas ya ha sido instalado y est? bloqueado. Si est?s intentando desinstalar este plugin, por favor, l?ete el documento README que acompa?a al plugin',
-     uninstall_complete => 'Desintalaci?n completada',
-     uninstall_complete_msg => 'Las estructuras de datos para el plugin de P?ginas Est?ticas han sido eliminadas correctamente de tu base de datos de Geeklog.',
-     uninstall_failed => 'Desinstalaci?n Fallida',
-     uninstall_failed_msg => 'El proceso de desinstalaci?n del plugin de P?ginas Est?ticas fall?. Por favor, lee la informaci?n de diagn?stico del fichero error.log de Geeklog',
      all_html_allowed => 'Se permite cualquier etiqueta HTML',
      results => 'Resultado de P?ginas Est?ticas',
!     author => 'Autor'
  );
  
--- 61,80 ----
      access_denied => 'Acceso Denegado',
      access_denied_msg => 'Est?s intentando acceder a una p?gina de administraci?n de P?ginas Est?ticas. Ten en cuenta que cualquier acceso a esta p?gina se registra',
      all_html_allowed => 'Se permite cualquier etiqueta HTML',
      results => 'Resultado de P?ginas Est?ticas',
!     author => 'Autor',
!     no_title_or_content => 'You must at least fill in the <b>Title</b> and <b>Content</b> fields.',
!     no_such_page_logged_in => 'Sorry '.$_USER['username'].'..',
!     no_such_page_anon => 'Please log in..',
!     no_page_access_msg => "This could be because you're not logged in, or not a member of {$_CONF["site_name"]}. Please <a href=\"{$_CONF['site_url']}/users.php?mode=new\"> become a member</a> of {$_CONF["site_name"]} to receive full membership access",
!     php_msg => 'PHP: ',
!     php_warn => 'Warning: PHP code in your page will be evaluated if you enable this option. Use with caution !!',
!     exit_msg => 'Exit Type: ',
!     exit_info => 'Enable for Login Required Message.  Leave unchecked for normal security check and message.',    
!     deny_msg => 'Access to this page is denied.  Either the page has been moved/removed or you do not have sufficient permissions.',
!     stats_headline => 'Top Ten Static Pages',
!     stats_page_title => 'Page Title',
!     stats_hits => 'Hits',
!     stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.'
  );
  




From dhaun at geeklog.net  Sun Mar  9 13:10:28 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 9 Mar 2003 12:10:28 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/install install.php,1.43,1.44
Message-ID: <200303091810.h29IASi05878@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install
In directory internal.geeklog.net:/tmp/cvs-serv5818

Modified Files:
	install.php 
Log Message:
Fixed spelling of staticpages.PHP feature (upercase "PHP"),
test for static pages plugin can now identify a) not installed, b) original version, c) Phill's or Tom's version, d) v1.3


Index: install.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install/install.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** install.php	9 Mar 2003 11:47:22 -0000	1.43
--- install.php	9 Mar 2003 18:10:26 -0000	1.44
***************
*** 215,219 ****
  * Checks for Static Pages Version
  *
! * @return   1 if Static Pages 1.1 by Phill or 1.2 by Tom, 0 if original Static Pages
  *
  */
--- 215,219 ----
  * Checks for Static Pages Version
  *
! * @return   0 = not installed, 1 = original plugin, 2 = plugin by Phill or Tom, 3 = v1.3
  *
  */
***************
*** 222,235 ****
      global $_TABLES;
  
!     $result = DB_query ("SELECT * FROM {$_TABLES['staticpage']}");
!     $A = DB_fetchArray ($result);
!     $fields = array ();
!     foreach ($A as $name => $value) {
!         $fields[] = $name;
!     }
!     if (in_array ('sp_pos',$fields,true)) {  
!         $retval = 1;
!     } else {
!         $retval = 0;
      }
  
--- 222,242 ----
      global $_TABLES;
  
!     $retval = 0;
! 
!     if (DB_count ($_TABLES['plugins'], 'pi_name', 'staticpages') > 0) {
!         $result = DB_query ("DESCRIBE {$_TABLES['staticpage']}");
!         $numrows = DB_numRows ($result);
! 
!         $retval = 1; // assume v1.1 for now ...
! 
!         for ($i = 0; $i < $numrows; $i++) {
!             $A = DB_fetchArray ($result);
!             if ($A[0] == 'sp_nf') {
!                 $retval = 3; // v1.3
!                 break;
!             } elseif ($A[0] == 'sp_pos') {
!                 $retval = 2; // v1.2
!             }
!         }
      }
  
***************
*** 392,396 ****
              // upgrade Static Pages plugin
              $spversion = get_SP_ver ();
!             if ($spversion == 0) { // original version
                  DB_query ("ALTER TABLE {$_TABLES['staticpage']} "
                      . "ADD COLUMN group_id mediumint(8) unsigned DEFAULT '1',"
--- 399,403 ----
              // upgrade Static Pages plugin
              $spversion = get_SP_ver ();
!             if ($spversion == 1) { // original version
                  DB_query ("ALTER TABLE {$_TABLES['staticpage']} "
                      . "ADD COLUMN group_id mediumint(8) unsigned DEFAULT '1',"
***************
*** 402,410 ****
                      . "ADD COLUMN sp_php tinyint(1) unsigned DEFAULT '0',"
                      . "ADD COLUMN sp_nf tinyint(1) unsigned DEFAULT '0'");
!                 DB_query ("INSERT INTO {$_TABLES['features']} (ft_name, ft_descr) VALUES ('staticpages.php','Ability to use PHP in static pages')");
                  $php_id = DB_insertId ();
                  $group_id = DB_getItem ($_TABLES['groups'], 'grp_id', "grp_name = 'Static Page Admin'");
                  DB_query ("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($php_id, $group_id)");
!             } else { // extended version by Phill or Tom
                  DB_query ("ALTER TABLE {$_TABLES['staticpage']} "
                      . "DROP COLUMN sp_pos,"
--- 409,417 ----
                      . "ADD COLUMN sp_php tinyint(1) unsigned DEFAULT '0',"
                      . "ADD COLUMN sp_nf tinyint(1) unsigned DEFAULT '0'");
!                 DB_query ("INSERT INTO {$_TABLES['features']} (ft_name, ft_descr) VALUES ('staticpages.PHP','Ability to use PHP in static pages')");
                  $php_id = DB_insertId ();
                  $group_id = DB_getItem ($_TABLES['groups'], 'grp_id', "grp_name = 'Static Page Admin'");
                  DB_query ("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($php_id, $group_id)");
!             } elseif ($spversion == 2) { // extended version by Phill or Tom
                  DB_query ("ALTER TABLE {$_TABLES['staticpage']} "
                      . "DROP COLUMN sp_pos,"
***************
*** 412,422 ****
                      . "ADD COLUMN sp_nf tinyint(1) unsigned DEFAULT '0'");
              }
-             DB_query ("UPDATE {$_TABLES['plugins']} SET pi_version = '1.3' WHERE pi_name = 'staticpages'");
  
!             // remove Static Pages 'lock' flag
!             DB_query ("DELETE FROM {$_TABLES['vars']} WHERE name = 'staticpages'");
  
!             // remove Static Pages Admin group id
!             DB_query ("DELETE FROM {$_TABLES['vars']} WHERE name = 'sp_group_id'");
  
              $current_gl_version = '1.3.8';
--- 419,433 ----
                      . "ADD COLUMN sp_nf tinyint(1) unsigned DEFAULT '0'");
              }
  
!             if ($spversion > 0) {
!                 // update plugin version number
!                 DB_query ("UPDATE {$_TABLES['plugins']} SET pi_version = '1.3' WHERE pi_name = 'staticpages'");
  
!                 // remove Static Pages 'lock' flag
!                 DB_query ("DELETE FROM {$_TABLES['vars']} WHERE name = 'staticpages'");
! 
!                 // remove Static Pages Admin group id
!                 DB_query ("DELETE FROM {$_TABLES['vars']} WHERE name = 'sp_group_id'");
!             }
  
              $current_gl_version = '1.3.8';




From dhaun at geeklog.net  Mon Mar 10 05:50:02 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 10 Mar 2003 04:50:02 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/plugins/staticpages index.php,1.15,1.16
Message-ID: <200303101050.h2AAo2i25714@internal.geeklog.net>

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

Modified Files:
	index.php 
Log Message:
You can now edit the ID of a static page (to create more readable URLs).


Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/plugins/staticpages/index.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** index.php	9 Mar 2003 11:47:22 -0000	1.15
--- index.php	10 Mar 2003 10:50:00 -0000	1.16
***************
*** 6,11 ****
  // +---------------------------------------------------------------------------+
  // | index.php                                                                 |
- // | Administration page.                                                      |
  // |                                                                           |
  // +---------------------------------------------------------------------------+
  // | Copyright (C) 2000-2003 by the following authors:                         |
--- 6,11 ----
  // +---------------------------------------------------------------------------+
  // | index.php                                                                 |
  // |                                                                           |
+ // | Administration page.                                                      |
  // +---------------------------------------------------------------------------+
  // | Copyright (C) 2000-2003 by the following authors:                         |
***************
*** 55,59 ****
  *
  */ 
! function form($A, $error=false) 
  {
  	global $_TABLES, $PHP_SELF, $_CONF, $HTTP_POST_VARS, $_USER, $LANG_STATIC,$_SP_CONF, $LANG_ACCESS, $mode, $sp_id;
--- 55,59 ----
  *
  */ 
! function form ($A, $error = false) 
  {
  	global $_TABLES, $PHP_SELF, $_CONF, $HTTP_POST_VARS, $_USER, $LANG_STATIC,$_SP_CONF, $LANG_ACCESS, $mode, $sp_id;
***************
*** 89,95 ****
          $sp_template->set_var('lang_accessrights', $LANG_ACCESS['accessrights']);
      	$sp_template->set_var('lang_owner', $LANG_ACCESS['owner']);
! 		$sp_template->set_var('owner_username', DB_getItem($_TABLES['users'],'username',"uid = {$A['owner_id']}"));
! 		$sp_template->set_var('owner_id', $A['owner_id']);
!    		$sp_template->set_var('lang_group', $LANG_ACCESS['group']);
      	$usergroups = SEC_getUserGroups();
      	if ($access == 3) {
--- 89,95 ----
          $sp_template->set_var('lang_accessrights', $LANG_ACCESS['accessrights']);
      	$sp_template->set_var('lang_owner', $LANG_ACCESS['owner']);
!         $sp_template->set_var('owner_username', DB_getItem($_TABLES['users'],'username',"uid = {$A['owner_id']}"));
!         $sp_template->set_var('owner_id', $A['owner_id']);
!         $sp_template->set_var('lang_group', $LANG_ACCESS['group']);
      	$usergroups = SEC_getUserGroups();
      	if ($access == 3) {
***************
*** 127,131 ****
--- 127,138 ----
          $sp_template->set_var('lang_writtenby', $LANG_STATIC['writtenby']);
          $sp_template->set_var('username', DB_getItem($_TABLES['users'],'username',"uid = {$A["sp_uid"]}"));
+         $sp_template->set_var ('lang_url', $LANG_STATIC['url']);
+         $sp_template->set_var ('lang_id', $LANG_STATIC['id']);
          $sp_template->set_var('sp_uid', $A['sp_uid']);
+         $sp_template->set_var('sp_id', $A['sp_id']);
+         $sp_template->set_var('sp_old_id', $A['sp_old_id']);
+         $sp_template->set_var ('example_url', COM_buildURL ($_CONF['site_url']
+                                . '/staticpages/index.php?page=' . $A['sp_id']));
+ 
          if (SEC_hasRights ('staticpages.PHP')) {
              if ($A['sp_php'] == 1) {
***************
*** 139,143 ****
              $sp_template->set_var('php_msg',$LANG_STATIC['php_msg']);
          } else {
!   	    $sp_template->set_var('php_type','hidden');
              $sp_template->set_var('php_warn','');
              $sp_template->set_var('php_msg','');
--- 146,150 ----
              $sp_template->set_var('php_msg',$LANG_STATIC['php_msg']);
          } else {
!   	        $sp_template->set_var('php_type','hidden');
              $sp_template->set_var('php_warn','');
              $sp_template->set_var('php_msg','');
***************
*** 200,204 ****
              $sp_template->set_var('lang_allowedhtml', $LANG_STATIC['all_html_allowed']);
          }
-         $sp_template->set_var('sp_id', $A['sp_id']);
          $sp_template->set_var('lang_hits', $LANG_STATIC['hits']);
          if (empty($A['sp_hits'])) {
--- 207,210 ----
***************
*** 221,241 ****
  *
  */
! function staticpageeditor($sp_id, $mode = '') 
  {
  	global $HTTP_POST_VARS, $_USER, $_CONF, $_TABLES;
  
! 	if (!empty($sp_id) && $mode == 'edit') {
! 		$result = DB_query("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE sp_id = '$sp_id' AND " . SP_getPerms('','3'));
! 		$A = DB_fetchArray($result);
! 	} elseif ($mode == 'edit') {
! 		$A['sp_id'] = COM_makesid();
! 		$A['sp_uid'] = $_USER["uid"];
! 		$A['unixdate'] = time();
! 	} else {
! 		$A = $HTTP_POST_VARS;
! 		$A['sp_content'] = COM_checkHTML(COM_checkWords($A['sp_content']));
! 		$A['sp_title'] = strip_tags($A['sp_title']);
! 	}
! 	return form($A);
  }
  
--- 227,251 ----
  *
  */
! function staticpageeditor ($sp_id, $mode = '') 
  {
  	global $HTTP_POST_VARS, $_USER, $_CONF, $_TABLES;
  
!     if (!empty ($sp_id) && $mode == 'edit') {
!         $result = DB_query ("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE sp_id = '$sp_id' AND " . SP_getPerms ('', '3'));
!         $A = DB_fetchArray ($result);
!         $A['sp_old_id'] = $A['sp_id'];
!     } elseif ($mode == 'edit') {
!         $A['sp_id'] = COM_makesid ();
!         $A['sp_uid'] = $_USER['uid'];
!         $A['unixdate'] = time ();
!         $A['sp_old_id'] = '';
!     } else {
!         $A = $HTTP_POST_VARS;
!         $A['sp_content'] = COM_checkHTML (COM_checkWords ($A['sp_content']));
!         $A['sp_title'] = strip_tags ($A['sp_title']);
!         $A['sp_old_id'] = $HTTP_POST_VARS['sp_old_id'];
!     }
! 
!     return form ($A);
  }
  
***************
*** 243,247 ****
  # Displays a list of static pages 
  
! function liststaticpages($page = 1) 
  {
  	global $_TABLES, $LANG_STATIC, $_CONF;
--- 253,257 ----
  # Displays a list of static pages 
  
! function liststaticpages ($page = 1) 
  {
  	global $_TABLES, $LANG_STATIC, $_CONF;
***************
*** 327,340 ****
  * @sp_php       int         Flag to indicate PHP usage
  * @sp_nf        int         Flag to indicate type of not found message
  *
  */
! 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)
  {
  	global $_CONF, $LANG12, $LANG_STATIC, $_SP_CONF, $_TABLES;
  
! 	if (!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') {
--- 337,374 ----
  * @sp_php       int         Flag to indicate PHP usage
  * @sp_nf        int         Flag to indicate type of not found message
+ * @sp_old_id    string      original ID of this static page
  *
  */
! 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);
!     $sp_id = str_replace (array ('_', '/', '\\', ':'), '-', $sp_id);
!     if (empty ($sp_id)) {
!         $sp_id = COM_makesid ();
!     }
  
!     // Check for unique page ID
!     $duplicate_id = false;
!     $delete_old_page = false;
!     if (DB_count ($_TABLES['staticpage'], 'sp_id', $sp_id) > 0) {
!         if ($sp_id != $sp_old_id) {
!             $duplicate_id = true;
!         }
!     } else {
!         $delete_old_page = true;
!     }
! 
!     if ($duplicate_id) {
!         $retval .= COM_siteHeader ();
!         $retval .= COM_errorLog ($LANG_STATIC['duplicate_id'], 2);
!         $retval .= staticpageeditor ($sp_id);
!         $retval .= COM_siteFooter ();
!         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') {
***************
*** 346,384 ****
  		// Clean up the text
          if ($_SP_CONF['censor'] == 1) {
!             $sp_content = COM_checkWords($sp_content); 
!             $sp_title = COM_checkWords($sp_title);
!             $sp_label = COM_checkWords($sp_label);
          }
          if ($_SP_CONF['filter_html'] == 1) {
!             $sp_content = COM_checkHTML($sp_content);
!             $sp_title = COM_checkHTML($sp_title);
!             $sp_label = COM_checkHTML($sp_label);
          }
!         $sp_content = addslashes($sp_content);
!         $sp_title = addslashes($sp_title);
!         $sp_label = addslashes($sp_label);
! 
! 		//$sp_content= addslashes(COM_checkHTML(COM_checkWords($sp_content)));
! 		//$sp_title = addslashes(htmlspecialchars(strip_tags(COM_checkWords($sp_title))));
! 		//$sp_label = addslashes(htmlspecialchars(strip_tags(COM_checkWords($sp_label))));
  
!         //If user does not have php edit perms, then set php flag to 0.
!         if (!SEC_hasRights('staticpages.PHP')) {
! 	        $sp_php='0';
          }
!         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'",$_CONF['site_admin_url'] . '/plugins/staticpages/index.php');
! 
  	} else {
!         $retval .= COM_siteHeader();
! 		$retval .= COM_errorLog($LANG_STATIC['no_title_or_content'],2);
! 		$retval .= staticpageeditor($sp_id);
!         $retval .= COM_siteFooter();
          echo $retval;
  	}
  }
  
- // MAIN
  
  
  if (empty($mode) OR empty($sp_id)) {
--- 380,418 ----
  		// Clean up the text
          if ($_SP_CONF['censor'] == 1) {
!             $sp_content = COM_checkWords ($sp_content); 
!             $sp_title = COM_checkWords ($sp_title);
!             $sp_label = COM_checkWords ($sp_label);
          }
          if ($_SP_CONF['filter_html'] == 1) {
!             $sp_content = COM_checkHTML ($sp_content);
!             $sp_title = COM_checkHTML ($sp_title);
!             $sp_label = COM_checkHTML ($sp_label);
          }
!         $sp_content = addslashes ($sp_content);
!         $sp_title = addslashes ($sp_title);
!         $sp_label = addslashes ($sp_label);
  
!         // If user does not have php edit perms, then set php flag to 0.
!         if (!SEC_hasRights ('staticpages.PHP')) {
! 	        $sp_php = 0;
          }
!         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);
!         $retval .= staticpageeditor ($sp_id);
!         $retval .= COM_siteFooter ();
          echo $retval;
  	}
  }
  
  
+ // MAIN
  
  if (empty($mode) OR empty($sp_id)) {
***************
*** 399,408 ****
      $display .= COM_siteFooter();
  } else if (($mode == $LANG_STATIC['save']) && !empty ($LANG_STATIC['save'])) {
!     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);
!     COM_errorlog("Saved Static Page " . $sp_id,1);
  } else {
!     $display .= COM_siteHeader('menu');
!     $display .= liststaticpages($sp_id);
!     $display .= COM_siteFooter();
  }
  
--- 433,444 ----
      $display .= COM_siteFooter();
  } else if (($mode == $LANG_STATIC['save']) && !empty ($LANG_STATIC['save'])) {
!     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);
  } else {
!     $display .= COM_siteHeader ('menu');
!     $display .= liststaticpages ($page);
!     $display .= COM_siteFooter ();
  }
  




From dhaun at geeklog.net  Mon Mar 10 05:50:02 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 10 Mar 2003 04:50:02 -0600
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.71,1.72
Message-ID: <200303101050.h2AAo2i25701@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory internal.geeklog.net:/tmp/cvs-serv25664/docs

Modified Files:
	history 
Log Message:
You can now edit the ID of a static page (to create more readable URLs).


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** history	9 Mar 2003 11:47:22 -0000	1.71
--- history	10 Mar 2003 10:50:00 -0000	1.72
***************
*** 4,7 ****
--- 4,9 ----
  -------
  
+ - You can now edit the ID of a static page to create more readable URLs like
+   http://yoursite/staticpages/index.php?page=about
  - Integrated Tom Willet's version of the Static Pages plugin. This new version
    is now called Static Pages 1.3.




From dhaun at geeklog.net  Mon Mar 10 05:50:02 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 10 Mar 2003 04:50:02 -0600
Subject: [geeklog-cvs] geeklog-1.3/plugins/staticpages/language danish.php,1.2,1.3 english.php,1.4,1.5 german.php,1.5,1.6 polish.php,1.2,1.3 spanish.php,1.2,1.3
Message-ID: <200303101050.h2AAo2i25708@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language
In directory internal.geeklog.net:/tmp/cvs-serv25664/plugins/staticpages/language

Modified Files:
	danish.php english.php german.php polish.php spanish.php 
Log Message:
You can now edit the ID of a static page (to create more readable URLs).


Index: danish.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/danish.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** danish.php	9 Mar 2003 11:47:22 -0000	1.2
--- danish.php	10 Mar 2003 10:50:00 -0000	1.3
***************
*** 77,81 ****
      stats_page_title => 'Page Title',
      stats_hits => 'Hits',
!     stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.'
  );
  
--- 77,83 ----
      stats_page_title => 'Page Title',
      stats_hits => 'Hits',
!     stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.',
!     id => 'ID',
!     duplicate_id => 'The ID you chose for this static page is already in use. Please select another ID.'
  );
  

Index: english.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/english.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** english.php	9 Mar 2003 11:47:22 -0000	1.4
--- english.php	10 Mar 2003 10:50:00 -0000	1.5
***************
*** 76,80 ****
      stats_page_title => 'Page Title',
      stats_hits => 'Hits',
!     stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.'
  );
  
--- 76,82 ----
      stats_page_title => 'Page Title',
      stats_hits => 'Hits',
!     stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.',
!     id => 'ID',
!     duplicate_id => 'The ID you chose for this static page is already in use. Please select another ID.'
  );
  

Index: german.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/german.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** german.php	9 Mar 2003 11:47:22 -0000	1.5
--- german.php	10 Mar 2003 10:50:00 -0000	1.6
***************
*** 67,72 ****
      author => 'Autor',
      no_title_or_content => 'Bitte mindestens die Felder <b>Titel</b> und <b>Inhalt</b> ausf?llen.',
!     no_such_page_logged_in => 'Sorry '.$_USER['username'].'..',
!     no_such_page_anon => 'Please log in..',
      no_page_access_msg => "This could be because you're not logged in, or not a member of {$_CONF["site_name"]}. Please <a href=\"{$_CONF['site_url']}/users.php?mode=new\"> become a member</a> of {$_CONF["site_name"]} to receive full membership access.",
      php_msg => 'PHP: ',
--- 67,72 ----
      author => 'Autor',
      no_title_or_content => 'Bitte mindestens die Felder <b>Titel</b> und <b>Inhalt</b> ausf?llen.',
!     no_such_page_logged_in => 'Sorry, ' . $_USER['username'] . ' ...',
!     no_such_page_anon => 'Bitte einloggen.',
      no_page_access_msg => "This could be because you're not logged in, or not a member of {$_CONF["site_name"]}. Please <a href=\"{$_CONF['site_url']}/users.php?mode=new\"> become a member</a> of {$_CONF["site_name"]} to receive full membership access.",
      php_msg => 'PHP: ',
***************
*** 75,82 ****
      exit_info => 'Art des Hinweistextes, wenn kein Zugriff auf die Seite erlaubt ist: Aktiviert = "Anmeldung erforderlich", nicht aktiviert = "Zugriff verweigert".',
      deny_msg => 'Zugriff auf diese Seite ist nicht m?glich. Die Seite wurde entweder umbenannt oder gel?scht oder Du hast nicht die n?tigen Zugriffsrechte.',
!     stats_headline => 'Top Ten der Statische Seiten',
      stats_page_title => 'Titel',
      stats_hits => 'Angezeigt',
!     stats_no_hits => 'Es gibt keine Statischen Seiten oder sie wurden von niemandem gelesen.'
  );
  
--- 75,84 ----
      exit_info => 'Art des Hinweistextes, wenn kein Zugriff auf die Seite erlaubt ist: Aktiviert = "Anmeldung erforderlich", nicht aktiviert = "Zugriff verweigert".',
      deny_msg => 'Zugriff auf diese Seite ist nicht m?glich. Die Seite wurde entweder umbenannt oder gel?scht oder Du hast nicht die n?tigen Zugriffsrechte.',
!     stats_headline => 'Top Ten der Statischen Seiten',
      stats_page_title => 'Titel',
      stats_hits => 'Angezeigt',
!     stats_no_hits => 'Es gibt keine Statischen Seiten oder sie wurden von niemandem gelesen.',
!     id => 'ID',
!     duplicate_id => 'Diese ID wird bereits f?r eine andere Statische Seite benutzt. Bitte w?hle eine andere ID.'
  );
  

Index: polish.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/polish.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** polish.php	9 Mar 2003 11:47:22 -0000	1.2
--- polish.php	10 Mar 2003 10:50:00 -0000	1.3
***************
*** 76,80 ****
      stats_page_title => 'Page Title',
      stats_hits => 'Hits',
!     stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.'
  );
  
--- 76,82 ----
      stats_page_title => 'Page Title',
      stats_hits => 'Hits',
!     stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.',
!     id => 'ID',
!     duplicate_id => 'The ID you chose for this static page is already in use. Please select another ID.'
  );
  

Index: spanish.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/spanish.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** spanish.php	9 Mar 2003 11:47:22 -0000	1.2
--- spanish.php	10 Mar 2003 10:50:00 -0000	1.3
***************
*** 76,80 ****
      stats_page_title => 'Page Title',
      stats_hits => 'Hits',
!     stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.'
  );
  
--- 76,82 ----
      stats_page_title => 'Page Title',
      stats_hits => 'Hits',
!     stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.',
!     id => 'ID',
!     duplicate_id => 'The ID you chose for this static page is already in use. Please select another ID.'
  );
  




From dhaun at geeklog.net  Mon Mar 10 05:50:02 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 10 Mar 2003 04:50:02 -0600
Subject: [geeklog-cvs] geeklog-1.3/plugins/staticpages/templates/admin editor.thtml,1.5,1.6
Message-ID: <200303101050.h2AAo2i25711@internal.geeklog.net>

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

Modified Files:
	editor.thtml 
Log Message:
You can now edit the ID of a static page (to create more readable URLs).


Index: editor.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/templates/admin/editor.thtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** editor.thtml	9 Mar 2003 11:47:22 -0000	1.5
--- editor.thtml	10 Mar 2003 10:50:00 -0000	1.6
***************
*** 3,14 ****
                                      <table border="0" cellspacing="0" cellpadding="3" width="100%">
                                          <tr>
-                                             <td align="right">{lang_writtenby}:</td>
-                                             <td>{username}<input type="hidden" name="sp_uid" value="{sp_uid}"></td>
-                                         </tr>
-                                         <tr>
-                                             <td align="right">{lang_lastupdated}:</td>
-                                             <td>{sp_formateddate}<input type="hidden" name="unixdate" value="{sp_date}"></td>
-                                         </tr>
-                                         <tr>
                                              <td align="right">{lang_title}:</td>
                                              <td><input type="text" size="48" maxlength="255" name="sp_title" value="{sp_title}"></td>
--- 3,6 ----
***************
*** 33,36 ****
--- 25,36 ----
                                          </tr>
                                          <tr>
+                                           <td align="right">{lang_id}:</td>
+                                           <td><input type="text" name="sp_id", size="20" maxlength="20" value="{sp_id}"></td>
+                                         </tr>
+                                         <tr>
+                                           <td align="right">{lang_url}:</td>
+                                           <td>{example_url}</td>
+                                         </tr>
+                                         <tr>
                                              <td valign="top" align="right">{lang_content}:</td>
                                              <td>
***************
*** 40,52 ****
                                          </tr>
                                          <tr>
                                              <td colspan="2"><hr></td>
                                          </tr>
                                          <tr>
                                              <td align="right" valign="top">{php_msg}</td>
!                                             <td><input type="{php_type}" name="sp_php" value="1" {php_checked}>&nbsp;&nbsp;{php_warn}</td>
                                          </tr>
                                          <tr>
                                              <td align="right" valign="top">{exit_msg}</td>
!                                             <td><input type="checkbox" name="sp_nf" value="1" {exit_checked}>&nbsp;&nbsp;{exit_info}</td>
                                          </tr>
                                          <tr>
--- 40,60 ----
                                          </tr>
                                          <tr>
+                                             <td align="right">{lang_writtenby}:</td>
+                                             <td>{username}<input type="hidden" name="sp_uid" value="{sp_uid}"></td>
+                                         </tr>
+                                         <tr>
+                                             <td align="right">{lang_lastupdated}:</td>
+                                             <td>{sp_formateddate}<input type="hidden" name="unixdate" value="{sp_date}"></td>
+                                         </tr>
+                                         <tr>
                                              <td colspan="2"><hr></td>
                                          </tr>
                                          <tr>
                                              <td align="right" valign="top">{php_msg}</td>
!                                             <td valign="top"><input type="{php_type}" name="sp_php" value="1" {php_checked}>&nbsp;&nbsp;{php_warn}</td>
                                          </tr>
                                          <tr>
                                              <td align="right" valign="top">{exit_msg}</td>
!                                             <td valign="top"><input type="checkbox" name="sp_nf" value="1" {exit_checked}>&nbsp;&nbsp;{exit_info}</td>
                                          </tr>
                                          <tr>
***************
*** 95,99 ****
                                                  <input type="submit" value="{lang_save}" name="mode"> 
                                                  {delete_option}
!                                                 <input type="hidden" name="sp_id" value="{sp_id}">
                                              </td>
                                          </tr>
--- 103,107 ----
                                                  <input type="submit" value="{lang_save}" name="mode"> 
                                                  {delete_option}
!                                                 <input type="hidden" name="sp_old_id" value="{sp_old_id}">
                                              </td>
                                          </tr>




From dhaun at geeklog.net  Mon Mar 10 10:53:11 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 10 Mar 2003 09:53:11 -0600
Subject: [geeklog-cvs] geeklog-1.3/plugins/staticpages/templates/admin editor.thtml,1.6,1.7
Message-ID: <200303101553.h2AFrAi00434@internal.geeklog.net>

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

Modified Files:
	editor.thtml 
Log Message:
Removed a comma ...


Index: editor.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/templates/admin/editor.thtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** editor.thtml	10 Mar 2003 10:50:00 -0000	1.6
--- editor.thtml	10 Mar 2003 15:53:08 -0000	1.7
***************
*** 26,30 ****
                                          <tr>
                                            <td align="right">{lang_id}:</td>
!                                           <td><input type="text" name="sp_id", size="20" maxlength="20" value="{sp_id}"></td>
                                          </tr>
                                          <tr>
--- 26,30 ----
                                          <tr>
                                            <td align="right">{lang_id}:</td>
!                                           <td><input type="text" name="sp_id" size="20" maxlength="20" value="{sp_id}"></td>
                                          </tr>
                                          <tr>




From dhaun at geeklog.net  Mon Mar 10 10:53:46 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 10 Mar 2003 09:53:46 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/plugins/staticpages index.php,1.16,1.17
Message-ID: <200303101553.h2AFrki00472@internal.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;
!     }
  }
  




From dhaun at geeklog.net  Mon Mar 10 13:36:03 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 10 Mar 2003 12:36:03 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/plugins/staticpages index.php,1.17,1.18
Message-ID: <200303101836.h2AIa3i05888@internal.geeklog.net>

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

Modified Files:
	index.php 
Log Message:
Found this old feature request (#544847) ... You can now "clone" static pages.


Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/plugins/staticpages/index.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** index.php	10 Mar 2003 15:53:44 -0000	1.17
--- index.php	10 Mar 2003 18:36:01 -0000	1.18
***************
*** 229,233 ****
  function staticpageeditor ($sp_id, $mode = '') 
  {
! 	global $HTTP_POST_VARS, $_USER, $_CONF, $_TABLES;
  
      if (!empty ($sp_id) && $mode == 'edit') {
--- 229,233 ----
  function staticpageeditor ($sp_id, $mode = '') 
  {
!     global $HTTP_POST_VARS, $_USER, $_CONF, $_TABLES;
  
      if (!empty ($sp_id) && $mode == 'edit') {
***************
*** 240,243 ****
--- 240,250 ----
          $A['unixdate'] = time ();
          $A['sp_old_id'] = '';
+     } elseif (!empty ($sp_id) && $mode == 'clone') {
+         $result = DB_query ("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE sp_id = '$sp_id' AND " . SP_getPerms ('', '3'));
+         $A = DB_fetchArray ($result);
+         $A['sp_id'] = COM_makesid ();
+         $A['sp_uid'] = $_USER['uid'];
+         $A['unixdate'] = time ();
+         $A['sp_old_id'] = '';
      } else {
          $A = $HTTP_POST_VARS;
***************
*** 255,259 ****
  function liststaticpages ($page = 1) 
  {
! 	global $_TABLES, $LANG_STATIC, $_CONF;
  
      $retval = '';
--- 262,266 ----
  function liststaticpages ($page = 1) 
  {
!     global $_TABLES, $LANG_STATIC, $_CONF;
  
      $retval = '';
***************
*** 267,270 ****
--- 274,278 ----
      $sp_templates->set_var('lang_newpage', $LANG_STATIC['newpage']);
      $sp_templates->set_var('lang_adminhome', $LANG_STATIC['adminhome']);
+     $sp_templates->set_var('lang_instructions', $LANG_STATIC['instructions']);
      $sp_templates->set_var('lang_title', $LANG_STATIC['title']);
      $sp_templates->set_var('lang_writtenby', $LANG_STATIC['writtenby']);
***************
*** 285,288 ****
--- 293,297 ----
              $sp_templates->set_var('row_number', $i);
              $sp_templates->set_var('page_display_url',COM_buildURL($_CONF['site_url'] . '/staticpages/index.php?page=' . $A['sp_id']));
+             $sp_templates->set_var ('page_clone_url', COM_buildURL ($_CONF['site_admin_url'] . '/plugins/staticpages/index.php?mode=clone&amp;sp_id=' . $A['sp_id']));
              $sp_templates->set_var('sp_title', stripslashes ($A['sp_title']));
              $sp_templates->set_var('username', DB_getItem($_TABLES['users'],'username',"uid = {$A["sp_uid"]}"));
***************
*** 434,437 ****
--- 443,450 ----
      $display .= staticpageeditor($sp_id,$mode);
      $display .= COM_siteFooter();
+ } else if ($mode == 'clone') {
+     $display .= COM_siteHeader ('menu');
+     $display .= staticpageeditor ($sp_id,$mode);
+     $display .= COM_siteFooter ();
  } else if (($mode == $LANG_STATIC['save']) && !empty ($LANG_STATIC['save'])) {
      submitstaticpage ($sp_id, $sp_uid, $sp_title, $sp_content, $unixdate,




From dhaun at geeklog.net  Mon Mar 10 13:36:03 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 10 Mar 2003 12:36:03 -0600
Subject: [geeklog-cvs] geeklog-1.3/plugins/staticpages/templates/admin list.thtml,1.6,1.7 row.thtml,1.4,1.5
Message-ID: <200303101836.h2AIa3i05886@internal.geeklog.net>

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

Modified Files:
	list.thtml row.thtml 
Log Message:
Found this old feature request (#544847) ... You can now "clone" static pages.


Index: list.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/templates/admin/list.thtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** list.thtml	20 Aug 2002 13:14:57 -0000	1.6
--- list.thtml	10 Mar 2003 18:36:01 -0000	1.7
***************
*** 2,14 ****
                                  <table border="0" cellspacing="0" cellpadding="2" width="100%">
                                      <tr>
!                                         <td>
                                              <img src="{site_url}/staticpages/images/staticpages.gif">
                                          </td>
                                          <td>[ <a href="{new_page_url}">{lang_newpage}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
                                      </tr>
                                  </table>
                                  <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                      <tr>
!                                         <th align="left">#</th>
                                          <th align="left">{lang_title}</th>
                                          <th>{lang_writtenby}</th>
--- 2,17 ----
                                  <table border="0" cellspacing="0" cellpadding="2" width="100%">
                                      <tr>
!                                         <td rowspan="2">
                                              <img src="{site_url}/staticpages/images/staticpages.gif">
                                          </td>
                                          <td>[ <a href="{new_page_url}">{lang_newpage}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
                                      </tr>
+                                     <tr>
+                                         <td>{lang_instructions}</td>
+                                     </tr>
                                  </table>
                                  <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                      <tr>
!                                         <th align="left" colspan="2">#</th>
                                          <th align="left">{lang_title}</th>
                                          <th>{lang_writtenby}</th>

Index: row.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/templates/admin/row.thtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** row.thtml	20 Aug 2002 13:14:57 -0000	1.4
--- row.thtml	10 Mar 2003 18:36:01 -0000	1.5
***************
*** 4,7 ****
--- 4,10 ----
                                      </td>
                                      <td align="left">
+                                         [<a href="{page_clone_url}">C</a>]
+                                     </td>
+                                     <td align="left">
                                          <a href="{page_display_url}">{sp_title}</a>
                                      </td>




From dhaun at geeklog.net  Mon Mar 10 13:36:03 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 10 Mar 2003 12:36:03 -0600
Subject: [geeklog-cvs] geeklog-1.3/plugins/staticpages/language danish.php,1.3,1.4 english.php,1.5,1.6 german.php,1.6,1.7 polish.php,1.3,1.4 spanish.php,1.3,1.4
Message-ID: <200303101836.h2AIa3i05887@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language
In directory internal.geeklog.net:/tmp/cvs-serv5835/plugins/staticpages/language

Modified Files:
	danish.php english.php german.php polish.php spanish.php 
Log Message:
Found this old feature request (#544847) ... You can now "clone" static pages.


Index: danish.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/danish.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** danish.php	10 Mar 2003 10:50:00 -0000	1.3
--- danish.php	10 Mar 2003 18:36:01 -0000	1.4
***************
*** 79,83 ****
      stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.',
      id => 'ID',
!     duplicate_id => 'The ID you chose for this static page is already in use. Please select another ID.'
  );
  
--- 79,84 ----
      stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.',
      id => 'ID',
!     duplicate_id => 'The ID you chose for this static page is already in use. Please select another ID.',
!     instructions => "To modify or delete a static page, click on that page's number below. To view a static page, click on the title of the page you wish to view. To create a new static page click on new page above. Click on [C] to create a copy of an existing page."
  );
  

Index: english.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/english.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** english.php	10 Mar 2003 10:50:00 -0000	1.5
--- english.php	10 Mar 2003 18:36:01 -0000	1.6
***************
*** 78,82 ****
      stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.',
      id => 'ID',
!     duplicate_id => 'The ID you chose for this static page is already in use. Please select another ID.'
  );
  
--- 78,83 ----
      stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.',
      id => 'ID',
!     duplicate_id => 'The ID you chose for this static page is already in use. Please select another ID.',
!     instructions => "To modify or delete a static page, click on that page's number below. To view a static page, click on the title of the page you wish to view. To create a new static page click on new page above. Click on [C] to create a copy of an existing page."
  );
  

Index: german.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/german.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** german.php	10 Mar 2003 10:50:00 -0000	1.6
--- german.php	10 Mar 2003 18:36:01 -0000	1.7
***************
*** 80,84 ****
      stats_no_hits => 'Es gibt keine Statischen Seiten oder sie wurden von niemandem gelesen.',
      id => 'ID',
!     duplicate_id => 'Diese ID wird bereits f?r eine andere Statische Seite benutzt. Bitte w?hle eine andere ID.'
  );
  
--- 80,85 ----
      stats_no_hits => 'Es gibt keine Statischen Seiten oder sie wurden von niemandem gelesen.',
      id => 'ID',
!     duplicate_id => 'Diese ID wird bereits f?r eine andere Statische Seite benutzt. Bitte w?hle eine andere ID.',
!     instructions => 'Auf die Nummer klicken, um eine Statische Seite zu ?ndern oder zu l?schen. Um eine Statische Seite anzusehen, auf deren Titel klicken. Auf Neue Seite (s.o.) klicken, um einen neue Statische Seite anzulegen. Auf das [C] klicken, um eine Kopie einer vorhandenen Seite zu erhalten.'
  );
  

Index: polish.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/polish.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** polish.php	10 Mar 2003 10:50:00 -0000	1.3
--- polish.php	10 Mar 2003 18:36:01 -0000	1.4
***************
*** 78,82 ****
      stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.',
      id => 'ID',
!     duplicate_id => 'The ID you chose for this static page is already in use. Please select another ID.'
  );
  
--- 78,83 ----
      stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.',
      id => 'ID',
!     duplicate_id => 'The ID you chose for this static page is already in use. Please select another ID.',
!     instructions => "To modify or delete a static page, click on that page's number below. To view a static page, click on the title of the page you wish to view. To create a new static page click on new page above. Click on [C] to create a copy of an existing page."
  );
  

Index: spanish.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language/spanish.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spanish.php	10 Mar 2003 10:50:00 -0000	1.3
--- spanish.php	10 Mar 2003 18:36:01 -0000	1.4
***************
*** 78,82 ****
      stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.',
      id => 'ID',
!     duplicate_id => 'The ID you chose for this static page is already in use. Please select another ID.'
  );
  
--- 78,83 ----
      stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.',
      id => 'ID',
!     duplicate_id => 'The ID you chose for this static page is already in use. Please select another ID.',
!     instructions => "To modify or delete a static page, click on that page's number below. To view a static page, click on the title of the page you wish to view. To create a new static page click on new page above. Click on [C] to create a copy of an existing page."
  );
  




From dhaun at geeklog.net  Mon Mar 10 13:36:03 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 10 Mar 2003 12:36:03 -0600
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.72,1.73
Message-ID: <200303101836.h2AIa3i05885@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory internal.geeklog.net:/tmp/cvs-serv5835/docs

Modified Files:
	history 
Log Message:
Found this old feature request (#544847) ... You can now "clone" static pages.


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** history	10 Mar 2003 10:50:00 -0000	1.72
--- history	10 Mar 2003 18:36:01 -0000	1.73
***************
*** 4,7 ****
--- 4,8 ----
  -------
  
+ - You can now "clone" static pages, i.e. make a copy of an existing page.
  - You can now edit the ID of a static page to create more readable URLs like
    http://yoursite/staticpages/index.php?page=about




From dhaun at geeklog.net  Tue Mar 11 04:37:53 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Tue, 11 Mar 2003 03:37:53 -0600
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.73,1.74
Message-ID: <200303110937.h2B9bqi29367@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory internal.geeklog.net:/tmp/cvs-serv29353/docs

Modified Files:
	history 
Log Message:
Fixed the "late" update of portal blocks (bug #681855).


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** history	10 Mar 2003 18:36:01 -0000	1.73
--- history	11 Mar 2003 09:37:50 -0000	1.74
***************
*** 4,7 ****
--- 4,8 ----
  -------
  
+ - Fixed "late" update of portal blocks (bug #681855).
  - You can now "clone" static pages, i.e. make a copy of an existing page.
  - You can now edit the ID of a static page to create more readable URLs like




From dhaun at geeklog.net  Tue Mar 11 04:37:53 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Tue, 11 Mar 2003 03:37:53 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.204,1.205
Message-ID: <200303110937.h2B9bri29370@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv29353/public_html

Modified Files:
	lib-common.php 
Log Message:
Fixed the "late" update of portal blocks (bug #681855).


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.204
retrieving revision 1.205
diff -C2 -d -r1.204 -r1.205
*** lib-common.php	1 Mar 2003 16:40:25 -0000	1.204
--- lib-common.php	11 Mar 2003 09:37:50 -0000	1.205
***************
*** 3050,3054 ****
              if( $A['type'] == 'portal' )
              {
!                 COM_rdfCheck( $A['bid'], $A['rdfurl'], $A['date'] );
              }
  
--- 3050,3058 ----
              if( $A['type'] == 'portal' )
              {
!                 if( COM_rdfCheck( $A['bid'], $A['rdfurl'], $A['date'] ))
!                 {
!                     $A['content'] = DB_getItem( $_TABLES['blocks'], 'content',
!                                                 "bid = '{$A['bid']}'");
!                 }
              }
  
***************
*** 3120,3128 ****
  * @param        string      $date       Last time the headlines were imported
  * @see function COM_rdfImport
! * @return   void
  */
  
  function COM_rdfCheck( $bid, $rdfurl, $date )
  {
      $nextupdate = $date + 3600;
  
--- 3124,3133 ----
  * @param        string      $date       Last time the headlines were imported
  * @see function COM_rdfImport
! * @return       bool        "true" if the block was updated, "false" if not
  */
  
  function COM_rdfCheck( $bid, $rdfurl, $date )
  {
+     $retval = false;
      $nextupdate = $date + 3600;
  
***************
*** 3130,3134 ****
--- 3135,3142 ----
      {
          COM_rdfImport( $bid, $rdfurl );
+         $retval = true;
      }
+ 
+     return $retval;
  }
  




From dhaun at geeklog.net  Tue Mar 11 05:14:51 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Tue, 11 Mar 2003 04:14:51 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin block.php,1.47,1.48
Message-ID: <200303111014.h2BAEpi29908@internal.geeklog.net>

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

Modified Files:
	block.php 
Log Message:
Fixed problem with the Older Stories block disappearing.


Index: block.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/block.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** block.php	4 Feb 2003 20:33:32 -0000	1.47
--- block.php	11 Mar 2003 10:14:49 -0000	1.48
***************
*** 6,11 ****
  // +---------------------------------------------------------------------------+
  // | block.php                                                                 |
- // | Geeklog block administration.                                             |
  // |                                                                           |
  // +---------------------------------------------------------------------------+
  // | Copyright (C) 2000-2003 by the following authors:                         |
--- 6,11 ----
  // +---------------------------------------------------------------------------+
  // | block.php                                                                 |
  // |                                                                           |
+ // | Geeklog block administration.                                             |
  // +---------------------------------------------------------------------------+
  // | Copyright (C) 2000-2003 by the following authors:                         |
***************
*** 398,401 ****
--- 398,404 ----
          DB_save($_TABLES['blocks'],'bid,name,title,help,type,blockorder,content,tid,rdfurl,rdfupdated,phpblockfn,onleft,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon,is_enabled',"$bid,'$name','$title','$help','$type','$blockorder','$content','$tid','$rdfurl','$rdfupdated','$phpblockfn',$onleft,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$is_enabled",$_CONF['site_admin_url'] . "/block.php?msg=11");
  
+         if (($type == 'gldefault') && ($name == 'older_stories')) {
+             COM_olderStuff ();
+         }
  
      } else {




From dhaun at geeklog.net  Tue Mar 11 05:14:51 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Tue, 11 Mar 2003 04:14:51 -0600
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.74,1.75
Message-ID: <200303111014.h2BAEpi29905@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory internal.geeklog.net:/tmp/cvs-serv29891/docs

Modified Files:
	history 
Log Message:
Fixed problem with the Older Stories block disappearing.


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** history	11 Mar 2003 09:37:50 -0000	1.74
--- history	11 Mar 2003 10:14:49 -0000	1.75
***************
*** 4,7 ****
--- 4,9 ----
  -------
  
+ - Fixed problem with the Older Stories block disappearing when it was edited
+   (e.g. moved from left to right), bug #670673.
  - Fixed "late" update of portal blocks (bug #681855).
  - You can now "clone" static pages, i.e. make a copy of an existing page.




From dhaun at geeklog.net  Tue Mar 11 12:00:59 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Tue, 11 Mar 2003 11:00:59 -0600
Subject: [geeklog-cvs] geeklog-1.3/sql mysql_tableanddata.php,1.43,1.44
Message-ID: <200303111700.h2BH0xi03698@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/sql
In directory internal.geeklog.net:/tmp/cvs-serv3643/sql

Modified Files:
	mysql_tableanddata.php 
Log Message:
Fixed problems with static pages permissions.


Index: mysql_tableanddata.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/sql/mysql_tableanddata.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** mysql_tableanddata.php	9 Mar 2003 11:47:22 -0000	1.43
--- mysql_tableanddata.php	11 Mar 2003 17:00:57 -0000	1.44
***************
*** 546,550 ****
    owner_id mediumint(8) unsigned NOT NULL default '1',
    perm_owner tinyint(1) unsigned NOT NULL default '3',
!   perm_group tinyint(1) unsigned NOT NULL default '3',
    perm_members tinyint(1) unsigned NOT NULL default '2',
    perm_anon tinyint(1) unsigned NOT NULL default '2',
--- 546,550 ----
    owner_id mediumint(8) unsigned NOT NULL default '1',
    perm_owner tinyint(1) unsigned NOT NULL default '3',
!   perm_group tinyint(1) unsigned NOT NULL default '2',
    perm_members tinyint(1) unsigned NOT NULL default '2',
    perm_anon tinyint(1) unsigned NOT NULL default '2',




From dhaun at geeklog.net  Tue Mar 11 12:00:59 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Tue, 11 Mar 2003 11:00:59 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/install install.php,1.44,1.45
Message-ID: <200303111700.h2BH0xi03688@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install
In directory internal.geeklog.net:/tmp/cvs-serv3643/public_html/admin/install

Modified Files:
	install.php 
Log Message:
Fixed problems with static pages permissions.


Index: install.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install/install.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** install.php	9 Mar 2003 18:10:26 -0000	1.44
--- install.php	11 Mar 2003 17:00:56 -0000	1.45
***************
*** 404,408 ****
                      . "ADD COLUMN owner_id mediumint(8) unsigned DEFAULT '1',"
                      . "ADD COLUMN perm_owner tinyint(1) unsigned DEFAULT '3',"
!                     . "ADD COLUMN perm_group tinyint(1) unsigned DEFAULT '3',"
                      . "ADD COLUMN perm_members tinyint(1) unsigned DEFAULT '2',"
                      . "ADD COLUMN perm_anon tinyint(1) unsigned DEFAULT '2',"
--- 404,408 ----
                      . "ADD COLUMN owner_id mediumint(8) unsigned DEFAULT '1',"
                      . "ADD COLUMN perm_owner tinyint(1) unsigned DEFAULT '3',"
!                     . "ADD COLUMN perm_group tinyint(1) unsigned DEFAULT '2',"
                      . "ADD COLUMN perm_members tinyint(1) unsigned DEFAULT '2',"
                      . "ADD COLUMN perm_anon tinyint(1) unsigned DEFAULT '2',"
***************
*** 429,432 ****
--- 429,441 ----
                  // remove Static Pages Admin group id
                  DB_query ("DELETE FROM {$_TABLES['vars']} WHERE name = 'sp_group_id'");
+ 
+                 if ($spversion == 1) {
+                     $result = DB_query ("SELECT DISTINCT sp_uid FROM {$_TABLES['staticpage']}");
+                     $authors = DB_numRows ($result);
+                     for ($i = 0; $i < $authors; $i++) {
+                         $A = DB_fetchArray ($result);
+                         DB_query ("UPDATE {$_TABLES['staticpage']} SET owner_id = '{$A['sp_uid']}' WHERE sp_uid = '{$A['sp_uid']}'");
+                     }
+                 }
              }
  




From dhaun at geeklog.net  Tue Mar 11 12:00:58 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Tue, 11 Mar 2003 11:00:58 -0600
Subject: [geeklog-cvs] geeklog-1.3/plugins/staticpages functions.inc,1.18,1.19
Message-ID: <200303111700.h2BH0wi03682@internal.geeklog.net>

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

Modified Files:
	functions.inc 
Log Message:
Fixed problems with static pages permissions.


Index: functions.inc
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/functions.inc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** functions.inc	9 Mar 2003 11:47:22 -0000	1.18
--- functions.inc	11 Mar 2003 17:00:56 -0000	1.19
***************
*** 103,107 ****
                                        'statrow'=>'singlestat.thtml'));
      if ($showsitestats == 1) {
!         $result = DB_query ("SELECT count(*) AS cnt FROM {$_TABLES['staticpage']} WHERE " . SP_getPerms ());
          $A = DB_fetchArray ($result);
          $total_pages = $A['cnt'];
--- 103,111 ----
                                        'statrow'=>'singlestat.thtml'));
      if ($showsitestats == 1) {
!         $perms = SP_getPerms ();
!         if (!empty ($perms)) {
!             $perms = ' WHERE ' . $perms;
!         }
!         $result = DB_query ("SELECT count(*) AS cnt FROM {$_TABLES['staticpage']}" . $perms);
          $A = DB_fetchArray ($result);
          $total_pages = $A['cnt'];
***************
*** 110,114 ****
          $retval .= '<td align="right">' . $total_pages . '&nbsp;&nbsp;</td></tr></table>';
      } else {
!         $result = DB_query ("SELECT sp_id,sp_title,sp_hits FROM {$_TABLES['staticpage']} WHERE sp_hits > 0 AND" . SP_getPerms() . ' ORDER BY sp_hits DESC LIMIT 10');
          $nrows  = DB_numRows ($result);
          $retval .= COM_startBlock ($LANG_STATIC['stats_headline']);
--- 114,122 ----
          $retval .= '<td align="right">' . $total_pages . '&nbsp;&nbsp;</td></tr></table>';
      } else {
!         $perms = SP_getPerms ();
!         if (!empty ($perms)) {
!             $perms = ' AND ' . $perms;
!         }
!         $result = DB_query ("SELECT sp_id,sp_title,sp_hits FROM {$_TABLES['staticpage']} WHERE sp_hits > 0" . $perms . ' ORDER BY sp_hits DESC LIMIT 10');
          $nrows  = DB_numRows ($result);
          $retval .= COM_startBlock ($LANG_STATIC['stats_headline']);
***************
*** 262,266 ****
  
      if (SEC_hasRights ('staticpages.edit,staticpages.delete', 'OR')) {
!         $result = DB_query ("SELECT count(*) AS cnt FROM {$_TABLES['staticpage']} WHERE " . SP_getPerms ('','3'));
          $A = DB_fetchArray ($result);
          $total_pages = $A['cnt'];
--- 270,278 ----
  
      if (SEC_hasRights ('staticpages.edit,staticpages.delete', 'OR')) {
!         $perms = SP_getPerms ('', '3');
!         if (!empty ($perms)) {
!             $perms = ' WHERE ' . $perms;
!         }
!         $result = DB_query ("SELECT count(*) AS cnt FROM {$_TABLES['staticpage']}" . $perms);
          $A = DB_fetchArray ($result);
          $total_pages = $A['cnt'];
***************
*** 272,276 ****
  * Return SQL where statement with appropriate permissions
  *
! * Takes User id and permission and returns SQL where clause which will return the appropriate objects.
  * This assumes that the table has the following security structure:
  * owner_id        | mediumint(8)          
--- 284,289 ----
  * Return SQL where statement with appropriate permissions
  *
! * Takes User id and permission and returns SQL where clause which will return
! * the appropriate objects.
  * This assumes that the table has the following security structure:
  * owner_id        | mediumint(8)          
***************
*** 289,314 ****
  *
  */
! function SP_getPerms($table='',$access='2',$u_id='')
  {
! 	global $_USER, $_GROUPS;
! 	
! 	if ($table != '') { $table .= '.'; }
! 	if ($u_id == '') {
! 		$uid = $_USER['uid'];
! 		$GROUPS = $_GROUPS;
! 	} else {
! 		$uid = $u_id;
! 		$GROUPS = SEC_getUserGroups($uid);
! 	}
! 	$where = "((" . $table . "perm_anon >= $access)";
! 	// check to see if anonymous user
! 	if ($uid > 1) {
! 		$where .= " OR (" . $table . "perm_members >= $access)";
! 		foreach ($GROUPS as $group) {
! 			$where .= " OR ((" . $table . "group_id = $group) AND (" . $table . "perm_group >= $access))";
! 		}
! 		$where .= " OR ((" . $table . "owner_id = $uid) AND (" . $table . "perm_owner >= $access))";
  	}
! 	return $where . ")"; 
  }
  
--- 302,343 ----
  *
  */
! function SP_getPerms ($table = '', $access = '2', $u_id = '')
  {
!     global $_USER, $_GROUPS;
! 
!     if ($table != '') { $table .= '.'; }
! 
!     if ($u_id == '') {
!         $uid = $_USER['uid'];
!         $GROUPS = $_GROUPS;
!     } else {
!         $uid = $u_id;
!         $GROUPS = SEC_getUserGroups ($uid);
  	}
! 
!     if (SEC_inGroup ('Root', $uid)) {
!         return '';
!     }
! 
!     $sql = '(';
! 
!     if ($uid > 1) {
!         $sql .= "((owner_id = '{$uid}') AND (perm_owner >= $access)) OR ";
! 
!         $groupList = '';
!         foreach ($GROUPS as $grp) {
!             $groupList .= $grp . ',';
!         }
!         $groupList = substr ($groupList, 0, -1);
!         $sql .= "((group_id IN ($groupList)) AND (perm_group >= $access)) OR ";
! 
!         $sql .= "(perm_members >= $access)";
!     } else {
!         $sql .= "perm_anon >= $access";
!     }
! 
!     $sql .= ')';
! 
!     return $sql;
  }
  




From dhaun at geeklog.net  Tue Mar 11 12:00:58 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Tue, 11 Mar 2003 11:00:58 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html index.php,1.42,1.43
Message-ID: <200303111700.h2BH0wi03685@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv3643/public_html

Modified Files:
	index.php 
Log Message:
Fixed problems with static pages permissions.


Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/index.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** index.php	9 Mar 2003 11:47:22 -0000	1.42
--- index.php	11 Mar 2003 17:00:56 -0000	1.43
***************
*** 81,85 ****
      if (DB_getItem ($_TABLES['plugins'], 'pi_enabled', "pi_name = 'staticpages'") == 1) {
  
!         $spsql = "SELECT sp_content,sp_label,sp_format,sp_php FROM {$_TABLES['staticpage']} WHERE sp_title = 'frontpage' AND " . SP_getPerms ();
          $result = DB_query ($spsql);
  
--- 81,89 ----
      if (DB_getItem ($_TABLES['plugins'], 'pi_enabled', "pi_name = 'staticpages'") == 1) {
  
!         $perms = SP_getPerms ();
!         if (!empty ($perms)) {
!             $perms = ' AND ' . $perms;
!         }
!         $spsql = "SELECT sp_content,sp_label,sp_format,sp_php FROM {$_TABLES['staticpage']} WHERE sp_title = 'frontpage'" . $perms;
          $result = DB_query ($spsql);
  
***************
*** 209,217 ****
      $sql .= "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR ";
      $sql .= "(group_id IN ($groupList) AND perm_group >= 2) OR ";
!     $sql .= "(perm_members >= 2) OR ";
  }
- $sql .= "(perm_anon >= 2))";
  
  if (!empty($U['aids'])) {
      $AIDS = explode(' ',$U['aids']);
      for ($z = 0; $z < sizeof($AIDS); $z++) {
--- 213,223 ----
      $sql .= "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR ";
      $sql .= "(group_id IN ($groupList) AND perm_group >= 2) OR ";
!     $sql .= "(perm_members >= 2))";
! } else {
!     $sql .= "perm_anon >= 2)";
  }
  
  if (!empty($U['aids'])) {
+     $sql .= ' ';
      $AIDS = explode(' ',$U['aids']);
      for ($z = 0; $z < sizeof($AIDS); $z++) {
***************
*** 221,224 ****
--- 227,231 ----
  
  if (!empty($U['tids'])) {
+     $sql .= ' ';
      $TIDS = explode(' ',$U['tids']);
      for ($z = 0; $z < sizeof($TIDS); $z++) {
***************
*** 228,232 ****
  
  if ($newstories) {
!     $sql .= "AND (date >= (NOW() - INTERVAL {$_CONF['newstoriesinterval']} SECOND))";
  }
  
--- 235,239 ----
  
  if ($newstories) {
!     $sql .= "AND (date >= (NOW() - INTERVAL {$_CONF['newstoriesinterval']} SECOND)) ";
  }
  
***************
*** 249,255 ****
      $countsql .= "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR ";
      $countsql .= "(group_id IN ($groupList) AND perm_group >= 2) OR ";
!     $countsql .= "(perm_members >= 2) OR ";
  }
- $countsql .= "(perm_anon >= 2))";
  
  if ($newstories) {
--- 256,263 ----
      $countsql .= "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR ";
      $countsql .= "(group_id IN ($groupList) AND perm_group >= 2) OR ";
!     $countsql .= "(perm_members >= 2))";
! } else {
!     $countsql .= "perm_anon >= 2)";
  }
  
  if ($newstories) {
***************
*** 264,278 ****
      for ($x = 1; $x <= $nrows; $x++) {
          $A = DB_fetchArray($result);
!         if (SEC_hasAccess($A['owner_id'],$A['group_id'],$A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']) > 0) {
!             if ($A['featured'] == 1) {
!                 $feature = 'true';
!             } elseif (($x == 1) && ($_CONF['showfirstasfeatured'] == 1)) {
!                 $feature = 'true';
!                 $A['featured'] = 1;
!             }
!             $display .= COM_article($A,'y');
          }
      }
!     
      // Print Google-like paging navigation
      if (empty($topic)) {
--- 272,284 ----
      for ($x = 1; $x <= $nrows; $x++) {
          $A = DB_fetchArray($result);
!         if ($A['featured'] == 1) {
!             $feature = 'true';
!         } elseif (($x == 1) && ($_CONF['showfirstasfeatured'] == 1)) {
!             $feature = 'true';
!             $A['featured'] = 1;
          }
+         $display .= COM_article($A,'y');
      }
! 
      // Print Google-like paging navigation
      if (empty($topic)) {




From dhaun at geeklog.net  Tue Mar 11 12:00:59 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Tue, 11 Mar 2003 11:00:59 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/plugins/staticpages index.php,1.18,1.19 install.php,1.9,1.10
Message-ID: <200303111700.h2BH0xi03693@internal.geeklog.net>

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

Modified Files:
	index.php install.php 
Log Message:
Fixed problems with static pages permissions.


Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/plugins/staticpages/index.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** index.php	10 Mar 2003 18:36:01 -0000	1.18
--- index.php	11 Mar 2003 17:00:57 -0000	1.19
***************
*** 232,236 ****
  
      if (!empty ($sp_id) && $mode == 'edit') {
!         $result = DB_query ("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE sp_id = '$sp_id' AND " . SP_getPerms ('', '3'));
          $A = DB_fetchArray ($result);
          $A['sp_old_id'] = $A['sp_id'];
--- 232,240 ----
  
      if (!empty ($sp_id) && $mode == 'edit') {
!         $perms = SP_getPerms ('', '3');
!         if (!empty ($perms)) {
!             $perms = ' AND ' . $perms;
!         }
!         $result = DB_query ("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE sp_id = '$sp_id'" . $perms);
          $A = DB_fetchArray ($result);
          $A['sp_old_id'] = $A['sp_id'];
***************
*** 241,245 ****
          $A['sp_old_id'] = '';
      } elseif (!empty ($sp_id) && $mode == 'clone') {
!         $result = DB_query ("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE sp_id = '$sp_id' AND " . SP_getPerms ('', '3'));
          $A = DB_fetchArray ($result);
          $A['sp_id'] = COM_makesid ();
--- 245,253 ----
          $A['sp_old_id'] = '';
      } elseif (!empty ($sp_id) && $mode == 'clone') {
!         $perms = SP_getPerms ('', '3');
!         if (!empty ($perms)) {
!             $perms = ' AND ' . $perms;
!         }
!         $result = DB_query ("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE sp_id = '$sp_id'" . $perms);
          $A = DB_fetchArray ($result);
          $A['sp_id'] = COM_makesid ();
***************
*** 283,287 ****
  	//$limit = (50 * $page) - 50;
  	//$result = DB_query("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} ORDER BY sp_date DESC LIMIT $limit,50");
! 	$result = DB_query("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} WHERE " . SP_getPerms('','3') . " ORDER BY sp_date DESC");
  	$nrows = DB_numRows($result);
  	if ($nrows > 0) {
--- 291,299 ----
  	//$limit = (50 * $page) - 50;
  	//$result = DB_query("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} ORDER BY sp_date DESC LIMIT $limit,50");
!         $perms = SP_getPerms ('', '3');
!         if (!empty ($perms)) {
!             $perms = ' WHERE ' . $perms;
!         }
! 	$result = DB_query("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']}" . $perms . " ORDER BY sp_date DESC");
  	$nrows = DB_numRows($result);
  	if ($nrows > 0) {

Index: install.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/plugins/staticpages/install.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** install.php	9 Mar 2003 11:47:22 -0000	1.9
--- install.php	11 Mar 2003 17:00:57 -0000	1.10
***************
*** 81,85 ****
          . "owner_id mediumint(8) unsigned NOT NULL default '1',"
          . "perm_owner tinyint(1) unsigned NOT NULL default '3',"
!         . "perm_group tinyint(1) unsigned NOT NULL default '3',"
          . "perm_members tinyint(1) unsigned NOT NULL default '2',"
          . "perm_anon tinyint(1) unsigned NOT NULL default '2',"
--- 81,85 ----
          . "owner_id mediumint(8) unsigned NOT NULL default '1',"
          . "perm_owner tinyint(1) unsigned NOT NULL default '3',"
!         . "perm_group tinyint(1) unsigned NOT NULL default '2',"
          . "perm_members tinyint(1) unsigned NOT NULL default '2',"
          . "perm_anon tinyint(1) unsigned NOT NULL default '2',"




From dhaun at geeklog.net  Tue Mar 11 12:00:59 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Tue, 11 Mar 2003 11:00:59 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/staticpages index.php,1.10,1.11
Message-ID: <200303111700.h2BH0xi03695@internal.geeklog.net>

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

Modified Files:
	index.php 
Log Message:
Fixed problems with static pages permissions.


Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/staticpages/index.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** index.php	9 Mar 2003 11:47:22 -0000	1.10
--- index.php	11 Mar 2003 17:00:57 -0000	1.11
***************
*** 50,54 ****
  }
  
! $result = DB_query ("SELECT * FROM {$_TABLES['staticpage']} WHERE (sp_id = '$page') AND " . SP_getPerms ());
  $count = DB_numRows ($result);
  
--- 50,58 ----
  }
  
! $perms = SP_getPerms ();
! if (!empty ($perms)) {
!     $perms = ' AND ' . $perms;
! }
! $result = DB_query ("SELECT * FROM {$_TABLES['staticpage']} WHERE (sp_id = '$page')" . $perms);
  $count = DB_numRows ($result);
  




From dhaun at geeklog.net  Tue Mar 11 17:08:26 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Tue, 11 Mar 2003 16:08:26 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin link.php,1.31,1.32
Message-ID: <200303112208.h2BM8Qi09938@internal.geeklog.net>

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

Modified Files:
	link.php 
Log Message:
Erm, I guess we really want to display a proper error message (instead of an SQL error) when you don't fill in all the fields for a link ...


Index: link.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/link.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** link.php	2 Feb 2003 19:46:47 -0000	1.31
--- link.php	11 Mar 2003 22:08:24 -0000	1.32
***************
*** 6,17 ****
  // +---------------------------------------------------------------------------+
  // | link.php                                                                  |
- // | Geeklog links administration page.                                        |
  // |                                                                           |
  // +---------------------------------------------------------------------------+
  // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 6,18 ----
  // +---------------------------------------------------------------------------+
  // | link.php                                                                  |
  // |                                                                           |
+ // | Geeklog links administration page.                                        |
  // +---------------------------------------------------------------------------+
  // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
! // |          Dirk Haun         - dirk at haun-online.de                          |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 252,256 ****
  		$retval .= COM_siteHeader('menu');
  		$retval .= COM_errorLog($LANG23[10],2);
! 		editlink($mode,$lid);
  		$retval .= COM_siteFooter();
          return $retval;
--- 253,261 ----
  		$retval .= COM_siteHeader('menu');
  		$retval .= COM_errorLog($LANG23[10],2);
!         if (DB_count ($_TABLES['links'], 'lid', $lid) > 0) {
! 		    $retval .= editlink ($mode, $lid);
!         } else {
! 		    $retval .= editlink ($mode, '');
!         }
  		$retval .= COM_siteFooter();
          return $retval;




From dhaun at geeklog.net  Wed Mar 12 06:34:08 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Wed, 12 Mar 2003 05:34:08 -0600
Subject: [geeklog-cvs] geeklog-1.3/plugins/staticpages/templates/admin list.thtml,1.7,1.8
Message-ID: <200303121134.h2CBY8i26290@internal.geeklog.net>

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

Modified Files:
	list.thtml 
Log Message:
Added paging for the list of Static Pages (for more than 50 pages).


Index: list.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/templates/admin/list.thtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** list.thtml	10 Mar 2003 18:36:01 -0000	1.7
--- list.thtml	12 Mar 2003 11:34:05 -0000	1.8
***************
*** 21,24 ****
--- 21,25 ----
                                      <tr><td colspan="4">{lang_nopages_msg}</td></tr>
                                  </table>
+                                 {google_paging}
                                  {end_block}
  




From dhaun at geeklog.net  Wed Mar 12 06:34:08 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Wed, 12 Mar 2003 05:34:08 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/plugins/staticpages index.php,1.19,1.20
Message-ID: <200303121134.h2CBY8i26291@internal.geeklog.net>

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

Modified Files:
	index.php 
Log Message:
Added paging for the list of Static Pages (for more than 50 pages).


Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/plugins/staticpages/index.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** index.php	11 Mar 2003 17:00:57 -0000	1.19
--- index.php	12 Mar 2003 11:34:05 -0000	1.20
***************
*** 13,17 ****
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
  // |          Phill Gillespie  - phill at mediaaustralia.com.au                   |
! // |          Tom Willett      - twillett at users.sourceforge.net
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 13,18 ----
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
  // |          Phill Gillespie  - phill at mediaaustralia.com.au                   |
! // |          Tom Willett      - twillett at users.sourceforge.net                |
! // |          Dirk Haun        - dirk at haun-online.de                           |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 288,336 ****
      $sp_templates->set_var('lang_url', $LANG_STATIC['url']);
  
! 	//if (empty($page)) $page = 1;
! 	//$limit = (50 * $page) - 50;
! 	//$result = DB_query("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']} ORDER BY sp_date DESC LIMIT $limit,50");
!         $perms = SP_getPerms ('', '3');
!         if (!empty ($perms)) {
!             $perms = ' WHERE ' . $perms;
          }
! 	$result = DB_query("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']}" . $perms . " ORDER BY sp_date DESC");
! 	$nrows = DB_numRows($result);
! 	if ($nrows > 0) {
!  		for ($i = 1; $i <= $nrows; $i++) {
! 			//$scount = (50 * $page) - 50 + $i;
! 			$A = DB_fetchArray($result);
!             $sp_templates->set_var('sp_id', $A['sp_id']);
!             $sp_templates->set_var('page_edit_url',COM_buildURL($_CONF['site_admin_url'] . '/plugins/staticpages/index.php?mode=edit&amp;sp_id=' . $A['sp_id']));
!             $sp_templates->set_var('row_number', $i);
!             $sp_templates->set_var('page_display_url',COM_buildURL($_CONF['site_url'] . '/staticpages/index.php?page=' . $A['sp_id']));
!             $sp_templates->set_var ('page_clone_url', COM_buildURL ($_CONF['site_admin_url'] . '/plugins/staticpages/index.php?mode=clone&amp;sp_id=' . $A['sp_id']));
!             $sp_templates->set_var('sp_title', stripslashes ($A['sp_title']));
!             $sp_templates->set_var('username', DB_getItem($_TABLES['users'],'username',"uid = {$A["sp_uid"]}"));
! 			$curtime = COM_getUserDateTimeFormat($A['unixdate']);
!             $sp_templates->set_var('sp_date', $curtime[0]);
!             $sp_templates->parse('list_item', 'row', true);
! 		}
!         $sp_templates->set_var('lang_nopages_msg', '');
!         /*
! 		$retval .= "<tr><td colspan=6>";
! 		if (DB_count($_TABLES['staticpage']) > 50) {
! 			$prevpage = $page - 1; 
! 			$nextpage = $page + 1;
! 			$num_pages = DB_count($_TABLES['staticpage']) / 50;
! 			if ($page > 1) {
! 				$retval .= "<a href={$_CONF["site_admin_url"]}/plugins/staticpages/index.php?mode=list&page=$prevpage>{$LANG50[1]}</a>&nbsp;&nbsp";
! 			}
! 			if ($page < $num_pages) {
! 				$retval .= "<a href={$_CONF["site_admin_url"]}/plugins/staticpages/index.php?mode=list&page=$nextpage>{$LANG50[2]}</a> ";
! 			}
! 		}
! 		$retval .= "</td></tr>
!         */
! 	} else {
!         $sp_templates->set_var('lang_nopages_msg', $LANG_STATIC['nopages']);
!         $sp_templates->set_var('list_item', '');
      }
! 	$sp_templates->set_var('end_block', COM_endBlock());	
  
      $retval .= $sp_templates->parse('output', 'list');
--- 289,351 ----
      $sp_templates->set_var('lang_url', $LANG_STATIC['url']);
  
!     $perpage = 50;
!     if ($page <= 0) {
!         $page = 1;
!     }
! 
!     $perms = SP_getPerms ('', '3');
!     if (!empty ($perms)) {
!        $perms = ' WHERE ' . $perms;
!     }
! 
!     $result = DB_query ("SELECT COUNT(*) AS count FROM {$_TABLES['staticpage']}" . $perms);
!     $C = DB_fetchArray ($result);
!     $numpages = ceil ($C['count'] / $perpage);
! 
!     if ($page > $numpages) {
!         $page = 1;
!     }
!     $start = ($page - 1) * $perpage;
! 
!     $result = DB_query ("SELECT *,UNIX_TIMESTAMP(sp_date) AS unixdate FROM {$_TABLES['staticpage']}" . $perms . " ORDER BY sp_date DESC LIMIT $start,$perpage");
!     $nrows = DB_numRows ($result);
!     if ($nrows > 0) {
!         for ($i = 1; $i <= $nrows; $i++) {
!             $A = DB_fetchArray($result);
!             $sp_templates->set_var ('sp_id', $A['sp_id']);
!             $sp_templates->set_var ('page_edit_url',
!                     COM_buildURL ($_CONF['site_admin_url']
!                     . '/plugins/staticpages/index.php?mode=edit&amp;sp_id='
!                     . $A['sp_id']));
!             $sp_templates->set_var ('row_number', $i + $start);
!             $sp_templates->set_var ('page_display_url',
!                     COM_buildURL ($_CONF['site_url']
!                     . '/staticpages/index.php?page=' . $A['sp_id']));
!             $sp_templates->set_var ('page_clone_url',
!                     COM_buildURL ($_CONF['site_admin_url']
!                     . '/plugins/staticpages/index.php?mode=clone&amp;sp_id='
!                     . $A['sp_id']));
!             $sp_templates->set_var ('sp_title', stripslashes ($A['sp_title']));
!             $sp_templates->set_var ('username', DB_getItem ($_TABLES['users'],
!                     'username', "uid = {$A["sp_uid"]}"));
!             $curtime = COM_getUserDateTimeFormat ($A['unixdate']);
!             $sp_templates->set_var ('sp_date', $curtime[0]);
!             $sp_templates->parse ('list_item', 'row', true);
          }
!         $sp_templates->set_var ('lang_nopages_msg', '');
! 
!         $baseurl = $_CONF['site_admin_url'] . '/plugins/staticpages/index.php';
!         if ($numpages > 1) {
!             $sp_templates->set_var ('google_paging',
!                     COM_printPageNavigation ($baseurl, $page, $numpages));
!         } else {
!             $sp_templates->set_var ('google_paging', '');
!         }
!     } else {
!         $sp_templates->set_var ('lang_nopages_msg', $LANG_STATIC['nopages']);
!         $sp_templates->set_var ('list_item', '');
!         $sp_templates->set_var ('google_paging', '');
      }
!     $sp_templates->set_var ('end_block', COM_endBlock ());	
  
      $retval .= $sp_templates->parse('output', 'list');




From dhaun at geeklog.net  Wed Mar 12 14:02:03 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Wed, 12 Mar 2003 13:02:03 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html index.php,1.43,1.44
Message-ID: <200303121902.h2CJ23i04200@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv4149/public_html

Modified Files:
	index.php 
Log Message:
Static Pages named topic:<topic-id> (e.g. topic:GeekLog) will be displayed on top of that topic (based on a hack by James Fryer).
Also made sure that any messages are displayed above anything else.


Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/index.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** index.php	11 Mar 2003 17:00:56 -0000	1.43
--- index.php	12 Mar 2003 19:02:01 -0000	1.44
***************
*** 76,143 ****
  $shownews = true;
  
! if (empty ($topic)) {
  
!     // check if static pages plugin is installed and enabled
!     if (DB_getItem ($_TABLES['plugins'], 'pi_enabled', "pi_name = 'staticpages'") == 1) {
  
!         $perms = SP_getPerms ();
!         if (!empty ($perms)) {
!             $perms = ' AND ' . $perms;
!         }
!         $spsql = "SELECT sp_content,sp_label,sp_format,sp_php FROM {$_TABLES['staticpage']} WHERE sp_title = 'frontpage'" . $perms;
!         $result = DB_query ($spsql);
  
!         if (DB_numRows ($result) > 0) {
!             $spresult = DB_fetchArray ($result);
  
!             if ($spresult['sp_label'] == 'nonews') { // replace news entirely
!                 $shownews = false;
!                 switch ($spresult['sp_format']) {
!                     case 'noblocks':
!                         $display .= COM_siteHeader ('none');
!                         break;
!                     case 'allblocks':
!                     case 'leftblocks':
!                         $display .= COM_siteHeader ('menu');
!                         break;
!                 }
  
!                 // Check for type (ie html or php)
!                 if ($spresult['sp_php'] == 1) {
!                     $display .= eval (stripslashes ($spresult['sp_content']));
!                 } else {
!                     $display .= stripslashes ($spresult['sp_content']);
!                 }
  
!                 if ($spresult['sp_format'] == 'allblocks') {
!                     $display .= COM_siteFooter (true);
!                 } else if ($spresult['sp_format'] != 'blankpage') {
!                     $display .= COM_siteFooter ();
!                 }
!             } else { // display static page content before the news
!                 $display .= COM_siteHeader ();
!                 if (($_SP_CONF['in_block'] == 1) && !empty ($spresult['sp_label'])) {
!                     $display .= COM_startBlock ($spresult['sp_label']);
!                 }
  
!                 // Check for type (ie html or php)
!                 if ($spresult['sp_php'] == 1) {
!                     $display .= eval (stripslashes ($spresult['sp_content']));
!                 } else {
!                     $display .= stripslashes ($spresult['sp_content']);
!                 }
  
!                 if (($_SP_CONF['in_block'] == 1) && !empty ($spresult['sp_label'])) {
!                     $display .= COM_endBlock ();
!                 }
              }
-         } else {
-             $display .= COM_siteHeader();
          }
      } else {
!         $display .= COM_siteHeader();
      }
  } else {
!     $display .= COM_siteHeader();
  }
  
--- 76,147 ----
  $shownews = true;
  
! // check if static pages plugin is installed and enabled
! if (DB_getItem ($_TABLES['plugins'], 'pi_enabled', "pi_name = 'staticpages'") == 1) {
  
!     if (empty ($topic)) {
!         $staticpage_title = 'frontpage';
!     } else {
!         $staticpage_title = 'topic:' . $topic;
!     }
  
!     $perms = SP_getPerms ();
!     if (!empty ($perms)) {
!         $perms = ' AND ' . $perms;
!     }
!     $spsql = "SELECT sp_content,sp_label,sp_format,sp_php FROM {$_TABLES['staticpage']} WHERE sp_title = '{$staticpage_title}'" . $perms;
!     $result = DB_query ($spsql);
  
!     if (DB_numRows ($result) > 0) {
!         $spresult = DB_fetchArray ($result);
  
!         if ($spresult['sp_label'] == 'nonews') { // replace news entirely
!             $shownews = false;
!             switch ($spresult['sp_format']) {
!                 case 'noblocks':
!                     $display .= COM_siteHeader ('none')
!                              . COM_showMessage ($HTTP_GET_VARS['msg']);
!                     break;
!                 case 'allblocks':
!                 case 'leftblocks':
!                     $display .= COM_siteHeader ('menu')
!                              . COM_showMessage ($HTTP_GET_VARS['msg']);
!                     break;
!             }
  
!             // Check for type (ie html or php)
!             if ($spresult['sp_php'] == 1) {
!                 $display .= eval (stripslashes ($spresult['sp_content']));
!             } else {
!                 $display .= stripslashes ($spresult['sp_content']);
!             }
  
!             if ($spresult['sp_format'] == 'allblocks') {
!                 $display .= COM_siteFooter (true);
!             } else if ($spresult['sp_format'] != 'blankpage') {
!                 $display .= COM_siteFooter ();
!             }
!         } else { // display static page content before the news
!             $display .= COM_siteHeader ()
!                      . COM_showMessage ($HTTP_GET_VARS['msg']);
!             if (($_SP_CONF['in_block'] == 1) && !empty ($spresult['sp_label'])) {
!                 $display .= COM_startBlock ($spresult['sp_label']);
!             }
  
!             // Check for type (ie html or php)
!             if ($spresult['sp_php'] == 1) {
!                 $display .= eval (stripslashes ($spresult['sp_content']));
!             } else {
!                 $display .= stripslashes ($spresult['sp_content']);
!             }
  
!             if (($_SP_CONF['in_block'] == 1) && !empty ($spresult['sp_label'])) {
!                 $display .= COM_endBlock ();
              }
          }
      } else {
!         $display .= COM_siteHeader() . COM_showMessage ($HTTP_GET_VARS['msg']);
      }
  } else {
!     $display .= COM_siteHeader() . COM_showMessage ($HTTP_GET_VARS['msg']);
  }
  
***************
*** 182,187 ****
  $limit = $U['maxstories'];
  
- $display .= COM_showMessage($HTTP_GET_VARS['msg']);
- 
  // Geeklog now allows for articles to be published in the future.  Because of
  // this, we need to check to see if we need to rebuild the RDF file in the case
--- 186,189 ----
***************
*** 306,311 ****
  $display .= COM_siteFooter(true); // The true value enables right hand blocks.
  
- } else {
-     $display = COM_showMessage ($HTTP_GET_VARS['msg']) . $display;
  }
  
--- 308,311 ----




From dhaun at geeklog.net  Wed Mar 12 14:02:03 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Wed, 12 Mar 2003 13:02:03 -0600
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.75,1.76
Message-ID: <200303121902.h2CJ23i04198@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory internal.geeklog.net:/tmp/cvs-serv4149/docs

Modified Files:
	history 
Log Message:
Static Pages named topic:<topic-id> (e.g. topic:GeekLog) will be displayed on top of that topic (based on a hack by James Fryer).
Also made sure that any messages are displayed above anything else.


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** history	11 Mar 2003 10:14:49 -0000	1.75
--- history	12 Mar 2003 19:02:01 -0000	1.76
***************
*** 4,7 ****
--- 4,11 ----
  -------
  
+ - A Static Page with a title of "topic:<topic-id>" (e.g. topic:GeekLog) will
+   be displayed on top of the index page for that topic (based on a hack by
+   James Fryer).
+ - Added paging to the list of Static Pages (for more than 50 pages).
  - Fixed problem with the Older Stories block disappearing when it was edited
    (e.g. moved from left to right), bug #670673.




From dhaun at geeklog.net  Wed Mar 12 17:36:54 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Wed, 12 Mar 2003 16:36:54 -0600
Subject: [geeklog-cvs] geeklog-1.3/language chinese_gb2312.php,NONE,1.1
Message-ID: <200303122236.h2CMasi10047@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory internal.geeklog.net:/tmp/cvs-serv10025

Added Files:
	chinese_gb2312.php 
Log Message:
Chinese language file (gb2312 encoding), provided by Crocodile King


--- NEW FILE: chinese_gb2312.php ---
<?php

###############################################################################
# chinese_gb2312.php
#
# Last Modified:20030312:
# This is the Chinese (gb2312) language page for GeekLog!
#
# Copyright (C) 2003 Crocodile King @  Scarborough,Toronto Canada
# Kingwangwen at hotmail.com &  @truez.com
#
# Note: I have fixed it by referral Chinese_big5.php
#
# Chinese punctuation used in this file
# ???U??????????????????????????????????????????????????????????????
#
# Special thanks to Mischa Polivanov for his work on this project
#
# Copyright (C) 2000 Jason Whittenburg
[...1087 lines suppressed...]
    7 => "????????????",
    8 => "??????",
    9 => "????",
    10 => "????????"
);

$LANG_404 = array(
    1 => "404 ????",
    2 => "??????????????????????????<b>http://{$HTTP_SERVER_VARS["HTTP_HOST"]}{$HTTP_SERVER_VARS["REQUEST_URI"]}</b>.",
    3 => "<p>????????????????????????????????????<a href=\"{$_CONF["site_url"]}\">????</a>??<a href=\"{$_CONF["site_url"]}/search.php\">??????</a>????????????????"
);

$LANG_LOGIN = array (
    1 => "????????",
    2 => "????????????????????????????????",
    3 => "????",
    4 => "??????"
);

?>




From dhaun at geeklog.net  Thu Mar 13 05:36:13 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 13 Mar 2003 04:36:13 -0600
Subject: [geeklog-cvs] geeklog-1.3/docs index.html,1.9,1.10
Message-ID: <200303131036.h2DAaDi26816@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory internal.geeklog.net:/tmp/cvs-serv26797/docs

Modified Files:
	index.html 
Log Message:
Added documentation for the Static Pages plugin 1.3


Index: index.html
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/index.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** index.html	28 Dec 2002 13:28:34 -0000	1.9
--- index.html	13 Mar 2003 10:36:11 -0000	1.10
***************
*** 33,36 ****
--- 33,37 ----
      instructions)</li>
    <li><a href="config.html">The Geeklog Configuration File</a> (config.php)</li>
+   <li><a href="staticpages.html">Static Pages plugin</a></li>
    <li>Geeklog's API<br>
      <ul>




From dhaun at geeklog.net  Fri Mar 14 04:47:52 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 14 Mar 2003 03:47:52 -0600
Subject: [geeklog-cvs] geeklog-1.3/language czech.php,NONE,1.1
Message-ID: <200303140947.h2E9lqi31817@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory internal.geeklog.net:/tmp/cvs-serv31806

Added Files:
	czech.php 
Log Message:
Czech language file, provided by Hermes Trismegistos


--- NEW FILE: czech.php ---
<?php

###############################################################################
# 
# This is the czech language page for GeekLog!
#
# Copyright (C) 2002 hermes_trismegistos
# hermes_trismegistos at post.cz
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
[...1075 lines suppressed...]
    7 => "Statistika",
    8 => "Vlastn? nastaven?",
    9 => "Hled?n?",
    10 => "roz???en? hled?n?"
);

$LANG_404 = array(
    1 => "404 Error",
    2 => "Gee, I've looked everywhere but I can not find <b>http://{$HTTP_SERVER_VARS["HTTP_HOST"]}{$HTTP_SERVER_VARS["REQUEST_URI"]}</b>.",
    3 => "<p>We're sorry, but the file you have requested does not exist. Please feel free to check the <a href=\"{$_CONF['site_url']}\">main page</a> or the <a href=\"{$_CONF['site_url']}/search.php\">search page</a> to see if you can find what you lost."
);

$LANG_LOGIN = array (
    1 => 'Je nutn? se p?ihl?sit',
    2 => 'Promi?te, pro p??stup je nutn? b?t p?ihl??en jako u?ivatel.',
    3 => 'P?ihl?sit',
    4 => 'Nov? u?ivatel'
);

?>




From dhaun at geeklog.net  Fri Mar 14 04:56:43 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 14 Mar 2003 03:56:43 -0600
Subject: [geeklog-cvs] geeklog-1.3/plugins/staticpages/language czech.php,NONE,1.1
Message-ID: <200303140956.h2E9uhi31942@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language
In directory internal.geeklog.net:/tmp/cvs-serv31926

Added Files:
	czech.php 
Log Message:
Czech language file, provided by Hermes Trismegistos


--- NEW FILE: czech.php ---
<?php

###############################################################################
# lang.php
# This is the cz language page for the Geeklog Static Page Plug-in!
#
# Copyright (C) 2002 hermes_trismegistos
# hermes_trismegistos at hermetik.net
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
#
###############################################################################
#
# $LANG_CHARSET = "iso-8859-2";
#
###############################################################################
# Array Format: 
# $LANGXX[YY]:	$LANG - variable name
#		  	XX - file id number
#			YY - phrase id number
###############################################################################


$LANG_STATIC= array(
    newpage => "Nov? str?nka",
    adminhome => "Administrace",
    staticpages => "Statick? str?nky",
    staticpageeditor => "Editor statick?ch str?nek",
    writtenby => "Vlo?eno",
    date => "Posledn? aktualizace",
    title => "Titulek",
    content => "Obsah",
    hits => "Klicknut?",
    staticpagelist => "V?pis statick?ch str?nek",
    usealtheader => "Alternativn? hlavi?ka",
    url => "URL",
    edit => "Editovat",
    lastupdated => "Posledn? aktualizace",
    pageformat => "Form?t str?nky",
    leftrightblocks => "Bloky nalevo a napravo",
    blankpage => "Pr?zdn? str?nka",
    noblocks => "Bez blok?",
    leftblocks => "Bloky nalevo",
    addtomenu => 'P?idat do menu',
    label => 'N?zev polo?ky',
    nopages => '??dn? str?nky zde nejsou',
    save => 'ulo?it',
    preview => 'preview',
    delete => 'smazat',
    cancel => 'zru?it akci',
    access_denied => 'P??stup odep?en',
    access_denied_msg => 'Pokou??te se editovat statick? str?nky - na to nem?te dostate?n? pr?va.  Tento pokus byl zaznamen?n.',
    all_html_allowed => 'HTML tagy povoleny',
    results => 'Statick? str?nky - ',
    author => 'Autor',
    no_title_or_content => 'Mus?te vyplnit alespo? pole <b>Titulek</b> a <b>Obsah</b>.',
    no_such_page_logged_in => 'Sorry '.$_USER['username'].'..',
    no_such_page_anon => 'Please log in..',
    no_page_access_msg => "This could be because you're not logged in, or not a member of {$_CONF["site_name"]}. Please <a href=\"{$_CONF['site_url']}/users.php?mode=new\"> become a member</a> of {$_CONF["site_name"]} to receive full membership access",
    php_msg => 'PHP: ',
    php_warn => 'Warning: PHP code in your page will be evaluated if you enable this option. Use with caution !!',
    exit_msg => 'Exit Type: ',
    exit_info => 'Enable for Login Required Message.  Leave unchecked for normal security check and message.',
    deny_msg => 'Access to this page is denied.  Either the page has been moved/removed or you do not have sufficient permissions.',
    stats_headline => 'Top Ten Static Pages',
    stats_page_title => 'Page Title',
    stats_hits => 'Hits',
    stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.',
    id => 'ID',
    duplicate_id => 'The ID you chose for this static page is already in use. Please select another ID.',
    instructions => "To modify or delete a static page, click on that page's number below. To view a static page, click on the title of the page you wish to view. To create a new static page click on new page above. Click on [C] to create a copy of an existing page."
);

?>




From dhaun at geeklog.net  Sat Mar 15 13:25:00 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 15 Mar 2003 12:25:00 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.205,1.206
Message-ID: <200303151825.h2FIP0i01875@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv1845

Modified Files:
	lib-common.php 
Log Message:
Older Stories block was off by one story


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.205
retrieving revision 1.206
diff -C2 -d -r1.205 -r1.206
*** lib-common.php	11 Mar 2003 09:37:50 -0000	1.205
--- lib-common.php	15 Mar 2003 18:24:57 -0000	1.206
***************
*** 2856,2860 ****
      global $_TABLES, $_CONF;
  
!     $sql = "SELECT sid,tid,title,comments,unix_timestamp(date) AS day FROM {$_TABLES['stories']} WHERE (perm_anon = 2) AND (date <= NOW()) AND (draft_flag = 0) AND (featured = 0) ORDER BY date DESC LIMIT {$_CONF['limitnews']}, {$_CONF['limitnews']}";
      $result = DB_query( $sql );
      $nrows = DB_numRows( $result );
--- 2856,2860 ----
      global $_TABLES, $_CONF;
  
!     $sql = "SELECT sid,tid,title,comments,unix_timestamp(date) AS day FROM {$_TABLES['stories']} WHERE (perm_anon = 2) AND (date <= NOW()) AND (draft_flag = 0) ORDER BY featured DESC, date DESC LIMIT {$_CONF['limitnews']}, {$_CONF['limitnews']}";
      $result = DB_query( $sql );
      $nrows = DB_numRows( $result );




From mlimburg at geeklog.net  Sat Mar 15 22:58:45 2003
From: mlimburg at geeklog.net (mlimburg at geeklog.net)
Date: Sat, 15 Mar 2003 21:58:45 -0600
Subject: [geeklog-cvs] geeklog-1.3 config.php,1.73,1.74
Message-ID: <200303160358.h2G3wji11404@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3
In directory internal.geeklog.net:/tmp/cvs-serv11390

Modified Files:
	config.php 
Log Message:
Tested mod_rewrite & staticpages on apache for windows.  Works nicely.

Index: config.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/config.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** config.php	9 Feb 2003 21:33:35 -0000	1.73
--- config.php	16 Mar 2003 03:58:43 -0000	1.74
***************
*** 394,402 ****
  $_CONF['censorlist']    = array('fuck','cunt','fucker','fucking','pussy','cock','c0ck',' cum ','twat','clit','bitch','fuk','fuking','motherfucker');
  
! // Experimental, only works with staticpages right now. This feature is known
! // to have issues that are unresolvable with systems running IIS.  Have not
! // tested on windows with apache yet.  This feature when fully implemented,
! // will make your site crawler friendly.  Problems with IIS are known PHP CGI
! // bug.
  
  $_CONF['url_rewrite']       = false; // false = off, true = on
--- 394,402 ----
  $_CONF['censorlist']    = array('fuck','cunt','fucker','fucking','pussy','cock','c0ck',' cum ','twat','clit','bitch','fuk','fuking','motherfucker');
  
! // EXPERIMENTAL!  This feature when fully implemented, will make your site crawler friendly.
! //
! // Note: Works with Apache (Linux and Windows successfully tested).
! //       Only works with staticpages right now.
! //       Unresolvable issues with systems running IIS; known PHP CGI bug.
  
  $_CONF['url_rewrite']       = false; // false = off, true = on




From dhaun at geeklog.net  Sun Mar 16 05:25:30 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 16 Mar 2003 04:25:30 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.206,1.207
Message-ID: <200303161025.h2GAPUi24500@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv24463

Modified Files:
	lib-common.php 
Log Message:
Introduced function COM_getPermSQL() which returns an SQL expression to check for proper (Geeklog-style) permissions to an object (story, topic, ...).


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.206
retrieving revision 1.207
diff -C2 -d -r1.206 -r1.207
*** lib-common.php	15 Mar 2003 18:24:57 -0000	1.206
--- lib-common.php	16 Mar 2003 10:25:28 -0000	1.207
***************
*** 1140,1144 ****
      $select_set = explode( ',',$tmp );
  
!     $result = DB_query( "SELECT * FROM {$_TABLES['topics']} ORDER BY $select_set[$sortcol]" );
      $nrows = DB_numRows( $result );
  
--- 1140,1145 ----
      $select_set = explode( ',',$tmp );
  
!     $result = DB_query( "SELECT * FROM {$_TABLES['topics']}" . COM_getPermSQL()
!             . " ORDER BY $select_set[$sortcol]" );
      $nrows = DB_numRows( $result );
  
***************
*** 1146,1161 ****
      {
          $A = DB_fetchArray( $result );
!         $access = SEC_hasAccess( $A['owner_id'], $A['group_id'], $A['perm_owner'], $A['perm_group'], $A['perm_members'], $A['perm_anon'] );
!         if( $access > 0 )
!         {
!             $retval .= '<option value="' . $A[0] . '"';
! 
!             if( $A[0] == $selected )
!             {
!                 $retval .= ' selected';
!             }
  
!             $retval .= '>' . stripslashes( $A[1] ) . '</option>' . LB;
          }
      }
  
--- 1147,1158 ----
      {
          $A = DB_fetchArray( $result );
!         $retval .= '<option value="' . $A[0] . '"';
  
!         if( $A[0] == $selected )
!         {
!             $retval .= ' selected';
          }
+ 
+         $retval .= '>' . stripslashes( $A[1] ) . '</option>' . LB;
      }
  
***************
*** 1791,1817 ****
             $page, $newstories;
  
!     $groupList = '';
!     if (!empty ($_USER['uid'])) {
!         foreach ($_GROUPS as $grp) {
!             $groupList .= $grp . ',';
!         }
!         $groupList = substr ($groupList, 0, -1);
!     }
!     $permsql = '';
!     if (!empty ($_USER['uid'])) {
!         $permsql .= "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR "
!                  . "(group_id IN ($groupList) AND perm_group >= 2) OR "
!                  . "(perm_members >= 2) OR ";
!     }
!     $permsql .= "(perm_anon >= 2)";
! 
!     $sql = "SELECT tid,topic,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon FROM {$_TABLES['topics']} WHERE ({$permsql}) ";
      if( $_CONF['sortmethod'] == 'alpha' )
      {
!         $sql .= "ORDER BY topic ASC";
      }
      else
      {
!         $sql .= "ORDER BY sortnum";
      }
      $result = DB_query( $sql );
--- 1788,1799 ----
             $page, $newstories;
  
!     $sql = "SELECT tid,topic,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon FROM {$_TABLES['topics']}" . COM_getPermSQL();
      if( $_CONF['sortmethod'] == 'alpha' )
      {
!         $sql .= " ORDER BY topic ASC";
      }
      else
      {
!         $sql .= " ORDER BY sortnum";
      }
      $result = DB_query( $sql );
***************
*** 1846,1850 ****
                  if( $_CONF['showstorycount'] )
                  {
!                     $rcount = DB_query( "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (tid = '{$A['tid']}') AND ({$permsql})" );
                      $T = DB_fetchArray( $rcount );
                      $retval .= $T['count'];
--- 1828,1832 ----
                  if( $_CONF['showstorycount'] )
                  {
!                     $rcount = DB_query( "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (tid = '{$A['tid']}')" . COM_getPermSQL( 'AND' ));
                      $T = DB_fetchArray( $rcount );
                      $retval .= $T['count'];
***************
*** 1876,1880 ****
                  if( $_CONF['showstorycount'] )
                  {
!                     $rcount = DB_query( "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (tid = '{$A['tid']}') AND ({$permsql})" );
                      $T = DB_fetchArray( $rcount );
                      $retval .= $T['count'];
--- 1858,1862 ----
                  if( $_CONF['showstorycount'] )
                  {
!                     $rcount = DB_query( "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (tid = '{$A['tid']}')" . COM_getPermSQL( 'AND' ));
                      $T = DB_fetchArray( $rcount );
                      $retval .= $T['count'];
***************
*** 1989,1993 ****
              . '<input type="submit" value="' . $LANG01[58] . '">' . LB
              . '</form>' . $LANG01[59] . LB
!             . COM_endBlock(COM_getBlockTemplate( 'user_block', 'footer' ));
      }
  
--- 1971,1975 ----
              . '<input type="submit" value="' . $LANG01[58] . '">' . LB
              . '</form>' . $LANG01[59] . LB
!             . COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));
      }
  
***************
*** 3124,3128 ****
  * @param        string      $date       Last time the headlines were imported
  * @see function COM_rdfImport
! * @return       bool        "true" if the block was updated, "false" if not
  */
  
--- 3106,3110 ----
  * @param        string      $date       Last time the headlines were imported
  * @see function COM_rdfImport
! * @return   void
  */
  
***************
*** 3572,3583 ****
          $cur_day = strftime( "%D", time() );
  
-         $groups = SEC_getUserGroups( $U['uuid'] );
-         $groupList = '';
-         foreach( $groups as $grp )
-         {
-             $groupList .= $grp . ',';
-         }
-         $groupList = substr( $groupList, 0, -1 );
- 
          $storysql = "SELECT sid,uid,date AS day,title,introtext,bodytext "
              . "FROM {$_TABLES['stories']} "
--- 3554,3557 ----
***************
*** 3603,3611 ****
          else // get all topics this user has access to
          {
!             $topicsql = "SELECT tid FROM {$_TABLES['topics']} WHERE "
!                       . "(owner_id = {$U['uuid']} AND perm_owner >= 2) OR "
!                       . "(group_id IN ($groupList) AND perm_group >= 2) OR "
!                       . "(perm_members >= 2) OR "
!                       . "(perm_anon >= 2)";
              $tresult = DB_query( $topicsql );
              $trows = DB_numRows( $tresult );
--- 3577,3582 ----
          else // get all topics this user has access to
          {
!             $topicsql = "SELECT tid FROM {$_TABLES['topics']}"
!                       . COM_getPermSQL( 'WHERE', $U['uuid'] );
              $tresult = DB_query( $topicsql );
              $trows = DB_numRows( $tresult );
***************
*** 3626,3632 ****
          }
  
!         $storysql .= " AND ((owner_id = {$U['uuid']} AND perm_owner >= 2) OR "
!                   . "(group_id IN ($groupList) AND perm_group >= 2) OR "
!                   . "(perm_members >= 2) OR (perm_anon >= 2))";
  
          $stories = DB_query( $storysql );
--- 3597,3601 ----
          }
  
!         $storysql .= COM_getPermSQL( 'AND', $U['uuid'] );
  
          $stories = DB_query( $storysql );
***************
*** 3722,3737 ****
      global $_TABLES, $_CONF, $LANG01, $_USER, $_GROUPS, $page, $newstories;
  
-     $groupList = '';
- 
-     if( !empty( $_USER['uid'] ))
-     {
-         foreach( $_GROUPS as $grp )
-         {
-             $groupList .= $grp . ',';
-         }
- 
-         $groupList = substr( $groupList, 0, -1 );
-     }
- 
      $retval .= COM_startBlock( $title, $help, COM_getBlockTemplate( 'whats_new_block', 'header' ));
  
--- 3691,3694 ----
***************
*** 3739,3753 ****
      {
          // Find the newest stories
!         $nesql = '';
! 
!         if( !empty( $_USER['uid'] ))
!         {
!             $nesql .= "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR ";
!             $nesql .= "(group_id IN ($groupList) AND perm_group >= 2) OR ";
!             $nesql .= "(perm_members >= 2) OR ";
!         }
! 
!         $nesql .= "(perm_anon >= 2)";
!         $sql = "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (date >= (date_sub(NOW(), INTERVAL {$_CONF['newstoriesinterval']} SECOND))) AND (date <= NOW()) AND (draft_flag = 0) AND (" . $nesql . ")";
          $result = DB_query( $sql );
          $A = DB_fetchArray( $result );
--- 3696,3700 ----
      {
          // Find the newest stories
!         $sql = "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (date >= (date_sub(NOW(), INTERVAL {$_CONF['newstoriesinterval']} SECOND))) AND (date <= NOW()) AND (draft_flag = 0)" . COM_getPermSQL( 'AND' );
          $result = DB_query( $sql );
          $A = DB_fetchArray( $result );
***************
*** 3806,3842 ****
          $retval .= '<b>' . $LANG01[83] . '</b> <small>' . $LANG01[85] . '</small><br>';
  
-         $stsql = '';
          $stwhere = '';
  
          if( !empty( $_USER['uid'] ))
          {
-             $stsql .= "({$_TABLES['stories']}.owner_id = {$_USER['uid']} AND {$_TABLES['stories']}.perm_owner >= 2) OR ";
-             $stsql .= "({$_TABLES['stories']}.group_id IN ($groupList) AND {$_TABLES['stories']}.perm_group >= 2) OR ";
-             $stsql .= "({$_TABLES['stories']}.perm_members >= 2) OR ";
              $stwhere .= "({$_TABLES['stories']}.owner_id IS NOT NULL AND {$_TABLES['stories']}.perm_owner IS NOT NULL) OR ";
              $stwhere .= "({$_TABLES['stories']}.group_id IS NOT NULL AND {$_TABLES['stories']}.perm_group IS NOT NULL) OR ";
!             $stwhere .= "({$_TABLES['stories']}.perm_members IS NOT NULL) OR ";
          }
  
-         $stsql .= "({$_TABLES['stories']}.perm_anon >= 2)";
-         $stwhere .= "({$_TABLES['stories']}.perm_anon IS NOT NULL)";
- 
-         $posql = '';
          $powhere = '';
  
          if( !empty( $_USER['uid'] ))
          {
-             $posql .= "({$_TABLES['pollquestions']}.owner_id = {$_USER['uid']} AND {$_TABLES['pollquestions']}.perm_owner >= 2) OR ";
-             $posql .= "({$_TABLES['pollquestions']}.group_id IN ($groupList) AND {$_TABLES['pollquestions']}.perm_group >= 2) OR ";
-             $posql .= "({$_TABLES['pollquestions']}.perm_members >= 2) OR ";
              $powhere .= "({$_TABLES['pollquestions']}.owner_id IS NOT NULL AND {$_TABLES['pollquestions']}.perm_owner IS NOT NULL) OR ";
              $powhere .= "({$_TABLES['pollquestions']}.group_id IS NOT NULL AND {$_TABLES['pollquestions']}.perm_group IS NOT NULL) OR ";
!             $powhere .= "({$_TABLES['pollquestions']}.perm_members IS NOT NULL) OR ";
          }
  
!         $posql .= "({$_TABLES['pollquestions']}.perm_anon >= 2)";
!         $powhere .= "({$_TABLES['pollquestions']}.perm_anon IS NOT NULL)";
! 
!         $sql = "SELECT DISTINCT count(*) AS dups, type, question, {$_TABLES['stories']}.title, {$_TABLES['stories']}.sid, qid, max({$_TABLES['comments']}.date) as lastdate FROM {$_TABLES['comments']} LEFT JOIN {$_TABLES['stories']} ON (({$_TABLES['stories']}.sid = {$_TABLES['comments']}.sid) AND ({$stsql})) LEFT JOIN {$_TABLES['pollquestions']} ON ((qid = {$_TABLES['comments']}.sid) AND (({$posql}))) WHERE ({$_TABLES['comments']}.date >= (DATE_SUB(NOW(), INTERVAL {$_CONF['newcommentsinterval']} SECOND))) AND ((({$stwhere})) OR (({$powhere}))) GROUP BY {$_TABLES['comments']}.sid ORDER BY 7 DESC LIMIT 15";
  
          $result = DB_query( $sql );
--- 3753,3783 ----
          $retval .= '<b>' . $LANG01[83] . '</b> <small>' . $LANG01[85] . '</small><br>';
  
          $stwhere = '';
  
          if( !empty( $_USER['uid'] ))
          {
              $stwhere .= "({$_TABLES['stories']}.owner_id IS NOT NULL AND {$_TABLES['stories']}.perm_owner IS NOT NULL) OR ";
              $stwhere .= "({$_TABLES['stories']}.group_id IS NOT NULL AND {$_TABLES['stories']}.perm_group IS NOT NULL) OR ";
!             $stwhere .= "({$_TABLES['stories']}.perm_members IS NOT NULL)";
!         }
!         else
!         {
!             $stwhere .= "({$_TABLES['stories']}.perm_anon IS NOT NULL)";
          }
  
          $powhere = '';
  
          if( !empty( $_USER['uid'] ))
          {
              $powhere .= "({$_TABLES['pollquestions']}.owner_id IS NOT NULL AND {$_TABLES['pollquestions']}.perm_owner IS NOT NULL) OR ";
              $powhere .= "({$_TABLES['pollquestions']}.group_id IS NOT NULL AND {$_TABLES['pollquestions']}.perm_group IS NOT NULL) OR ";
!             $powhere .= "({$_TABLES['pollquestions']}.perm_members IS NOT NULL)";
!         }
!         else
!         {
!             $powhere .= "({$_TABLES['pollquestions']}.perm_anon IS NOT NULL)";
          }
  
!         $sql = "SELECT DISTINCT count(*) AS dups, type, question, {$_TABLES['stories']}.title, {$_TABLES['stories']}.sid, qid, max({$_TABLES['comments']}.date) as lastdate FROM {$_TABLES['comments']} LEFT JOIN {$_TABLES['stories']} ON (({$_TABLES['stories']}.sid = {$_TABLES['comments']}.sid)" . COM_getPermSQL( 'AND', 0, 2, $_TABLES['stories'] ) . ") LEFT JOIN {$_TABLES['pollquestions']} ON ((qid = {$_TABLES['comments']}.sid)" . COM_getPermSQL( 'AND', 0, 2, $_TABLES['pollquestions'] ) . ") WHERE ({$_TABLES['comments']}.date >= (DATE_SUB(NOW(), INTERVAL {$_CONF['newcommentsinterval']} SECOND))) AND ((({$stwhere})) OR (({$powhere}))) GROUP BY {$_TABLES['comments']}.sid ORDER BY 7 DESC LIMIT 15";
  
          $result = DB_query( $sql );
***************
*** 3915,3931 ****
          $retval .= '<b>' . $LANG01[84] . '</b> <small>' . $LANG01[87] . '</small><br>';
  
!         $lisql = '';
!         if( !empty( $_USER['uid'] ))
!         {
!             $lisql .= "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR ";
!             $lisql .= "(group_id IN ($groupList) AND perm_group >= 2) OR ";
!             $lisql .= '(perm_members >= 2) OR ';
!         }
! 
!         $lisql .= '(perm_anon >= 2)';
! 
!         $sql = "SELECT lid,title,url FROM {$_TABLES['links']} "
!             . "WHERE $lisql "
!             . 'ORDER BY lid DESC LIMIT 15';
          $foundone = 0;
          $now = time();
--- 3856,3861 ----
          $retval .= '<b>' . $LANG01[84] . '</b> <small>' . $LANG01[87] . '</small><br>';
  
!         $sql = "SELECT lid,title,url FROM {$_TABLES['links']}"
!              . COM_getPermSQL() . ' ORDER BY lid DESC LIMIT 15';
          $foundone = 0;
          $now = time();
***************
*** 4680,4683 ****
--- 4610,4677 ----
      return( $related );
  }
+ 
+ /**
+ * Return SQL expression to check for permissions.
+ *
+ * Creates part of an SQL expression that can be used to request items with the
+ * standard set of Geeklog permissions.
+ *
+ * @param        string      $type     part of the SQL expr. e.g. 'WHERE', 'AND'
+ * @param        int         $u_id     user id or 0 = current user
+ * @param        int         $access   access to check for (2=read, 3=r&write)
+ * @param        string      $table    table name if ambiguous (e.g. in JOINs)
+ * @return       string      SQL expression string (may be empty)
+ */
+ function COM_getPermSQL( $type = 'WHERE', $u_id = 0, $access = 2, $table = '' )
+ {
+     global $_USER, $_GROUPS;
+ 
+     if( !empty( $table ))
+     {
+         $table .= '.';
+     }
+ 
+     if( $u_id <= 0 )
+     {
+         $uid = $_USER['uid'];    
+         $GROUPS = $_GROUPS;
+     }
+     else
+     {
+         $uid = $u_id;
+         $GROUPS = SEC_getUserGroups( $uid );
+     }
+ 
+     if( SEC_inGroup( 'Root', $uid ))
+     {
+         return '';
+     }
+ 
+     $sql = ' ' . $type . ' (';
+ 
+     if( $uid > 1 )
+     {
+         $sql .= "(({$table}owner_id = '{$uid}') AND ({$table}perm_owner >= $access)) OR ";
+ 
+         $groupList = '';
+         foreach( $GROUPS as $grp )
+         {
+             $groupList .= $grp . ',';
+         }
+         $groupList = substr( $groupList, 0, -1 );
+         $sql .= "(({$table}group_id IN ($groupList)) AND ({$table}perm_group >= $access)) OR ";
+ 
+         $sql .= "({$table}perm_members >= $access)";
+     }
+     else
+     {
+         $sql .= "{$table}perm_anon >= $access";
+     }
+ 
+     $sql .= ')';
+ 
+     return $sql;   
+ }
+ 
  
  /**




From dhaun at geeklog.net  Tue Mar 18 05:29:45 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Tue, 18 Mar 2003 04:29:45 -0600
Subject: [geeklog-cvs] geeklog-1.3/language spanish.php,1.2,1.3
Message-ID: <200303181029.h2IATji07184@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory internal.geeklog.net:/tmp/cvs-serv7172

Modified Files:
	spanish.php 
Log Message:
Updated Spanish language file, provided by Fernando Bernardini


Index: spanish.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/spanish.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** spanish.php	28 Dec 2002 15:10:16 -0000	1.2
--- spanish.php	18 Mar 2003 10:29:43 -0000	1.3
***************
*** 44,988 ****
  
  	1 => "Contribuido por:",
- 
  	2 => "leer art?culo completo",
- 
  	3 => "comentarios",
- 
  	4 => "Editar",
- 
  	5 => "Encuesta",
[...3190 lines suppressed...]
  
!     1 => 'Login requerido',
! 
      2 => 'Lo siento, para acceder a esta ?rea tienes que estar autentificado como usuario.',
! 
!     3 => 'Login',
! 
      4 => 'Nuevo Usuario'
- 
  );
  
--- 1144,1151 ----
  $LANG_LOGIN = array (
  
!     1 => 'se requiere ingresar',
      2 => 'Lo siento, para acceder a esta ?rea tienes que estar autentificado como usuario.',
!     3 => 'ingresar',
      4 => 'Nuevo Usuario'
  );
  




From dhaun at geeklog.net  Tue Mar 18 05:30:54 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Tue, 18 Mar 2003 04:30:54 -0600
Subject: [geeklog-cvs] geeklog-1.3/language spanish_argentina.php,1.6,1.7
Message-ID: <200303181030.h2IAUsi07241@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory internal.geeklog.net:/tmp/cvs-serv7229

Modified Files:
	spanish_argentina.php 
Log Message:
Updated Spanish (Argentina) language file, provided by Fernando Bernardini


Index: spanish_argentina.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/spanish_argentina.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** spanish_argentina.php	28 Dec 2002 15:10:16 -0000	1.6
--- spanish_argentina.php	18 Mar 2003 10:30:51 -0000	1.7
***************
*** 67,71 ****
  	28 => "Borrar",
  	29 => "No hay comentarios de usuarios.",
! 	30 => "Historias anteriores",
  	31 => "Tags HTML permitidos:",
  	32 => "Error, usuario inv?lido",
--- 67,71 ----
  	28 => "Borrar",
  	29 => "No hay comentarios de usuarios.",
! 	30 => "Art?culos anteriores",
  	31 => "Tags HTML permitidos:",
  	32 => "Error, usuario inv?lido",
***************
*** 74,82 ****
  	35 => "Salir",
  	36 => "sobre",
! 	37 => "",
  	38 => "",
  	39 => "Actualizar",
  	40 => "",
! 	41 => "",
  	42 => "Escrito por:",
  	43 => "Responder a",
--- 74,82 ----
  	35 => "Salir",
  	36 => "sobre",
! 	37 => "No hay noticias del usuario",
  	38 => "",
  	39 => "Actualizar",
  	40 => "",
! 	41 => "Usuarios Inviados",
  	42 => "Escrito por:",
  	43 => "Responder a",
***************
*** 117,122 ****
  	78 => "Pr?ximos Eventos",
  	79 => "Novedades",
! 	80 => "notas (80)",
! 	81 => "nota (81)",
  	82 => "horas",
  	83 => "COMENTARIOS",
--- 117,122 ----
  	78 => "Pr?ximos Eventos",
  	79 => "Novedades",
! 	80 => "Notas",
! 	81 => "Nota",
  	82 => "horas",
  	83 => "COMENTARIOS",
***************
*** 143,147 ****
      104 => 'por',
      105 => 'Envair Mails',
!     106 => 'Vistas'
  );
  
--- 143,149 ----
      104 => 'por',
      105 => 'Envair Mails',
!     106 => 'Vistas',
!     107 => 'Comprobaci?n GL',
!     108 => 'Limpiar Cach?'
  );
  
***************
*** 156,160 ****
  	5 => "Descripci?n",
  	6 => "Agregar un Evento",
! 	7 => "Pr?ximos Events",
  	8 => 'Al agregar este evento en su calendario usted podr? ver r?pidamente los eventos que le interesan. Para ello elija "Mi Calendario" en el ?rea de Funciones del usuario.',
  	9 => "Agregar a Mi Calendario",
--- 158,162 ----
  	5 => "Descripci?n",
  	6 => "Agregar un Evento",
! 	7 => "Pr?ximos Eventos",
  	8 => 'Al agregar este evento en su calendario usted podr? ver r?pidamente los eventos que le interesan. Para ello elija "Mi Calendario" en el ?rea de Funciones del usuario.',
  	9 => "Agregar a Mi Calendario",
***************
*** 194,198 ****
  	22 => 'Use un t?tulo claro que describa el contenido del mensaje.',
  	23 => 'Su direcci?n de email NO ser? divulgada.',
! 	24 => 'Usuario Anonimo'
  );
  
--- 196,200 ----
  	22 => 'Use un t?tulo claro que describa el contenido del mensaje.',
  	23 => 'Su direcci?n de email NO ser? divulgada.',
! 	24 => 'Usuario An?nimo'
  );
  
***************
*** 209,217 ****
  	7 => "Biograf?a",
  	8 => "Clave PGP",
! 	9 => "Grabar la Informaci?n",
  	10 => "Ultimos 10 comentarios",
  	11 => "No hay comentarios",
  	12 => "Preferencias del Usuario para",
! 	13 => "Enviar un resumen cada nohe por Email",
  	14 => "Este password es generado al azar. Se recomienda que cambie el password cuanto antes. Para cambiar el password conectese al sitio con su usuario.",
  	15 => "Su cuenta en {$_CONF["site_name"]} fue creada exitosamente. Para poder usarla debe ingresar utilizando los datos dados m?s abajo. Guarde este mensaje para futuras referencias.",
--- 211,219 ----
  	7 => "Biograf?a",
  	8 => "Clave PGP",
! 	9 => "Guardar",
  	10 => "Ultimos 10 comentarios",
  	11 => "No hay comentarios",
  	12 => "Preferencias del Usuario para",
! 	13 => "Enviar un resumen cada noche por Email",
  	14 => "Este password es generado al azar. Se recomienda que cambie el password cuanto antes. Para cambiar el password conectese al sitio con su usuario.",
  	15 => "Su cuenta en {$_CONF["site_name"]} fue creada exitosamente. Para poder usarla debe ingresar utilizando los datos dados m?s abajo. Guarde este mensaje para futuras referencias.",
***************
*** 226,231 ****
  	24 => "Su password ser? enviado a la direcci?n de email que ingrese.",
  	25 => "Olvid? su Password?",
! 	26 => "Ingrese su nombre de usuario y elija 'Enviar el Password por email' y el su nuevo password ser? enviado por email a su direcci?n",
! 	27 => "?Registrate ahora!",
  	28 => "Enviar el password por email",
  	29 => "desconectado de",
--- 228,233 ----
  	24 => "Su password ser? enviado a la direcci?n de email que ingrese.",
  	25 => "Olvid? su Password?",
! 	26 => "Ingrese su nombre de usuario y elija 'Enviar el Password por email' y su nuevo password ser? enviado por email a su direcci?n",
! 	27 => "?Reg?strate ahora!",
  	28 => "Enviar el password por email",
  	29 => "desconectado de",
***************
*** 257,270 ****
  	55 => "Si no selecciona ninguna significa que desea la selecci?n por defecto. De seleccionar, seleccione todas las de su inter?s ya que las opciones por defecto ya no ser?n tomadas en cuenta. Las opciones por defecto se muestran resaltadas.",
  	56 => "Autores",
! 	57 => "Modo de visualizaci?n",
  	58 => "Orden",
  	59 => "Limite por Comentario",
  	60 => "?C?mo desea ver los comentarios?",
! 	61 => "?Primero los m?s viejos o los m?s nuevos?",
  	62 => "El valor por defecto es 100",
! 	63 => "Gracias por usar {$_CONF['site_name']}. Su password a sido enviado por email y estar? llenado en unos instantes. Por favor siga las instrucciones en el mensaje.",
  	64 => "Preferencias para los Comentarios de",
! 	65 => "Intente reingresar con su usuario",
! 	66 => "Los datos ingresados no son v?lidos. Intente volver conectarse aqui. ?Es un <a href=\"{$_CONF['site_url']}/users.php?mode=new\">usuario nuevo</a>?",
  	67 => "Miembro desde",
  	68 => "Recu?rdeme para",
--- 259,272 ----
  	55 => "Si no selecciona ninguna significa que desea la selecci?n por defecto. De seleccionar, seleccione todas las de su inter?s ya que las opciones por defecto ya no ser?n tomadas en cuenta. Las opciones por defecto se muestran resaltadas.",
  	56 => "Autores",
! 	57 => "Modo de Presentaci?n",
  	58 => "Orden",
  	59 => "Limite por Comentario",
  	60 => "?C?mo desea ver los comentarios?",
! 	61 => "?Primero los m?s antiguos o los m?s recientes?",
  	62 => "El valor por defecto es 100",
! 	63 => "Gracias por usar {$_CONF['site_name']}. Su password a sido enviado por email y estar? llegando en unos instantes. Por favor siga las instrucciones en el mensaje.",
  	64 => "Preferencias para los Comentarios de",
! 	65 => "Intente reconectarse otra vez",
! 	66 => "Los datos ingresados no son v?lidos. Intente volver a conectarse aqu?. ?Es usted un <a href=\"{$_CONF['site_url']}/users.php?mode=new\">usuario nuevo</a>?",
  	67 => "Miembro desde",
  	68 => "Recu?rdeme para",
***************
*** 275,280 ****
      	73 => "Idioma",
  	74 => "?Cambie la apariencia de esta p?gina!",
! 	75 => "Secciones enviadas por mail a",
! 	76 => "Si selecciona una o m?s Secciones de la lista de abajo, todas las Notas nuevas de esas Secciones le ser?n enviadas por mail al finalizar el d?a."
  );
  
--- 277,292 ----
      	73 => "Idioma",
  	74 => "?Cambie la apariencia de esta p?gina!",
! 	75 => "Secciones enviadas por email a",
! 	76 => "Si selecciona una o m?s Secciones de la lista de abajo, todas las Notas nuevas de esas Secciones le ser?n enviadas por mail al finalizar el d?a.",
!         77 => "Foto",
!         78 => "A?adir una imagen tuya!",
!         79 => "Tildar el checkbox para borrar tu foto",
!         80 => "Identificaci?n",
!         81 => "Enviar Email",
!         82 => 'Ultimas 10 noticias para el usuario',
!         83 => 'Estad?sticas de noticias para el usuario',
!         84 => 'N?mero total de art?culos:',
!         85 => 'N?mero total de comentarios:',
!         86 => 'Encontrar todas las noticias de'
  );
  
***************
*** 287,292 ****
  	3 => "para la Secci?n $topic",
  	4 => "Nota del D?a",
! 	5 => "Pr?ximo",
! 	6 => "Previo"
  );
  
--- 299,304 ----
  	3 => "para la Secci?n $topic",
  	4 => "Nota del D?a",
! 	5 => "Siguiente",
! 	6 => "Anterior"
  );
  
***************
*** 384,388 ****
  	27 => "segundos",
      28 => 'No se encontraron coincidencias en Notas y Comentarios',
!     29 => 'Resultados para Notas y Comentarios'
  );
  
--- 396,413 ----
  	27 => "segundos",
      28 => 'No se encontraron coincidencias en Notas y Comentarios',
!     29 => 'Resultados para Notas y Comentarios',
!     30 => 'Ning?n link coincide con la b?squeda',
!     31 => 'Este plug-in no devolvi? resultados',
!     32 => 'Evento',
!     33 => 'URL',
!     34 => 'Ubicaci?n',
!     35 => 'Todo el dia',
!     36 => 'Ning?n evento coincidi? con la b?squeda',
!     37 => 'Resultados de Eventos',
!     38 => 'Resultados de Links',
!     39 => 'Links',
!     40 => 'Eventos',
!     41 => 'Tu b?squeda  debe tener al menos 3 letras.',
!     42 => 'Por favor utiliza un formato de fecha como este DD-MM-YYYY (d?a-mes-a?o).'
  );
  
***************
*** 412,418 ****
  	20 => "Visitas",
  	21 => "Parecer?a que en este sitio no hay Links o que nadie nuca los visita.",
! 	22 => "Las 10 Notas m?s enviadas por mail",
  	23 => "Emails",
! 	24 => "Parecer?a que nadie mand? una nota por mail en este sitio."
  );
  
--- 437,443 ----
  	20 => "Visitas",
  	21 => "Parecer?a que en este sitio no hay Links o que nadie nuca los visita.",
! 	22 => "Las 10 Notas m?s enviadas por email",
  	23 => "Emails",
! 	24 => "Parecer?a que nadie mand? una nota por email en este sitio."
  );
  
***************
*** 454,459 ****
  	22 => "Error: Faltan Campos",
  	23 => "Por favor complete todo los campos del formulario. Todos los campos son requeridos.",
! 	24 => "Envio Grabado",
! 	25 => "Sus envios fueron grabados con ?xito.",
  	26 => "L?mite de Velocidad",
  	27 => "Nombre del Usuario",
--- 479,484 ----
  	22 => "Error: Faltan Campos",
  	23 => "Por favor complete todo los campos del formulario. Todos los campos son requeridos.",
! 	24 => "Env?o Guardado",
! 	25 => "Sus env?os fueron grabados con ?xito.",
  	26 => "L?mite de Velocidad",
  	27 => "Nombre del Usuario",
***************
*** 469,473 ****
  	37 => "Los Eventos enviados a {$_CONF["site_name"]} se agregan al Calendario P?blico, donde el resto de los usuarios pueden agregarlo a su Calendario Personal. Esta funcionalidad <b>NO</b> est? pensada para que guarde sus eventos personales como cumplea?os, citas, etc.<br><br>Una vez enviado el evento ser? evaluado por los Administradores, de ser aprobado se mostrar? en el Calendrio P?blico", 
    	38 => "Agregar un Evento a",
!   	39 => "Calendario P?blicor",
    	40 => "Calendario Personal",
    	41 => "Hora de Finalizaci?n",
--- 494,498 ----
  	37 => "Los Eventos enviados a {$_CONF["site_name"]} se agregan al Calendario P?blico, donde el resto de los usuarios pueden agregarlo a su Calendario Personal. Esta funcionalidad <b>NO</b> est? pensada para que guarde sus eventos personales como cumplea?os, citas, etc.<br><br>Una vez enviado el evento ser? evaluado por los Administradores, de ser aprobado se mostrar? en el Calendrio P?blico", 
    	38 => "Agregar un Evento a",
!   	39 => "Calendario P?blico",
    	40 => "Calendario Personal",
    	41 => "Hora de Finalizaci?n",
***************
*** 482,486 ****
    	50 => 'Editar los Tipos de Eventos',
    	51 => 'Locaci?n',
!   	52 => 'Borrar'
  );
  
--- 507,512 ----
    	50 => 'Editar los Tipos de Eventos',
    	51 => 'Locaci?n',
!   	52 => 'Borrar',
!         53 => 'Crear Cuenta'
  );
  
***************
*** 520,524 ****
  	12 => "Bloque Normal",
  	13 => "Opciones para el Bloque del Sistema",
! 	14 => "RDF URL",
  	15 => "?ltima actualizaci?n RDF",
  	16 => "Opciones para el Bloque Normal",
--- 546,550 ----
  	12 => "Bloque Normal",
  	13 => "Opciones para el Bloque del Sistema",
! 	14 => "RDF(Resource Description Framework)URL",
  	15 => "?ltima actualizaci?n RDF",
  	16 => "Opciones para el Bloque Normal",
***************
*** 551,555 ****
  	43 => "S?lo en la P?gina de Inicio",
  	44 => "Acceso Denegado",
! 	45 => "You are trying to access a block that you don't have rights to.  This attempt has been logged. Please <a href=\"{$_CONF["site_admin_url"]}/block.php\">go back to the block administration screen</a>.",
  	46 => 'Nuevo Bloque',
  	47 => 'P?gina de Inicio - Administrador',
--- 577,581 ----
  	43 => "S?lo en la P?gina de Inicio",
  	44 => "Acceso Denegado",
! 	45 => "Usted esta tratando de acceder a un bloque en el cual usted no tiene los permisos requeridos.  Este intento ha sido registrado. Por favor  <a href=\"{$_CONF["site_admin_url"]}/block.php\">vuelva a la pantalla de administraci?n de bloques</a>.",
  	46 => 'Nuevo Bloque',
  	47 => 'P?gina de Inicio - Administrador',
***************
*** 559,563 ****
    	51 => 'incluir http://',
    	52 => 'Si deja este campo en blanco no se mostrar? el ?cono de ayuda',
! 	53 => 'Habilitado'
  );
  
--- 585,592 ----
    	51 => 'incluir http://',
    	52 => 'Si deja este campo en blanco no se mostrar? el ?cono de ayuda',
! 	53 => 'Habilitado',
!         54 => 'grabar',
!         55 => 'cancelar',
!         56 => 'borrar'
  );
  
***************
*** 584,588 ****
  	17 => "No tiene permiso para acceder a este Evento. Todo intento de acceso ser? registrado. Por favor, vuelva a <a href=\"{$_CONF["site_admin_url"]}/event.php\">la p?gina de Administraci?n de Eventos</a>.",
  	18 => 'Nuevo Evento',
! 	19 => 'P?gina de Inicio - Administrador'
  );
  
--- 613,620 ----
  	17 => "No tiene permiso para acceder a este Evento. Todo intento de acceso ser? registrado. Por favor, vuelva a <a href=\"{$_CONF["site_admin_url"]}/event.php\">la p?gina de Administraci?n de Eventos</a>.",
  	18 => 'Nuevo Evento',
! 	19 => 'P?gina de Inicio - Administrador',
!         20 => 'grabar',
!         21 => 'cancelar',
!         22 => 'borrar'
  );
  
***************
*** 610,614 ****
  	18 => 'Nuevo Link',
  	19 => 'P?gina de Inicio - Administrador',
! 	20 => 'Si otra/o, especifique'
  );
  
--- 642,649 ----
  	18 => 'Nuevo Link',
  	19 => 'P?gina de Inicio - Administrador',
! 	20 => 'Si otra/o, especifique',
!         21 => 'grabar',
!         22 => 'cancelar',
!         23 => 'borrar'
  );
  
***************
*** 622,631 ****
  	4 => "Modo de envio",
  	5 => "Editor de Notas",
! 	6 => "",
  	7 => "Autor",
! 	8 => "",
! 	9 => "",
! 	10 => "",
! 	11 => "",
  	12 => "",
  	13 => "T?tulo",
--- 657,666 ----
  	4 => "Modo de envio",
  	5 => "Editor de Notas",
!         6 => "No hay Noticias en el sistema",
  	7 => "Autor",
!         8 => "grabar",
!         9 => "prever",
!         10 => "cancelar",
!         11 => "borrar",
  	12 => "",
  	13 => "T?tulo",
***************
*** 657,666 ****
  	39 => "Emails",
  	40 => "Acceso Denegado",
! 	41 => "Esta intentando acceder a una Nota pra la cual no tiene derechos de acceso, por lo que podr? ver la Nota pero no editarla. Por favor vuelva a la <a href=\"{$_CONF["site_admin_url"]}/story.php\">p?gina de administraci?n</a> cuando haya terminado.",
! 	42 => "Esta intentando acceder a una Nota pra la cual no tiene derechos de acceso. Por favor vuelva a la <a href=\"{$_CONF["site_admin_url"]}/story.php\">p?gina de administraci?n</a>.",
  	43 => 'Nueva Nota',
  	44 => 'P?gina de Inicio - Administrador',
  	45 => 'Acceso',
!         46 => '<b>NOTA:</b> si modifica esta fecha por una futura, la Nota no ser? publicada hasta esa fecha. Esto tambi?n incluye el envi? de titulares RDF, la b?squeda y las estad?sticas del sitio.',
          47 => 'Im?genes',
          48 => 'imagen',
--- 692,701 ----
  	39 => "Emails",
  	40 => "Acceso Denegado",
! 	41 => "Esta intentando acceder a una Nota para la cual no tiene derechos de acceso, por lo que podr? ver la Nota pero no editarla. Por favor vuelva a la <a href=\"{$_CONF["site_admin_url"]}/story.php\">p?gina de administraci?n</a> cuando haya terminado.",
! 	42 => "Esta intentando acceder a una Nota para la cual no tiene derechos de acceso. Por favor vuelva a la <a href=\"{$_CONF["site_admin_url"]}/story.php\">p?gina de administraci?n</a>.",
  	43 => 'Nueva Nota',
  	44 => 'P?gina de Inicio - Administrador',
  	45 => 'Acceso',
!         46 => '<b>NOTA:</b> si modifica esta fecha por una futura, la Nota no ser? publicada hasta esa fecha. Esto tambi?n incluye el envi? de titulares RDF(Resource Description Framework), la b?squeda y las estad?sticas del sitio.',
          47 => 'Im?genes',
          48 => 'imagen',
***************
*** 671,675 ****
          53 => 'no fue usada.  Debe incluir esta imagen en la Introducci?n o el Texto para poder grabar los cambios',
          54 => 'Im?genes no utilizadas',
!         55 => 'Los siguientes errores ocurriron al querer grabar su Nota. Por favor corrija los errores antes de grabar.'
  );
  
--- 706,711 ----
          53 => 'no fue usada.  Debe incluir esta imagen en la Introducci?n o el Texto para poder grabar los cambios',
          54 => 'Im?genes no utilizadas',
!         55 => 'Los siguientes errores ocurriron al querer grabar su Nota. Por favor corrija los errores antes de grabar.',
!         56 => 'Mostrar Icono de Tema'
  );
  
***************
*** 691,697 ****
  	12 => "Hubo un error buscando los datos para la pregunta de la Encuesta $qid",
  	13 => "Crear Encuesta",
! 	14 => "",
! 	15 => "",
! 	16 => "",
  	17 => "",
  	18 => "Listado de Encuestas",
--- 727,733 ----
  	12 => "Hubo un error buscando los datos para la pregunta de la Encuesta $qid",
  	13 => "Crear Encuesta",
!         14 => "grabar",
!         15 => "cancelar",
!         16 => "borrar",
  	17 => "",
  	18 => "Listado de Encuestas",
***************
*** 699,703 ****
  	20 => "Votantes",
  	21 => "Acceso Denegado",
! 	22 => "Esta intentando acceder a una Encuesta pra la cual no tiene derechos de acceso. Por favor vuelva a la <a href=\"{$_CONF["site_admin_url"]}/poll.php\">p?gina de administraci?n</a>.",
  	23 => 'Nueva Encuesta',
  	24 => 'P?gina de Inicio - Administrador',
--- 735,739 ----
  	20 => "Votantes",
  	21 => "Acceso Denegado",
! 	22 => "Esta intentando acceder a una Encuesta para la cual no tiene derechos de acceso. Por favor vuelva a la <a href=\"{$_CONF["site_admin_url"]}/poll.php\">p?gina de administraci?n</a>.",
  	23 => 'Nueva Encuesta',
  	24 => 'P?gina de Inicio - Administrador',
***************
*** 710,714 ****
  
  $LANG27 = array(
! 	1 => "Editor dse Secciones",
  	2 => "ID",
  	3 => "Nombre",
--- 746,750 ----
  
  $LANG27 = array(
! 	1 => "Editor de Secciones",
  	2 => "ID",
  	3 => "Nombre",
***************
*** 722,731 ****
  	11 => "Notas/P?gina",
  	12 => "Acceso Denegado",
! 	13 => "Esta intentando acceder a una Secci?n pra la cual no tiene derechos de acceso. Por favor vuelva a la <a href=\"{$_CONF["site_admin_url"]}/topic.php\">p?gina de administraci?n</a>.",
  	14 => "Ordenamiento",
  	15 => "alfab?tico",
  	16 => "por defecto es",
  	17 => "Nueva Secci?n",
! 	18 => "P?gina de Inicio - Administrador"
  );
  
--- 758,770 ----
  	11 => "Notas/P?gina",
  	12 => "Acceso Denegado",
! 	13 => "Esta intentando acceder a una Secci?n para la cual no tiene derechos de acceso. Por favor vuelva a la <a href=\"{$_CONF["site_admin_url"]}/topic.php\">p?gina de administraci?n</a>.",
  	14 => "Ordenamiento",
  	15 => "alfab?tico",
  	16 => "por defecto es",
  	17 => "Nueva Secci?n",
! 	18 => "P?gina de Inicio - Administrador",
!         19 => 'grabar',
!         20 => 'cancelar',
!         21 => 'borrar'
  );
  
***************
*** 746,751 ****
  	11 => "Administrador de Usuarios",
  	12 => "Para modificar o borrar un Usuario el?jalo en la lista de abajo. Para crear uno nuevo selecione 'Nuevo Usuario' m?s arriba.",
! 	13 => "SecLev",
! 	14 => "Reg. Date",
  	15 => 'Nuevo Usuario',
  	16 => 'P?gina de Inicio - Administrador',
--- 785,790 ----
  	11 => "Administrador de Usuarios",
  	12 => "Para modificar o borrar un Usuario el?jalo en la lista de abajo. Para crear uno nuevo selecione 'Nuevo Usuario' m?s arriba.",
! 	13 => "Nivel de seguridad",
! 	14 => "Fecha de Registro",
  	15 => 'Nuevo Usuario',
  	16 => 'P?gina de Inicio - Administrador',
***************
*** 761,770 ****
      23 => 'Importaci?n Masiva',
      24 => 'Importaci?n masiva de Usuarios',
!     25 => 'Puede importar una lista de Usuarios a '.$_CONF["site_name"].'. El archivo con la lista de usuarios debe tener un registro por l?nea y los campos separados por TAB. Los campos deben estar en el siguiente orden: Nombre Completo, Nombre de Usuario, Direcci?n de Mail. A cada usuario agragdo se le enviar? por mail un password generado al azar, que podr?n cambiar al ingresar al sitio. Por favor, chequee bien el archivo de importaci?n ya que los errores encontrados pueden llegar a necesaitar arreglaos manuales.',
      26 => 'Buscar',
!     27 => 'Limitar los resultados'
  );
  
- 
  ###############################################################################
  # moderation.php
--- 800,815 ----
      23 => 'Importaci?n Masiva',
      24 => 'Importaci?n masiva de Usuarios',
!     25 => 'Puede importar una lista de Usuarios a '.$_CONF["site_name"].'. El archivo con la lista de usuarios debe tener un registro por l?nea y los campos separados por TAB. Los campos deben estar en el siguiente orden: Nombre Completo, Nombre de Usuario, Direcci?n de Mail. A cada usuario agregado se le enviar? por email un password generado al azar, que podr?n cambiar al ingresar al sitio. Por favor, chequee bien el archivo de importaci?n ya que los errores encontrados pueden llegar a necesaitar arreglos manuales.',
      26 => 'Buscar',
!     27 => 'Limitar los resultados',
!     28 => 'Tildar el checkbox para borrar esta imagen',
!     29 => 'Ruta',
!     30 => 'Importar',
!     31 => 'Nuevos Usuarios',
!     32 => 'Proceso finalizado. Se importaron $successes y hubieron $failures fallos',
!     33 => 'enviar',
!     34 => 'Error: Debes especificar un archivo a enviar.'
  );
  
  ###############################################################################
  # moderation.php
***************
*** 774,777 ****
--- 819,832 ----
  	2 => "Borrar",
  	3 => "Editar",
+     4 => 'Perfil',
+     10 => "T?tulo",
+     11 => "Fecha Inicio",
+     12 => "URL",
+     13 => "Categor?a",
+     14 => "Fecha",
+     15 => "Tema",
+     16 => 'Nombre del usuario',
+     17 => 'Nombre completo',
+     18 => 'Email',
  	34 => "P?gina de administraci?n",
  	35 => "Envios de Notas",
***************
*** 779,783 ****
  	37 => "Envios de Eventos",
  	38 => "Enviar",
! 	39 => "No hay envios para moderar en este momento"
  );
  
--- 834,840 ----
  	37 => "Envios de Eventos",
  	38 => "Enviar",
! 	39 => "No hay envios para moderar en este momento",
!    40 => "Envios del Usuario"
! 
  );
  
***************
*** 814,818 ****
      27 => "Semana",
      28 => "Calendario Personal para",
!     29 => "Calendario Publico",
      30 => "borrar evento",
      31 => "Agregar",
--- 871,875 ----
      27 => "Semana",
      28 => "Calendario Personal para",
!     29 => "Calendario P?blico",
      30 => "borrar evento",
      31 => "Agregar",
***************
*** 823,827 ****
      36 => "Enviar",
      37 => "Disculpe, la opci?n de calendario personal no se encuentra habilitada en este sitio",
!     38 => "Editor Personal de Eventos"
  );
  
--- 880,887 ----
      36 => "Enviar",
      37 => "Disculpe, la opci?n de calendario personal no se encuentra habilitada en este sitio",
!     38 => "Editor Personal de Eventos",
!     39 => 'D?a',
!     40 => 'Semana',
!     41 => 'Mes'
  );
  
***************
*** 829,833 ****
  # admin/mail.php
  $LANG31 = array(
!  	1 => "Mail",
   	2 => "De",
   	3 => "Responder a",
--- 889,893 ----
  # admin/mail.php
  $LANG31 = array(
!  	1 => $_CONF['site_name'] . "  Mail Utility",
   	2 => "De",
   	3 => "Responder a",
***************
*** 852,859 ****
          22 => 'Exitosos',
          23 => 'No hubo env?os fallidos',
!         24 => 'No hubo env?os exitosos'	
  );
  
- 
  ###############################################################################
  # confirmation and error messages
--- 912,920 ----
          22 => 'Exitosos',
          23 => 'No hubo env?os fallidos',
!         24 => 'No hubo env?os exitosos'	,
!     25 => '-- Selecciona Grupo --',
!     26 => "Por favor, rellena todos los campos del formulario y selecciona un grupo de usuarios de la lista desplegable."
  );
  
  ###############################################################################
  # confirmation and error messages
***************
*** 872,877 ****
  	11 => "Su Bloque ha sido grabado con ?xito.",
  	12 => "El Bloque ha sido borrado con ?xito.",
! 	13 => "Su Secci?n ha sido borrado con ?xito.",
! 	14 => "La Secci?n junto con todas sus Notas y Bloques ha sido borrado con ?xito.",
  	15 => "Su link fue grabado con ?xito.",
  	16 => "El link fue borrado con ?xito.",
--- 933,938 ----
  	11 => "Su Bloque ha sido grabado con ?xito.",
  	12 => "El Bloque ha sido borrado con ?xito.",
! 	13 => "Su Secci?n ha sido borrada con ?xito.",
! 	14 => "La Secci?n junto con todas sus Notas y Bloques han sido borrado con ?xito.",
  	15 => "Su link fue grabado con ?xito.",
  	16 => "El link fue borrado con ?xito.",
***************
*** 905,909 ****
          44 => 'El Plug-In fue instalado con ?xito.',
          45 => 'El Plug-In fue borrado con ?xito.',
!         46 => "Disculpe, no tiene acceso a la herramienta de Backup de la base. Aclaramos que todo acceso sin autorizaci?n queda registrado en el servidor."
  );
  
--- 966,978 ----
          44 => 'El Plug-In fue instalado con ?xito.',
          45 => 'El Plug-In fue borrado con ?xito.',
!         46 => "Disculpe, no tiene acceso a la herramienta de Backup de la base de datos. Aclaramos que todo acceso sin autorizaci?n queda registrado en el servidor.",
!     47 => "Esta funci?n est? disponible bajo *nix. Si est?s usando *nix como tu sistema operativo, entonces tu cach? ha sido limpiado con ?xito. Si est?s bajo Windows, necesitas buscar ficheros adodb_*.php y borrarlos manualmente.",
! 
!    48 => 'Gracias por registrarte como miembro en ' . $_CONF['site_name'] . '. Nuestro equipo comprobar? tu solicitud. Si es aprobada, te ser? enviado tu password a la direcci?n email que has indicado.',
!     49 => "Tu grupo ha sido grabado con ?xito.",
!     50 => "El grupo ha sido borrado con ?xito."
! 
! 
! 
  );
  
***************
*** 911,915 ****
  
  $LANG32 = array (
! 	1 => "Instalar plugins puede da?ar su instalaci?n de Geeklog y, posiblemente, su sistema. Es importante que s?lo instale plugins obtenidos de <a href=\"http://www.geeklog.net\" target=\"_blank\">Geeklog</a> ya que han sido testeados en varios entornos. Es tambi?n importante que entienda que la instalaci?n del plugin requiere la ejecuci?n de comandos del sistema que pueden traer problemas de seguridad. A?n con esta advertencia, no garabtizamos el ?xito de la instalaci?n del plugin ni nos hacemos responsables por cualquier da?o causado durante la instalaci?n (o posterior a la misma). En otras palabras, instale el plugin a su propio riesgo. Las instrucciones particulares de instalaci?n vienen dentro de cada plugin.", 
  	2 => "Advertencia de la Instalaci?n del Plug-in",
  	3 => "Formulario de instalaci?n del Plug-in",
--- 980,984 ----
  
  $LANG32 = array (
! 	1 => "Instalar plugins puede da?ar su instalaci?n de Geeklog y, posiblemente, su sistema. Es importante que s?lo instale plugins obtenidos de <a href=\"http://www.geeklog.net\" target=\"_blank\">Geeklog</a> ya que han sido testeados en varios entornos. Es tambi?n importante que entienda que la instalaci?n del plugin requiere la ejecuci?n de comandos del sistema que pueden traer problemas de seguridad. A?n con esta advertencia, no garantizamos el ?xito de la instalaci?n del plugin ni nos hacemos responsables por cualquier da?o causado durante la instalaci?n (o posterior a la misma). En otras palabras, instale el plugin a su propio riesgo. Las instrucciones particulares de instalaci?n vienen dentro de cada plugin.", 
  	2 => "Advertencia de la Instalaci?n del Plug-in",
  	3 => "Formulario de instalaci?n del Plug-in",
***************
*** 954,959 ****
  	permmsg => "NOTA: miembros son todos los miembros conectados y los usuarios an?nimos en el sitio.",
  	securitygroups => "Grupos de Seguridad",
! 	editrootmsg => "Even though you are a User Administrator, you can't edit a root user without first being a root user yourself.  You can edit all other users except root users. Please note that all attempts to illegally edit root users are logged.  Please go back to the <a href=\"{$_CONF["site_admin_url"]}/user.php\">User Administration page</a>.",
! 	securitygroupsmsg => "Select the checkboxes for the groups you want the user to belong to.",
  	groupeditor => "Editor de Grupo",
  	description => "Descripci?n",
--- 1023,1028 ----
  	permmsg => "NOTA: miembros son todos los miembros conectados y los usuarios an?nimos en el sitio.",
  	securitygroups => "Grupos de Seguridad",
!         editrootmsg => "Aunque usted sea un usuario con privilegios de administrator, usted no puede editar a un usuario <b>root</b> sin primeramente ser usted mismo un usuario <b>root</b>. Usted puede editar todo tipo de usuarios menos usuarios <b>root</b>. Note que todo inento ilegal de editar a un usuario <b>root</b> queda registrado por el server. Por favor vuelva atras a <a href=\"{$_CONF["site_admin_url"]}/user.php\">La pagina de Administraci?n de Usuarios</a>.",
! 	securitygroupsmsg => "Seleccione los checkboxes para los grupos que a usted quiere que el usuario pertenezca.",
  	groupeditor => "Editor de Grupo",
  	description => "Descripci?n",
***************
*** 968,975 ****
  	yes => "S?",
  	no => "No",
  	corerightsdescr => "Este grupo es un Grupo de Sistema de {$_CONF["site_name"]}, y por ende sus derechos no pueden ser editados. A continuaci?n se muestra una lista no editable de los derechos de acceso de este grupo.",
  	groupmsg => "Los Grupos de Seguridad en este sitio son jer?rquicos. Al agregar este grupo a cualquiera de los de abajo le estar? dando los mismos derechos que esos grupos posean. De ser posible, se recomienda utilizar los grupos ya creados para dar los derechos a un nuevo grupo. Si necesita modificar los derechos del grupo, puede seleccionarlos en la secci?n llamada 'Derechos'. Para agregar este grupo a cualquiera de los de abajo simplemente marque los grupos que quiera.",
  	coregroupmsg => "Este grupo es un Grupo de Sistema de {$_CONF["site_name"]}, y por ende los grupos que pertenezcan a este grupo no podr?n ser editados. A continuaci?n se muestar una lista (no editable) de los grupos a los cuales este grupo pertenece.",
! 	rightsdescr => "A groups access to a certain right below can be given directly to the group OR to a different group that this group is a part of.  The ones you see below without a checkbox are the rights that have been given to this group because it belongs to another group with that right.  The rights with checkboxes below are rights that can be given directly to this group.",
  	lock => "Bloqueo",
  	members => "Miembros",
--- 1037,1049 ----
  	yes => "S?",
  	no => "No",
+ 	
  	corerightsdescr => "Este grupo es un Grupo de Sistema de {$_CONF["site_name"]}, y por ende sus derechos no pueden ser editados. A continuaci?n se muestra una lista no editable de los derechos de acceso de este grupo.",
+ 	
  	groupmsg => "Los Grupos de Seguridad en este sitio son jer?rquicos. Al agregar este grupo a cualquiera de los de abajo le estar? dando los mismos derechos que esos grupos posean. De ser posible, se recomienda utilizar los grupos ya creados para dar los derechos a un nuevo grupo. Si necesita modificar los derechos del grupo, puede seleccionarlos en la secci?n llamada 'Derechos'. Para agregar este grupo a cualquiera de los de abajo simplemente marque los grupos que quiera.",
+ 	
  	coregroupmsg => "Este grupo es un Grupo de Sistema de {$_CONF["site_name"]}, y por ende los grupos que pertenezcan a este grupo no podr?n ser editados. A continuaci?n se muestar una lista (no editable) de los grupos a los cuales este grupo pertenece.",
! 	
! 	rightsdescr => "El acceso de un grupo a ciertos privilegios puede ser dado directamente al grupo o a un grupo diferente al cual este grupo pertenezca. Los privilegios que usted vea debajo sin checkbox son los privilegios que fueron dados a este grupo porque ya pertenecia a otro grupo con ese privilegio. Los privilegios que veas debajo con checkbox son los derechos que pueden ser asignados directametne a este grupo.",
! 
  	lock => "Bloqueo",
  	members => "Miembros",
***************
*** 988,994 ****
--- 1062,1071 ----
  	save => 'Grabar',
  	cancel => 'Cancelar',
+ 	delete => 'borrar',
  	canteditroot => 'Ha intentado editar el Grupo Root. Como no es miembro del grupo no tiene acceso al mismo. Si cree que esto ha sido un error por favor contacte al administrador del sistema.'
  );
  
+ #################################################################################################################################3
+ 
  #admin/word.php
  $LANG_WORDS = array(
***************
*** 1007,1012 ****
      backup_successful => 'El back up de la base se ha realizado con ?xito.',
      no_backups => 'No hay backups en el sistema',
!     db_explanation => 'Para crear un backup del sistema utilice el bot?n de abajo'
  );
  
  ?>
--- 1084,1134 ----
      backup_successful => 'El back up de la base se ha realizado con ?xito.',
      no_backups => 'No hay backups en el sistema',
!     db_explanation => 'Para crear un backup del sistema utilice el bot?n de abajo',
! 
!      not_found => "Ruta incorrecta o la utilidad mysqldump no se puede ejecutar.<br>Comprueba la definici?n de <strong>\$_DB_mysqldump_path</strong> en config.php.<br>La variable est? definida actualmente como: <var>{$_DB_mysqldump_path}</var>",
!     zero_size => 'Fallo de Backup: El tama?o era de 0 bytes',
!     path_not_found => "{$_CONF['backup_path']} no existe o no es una carpeta",
!     no_access => "ERROR: La carpeta {$_CONF['backup_path']} no es accesible.",
!     backup_file => 'Archivo de backup',
!     size => 'Tama?o',
!     bytes => 'Bytes'
! 
! 
! );
! 
! 
! $LANG_BUTTONS = array(
! 
!     1 => "Inicio",
!     2 => "Contacto",
!     3 => "Publ?cate",
!     4 => "Links",
!     5 => "Encuentas",
!     6 => "Calendario",
!     7 => "Estad?sticas",
!     8 => "Personalizar",
!     9 => "Buscar",
!     10 => "b?squeda avanzada"
! );
! 
! 
! $LANG_404 = array(
! 
!     1 => "Error 404",
!     2 => "Buah, he mirado en todos los lados pero no puedo encontrar <b>http://{$HTTP_SERVER_VARS["HTTP_HOST"]}{$HTTP_SERVER_VARS["REQUEST_URI"]}</b>.",
!     3 => "<p>Lo sentimos, pero el archivo que pides no existe. Por favor, consulta la <a href=\"{$_CONF['site_url']}\">p?gina principal</a> o la <a href=\"{$_CONF['site_url']}/search.php\">p?gina de b?squeda</a> para ver si puedes encontrar lo que has perdido."
! );
! 
! 
! 
! $LANG_LOGIN = array (
! 
!     1 => 'Se requiere ingresar',
!     2 => 'Lo siento, para acceder a esta ?rea tienes que estar autentificado como usuario.',
!     3 => 'Ingresar',
!     4 => 'Nuevo Usuario'
  );
+ 
+ 
  
  ?>




From dhaun at geeklog.net  Wed Mar 19 06:13:37 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Wed, 19 Mar 2003 05:13:37 -0600
Subject: [geeklog-cvs] geeklog-1.3/system/install_templates databasesettings.tpl,1.5,1.6
Message-ID: <200303191113.h2JBDbi01198@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/system/install_templates
In directory internal.geeklog.net:/tmp/cvs-serv1177/system/install_templates

Modified Files:
	databasesettings.tpl 
Log Message:
Minor corrections to ensure the install script produces valid HTML.


Index: databasesettings.tpl
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/install_templates/databasesettings.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** databasesettings.tpl	16 Apr 2002 15:02:39 -0000	1.5
--- databasesettings.tpl	19 Mar 2003 11:13:35 -0000	1.6
***************
*** 1,3 ****
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
  <html>
  <head><title>Geeklog Installation: Database Setup</title></head>
--- 1,3 ----
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  <html>
  <head><title>Geeklog Installation: Database Setup</title></head>
***************
*** 7,16 ****
      <form action="install.php" method="post">
      <input type="hidden" name="upgrade" value="{upgrade}">
!     <center><table cellpadding="3" cellspacing="0" border="0">
          {UPGRADE_OPTIONS}
!     </table></center>
      <input type="hidden" name="page" value="2">
      <input type="hidden" name="geeklog_path" value="{geeklog_path}">
!     <center><input type="submit" name="action" value="<< Previous">&nbsp;<input type="submit" name="action" value="Next >>"></center>
      </form>
  </body>
--- 7,16 ----
      <form action="install.php" method="post">
      <input type="hidden" name="upgrade" value="{upgrade}">
!     <table cellpadding="3" cellspacing="0" border="0" align="center">
          {UPGRADE_OPTIONS}
!     </table>
      <input type="hidden" name="page" value="2">
      <input type="hidden" name="geeklog_path" value="{geeklog_path}">
!     <p align="center"><input type="submit" name="action" value="&lt;&lt; Previous">&nbsp;<input type="submit" name="action" value="Next &gt;&gt;"></p>
      </form>
  </body>




From dhaun at geeklog.net  Wed Mar 19 06:13:37 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Wed, 19 Mar 2003 05:13:37 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/install install.php,1.45,1.46
Message-ID: <200303191113.h2JBDbi01195@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install
In directory internal.geeklog.net:/tmp/cvs-serv1177/public_html/admin/install

Modified Files:
	install.php 
Log Message:
Minor corrections to ensure the install script produces valid HTML.


Index: install.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install/install.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** install.php	11 Mar 2003 17:00:56 -0000	1.45
--- install.php	19 Mar 2003 11:13:35 -0000	1.46
***************
*** 117,121 ****
      }
      $retval .= '</b></p></td></tr>';
!     $retval .= '<tr><td colspan="2" align="center"><input type="submit" value="Next >>"></td></tr>' . LB;
      $retval .= '</table>' . LB;
      $retval .= '<input type="hidden" name="page" value="1">' . LB;
--- 117,121 ----
      }
      $retval .= '</b></p></td></tr>';
!     $retval .= '<tr><td colspan="2" align="center"><input type="submit" value="Next &gt;&gt;"></td></tr>' . LB;
      $retval .= '</table>' . LB;
      $retval .= '<input type="hidden" name="page" value="1">' . LB;
***************
*** 150,154 ****
          // This is a fresh installation, let them change their table settings
          $db_templates->set_var('upgrade',0);
!         $db_templates->set_var('UPGRADE_OPTIONS','');
      }
  
--- 150,154 ----
          // This is a fresh installation, let them change their table settings
          $db_templates->set_var('upgrade',0);
!         $db_templates->set_var('UPGRADE_OPTIONS','<tr><td>&nbsp;</td></tr>');
      }
  




From dhaun at geeklog.net  Wed Mar 19 10:41:10 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Wed, 19 Mar 2003 09:41:10 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/install check.php,1.2,1.3
Message-ID: <200303191541.h2JFfAi06303@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install
In directory internal.geeklog.net:/tmp/cvs-serv6285

Modified Files:
	check.php 
Log Message:
Removed an extra slash ...


Index: check.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install/check.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** check.php	7 Jul 2002 18:05:24 -0000	1.2
--- check.php	19 Mar 2003 15:41:08 -0000	1.3
***************
*** 86,90 ****
  }
  
! echo '<p>Testing <b>backend</b> directory ' . $_CONF['path_html'] . '/backend/ ...<br>' . LB;
  if ($_CONF['backend'] > 0) {
      if (!$file = @fopen ($_CONF['rdf_file'], 'w')) {
--- 86,90 ----
  }
  
! echo '<p>Testing <b>backend</b> directory ' . $_CONF['path_html'] . 'backend/ ...<br>' . LB;
  if ($_CONF['backend'] > 0) {
      if (!$file = @fopen ($_CONF['rdf_file'], 'w')) {




From dhaun at geeklog.net  Wed Mar 19 11:05:37 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Wed, 19 Mar 2003 10:05:37 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html submit.php,1.49,1.50
Message-ID: <200303191605.h2JG5bi06719@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv6697

Modified Files:
	submit.php 
Log Message:
Pick up the $_CONF['comment_code'] setting when the story submission queue is off.


Index: submit.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/submit.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** submit.php	29 Jan 2003 17:08:52 -0000	1.49
--- submit.php	19 Mar 2003 16:05:35 -0000	1.50
***************
*** 5,17 ****
  // | Geeklog 1.3                                                               |
  // +---------------------------------------------------------------------------+
! // | lib-common.php                                                            |
! // | Geeklog common library.                                                   |
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 5,18 ----
  // | Geeklog 1.3                                                               |
  // +---------------------------------------------------------------------------+
! // | submit.php                                                                |
  // |                                                                           |
+ // | Let users submit stories, links, and events.                              |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
! // |          Dirk Haun         - dirk at haun-online.de                          |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 698,702 ****
                  $T = DB_fetchArray ($result);
                  $related = addslashes (COM_whatsRelated ($introtext, $_USER['uid'], $A['tid']));
!                 DB_save ($_TABLES['stories'], 'sid,uid,tid,title,introtext,related,date,postmode,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon', "{$A["sid"]},{$_USER['uid']},'{$A["tid"]}','{$A['title']}','{$A["introtext"]}','{$related}',NOW(),'{$A["postmode"]}',{$_USER['uid']},{$T['group_id']},{$T['perm_owner']},{$T['perm_group']},{$T['perm_members']},{$T['perm_anon']}");
                  if (isset ($_CONF['notification']) && in_array ('story', $_CONF['notification'])) {
                      $A['uid'] = $_USER['uid'];
--- 699,703 ----
                  $T = DB_fetchArray ($result);
                  $related = addslashes (COM_whatsRelated ($introtext, $_USER['uid'], $A['tid']));
!                 DB_save ($_TABLES['stories'], 'sid,uid,tid,title,introtext,related,date,commentcode,postmode,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon', "{$A["sid"]},{$_USER['uid']},'{$A["tid"]}','{$A['title']}','{$A["introtext"]}','{$related}',NOW(),{$_CONF['comment_code']},'{$A["postmode"]}',{$_USER['uid']},{$T['group_id']},{$T['perm_owner']},{$T['perm_group']},{$T['perm_members']},{$T['perm_anon']}");
                  if (isset ($_CONF['notification']) && in_array ('story', $_CONF['notification'])) {
                      $A['uid'] = $_USER['uid'];




From dhaun at geeklog.net  Wed Mar 19 12:14:54 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Wed, 19 Mar 2003 11:14:54 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.81,1.82
Message-ID: <200303191714.h2JHEsi08885@internal.geeklog.net>

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

Modified Files:
	story.php 
Log Message:
Added call to setMaxFileUploads() so that you can have more than 5 images per story.
Also fixed a problem with topic permissions being too restrictive.


Index: story.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** story.php	2 Feb 2003 19:46:47 -0000	1.81
--- story.php	19 Mar 2003 17:14:52 -0000	1.82
***************
*** 9,17 ****
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 9,18 ----
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
! // |          Dirk Haun         - dirk at haun-online.de                          |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 414,431 ****
      }
  
-     $groupList = '';
-     if (!empty ($_USER['uid'])) {
-         foreach ($_GROUPS as $grp) {
-             $groupList .= $grp . ',';
-         }
-         $groupList = substr ($groupList, 0, -1);
-     }
- 
      $excludetopics = '';
!     $topicsql = "SELECT tid FROM {$_TABLES['topics']} WHERE "
!               . "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR "     
!               . "(group_id IN ($groupList) AND perm_group >= 2) OR "
!               . "(perm_members >= 2) OR "
!               . "(perm_anon >= 2)";
      $tresult = DB_query( $topicsql );
      $trows = DB_numRows( $tresult );     
--- 415,420 ----
      }
  
      $excludetopics = '';
!     $topicsql = "SELECT tid FROM {$_TABLES['topics']}" . COM_getPermSQL ();
      $tresult = DB_query( $topicsql );
      $trows = DB_numRows( $tresult );     
***************
*** 656,660 ****
                  $perm_members, $perm_anon);
      }
!     if (($access < 3) || (SEC_hasTopicAccess ($tid) < 3) || !SEC_inGroup ($group_id)) {
          $display .= COM_siteHeader('menu');
          $display .= COM_startBlock($MESSAGE[30]);
--- 645,649 ----
                  $perm_members, $perm_anon);
      }
!     if (($access < 3) || (SEC_hasTopicAccess ($tid) < 2) || !SEC_inGroup ($group_id)) {
          $display .= COM_siteHeader('menu');
          $display .= COM_startBlock($MESSAGE[30]);
***************
*** 749,752 ****
--- 738,742 ----
  
              $upload->setDebug(true);
+             $upload->setMaxFileUploads ($_CONF['maximagesperarticle']);
              if (!empty($_CONF['image_lib'])) {
                  if ($_CONF['image_lib'] == 'imagemagick') {




From dhaun at geeklog.net  Fri Mar 21 08:55:41 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 21 Mar 2003 07:55:41 -0600
Subject: [geeklog-cvs] geeklog-1.3 config.php,1.74,1.75
Message-ID: <200303211355.h2LDtfi25236@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3
In directory internal.geeklog.net:/tmp/cvs-serv25190

Modified Files:
	config.php 
Log Message:
Integrated Vincent Furia's improvements to COM_exportRDF() and COM_rdfUpToDateCheck(). Also added an option to include the story's introtext to the RDF feed and fixed a bug with unescaped special characters in the feed's title.


Index: config.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/config.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** config.php	16 Mar 2003 03:58:43 -0000	1.74
--- config.php	21 Mar 2003 13:55:38 -0000	1.75
***************
*** 311,315 ****
  // Story Settings
  $_CONF['maximagesperarticle']   = 5;
- $_CONF['backend']               = 1;
  $_CONF['limitnews']             = 10;
  $_CONF['minnews']               = 1;	// minimum number of stories per page
--- 311,314 ----
***************
*** 318,321 ****
--- 317,331 ----
  $_CONF['hideemailicon']         = 0;    // If 1, hide "email story" option
  $_CONF['hideprintericon']       = 0;    // If 1, hide "printer friendly" option
+ 
+ // RDF feed settings
+ $_CONF['backend']               = 1;    // 1 = active, 0 = off
+ // This allows a person to limit the rdf feed to a certain number of stories
+ // (e.g. 10 or 12) or else limit the rdf feed to all stories within a certain
+ // period of time in hours (e.g. 24h or 168h). 
+ $_CONF['rdf_limit']             = 10;   // number of stories (10) or hours (24h)
+ // Include the story's entire intro text in the feed (= 1) or limit the number
+ // of characters from the intro text (any number > 1) or don't include the text
+ // at all (= 0).
+ $_CONF['rdf_storytext']         = 0;
  
  // When set to 1, this will render the first story on any page using the




From dhaun at geeklog.net  Fri Mar 21 08:55:41 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 21 Mar 2003 07:55:41 -0600
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.76,1.77
Message-ID: <200303211355.h2LDtfi25239@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory internal.geeklog.net:/tmp/cvs-serv25190/docs

Modified Files:
	history 
Log Message:
Integrated Vincent Furia's improvements to COM_exportRDF() and COM_rdfUpToDateCheck(). Also added an option to include the story's introtext to the RDF feed and fixed a bug with unescaped special characters in the feed's title.


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** history	12 Mar 2003 19:02:01 -0000	1.76
--- history	21 Mar 2003 13:55:38 -0000	1.77
***************
*** 4,7 ****
--- 4,12 ----
  -------
  
+ - Integrated Vincent Furia's improvements for COM_exportRDF. You can now use
+   $_CONF['rdf_limit'] to limit the number of stories in the RDF file by
+   setting this to a number (e.g. 10) or a number of hours (e.g. 24h).
+   $_CONF['rdf_storytext'] lets you add the story's introtext to the RDF feed.
+   Also fixed a bug with un-escaped special characters in the feed's title.
  - A Static Page with a title of "topic:<topic-id>" (e.g. topic:GeekLog) will
    be displayed on top of the index page for that topic (based on a hack by
***************
*** 22,26 ****
    $_CONF['cookiedomain']), found & fixed by Jon Evans.
  - Fixed mixing of comments from different plugins, found & fixed by Alan McKay.
! - A theme can provide it's own functions to render the site header and footer
    (this is not a new feature). Geeklog now expects those functions to be named
    <themename>_siteHeader and <themename>_siteFoote, respectively. Until now,
--- 27,31 ----
    $_CONF['cookiedomain']), found & fixed by Jon Evans.
  - Fixed mixing of comments from different plugins, found & fixed by Alan McKay.
! - A theme can provide its own functions to render the site header and footer
    (this is not a new feature). Geeklog now expects those functions to be named
    <themename>_siteHeader and <themename>_siteFoote, respectively. Until now,
***************
*** 65,71 ****
--- 70,81 ----
  
  - Updated French language file, provided by Jaques.
+ - Updated Hellenic (Greek) language file, provided by Access-=-Denied Networks
+ - Updated Spanish and Spanish (Argentina) language files,
+   provided by Fernando Bernardini
  - New Slovenian language file, provided by gape
  - New Slovak language file, provided by Rado
  - New Romanian language file, provided by Dan Gheorghitza
+ - New Chinese language file (gb2312 encoding), provided by Crocodile King
+ - New Czech language file, provided by Hermes Trismegistos
  
  




From dhaun at geeklog.net  Fri Mar 21 08:55:41 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 21 Mar 2003 07:55:41 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.207,1.208
Message-ID: <200303211355.h2LDtfi25242@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv25190/public_html

Modified Files:
	lib-common.php 
Log Message:
Integrated Vincent Furia's improvements to COM_exportRDF() and COM_rdfUpToDateCheck(). Also added an option to include the story's introtext to the RDF feed and fixed a bug with unescaped special characters in the feed's title.


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.207
retrieving revision 1.208
diff -C2 -d -r1.207 -r1.208
*** lib-common.php	16 Mar 2003 10:25:28 -0000	1.207
--- lib-common.php	21 Mar 2003 13:55:39 -0000	1.208
***************
*** 1274,1278 ****
  *
  * The core of this code has been lifted from phpweblog which is licenced
! * under the GPL.
  *
  * @see function COM_rdfUpToDateCheck
--- 1274,1278 ----
  *
  * The core of this code has been lifted from phpweblog which is licenced
! * under the GPL. It has since been heavily modified.
  *
  * @see function COM_rdfUpToDateCheck
***************
*** 1282,1296 ****
  function COM_exportRDF()
  {
!     global $_TABLES, $_CONF, $_COM_VERBOSE, $LANG01;
  
!     if ($_CONF['backend']>0)
      {
          $outputfile = $_CONF['rdf_file'];
          $rdencoding = 'UTF-8';
!         $rdtitle = $_CONF['site_name'];
          $rdlink = $_CONF['site_url'];
!         $rddescr = $_CONF['site_slogan'];
          $rdlang = $_CONF['locale'];
!         $result = DB_query( "SELECT * FROM {$_TABLES['stories']} WHERE draft_flag = 0 AND date <= NOW() ORDER BY date DESC limit 20" );
  
          if( !$file = @fopen( $outputfile, w ))
--- 1282,1335 ----
  function COM_exportRDF()
  {
!     global $_TABLES, $_CONF, $LANG01;
  
!     if( $_CONF['backend'] > 0 )
      {
          $outputfile = $_CONF['rdf_file'];
          $rdencoding = 'UTF-8';
!         $rdtitle = htmlspecialchars( $_CONF['site_name'] );
          $rdlink = $_CONF['site_url'];
!         $rddescr = htmlspecialchars( $_CONF['site_slogan'] );
          $rdlang = $_CONF['locale'];
! 
!         $where = '';
!         if( !empty( $_CONF['rdf_limit'] ))
!         {
!             if( substr( $_CONF['rdf_limit'], -1 ) == 'h' ) // last xx hours
!             {
!                 $limit = '';
!                 $hours = substr( $_CONF['rdf_limit'], 0, -1 );
!                 $where = " AND date >= DATE_SUB(NOW(),INTERVAL $hours HOUR)";
!             }
!             else
!             {
!                 $limit = ' LIMIT ' . $_CONF['rdf_limit'];
!             }
!         }
!         else
!         {
!             $limit = ' LIMIT 10';
!         }
! 
!         // get list of topics that anonymous users have access to
!         $tresult = DB_query( "SELECT tid FROM {$_TABLES['topics']}"
!                              . COM_getPermSQL( 'WHERE', 1 ));
!         $tnumrows = DB_numRows( $tresult );
!         $tlist = '';
!         for( $i = 1; $i <= $tnumrows; $i++ )
!         {
!             $T = DB_fetchArray( $tresult );
!             $tlist .= "'" . $T['tid'] . "'";
!             if( $i < $tnumrows )
!             {
!                 $tlist .= ',';
!             }
!         }
!         if( !empty( $tlist ))
!         {
!             $where .= " AND (tid IN ($tlist))";
!         }
! 
!         $result = DB_query( "SELECT sid,title,introtext FROM {$_TABLES['stories']} WHERE draft_flag = 0 AND date <= NOW() $where AND perm_anon > 0 ORDER BY date DESC $limit" );
  
          if( !$file = @fopen( $outputfile, w ))
***************
*** 1311,1348 ****
              $sids = '';
              $nrows = DB_numRows( $result );
-             $actualcount = 0;
  
!             for( $i = 1; $i <= $nrows AND $actualcount < 10; $i++ )
              {
                  $row = DB_fetchArray( $result );
!                 $topic_anon = DB_getItem( $_TABLES['topics'], 'perm_anon', "tid='{$row['tid']}'" );
  
!                 // Only add to RDF feed if anonymous has access to it
  
!                 if( $row['perm_anon'] == 2 AND $topic_anon == 2 )
                  {
!                     $sids .= $row['sid'];
  
!                     if( $i <> $nrows )
                      {
!                         $sids .= ',';
                      }
  
!                     $title = 'title';
!                     $link = 'sid';
!                     $author = 'author';
! 
!                     fputs ( $file, "<item>\n" );
  
!                     $title = '<title>' . htmlspecialchars( stripslashes( $row[$title] )) . "</title>\n";
!                     $author = '<author>' . htmlspecialchars( stripslashes( $row[$author] )) . "</author>\n";
!                     $link  = "<link>{$_CONF['site_url']}/article.php?story={$row[$link]}</link>\n";
  
!                     fputs( $file,  $title );
!                     fputs( $file,  $link );
!                     fputs( $file, "</item>\n\n" );
  
!                     $actualcount++;
                  }
              }
  
--- 1350,1406 ----
              $sids = '';
              $nrows = DB_numRows( $result );
  
!             for( $i = 1; $i <= $nrows; $i++ )
              {
                  $row = DB_fetchArray( $result );
!                 $sids .= $row['sid'];
  
!                 if( $i <> $nrows )
!                 {
!                     $sids .= ',';
!                 }
  
!                 $title = 'title';
!                 $link = 'sid';
! 
!                 if( $_CONF['rdf_storytext'] > 0 )
                  {
!                     $desc = '<description>';
  
!                     $storytext = stripslashes( strip_tags( $row['introtext'] ));
!                     $storytext = trim( $storytext );
!                     $storytext = preg_replace( "/(\015)/", "", $storytext);
! 
!                     if( $_CONF['rdf_storytext'] > 1 )
                      {
!                         if( strlen( $storytext ) > $_CONF['rdf_storytext'] )
!                         {
!                             $storytext = substr( $storytext, 0,
!                                     $_CONF['rdf_storytext'] ) . '...';
!                         }
                      }
  
!                     $desc .= $storytext . "</description>\n";
!                 }
!                 else
!                 {
!                     $desc = '';
!                 }
  
!                 fputs ( $file, "<item>\n" );
  
!                 $title = '<title>'
!                        . htmlspecialchars( stripslashes( $row[$title] ))
!                        . "</title>\n";
!                 $link  = '<link>' . $_CONF['site_url'] . '/article.php?story='
!                        . $row[$link] . "</link>\n";
  
!                 fputs( $file,  $title );
!                 fputs( $file,  $link );
!                 if( !empty( $desc ))
!                 {
!                     fputs( $file,  $desc );
                  }
+                 fputs( $file, "</item>\n\n" );
              }
  
***************
*** 1358,1362 ****
  /**
  *
! * Checks to see if RDF file needs updating and updates it if sol
  * Checks to see if we need to update the RDF as a result
  * of an article with a future publish date reaching it's
--- 1416,1420 ----
  /**
  *
! * Checks to see if RDF file needs updating and updates it if so.
  * Checks to see if we need to update the RDF as a result
  * of an article with a future publish date reaching it's
***************
*** 1369,1394 ****
  function COM_rdfUpToDateCheck()
  {
!     global $_TABLES;
! 
!     $result = DB_query( "SELECT sid FROM {$_TABLES['stories']} WHERE draft_flag = 0 AND date <= NOW() ORDER BY date DESC limit 10" );
!     $nrows = DB_numRows( $result );
!     $sids = '';
  
!     for( $i = 1; $i <= $nrows; $i++ )
      {
!         $A = DB_fetchArray( $result );
!         $sids .= $A['sid'];
  
!         if( $i <> $nrows )
          {
!             $sids .= ',';
          }
-     }
  
!     $last_rdf_sids = DB_getItem( $_TABLES['vars'], 'value', "name = 'rdf_sids'" );
  
!     if( $sids <> $last_rdf_sids )
!     {
!         COM_exportRDF();
      }
  }
--- 1427,1494 ----
  function COM_rdfUpToDateCheck()
  {
!     global $_TABLES, $_CONF;
  
!     if( $_CONF['backend'] > 0 )
      {
!         $where = '';
!         if( !empty( $_CONF['rdf_limit'] ))
!         {
!             if( substr( $_CONF['rdf_limit'], -1 ) == 'h' ) // last xx hours
!             {
!                 $limit = '';
!                 $hours = substr( $_CONF['rdf_limit'], 0, -1 );
!                 $where = " AND date >= DATE_SUB(NOW(),INTERVAL $hours HOUR)";
!             }
!             else
!             {
!                 $limit = ' LIMIT ' . $_CONF['rdf_limit'];
!             }
!         }
!         else
!         {
!             $limit = ' LIMIT 10';
!         }
  
!         // get list of topics that anonymous users have access to
!         $tresult = DB_query( "SELECT tid FROM {$_TABLES['topics']}"
!                              . COM_getPermSQL( 'WHERE', 1 ));
!         $tnumrows = DB_numRows( $tresult );
!         $tlist = '';
!         for( $i = 1; $i <= $tnumrows; $i++ )
          {
!             $T = DB_fetchArray( $tresult );
!             $tlist .= "'" . $T['tid'] . "'";
!             if( $i < $tnumrows )
!             {
!                 $tlist .= ',';
!             }
!         }
!         if( !empty( $tlist ))
!         {
!             $where .= " AND (tid IN ($tlist))";
          }
  
!         $result = DB_query( "SELECT sid FROM {$_TABLES['stories']} WHERE draft_flag = 0 AND date <= NOW() $where AND perm_anon > 0 ORDER BY date DESC $limit" );
!         $nrows = DB_numRows( $result );
!         $sids = '';
  
!         for( $i = 1; $i <= $nrows; $i++ )
!         {
!             $A = DB_fetchArray( $result );
!             $sids .= $A['sid'];
! 
!             if( $i <> $nrows )
!             {
!                 $sids .= ',';
!             }
!         }
! 
!         $last_rdf_sids = DB_getItem( $_TABLES['vars'], 'value',
!                                      "name = 'rdf_sids'" );
! 
!         if( $sids <> $last_rdf_sids )
!         {
!             COM_exportRDF ();
!         }
      }
  }
***************
*** 1397,1403 ****
  * Checks and Updates the featured status of all articles.
  *
! * Checks to see if any articles that were published for the future have been published and, if
! * so, will see if they are featured.  If they are featured, this will set old featured article (if
! * if there is one) to normal
  *
  */
--- 1497,1503 ----
  * Checks and Updates the featured status of all articles.
  *
! * Checks to see if any articles that were published for the future have been
! * published and, if so, will see if they are featured.  If they are featured,
! * this will set old featured article (if there is one) to normal
  *
  */




From dhaun at geeklog.net  Fri Mar 21 09:58:51 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 21 Mar 2003 08:58:51 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin moderation.php,1.32,1.33
Message-ID: <200303211458.h2LEwpi27220@internal.geeklog.net>

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

Modified Files:
	moderation.php 
Log Message:
Fixed bug #684862 (link to edit submissions for plugins is now index.php instead of <plugintype>.php). Also made sure we always use the submission table name supplied by the plugin (instead of assuming it's "<plugintype>submission").


Index: moderation.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/moderation.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** moderation.php	1 Jan 2003 20:02:19 -0000	1.32
--- moderation.php	21 Mar 2003 14:58:49 -0000	1.33
***************
*** 6,17 ****
  // +---------------------------------------------------------------------------+
  // | moderation.php                                                            |
- // | Geeklog main administration page.                                         |
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 6,18 ----
  // +---------------------------------------------------------------------------+
  // | moderation.php                                                            |
  // |                                                                           |
+ // | Geeklog main administration page.                                         |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
! // |          Dirk Haun         - dirk at haun-online.de                          |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 239,244 ****
              }
              if ($isplugin)  {
!                 $mod_templates->set_var('edit_submission_url', $_CONF['site_admin_url'] . '/plugins/' . $type . '/' 
!                     . $type . '.php?mode=editsubmission&amp;id=' . $A['id']);
              } else {
                  $mod_templates->set_var('edit_submission_url', $_CONF['site_admin_url'] . '/' .  $type
--- 240,246 ----
              }
              if ($isplugin)  {
!                 $mod_templates->set_var ('edit_submission_url',
!                     $_CONF['site_admin_url'] . '/plugins/' . $type
!                     . '/index.php?mode=editsubmission&amp;id=' . $A['id']);
              } else {
                  $mod_templates->set_var('edit_submission_url', $_CONF['site_admin_url'] . '/' .  $type
***************
*** 269,275 ****
          }
      }
! 	
      $retval .= COM_endBlock();
! 	
      return $retval;
  }
--- 271,277 ----
          }
      }
! 
      $retval .= COM_endBlock();
! 
      return $retval;
  }
***************
*** 380,387 ****
              }
              if (empty($mid[$i])) {
!                 $retval .= COM_errorLog("moderation.php just tried deleting everyting in table {$type}submission because it got an empty id.  Please report this immediately to your site administrator");
                  return $retval;
              }
!             DB_delete($_TABLES["{$type}submission"],"$id",$mid[$i]);
              break;
          case 'approve':
--- 382,389 ----
              }
              if (empty($mid[$i])) {
!                 $retval .= COM_errorLog("moderation.php just tried deleting everything in table $submissiontable because it got an empty id.  Please report this immediately to your site administrator");
                  return $retval;
              }
!             DB_delete($submissiontable,"$id",$mid[$i]);
              break;
          case 'approve':
***************
*** 397,401 ****
                  DB_save ($_TABLES['stories'],'sid,uid,tid,title,introtext,related,date,commentcode,postmode,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon',
                  "{$A['sid']},{$A['uid']},'{$A['tid']}','{$A['title']}','{$A['introtext']}','{$A['related']}','{$A['date']}',{$_CONF['comment_code']},'{$A['postmode']}',{$A['owner_id']},{$T['group_id']},{$T['perm_owner']},{$T['perm_group']},{$T['perm_members']},{$T['perm_anon']}");
!                 DB_delete($_TABLES["{$type}submission"],"$id",$mid[$i]);
              } else {
                  // This is called in case this is a plugin. There may be some
--- 399,403 ----
                  DB_save ($_TABLES['stories'],'sid,uid,tid,title,introtext,related,date,commentcode,postmode,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon',
                  "{$A['sid']},{$A['uid']},'{$A['tid']}','{$A['title']}','{$A['introtext']}','{$A['related']}','{$A['date']}',{$_CONF['comment_code']},'{$A['postmode']}',{$A['owner_id']},{$T['group_id']},{$T['perm_owner']},{$T['perm_group']},{$T['perm_members']},{$T['perm_anon']}");
!                 DB_delete($_TABLES["storysubmission"],"$id",$mid[$i]);
              } else {
                  // This is called in case this is a plugin. There may be some
***************
*** 467,471 ****
                      mail($A["email"], "{$_CONF["site_name"]}: {$LANG04[16]}",
                          $mailtext,
!                         "From: {$_CONF["site_name"]} <{$_CONF["site_mail"]}>\nReturn-Path: <{$_CONF["site_mail"]}>\nContent-Type: text/plain; charset={$charset}\nX-Mailer: GeekLog $VERSION");
                  }
                  break;
--- 469,473 ----
                      mail($A["email"], "{$_CONF["site_name"]}: {$LANG04[16]}",
                          $mailtext,
!                         "From: {$_CONF["site_name"]} <{$_CONF["site_mail"]}>\r\nReturn-Path: <{$_CONF["site_mail"]}>\r\nX-Mailer: GeekLog $VERSION\r\nContent-Type: text/plain; charset={$charset}");
                  }
                  break;




From dhaun at geeklog.net  Fri Mar 21 12:15:23 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 21 Mar 2003 11:15:23 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin group.php,1.23,1.24
Message-ID: <200303211715.h2LHFNi31160@internal.geeklog.net>

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

Modified Files:
	group.php 
Log Message:
Fixed bug #701596: Group permissions were displayed for the current user, not for the selected group.


Index: group.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/group.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** group.php	20 Sep 2002 20:54:15 -0000	1.23
--- group.php	21 Mar 2003 17:15:21 -0000	1.24
***************
*** 9,17 ****
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 9,18 ----
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
! // |          Dirk Haun         - dirk at haun-online.de                          |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 109,113 ****
  		// most topics should belong to the normal user group 
  		$A['group_id'] = DB_getItem($_TABLES['groups'],'grp_id',"grp_name = 'Normal User'");
! 		$A['grp_gl_core'] == 0;
  	}
  
--- 110,114 ----
  		// most topics should belong to the normal user group 
  		$A['group_id'] = DB_getItem($_TABLES['groups'],'grp_id',"grp_name = 'Normal User'");
! 		$A['grp_gl_core'] = 0;
  	}
  
***************
*** 201,207 ****
  }
  
  /**
! * Prints the features a group has access.  Please follow the comments in the code
! * closely if you need to modify this function. Also right is synonymous with feature
  *
  * @param    mixed       $grp_id     ID to print rights for
--- 202,260 ----
  }
  
+ 
  /**
! * Get the indirect features for a group, i.e. a list of all the features
! * that this group inherited from other groups.
! *
! * @param    int      $grp_id   ID of group
! * @return   string   comma-separated list of feature names
! *
! */
! function getIndirectFeatures ($grp_id)
! {
!     global $_TABLES;
! 
!     $checked = array ();
!     $tocheck = array ($grp_id);
! 
!     do {
!         $grp = array_pop ($tocheck);
! 
!         $result = DB_query ("SELECT ug_main_grp_id FROM {$_TABLES['group_assignments']} WHERE ug_grp_id = $grp AND ug_uid IS NULL");
!         $numrows = DB_numRows ($result);
! 
!         $checked[] = $grp;
! 
!         for ($j = 0; $j < $numrows; $j++) {
!             $A = DB_fetchArray ($result);
!             if (!in_array ($A['ug_main_grp_id'], $checked) &&
!                 !in_array ($A['ug_main_grp_id'], $tocheck)) {
!                 $tocheck[] = $A['ug_main_grp_id'];
!             }
!         }
!     }
!     while (sizeof ($tocheck) > 0);
! 
!     // get features for all groups in $checked
!     $glist = join (',', $checked);
!     $result = DB_query("SELECT DISTINCT ft_name FROM {$_TABLES['access']},{$_TABLES['features']} WHERE ft_id = acc_ft_id AND acc_grp_id IN ($glist)");
!     $nrows = DB_numRows ($result);
! 
!     $retval = '';
!     for ($j = 1; $j <= $nrows; $j++) {
!         $A = DB_fetchArray ($result);
!         $retval .= $A['ft_name'];
!         if ($j < $nrows) {
!             $retval .= ',';
!         }
!     }
! 
!     return $retval;
! }
! 
! /**
! * Prints the features a group has access.  Please follow the comments in the
! * code closely if you need to modify this function. Also right is synonymous
! * with feature.
  *
  * @param    mixed       $grp_id     ID to print rights for
***************
*** 213,218 ****
  {
  	global $_TABLES, $VERBOSE, $_USER, $LANG_ACCESS;
! 
! 	// this gets a bit complicated so bare with the comments
  	// first query for all available features
  	$features = DB_query("SELECT * FROM {$_TABLES['features']} ORDER BY ft_name");
--- 266,271 ----
  {
  	global $_TABLES, $VERBOSE, $_USER, $LANG_ACCESS;
! $VERBOSE = true;
! 	// this gets a bit complicated so bear with the comments
  	// first query for all available features
  	$features = DB_query("SELECT * FROM {$_TABLES['features']} ORDER BY ft_name");
***************
*** 223,230 ****
   		$directfeatures = DB_query("SELECT acc_ft_id,ft_name FROM {$_TABLES['access']},{$_TABLES['features']} WHERE ft_id = acc_ft_id AND acc_grp_id = $grp_id",1);
  
! 		// now in many cases the features will be give to this user indirectly via membership
! 		// to another group.  These are not editable and must, instead, be removed from that group
! 		// directly
! 		$indirectfeatures = SEC_getUserPermissions($grp_id);
  		$indirectfeatures = explode(',',$indirectfeatures);
  
--- 276,283 ----
   		$directfeatures = DB_query("SELECT acc_ft_id,ft_name FROM {$_TABLES['access']},{$_TABLES['features']} WHERE ft_id = acc_ft_id AND acc_grp_id = $grp_id",1);
  
!         // now in many cases the features will be given to this user indirectly
!         // via membership to another group.  These are not editable and must,
!         // instead, be removed from that group directly
! 		$indirectfeatures = getIndirectFeatures ($grp_id);
  		$indirectfeatures = explode(',',$indirectfeatures);
  




From dhaun at geeklog.net  Sat Mar 22 09:04:55 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 22 Mar 2003 08:04:55 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.208,1.209
Message-ID: <200303221404.h2ME4ti20048@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv19998/public_html

Modified Files:
	lib-common.php 
Log Message:
We need to use character sets other than UTF-8 and an additional $_CONF['rdf_language'] setting for RSS/RDF feeds in languages other than English.


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.208
retrieving revision 1.209
diff -C2 -d -r1.208 -r1.209
*** lib-common.php	21 Mar 2003 13:55:39 -0000	1.208
--- lib-common.php	22 Mar 2003 14:04:53 -0000	1.209
***************
*** 1287,1295 ****
      {
          $outputfile = $_CONF['rdf_file'];
!         $rdencoding = 'UTF-8';
          $rdtitle = htmlspecialchars( $_CONF['site_name'] );
          $rdlink = $_CONF['site_url'];
          $rddescr = htmlspecialchars( $_CONF['site_slogan'] );
!         $rdlang = $_CONF['locale'];
  
          $where = '';
--- 1287,1309 ----
      {
          $outputfile = $_CONF['rdf_file'];
!         if( !empty( $_CONF['default_charset'] ))
!         {
!             $rdencoding = $_CONF['default_charset'];
!         }
!         else
!         {
!             $rdencoding = 'UTF-8';
!         }
          $rdtitle = htmlspecialchars( $_CONF['site_name'] );
          $rdlink = $_CONF['site_url'];
          $rddescr = htmlspecialchars( $_CONF['site_slogan'] );
!         if( !empty( $_CONF['rdf_language'] ))
!         {
!             $rdlang = $_CONF['rdf_language'];
!         }
!         else
!         {
!             $rdlang = $_CONF['locale'];
!         }
  
          $where = '';




From dhaun at geeklog.net  Sat Mar 22 09:04:55 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 22 Mar 2003 08:04:55 -0600
Subject: [geeklog-cvs] geeklog-1.3 config.php,1.75,1.76
Message-ID: <200303221404.h2ME4ti20045@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3
In directory internal.geeklog.net:/tmp/cvs-serv19998

Modified Files:
	config.php 
Log Message:
We need to use character sets other than UTF-8 and an additional $_CONF['rdf_language'] setting for RSS/RDF feeds in languages other than English.


Index: config.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/config.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** config.php	21 Mar 2003 13:55:38 -0000	1.75
--- config.php	22 Mar 2003 14:04:53 -0000	1.76
***************
*** 132,135 ****
--- 132,136 ----
  $_CONF['timeonly']  = '%I:%M %p %Z';
  $_CONF['default_charset'] = 'iso-8859-1';
+ $_CONF['rdf_language']    = 'en-gb'; // may have to be different than the locale
  
  // ----------------------------------------------------------------------------+
***************
*** 318,322 ****
  $_CONF['hideprintericon']       = 0;    // If 1, hide "printer friendly" option
  
! // RDF feed settings
  $_CONF['backend']               = 1;    // 1 = active, 0 = off
  // This allows a person to limit the rdf feed to a certain number of stories
--- 319,327 ----
  $_CONF['hideprintericon']       = 0;    // If 1, hide "printer friendly" option
  
! // When set to 1, this will render the first story on any page using the
! // templates for featured stories - even if that story is not featured.
! $_CONF['showfirstasfeatured']   = 0;
! 
! // RSS/RDF feed settings
  $_CONF['backend']               = 1;    // 1 = active, 0 = off
  // This allows a person to limit the rdf feed to a certain number of stories
***************
*** 328,335 ****
  // at all (= 0).
  $_CONF['rdf_storytext']         = 0;
- 
- // When set to 1, this will render the first story on any page using the
- // templates for featured stories - even if that story is not featured.
- $_CONF['showfirstasfeatured']   = 0;
  
  // Uncomment the following line to set the copyright year in the site's footer
--- 333,336 ----




From dhaun at geeklog.net  Sat Mar 22 09:29:59 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 22 Mar 2003 08:29:59 -0600
Subject: [geeklog-cvs] geeklog-1.3/docs config.html,1.14,1.15
Message-ID: <200303221429.h2METxi20296@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory internal.geeklog.net:/tmp/cvs-serv20284

Modified Files:
	config.html 
Log Message:
Added explanations of the RSS/RDF feed settings.


Index: config.html
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/config.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** config.html	19 Jan 2003 10:39:34 -0000	1.14
--- config.html	22 Mar 2003 14:29:57 -0000	1.15
***************
*** 83,89 ****
      <td valign="top">/path/to/geeklog/language/</td>
      <td valign="top">location of the Geeklog language files</td></tr>
- <tr><td valign="top"><a name="desc_rdf_file">rdf_file</a></td>
-     <td valign="top">HTML path with "/backend/geeklog.rdf" suffix</td>
-     <td valign="top">File system path for the RDF file. This file allows you to share your site's headlines with others</td></tr>
  <tr><td valign="top"><a name="desc_backup_path">backup_path</a></td>
      <td valign="top">Base path with "/backups/" suffix</td>
--- 83,86 ----
***************
*** 462,469 ****
    <td valign="top">max. number of images you can have in a story</td></tr>
  <tr>
-   <td valign="top"><a name="desc_backend">backend</a></td>
-   <td valign="top">1</td>
-   <td valign="top">Create an RSS/RDF file for the stories in rdfpath (0=no, 1=yes)</td></tr>
- <tr>
    <td valign="top"><a name="desc_limitnews">limitnews</a></td>
    <td valign="top">10</td>
--- 459,462 ----
***************
*** 654,657 ****
--- 647,677 ----
  </tr>
  </table>
+ 
+ 
+ <h3><a name="rdf">RSS/RDF Feed Settings</a></h3>
+ 
+ <p>Geeklog can export its headlines to a so-called RSS feed (also known as an RDF feed). This will let you share your news with other sites (Hint: Create a Portal block from Geeklog's Block menu to import RSS/RDF news feeds from other sites).</p>
+ 
+ <table border="1" width="100%">
+ <tr><th width="8%">Variable</th>
+     <th width="29%">Default Value</th>
+     <th width="63%">Description</th></tr>
+ <tr><td valign="top"><a name="desc_backend">backend</a></td>
+     <td valign="top">1</td>
+     <td valign="top">Create an RSS/RDF file for the stories in rdf_file (0=no, 1=yes)</td></tr>
+ <tr><td valign="top"><a name="desc_rdf_file">rdf_file</a></td>
+     <td valign="top">HTML path with "/backend/geeklog.rdf" suffix</td>
+     <td valign="top">File system path for the RDF file. This file allows you to share your site's headlines with others</td></tr>
+ <tr><td valign="top"><a name="desc_rdf_language">rdf_language</a></td>
+     <td valign="top">en-gb</td>
+     <td valign="top">Value for the feed's language tag. Depending on your site's language and operating system, this may differ from the language setting in the locale (see above).<br><strong>Example:</strong> The PHP locale setting for German is 'de_DE' while the correct language setting for a German RSS feed would be 'de-DE' (note the dash instead of the underscore).</td></tr>
+ <tr><td valign="top"><a name="desc_rdf_limit">rdf_limit</a></td>
+     <td valign="top">10</td>
+     <td valign="top">Limit the number of stories in the RSS feed. If the value for this setting is a number, the feed will hold this many stories. If the number is followed by a lower-case 'h' (e.g. 24h) it denotes the number of hours from which to chose the stories.</td></tr>
+ <tr><td valign="top"><a name="desc_rdf_storytext">rdf_storytext</a></td>
+     <td valign="top">0</td>
+     <td valign="top">If this value is 1, then the entire introtext of the stories will be included in the RSS feed. Any number greater than one limits the introtext to that many characters (e.g. a value of 80 would only include the first 80 characters from the introtext in the feed). If set to 0, the introtext is not included in the feed.</td></tr>
+ </table>
+ 
  
  <h3><a name="content">Content Control Settings</a></h3>




From dhaun at geeklog.net  Sat Mar 22 18:24:30 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 22 Mar 2003 17:24:30 -0600
Subject: [geeklog-cvs] geeklog-1.3/docs index.html,1.10,1.11
Message-ID: <200303222324.h2MNOUi27901@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory internal.geeklog.net:/tmp/cvs-serv27883

Modified Files:
	index.html 
Log Message:
Fixed spelling


Index: index.html
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/index.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** index.html	13 Mar 2003 10:36:11 -0000	1.10
--- index.html	22 Mar 2003 23:24:28 -0000	1.11
***************
*** 71,75 ****
  was time to devote his time to other things and the project has since been 
  maintained by Tony Bibbs who uses Geeklog to run <a 
! href="http://www.iowaoutdoors.org/">Iowa Outdoors</a>. Geeklog is bonafied 
  open-source software and has been released under the <a href="license" 
  title="GNU General Public License">GNU GPL</a> for use by others. 
--- 71,75 ----
  was time to devote his time to other things and the project has since been 
  maintained by Tony Bibbs who uses Geeklog to run <a 
! href="http://www.iowaoutdoors.org/">Iowa Outdoors</a>. Geeklog is bona fide 
  open-source software and has been released under the <a href="license" 
  title="GNU General Public License">GNU GPL</a> for use by others. 




From dhaun at geeklog.net  Sun Mar 23 17:13:47 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 23 Mar 2003 16:13:47 -0600
Subject: [geeklog-cvs] geeklog-1.3/docs staticpages.html,NONE,1.1
Message-ID: <200303232213.h2NMDki19441@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory internal.geeklog.net:/tmp/cvs-serv19427

Added Files:
	staticpages.html 
Log Message:
Static Pages documentation. I thought I already checked this in, but obviously not ...


--- NEW FILE: staticpages.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
  <title>Geeklog Documentation - Static Pages plugin</title>
  <link rel="stylesheet" type="text/css" href="docstyle.css" title="Dev Stylesheet">
</head>

<body>
<table cellpadding="2" cellspacing="2" border="0" width="100%">
<tr>
  <td valign="top"><img src="images/newlogo.gif" alt="Geeklog Documentation" width="235" height="90" border="0"></td>
</tr>
<tr>
  <td valign="top" class="menu"><a href="index.html">Geeklog Documentation</a> - Static Pages plugin</td>
</tr>
</table>

<h1>Static Pages plugin</h1>

<h2><a name="about">What is it?</a></h2>

<p>The Static Pages plugin was originally aimed at creating pages with static content (as opposed to the dynamic pages created by Geeklog) - hence the name. Pages like an "about us" page, a mission statement, etc. would come to mind.</p>

<p>Since then, people have used the Static Pages for all kinds of things and with the inclusion of PHP into Static Pages, even the original name isn't quite right any more ...</p>


<h2><a name="history">History</a></h2>

<p>The plugin was originally written by Tony Bibbs and is included with Geeklog as a pre-installed plugin since Geeklog 1.3.4. An extended version of the plugin was started by Phill Gillespie and later supported by Tom Willet. The extended version allows the use of PHP in Static Pages and also supports proper Geeklog permissions.</p>

<p>With Geeklog 1.3.8 and Static Pages 1.3 these two versions have now been merged again. Static Pages 1.3 also includes some new features that were not included in either of its predecessors.</p>


<h2><a name="features">Features</a></h2>

<ul>
  <li>supports <a href="#php">use of PHP</a></li>
  <li>proper support for Geeklog permissions</li>
  <li><a href="#id">editable page ID</a> to make more readable URLs</li>
  <li>Static Pages can be displayed on Geeklog's <a href="#frontpage">index page</a> and can even replace it entirely ("splash screen")</li>
  <li>Static Pages can be displayed on Geeklog's <a href="#topic">topic pages</a></li>
  <li>"<a href="#cloning">cloning</a>" of existing pages</li>
  <li>Makes use of Geeklog's <a href="#url">URL rewrite feature</a></li>
</ul>


<h2><a name="php">Use of PHP</a></h2>

<p align="center"><em>The use of PHP in Static Pages may result in security issues if not used properly. Use this feature with care!</em></p>

<p>The use of PHP has to be enabled for each individual Static Page. Make sure you check the PHP checkbox below the content edit field. If that checkbox is not checked, your PHP code will be displayed as the page's content instead (i.e. it will not be executed).</p>

<p>To use PHP, the person editing the Static Page will also need to have "staticpages.PHP" permission. This is the default for all users in the "Static Page Admin" group, but you could create a second Admin group with only the "staticpages.edit" and "staticpages.delete" permissions if you don't want to allow all your Static Page Admins to make use of PHP.</p>

<p>Please note that when you enable PHP for a Static Page, the content of the page is treated as PHP source, i.e. you will need to write PHP code. Some examples may help:</p>

<p><strong>Example 1 (wrong!)</strong></p>
<pre><code>
    &lt;?php 
     return "This is a test"; 
    ?&gt;
    This is not a test.
</code></pre>

<p>With PHP enabled, this will not display anything at all. With PHP disabled, it will only display "This is not a test."</p>

<p>Why? Because everything between <code>&lt;?php</code> and <code>?&gt;</code> will <em>always</em> be stripped out, whether the page has been set to PHP mode or not.</p>

<p><strong>Example 2 (good)</strong></p>
<pre><code>
    return "This is a test";
</code></pre>

<p>With PHP enabled, this will display "This is a test". With PHP disabled, it will display the entire PHP code, i.e. <code>return "This is a test";</code>

<p><strong>Example 3 (wrong)</strong></p>
<pre><code>
    echo "This is a test";
</code></pre>

<p>With PHP enabled, this will display "This is a test" - but not where you would expect it. When using PHP in Static Pages, you should not use <code>echo</code> or <code>print</code> but return the content you want to be displayed using a <code>return</code> statement (see example 2).</p>

<h3><a name="phpsummary">Summary</a></h3>
<ul>
  <li>You will need to enable the use of PHP for each individual page.</li>
  <li>Don't include your PHP code in <code>&lt;?php</code> and <code>?&gt;</code> tags.</li>
  <li>Don't use <code>echo</code> or <code>print</code>.</li>
  <li>Use <code>return</code> to return the content you want to be displayed.</li>
</ul>


<h2><a name="id">Page ID</a></h2>

<p>When creating a new Static Page, it will be assigned a page ID automatically. This ID consists of the date and time and up to three random digits. When you anticipate that the URL of this page may be used a lot, e.g. quoted in emails, it may make sense to use a more readable ID for the page.</p>

<p>The Static Pages editor will let you change the page ID. For example, you may want to rename the ID for your "about" page from "20030313100131123" to "about", thus creating a URL like</p>

<p align="center"><tt>http://yoursite/staticpages/index.php?page=about</tt></p>

<p>which looks much nicer when quoted (and is easier to remember). You could further improve this by making use of Geeklog's <a href="#url">URL rewrite feature</a>.</p>

<p>Please note that you should only use letters and digits for the page ID. Avoid national special characters, most punctuation characters ('-' and '.' should be okay, though) and spaces. The Static Page editor will catch some illegal characters but not all of them ...</p>


<h2><a name="frontpage">Using Static Pages on the index page</a></h2>

<p>Sometimes, you may want to display the contents of a Static Page on your site's front page. To do that, create a Static Page and give it the title "frontpage" (without the quotes). The contents of this Static Page will then be displayed above the stories on Geeklog's index page.</p>

<p>You can even take this one step further and make the Static Page replace the index page entirely when you also set the page's label to "nonews".</p>

<p>By setting the permissions accordingly, you can also create Static Pages that are only displayed for anonymous users (e.g. to tell them what they can expect when they register with your site) or logged-in users.</p>


<h2><a name="topic">Using Static Pages on topic pages</a></h2>

<p>In addition to being used on the frontpage, you can also create Static Pages that are displayed on top of a topic page (i.e. <tt>index.php?topic=SomeTopic</tt>).</p>

<p>To make use of this feature, create a new Static Page and give it a title consisting of the word "topic:" followed by the topic's ID, e.g. "topic:GeekLog" (without the quotes). The page will then be displayed above the list of stories from that topic.</p>

<p>Make sure you use the topic ID (i.e. the word you see in the URL for that topic), not the topic name (the topic name is what is displayed in Geeklog's Section block).</p>


<h2><a name="block">Wrapping Static Pages in a block</a></h2>

<p>Static Pages will be wrapped in a block when <code>$_SP_CONF['in_block']</code> is set to <code>1</code> (in the plugin's <tt>config.php</tt> file). The title of the Static Page is then used as the block title.</p>

<p>However, when using a Static Page on the frontpage or on a topic page, the page's <em>label</em> is used as the block title. A Static Page that is used as a splash screen (with "nonews" as a label) can not be wrapped in a block - you would need to include some PHP code that calls <code>COM_startBlock</code> and <code>COM_endBlock</code> in that case.</p>


<h2><a name="cloning">Cloning Static Pages</a></h2>

<p>When you have a lot of similar Static Pages you may want to make a copy of an existing page and then edit that copy. This can easily be done by clicking on the [C] from the list of Static Pages. Doing so will create a copy of that page with a new page ID.</p>


<h2><a name="url">URL rewriting</a></h2>

<p align="center"><em>Please note that this feature is considered experimental and is known not to work with IIS.</em></p>

<p>Geeklog supports a form of URL rewriting, i.e. change the look or URLs such that they are more search engine friendly. For example, instead of</p>

<p align="center"><tt>http://yoursite/staticpages/index.php?page=20030313100131123</tt></p>

<p>the URL could look like this</p>

<p align="center"><tt>http://yoursite/staticpages/index.php/20030313100131123</tt></p>

<p>Some search engines are known not to index pages when the URL includes characters like '?' and '='. You could further improve the chances of this page being indexed by <a href="#id">replacing the numeric page ID</a> with a word or expression (preferrably something that corresponds to the page's content), e.g.</p>

<p align="center"><tt>http://yoursite/staticpages/index.php/about</tt></p>

<p>To make use of URL rewriting, you will need to enable it in Geeklog's <tt>config.php</tt> file by setting</p>

<p><code>$_CONF['url_rewrite'] = true;</code></p>

<p>The Static Pages plugin is currently the only plugin known to make use of this feature.</p>

<table border="0" width="100%" class="footer">
<tr valign="top">
  <td colspan="2"><a href="http://www.geeklog.net">The Geeklog Documentation Project</a><br>
    All trademarks and copyrights on this page are owned by their respective owners. GeekLog is copyleft.</td>
</tr>
</table>

</body>
</html>




From dhaun at geeklog.net  Mon Mar 24 12:42:19 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:19 -0600
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.77,1.78
Message-ID: <200303241742.h2OHgJi08849@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory internal.geeklog.net:/tmp/cvs-serv8775/docs

Modified Files:
	history 
Log Message:
You can now set a default topic for story submissions.


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** history	21 Mar 2003 13:55:38 -0000	1.77
--- history	24 Mar 2003 17:42:17 -0000	1.78
***************
*** 4,7 ****
--- 4,14 ----
  -------
  
+ - You can now make one topic the default topic. The topic selection in the
+   story submission form will then default to this topic.
+ - When clicking on the "contribute" link from the topic index page, the new
+   story will now default to the topic you just viewed.
+   This only works with themes that use the {menu_elements} variable in
+   header.thtml. Other themes can use the new variable {current_topic} which
+   holds '&topic=<topicid>' when a topic is selected (and is empty otherwise).
  - Integrated Vincent Furia's improvements for COM_exportRDF. You can now use
    $_CONF['rdf_limit'] to limit the number of stories in the RDF file by




From dhaun at geeklog.net  Mon Mar 24 12:42:20 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:20 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue/admin/topic listitem.thtml,1.2,1.3 topiceditor.thtml,1.3,1.4
Message-ID: <200303241742.h2OHgKi08885@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/admin/topic
In directory internal.geeklog.net:/tmp/cvs-serv8775/public_html/layout/Smooth_Blue/admin/topic

Modified Files:
	listitem.thtml topiceditor.thtml 
Log Message:
You can now set a default topic for story submissions.


Index: listitem.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/admin/topic/listitem.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** listitem.thtml	20 May 2002 20:08:55 -0000	1.2
--- listitem.thtml	24 Mar 2003 17:42:18 -0000	1.3
***************
*** 1,5 ****
                              {begin_row} 
                              <td>
!                                 <a href="{site_admin_url}/topic.php?mode=edit&amp;tid={topic_id}">{image_tag}{topic_name}</a> ({topic_access})
                              </td>
                              {end_row}
--- 1,5 ----
                              {begin_row} 
                              <td>
!                                 <a href="{site_admin_url}/topic.php?mode=edit&amp;tid={topic_id}">{image_tag}{topic_name}</a>{default_topic} ({topic_access})
                              </td>
                              {end_row}

Index: topiceditor.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/admin/topic/topiceditor.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** topiceditor.thtml	18 Aug 2002 18:07:31 -0000	1.3
--- topiceditor.thtml	24 Mar 2003 17:42:18 -0000	1.4
***************
*** 22,25 ****
--- 22,29 ----
                                      </tr>
                                      <tr>
+                                         <td align="right">{lang_defaulttopic}:</td>
+                                         <td><input type="checkbox" name="is_default" {default_checked}"> ({lang_defaulttext})</td>
+                                     </tr>
+                                     <tr>
                                          <td colspan="2"><hr><td>
                                      </tr>




From dhaun at geeklog.net  Mon Mar 24 12:42:20 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:20 -0600
Subject: [geeklog-cvs] geeklog-1.3/sql mysql_tableanddata.php,1.44,1.45
Message-ID: <200303241742.h2OHgKi08914@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/sql
In directory internal.geeklog.net:/tmp/cvs-serv8775/sql

Modified Files:
	mysql_tableanddata.php 
Log Message:
You can now set a default topic for story submissions.


Index: mysql_tableanddata.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/sql/mysql_tableanddata.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** mysql_tableanddata.php	11 Mar 2003 17:00:57 -0000	1.44
--- mysql_tableanddata.php	24 Mar 2003 17:42:18 -0000	1.45
***************
*** 426,429 ****
--- 426,430 ----
    sortnum tinyint(3) default NULL,
    limitnews tinyint(3) default NULL,
+   is_default tinyint(1) unsigned NOT NULL DEFAULT '0',
    group_id mediumint(8) unsigned NOT NULL default '1',
    owner_id mediumint(8) unsigned NOT NULL default '1',




From dhaun at geeklog.net  Mon Mar 24 12:42:20 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:20 -0600
Subject: [geeklog-cvs] geeklog-1.3/sql/updates mysql_1.3.7_to_1.3.8.php,NONE,1.1
Message-ID: <200303241742.h2OHgKi08916@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/sql/updates
In directory internal.geeklog.net:/tmp/cvs-serv8775/sql/updates

Added Files:
	mysql_1.3.7_to_1.3.8.php 
Log Message:
You can now set a default topic for story submissions.


--- NEW FILE: mysql_1.3.7_to_1.3.8.php ---
<?php

$_SQL[] = "ALTER TABLE {$_TABLES['topics']} ADD is_default tinyint(1) unsigned NOT NULL DEFAULT '0'";

?>




From dhaun at geeklog.net  Mon Mar 24 12:42:20 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:20 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic/admin/topic listitem.thtml,1.2,1.3 topiceditor.thtml,1.3,1.4 topiclist.thtml,1.3,1.4
Message-ID: <200303241742.h2OHgKi08869@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/admin/topic
In directory internal.geeklog.net:/tmp/cvs-serv8775/public_html/layout/Classic/admin/topic

Modified Files:
	listitem.thtml topiceditor.thtml topiclist.thtml 
Log Message:
You can now set a default topic for story submissions.


Index: listitem.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/admin/topic/listitem.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** listitem.thtml	4 May 2002 20:45:45 -0000	1.2
--- listitem.thtml	24 Mar 2003 17:42:17 -0000	1.3
***************
*** 1,5 ****
                              {begin_row} 
                              <td>
!                                 <a href="{site_admin_url}/topic.php?mode=edit&amp;tid={topic_id}">{image_tag}{topic_name}</a> ({topic_access})
                              </td>
                              {end_row}
--- 1,5 ----
                              {begin_row} 
                              <td>
!                                 <a href="{site_admin_url}/topic.php?mode=edit&amp;tid={topic_id}">{image_tag}{topic_name}</a>{default_topic} ({topic_access})
                              </td>
                              {end_row}

Index: topiceditor.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/admin/topic/topiceditor.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** topiceditor.thtml	4 May 2002 19:27:49 -0000	1.3
--- topiceditor.thtml	24 Mar 2003 17:42:17 -0000	1.4
***************
*** 22,25 ****
--- 22,29 ----
                                      </tr>
                                      <tr>
+                                         <td align="right">{lang_defaulttopic}:</td>
+                                         <td><input type="checkbox" name="is_default" {default_checked}"> ({lang_defaulttext})</td>
+                                     </tr>
+                                     <tr>
                                          <td colspan="2"><hr><td>
                                      </tr>

Index: topiclist.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/admin/topic/topiclist.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** topiclist.thtml	4 May 2002 20:45:45 -0000	1.3
--- topiclist.thtml	24 Mar 2003 17:42:17 -0000	1.4
***************
*** 3,7 ****
                                      <tr>
                                          <td rowspan="2">
!                                             <img src="{site_url}/images/icons/topic.gif" alt="">
                                          </td>
                                          <td>[ <a href="{site_admin_url}/topic.php?mode=edit">{lang_newtopic}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
--- 3,7 ----
                                      <tr>
                                          <td rowspan="2">
!                                             <img src="{layout_url}/images/icons/topic.gif" alt="">
                                          </td>
                                          <td>[ <a href="{site_admin_url}/topic.php?mode=edit">{lang_newtopic}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>




From dhaun at geeklog.net  Mon Mar 24 12:42:19 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:19 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.82,1.83 topic.php,1.32,1.33
Message-ID: <200303241742.h2OHgJi08861@internal.geeklog.net>

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

Modified Files:
	story.php topic.php 
Log Message:
You can now set a default topic for story submissions.


Index: story.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** story.php	19 Mar 2003 17:14:52 -0000	1.82
--- story.php	24 Mar 2003 17:42:17 -0000	1.83
***************
*** 293,297 ****
      $story_templates->set_var('story_title', stripslashes($A['title']));
      $story_templates->set_var('lang_topic', $LANG24[14]);
!     $story_templates->set_var('topic_options', COM_topicList('tid,topic',$A['tid']));
      $story_templates->set_var('lang_show_topic_icon', $LANG24[56]);
      if ($A['show_topic_icon'] == 1) {
--- 293,300 ----
      $story_templates->set_var('story_title', stripslashes($A['title']));
      $story_templates->set_var('lang_topic', $LANG24[14]);
!     if (empty ($A['tid'])) {
!         $A['tid'] = DB_getItem ($_TABLES['topics'], 'tid', 'is_default = 1' . COM_getPermSQL ('AND'));
!     }
!     $story_templates->set_var ('topic_options', COM_topicList ('tid,topic', $A['tid']));
      $story_templates->set_var('lang_show_topic_icon', $LANG24[56]);
      if ($A['show_topic_icon'] == 1) {

Index: topic.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/topic.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** topic.php	2 Feb 2003 19:46:47 -0000	1.32
--- topic.php	24 Mar 2003 17:42:17 -0000	1.33
***************
*** 9,17 ****
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 9,18 ----
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
! // |          Dirk Haun         - dirk at haun-online.de                          |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 151,154 ****
--- 152,164 ----
      $topic_templates->set_var('image_url', $A['imageurl']); 
      $topic_templates->set_var('warning_msg', $LANG27[6]);
+ 
+     $topic_templates->set_var ('lang_defaulttopic', $LANG27[22]);
+     $topic_templates->set_var ('lang_defaulttext', $LANG27[23]);
+     if ($A['is_default'] == 1) {
+         $topic_templates->set_var ('default_checked', 'checked="checked"');
+     } else {
+         $topic_templates->set_var ('default_checked', '');
+     }
+ 
      $topic_templates->parse('output', 'editor');
      $retval .= $topic_templates->finish($topic_templates->get_var('output'));
***************
*** 159,163 ****
  ###############################################################################
  # Saves $tid to the database
! function savetopic($tid,$topic,$imageurl,$sortnum,$limitnews,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon)
  {
      global $_TABLES, $_CONF, $LANG27, $MESSAGE;
--- 169,173 ----
  ###############################################################################
  # Saves $tid to the database
! function savetopic($tid,$topic,$imageurl,$sortnum,$limitnews,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$is_default)
  {
      global $_TABLES, $_CONF, $LANG27, $MESSAGE;
***************
*** 191,195 ****
  		}	
          $topic = addslashes ($topic);
! 		DB_save($_TABLES['topics'],'tid, topic, imageurl, sortnum, limitnews, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon',"'$tid', '$topic', '$imageurl','$sortnum','$limitnews',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon",$_CONF['site_admin_url'] . "/topic.php?msg=13");
  	} else {
  		$retval .= COM_siteHeader('menu');
--- 201,213 ----
  		}	
          $topic = addslashes ($topic);
! 
!         if ($is_default == 'on') {
!             $is_default = 1;
!             DB_query ("UPDATE {$_TABLES['topics']} SET is_default = 0 WHERE is_default = 1");
!         } else {
!             $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",$_CONF['site_admin_url'] . "/topic.php?msg=13");
  	} else {
  		$retval .= COM_siteHeader('menu');
***************
*** 239,242 ****
--- 257,265 ----
              $topic_templates->set_var('topic_name', stripslashes ($A['topic']));
              $topic_templates->set_var('topic_access', $access);
+             if ($A['is_default'] == 1) {
+                 $topic_templates->set_var ('default_topic', '(*)');
+             } else {
+                 $topic_templates->set_var ('default_topic', '');
+             }
  		    if (!empty($A["imageurl"])) {
                  if (isset ($_THEME_URL)) {
***************
*** 286,290 ****
  } else if (($mode == $LANG27[19]) && !empty ($LANG27[19])) { // save
      savetopic($tid,$topic,$imageurl,$sortnum,$limitnews,$owner_id,$group_id,
!             $perm_owner,$perm_group,$perm_members,$perm_anon);
  } else if ($mode == 'edit') {
      $display .= COM_siteHeader('menu');
--- 309,313 ----
  } else if (($mode == $LANG27[19]) && !empty ($LANG27[19])) { // save
      savetopic($tid,$topic,$imageurl,$sortnum,$limitnews,$owner_id,$group_id,
!             $perm_owner,$perm_group,$perm_members,$perm_anon,$is_default);
  } else if ($mode == 'edit') {
      $display .= COM_siteHeader('menu');




From dhaun at geeklog.net  Mon Mar 24 12:42:20 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:20 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue header.thtml,1.5,1.6
Message-ID: <200303241742.h2OHgKi08877@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue
In directory internal.geeklog.net:/tmp/cvs-serv8775/public_html/layout/Smooth_Blue

Modified Files:
	header.thtml 
Log Message:
You can now set a default topic for story submissions.


Index: header.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/header.thtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** header.thtml	6 Jun 2002 12:58:50 -0000	1.5
--- header.thtml	24 Mar 2003 17:42:18 -0000	1.6
***************
*** 43,47 ****
      <td class="menu" colspan="3" nowrap="nowrap">
        <a href="{site_url}/index.php">Homepage</a> |
!       <a href="{site_url}/submit.php">{button_contribute}</a> |
        <a href="{site_url}/links.php">{button_links}</a> |
        <a href="{site_url}/calendar.php">{button_calendar}</a> |
--- 43,47 ----
      <td class="menu" colspan="3" nowrap="nowrap">
        <a href="{site_url}/index.php">Homepage</a> |
!       <a href="{site_url}/submit.php?type=story{current_topic}">{button_contribute}</a> |
        <a href="{site_url}/links.php">{button_links}</a> |
        <a href="{site_url}/calendar.php">{button_calendar}</a> |




From dhaun at geeklog.net  Mon Mar 24 12:42:20 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:20 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo/admin/topic listitem.thtml,1.3,1.4 topiceditor.thtml,1.4,1.5
Message-ID: <200303241742.h2OHgKi08908@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/admin/topic
In directory internal.geeklog.net:/tmp/cvs-serv8775/public_html/layout/Yahoo/admin/topic

Modified Files:
	listitem.thtml topiceditor.thtml 
Log Message:
You can now set a default topic for story submissions.


Index: listitem.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/admin/topic/listitem.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** listitem.thtml	5 May 2002 13:26:03 -0000	1.3
--- listitem.thtml	24 Mar 2003 17:42:18 -0000	1.4
***************
*** 1,5 ****
                              {begin_row} 
                              <td>
!                                 <a href="{site_admin_url}/topic.php?mode=edit&amp;tid={topic_id}">{image_tag}{topic_name}</a> ({topic_access})
                              </td>
                              {end_row}
--- 1,5 ----
                              {begin_row} 
                              <td>
!                                 <a href="{site_admin_url}/topic.php?mode=edit&amp;tid={topic_id}">{image_tag}{topic_name}</a>{default_topic} ({topic_access})
                              </td>
                              {end_row}

Index: topiceditor.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/admin/topic/topiceditor.thtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** topiceditor.thtml	4 May 2002 19:27:49 -0000	1.4
--- topiceditor.thtml	24 Mar 2003 17:42:18 -0000	1.5
***************
*** 22,25 ****
--- 22,29 ----
                                      </tr>
                                      <tr>
+                                         <td align="right">{lang_defaulttopic}:</td>
+                                         <td><input type="checkbox" name="is_default" {default_checked}"> ({lang_defaulttext})</td>
+                                     </tr>
+                                     <tr>
                                          <td colspan="2"><hr><td>
                                      </tr>




From dhaun at geeklog.net  Mon Mar 24 12:42:19 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:19 -0600
Subject: [geeklog-cvs] geeklog-1.3/language english.php,1.75,1.76 german.php,1.61,1.62
Message-ID: <200303241742.h2OHgJi08853@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory internal.geeklog.net:/tmp/cvs-serv8775/language

Modified Files:
	english.php german.php 
Log Message:
You can now set a default topic for story submissions.


Index: english.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/english.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** english.php	19 Jan 2003 10:39:34 -0000	1.75
--- english.php	24 Mar 2003 17:42:17 -0000	1.76
***************
*** 768,772 ****
  	7 => "Please fill in the Topic ID and Topic Name fields",
  	8 => "Topic Manager",
! 	9 => "To modify or delete a topic, click on that topic.  To create a new topic click the new topic button to the left. You will find your access level for each topic in parenthesis",
  	10=> "Sort Order",
  	11 => "Stories/Page",
--- 768,772 ----
  	7 => "Please fill in the Topic ID and Topic Name fields",
  	8 => "Topic Manager",
! 	9 => "To modify or delete a topic, click on that topic.  To create a new topic click the new topic button to the left. You will find your access level for each topic in parenthesis. The asterisk(*) denotes the default topic.",
  	10=> "Sort Order",
  	11 => "Stories/Page",
***************
*** 780,784 ****
      19 => 'save',
      20 => 'cancel',
!     21 => 'delete'
  );
  
--- 780,787 ----
      19 => 'save',
      20 => 'cancel',
!     21 => 'delete',
!     22 => 'Default',
!     23 => 'make this the default topic for new story submissions',
!     24 => '(*)'
  );
  

Index: german.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/german.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** german.php	4 Feb 2003 21:50:14 -0000	1.61
--- german.php	24 Mar 2003 17:42:17 -0000	1.62
***************
*** 763,767 ****
  	7 => "Bitte die Felder Kategorie-ID und Kategorie-Name ausf?llen",
  	8 => "Kategorie-Manager",
! 	9 => "Auf eine Kategorie klicken, um sie zu ?ndern oder l?schen. Auf Neue Kategorie (s.o.) klicken, um eine neue Kategorie anzulegen. Die n?tige Zugriffsberechtigung wird in Klammern hinter der Kategorie angegeben.",
  	10=> "Sortierreihenfolge",
  	11 => "Artikel/Seite",
--- 763,767 ----
  	7 => "Bitte die Felder Kategorie-ID und Kategorie-Name ausf?llen",
  	8 => "Kategorie-Manager",
! 	9 => "Auf eine Kategorie klicken, um sie zu ?ndern oder l?schen. Auf Neue Kategorie (s.o.) klicken, um eine neue Kategorie anzulegen. Die n?tige Zugriffsberechtigung wird in Klammern hinter der Kategorie angegeben. Das Sternchen(*) markiert die Default-Kategorie.",
  	10=> "Sortierreihenfolge",
  	11 => "Artikel/Seite",
***************
*** 775,779 ****
      19 => 'Speichern',
      20 => 'Abbruch',
!     21 => 'L?schen'
  );
  
--- 775,782 ----
      19 => 'Speichern',
      20 => 'Abbruch',
!     21 => 'L?schen',
!     22 => 'Default',
!     23 => 'Zur Default-Kategorie f?r neue Artikel machen',
!     24 => '(*)'
  );
  




From dhaun at geeklog.net  Mon Mar 24 12:42:20 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:20 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo header.thtml,1.9,1.10
Message-ID: <200303241742.h2OHgKi08901@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo
In directory internal.geeklog.net:/tmp/cvs-serv8775/public_html/layout/Yahoo

Modified Files:
	header.thtml 
Log Message:
You can now set a default topic for story submissions.


Index: header.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/header.thtml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** header.thtml	23 Aug 2002 10:20:32 -0000	1.9
--- header.thtml	24 Mar 2003 17:42:18 -0000	1.10
***************
*** 30,34 ****
  </tr>
  <tr>
!   <td align="center"><a href="{site_url}/submit.php"><img src="{site_url}/images/icons/story.gif" border="0" alt=""><br>{button_contribute}</a><br><br></td>
    <td align="center"><a href="{site_url}/links.php"><img src="{site_url}/images/icons/link.gif" border="0" alt=""><br>{button_links}</a><br><br></td>
    <td align="center"><a href="{site_url}/calendar.php"><img src="{site_url}/images/icons/event.gif" border="0" alt=""><br>{button_calendar}</a><br><br></td>
--- 30,34 ----
  </tr>
  <tr>
!   <td align="center"><a href="{site_url}/submit.php?type=story{current_topic}"><img src="{site_url}/images/icons/story.gif" border="0" alt=""><br>{button_contribute}</a><br><br></td>
    <td align="center"><a href="{site_url}/links.php"><img src="{site_url}/images/icons/link.gif" border="0" alt=""><br>{button_links}</a><br><br></td>
    <td align="center"><a href="{site_url}/calendar.php"><img src="{site_url}/images/icons/event.gif" border="0" alt=""><br>{button_calendar}</a><br><br></td>




From dhaun at geeklog.net  Mon Mar 24 12:42:19 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:19 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/install install.php,1.46,1.47
Message-ID: <200303241742.h2OHgJi08864@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install
In directory internal.geeklog.net:/tmp/cvs-serv8775/public_html/admin/install

Modified Files:
	install.php 
Log Message:
You can now set a default topic for story submissions.


Index: install.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install/install.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** install.php	19 Mar 2003 11:13:35 -0000	1.46
--- install.php	24 Mar 2003 17:42:17 -0000	1.47
***************
*** 397,400 ****
--- 397,406 ----
              break;
          case '1.3.7':
+             require_once($_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.3.7_to_1.3.8.php');
+             for ($i = 1; $i <= count($_SQL); $i++) {
+                 DB_query(current($_SQL));
+                 next($_SQL);
+             }
+ 
              // upgrade Static Pages plugin
              $spversion = get_SP_ver ();




From dhaun at geeklog.net  Mon Mar 24 12:42:20 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:20 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver/admin/topic listitem.thtml,1.2,1.3 topiceditor.thtml,1.2,1.3
Message-ID: <200303241742.h2OHgKi08898@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/admin/topic
In directory internal.geeklog.net:/tmp/cvs-serv8775/public_html/layout/XSilver/admin/topic

Modified Files:
	listitem.thtml topiceditor.thtml 
Log Message:
You can now set a default topic for story submissions.


Index: listitem.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/admin/topic/listitem.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** listitem.thtml	20 May 2002 20:08:56 -0000	1.2
--- listitem.thtml	24 Mar 2003 17:42:18 -0000	1.3
***************
*** 1,5 ****
                              {begin_row} 
                              <td>
!                                 <a href="{site_admin_url}/topic.php?mode=edit&amp;tid={topic_id}">{image_tag}{topic_name}</a> ({topic_access})
                              </td>
                              {end_row}
--- 1,5 ----
                              {begin_row} 
                              <td>
!                                 <a href="{site_admin_url}/topic.php?mode=edit&amp;tid={topic_id}">{image_tag}{topic_name}</a>{default_topic} ({topic_access})
                              </td>
                              {end_row}

Index: topiceditor.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/admin/topic/topiceditor.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** topiceditor.thtml	4 May 2002 19:27:49 -0000	1.2
--- topiceditor.thtml	24 Mar 2003 17:42:18 -0000	1.3
***************
*** 22,25 ****
--- 22,29 ----
                                      </tr>
                                      <tr>
+                                         <td align="right">{lang_defaulttopic}:</td>
+                                         <td><input type="checkbox" name="is_default" {default_checked}"> ({lang_defaulttext})</td>
+                                     </tr>
+                                     <tr>
                                          <td colspan="2"><hr><td>
                                      </tr>




From dhaun at geeklog.net  Mon Mar 24 12:42:19 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:19 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.209,1.210 submit.php,1.50,1.51
Message-ID: <200303241742.h2OHgJi08857@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv8775/public_html

Modified Files:
	lib-common.php submit.php 
Log Message:
You can now set a default topic for story submissions.


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.209
retrieving revision 1.210
diff -C2 -d -r1.209 -r1.210
*** lib-common.php	22 Mar 2003 14:04:53 -0000	1.209
--- lib-common.php	24 Mar 2003 17:42:17 -0000	1.210
***************
*** 786,790 ****
  
      // contribute link
!     $header->set_var( 'menuitem_url', $_CONF['site_url'] . '/submit.php?type=story' );
      $header->set_var( 'menuitem_text', $LANG01[71] );
      $header->parse( 'menu_elements', 'menuitem', true );
--- 786,800 ----
  
      // contribute link
!     if( empty( $topic ))
!     {
!         $contributelink = $_CONF['site_url'] . '/submit.php?type=story';
!         $header->set_var( 'current_topic', '' );
!     }
!     else
!     {
!         $contributelink = $_CONF['site_url'] . '/submit.php?type=story&amp;topic=' . $topic;
!         $header->set_var( 'current_topic', '&amp;topic=' . $topic );
!     }
!     $header->set_var( 'menuitem_url', $contributelink);
      $header->set_var( 'menuitem_text', $LANG01[71] );
      $header->parse( 'menu_elements', 'menuitem', true );

Index: submit.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/submit.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** submit.php	19 Mar 2003 16:05:35 -0000	1.50
--- submit.php	24 Mar 2003 17:42:17 -0000	1.51
***************
*** 52,56 ****
  *
  */
! function submissionform($type='story', $mode = '', $month='', $day='', $year='', $hour='') 
  {
      global $_TABLES, $_CONF, $LANG12, $REMOTE_ADDR, $_USER, $HTTP_POST_VARS,
--- 52,56 ----
  *
  */
! function submissionform($type='story', $mode = '', $month='', $day='', $year='', $hour='', $topic = '')
  {
      global $_TABLES, $_CONF, $LANG12, $REMOTE_ADDR, $_USER, $HTTP_POST_VARS,
***************
*** 104,108 ****
                      break;
                  } 
!                 $retval .= submitstory();
                  break;
              }
--- 104,108 ----
                      break;
                  } 
!                 $retval .= submitstory($topic);
                  break;
              }
***************
*** 302,306 ****
  *
  */
! function submitstory() 
  {
      global $_TABLES, $HTTP_POST_VARS, $_CONF, $LANG12, $_USER;
--- 302,306 ----
  *
  */
! function submitstory($topic = '') 
  {
      global $_TABLES, $HTTP_POST_VARS, $_CONF, $LANG12, $_USER;
***************
*** 375,378 ****
--- 375,384 ----
      $storyform->set_var('story_title', htmlspecialchars ($title));	
      $storyform->set_var('lang_topic', $LANG12[28]);
+     if (empty ($A['tid']) && !empty ($topic)) {
+         $A['tid'] = $topic;
+     }
+     if (empty ($A['tid'])) {
+         $A['tid'] = DB_getItem ($_TABLES['topics'], 'tid', 'is_default = 1' . COM_getPermSQL ('AND'));
+     }
      $storyform->set_var('story_topic_options', COM_topicList('tid,topic',$A['tid']));
      $storyform->set_var('lang_story', $LANG12[29]);
***************
*** 760,764 ****
      }
  
!     $display .= submissionform($type, $mode, $month, $day, $year, $hour); 
  
  }
--- 766,770 ----
      }
  
!     $display .= submissionform($type, $mode, $month, $day, $year, $hour, $topic); 
  
  }




From dhaun at geeklog.net  Mon Mar 24 12:42:20 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:20 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver header.thtml,1.8,1.9
Message-ID: <200303241742.h2OHgKi08889@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver
In directory internal.geeklog.net:/tmp/cvs-serv8775/public_html/layout/XSilver

Modified Files:
	header.thtml 
Log Message:
You can now set a default topic for story submissions.


Index: header.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/header.thtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** header.thtml	23 Aug 2002 10:20:32 -0000	1.8
--- header.thtml	24 Mar 2003 17:42:18 -0000	1.9
***************
*** 71,75 ****
        <td width="100%" height="22" background="{layout_url}/images/container-top-bg.gif" nowrap><a href="{site_url}/stats.php" onmouseover="filter('d703','d854')"
  onmouseout="filter('d703','d290')">
! <img border="0" src="{layout_url}/images/stats.gif" name="d703" width="125" height="22" alt=""></a><a href="{site_url}/calendar.php" onmouseover="filter('e844','e38')" onmouseout="filter('e844','e721')"><img border="0" src="{layout_url}/images/calendar.gif" name="e844" width="125" height="22" alt=""></a><a href="{site_url}/links.php" onmouseover="filter('c927','c831')" onmouseout="filter('c927','c742')"><img border="0" src="{layout_url}/images/links.gif" name="c927" width="125" height="22" alt=""></a><a href="{site_url}/submit.php" onmouseover="filter('e58','e388')"
  onmouseout="filter('e58','e806')"><img border="0" src="{layout_url}/images/submit.gif" name="e58" width="125" height="22" alt=""></a><a href="{site_url}/pollbooth.php" onmouseover="filter('c337','c830')"
  onmouseout="filter('c337','c418')"><img border="0" src="{layout_url}/images/polls.gif" name="c337" width="125" height="22" alt=""></a><a href="{site_url}/usersettings.php?mode=preferences" onmouseover="filter('c855','c233')"
--- 71,75 ----
        <td width="100%" height="22" background="{layout_url}/images/container-top-bg.gif" nowrap><a href="{site_url}/stats.php" onmouseover="filter('d703','d854')"
  onmouseout="filter('d703','d290')">
! <img border="0" src="{layout_url}/images/stats.gif" name="d703" width="125" height="22" alt=""></a><a href="{site_url}/calendar.php" onmouseover="filter('e844','e38')" onmouseout="filter('e844','e721')"><img border="0" src="{layout_url}/images/calendar.gif" name="e844" width="125" height="22" alt=""></a><a href="{site_url}/links.php" onmouseover="filter('c927','c831')" onmouseout="filter('c927','c742')"><img border="0" src="{layout_url}/images/links.gif" name="c927" width="125" height="22" alt=""></a><a href="{site_url}/submit.php?type=story{current_topic}" onmouseover="filter('e58','e388')"
  onmouseout="filter('e58','e806')"><img border="0" src="{layout_url}/images/submit.gif" name="e58" width="125" height="22" alt=""></a><a href="{site_url}/pollbooth.php" onmouseover="filter('c337','c830')"
  onmouseout="filter('c337','c418')"><img border="0" src="{layout_url}/images/polls.gif" name="c337" width="125" height="22" alt=""></a><a href="{site_url}/usersettings.php?mode=preferences" onmouseover="filter('c855','c233')"




From dhaun at geeklog.net  Mon Mar 24 12:42:20 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 11:42:20 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome/admin/topic listitem.thtml,1.3,1.4 topiceditor.thtml,1.3,1.4 topiclist.thtml,1.3,1.4
Message-ID: <200303241742.h2OHgKi08874@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/admin/topic
In directory internal.geeklog.net:/tmp/cvs-serv8775/public_html/layout/Digital_Monochrome/admin/topic

Modified Files:
	listitem.thtml topiceditor.thtml topiclist.thtml 
Log Message:
You can now set a default topic for story submissions.


Index: listitem.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/admin/topic/listitem.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** listitem.thtml	23 May 2002 18:08:01 -0000	1.3
--- listitem.thtml	24 Mar 2003 17:42:17 -0000	1.4
***************
*** 1,5 ****
                              {begin_row} 
                              <td>
!                                 <a href="{site_admin_url}/topic.php?mode=edit&amp;tid={topic_id}">{image_tag}{topic_name}</a> ({topic_access})
                              </td>
                              {end_row}
--- 1,5 ----
                              {begin_row} 
                              <td>
!                                 <a href="{site_admin_url}/topic.php?mode=edit&amp;tid={topic_id}">{image_tag}{topic_name}</a>{default_topic} ({topic_access})
                              </td>
                              {end_row}

Index: topiceditor.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/admin/topic/topiceditor.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** topiceditor.thtml	4 May 2002 19:27:49 -0000	1.3
--- topiceditor.thtml	24 Mar 2003 17:42:17 -0000	1.4
***************
*** 22,25 ****
--- 22,29 ----
                                      </tr>
                                      <tr>
+                                         <td align="right">{lang_defaulttopic}:</td>
+                                         <td><input type="checkbox" name="is_default" {default_checked}"> ({lang_defaulttext})</td>
+                                     </tr>
+                                     <tr>
                                          <td colspan="2"><hr><td>
                                      </tr>

Index: topiclist.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/admin/topic/topiclist.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** topiclist.thtml	23 May 2002 18:08:01 -0000	1.3
--- topiclist.thtml	24 Mar 2003 17:42:17 -0000	1.4
***************
*** 3,7 ****
                                      <tr>
                                          <td rowspan="2">
!                                             <img src="{site_url}/images/icons/topic.gif" alt="">
                                          </td>
                                          <td>[ <a href="{site_admin_url}/topic.php?mode=edit">{lang_newtopic}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
--- 3,7 ----
                                      <tr>
                                          <td rowspan="2">
!                                             <img src="{layout_url}/images/icons/topic.gif" alt="">
                                          </td>
                                          <td>[ <a href="{site_admin_url}/topic.php?mode=edit">{lang_newtopic}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>




From dhaun at geeklog.net  Mon Mar 24 13:19:09 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Mon, 24 Mar 2003 12:19:09 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin topic.php,1.33,1.34
Message-ID: <200303241819.h2OIJ9i09805@internal.geeklog.net>

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

Modified Files:
	topic.php 
Log Message:
Oops, it was supposed to pick the default topic marker from the language file ...


Index: topic.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/topic.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** topic.php	24 Mar 2003 17:42:17 -0000	1.33
--- topic.php	24 Mar 2003 18:19:07 -0000	1.34
***************
*** 258,262 ****
              $topic_templates->set_var('topic_access', $access);
              if ($A['is_default'] == 1) {
!                 $topic_templates->set_var ('default_topic', '(*)');
              } else {
                  $topic_templates->set_var ('default_topic', '');
--- 258,262 ----
              $topic_templates->set_var('topic_access', $access);
              if ($A['is_default'] == 1) {
!                 $topic_templates->set_var ('default_topic', $LANG27[24]);
              } else {
                  $topic_templates->set_var ('default_topic', '');




From dhaun at geeklog.net  Thu Mar 27 04:37:37 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:37:37 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue/comment startcomment.thtml,NONE,1.1
Message-ID: <200303270937.h2R9bb132366@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/comment
In directory internal.geeklog.net:/tmp/cvs-serv32335/layout/Smooth_Blue/comment

Added Files:
	startcomment.thtml 
Log Message:
Eliminated function COM_startComment and moved hard-coded HTML to new template file comment/startcomment.thtml


--- NEW FILE: startcomment.thtml ---
<table border="0" cellpadding="0" cellspacing="0" width="100%">
  <tr>
    <td>
      <table width="100%" border="0" cellspacing="0" cellpadding="3">
      {comments}
      </table>
    </td>
  </tr>
</table>




From dhaun at geeklog.net  Thu Mar 27 04:37:37 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:37:37 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo/comment startcomment.thtml,NONE,1.1
Message-ID: <200303270937.h2R9bb132370@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/comment
In directory internal.geeklog.net:/tmp/cvs-serv32335/layout/Yahoo/comment

Added Files:
	startcomment.thtml 
Log Message:
Eliminated function COM_startComment and moved hard-coded HTML to new template file comment/startcomment.thtml


--- NEW FILE: startcomment.thtml ---
<table border="0" cellpadding="0" cellspacing="0" width="100%">
  <tr>
    <td>
      <table width="100%" border="0" cellspacing="0" cellpadding="3">
      {comments}
      </table>
    </td>
  </tr>
</table>




From dhaun at geeklog.net  Thu Mar 27 04:37:37 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:37:37 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html comment.php,1.39,1.40 lib-common.php,1.210,1.211
Message-ID: <200303270937.h2R9bb132362@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv32335

Modified Files:
	comment.php lib-common.php 
Log Message:
Eliminated function COM_startComment and moved hard-coded HTML to new template file comment/startcomment.thtml


Index: comment.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/comment.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** comment.php	29 Jan 2003 17:08:52 -0000	1.39
--- comment.php	27 Mar 2003 09:37:35 -0000	1.40
***************
*** 5,17 ****
  // | Geeklog 1.3                                                               |
  // +---------------------------------------------------------------------------+
! // | lib-common.php                                                            |
! // | Geeklog common library.                                                   |
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 5,18 ----
  // | Geeklog 1.3                                                               |
  // +---------------------------------------------------------------------------+
! // | comment.php                                                               |
  // |                                                                           |
+ // | Let user comment on a story.                                              |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
! // |          Dirk Haun         - dirk at haun-online.de                          |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 135,141 ****
  
              if ($mode == $LANG03[14] && !empty($title) && !empty($comment) ) {
!                 $retval .= COM_startComment($LANG03[14])
!                     . COM_comment($HTTP_POST_VARS,1,$type,0,'flat',true)
!                     . '</td></tr></table></td></tr></table>';
              } else if ($mode == $LANG03[14]) {
                  $retval .= COM_startBlock($LANG03[17])
--- 136,149 ----
  
              if ($mode == $LANG03[14] && !empty($title) && !empty($comment) ) {
!                 $start = new Template( $_CONF['path_layout'] . 'comment' );
!                 $start->set_file( array( 'startcomment' => 'startcomment.thtml' ));
!                 $start->set_var( 'site_url', $_CONF['site_url'] );
!                 $start->set_var( 'layout_url', $_CONF['layout_url'] );
! 
!                 $thecomments = COM_comment ($HTTP_POST_VARS, 1, $type, 0,
!                                             'flat', true);
! 
!                 $start->set_var( 'comments', $thecomments );
!                 $retval .= $start->finish( $start->parse( 'output', 'startcomment' ));
              } else if ($mode == $LANG03[14]) {
                  $retval .= COM_startBlock($LANG03[17])

Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.210
retrieving revision 1.211
diff -C2 -d -r1.210 -r1.211
*** lib-common.php	24 Mar 2003 17:42:17 -0000	1.210
--- lib-common.php	27 Mar 2003 09:37:35 -0000	1.211
***************
*** 974,980 ****
  * the database.
  *
! * Programming Note:  The two functions COM_startBlock and COM_endBlock are used to sandwich your
! * block content or use COM_startComment and COM_endBlock for comments.  These functions are not
! * used only for blocks but anything that uses that format, e.g. Stats page.  They are used like
  * COM_siteHeader and COM_siteFooter but for internal page elements.
  *
--- 974,980 ----
  * the database.
  *
! * Programming Note:  The two functions COM_startBlock and COM_endBlock are used
! * to sandwich your block content.  These functions are not used only for blocks
! * but anything that uses that format, e.g. Stats page.  They are used like
  * COM_siteHeader and COM_siteFooter but for internal page elements.
  *
***************
*** 1045,1093 ****
  }
  
- /**
- * Prints Admin option on moderation.php  DO NOT USE THIS FUNCTION.
- *
- * This prints an image/label pair on moderation.php  This should not be
- * used by any of our pages anymore but we need to test that out before
- * removing permanently.
- *
- * @param    string      $type       Type of adminedit we are creating
- * @param    string      $text       Text label
- * @return   string      Formated HTML
- */
- 
- function COM_adminEdit( $type, $text='' )
- {
-     global $LANG01, $_CONF;
- 
-     if( !HandlePluginAdminEdit( $type ))
-     {
-         $retval .= '<table border="0" cellspacing="0" cellpadding=2 width="100%">'.LB
-             .'<tr><td rowspan="2"><img src="'.$_CONF['site_url'].'/images/icons/'.$type.'.gif" alt=""></td>'.LB
-             .'<td>[ <a href="'.$_CONF['site_admin_url'].'/'.$type.'.php?mode=edit">'.$LANG01[52].' '.$type.'</a> | <a href="'.$_CONF['site_admin_url'].'">'.$LANG01[53].'</a> ]</td></tr>'.LB
-             .'<tr><td>'.$text.'</td></tr>'.LB
-             .'</table><br>';
-     }
- 
-     return $retval;
- }
- 
- /**
- * Same as COM_startBlock, but set up for the comments
- *
- * Use COM_endBlock to end comment
- *
- * @return   string  Formated HTML Starting Comment block
- * @see  COM_startBlock
- *
- */
- function COM_startComment()
- {
-     $retval .= '<table border="0" cellpadding="0" cellspacing="0" width="100%">'.LB
-         .'<tr><td><table width="100%" border="0" cellspacing="0" cellpadding=3>'.LB;
- 
-     return $retval;
- }
- 
  
  /**
--- 1045,1048 ----
***************
*** 2473,2557 ****
      }
  
!     switch( $mode )
      {
-         case 'nocomments':
-             $retval .= COM_commentBar( $sid, $title, $type, $order, $mode);
-             break;
- 
-     case 'nested':
-         $result = DB_query( "SELECT *,unix_timestamp(date) AS nice_date FROM {$_TABLES['comments']} WHERE sid = '$sid' AND pid = 0 AND type = '$type' ORDER BY date $order LIMIT $limit" );
-         $nrows = DB_numRows( $result );
-         $retval .= COM_commentBar( $sid, $title, $type, $order, $mode);
- 
-         if( $nrows > 0 )
-         {
-             $retval .= COM_startComment();
- 
-             for( $i = 0; $i < $nrows; $i++ )
-             {
-                 $A = DB_fetchArray( $result );
-                 $retval .= COM_comment( $A, 0, $type, 0, $mode );
-                 $retval .= COM_commentChildren( $sid, $A['cid'], $order, $mode, $type );
-             }
- 
-             $retval .= '</table></td></tr></table>';
-         }
-         else
-         {
-             $retval .= COM_startComment()
-                 . '<tr><td class="commenttitle" align="center">' . $LANG01[29] . '</td></tr></table></td></tr></table>';
-         }
- 
-         break;
-     case 'flat':
-         $result = DB_query( "SELECT *,unix_timestamp(date) AS nice_date FROM {$_TABLES['comments']} WHERE sid = '$sid' AND type = '$type' ORDER BY date $order LIMIT $limit" );
-         $nrows = DB_numRows( $result );
          $retval .= COM_commentBar( $sid, $title, $type, $order, $mode );
  
!         if( $nrows > 0 )
          {
!             $retval .= COM_startComment();
! 
!             for( $i =0; $i < $nrows; $i++ )
              {
!                 $A = DB_fetchArray( $result );
!                 $retval .= COM_comment( $A, 0 ,$type, 0, $mode );
              }
  
!             $retval .= '</table></td></tr></table>';
!         }
!         else
!         {
!             $retval .= COM_startComment()
!                 . '<tr><td class="commenttitle" align="center">' . $LANG01[29] . '</td></tr></table></td></tr></table>';
!         }
!         break;
  
!     case 'threaded':
!         $result = DB_query( "SELECT *,unix_timestamp(date) AS nice_date FROM {$_TABLES['comments']} WHERE sid = '$sid' AND pid = $pid AND type = '$type' ORDER BY date $order LIMIT $limit" );
!         $nrows = DB_numRows( $result );
!         $retval .= COM_commentBar( $sid, $title, $type, $order, $mode );
  
!         if( $nrows > 0 )
!         {
!             $retval .= COM_startComment();
!             for( $i = 0; $i < $nrows; $i++ )
              {
!                 $A = DB_fetchArray( $result );
!                 $retval .= COM_comment( $A, 0, $type, 0, $mode)
!                     . '<tr><td>'
!                     . COM_commentChildren( $sid, $A['cid'], $order, $mode, $type )
!                     . '</td></tr>';
!             }
  
!             $retval .= '</table></td></tr></table>';
!         }
!         else
!         {
!             $retval .= COM_startComment()
!             . '<tr><td class="commenttitle" align="center">' . $LANG01[29] . '</td></tr></table></td></tr></table>';
          }
  
!         break;
      }
  
--- 2428,2515 ----
      }
  
!     if( $mode == 'nocomments' )
      {
          $retval .= COM_commentBar( $sid, $title, $type, $order, $mode );
+     }
+     else
+     {
+         $comment = new Template( $_CONF['path_layout'] . 'comment' );
+         $comment->set_file( array( 'startcomment' => 'startcomment.thtml' ));
+         $comment->set_var( 'site_url', $_CONF['site_url'] );
+         $comment->set_var( 'layout_url', $_CONF['layout_url'] );
  
!         $thecomments = '';
!         switch( $mode )
          {
!             case 'nested':
              {
!                 $result = DB_query( "SELECT *,unix_timestamp(date) AS nice_date FROM {$_TABLES['comments']} WHERE sid = '$sid' AND pid = 0 AND type = '$type' ORDER BY date $order LIMIT $limit" );
!                 $nrows = DB_numRows( $result );
!                 $retval .= COM_commentBar( $sid, $title, $type, $order, $mode );
! 
!                 if( $nrows > 0 )
!                 {
!                     for( $i = 0; $i < $nrows; $i++ )
!                     {
!                         $A = DB_fetchArray( $result );
!                         $thecomments .= COM_comment( $A, 0, $type, 0, $mode );
!                         $thecomments .= COM_commentChildren( $sid, $A['cid'], $order, $mode, $type );
!                     }
!                 }
!                 else
!                 {
!                     $thecomments .= '<tr><td class="commenttitle" align="center">' . $LANG01[29] . '</td></tr>';
!                 }
              }
+             break;
  
!             case 'flat':
!             {
!                 $result = DB_query( "SELECT *,unix_timestamp(date) AS nice_date FROM {$_TABLES['comments']} WHERE sid = '$sid' AND type = '$type' ORDER BY date $order LIMIT $limit" );
!                 $nrows = DB_numRows( $result );
!                 $retval .= COM_commentBar( $sid, $title, $type, $order, $mode );
  
!                 if( $nrows > 0 )
!                 {
!                     for( $i =0; $i < $nrows; $i++ )
!                     {
!                         $A = DB_fetchArray( $result );
!                         $thecomments .= COM_comment( $A, 0 ,$type, 0, $mode );
!                     }
!                 }
!                 else
!                 {
!                     $thecomments .= '<tr><td class="commenttitle" align="center">' . $LANG01[29] . '</td></tr>';
!                 }
!             }
!             break;
  
!             case 'threaded':
              {
!                 $result = DB_query( "SELECT *,unix_timestamp(date) AS nice_date FROM {$_TABLES['comments']} WHERE sid = '$sid' AND pid = $pid AND type = '$type' ORDER BY date $order LIMIT $limit" );
!                 $nrows = DB_numRows( $result );
!                 $retval .= COM_commentBar( $sid, $title, $type, $order, $mode );
  
!                 if( $nrows > 0 )
!                 {
!                     for( $i = 0; $i < $nrows; $i++ )
!                     {
!                         $A = DB_fetchArray( $result );
!                         $thecomments .= COM_comment( $A, 0, $type, 0, $mode)
!                             . '<tr><td>'
!                             . COM_commentChildren( $sid, $A['cid'], $order, $mode, $type )
!                             . '</td></tr>';
!                     }
!                 }
!                 else
!                 {
!                     $thecomments .= '<tr><td class="commenttitle" align="center">' . $LANG01[29] . '</td></tr>';
!                 }
!             }
!             break;
          }
  
!         $comment->set_var( 'comments', $thecomments );
!         $retval .= $comment->finish( $comment->parse( 'output', 'startcomment' ));
      }
  




From dhaun at geeklog.net  Thu Mar 27 04:37:37 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:37:37 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome/comment startcomment.thtml,NONE,1.1
Message-ID: <200303270937.h2R9bb132364@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/comment
In directory internal.geeklog.net:/tmp/cvs-serv32335/layout/Digital_Monochrome/comment

Added Files:
	startcomment.thtml 
Log Message:
Eliminated function COM_startComment and moved hard-coded HTML to new template file comment/startcomment.thtml


--- NEW FILE: startcomment.thtml ---
<table border="0" cellpadding="0" cellspacing="0" width="100%">
  <tr>
    <td>
      <table width="100%" border="0" cellspacing="0" cellpadding="3">
      {comments}
      </table>
    </td>
  </tr>
</table>




From dhaun at geeklog.net  Thu Mar 27 04:37:37 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:37:37 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic/comment startcomment.thtml,NONE,1.1
Message-ID: <200303270937.h2R9bb132361@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/comment
In directory internal.geeklog.net:/tmp/cvs-serv32335/layout/Classic/comment

Added Files:
	startcomment.thtml 
Log Message:
Eliminated function COM_startComment and moved hard-coded HTML to new template file comment/startcomment.thtml


--- NEW FILE: startcomment.thtml ---
<table border="0" cellpadding="0" cellspacing="0" width="100%">
  <tr>
    <td>
      <table width="100%" border="0" cellspacing="0" cellpadding="3">
      {comments}
      </table>
    </td>
  </tr>
</table>




From dhaun at geeklog.net  Thu Mar 27 04:37:37 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:37:37 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver/comment startcomment.thtml,NONE,1.1
Message-ID: <200303270937.h2R9bb132369@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/comment
In directory internal.geeklog.net:/tmp/cvs-serv32335/layout/XSilver/comment

Added Files:
	startcomment.thtml 
Log Message:
Eliminated function COM_startComment and moved hard-coded HTML to new template file comment/startcomment.thtml


--- NEW FILE: startcomment.thtml ---
<table border="0" cellpadding="0" cellspacing="0" width="100%">
  <tr>
    <td>
      <table width="100%" border="0" cellspacing="0" cellpadding="3">
      {comments}
      </table>
    </td>
  </tr>
</table>




From dhaun at geeklog.net  Thu Mar 27 04:39:53 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:39:53 -0600
Subject: [geeklog-cvs] geeklog-1.3/language english.php,1.76,1.77 german.php,1.62,1.63
Message-ID: <200303270939.h2R9dr132404@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory internal.geeklog.net:/tmp/cvs-serv32386/language

Modified Files:
	english.php german.php 
Log Message:
Ensure that we're really displaying the last 10 backups (thanks to Alexander Schmacks fpr the fix), display total number of backup files, replaced $PHP_SELF with $_CONF['site_admin_url']/database.php since $PHP_SELF seems to cause problems in some environments.


Index: english.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/english.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** english.php	24 Mar 2003 17:42:17 -0000	1.76
--- english.php	27 Mar 2003 09:39:51 -0000	1.77
***************
*** 1100,1104 ****
      backup_file => 'Backup file',
      size => 'Size',
!     bytes => 'Bytes'
  );
  
--- 1100,1105 ----
      backup_file => 'Backup file',
      size => 'Size',
!     bytes => 'Bytes',
!     total_number => 'Total number of backups: %d'
  );
  

Index: german.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/german.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** german.php	24 Mar 2003 17:42:17 -0000	1.62
--- german.php	27 Mar 2003 09:39:51 -0000	1.63
***************
*** 1093,1097 ****
      backup_file => 'Backup-Datei',
      size => 'Gr??e',
!     bytes => 'Bytes'
  );
  
--- 1093,1098 ----
      backup_file => 'Backup-Datei',
      size => 'Gr??e',
!     bytes => 'Bytes',
!     total_number => 'Gesamtanzahl Backups: %d'
  );
  




From dhaun at geeklog.net  Thu Mar 27 04:39:53 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:39:53 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin database.php,1.7,1.8
Message-ID: <200303270939.h2R9dr132407@internal.geeklog.net>

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

Modified Files:
	database.php 
Log Message:
Ensure that we're really displaying the last 10 backups (thanks to Alexander Schmacks fpr the fix), display total number of backup files, replaced $PHP_SELF with $_CONF['site_admin_url']/database.php since $PHP_SELF seems to cause problems in some environments.


Index: database.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/database.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** database.php	12 Jan 2003 09:42:38 -0000	1.7
--- database.php	27 Mar 2003 09:39:51 -0000	1.8
***************
*** 9,13 ****
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
--- 9,13 ----
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
***************
*** 103,146 ****
  
  if(is_writable($_CONF['backup_path'])) {
! 	$backups = array();
! 	$display .= COM_startBlock($LANG_DB_BACKUP['last_ten_backups']);
! 	$fd = opendir($_CONF['backup_path']);
! 	$index = 0;
! 	while ((false !== ($file = @readdir ($fd))) && ($index < 10)) {
! 	    if ($file <> '.' && $file <> '..' && $file <> 'CVS') {
! 	        $index++;
! 	        clearstatcache();
              $backups[] = $file;
      	}
! 	}
! 	if (is_array($backups) AND $index > 0) {
! 	    krsort($backups);
! 	    reset($backups);
!         $display .= '<table width="100%" border="0">' . LB;
!         $display .= '<tr><td><b>' . $LANG_DB_BACKUP['backup_file'] . '</b></td><td align="right"><b>' . $LANG_DB_BACKUP['size'] . '</b></td></tr>';
! 	    for ($i = 1; $i <= count($backups); $i++) {
! 			$backupfile = "{$_CONF['backup_path']}" .current($backups);
! 			$backupfilesize = filesize($backupfile);
! 	        $display .= '<tr><td>' . current($backups) . '</td><td align="right">' . $backupfilesize . ' <b>' . $LANG_DB_BACKUP['bytes'] . '</b></td></tr>' . LB;
! 	        next($backups);
! 	    }
!         $display .= '</table>' . LB;
! 	} else {
! 	   $display .= $LANG_DB_BACKUP['no_backups'];
! 	}
! 	$display .= COM_endBlock();
  	// Show backup form
! 	$display .= $LANG_DB_BACKUP['db_explanation'];
! 	$display .= '<form name="dobackup" method="post" action="' . $PHP_SELF . '">';
! 	$display .= '<input type="submit" name="mode" value="' . $LANG_DB_BACKUP['do_backup'] . '"></form>';
! 	$display .= COM_siteFooter();
  } else {
! 	$display .= COM_startBlock($LANG08[06]);
! 	$display .= $LANG_DB_BACKUP['no_access'];
! 	COM_errorLog($_CONF['backup_path'] . " is not accessible.",1);
! 	$display .= COM_endBlock();
! 	$display .= COM_siteFooter();
  }
  echo $display; 
!     
  ?>
--- 103,161 ----
  
  if(is_writable($_CONF['backup_path'])) {
!     $backups = array();
!     $display .= COM_startBlock($LANG_DB_BACKUP['last_ten_backups']);
!     $fd = opendir($_CONF['backup_path']);
!     $index = 0;
!     while ((false !== ($file = @readdir ($fd)))) {
!         if ($file <> '.' && $file <> '..' && $file <> 'CVS') {
!             $index++;
!             clearstatcache();
              $backups[] = $file;
      	}
!     }
!     if (is_array($backups) AND $index > 0) {
!         krsort($backups);
!         $backups = array_slice ($backups, 0, 10);
!         reset($backups);
! 
!         $database = new Template ($_CONF['path_layout'] . 'admin/database');
!         $database->set_file (array ('list' => 'listbackups.thtml',
!                                     'row' => 'listitem.thtml'));
!         $database->set_var ('site_url', $_CONF['site_url']);
!         $database->set_var ('layout_url', $_CONF['layout_url']);
!         $database->set_var ('lang_backupfile', $LANG_DB_BACKUP['backup_file']);
!         $database->set_var ('lang_backupsize', $LANG_DB_BACKUP['size']);
!         $database->set_var ('lang_bytes', $LANG_DB_BACKUP['bytes']);
! 
!         for ($i = 1; $i <= count ($backups); $i++) {
!             $backupfile = $_CONF['backup_path'] . current ($backups);
!             $backupfilesize = filesize ($backupfile);
!             $database->set_var ('backup_file', current ($backups));
!             $database->set_var ('backup_size', $backupfilesize);
!             $database->parse ('backup_item', 'row', true);
!             next($backups);
!         }
!         $database->set_var ('number_backups',
!                 sprintf ($LANG_DB_BACKUP['total_number'], $index));
!         $display .= $database->parse ('output', 'list');
!     } else {
!         $display .= $LANG_DB_BACKUP['no_backups'];
!     }
!     $display .= COM_endBlock();
! 
  	// Show backup form
!     $display .= $LANG_DB_BACKUP['db_explanation'];
!     $display .= '<form name="dobackup" method="post" action="' . $_CONF['site_admin_url'] . '/database.php">';
!     $display .= '<input type="submit" name="mode" value="' . $LANG_DB_BACKUP['do_backup'] . '"></form>';
!     $display .= COM_siteFooter();
  } else {
!     $display .= COM_startBlock($LANG08[06]);
!     $display .= $LANG_DB_BACKUP['no_access'];
!     COM_errorLog($_CONF['backup_path'] . " is not accessible.",1);
!     $display .= COM_endBlock();
!     $display .= COM_siteFooter();
  }
+ 
  echo $display; 
! 
  ?>




From dhaun at geeklog.net  Thu Mar 27 04:46:17 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:46:17 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue/admin/database - New directory
Message-ID: <200303270946.h2R9kH132465@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/admin/database
In directory internal.geeklog.net:/tmp/cvs-serv32446/Smooth_Blue/admin/database

Log Message:
Directory /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/admin/database added to the repository





From dhaun at geeklog.net  Thu Mar 27 04:46:18 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:46:18 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo/admin/database - New directory
Message-ID: <200303270946.h2R9kI132472@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/admin/database
In directory internal.geeklog.net:/tmp/cvs-serv32446/Yahoo/admin/database

Log Message:
Directory /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/admin/database added to the repository





From dhaun at geeklog.net  Thu Mar 27 04:46:18 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:46:18 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver/admin/database - New directory
Message-ID: <200303270946.h2R9kI132473@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/admin/database
In directory internal.geeklog.net:/tmp/cvs-serv32446/XSilver/admin/database

Log Message:
Directory /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/admin/database added to the repository





From dhaun at geeklog.net  Thu Mar 27 04:46:17 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:46:17 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic/admin/database - New directory
Message-ID: <200303270946.h2R9kH132467@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/admin/database
In directory internal.geeklog.net:/tmp/cvs-serv32446/Classic/admin/database

Log Message:
Directory /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/admin/database added to the repository





From dhaun at geeklog.net  Thu Mar 27 04:46:18 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:46:18 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome/admin/database - New directory
Message-ID: <200303270946.h2R9kI132469@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/admin/database
In directory internal.geeklog.net:/tmp/cvs-serv32446/Digital_Monochrome/admin/database

Log Message:
Directory /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/admin/database added to the repository





From dhaun at geeklog.net  Thu Mar 27 04:47:55 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:47:55 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic/admin/database listbackups.thtml,NONE,1.1 listitem.thtml,NONE,1.1
Message-ID: <200303270947.h2R9lt132523@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/admin/database
In directory internal.geeklog.net:/tmp/cvs-serv32500/Classic/admin/database

Added Files:
	listbackups.thtml listitem.thtml 
Log Message:
Moved hard-coded HTML for the list of database backups to template files.


--- NEW FILE: listbackups.thtml ---
<table width="100%" border="0">
<tr>
  <th align="left">{lang_backupfile}</th>
  <th align="right">{lang_backupsize}</th>
</tr>
{backup_item}
</table>
<p>{number_backups}</p>

--- NEW FILE: listitem.thtml ---
<tr>
  <td align="left">{backup_file}</td>
  <td align="right">{backup_size} <b>{lang_bytes}</b></td>
</tr>




From dhaun at geeklog.net  Thu Mar 27 04:47:55 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:47:55 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue/admin/database listbackups.thtml,NONE,1.1 listitem.thtml,NONE,1.1
Message-ID: <200303270947.h2R9lt132527@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/admin/database
In directory internal.geeklog.net:/tmp/cvs-serv32500/Smooth_Blue/admin/database

Added Files:
	listbackups.thtml listitem.thtml 
Log Message:
Moved hard-coded HTML for the list of database backups to template files.


--- NEW FILE: listbackups.thtml ---
<table width="100%" border="0">
<tr>
  <th align="left">{lang_backupfile}</th>
  <th align="right">{lang_backupsize}</th>
</tr>
{backup_item}
</table>
<p>{number_backups}</p>

--- NEW FILE: listitem.thtml ---
<tr>
  <td align="left">{backup_file}</td>
  <td align="right">{backup_size} <b>{lang_bytes}</b></td>
</tr>




From dhaun at geeklog.net  Thu Mar 27 04:47:55 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:47:55 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome/admin/database listbackups.thtml,NONE,1.1 listitem.thtml,NONE,1.1
Message-ID: <200303270947.h2R9lt132525@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/admin/database
In directory internal.geeklog.net:/tmp/cvs-serv32500/Digital_Monochrome/admin/database

Added Files:
	listbackups.thtml listitem.thtml 
Log Message:
Moved hard-coded HTML for the list of database backups to template files.


--- NEW FILE: listbackups.thtml ---
<table width="100%" border="0">
<tr>
  <th align="left">{lang_backupfile}</th>
  <th align="right">{lang_backupsize}</th>
</tr>
{backup_item}
</table>
<p>{number_backups}</p>

--- NEW FILE: listitem.thtml ---
<tr>
  <td align="left">{backup_file}</td>
  <td align="right">{backup_size} <b>{lang_bytes}</b></td>
</tr>




From dhaun at geeklog.net  Thu Mar 27 04:47:55 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:47:55 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo/admin/database listbackups.thtml,NONE,1.1 listitem.thtml,NONE,1.1
Message-ID: <200303270947.h2R9lt132533@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/admin/database
In directory internal.geeklog.net:/tmp/cvs-serv32500/Yahoo/admin/database

Added Files:
	listbackups.thtml listitem.thtml 
Log Message:
Moved hard-coded HTML for the list of database backups to template files.


--- NEW FILE: listbackups.thtml ---
<table width="100%" border="0">
<tr>
  <th align="left">{lang_backupfile}</th>
  <th align="right">{lang_backupsize}</th>
</tr>
{backup_item}
</table>
<p>{number_backups}</p>

--- NEW FILE: listitem.thtml ---
<tr>
  <td align="left">{backup_file}</td>
  <td align="right">{backup_size} <b>{lang_bytes}</b></td>
</tr>




From dhaun at geeklog.net  Thu Mar 27 04:47:55 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 03:47:55 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver/admin/database listbackups.thtml,NONE,1.1 listitem.thtml,NONE,1.1
Message-ID: <200303270947.h2R9lt132529@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/admin/database
In directory internal.geeklog.net:/tmp/cvs-serv32500/XSilver/admin/database

Added Files:
	listbackups.thtml listitem.thtml 
Log Message:
Moved hard-coded HTML for the list of database backups to template files.


--- NEW FILE: listbackups.thtml ---
<table width="100%" border="0">
<tr>
  <th align="left">{lang_backupfile}</th>
  <th align="right">{lang_backupsize}</th>
</tr>
{backup_item}
</table>
<p>{number_backups}</p>

--- NEW FILE: listitem.thtml ---
<tr>
  <td align="left">{backup_file}</td>
  <td align="right">{backup_size} <b>{lang_bytes}</b></td>
</tr>




From dhaun at geeklog.net  Thu Mar 27 15:20:02 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 14:20:02 -0600
Subject: [geeklog-cvs] geeklog-1.3 config.php,1.76,1.77
Message-ID: <200303272020.h2RKK2107635@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3
In directory internal.geeklog.net:/tmp/cvs-serv7566

Modified Files:
	config.php 
Log Message:
You can now keep the original, unscaled image when uploading images for stories. The smaller, scaled version will then be used as a thumbnail and link to the original image (based on code provided by Alexander Schmacks).


Index: config.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/config.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** config.php	22 Mar 2003 14:04:53 -0000	1.76
--- config.php	27 Mar 2003 20:20:00 -0000	1.77
***************
*** 364,367 ****
--- 364,371 ----
  //$_CONF['path_to_netpbm']        = '/path/to/netpbm/';
  
+ // When set to 1, Geeklog will keep the original, unscaled images and make
+ // the smaller image link to the unscaled image.
+ $_CONF['keep_unscaled_image']   = 0; // 1 = keep original images
+ 
  // Story image settings
  $_CONF['max_image_width']       = 300;  // In pixels




From dhaun at geeklog.net  Thu Mar 27 15:20:02 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 14:20:02 -0600
Subject: [geeklog-cvs] geeklog-1.3/docs config.html,1.15,1.16 history,1.78,1.79
Message-ID: <200303272020.h2RKK2107639@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory internal.geeklog.net:/tmp/cvs-serv7566/docs

Modified Files:
	config.html history 
Log Message:
You can now keep the original, unscaled image when uploading images for stories. The smaller, scaled version will then be used as a thumbnail and link to the original image (based on code provided by Alexander Schmacks).


Index: config.html
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/config.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** config.html	22 Mar 2003 14:29:57 -0000	1.15
--- config.html	27 Mar 2003 20:20:00 -0000	1.16
***************
*** 605,608 ****
--- 605,613 ----
  </tr>
  <tr>
+   <td valign="top"><a name="desc_keep_unscaled_image">keep_unscaled_image</a></td>
+   <td valign="top">0</td>
+   <td valign="top">Set this to 1 if you want Geeklog to keep the original, unscaled images after upload. The smaller image will then be used as a thumbnail and will link to the original image. Note that this may use a lot of disk space (depending on the size of your images).</td>
+ </tr>
+ <tr>
    <td valign="top"><a name="desc_max_image_width">max_image_width</a></td>
    <td valign="top">300</td>

Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** history	24 Mar 2003 17:42:17 -0000	1.78
--- history	27 Mar 2003 20:20:00 -0000	1.79
***************
*** 4,7 ****
--- 4,17 ----
  -------
  
+ - New config option $_CONF['keep_unscaled_image'] allows you to keep the
+   original, unscaled image after upload (in stories only, for now). The smaller,
+   scaled image will be used as a thumbnail and link to the original image
+   (based on code provided by Alexander Schmacks).
+ - In database.php:
+   + Made sure we really display the last 10 backups (fix by Alexander Schmacks)
+   + Display total number of backups in the directory
+   + Moved hard-coded HTML for the list of backups to template files
+   + Replaced $PHP_SELF with $_CONF['site_admin_url']/database.php since
+     $PHP_SELF seems to cause problems in some environments
  - You can now make one topic the default topic. The topic selection in the
    story submission form will then default to this topic.




From dhaun at geeklog.net  Thu Mar 27 15:20:02 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 14:20:02 -0600
Subject: [geeklog-cvs] geeklog-1.3/language english.php,1.77,1.78 german.php,1.63,1.64
Message-ID: <200303272020.h2RKK2107643@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory internal.geeklog.net:/tmp/cvs-serv7566/language

Modified Files:
	english.php german.php 
Log Message:
You can now keep the original, unscaled image when uploading images for stories. The smaller, scaled version will then be used as a thumbnail and link to the original image (based on code provided by Alexander Schmacks).


Index: english.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/english.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** english.php	27 Mar 2003 09:39:51 -0000	1.77
--- english.php	27 Mar 2003 20:20:00 -0000	1.78
***************
*** 721,725 ****
      54 => 'Attached Images Not Used',
      55 => 'The following errors occured while trying to save your story.  Please correct these errors before saving',
!     56 => 'Show Topic Icon'
  );
  
--- 721,726 ----
      54 => 'Attached Images Not Used',
      55 => 'The following errors occured while trying to save your story.  Please correct these errors before saving',
!     56 => 'Show Topic Icon',
!     57 => 'View unscaled image'
  );
  

Index: german.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/german.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** german.php	27 Mar 2003 09:39:51 -0000	1.63
--- german.php	27 Mar 2003 20:20:00 -0000	1.64
***************
*** 716,720 ****
      54 => 'Nicht verwendete Bilder',
  	 55 => 'Folgende Fehler traten beim Versuch, den Artikel zu speichern, auf. Bitte diese Fehler beheben und den Artikel noch einmal speichern.',
!     56 => 'mit Icon'
  );
  
--- 716,721 ----
      54 => 'Nicht verwendete Bilder',
  	 55 => 'Folgende Fehler traten beim Versuch, den Artikel zu speichern, auf. Bitte diese Fehler beheben und den Artikel noch einmal speichern.',
!     56 => 'mit Icon',
!     57 => 'Bild in Originalgr??e'
  );
  




From dhaun at geeklog.net  Thu Mar 27 15:20:02 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 14:20:02 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.83,1.84
Message-ID: <200303272020.h2RKK2107646@internal.geeklog.net>

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

Modified Files:
	story.php 
Log Message:
You can now keep the original, unscaled image when uploading images for stories. The smaller, scaled version will then be used as a thumbnail and link to the original image (based on code provided by Alexander Schmacks).


Index: story.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** story.php	24 Mar 2003 17:42:17 -0000	1.83
--- story.php	27 Mar 2003 20:20:00 -0000	1.84
***************
*** 536,542 ****
              $sizeattributes = '';
          }
!         $norm = '<img ' . $sizeattributes . 'src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">';
!         $left = '<img ' . $sizeattributes . 'align="left" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">';
!         $right = '<img ' . $sizeattributes . 'align="right" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">';
          $fulltext = $intro . ' ' . $body;
          $count = substr_count($fulltext, $norm) + substr_count($fulltext, $left) + substr_count($fulltext, $right);
--- 536,559 ----
              $sizeattributes = '';
          }
! 
!         $lLinkPrefix = '';      
!         $lLinkSuffix = '';
!         if ($_CONF['keep_unscaled_image'] == 1) {
!             $lFilename_large = substr_replace ($A['ai_filename'], '_original.',
!                     strrpos ($A['ai_filename'], '.'), 1);
!             $lFilename_large_complete = $_CONF['path_html'] . 'images/articles/'
!                                       . $lFilename_large;
!             $lFilename_large_URL = $_CONF['site_url'] . '/images/articles/'
!                                  . $lFilename_large;
!             if (file_exists ($lFilename_large_complete)) {
!                 $lLinkPrefix = '<a href="' . $lFilename_large_URL
!                              . '" title="' . $LANG24[57] . '">';
!                 $lLinkSuffix = '</a>';
!             }
!         }
! 
!         $norm = $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix;
!         $left = $lLinkPrefix . '<img ' . $sizeattributes . 'align="left" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix;
!         $right = $lLinkPrefix . '<img ' . $sizeattributes . 'align="right" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix;
          $fulltext = $intro . ' ' . $body;
          $count = substr_count($fulltext, $norm) + substr_count($fulltext, $left) + substr_count($fulltext, $right);
***************
*** 577,580 ****
--- 594,614 ----
              $sizeattributes = '';
          }
+ 
+         $lLinkPrefix = '';
+         $lLinkSuffix = '';
+         if ($_CONF['keep_unscaled_image'] == 1) {
+             $lFilename_large = substr_replace ($A['ai_filename'], '_original.',
+                     strrpos ($A['ai_filename'], '.'), 1);
+             $lFilename_large_complete = $_CONF['path_html'] . 'images/articles/'
+                                       . $lFilename_large;
+             $lFilename_large_URL = $_CONF['site_url'] . '/images/articles/'
+                                  . $lFilename_large;
+             if (file_exists ($lFilename_large_complete)) {
+                 $lLinkPrefix = '<a href="' . $lFilename_large_URL
+                              . '" title="' . $LANG24[57] . '">';   
+                 $lLinkSuffix = '</a>';
+             }
+         }
+ 
          $norm = '[' . $LANG24[48] . $i . ']';
          $left = '[' . $LANG24[48] . $i . '_' . $LANG24[50] . ']';
***************
*** 588,601 ****
              // Only parse if we haven't encountered any error to this point
              if (count($errors) == 0) {
!                 $intro = str_replace($norm, '<img ' . $sizeattributes . 'src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">', $intro);
!                 $body = str_replace($norm, '<img ' . $sizeattributes . 'src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">', $body);
!                 $intro = str_replace($left, '<img ' . $sizeattributes . 'align="left" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">', $intro);
!                 $body = str_replace($left, '<img ' . $sizeattributes . 'align="left" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">', $body);
!                 $intro = str_replace($right, '<img ' . $sizeattributes . 'align="right" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">', $intro);
!                 $body = str_replace($right, '<img ' . $sizeattributes . 'align="right" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">', $body);
              }
          }
      }
!     
      return array($errors, $intro, $body);
  }
--- 622,635 ----
              // Only parse if we haven't encountered any error to this point
              if (count($errors) == 0) {
!                 $intro = str_replace($norm, $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix, $intro);
!                 $body = str_replace($norm, $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix, $body);
!                 $intro = str_replace($left, $lLinkPrefix . '<img ' . $sizeattributes . 'align="left" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix, $intro);
!                 $body = str_replace($left, $lLinkPrefix . '<img ' . $sizeattributes . 'align="left" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix, $body);
!                 $intro = str_replace($right, $lLinkPrefix . '<img ' . $sizeattributes . 'align="right" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix, $intro);
!                 $body = str_replace($right, $lLinkPrefix . '<img ' . $sizeattributes . 'align="right" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix, $body);
              }
          }
      }
! 
      return array($errors, $intro, $body);
  }
***************
*** 720,728 ****
          // Delete any images if needed
          for ($i = 1; $i <= count($delete); $i++) {
!             $curfile = $_CONF['path_html'] . 'images/articles/' . DB_getItem($_TABLES['article_images'],'ai_filename',"ai_sid = '$sid' AND ai_img_num = " . key($delete));
              if (!unlink($curfile)) {
                  echo COM_errorLog("Unable to delete image $curfile. Please check file permissions");
                  exit;
              }
              DB_query("DELETE FROM {$_TABLES['article_images']} WHERE ai_sid = '$sid' AND ai_img_num = " . key($delete));
              next($delete);
--- 754,776 ----
          // Delete any images if needed
          for ($i = 1; $i <= count($delete); $i++) {
!             $ai_filename = DB_getItem ($_TABLES['article_images'],'ai_filename',                    "ai_sid = '$sid' AND ai_img_num = " . key ($delete));
!             $curfile = $_CONF['path_html'] . 'images/articles/' . $ai_filename;
              if (!unlink($curfile)) {
                  echo COM_errorLog("Unable to delete image $curfile. Please check file permissions");
                  exit;
              }
+ 
+             // remove unscaled image, if it exists
+             $lFilename_large = substr_replace ($ai_filename, '_original.',
+                     strrpos ($ai_filename, '.'), 1);
+             $lFilename_large_complete = $_CONF['path_html'] . 'images/articles/'
+                                       . $lFilename_large;
+             if (file_exists ($lFilename_large_complete)) {
+                 if (!unlink ($lFilename_large_complete)) {
+                     echo COM_errorLog ('Unable to remove the following image from the article: ' . $lFilename_large_complete);
+                     exit;
+                 }
+             }
+ 
              DB_query("DELETE FROM {$_TABLES['article_images']} WHERE ai_sid = '$sid' AND ai_img_num = " . key($delete));
              next($delete);
***************
*** 751,754 ****
--- 799,807 ----
                  }    
                  $upload->setAutomaticResize(true);
+                 if ($_CONF['keep_unscaled_image'] == 1) {
+                     $upload->keepOriginalImage (true);
+                 } else {
+                     $upload->keepOriginalImage (false);
+                 }
              }
              $upload->setAllowedMimeTypes(array('image/gif','image/jpeg','image/pjpeg','image/x-png','image/png'));
***************
*** 849,852 ****
--- 902,917 ----
                  echo COM_errorLog('Unable to remove the following image from the article: ' . $filename);
                  exit;
+             }
+ 
+             // remove unscaled image, if it exists
+             $lFilename_large = substr_replace ($A['ai_filename'], '_original.',
+                     strrpos ($A['ai_filename'], '.'), 1);
+             $lFilename_large_complete = $_CONF['path_html'] . 'images/articles/'
+                                       . $lFilename_large;
+             if (file_exists ($lFilename_large_complete)) {
+                 if (!unlink ($lFilename_large_complete)) {
+                     echo COM_errorLog ('Unable to remove the following image from the article: ' . $lFilename_large_complete);
+                     exit;
+                 }
              }
          }




From dhaun at geeklog.net  Thu Mar 27 15:20:02 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 14:20:02 -0600
Subject: [geeklog-cvs] geeklog-1.3/system/classes upload.class.php,1.25,1.26
Message-ID: <200303272020.h2RKK2107649@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/system/classes
In directory internal.geeklog.net:/tmp/cvs-serv7566/system/classes

Modified Files:
	upload.class.php 
Log Message:
You can now keep the original, unscaled image when uploading images for stories. The smaller, scaled version will then be used as a thumbnail and link to the original image (based on code provided by Alexander Schmacks).


Index: upload.class.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/classes/upload.class.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** upload.class.php	9 Mar 2003 01:20:35 -0000	1.25
--- upload.class.php	27 Mar 2003 20:20:00 -0000	1.26
***************
*** 109,112 ****
--- 109,116 ----
      * @access private
      */
+     var $_keepOriginalImage = false;      // boolean
+     /**
+     * @access private
+     */
      var $_maxFileUploadsPerForm = 5;
      /**
***************
*** 465,492 ****
                  $cmd = $this->_pathToMogrify . ' -resize '. $newsize . ' ' . $this->_fileUploadDirectory . '/' . $this->_getDestinationName() . ' 2>&1';
                  $this->_addDebugMsg('Attempting to resize with this command (imagemagick): ' . $cmd);
                  exec($cmd, $mogrify_output, $retval);
              } else {
                  // use netpm
!                 $cmd = $_CONF['path_to_netpbm'];
                  $filename = $this->_fileUploadDirectory . '/' . $this->_getDestinationName();
                  $cmd_end = ' ' . $filename . ' | ' . $this->_pathToNetPBM . 'pnmscale -xsize=' . $newwidth . ' -ysize=' . $newheight . ' | ' . $this->_pathToNetPBM; 
                  // convert to pnm, resize, convert back
!                 if (eregi('\.png', $filename)) {
                      $tmpfile = $this->_fileUploadDirectory . '/tmp.png';
! 		    $cmd .= $this->_pathToNetPBM . 'pngtopnm ' . $cmd_end . 'pnmtopng > ' . $tmpfile;
! 	        } else {
!                     if (eregi('\.(jpg|jpeg)', $filename)) {
!                         $tmpfile = $this->_fileUploadDirectory . '/tmp.jpg';
! 		        $cmd .= $this->_pathToNetPBM . 'jpegtopnm ' . $cmd_end . 'ppmtojpeg > ' . $tmpfile;
!                     }  else {
!                         if (eregi('\.gif', $filename)) {
!                             $tmpfile = $this->_fileUploadDirectory . '/tmp.gif';
! 	  	            $cmd .= $this->_pathToNetPBM . 'giftopnm ' . $cmd_end . 'ppmquant 256 | ' . $this->_pathToNetPBM . 'ppmtogif > ' . $tmpfile;
!                         }
!                     }
! 	        }
                  $this->_addDebugMsg('Attempting to resize with this command (netpbm): ' . $cmd);
                  exec($cmd, $netpbm_output, $retval);
  
                  // Move tmp file to actual file
                  if (!copy($tmpfile,$filename)) {
--- 469,522 ----
                  $cmd = $this->_pathToMogrify . ' -resize '. $newsize . ' ' . $this->_fileUploadDirectory . '/' . $this->_getDestinationName() . ' 2>&1';
                  $this->_addDebugMsg('Attempting to resize with this command (imagemagick): ' . $cmd);
+ 
+                 if ($this->_keepOriginalImage) {
+                     $filename = $this->_fileUploadDirectory . '/'
+                               . $this->_getDestinationName ();
+                     $lFilename_large = substr_replace ($this->_getDestinationName (), '_original.', strrpos ($this->_getDestinationName (), '.'), 1);
+                     $lFilename_large_complete = $this->_fileUploadDirectory
+                                               . '/' .  $lFilename_large;
+                     if (!copy ($filename, $lFilename_large_complete)) {
+                         $this->_addError ("Couldn't copy $filename to $lFilename_large_complete.  You'll need to remove both files.");
+                         $this->printErrors ();
+                         exit;
+                     }
+                 }
+ 
                  exec($cmd, $mogrify_output, $retval);
              } else {
                  // use netpm
!                 $cmd = $this->_pathToNetPBM;
                  $filename = $this->_fileUploadDirectory . '/' . $this->_getDestinationName();
                  $cmd_end = ' ' . $filename . ' | ' . $this->_pathToNetPBM . 'pnmscale -xsize=' . $newwidth . ' -ysize=' . $newheight . ' | ' . $this->_pathToNetPBM; 
                  // convert to pnm, resize, convert back
!                 if (eregi ('\.png', $filename)) {
                      $tmpfile = $this->_fileUploadDirectory . '/tmp.png';
!                     $cmd .= 'pngtopnm ' . $cmd_end . 'pnmtopng > ' . $tmpfile;
!                 } else if (eregi ('\.(jpg|jpeg)', $filename)) {
!                     $tmpfile = $this->_fileUploadDirectory . '/tmp.jpg';
!                     $cmd .= 'jpegtopnm ' . $cmd_end . 'ppmtojpeg > ' . $tmpfile;
!                 }  else if (eregi ('\.gif', $filename)) {
!                     $tmpfile = $this->_fileUploadDirectory . '/tmp.gif';
!                     $cmd .= 'giftopnm ' . $cmd_end . 'ppmquant 256 | '
!                          . $this->_pathToNetPBM . 'ppmtogif > ' . $tmpfile;
!                 } else {
!                     $this->_addError ("Image format of file $filename is not supported.");
!                     $this->printErrors ();
!                     exit;
!                 }
                  $this->_addDebugMsg('Attempting to resize with this command (netpbm): ' . $cmd);
                  exec($cmd, $netpbm_output, $retval);
  
+                 if ($this->_keepOriginalImage) {
+                     $lFilename_large = substr_replace ($this->_getDestinationName(), '_original.', strrpos ($this->_getDestinationName (), '.'), 1);
+                     $lFilename_large_complete = $this->_fileUploadDirectory
+                                               . '/' .  $lFilename_large;
+                     if (!copy ($filename, $lFilename_large_complete)) {
+                         $this->_addError ("Couldn't copy $filename to $lFilename_large_complete.  You'll need to remove both files.");
+                         $this->printErrors ();
+                         exit;
+                     }
+                 }
+ 
                  // Move tmp file to actual file
                  if (!copy($tmpfile,$filename)) {
***************
*** 625,628 ****
--- 655,672 ----
          return true;
      }    
+ 
+     /**
+     * Allows you to keep the original (unscaled) image.
+     *
+     * @param    boolean   $keepit   true = keep original, false = don't
+     * @return   boolean   true if we set values OK, otherwise false
+     *
+     */
+     function keepOriginalImage ($keepit)
+     {
+         $this->_keepOriginalImage = $keepit;
+ 
+         return true;
+     }
      
      /**




From dhaun at geeklog.net  Thu Mar 27 16:03:14 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 15:03:14 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.84,1.85
Message-ID: <200303272103.h2RL3E108540@internal.geeklog.net>

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

Modified Files:
	story.php 
Log Message:
$_USER was missing from the list of global variables.


Index: story.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** story.php	27 Mar 2003 20:20:00 -0000	1.84
--- story.php	27 Mar 2003 21:03:11 -0000	1.85
***************
*** 666,670 ****
  function submitstory($type='',$sid,$uid,$tid,$title,$introtext,$bodytext,$hits,$unixdate,$comments,$featured,$commentcode,$statuscode,$postmode,$frontpage,$draft_flag,$numemails,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$delete,$show_topic_icon) 
  {
!     global $_TABLES, $_CONF, $LANG24, $MESSAGE, $HTTP_POST_FILES;
  
      // Convert array values to numeric permission values
--- 666,670 ----
  function submitstory($type='',$sid,$uid,$tid,$title,$introtext,$bodytext,$hits,$unixdate,$comments,$featured,$commentcode,$statuscode,$postmode,$frontpage,$draft_flag,$numemails,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$delete,$show_topic_icon) 
  {
!     global $_TABLES, $_CONF, $_USER, $LANG24, $MESSAGE, $HTTP_POST_FILES;
  
      // Convert array values to numeric permission values




From dhaun at geeklog.net  Thu Mar 27 16:07:18 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Thu, 27 Mar 2003 15:07:18 -0600
Subject: [geeklog-cvs] geeklog-1.3/system lib-security.php,1.12,1.13
Message-ID: <200303272107.h2RL7I108629@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/system
In directory internal.geeklog.net:/tmp/cvs-serv8614/system

Modified Files:
	lib-security.php 
Log Message:
Fixed description of SEC_hasTopicAccess() - it returns an int, not a boolean.


Index: lib-security.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/lib-security.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** lib-security.php	5 Mar 2003 14:34:44 -0000	1.12
--- lib-security.php	27 Mar 2003 21:07:16 -0000	1.13
***************
*** 219,223 ****
  *
  * @param        string      $tid        ID for topic to check on
! * @return       boolean     true if user has access to topic, otherwise false
  *
  */
--- 219,223 ----
  *
  * @param        string      $tid        ID for topic to check on
! * @return       int 	returns 3 for read/edit 2 for read only 0 for no access
  *
  */




From dhaun at geeklog.net  Fri Mar 28 10:42:46 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 28 Mar 2003 09:42:46 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin block.php,1.48,1.49
Message-ID: <200303281542.h2SFgk121274@internal.geeklog.net>

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

Modified Files:
	block.php 
Log Message:
Added a check for block ID > 0


Index: block.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/block.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** block.php	11 Mar 2003 10:14:49 -0000	1.48
--- block.php	28 Mar 2003 15:42:43 -0000	1.49
***************
*** 326,330 ****
  
      $access = 0;
!     if (DB_count ($_TABLES['blocks'], 'bid', $bid) > 0) {
          $result = DB_query ("SELECT owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon FROM {$_TABLES['blocks']} WHERE bid = '{$bid}'");
          $A = DB_fetchArray ($result);
--- 326,330 ----
  
      $access = 0;
!     if (($bid > 0) && DB_count ($_TABLES['blocks'], 'bid', $bid) > 0) {
          $result = DB_query ("SELECT owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon FROM {$_TABLES['blocks']} WHERE bid = '{$bid}'");
          $A = DB_fetchArray ($result);




From dhaun at geeklog.net  Fri Mar 28 13:19:58 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 28 Mar 2003 12:19:58 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome useroption_off.thtml,NONE,1.1
Message-ID: <200303281819.h2SIJw123589@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome
In directory internal.geeklog.net:/tmp/cvs-serv23517/public_html/layout/Digital_Monochrome

Added Files:
	useroption_off.thtml 
Log Message:
The Sections block now uses the useroption.thtml and the new useroption_off.thtml template files.


--- NEW FILE: useroption_off.thtml ---
{option_label} {option_count}<br>




From dhaun at geeklog.net  Fri Mar 28 13:19:58 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 28 Mar 2003 12:19:58 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic useroption_off.thtml,NONE,1.1
Message-ID: <200303281819.h2SIJw123587@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic
In directory internal.geeklog.net:/tmp/cvs-serv23517/public_html/layout/Classic

Added Files:
	useroption_off.thtml 
Log Message:
The Sections block now uses the useroption.thtml and the new useroption_off.thtml template files.


--- NEW FILE: useroption_off.thtml ---
{option_label} {option_count}<br>




From dhaun at geeklog.net  Fri Mar 28 13:19:58 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 28 Mar 2003 12:19:58 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver useroption_off.thtml,NONE,1.1
Message-ID: <200303281819.h2SIJw123593@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver
In directory internal.geeklog.net:/tmp/cvs-serv23517/public_html/layout/XSilver

Added Files:
	useroption_off.thtml 
Log Message:
The Sections block now uses the useroption.thtml and the new useroption_off.thtml template files.


--- NEW FILE: useroption_off.thtml ---
{option_label} {option_count}<br>




From dhaun at geeklog.net  Fri Mar 28 13:19:58 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 28 Mar 2003 12:19:58 -0600
Subject: [geeklog-cvs] geeklog-1.3/docs config.html,1.16,1.17 history,1.79,1.80
Message-ID: <200303281819.h2SIJw123582@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory internal.geeklog.net:/tmp/cvs-serv23517/docs

Modified Files:
	config.html history 
Log Message:
The Sections block now uses the useroption.thtml and the new useroption_off.thtml template files.


Index: config.html
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/config.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** config.html	27 Mar 2003 20:20:00 -0000	1.16
--- config.html	28 Mar 2003 18:19:56 -0000	1.17
***************
*** 355,363 ****
    <td valign="top"><a name="desc_showstorycount">showstorycount</a></td>
    <td valign="top">1</td>
!   <td valign="top">Show the number of stories in a topic in the Section block (0=no, 1=yes)</td></tr>
  <tr>
    <td valign="top"><a name="desc_showsubmissioncount">showsubmissioncount</a></td>
    <td valign="top">1</td>
!   <td valign="top">Show the number of story submissions for a topic in the Section block (0=no, 1=yes)</td></tr>
  <tr>
    <td valign="top"><a name="desc_showemptysearchresults">showemptysearchresults</a></td>
--- 355,367 ----
    <td valign="top"><a name="desc_showstorycount">showstorycount</a></td>
    <td valign="top">1</td>
!   <td valign="top">Show the number of stories in a topic in the Sections block (0=no, 1=yes)</td></tr>
  <tr>
    <td valign="top"><a name="desc_showsubmissioncount">showsubmissioncount</a></td>
    <td valign="top">1</td>
!   <td valign="top">Show the number of story submissions for a topic in the Sections block (0=no, 1=yes)</td></tr>
! <tr>
!   <td valign="top"><a name="desc_hide_home_link">hide_home_link</a></td>
!   <td valign="top">0</td>
!   <td valign="top">Hide the "Home" link from the Sections block (0=no, 1=yes)</td></tr>
  <tr>
    <td valign="top"><a name="desc_showemptysearchresults">showemptysearchresults</a></td>

Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** history	27 Mar 2003 20:20:00 -0000	1.79
--- history	28 Mar 2003 18:19:56 -0000	1.80
***************
*** 4,7 ****
--- 4,10 ----
  -------
  
+ - The Sections block now uses the useroption.thtml and the new
+   useroption_off.thtml template files for the list of topics. You can also use
+   $_CONF['hide_home_link'] to hide the "Home" link from the Sections block.
  - New config option $_CONF['keep_unscaled_image'] allows you to keep the
    original, unscaled image after upload (in stories only, for now). The smaller,




From dhaun at geeklog.net  Fri Mar 28 13:19:58 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 28 Mar 2003 12:19:58 -0600
Subject: [geeklog-cvs] geeklog-1.3 config.php,1.77,1.78
Message-ID: <200303281819.h2SIJw123580@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3
In directory internal.geeklog.net:/tmp/cvs-serv23517

Modified Files:
	config.php 
Log Message:
The Sections block now uses the useroption.thtml and the new useroption_off.thtml template files.


Index: config.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/config.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** config.php	27 Mar 2003 20:20:00 -0000	1.77
--- config.php	28 Mar 2003 18:19:56 -0000	1.78
***************
*** 268,271 ****
--- 268,274 ----
  $_CONF['showsubmissioncount'] = 1;
  
+ // Hide 'Home' link from Sections block (if set to 1)
+ $_CONF['hide_home_link'] = 0;
+ 
  // Show blocks for empty search results
  $_CONF['showemptysearchresults'] = 0;




From dhaun at geeklog.net  Fri Mar 28 13:19:58 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 28 Mar 2003 12:19:58 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.211,1.212
Message-ID: <200303281819.h2SIJw123585@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv23517/public_html

Modified Files:
	lib-common.php 
Log Message:
The Sections block now uses the useroption.thtml and the new useroption_off.thtml template files.


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.211
retrieving revision 1.212
diff -C2 -d -r1.211 -r1.212
*** lib-common.php	27 Mar 2003 09:37:35 -0000	1.211
--- lib-common.php	28 Mar 2003 18:19:56 -0000	1.212
***************
*** 1854,1859 ****
  *
  * Show the topics in the system the user has access to and prints them in HTML.
! * This function is used to show the topics in the sections block. Topics have
! * href and are seperated by line breaks.
  *
  * @param        string      $topic      TopicID of currently selected
--- 1854,1858 ----
  *
  * Show the topics in the system the user has access to and prints them in HTML.
! * This function is used to show the topics in the sections block.
  *
  * @param        string      $topic      TopicID of currently selected
***************
*** 1879,1894 ****
      $nrows = DB_numRows( $result );
  
!     // Give a link to the homepage here since a lot of people use this for
!     // navigating the site
!     // Note: We can't use $PHP_SELF here since the site may not be in the DocumentRoot
  
!     preg_match( "/\/\/[^\/]*(.*)/", $_CONF['site_url'], $pathonly );
!     if(( $HTTP_SERVER_VARS['SCRIPT_NAME'] <> $pathonly[1] . "/index.php" ) OR !empty( $topic ) OR ( $page > 1 ) OR $newstories )
!     {
!         $retval .= '<a href="' . $_CONF['site_url'] . '/index.php"><b>' . $LANG01[90] . '</b></a><br>';
!     }
!     else
      {
!         $retval .= $LANG01[90] . '<br>';
      }
  
--- 1878,1910 ----
      $nrows = DB_numRows( $result );
  
!     $retval = '';
!     $sections = new Template( $_CONF['path_layout'] );
!     $sections->set_file( array( 'option' => 'useroption.thtml',
!                                 'inactive' => 'useroption_off.thtml' ));
  
!     if( $_CONF['hide_home_link'] == 0 )
      {
!         // Give a link to the homepage here since a lot of people use this for
!         // navigating the site
!         // Note: We can't use $PHP_SELF here since the site may not be in the
!         // DocumentRoot
! 
!         preg_match( "/\/\/[^\/]*(.*)/", $_CONF['site_url'], $pathonly );
!         if(( $HTTP_SERVER_VARS['SCRIPT_NAME'] <> $pathonly[1] . "/index.php" )
!                 OR !empty( $topic ) OR ( $page > 1 ) OR $newstories )
!         {
!             $sections->set_var( 'option_url',
!                                 $_CONF['site_url'] . '/index.php' );
!             $sections->set_var( 'option_label', $LANG01[90] );
!             $sections->set_var( 'option_count', '' );
!             $retval .= $sections->parse( 'item', 'option' );
!         }
!         else
!         {
!             $sections->set_var( 'option_url', '' );
!             $sections->set_var( 'option_label', $LANG01[90] );
!             $sections->set_var( 'option_count', '' );
!             $retval .= $sections->parse( 'item', 'inactive' );
!         }
      }
  
***************
*** 1899,1907 ****
          if( $A['tid'] == $topic )
          {
!             $retval .= stripslashes( $A['topic'] );
  
              if( $_CONF['showstorycount'] + $_CONF['showsubmissioncount'] > 0 )
              {
!                 $retval .= ' (';
  
                  if( $_CONF['showstorycount'] )
--- 1915,1925 ----
          if( $A['tid'] == $topic )
          {
!             $sections->set_var( 'option_url', '' );
!             $sections->set_var( 'option_label', stripslashes( $A['topic'] ));
  
+             $countstring = '';
              if( $_CONF['showstorycount'] + $_CONF['showsubmissioncount'] > 0 )
              {
!                 $countstring .= '(';
  
                  if( $_CONF['showstorycount'] )
***************
*** 1909,1913 ****
                      $rcount = DB_query( "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (tid = '{$A['tid']}')" . COM_getPermSQL( 'AND' ));
                      $T = DB_fetchArray( $rcount );
!                     $retval .= $T['count'];
                  }
  
--- 1927,1931 ----
                      $rcount = DB_query( "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (tid = '{$A['tid']}')" . COM_getPermSQL( 'AND' ));
                      $T = DB_fetchArray( $rcount );
!                     $countstring .= $T['count'];
                  }
  
***************
*** 1916,1937 ****
                      if( $_CONF['showstorycount'] )
                      {
!                         $retval .= '/';
                      }
! 
!                     $retval .= DB_count( $_TABLES['storysubmission'], 'tid', $A['tid'] );
                  }
  
!                 $retval .= ')';
              }
! 
!             $retval .= '<br>' . LB;
          }
          else
          {
!             $retval .= '<a href="' . $_CONF['site_url'] . '/index.php?topic=' . $A['tid'] . '"><b>' . stripslashes( $A['topic'] ) . '</b></a> ';
  
              if( $_CONF['showstorycount'] + $_CONF['showsubmissioncount'] > 0 )
              {
!                 $retval .= '(';
  
                  if( $_CONF['showstorycount'] )
--- 1934,1958 ----
                      if( $_CONF['showstorycount'] )
                      {
!                         $countstring .= '/';
                      }
!                     $countstring .= DB_count( $_TABLES['storysubmission'],
!                                               'tid', $A['tid'] );
                  }
  
!                 $countstring .= ')';
              }
!             $sections->set_var( 'option_count', $countstring );
!             $retval .= $sections->parse( 'item', 'inactive' );
          }
          else
          {
!             $sections->set_var( 'option_url', $_CONF['site_url']
!                                 . '/index.php?topic=' . $A['tid'] );
!             $sections->set_var( 'option_label', stripslashes( $A['topic'] ));
  
+             $countstring = '';
              if( $_CONF['showstorycount'] + $_CONF['showsubmissioncount'] > 0 )
              {
!                 $countstring .= '(';
  
                  if( $_CONF['showstorycount'] )
***************
*** 1939,1943 ****
                      $rcount = DB_query( "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (tid = '{$A['tid']}')" . COM_getPermSQL( 'AND' ));
                      $T = DB_fetchArray( $rcount );
!                     $retval .= $T['count'];
                  }
  
--- 1960,1964 ----
                      $rcount = DB_query( "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (tid = '{$A['tid']}')" . COM_getPermSQL( 'AND' ));
                      $T = DB_fetchArray( $rcount );
!                     $countstring .= $T['count'];
                  }
  
***************
*** 1946,1959 ****
                      if( $_CONF['showstorycount'] )
                      {
!                         $retval .= '/';
                      }
! 
!                     $retval .= DB_count( $_TABLES['storysubmission'], 'tid', $A['tid'] );
                  }
  
!                 $retval .= ')';
              }
! 
!             $retval .= '<br>' . LB;
          }
      }
--- 1967,1980 ----
                      if( $_CONF['showstorycount'] )
                      {
!                         $countstring .= '/';
                      }
!                     $countstring .= DB_count( $_TABLES['storysubmission'],
!                                               'tid', $A['tid'] );
                  }
  
!                 $countstring .= ')';
              }
!             $sections->set_var( 'option_count', $countstring );
!             $retval .= $sections->parse( 'item', 'option' );
          }
      }




From dhaun at geeklog.net  Fri Mar 28 13:19:58 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 28 Mar 2003 12:19:58 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo useroption_off.thtml,NONE,1.1
Message-ID: <200303281819.h2SIJw123595@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo
In directory internal.geeklog.net:/tmp/cvs-serv23517/public_html/layout/Yahoo

Added Files:
	useroption_off.thtml 
Log Message:
The Sections block now uses the useroption.thtml and the new useroption_off.thtml template files.


--- NEW FILE: useroption_off.thtml ---
{option_label} {option_count}<br>




From dhaun at geeklog.net  Fri Mar 28 13:19:58 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Fri, 28 Mar 2003 12:19:58 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue useroption_off.thtml,NONE,1.1
Message-ID: <200303281819.h2SIJw123591@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue
In directory internal.geeklog.net:/tmp/cvs-serv23517/public_html/layout/Smooth_Blue

Added Files:
	useroption_off.thtml 
Log Message:
The Sections block now uses the useroption.thtml and the new useroption_off.thtml template files.


--- NEW FILE: useroption_off.thtml ---
{option_label} {option_count}<br>




From dhaun at geeklog.net  Sat Mar 29 12:28:36 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 29 Mar 2003 11:28:36 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue loginform.thtml,NONE,1.1
Message-ID: <200303291728.h2THSa106020@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue
In directory internal.geeklog.net:/tmp/cvs-serv5993/Smooth_Blue

Added Files:
	loginform.thtml 
Log Message:
Moved hard-coded HTML for the login form (User Functions block) to a template file.


--- NEW FILE: loginform.thtml ---
<form action="{site_url}/users.php" method="POST">
  <b>{lang_username}:</b><br>
  <input type="text" size="10" name="loginname" value=""><br>
  <b>{lang_password}:</b><br>
  <input type="password" size="10" name="passwd"><br>
  <input type="submit" value="{lang_login}">
</form>
{lang_signup}




From dhaun at geeklog.net  Sat Mar 29 12:28:36 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 29 Mar 2003 11:28:36 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic loginform.thtml,NONE,1.1
Message-ID: <200303291728.h2THSa106017@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic
In directory internal.geeklog.net:/tmp/cvs-serv5993/Classic

Added Files:
	loginform.thtml 
Log Message:
Moved hard-coded HTML for the login form (User Functions block) to a template file.


--- NEW FILE: loginform.thtml ---
<form action="{site_url}/users.php" method="POST">
  <b>{lang_username}:</b><br>
  <input type="text" size="10" name="loginname" value=""><br>
  <b>{lang_password}:</b><br>
  <input type="password" size="10" name="passwd"><br>
  <input type="submit" value="{lang_login}">
</form>
{lang_signup}




From dhaun at geeklog.net  Sat Mar 29 12:28:36 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 29 Mar 2003 11:28:36 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome loginform.thtml,NONE,1.1
Message-ID: <200303291728.h2THSa106018@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome
In directory internal.geeklog.net:/tmp/cvs-serv5993/Digital_Monochrome

Added Files:
	loginform.thtml 
Log Message:
Moved hard-coded HTML for the login form (User Functions block) to a template file.


--- NEW FILE: loginform.thtml ---
<form action="{site_url}/users.php" method="POST">
  <b>{lang_username}:</b><br>
  <input type="text" size="10" name="loginname" value=""><br>
  <b>{lang_password}:</b><br>
  <input type="password" size="10" name="passwd"><br>
  <input type="submit" value="{lang_login}">
</form>
{lang_signup}




From dhaun at geeklog.net  Sat Mar 29 12:28:36 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 29 Mar 2003 11:28:36 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver loginform.thtml,NONE,1.1
Message-ID: <200303291728.h2THSa106025@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver
In directory internal.geeklog.net:/tmp/cvs-serv5993/XSilver

Added Files:
	loginform.thtml 
Log Message:
Moved hard-coded HTML for the login form (User Functions block) to a template file.


--- NEW FILE: loginform.thtml ---
<form action="{site_url}/users.php" method="POST">
  <b>{lang_username}:</b><br>
  <input type="text" size="10" name="loginname" value=""><br>
  <b>{lang_password}:</b><br>
  <input type="password" size="10" name="passwd"><br>
  <input type="submit" value="{lang_login}">
</form>
{lang_signup}




From dhaun at geeklog.net  Sat Mar 29 12:28:36 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 29 Mar 2003 11:28:36 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo loginform.thtml,NONE,1.1
Message-ID: <200303291728.h2THSa106030@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo
In directory internal.geeklog.net:/tmp/cvs-serv5993/Yahoo

Added Files:
	loginform.thtml 
Log Message:
Moved hard-coded HTML for the login form (User Functions block) to a template file.


--- NEW FILE: loginform.thtml ---
<form action="{site_url}/users.php" method="POST">
  <b>{lang_username}:</b><br>
  <input type="text" size="10" name="loginname" value=""><br>
  <b>{lang_password}:</b><br>
  <input type="password" size="10" name="passwd"><br>
  <input type="submit" value="{lang_login}">
</form>
{lang_signup}




From dhaun at geeklog.net  Sat Mar 29 12:30:05 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 29 Mar 2003 11:30:05 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.212,1.213
Message-ID: <200303291730.h2THU4106071@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv6036

Modified Files:
	lib-common.php 
Log Message:
Moved hard-coded HTML for the login form (User Functions block) to template files,
added an ugly little hack for RSS feeds that have whitespace before the XML header


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.212
retrieving revision 1.213
diff -C2 -d -r1.212 -r1.213
*** lib-common.php	28 Mar 2003 18:19:56 -0000	1.212
--- lib-common.php	29 Mar 2003 17:30:02 -0000	1.213
***************
*** 2063,2075 ****
      else
      {
!         $retval .= COM_startBlock( $LANG01[47], $help, COM_getBlockTemplate( 'user_block', 'header' ))
!             . '<form action="' . $_CONF['site_url'] . '/users.php" method="post">' . LB
!             . '<b>' . $LANG01[21] . ':</b><br>' . LB
!             . '<input type="text" size="10" name="loginname" value=""><br>' . LB
!             . '<b>' . $LANG01[57] . ':</b><br>' . LB
!             . '<input type="password" size="10" name="passwd"><br>' . LB
!             . '<input type="submit" value="' . $LANG01[58] . '">' . LB
!             . '</form>' . $LANG01[59] . LB
!             . COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));
      }
  
--- 2063,2079 ----
      else
      {
!         $retval .= COM_startBlock( $LANG01[47], $help, COM_getBlockTemplate( 'user_block', 'header' ));
! 
!         $login = new Template( $_CONF['path_layout'] );
!         $login->set_file( 'form', 'loginform.thtml' );
!         $login->set_var( 'site_url', $_CONF['site_url'] );
!         $login->set_var( 'layout_url', $_CONF['layout_url'] );
!         $login->set_var( 'lang_username', $LANG01[21] );
!         $login->set_var( 'lang_password', $LANG01[57] );
!         $login->set_var( 'lang_login', $LANG01[58] );
!         $login->set_var( 'lang_signup', $LANG01[59] );
!         $retval .= $login->parse( 'output', 'form' );
! 
!         $retval .= COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));
      }
  
***************
*** 3320,3325 ****
--- 3324,3335 ----
      if( $fp = @fopen( $rdfurl, 'r' ))
      {
+         $startoffeed = true;
          while( $data = fread( $fp, 4096 ))
          {
+             if( $startoffeed )
+             {
+                 $data = ltrim( $data );
+                 $startoffeed = false;
+             }
              if( !xml_parse( $xml_parser, $data, feof( $fp )))
              {




From dhaun at geeklog.net  Sat Mar 29 14:12:30 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 29 Mar 2003 13:12:30 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html calendar.php,1.27,1.28
Message-ID: <200303291912.h2TJCU107558@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv7535

Modified Files:
	calendar.php 
Log Message:
Fixed display of events spanning several days in the personal calendar (bug #676604).


Index: calendar.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/calendar.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** calendar.php	6 Jan 2003 18:20:24 -0000	1.27
--- calendar.php	29 Mar 2003 19:12:28 -0000	1.28
***************
*** 5,17 ****
  // | Geeklog 1.3                                                               |
  // +---------------------------------------------------------------------------+
! // | lib-common.php                                                            |
! // | Geeklog common library.                                                   |
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 5,17 ----
  // | Geeklog 1.3                                                               |
  // +---------------------------------------------------------------------------+
! // | calendar.php                                                              |
  // |                                                                           |
+ // | Geeklog calendar.                                                         |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 161,166 ****
      }
  
!     $retval .= '<font size=-2>' . LB . '<table>' . LB 
!         . '<tr><td align=center colspan=7><a href="' . $_CONF['site_url'] . '/calendar.php?month=' . $m . '&amp;year=' . $y . $mode . '">' 
          . $mycal->getMonthName($m) . '</a></td></tr>'
          . makeDaysHeadline() . LB;
--- 161,166 ----
      }
  
!     $retval .= '<font size="-2">' . LB . '<table>' . LB 
!         . '<tr><td align="center" colspan="7"><a href="' . $_CONF['site_url'] . '/calendar.php?month=' . $m . '&amp;year=' . $y . $mode . '">' 
          . $mycal->getMonthName($m) . '</a></td></tr>'
          . makeDaysHeadline() . LB;
***************
*** 688,694 ****
                  . '&amp;year=' . $year . '" class="cal_date">' . $curday->daynumber. '</a><hr>');
  
-             // NEED TO CHANGE TO GET ENTRIES
              if ($mode == 'personal') {
!                 //$calsql = "SELECT {$_TABLES["events"]}.* FROM {$_TABLES["events"]}, {$_TABLES["userevent"]} WHERE ({$_TABLES["events"]}.eid = {$_TABLES["userevent"]}.eid) AND ({$_TABLES["userevent"]}.uid = {$_USER["uid"]}) AND ((datestart >= \"$year-$month-$curday->daynumber 00:00:00\" AND datestart <= \"$year-$month-$curday->daynumber 23:59:59\") OR (dateend >= \"$year-$month-$curday->daynumber 00:00:00\" AND dateend <= \"$year-$month-$curday->daynumber 23:59:59\") OR (\"$year-$month-$curday->daynumber\" between datestart and dateend)) ORDER BY datestart,timestart";
                  $calsql = "SELECT * FROM {$_TABLES["personal_events"]} WHERE (uid = {$_USER["uid"]}) AND ((datestart >= \"$year-$month-$curday->daynumber 00:00:00\" AND datestart <= \"$year-$month-$curday->daynumber 23:59:59\") OR (dateend >= \"$year-$month-$curday->daynumber 00:00:00\" AND dateend <= \"$year-$month-$curday->daynumber 23:59:59\") OR (\"$year-$month-$curday->daynumber\" between datestart and dateend)) ORDER BY datestart,timestart";
              } else {
--- 688,695 ----
                  . '&amp;year=' . $year . '" class="cal_date">' . $curday->daynumber. '</a><hr>');
  
              if ($mode == 'personal') {
!                 if (strlen($month) == 1) {
!                     $month = '0' . $month;
!                 }
                  $calsql = "SELECT * FROM {$_TABLES["personal_events"]} WHERE (uid = {$_USER["uid"]}) AND ((datestart >= \"$year-$month-$curday->daynumber 00:00:00\" AND datestart <= \"$year-$month-$curday->daynumber 23:59:59\") OR (dateend >= \"$year-$month-$curday->daynumber 00:00:00\" AND dateend <= \"$year-$month-$curday->daynumber 23:59:59\") OR (\"$year-$month-$curday->daynumber\" between datestart and dateend)) ORDER BY datestart,timestart";
              } else {




From dhaun at geeklog.net  Sat Mar 29 15:44:26 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 29 Mar 2003 14:44:26 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html calendar_event.php,1.23,1.24
Message-ID: <200303292044.h2TKiQ108443@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv8421

Modified Files:
	calendar_event.php 
Log Message:
Fixed localised display of all-day events, fixed <br> tags for event address.


Index: calendar_event.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/calendar_event.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** calendar_event.php	27 Nov 2002 18:11:26 -0000	1.23
--- calendar_event.php	29 Mar 2003 20:44:24 -0000	1.24
***************
*** 9,17 ****
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 9,17 ----
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 50,54 ****
  {
      global $_USER, $LANG02, $_CONF, $_TABLES;
! 	
      $retval .= COM_startBlock($LANG02[11]);
      $eventsql = "SELECT *, datestart AS start, dateend AS end, timestart, timeend, allday FROM {$_TABLES['events']} WHERE eid='$eid'";
--- 50,54 ----
  {
      global $_USER, $LANG02, $_CONF, $_TABLES;
! 
      $retval .= COM_startBlock($LANG02[11]);
      $eventsql = "SELECT *, datestart AS start, dateend AS end, timestart, timeend, allday FROM {$_TABLES['events']} WHERE eid='$eid'";
***************
*** 499,503 ****
                      
                  } else {
!                     $thedatetime = strftime('%A, %B %e %Y',strtotime($A['start'] . ' ' . $A['timestart']));
                      $cal_templates->set_var('event_start', $thedatetime);
                      $cal_templates->set_var('event_end', $LANG30[26]);
--- 499,503 ----
                      
                  } else {
!                     $thedatetime = strftime("%A, " . $_CONF['shortdate'],strtotime($A['start']));
                      $cal_templates->set_var('event_start', $thedatetime);
                      $cal_templates->set_var('event_end', $LANG30[26]);
***************
*** 516,520 ****
                      $cal_templates->set_var('event_address2','');
                  }
!                 if (empty($A['event_city']) && empty($A['event_state']) && empty($A['event_zip'])) {
                      $cal_templates->set_var('br2','');
                  } else {
--- 516,520 ----
                      $cal_templates->set_var('event_address2','');
                  }
!                 if (empty($A['city']) && empty($A['state']) && empty($A['zip'])) {
                      $cal_templates->set_var('br2','');
                  } else {
***************
*** 531,534 ****
--- 531,541 ----
                  }
                  $cal_templates->set_var('event_zip', $A['zipcode']);
+                 if (!empty ($A['address1']) || !empty ($A['address2']) ||
+                     !empty ($A['city']) || !empty ($A['state']) ||
+                     !empty($A['zip'])) {
+                     $cal_templates->set_var ('br0', '<br>');
+                 } else {
+                     $cal_templates->set_var ('br0', '');
+                 }
                  $cal_templates->set_var('event_location', stripslashes ($A['location']));
                  $cal_templates->set_var('lang_description', $LANG02[5]);




From dhaun at geeklog.net  Sat Mar 29 15:51:19 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 29 Mar 2003 14:51:19 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html calendar_event.php,1.23,1.24
Message-ID: <200303292051.h2TKpJ108605@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv8583

Modified Files:
	calendar_event.php 
Log Message:
Fixed localised display of all-day events, fixed <br> tags for event address.
[second attempt]


Index: calendar_event.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/calendar_event.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** calendar_event.php	27 Nov 2002 18:11:26 -0000	1.23
--- calendar_event.php	29 Mar 2003 20:51:17 -0000	1.24
***************
*** 9,17 ****
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 9,17 ----
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 50,54 ****
  {
      global $_USER, $LANG02, $_CONF, $_TABLES;
! 	
      $retval .= COM_startBlock($LANG02[11]);
      $eventsql = "SELECT *, datestart AS start, dateend AS end, timestart, timeend, allday FROM {$_TABLES['events']} WHERE eid='$eid'";
--- 50,54 ----
  {
      global $_USER, $LANG02, $_CONF, $_TABLES;
! 
      $retval .= COM_startBlock($LANG02[11]);
      $eventsql = "SELECT *, datestart AS start, dateend AS end, timestart, timeend, allday FROM {$_TABLES['events']} WHERE eid='$eid'";
***************
*** 499,503 ****
                      
                  } else {
!                     $thedatetime = strftime('%A, %B %e %Y',strtotime($A['start'] . ' ' . $A['timestart']));
                      $cal_templates->set_var('event_start', $thedatetime);
                      $cal_templates->set_var('event_end', $LANG30[26]);
--- 499,503 ----
                      
                  } else {
!                     $thedatetime = strftime("%A, " . $_CONF['shortdate'],strtotime($A['start']));
                      $cal_templates->set_var('event_start', $thedatetime);
                      $cal_templates->set_var('event_end', $LANG30[26]);
***************
*** 516,520 ****
                      $cal_templates->set_var('event_address2','');
                  }
!                 if (empty($A['event_city']) && empty($A['event_state']) && empty($A['event_zip'])) {
                      $cal_templates->set_var('br2','');
                  } else {
--- 516,520 ----
                      $cal_templates->set_var('event_address2','');
                  }
!                 if (empty($A['city']) && empty($A['state']) && empty($A['zip'])) {
                      $cal_templates->set_var('br2','');
                  } else {
***************
*** 531,534 ****
--- 531,541 ----
                  }
                  $cal_templates->set_var('event_zip', $A['zipcode']);
+                 if (!empty ($A['location']) && (!empty ($A['address1']) ||
+                     !empty ($A['address2']) || !empty ($A['city']) ||
+                     !empty ($A['state']) || !empty($A['zip']))) {
+                     $cal_templates->set_var ('br0', '<br>');
+                 } else {
+                     $cal_templates->set_var ('br0', '');
+                 }
                  $cal_templates->set_var('event_location', stripslashes ($A['location']));
                  $cal_templates->set_var('lang_description', $LANG02[5]);




From dhaun at geeklog.net  Sat Mar 29 15:52:56 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 29 Mar 2003 14:52:56 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue/calendar eventdetails.thtml,1.1,1.2
Message-ID: <200303292052.h2TKqu108669@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/calendar
In directory internal.geeklog.net:/tmp/cvs-serv8643/Smooth_Blue/calendar

Modified Files:
	eventdetails.thtml 
Log Message:
Added {event_location}


Index: eventdetails.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/calendar/eventdetails.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** eventdetails.thtml	14 May 2002 05:44:46 -0000	1.1
--- eventdetails.thtml	29 Mar 2003 20:52:54 -0000	1.2
***************
*** 12,15 ****
--- 12,16 ----
                                      <td align="right"><b>{lang_where}:</b></td>
                                      <td width="100%">
+                                         {event_location}{br0}
                                          {event_address1}{br1}
                                          {event_address2}{br2}




From dhaun at geeklog.net  Sat Mar 29 15:52:56 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 29 Mar 2003 14:52:56 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic/calendar eventdetails.thtml,1.3,1.4
Message-ID: <200303292052.h2TKqu108663@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/calendar
In directory internal.geeklog.net:/tmp/cvs-serv8643/Classic/calendar

Modified Files:
	eventdetails.thtml 
Log Message:
Added {event_location}


Index: eventdetails.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/calendar/eventdetails.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** eventdetails.thtml	16 Mar 2002 18:44:48 -0000	1.3
--- eventdetails.thtml	29 Mar 2003 20:52:54 -0000	1.4
***************
*** 12,15 ****
--- 12,16 ----
                                      <td align="right"><b>{lang_where}:</b></td>
                                      <td width="100%">
+                                         {event_location}{br0}
                                          {event_address1}{br1}
                                          {event_address2}{br2}




From dhaun at geeklog.net  Sat Mar 29 15:52:56 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 29 Mar 2003 14:52:56 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver/calendar eventdetails.thtml,1.2,1.3
Message-ID: <200303292052.h2TKqu108672@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/calendar
In directory internal.geeklog.net:/tmp/cvs-serv8643/XSilver/calendar

Modified Files:
	eventdetails.thtml 
Log Message:
Added {event_location}


Index: eventdetails.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/calendar/eventdetails.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** eventdetails.thtml	12 May 2002 20:51:39 -0000	1.2
--- eventdetails.thtml	29 Mar 2003 20:52:54 -0000	1.3
***************
*** 12,15 ****
--- 12,16 ----
                                      <td align="right"><b>{lang_where}:</b></td>
                                      <td width="100%">
+                                         {event_location}{br0}
                                          {event_address1}{br1}
                                          {event_address2}{br2}




From dhaun at geeklog.net  Sat Mar 29 15:52:56 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 29 Mar 2003 14:52:56 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo/calendar eventdetails.thtml,1.3,1.4
Message-ID: <200303292052.h2TKqu108675@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/calendar
In directory internal.geeklog.net:/tmp/cvs-serv8643/Yahoo/calendar

Modified Files:
	eventdetails.thtml 
Log Message:
Added {event_location}


Index: eventdetails.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/calendar/eventdetails.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** eventdetails.thtml	16 Mar 2002 18:44:48 -0000	1.3
--- eventdetails.thtml	29 Mar 2003 20:52:54 -0000	1.4
***************
*** 12,15 ****
--- 12,16 ----
                                      <td align="right"><b>{lang_where}:</b></td>
                                      <td width="100%">
+                                         {event_location}{br0}
                                          {event_address1}{br1}
                                          {event_address2}{br2}




From dhaun at geeklog.net  Sat Mar 29 15:52:56 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sat, 29 Mar 2003 14:52:56 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome/calendar eventdetails.thtml,1.3,1.4
Message-ID: <200303292052.h2TKqu108666@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/calendar
In directory internal.geeklog.net:/tmp/cvs-serv8643/Digital_Monochrome/calendar

Modified Files:
	eventdetails.thtml 
Log Message:
Added {event_location}


Index: eventdetails.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/calendar/eventdetails.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** eventdetails.thtml	16 Mar 2002 18:44:48 -0000	1.3
--- eventdetails.thtml	29 Mar 2003 20:52:54 -0000	1.4
***************
*** 12,15 ****
--- 12,16 ----
                                      <td align="right"><b>{lang_where}:</b></td>
                                      <td width="100%">
+                                         {event_location}{br0}
                                          {event_address1}{br1}
                                          {event_address2}{br2}




From dhaun at geeklog.net  Sun Mar 30 05:35:44 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:44 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic/calendar editpersonalevent.thtml,1.1,1.2
Message-ID: <200303301035.h2UAZi125322@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/calendar
In directory internal.geeklog.net:/tmp/cvs-serv25278/Classic/calendar

Modified Files:
	editpersonalevent.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: editpersonalevent.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/calendar/editpersonalevent.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editpersonalevent.thtml	11 Dec 2001 19:31:31 -0000	1.1
--- editpersonalevent.thtml	30 Mar 2003 10:35:42 -0000	1.2
***************
*** 115,119 ****
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="96" name="url" value="{event_url}"></td>
                                      </tr>
                                      <tr>
--- 115,119 ----
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="128" name="url" value="{event_url}"></td>
                                      </tr>
                                      <tr>




From dhaun at geeklog.net  Sun Mar 30 05:35:45 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:45 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome/calendar editpersonalevent.thtml,1.1,1.2
Message-ID: <200303301035.h2UAZi125330@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/calendar
In directory internal.geeklog.net:/tmp/cvs-serv25278/Digital_Monochrome/calendar

Modified Files:
	editpersonalevent.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: editpersonalevent.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/calendar/editpersonalevent.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editpersonalevent.thtml	11 Dec 2001 19:31:00 -0000	1.1
--- editpersonalevent.thtml	30 Mar 2003 10:35:42 -0000	1.2
***************
*** 115,119 ****
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="96" name="url" value="{event_url}"></td>
                                      </tr>
                                      <tr>
--- 115,119 ----
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="128" name="url" value="{event_url}"></td>
                                      </tr>
                                      <tr>




From dhaun at geeklog.net  Sun Mar 30 05:35:45 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:45 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver/submit submitevent.thtml,1.1.1.1,1.2
Message-ID: <200303301035.h2UAZj125353@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/submit
In directory internal.geeklog.net:/tmp/cvs-serv25278/XSilver/submit

Modified Files:
	submitevent.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: submitevent.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/submit/submitevent.thtml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** submitevent.thtml	20 Apr 2002 14:32:08 -0000	1.1.1.1
--- submitevent.thtml	30 Mar 2003 10:35:43 -0000	1.2
***************
*** 122,126 ****
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="96" name="url" value="http://"></td>
                                      </tr>
                                      <tr>
--- 122,126 ----
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="128" name="url" value="http://"></td>
                                      </tr>
                                      <tr>




From dhaun at geeklog.net  Sun Mar 30 05:35:45 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:45 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver/calendar editpersonalevent.thtml,1.1.1.1,1.2
Message-ID: <200303301035.h2UAZj125349@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/calendar
In directory internal.geeklog.net:/tmp/cvs-serv25278/XSilver/calendar

Modified Files:
	editpersonalevent.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: editpersonalevent.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/calendar/editpersonalevent.thtml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** editpersonalevent.thtml	20 Apr 2002 14:31:58 -0000	1.1.1.1
--- editpersonalevent.thtml	30 Mar 2003 10:35:43 -0000	1.2
***************
*** 115,119 ****
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="96" name="url" value="{event_url}"></td>
                                      </tr>
                                      <tr>
--- 115,119 ----
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="128" name="url" value="{event_url}"></td>
                                      </tr>
                                      <tr>




From dhaun at geeklog.net  Sun Mar 30 05:35:45 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:45 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome/submit submitevent.thtml,1.3,1.4
Message-ID: <200303301035.h2UAZj125336@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/submit
In directory internal.geeklog.net:/tmp/cvs-serv25278/Digital_Monochrome/submit

Modified Files:
	submitevent.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: submitevent.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/submit/submitevent.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** submitevent.thtml	11 Dec 2001 19:20:22 -0000	1.3
--- submitevent.thtml	30 Mar 2003 10:35:42 -0000	1.4
***************
*** 122,126 ****
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="96" name="url" value="http://"></td>
                                      </tr>
                                      <tr>
--- 122,126 ----
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="128" name="url" value="http://"></td>
                                      </tr>
                                      <tr>




From dhaun at geeklog.net  Sun Mar 30 05:35:45 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:45 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo/calendar editpersonalevent.thtml,1.1,1.2
Message-ID: <200303301035.h2UAZj125370@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/calendar
In directory internal.geeklog.net:/tmp/cvs-serv25278/Yahoo/calendar

Modified Files:
	editpersonalevent.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: editpersonalevent.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/calendar/editpersonalevent.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editpersonalevent.thtml	11 Dec 2001 19:30:17 -0000	1.1
--- editpersonalevent.thtml	30 Mar 2003 10:35:43 -0000	1.2
***************
*** 115,119 ****
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="96" name="url" value="{event_url}"></td>
                                      </tr>
                                      <tr>
--- 115,119 ----
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="128" name="url" value="{event_url}"></td>
                                      </tr>
                                      <tr>




From dhaun at geeklog.net  Sun Mar 30 05:35:44 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:44 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome/admin/event eventeditor.thtml,1.5,1.6
Message-ID: <200303301035.h2UAZi125327@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/admin/event
In directory internal.geeklog.net:/tmp/cvs-serv25278/Digital_Monochrome/admin/event

Modified Files:
	eventeditor.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: eventeditor.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/admin/event/eventeditor.thtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** eventeditor.thtml	20 May 2002 20:08:53 -0000	1.5
--- eventeditor.thtml	30 Mar 2003 10:35:42 -0000	1.6
***************
*** 114,118 ****
                                      <tr>
                                          <td align="right"><b>{lang_eventurl}:</b></td>
!                                         <td><input type="text" size="48"  maxlength="96" name="url" value="{event_url}"> {lang_includehttp}</td>
                                      </tr>
                                      <tr>
--- 114,118 ----
                                      <tr>
                                          <td align="right"><b>{lang_eventurl}:</b></td>
!                                         <td><input type="text" size="48"  maxlength="128" name="url" value="{event_url}"> {lang_includehttp}</td>
                                      </tr>
                                      <tr>




From dhaun at geeklog.net  Sun Mar 30 05:35:45 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:45 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue/calendar editpersonalevent.thtml,1.1,1.2
Message-ID: <200303301035.h2UAZj125339@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/calendar
In directory internal.geeklog.net:/tmp/cvs-serv25278/Smooth_Blue/calendar

Modified Files:
	editpersonalevent.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: editpersonalevent.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/calendar/editpersonalevent.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editpersonalevent.thtml	14 May 2002 05:44:46 -0000	1.1
--- editpersonalevent.thtml	30 Mar 2003 10:35:43 -0000	1.2
***************
*** 115,119 ****
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="96" name="url" value="{event_url}"></td>
                                      </tr>
                                      <tr>
--- 115,119 ----
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="128" name="url" value="{event_url}"></td>
                                      </tr>
                                      <tr>




From dhaun at geeklog.net  Sun Mar 30 05:35:44 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:44 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic/submit submitevent.thtml,1.4,1.5
Message-ID: <200303301035.h2UAZi125324@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/submit
In directory internal.geeklog.net:/tmp/cvs-serv25278/Classic/submit

Modified Files:
	submitevent.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: submitevent.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/submit/submitevent.thtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** submitevent.thtml	11 Dec 2001 19:25:30 -0000	1.4
--- submitevent.thtml	30 Mar 2003 10:35:42 -0000	1.5
***************
*** 122,126 ****
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="96" name="url" value="http://"></td>
                                      </tr>
                                      <tr>
--- 122,126 ----
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="128" name="url" value="http://"></td>
                                      </tr>
                                      <tr>




From dhaun at geeklog.net  Sun Mar 30 05:35:45 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:45 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue/submit submitevent.thtml,1.1,1.2
Message-ID: <200303301035.h2UAZj125342@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/submit
In directory internal.geeklog.net:/tmp/cvs-serv25278/Smooth_Blue/submit

Modified Files:
	submitevent.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: submitevent.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/submit/submitevent.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** submitevent.thtml	14 May 2002 05:44:47 -0000	1.1
--- submitevent.thtml	30 Mar 2003 10:35:43 -0000	1.2
***************
*** 122,126 ****
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="96" name="url" value="http://"></td>
                                      </tr>
                                      <tr>
--- 122,126 ----
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="128" name="url" value="http://"></td>
                                      </tr>
                                      <tr>




From dhaun at geeklog.net  Sun Mar 30 05:35:45 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:45 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue/admin/event eventeditor.thtml,1.4,1.5
Message-ID: <200303301035.h2UAZj125335@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/admin/event
In directory internal.geeklog.net:/tmp/cvs-serv25278/Smooth_Blue/admin/event

Modified Files:
	eventeditor.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: eventeditor.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/admin/event/eventeditor.thtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** eventeditor.thtml	18 Aug 2002 18:07:31 -0000	1.4
--- eventeditor.thtml	30 Mar 2003 10:35:43 -0000	1.5
***************
*** 114,118 ****
                                      <tr>
                                          <td align="right"><b>{lang_eventurl}:</b></td>
!                                         <td><input type="text" size="48"  maxlength="96" name="url" value="{event_url}"> {lang_includehttp}</td>
                                      </tr>
                                      <tr>
--- 114,118 ----
                                      <tr>
                                          <td align="right"><b>{lang_eventurl}:</b></td>
!                                         <td><input type="text" size="48"  maxlength="128" name="url" value="{event_url}"> {lang_includehttp}</td>
                                      </tr>
                                      <tr>




From dhaun at geeklog.net  Sun Mar 30 05:35:44 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:44 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic/admin/event eventeditor.thtml,1.5,1.6
Message-ID: <200303301035.h2UAZi125323@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/admin/event
In directory internal.geeklog.net:/tmp/cvs-serv25278/Classic/admin/event

Modified Files:
	eventeditor.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: eventeditor.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/admin/event/eventeditor.thtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** eventeditor.thtml	20 May 2002 20:08:53 -0000	1.5
--- eventeditor.thtml	30 Mar 2003 10:35:42 -0000	1.6
***************
*** 114,118 ****
                                      <tr>
                                          <td align="right"><b>{lang_eventurl}:</b></td>
!                                         <td><input type="text" size="48"  maxlength="96" name="url" value="{event_url}"> {lang_includehttp}</td>
                                      </tr>
                                      <tr>
--- 114,118 ----
                                      <tr>
                                          <td align="right"><b>{lang_eventurl}:</b></td>
!                                         <td><input type="text" size="48"  maxlength="128" name="url" value="{event_url}"> {lang_includehttp}</td>
                                      </tr>
                                      <tr>




From dhaun at geeklog.net  Sun Mar 30 05:35:45 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:45 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver/admin/event eventeditor.thtml,1.3,1.4
Message-ID: <200303301035.h2UAZj125345@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/admin/event
In directory internal.geeklog.net:/tmp/cvs-serv25278/XSilver/admin/event

Modified Files:
	eventeditor.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: eventeditor.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/admin/event/eventeditor.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** eventeditor.thtml	20 May 2002 20:08:56 -0000	1.3
--- eventeditor.thtml	30 Mar 2003 10:35:43 -0000	1.4
***************
*** 114,118 ****
                                      <tr>
                                          <td align="right"><b>{lang_eventurl}:</b></td>
!                                         <td><input type="text" size="48"  maxlength="96" name="url" value="{event_url}"> {lang_includehttp}</td>
                                      </tr>
                                      <tr>
--- 114,118 ----
                                      <tr>
                                          <td align="right"><b>{lang_eventurl}:</b></td>
!                                         <td><input type="text" size="48"  maxlength="128" name="url" value="{event_url}"> {lang_includehttp}</td>
                                      </tr>
                                      <tr>




From dhaun at geeklog.net  Sun Mar 30 05:35:45 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:45 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo/admin/event eventeditor.thtml,1.7,1.8
Message-ID: <200303301035.h2UAZj125364@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/admin/event
In directory internal.geeklog.net:/tmp/cvs-serv25278/Yahoo/admin/event

Modified Files:
	eventeditor.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: eventeditor.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/admin/event/eventeditor.thtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** eventeditor.thtml	20 May 2002 20:08:57 -0000	1.7
--- eventeditor.thtml	30 Mar 2003 10:35:43 -0000	1.8
***************
*** 114,118 ****
                                      <tr>
                                          <td align="right"><b>{lang_eventurl}:</b></td>
!                                         <td><input type="text" size="48"  maxlength="96" name="url" value="{event_url}"> {lang_includehttp}</td>
                                      </tr>
                                      <tr>
--- 114,118 ----
                                      <tr>
                                          <td align="right"><b>{lang_eventurl}:</b></td>
!                                         <td><input type="text" size="48"  maxlength="128" name="url" value="{event_url}"> {lang_includehttp}</td>
                                      </tr>
                                      <tr>




From dhaun at geeklog.net  Sun Mar 30 05:35:45 2003
From: dhaun at geeklog.net (dhaun at geeklog.net)
Date: Sun, 30 Mar 2003 04:35:45 -0600
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo/submit submitevent.thtml,1.3,1.4
Message-ID: <200303301035.h2UAZj125378@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/submit
In directory internal.geeklog.net:/tmp/cvs-serv25278/Yahoo/submit

Modified Files:
	submitevent.thtml 
Log Message:
Allow up to 128 characters for the event URL.


Index: submitevent.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/submit/submitevent.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** submitevent.thtml	11 Dec 2001 19:16:06 -0000	1.3
--- submitevent.thtml	30 Mar 2003 10:35:43 -0000	1.4
***************
*** 122,126 ****
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="96" name="url" value="http://"></td>
                                      </tr>
                                      <tr>
--- 122,126 ----
                                      <tr>
                                          <td align="right"><b>{lang_link}:</b></td>
!                                         <td><input type="text" size="36" maxlength="128" name="url" value="http://"></td>
                                      </tr>
                                      <tr>