From mjervis at qs1489.pair.com Tue Jul 1 15:42:04 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Tue, 01 Jul 2008 19:42:04 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/calendar install_defaults.php, 1.5, 1.6 Message-ID: <20080701194204.0010910FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/calendar In directory qs1489.pair.com:/tmp/cvs-serv4401/plugins/calendar Modified Files: install_defaults.php Log Message: Bug 663 - Invalid use of global in plugins [LWC] Index: install_defaults.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/install_defaults.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** install_defaults.php 11 May 2008 07:25:08 -0000 1.5 --- install_defaults.php 1 Jul 2008 19:42:02 -0000 1.6 *************** *** 51,55 **** */ ! global $_CA_DEFAULT; // when set to 1 will only allow logged-in users to view the list of past events --- 51,55 ---- */ ! $_CA_DEFAULT = array(); // when set to 1 will only allow logged-in users to view the list of past events From mjervis at qs1489.pair.com Tue Jul 1 15:42:05 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Tue, 01 Jul 2008 19:42:05 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/links install_defaults.php, 1.4, 1.5 Message-ID: <20080701194205.81CC610FE15@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/links In directory qs1489.pair.com:/tmp/cvs-serv4401/plugins/links Modified Files: install_defaults.php Log Message: Bug 663 - Invalid use of global in plugins [LWC] Index: install_defaults.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/install_defaults.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** install_defaults.php 4 May 2008 09:16:33 -0000 1.4 --- install_defaults.php 1 Jul 2008 19:42:02 -0000 1.5 *************** *** 52,57 **** */ - global $_LI_DEFAULT; - /** * the link plugin's config array --- 52,55 ---- From mjervis at qs1489.pair.com Tue Jul 1 15:42:05 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Tue, 01 Jul 2008 19:42:05 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls install_defaults.php, 1.5, 1.6 Message-ID: <20080701194205.8E45510FE16@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/polls In directory qs1489.pair.com:/tmp/cvs-serv4401/plugins/polls Modified Files: install_defaults.php Log Message: Bug 663 - Invalid use of global in plugins [LWC] Index: install_defaults.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/install_defaults.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** install_defaults.php 17 May 2008 13:53:21 -0000 1.5 --- install_defaults.php 1 Jul 2008 19:42:03 -0000 1.6 *************** *** 47,51 **** */ ! global $_PO_DEFAULT; // when set to 1 will only allow logged-in users to view the list of past polls --- 47,51 ---- */ ! $_PO_DEFAULT = array(); // when set to 1 will only allow logged-in users to view the list of past polls From mjervis at qs1489.pair.com Tue Jul 1 15:42:05 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Tue, 01 Jul 2008 19:42:05 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/spamx install_defaults.php, 1.3, 1.4 Message-ID: <20080701194205.A636D10FE17@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/spamx In directory qs1489.pair.com:/tmp/cvs-serv4401/plugins/spamx Modified Files: install_defaults.php Log Message: Bug 663 - Invalid use of global in plugins [LWC] Index: install_defaults.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/spamx/install_defaults.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** install_defaults.php 4 May 2008 09:16:33 -0000 1.3 --- install_defaults.php 1 Jul 2008 19:42:03 -0000 1.4 *************** *** 47,51 **** */ ! global $_SPX_DEFAULT; // Default Spam-X Action --- 47,51 ---- */ ! $_SPX_DEFAULT = array(); // Default Spam-X Action From mjervis at qs1489.pair.com Tue Jul 1 15:42:07 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Tue, 01 Jul 2008 19:42:07 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages install_defaults.php, 1.6, 1.7 Message-ID: <20080701194207.30C9C10FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages In directory qs1489.pair.com:/tmp/cvs-serv4401/plugins/staticpages Modified Files: install_defaults.php Log Message: Bug 663 - Invalid use of global in plugins [LWC] Index: install_defaults.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/install_defaults.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** install_defaults.php 4 May 2008 09:16:33 -0000 1.6 --- install_defaults.php 1 Jul 2008 19:42:03 -0000 1.7 *************** *** 48,52 **** */ ! global $_SP_DEFAULT; // If you don't plan on using PHP code in static pages, you should set this --- 48,52 ---- */ ! $_SP_DEFAULT = array(); // If you don't plan on using PHP code in static pages, you should set this From mjervis at qs1489.pair.com Tue Jul 1 15:53:01 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Tue, 01 Jul 2008 19:53:01 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/links functions.inc,1.109,1.110 Message-ID: <20080701195301.32C3C10FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/links In directory qs1489.pair.com:/tmp/cvs-serv5370/plugins/links Modified Files: functions.inc Log Message: Partial fix for Bug 671, hard-coded ltrness of ext-links class. CSS needs cross browser magic. Which I give up on. Index: functions.inc =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/functions.inc,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** functions.inc 31 May 2008 07:55:08 -0000 1.109 --- functions.inc 1 Jul 2008 19:52:58 -0000 1.110 *************** *** 170,174 **** function plugin_autotags_links($op, $content = '', $autotag = '') { ! global $_CONF, $_TABLES; if ($op == 'tagname' ) { --- 170,174 ---- function plugin_autotags_links($op, $content = '', $autotag = '') { ! global $_CONF, $_TABLES, $LANG_DIRECTION; if ($op == 'tagname' ) { *************** *** 185,191 **** $siteurl = DB_getItem($_TABLES['links'], 'url', "lid = '$lid'"); } $attr = array( 'title' => $siteurl, ! 'class' => 'ext-link' ); $link = COM_createLink($linktext, $url, $attr); --- 185,195 ---- $siteurl = DB_getItem($_TABLES['links'], 'url', "lid = '$lid'"); } + $class = 'ext-link'; + if ((!empty($LANG_DIRECTION)) && ($LANG_DIRECTION == 'rtl')) { + $class .= '-rtl'; + } $attr = array( 'title' => $siteurl, ! 'class' => $class ); $link = COM_createLink($linktext, $url, $attr); From mjervis at qs1489.pair.com Tue Jul 1 15:53:03 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Tue, 01 Jul 2008 19:53:03 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/links index.php,1.38,1.39 Message-ID: <20080701195303.5FCB310FE15@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/links In directory qs1489.pair.com:/tmp/cvs-serv5370/public_html/links Modified Files: index.php Log Message: Partial fix for Bug 671, hard-coded ltrness of ext-links class. CSS needs cross browser magic. Which I give up on. Index: index.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/links/index.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** index.php 12 Jun 2008 19:45:26 -0000 1.38 --- index.php 1 Jul 2008 19:52:59 -0000 1.39 *************** *** 343,347 **** function prepare_link_item ($A, &$template) { ! global $_CONF, $_USER, $LANG_ADMIN, $LANG_LINKS, $_IMAGE_TYPE; $url = COM_buildUrl ($_CONF['site_url'] --- 343,347 ---- function prepare_link_item ($A, &$template) { ! global $_CONF, $_USER, $LANG_ADMIN, $LANG_LINKS, $_IMAGE_TYPE, $LANG_DIRECTION; $url = COM_buildUrl ($_CONF['site_url'] *************** *** 354,360 **** nl2br (stripslashes ($A['description']))); $content = stripslashes ($A['title']); $attr = array( 'title' => stripslashes ($A['url']), ! 'class' => 'ext-link'); $html = COM_createLink($content, $url, $attr); $template->set_var ('link_html', $html); --- 354,364 ---- nl2br (stripslashes ($A['description']))); $content = stripslashes ($A['title']); + $class = 'ext-link'; + if ((!empty($LANG_DIRECTION)) && ($LANG_DIRECTION == 'rtl')) { + $class .= '-rtl'; + } $attr = array( 'title' => stripslashes ($A['url']), ! 'class' => $class); $html = COM_createLink($content, $url, $attr); $template->set_var ('link_html', $html); From mjervis at qs1489.pair.com Tue Jul 1 15:53:03 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Tue, 01 Jul 2008 19:53:03 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional style.css, 1.102, 1.103 Message-ID: <20080701195303.64B1510FE16@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional In directory qs1489.pair.com:/tmp/cvs-serv5370/public_html/layout/professional Modified Files: style.css Log Message: Partial fix for Bug 671, hard-coded ltrness of ext-links class. CSS needs cross browser magic. Which I give up on. Index: style.css =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/style.css,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** style.css 1 Jun 2008 07:39:18 -0000 1.102 --- style.css 1 Jul 2008 19:52:59 -0000 1.103 *************** *** 271,274 **** --- 271,280 ---- padding-right: 13px; } + .ext-link-rtl { + background-color: transparent; + background: url(./images/external.png) left center no-repeat; + background-attachment: scroll; + padding-left: 13px; + } .strike { text-decoration: line-through; From mjervis at qs1489.pair.com Tue Jul 1 16:27:37 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Tue, 01 Jul 2008 20:27:37 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.675,1.676 Message-ID: <20080701202737.DB58B10FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv8325/public_html/docs Modified Files: history Log Message: Allow overriding of rootdebug or other core config variables in siteconfig.php for emergency debugging. [bug 673] Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.675 retrieving revision 1.676 diff -C2 -d -r1.675 -r1.676 *** history 28 Jun 2008 19:40:05 -0000 1.675 --- history 1 Jul 2008 20:27:34 -0000 1.676 *************** *** 22,25 **** --- 22,37 ---- same time [Dirk, Mark Evans] - Fixed user submission queue (reported by greenteagod) [Dirk] + - Calendar block now includes events from the current day (in progress or all + day events, bug 0000604, patch from forums) (really) + - Plaintext stories have nl2br applied in syndication feeds to provide correct + formatting in feed readers. [bug 0000662] [bru_man] + - Hardcode an ltr div around HTML tags in the allowed html tag list. Plus minor + HTML compliance issues. [bug 0000669] [LWC] + - Fixed INST_checkTableExists for MS SQL Support. [bug 0000668] [Mike] + - Updated PLG_uninstall to supress errors for table drop. [bug 0000668] [LWC] + - The bundled plugins' install_defaults.php use "global" outside of any function + [bug 0000663] [LWC] + - Enabled siteconfig.php to override database config in core, primarily for + rootdebug. [bug 0000673] [Mike] - Updated Hebrew language file, provided by LWC From mjervis at qs1489.pair.com Tue Jul 1 16:27:37 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Tue, 01 Jul 2008 20:27:37 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html siteconfig.php,1.16,1.17 Message-ID: <20080701202737.0782710FE14@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv8325/public_html Modified Files: siteconfig.php Log Message: Allow overriding of rootdebug or other core config variables in siteconfig.php for emergency debugging. [bug 673] Index: siteconfig.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/siteconfig.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** siteconfig.php 19 Jun 2008 19:24:40 -0000 1.16 --- siteconfig.php 1 Jul 2008 20:27:35 -0000 1.17 *************** *** 18,21 **** --- 18,26 ---- $_CONF['site_enabled'] = true; + // If you have errors on your site, can't login, or can't get to the + // config UI, then you can comment this in to set the root debug option + // on and get detailed error messages: + // $_CONF['rootdebug'] = true; + $_CONF['path'] = '/path/to/Geeklog/'; $_CONF['path_system'] = $_CONF['path'] . 'system/'; From mjervis at qs1489.pair.com Tue Jul 1 16:27:37 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Tue, 01 Jul 2008 20:27:37 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.42, 1.43 Message-ID: <20080701202738.8CED510FE15@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system/classes In directory qs1489.pair.com:/tmp/cvs-serv8325/system/classes Modified Files: config.class.php Log Message: Allow overriding of rootdebug or other core config variables in siteconfig.php for emergency debugging. [bug 673] Index: config.class.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** config.class.php 14 Jun 2008 15:28:01 -0000 1.42 --- config.class.php 1 Jul 2008 20:27:35 -0000 1.43 *************** *** 113,117 **** while ($row = DB_fetchArray($result)) { if ($row[1] !== 'unset') { ! $this->config_array[$row[2]][$row[0]] = unserialize($row[1]); } } --- 113,119 ---- while ($row = DB_fetchArray($result)) { if ($row[1] !== 'unset') { ! if(!array_key_exists($row[2], $this->config_array) || !array_key_exists($row[0], $this->config_array[$row[2]])) { ! $this->config_array[$row[2]][$row[0]] = unserialize($row[1]); ! } } } From dhaun at qs1489.pair.com Wed Jul 2 04:10:49 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Wed, 02 Jul 2008 08:10:49 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.676,1.677 Message-ID: <20080702081049.90D0A10FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv73603/public_html/docs Modified Files: history Log Message: Fixed ChangeLog. Latest changes on top, please! Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.676 retrieving revision 1.677 diff -C2 -d -r1.676 -r1.677 *** history 1 Jul 2008 20:27:34 -0000 1.676 --- history 2 Jul 2008 08:10:47 -0000 1.677 *************** *** 4,7 **** --- 4,11 ---- ------------ + - Enabled siteconfig.php to override database config in core, primarily for + rootdebug. [bug 0000673] [Mike] + - The bundled plugins' install_defaults.php use "global" outside of any function + [bug 0000663] [Mike] - Allow remote users to use the webservices (bug #0000640). Due to the authentication it is not possible for OpenID users to use the webservices. *************** *** 22,37 **** same time [Dirk, Mark Evans] - Fixed user submission queue (reported by greenteagod) [Dirk] - - Calendar block now includes events from the current day (in progress or all - day events, bug 0000604, patch from forums) (really) - - Plaintext stories have nl2br applied in syndication feeds to provide correct - formatting in feed readers. [bug 0000662] [bru_man] - - Hardcode an ltr div around HTML tags in the allowed html tag list. Plus minor - HTML compliance issues. [bug 0000669] [LWC] - - Fixed INST_checkTableExists for MS SQL Support. [bug 0000668] [Mike] - - Updated PLG_uninstall to supress errors for table drop. [bug 0000668] [LWC] - - The bundled plugins' install_defaults.php use "global" outside of any function - [bug 0000663] [LWC] - - Enabled siteconfig.php to override database config in core, primarily for - rootdebug. [bug 0000673] [Mike] - Updated Hebrew language file, provided by LWC --- 26,29 ---- From mjervis at qs1489.pair.com Thu Jul 3 14:01:08 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Thu, 03 Jul 2008 18:01:08 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.677,1.678 Message-ID: <20080703180108.6248210FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv22523/public_html/docs Modified Files: history Log Message: Reverting: Bug 663 - Invalid use of global in plugins [LWC] Because it was a faulty assumption and my testing was crap. Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.677 retrieving revision 1.678 diff -C2 -d -r1.677 -r1.678 *** history 2 Jul 2008 08:10:47 -0000 1.677 --- history 3 Jul 2008 18:01:00 -0000 1.678 *************** *** 6,11 **** - Enabled siteconfig.php to override database config in core, primarily for rootdebug. [bug 0000673] [Mike] - - The bundled plugins' install_defaults.php use "global" outside of any function - [bug 0000663] [Mike] - Allow remote users to use the webservices (bug #0000640). Due to the authentication it is not possible for OpenID users to use the webservices. --- 6,9 ---- *************** *** 27,30 **** --- 25,29 ---- - Fixed user submission queue (reported by greenteagod) [Dirk] + - Updated Hebrew language file, provided by LWC From mjervis at qs1489.pair.com Thu Jul 3 14:01:03 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Thu, 03 Jul 2008 18:01:03 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls install_defaults.php, 1.6, 1.7 Message-ID: <20080703180133.4F01410FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/polls In directory qs1489.pair.com:/tmp/cvs-serv22523/plugins/polls Modified Files: install_defaults.php Log Message: Reverting: Bug 663 - Invalid use of global in plugins [LWC] Because it was a faulty assumption and my testing was crap. Index: install_defaults.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/install_defaults.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** install_defaults.php 1 Jul 2008 19:42:03 -0000 1.6 --- install_defaults.php 3 Jul 2008 18:00:53 -0000 1.7 *************** *** 46,50 **** * */ ! $_PO_DEFAULT = array(); --- 46,50 ---- * */ ! global $_PO_DEFAULT; $_PO_DEFAULT = array(); From mjervis at qs1489.pair.com Thu Jul 3 14:01:03 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Thu, 03 Jul 2008 18:01:03 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/calendar functions.inc, 1.91, 1.92 install_defaults.php, 1.6, 1.7 Message-ID: <20080703180133.D3B4E10FE15@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/calendar In directory qs1489.pair.com:/tmp/cvs-serv22523/plugins/calendar Modified Files: functions.inc install_defaults.php Log Message: Reverting: Bug 663 - Invalid use of global in plugins [LWC] Because it was a faulty assumption and my testing was crap. Index: functions.inc =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/functions.inc,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** functions.inc 29 Jun 2008 19:02:49 -0000 1.91 --- functions.inc 3 Jul 2008 18:00:50 -0000 1.92 *************** *** 123,127 **** $eventSql .= "WHERE dateend >= DATEADD(hh, 24, NOW()) AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) "; } else { ! $eventSql .= "WHERE dateend >= (getUTCDate() - INTERVAL 24 HOUR) AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) "; } $eventSql .= 'ORDER BY datestart,timestart'; --- 123,127 ---- $eventSql .= "WHERE dateend >= DATEADD(hh, 24, NOW()) AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) "; } else { ! $eventSql .= "WHERE dateend >= (NOW() - INTERVAL 24 HOUR) AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) "; } $eventSql .= 'ORDER BY datestart,timestart'; Index: install_defaults.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/install_defaults.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** install_defaults.php 1 Jul 2008 19:42:02 -0000 1.6 --- install_defaults.php 3 Jul 2008 18:00:50 -0000 1.7 *************** *** 50,54 **** * */ ! $_CA_DEFAULT = array(); --- 50,54 ---- * */ ! global $_CA_DEFAULT; $_CA_DEFAULT = array(); From mjervis at qs1489.pair.com Thu Jul 3 14:01:03 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Thu, 03 Jul 2008 18:01:03 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/links install_defaults.php, 1.5, 1.6 Message-ID: <20080703180133.D8BF810FE16@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/links In directory qs1489.pair.com:/tmp/cvs-serv22523/plugins/links Modified Files: install_defaults.php Log Message: Reverting: Bug 663 - Invalid use of global in plugins [LWC] Because it was a faulty assumption and my testing was crap. Index: install_defaults.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/install_defaults.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** install_defaults.php 1 Jul 2008 19:42:02 -0000 1.5 --- install_defaults.php 3 Jul 2008 18:00:53 -0000 1.6 *************** *** 55,58 **** --- 55,59 ---- * the link plugin's config array */ + global $_LI_DEFAULT; $_LI_DEFAULT = array(); From mjervis at qs1489.pair.com Thu Jul 3 14:01:03 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Thu, 03 Jul 2008 18:01:03 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/spamx install_defaults.php, 1.4, 1.5 Message-ID: <20080703180134.A46C410FE18@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/spamx In directory qs1489.pair.com:/tmp/cvs-serv22523/plugins/spamx Modified Files: install_defaults.php Log Message: Reverting: Bug 663 - Invalid use of global in plugins [LWC] Because it was a faulty assumption and my testing was crap. Index: install_defaults.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/spamx/install_defaults.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** install_defaults.php 1 Jul 2008 19:42:03 -0000 1.4 --- install_defaults.php 3 Jul 2008 18:00:53 -0000 1.5 *************** *** 46,50 **** * */ ! $_SPX_DEFAULT = array(); --- 46,50 ---- * */ ! global $_SPX_DEFAULT; $_SPX_DEFAULT = array(); From mjervis at qs1489.pair.com Thu Jul 3 14:01:04 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Thu, 03 Jul 2008 18:01:04 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages install_defaults.php, 1.7, 1.8 Message-ID: <20080703180134.A486310FE19@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages In directory qs1489.pair.com:/tmp/cvs-serv22523/plugins/staticpages Modified Files: install_defaults.php Log Message: Reverting: Bug 663 - Invalid use of global in plugins [LWC] Because it was a faulty assumption and my testing was crap. Index: install_defaults.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/install_defaults.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** install_defaults.php 1 Jul 2008 19:42:03 -0000 1.7 --- install_defaults.php 3 Jul 2008 18:00:53 -0000 1.8 *************** *** 47,51 **** * */ ! $_SP_DEFAULT = array(); --- 47,51 ---- * */ ! global $_SP_DEFAULT; $_SP_DEFAULT = array(); From dirk at haun-online.de Thu Jul 3 14:44:15 2008 From: dirk at haun-online.de (Dirk Haun) Date: Thu, 3 Jul 2008 20:44:15 +0200 Subject: [geeklog-cvs] Geeklog-1.x/public_html article.php,1.96,1.97 In-Reply-To: <20080629092909.C9FA110FE12@qs1489.pair.com> References: <20080629092909.C9FA110FE12@qs1489.pair.com> Message-ID: <20080703184415.1792472759@smtp.haun-online.de> Dirk Haun wrote: >Modified Files: > article.php >Log Message: >Removed unused code Erm, no, we still need that code. It needs to be activated, though. Change reverted. Also see bye, Dirk -- http://www.geeklog.net/ http://geeklog.info/ From mjervis at qs1489.pair.com Thu Jul 3 15:44:34 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Thu, 03 Jul 2008 19:44:34 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system/classes story.class.php, 1.29, 1.30 Message-ID: <20080703194434.2D6B510FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system/classes In directory qs1489.pair.com:/tmp/cvs-serv32100/system/classes Modified Files: story.class.php Log Message: Bug 678 - Draft and future publish dates not respected. Plus, no submission queue caused crash bug when users submitted stories. Index: story.class.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** story.class.php 22 Jun 2008 20:23:07 -0000 1.29 --- story.class.php 3 Jul 2008 19:44:31 -0000 1.30 *************** *** 496,499 **** --- 496,501 ---- } elseif ($this->_access == 2 && $mode != 'view') { return STORY_EDIT_DENIED; + } elseif ((($this->_access == 2) && ($mode == 'view')) && (($this->_draft_flag == 1) || ($this->_date > time()))) { + return STORY_INVALID_SID; } } else { *************** *** 802,805 **** --- 804,810 ---- { $array = $_POST; + + $this->_expire = time(); + $this->_expiredate = 0; // Handle Magic GPC Garbage: From dhaun at qs1489.pair.com Fri Jul 4 07:58:58 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 11:58:58 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.678,1.679 Message-ID: <20080704115858.C89DB10FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv80573/public_html/docs Modified Files: history Log Message: Adopted hack to allow multilingual blocks (bug #0000626) Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.678 retrieving revision 1.679 diff -C2 -d -r1.678 -r1.679 *** history 3 Jul 2008 18:01:00 -0000 1.678 --- history 4 Jul 2008 11:58:53 -0000 1.679 *************** *** 4,7 **** --- 4,11 ---- ------------ + - Adopted hack to allow multilingual blocks (bug #0000626) [Dirk] + - Fixed SQL error in story submissions (reported by Chase) [Mike] + - Stories with a publishing date in the future and stories with the draft flag + set were accessible if you knew their story id (bug #0000678) [Mike] - Enabled siteconfig.php to override database config in core, primarily for rootdebug. [bug 0000673] [Mike] *************** *** 25,29 **** - Fixed user submission queue (reported by greenteagod) [Dirk] - - Updated Hebrew language file, provided by LWC --- 29,32 ---- From dhaun at qs1489.pair.com Fri Jul 4 07:58:58 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 11:58:58 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional functions.php, 1.13, 1.14 Message-ID: <20080704115859.E0E5910FE14@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional In directory qs1489.pair.com:/tmp/cvs-serv80573/public_html/layout/professional Modified Files: functions.php Log Message: Adopted hack to allow multilingual blocks (bug #0000626) Index: functions.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/functions.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** functions.php 31 May 2008 18:38:48 -0000 1.13 --- functions.php 4 Jul 2008 11:58:54 -0000 1.14 *************** *** 2,19 **** // this file can't be used on its own ! if (strpos ($_SERVER['PHP_SELF'], 'functions.php') !== false) { ! die ('This file can not be used on its own!'); } $_IMAGE_TYPE = 'png'; ! if (!defined ('XHTML')) { ! define('XHTML',''); // change this to ' /' for XHTML } ! $result = DB_query ("SELECT onleft,name FROM {$_TABLES['blocks']} WHERE is_enabled = 1"); ! $nrows = DB_numRows ($result); for ($i = 0; $i < $nrows; $i++) { ! $A = DB_fetchArray ($result); if ($A['onleft'] == 1) { $_BLOCK_TEMPLATE[$A['name']] = 'blockheader-left.thtml,blockfooter-left.thtml'; --- 2,24 ---- // this file can't be used on its own ! if (strpos($_SERVER['PHP_SELF'], 'functions.php') !== false) { ! die('This file can not be used on its own!'); } $_IMAGE_TYPE = 'png'; ! if (!defined('XHTML')) { ! define('XHTML', ''); // change this to ' /' for XHTML } ! $lang = COM_getLanguageId(); ! if (empty($lang)) { ! $result = DB_query("SELECT onleft,name FROM {$_TABLES['blocks']} WHERE is_enabled = 1"); ! } else { ! $result = DB_query("SELECT onleft,name FROM {$_TABLES['blocks']}"); ! } ! $nrows = DB_numRows($result); for ($i = 0; $i < $nrows; $i++) { ! $A = DB_fetchArray($result); if ($A['onleft'] == 1) { $_BLOCK_TEMPLATE[$A['name']] = 'blockheader-left.thtml,blockfooter-left.thtml'; From dhaun at qs1489.pair.com Fri Jul 4 07:58:55 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 11:58:55 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.703,1.704 Message-ID: <20080704115925.2E0B410FE14@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv80573/public_html Modified Files: lib-common.php Log Message: Adopted hack to allow multilingual blocks (bug #0000626) Index: lib-common.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v retrieving revision 1.703 retrieving revision 1.704 diff -C2 -d -r1.703 -r1.704 *** lib-common.php 26 Jun 2008 21:27:57 -0000 1.703 --- lib-common.php 4 Jul 2008 11:58:50 -0000 1.704 *************** *** 3449,3453 **** } ! $commonsql .= ' ORDER BY blockorder,title asc'; $blocksql['mysql'] .= $commonsql; --- 3449,3453 ---- } ! $commonsql .= ' ORDER BY blockorder,title ASC'; $blocksql['mysql'] .= $commonsql; *************** *** 3514,3517 **** --- 3514,3540 ---- $retval = ''; + + $lang = COM_getLanguageId(); + if (!empty($lang)) { + + $blocksql['mssql'] = "SELECT bid, is_enabled, name, type, title, tid, blockorder, cast(content as text) as content, "; + $blocksql['mssql'] .= "rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, "; + $blocksql['mssql'] .= "group_id, perm_owner, perm_group, perm_members, perm_anon, allow_autotags,UNIX_TIMESTAMP(rdfupdated) AS date "; + + $blocksql['mysql'] = "SELECT *,UNIX_TIMESTAMP(rdfupdated) AS date "; + + $commonsql = "FROM {$_TABLES['blocks']} WHERE name = '" + . $A['name'] . '_' . $lang . "'"; + + $blocksql['mysql'] .= $commonsql; + $blocksql['mssql'] .= $commonsql; + $result = DB_query( $blocksql ); + + if (DB_numRows($result) == 1) { + // overwrite with data for language-specific block + $A = DB_fetchArray($result); + } + } + if( $A['type'] == 'portal' ) { From dhaun at qs1489.pair.com Fri Jul 4 09:16:10 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 13:16:10 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.704,1.705 Message-ID: <20080704131610.5BF4110FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv91879/public_html Modified Files: lib-common.php Log Message: E_ALL fix Index: lib-common.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v retrieving revision 1.704 retrieving revision 1.705 diff -C2 -d -r1.704 -r1.705 *** lib-common.php 4 Jul 2008 11:58:50 -0000 1.704 --- lib-common.php 4 Jul 2008 13:16:07 -0000 1.705 *************** *** 6241,6258 **** * */ ! function COM_getLanguageId( $language = '' ) { global $_CONF; ! if( empty( $language )) ! { $language = COM_getLanguage(); } ! $lang_id = array_search( $language, $_CONF['language_files'] ); ! if( $lang_id === false) ! { // that looks like a misconfigured $_CONF['language_files'] array ... ! COM_errorLog( 'Language "' . $language . '" not found in $_CONF[\'language_files\'] array!' ); $lang_id = ''; // not much we can do here ... --- 6241,6259 ---- * */ ! function COM_getLanguageId($language = '') { global $_CONF; ! if (empty($language)) { $language = COM_getLanguage(); } ! $lang_id = false; ! if (isset($_CONF['language_files'])) { ! $lang_id = array_search($language, $_CONF['language_files']); ! } ! if ($lang_id === false) { // that looks like a misconfigured $_CONF['language_files'] array ... ! COM_errorLog('Language "' . $language . '" not found in $_CONF[\'language_files\'] array!'); $lang_id = ''; // not much we can do here ... From dhaun at qs1489.pair.com Fri Jul 4 09:21:30 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 13:21:30 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.43, 1.44 Message-ID: <20080704132130.0454510FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system/classes In directory qs1489.pair.com:/tmp/cvs-serv92648/system/classes Modified Files: config.class.php Log Message: Allow to unset Configuration options again after they have been "restored", i.e. enabled (bug #0000664) Index: config.class.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** config.class.php 1 Jul 2008 20:27:35 -0000 1.43 --- config.class.php 4 Jul 2008 13:21:25 -0000 1.44 *************** *** 103,107 **** * * @return array(string => mixed) This is a reference to the ! * config array */ function &initConfig() --- 103,107 ---- * * @return array(string => mixed) This is a reference to the ! * config array */ function &initConfig() *************** *** 113,117 **** while ($row = DB_fetchArray($result)) { if ($row[1] !== 'unset') { ! if(!array_key_exists($row[2], $this->config_array) || !array_key_exists($row[0], $this->config_array[$row[2]])) { $this->config_array[$row[2]][$row[0]] = unserialize($row[1]); } --- 113,118 ---- while ($row = DB_fetchArray($result)) { if ($row[1] !== 'unset') { ! if (!array_key_exists($row[2], $this->config_array) || ! !array_key_exists($row[0], $this->config_array[$row[2]])) { $this->config_array[$row[2]][$row[0]] = unserialize($row[1]); } *************** *** 157,161 **** function set($name, $value, $group='Core') { ! global $_TABLES, $_DB, $_DB_dbms; $escaped_val = addslashes(serialize($value)); --- 158,162 ---- function set($name, $value, $group='Core') { ! global $_TABLES; $escaped_val = addslashes(serialize($value)); *************** *** 165,175 **** "SET value = '{$escaped_val}' WHERE " . "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! if ($_DB_dbms == 'mssql') { ! $sql_query = str_replace("\\'","''",$sql_query); ! $sql_query = str_replace('\\"','"',$sql_query); ! $_DB->dbQuery($sql_query, 0, 1); ! } else { ! DB_query($sql_query); ! } $this->config_array[$group][$name] = $value; $this->_post_configuration(); --- 166,170 ---- "SET value = '{$escaped_val}' WHERE " . "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! $this->_DB_escapedQuery($sql_query); $this->config_array[$group][$name] = $value; $this->_post_configuration(); *************** *** 187,191 **** function set_default($name, $value, $group = 'Core') { ! global $_TABLES, $_DB, $_DB_dbms; $escaped_val = addslashes(serialize($value)); --- 182,186 ---- function set_default($name, $value, $group = 'Core') { ! global $_TABLES; $escaped_val = addslashes(serialize($value)); *************** *** 195,205 **** "SET default_value = '{$escaped_val}' WHERE " . "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! if ($_DB_dbms == 'mssql') { ! $sql_query = str_replace("\\'", "''", $sql_query); ! $sql_query = str_replace('\\"', '"', $sql_query); ! $_DB->dbQuery($sql_query, 0, 1); ! } else { ! DB_query($sql_query); ! } } --- 190,194 ---- "SET default_value = '{$escaped_val}' WHERE " . "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! $this->_DB_escapedQuery($sql_query); } *************** *** 210,216 **** $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! $sql = "UPDATE {$_TABLES['conf_values']} SET value = default_value " . ! "WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! DB_query($sql); } --- 199,215 ---- $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! ! $result = DB_query("SELECT value, default_value FROM {$_TABLES['conf_values']} WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"); ! list($value, $default_value) = DB_fetchArray($result); ! ! $sql = "UPDATE {$_TABLES['conf_values']} "; ! if ($value == 'unset') { ! $default_value = addslashes($default_value); ! $sql .= "SET value = '{$default_value}', default_value = 'unset:{$default_value}'"; ! } else { ! $sql .= "SET value = default_value"; ! } ! $sql .= " WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! $this->_DB_escapedQuery($sql); } *************** *** 221,227 **** $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! $sql = "UPDATE {$_TABLES['conf_values']} SET value = 'unset' " . ! "WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! DB_query($sql); } --- 220,232 ---- $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! $default_value = DB_getItem($_TABLES['conf_values'], 'default_value', ! "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"); ! $sql = "UPDATE {$_TABLES['conf_values']} SET value = 'unset'"; ! if (substr($default_value, 0, 6) == 'unset:') { ! $default_value = addslashes(substr($default_value, 6)); ! $sql .= ", default_value = '{$default_value}'"; ! } ! $sql .= " WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! $this->_DB_escapedQuery($sql); } *************** *** 257,264 **** * @param boolean $set whether or not this parameter is set */ ! function add( $param_name, $default_value, $type, $subgroup, $fieldset, $selection_array=null, $sort=0, $set=true, $group='Core') { ! global $_TABLES, $_DB, $_DB_dbms; $format = 'INSERT INTO %1$s (name, value, type, ' . --- 262,269 ---- * @param boolean $set whether or not this parameter is set */ ! function add($param_name, $default_value, $type, $subgroup, $fieldset, $selection_array=null, $sort=0, $set=true, $group='Core') { ! global $_TABLES; $format = 'INSERT INTO %1$s (name, value, type, ' . *************** *** 281,291 **** $sql_query = vsprintf($format, $Qargs); ! if ($_DB_dbms == 'mssql') { ! $sql_query = str_replace("\\'","''",$sql_query); ! $sql_query = str_replace('\\"','""',$sql_query); ! $_DB->dbQuery($sql_query, 0, 1); ! } else { ! DB_query($sql_query); ! } $this->config_array[$group][$param_name] = $default_value; --- 286,290 ---- $sql_query = vsprintf($format, $Qargs); ! $this->_DB_escapedQuery($sql_query); $this->config_array[$group][$param_name] = $default_value; *************** *** 299,303 **** { DB_delete($GLOBALS['_TABLES']['conf_values'], ! array("name","group_name"), array(addslashes($param_name), addslashes($group))); unset($this->config_array[$group][$param_name]); --- 298,302 ---- { DB_delete($GLOBALS['_TABLES']['conf_values'], ! array('name', 'group_name'), array(addslashes($param_name), addslashes($group))); unset($this->config_array[$group][$param_name]); *************** *** 315,319 **** $q_string = "SELECT name, type, selectionArray, " ! . "fieldset, value FROM {$_TABLES['conf_values']}" . " WHERE group_name='{$group}' AND subgroup='{$subgroup}' " . " AND (type <> 'fieldset' AND type <> 'subgroup') " . --- 314,318 ---- $q_string = "SELECT name, type, selectionArray, " ! . "fieldset, value, default_value FROM {$_TABLES['conf_values']}" . " WHERE group_name='{$group}' AND subgroup='{$subgroup}' " . " AND (type <> 'fieldset' AND type <> 'subgroup') " . *************** *** 329,332 **** --- 328,336 ---- while ($row = DB_fetchArray($Qresult)) { $cur = $row; + if (substr($cur[5], 0, 6) == 'unset:') { + $cur[5] = true; + } else { + $cur[5] = false; + } $res[$cur[3]][$cur[0]] = array('display_name' => *************** *** 343,347 **** 'value' => (($cur[4] == 'unset') ? ! 'unset' : unserialize($cur[4]))); } --- 347,352 ---- 'value' => (($cur[4] == 'unset') ? ! 'unset' : unserialize($cur[4])), ! 'reset' => $cur[5]); } *************** *** 446,450 **** $outerloopcntr = 1; if (count($groups) > 0) { ! $t->set_block('menugroup','subgroup-selector','subgroups'); foreach ($groups as $group) { $t->set_var("select_id", ($group === $grp ? 'id="current"' : '')); --- 451,455 ---- $outerloopcntr = 1; if (count($groups) > 0) { ! $t->set_block('menugroup', 'subgroup-selector', 'subgroups'); foreach ($groups as $group) { $t->set_var("select_id", ($group === $grp ? 'id="current"' : '')); *************** *** 504,508 **** $e['type'], $e['value'], ! $e['selectionArray']); } $this->_UI_get_fs($grp, $fs_contents, $fset, $t); --- 509,514 ---- $e['type'], $e['value'], ! $e['selectionArray'], false, ! $e['reset']); } $this->_UI_get_fs($grp, $fs_contents, $fset, $t); *************** *** 571,575 **** function _UI_get_conf_element($group, $name, $display_name, $type, $val, ! $selectionArray = null , $deletable = 0) { global $_CONF, $LANG_CONFIG; --- 577,582 ---- function _UI_get_conf_element($group, $name, $display_name, $type, $val, ! $selectionArray = null , $deletable = false, ! $allow_reset = false) { global $_CONF, $LANG_CONFIG; *************** *** 601,606 **** $t->set_var('delete', $t->parse('output', 'delete-button')); } else { ! //$t->set_var('unset_link', ! // "(X)"); if (($a = strrchr($name, '[')) !== FALSE) { $on = substr($a, 1, -1); --- 608,615 ---- $t->set_var('delete', $t->parse('output', 'delete-button')); } else { ! if ($allow_reset) { ! $t->set_var('unset_link', ! "(X)"); ! } if (($a = strrchr($name, '[')) !== FALSE) { $on = substr($a, 1, -1); *************** *** 667,671 **** $name . '[' . $valkey . ']', $display_name . '[' . $valkey . ']', ! substr($type, 1), $valval, $selectionArray); } return $result; --- 676,681 ---- $name . '[' . $valkey . ']', $display_name . '[' . $valkey . ']', ! substr($type, 1), $valval, $selectionArray, ! false); } return $result; *************** *** 832,835 **** --- 842,862 ---- return $retval; } + + /** + * Helper function: Fix escaped SQL requests for MS SQL, if necessary + * + */ + function _DB_escapedQuery($sql) + { + global $_DB, $_DB_dbms; + + if ($_DB_dbms == 'mssql') { + $sql_query = str_replace("\\'", "''", $sql_query); + $sql_query = str_replace('\\"', '"', $sql_query); + $_DB->dbQuery($sql, 0, 1); + } else { + DB_query($sql); + } + } } From dhaun at qs1489.pair.com Fri Jul 4 10:46:13 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 14:46:13 +0000 Subject: [geeklog-cvs] Geeklog-1.x/language english.php, 1.337, 1.338 english_utf-8.php, 1.121, 1.122 Message-ID: <20080704144613.0438B10FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/language In directory qs1489.pair.com:/tmp/cvs-serv5280/language Modified Files: english.php english_utf-8.php Log Message: Added a title to the (X) option Index: english.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english.php,v retrieving revision 1.337 retrieving revision 1.338 diff -C2 -d -r1.337 -r1.338 *** english.php 31 May 2008 19:49:35 -0000 1.337 --- english.php 4 Jul 2008 14:46:06 -0000 1.338 *************** *** 1571,1575 **** 'reset_form' => 'Reset Form', 'changes_made' => 'Changes were successfully made to', ! 'title' => 'Configuration Manager' ); --- 1571,1576 ---- 'reset_form' => 'Reset Form', 'changes_made' => 'Changes were successfully made to', ! 'title' => 'Configuration Manager', ! 'disable' => 'Click to disable this option' ); Index: english_utf-8.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english_utf-8.php,v retrieving revision 1.121 retrieving revision 1.122 diff -C2 -d -r1.121 -r1.122 *** english_utf-8.php 31 May 2008 19:49:35 -0000 1.121 --- english_utf-8.php 4 Jul 2008 14:46:06 -0000 1.122 *************** *** 1571,1575 **** 'reset_form' => 'Reset Form', 'changes_made' => 'Changes were successfully made to', ! 'title' => 'Configuration Manager' ); --- 1571,1576 ---- 'reset_form' => 'Reset Form', 'changes_made' => 'Changes were successfully made to', ! 'title' => 'Configuration Manager', ! 'disable' => 'Click to disable this option' ); From dhaun at qs1489.pair.com Fri Jul 4 10:46:13 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 14:46:13 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.44, 1.45 Message-ID: <20080704144614.50C6310FE15@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system/classes In directory qs1489.pair.com:/tmp/cvs-serv5280/system/classes Modified Files: config.class.php Log Message: Added a title to the (X) option Index: config.class.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** config.class.php 4 Jul 2008 13:21:25 -0000 1.44 --- config.class.php 4 Jul 2008 14:46:07 -0000 1.45 *************** *** 610,614 **** if ($allow_reset) { $t->set_var('unset_link', ! "(X)"); } if (($a = strrchr($name, '[')) !== FALSE) { --- 610,615 ---- if ($allow_reset) { $t->set_var('unset_link', ! "(X)"); } if (($a = strrchr($name, '[')) !== FALSE) { From dhaun at qs1489.pair.com Fri Jul 4 10:58:30 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 14:58:30 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html article.php,1.96,1.97 Message-ID: <20080704145831.B240210FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv7900/public_html Modified Files: article.php Log Message: Removed commented out code (again). The equivalent of this code is now in the story class. Index: article.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/article.php,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** article.php 18 May 2008 19:29:30 -0000 1.96 --- article.php 4 Jul 2008 14:57:56 -0000 1.97 *************** *** 127,135 **** } - /*$access = SEC_hasAccess ($A['owner_id'], $A['group_id'], - $A['perm_owner'], $A['perm_group'], $A['perm_members'], - $A['perm_anon']); - if (($access == 0) OR !SEC_hasTopicAccess ($A['tid']) OR - (($A['draft_flag'] == 1) AND !SEC_hasRights ('story.edit'))) {*/ if ($output == STORY_PERMISSION_DENIED) { $display .= COM_siteHeader ('menu', $LANG_ACCESS['accessdenied']) --- 127,130 ---- From dhaun at qs1489.pair.com Fri Jul 4 11:03:38 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 15:03:38 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls/language hebrew_utf-8.php, 1.1, 1.2 Message-ID: <20080704150338.A2CBB10FE14@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/polls/language In directory qs1489.pair.com:/tmp/cvs-serv8614/plugins/polls/language Modified Files: hebrew_utf-8.php Log Message: Updated Hebrew language file, provided by LWC Index: hebrew_utf-8.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/language/hebrew_utf-8.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hebrew_utf-8.php 3 Jun 2008 18:09:32 -0000 1.1 --- hebrew_utf-8.php 4 Jul 2008 15:03:13 -0000 1.2 *************** *** 66,70 **** 8 => '?????????? ?????????????? ?????????? ???? ??????????', 9 => '????????', ! 10 => '???????????? / ????????????', 11 => "?????? ?????????? ???????????? ???????? ???? ???????????? ???????? ???????? ???????? %s", 12 => "?????? ?????????? ???????????? ???????? ???? ???????? ???????? ???????? ???????? %s", --- 66,70 ---- 8 => '?????????? ?????????????? ?????????? ???? ??????????', 9 => '????????', ! 10 => '???????????? / ???????????? / ??????????', 11 => "?????? ?????????? ???????????? ???????? ???? ???????????? ???????? ???????? ???????? %s", 12 => "?????? ?????????? ???????????? ???????? ???? ???????? ???????? ???????? ???????? %s", From dhaun at qs1489.pair.com Fri Jul 4 11:03:38 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 15:03:38 +0000 Subject: [geeklog-cvs] Geeklog-1.x/language hebrew_utf-8.php,1.10,1.11 Message-ID: <20080704150338.9553910FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/language In directory qs1489.pair.com:/tmp/cvs-serv8614/language Modified Files: hebrew_utf-8.php Log Message: Updated Hebrew language file, provided by LWC Index: hebrew_utf-8.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/hebrew_utf-8.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** hebrew_utf-8.php 28 Jun 2008 15:06:20 -0000 1.10 --- hebrew_utf-8.php 4 Jul 2008 15:03:11 -0000 1.11 *************** *** 2,6 **** ############################################################################### ! # hebrew.php # last Update 26/6/2008 # Version 1.5.0 #1.0 # Copyright (C) http://lior.weissbrod.com --- 2,6 ---- ############################################################################### ! # hebrew.php # last Update 29/6/2008 # Version 1.5.0 #1.0 # Copyright (C) http://lior.weissbrod.com *************** *** 78,82 **** 33 => '?????????? ??????????, ???? ?????????? ?????????? ?????????? log', 34 => '??????????', ! 35 => '??????????', 36 => '????????:', 37 => '?????? ?????????? ????????????', --- 78,82 ---- 33 => '?????????? ??????????, ???? ?????????? ?????????? ?????????? log', 34 => '??????????', ! 35 => '?????????? ??????????????', 36 => '????????:', 37 => '?????? ?????????? ????????????', *************** *** 182,186 **** 1 => '?????????? ??????????', 2 => '?????? ??????????', ! 3 => '??????????????', 4 => '?????????? ??????????', 5 => '???? ??????????', --- 182,186 ---- 1 => '?????????? ??????????', 2 => '?????? ??????????', ! 3 => '?????????? ??????????????', 4 => '?????????? ??????????', 5 => '???? ??????????', *************** *** 589,593 **** 32 => '?????????? ????????????', 33 => '?????????? ???????????? ???? ??????????', ! 34 => '??????????????', 35 => '???? ???????? ???????????? ?? HTML', 36 => '?????? ??????????', --- 589,593 ---- 32 => '?????????? ????????????', 33 => '?????????? ???????????? ???? ??????????', ! 34 => '?????????? ??????????????', 35 => '???? ???????? ???????????? ?? HTML', 36 => '?????? ??????????', *************** *** 1750,1759 **** 'use_gravatar' => '?????????? ??-Gravatar?', 'gravatar_rating' => '???????????? ?????????????? Gravatar', ! 'force_photo_width' => '?????????? ???????? ??????????', ! 'default_photo' => '???????????? ?????????? ???? ????????????', 'commentspeedlimit' => '?????????? ???????????? ????????????', 'comment_limit' => '???????????? ????????????', 'comment_mode' => '?????? ????????????', ! 'comment_code' => '???????????? ?????????? ???? ????????????', 'passwordspeedlimit' => '?????????? ???????????? ??????????????', 'login_attempts' => '?????????? ?????????????????? ???? ?????????????? ????????????', --- 1750,1759 ---- 'use_gravatar' => '?????????? ??-Gravatar?', 'gravatar_rating' => '???????????? ?????????????? Gravatar', ! 'force_photo_width' => '???????? ???????? ??????????', ! 'default_photo' => '?????????? ?????????? ??????????', 'commentspeedlimit' => '?????????? ???????????? ????????????', 'comment_limit' => '???????????? ????????????', 'comment_mode' => '?????? ????????????', ! 'comment_code' => '?????????? ?????????? ???? ????????????', 'passwordspeedlimit' => '?????????? ???????????? ??????????????', 'login_attempts' => '?????????? ?????????????????? ???? ?????????????? ????????????', *************** *** 1780,1784 **** 'sg_site' => '??????', 'sg_stories' => '???????????? ??????????????????', ! 'sg_theme' => '???????? ??????????', 'sg_blocks' => '???????????? ????????', 'sg_users' => '?????????????? ????????????', --- 1780,1784 ---- 'sg_site' => '??????', 'sg_stories' => '???????????? ??????????????????', ! 'sg_theme' => '???????? ????????????', 'sg_blocks' => '???????????? ????????', 'sg_users' => '?????????????? ????????????', From dhaun at qs1489.pair.com Fri Jul 4 11:14:31 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 15:14:31 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.705,1.706 Message-ID: <20080704151431.5C6C110FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv10376/public_html Modified Files: lib-common.php Log Message: E_ALL fix Index: lib-common.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v retrieving revision 1.705 retrieving revision 1.706 diff -C2 -d -r1.705 -r1.706 *** lib-common.php 4 Jul 2008 13:16:07 -0000 1.705 --- lib-common.php 4 Jul 2008 15:14:28 -0000 1.706 *************** *** 6163,6184 **** $retval = ''; ! if( isset( $_SERVER['HTTP_ACCEPT_LANGUAGE'] )) ! { ! $accept = explode( ',', $_SERVER['HTTP_ACCEPT_LANGUAGE'] ); ! foreach( $accept as $l ) ! { ! $l = explode( ';', trim( $l )); $l = $l[0]; ! if( array_key_exists( $l, $_CONF['language_files'] )) ! { $retval = $_CONF['language_files'][$l]; break; ! } ! else ! { ! $l = explode( '-', $l ); $l = $l[0]; ! if( array_key_exists( $l, $_CONF['language_files'] )) ! { $retval = $_CONF['language_files'][$l]; break; --- 6163,6178 ---- $retval = ''; ! if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { ! $accept = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']); ! foreach ($accept as $l) { ! $l = explode(';', trim($l)); $l = $l[0]; ! if (array_key_exists($l, $_CONF['language_files'])) { $retval = $_CONF['language_files'][$l]; break; ! } else { ! $l = explode('-', $l); $l = $l[0]; ! if (array_key_exists($l, $_CONF['language_files'])) { $retval = $_CONF['language_files'][$l]; break; *************** *** 6186,6190 **** } } - } --- 6180,6183 ---- *************** *** 6204,6225 **** $langfile = ''; ! if( !empty( $_USER['language'] )) ! { $langfile = $_USER['language']; ! } ! else if( !empty( $_COOKIE[$_CONF['cookie_language']] )) ! { $langfile = $_COOKIE[$_CONF['cookie_language']]; ! } ! else ! { $langfile = COM_getLanguageFromBrowser(); } $langfile = COM_sanitizeFilename($langfile); ! if( !empty( $langfile )) ! { ! if( is_file( $_CONF['path_language'] . $langfile . '.php' )) ! { return $langfile; } --- 6197,6211 ---- $langfile = ''; ! if (!empty($_USER['language'])) { $langfile = $_USER['language']; ! } elseif (!empty($_COOKIE[$_CONF['cookie_language']])) { $langfile = $_COOKIE[$_CONF['cookie_language']]; ! } elseif (isset($_CONF['languages'])) { $langfile = COM_getLanguageFromBrowser(); } $langfile = COM_sanitizeFilename($langfile); ! if (!empty($langfile)) { ! if (is_file($_CONF['path_language'] . $langfile . '.php')) { return $langfile; } From dhaun at qs1489.pair.com Fri Jul 4 11:26:48 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 15:26:48 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html users.php,1.167,1.168 Message-ID: <20080704152648.AD99C10FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv12030/public_html Modified Files: users.php Log Message: E_ALL fix + CUSTOM_loginErrorHandler isn't supposed to return anything Index: users.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/users.php,v retrieving revision 1.167 retrieving revision 1.168 diff -C2 -d -r1.167 -r1.168 *** users.php 15 Mar 2008 08:57:15 -0000 1.167 --- users.php 4 Jul 2008 15:26:45 -0000 1.168 *************** *** 816,822 **** // Typically this will be used if you have a custom main site page // and need to control the login process ! $display .= CUSTOM_loginErrorHandler($msg); } else { ! $retval .= COM_siteHeader('menu', $message_title) . COM_startBlock($message_title, '', COM_getBlockTemplate('_msg_block', 'header')) --- 816,822 ---- // Typically this will be used if you have a custom main site page // and need to control the login process ! CUSTOM_loginErrorHandler($msg); } else { ! $retval = COM_siteHeader('menu', $message_title) . COM_startBlock($message_title, '', COM_getBlockTemplate('_msg_block', 'header')) From dhaun at qs1489.pair.com Fri Jul 4 11:59:21 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 15:59:21 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php, 1.706, 1.707 users.php, 1.168, 1.169 Message-ID: <20080704155922.E748D10FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv16447/public_html Modified Files: lib-common.php users.php Log Message: Disable OpenID login when new registrations are disabled Index: users.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/users.php,v retrieving revision 1.168 retrieving revision 1.169 diff -C2 -d -r1.168 -r1.169 *** users.php 4 Jul 2008 15:26:45 -0000 1.168 --- users.php 4 Jul 2008 15:59:19 -0000 1.169 *************** *** 659,663 **** // OpenID remote authentification. ! if ($_CONF['user_login_method']['openid'] && !$_CONF['usersubmission']) { $user_templates->set_file('openid_login', '../loginform_openid.thtml'); $user_templates->set_var('lang_openid_login', $LANG01[128]); --- 659,664 ---- // OpenID remote authentification. ! if ($_CONF['user_login_method']['openid'] && ($_CONF['usersubmission'] == 0) ! && !$_CONF['disable_new_user_registration']) { $user_templates->set_file('openid_login', '../loginform_openid.thtml'); $user_templates->set_var('lang_openid_login', $LANG01[128]); *************** *** 1061,1065 **** $status = SEC_remoteAuthentication($loginname, $passwd, $service, $uid); ! } elseif (($_CONF['usersubmission'] == 0) && $_CONF['user_login_method']['openid'] && (isset($_GET['openid_login']) && ($_GET['openid_login'] == '1'))) { // Here we go with the handling of OpenID authentification. --- 1062,1069 ---- $status = SEC_remoteAuthentication($loginname, $passwd, $service, $uid); ! } elseif ($_CONF['user_login_method']['openid'] && ! ($_CONF['usersubmission'] == 0) && ! !$_CONF['disable_new_user_registration'] && ! (isset($_GET['openid_login']) && ($_GET['openid_login'] == '1'))) { // Here we go with the handling of OpenID authentification. Index: lib-common.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v retrieving revision 1.706 retrieving revision 1.707 diff -C2 -d -r1.706 -r1.707 *** lib-common.php 4 Jul 2008 15:14:28 -0000 1.706 --- lib-common.php 4 Jul 2008 15:59:18 -0000 1.707 *************** *** 2372,2376 **** // OpenID remote authentification. ! if ($_CONF['user_login_method']['openid'] && !$_CONF['usersubmission']) { $login->set_file('openid_login', 'loginform_openid.thtml'); $login->set_var('lang_openid_login', $LANG01[128]); --- 2372,2376 ---- // OpenID remote authentification. ! if ($_CONF['user_login_method']['openid'] && ($_CONF['usersubmission'] == 0) && !$_CONF['disable_new_user_registration']) { $login->set_file('openid_login', 'loginform_openid.thtml'); $login->set_var('lang_openid_login', $LANG01[128]); From dhaun at qs1489.pair.com Fri Jul 4 13:26:49 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 17:26:49 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.707,1.708 Message-ID: <20080704172650.535A010FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv28166/public_html Modified Files: lib-common.php Log Message: Fixed my fix - don't spam the error.log ... Index: lib-common.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v retrieving revision 1.707 retrieving revision 1.708 diff -C2 -d -r1.707 -r1.708 *** lib-common.php 4 Jul 2008 15:59:18 -0000 1.707 --- lib-common.php 4 Jul 2008 17:26:47 -0000 1.708 *************** *** 6235,6247 **** } ! $lang_id = false; if (isset($_CONF['language_files'])) { $lang_id = array_search($language, $_CONF['language_files']); - } - if ($lang_id === false) { - // that looks like a misconfigured $_CONF['language_files'] array ... - COM_errorLog('Language "' . $language . '" not found in $_CONF[\'language_files\'] array!'); ! $lang_id = ''; // not much we can do here ... } --- 6235,6248 ---- } ! $lang_id = ''; if (isset($_CONF['language_files'])) { $lang_id = array_search($language, $_CONF['language_files']); ! if ($lang_id === false) { ! // that looks like a misconfigured $_CONF['language_files'] array ! COM_errorLog('Language "' . $language . '" not found in $_CONF[\'language_files\'] array!'); ! ! $lang_id = ''; // not much we can do here ... ! } } From dhaun at qs1489.pair.com Fri Jul 4 14:08:15 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 18:08:15 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin database.php, 1.49, 1.50 Message-ID: <20080704180815.2CA6510FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin In directory qs1489.pair.com:/tmp/cvs-serv35358/public_html/admin Modified Files: database.php Log Message: Hide the database password when the database backup failed and we're logging the mysqldump command Index: database.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/database.php,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** database.php 7 Jun 2008 12:41:44 -0000 1.49 --- database.php 4 Jul 2008 18:08:12 -0000 1.50 *************** *** 184,187 **** --- 184,192 ---- $command .= " $_DB_name > \"$backupfile\""; + $log_command = $command; + if (!empty($_DB_pass)) { + $log_command = str_replace(" -p$_DB_pass", ' -p*****', $command); + } + if (function_exists('is_executable')) { $canExec = is_executable($_DB_mysqldump_path); *************** *** 197,201 **** $retval .= COM_showMessage(94); COM_errorLog('Backup Filesize was less than 1kb', 1); ! COM_errorLog("Command used for mysqldump: $command", 1); } } else { --- 202,206 ---- $retval .= COM_showMessage(94); COM_errorLog('Backup Filesize was less than 1kb', 1); ! COM_errorLog("Command used for mysqldump: $log_command", 1); } } else { *************** *** 206,210 **** 'footer')); COM_errorLog('Backup Error: Bad path or mysqldump does not exist', 1); ! COM_errorLog("Command used for mysqldump: $command", 1); } } else { --- 211,215 ---- 'footer')); COM_errorLog('Backup Error: Bad path or mysqldump does not exist', 1); ! COM_errorLog("Command used for mysqldump: $log_command", 1); } } else { From dhaun at qs1489.pair.com Fri Jul 4 14:19:52 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 18:19:52 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.708,1.709 Message-ID: <20080704181952.0299810FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv37368/public_html Modified Files: lib-common.php Log Message: Send a HTTP status code 503 "Service Unavailable" when the site is disabled Index: lib-common.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v retrieving revision 1.708 retrieving revision 1.709 diff -C2 -d -r1.708 -r1.709 *** lib-common.php 4 Jul 2008 17:26:47 -0000 1.708 --- lib-common.php 4 Jul 2008 18:19:43 -0000 1.709 *************** *** 99,117 **** // Before we do anything else, check to ensure site is enabled ! if( isset( $_CONF['site_enabled'] ) && !$_CONF['site_enabled'] ) ! { ! if( empty( $_CONF['site_disabled_msg'] )) ! { ! echo $_CONF['site_name'] . ' is temporarily down. Please check back soon'; ! } ! else ! { // if the msg starts with http: assume it's a URL we should redirect to ! if( preg_match( "/^(https?):/", $_CONF['site_disabled_msg'] ) === 1 ) ! { ! echo COM_refresh( $_CONF['site_disabled_msg'] ); ! } ! else ! { echo $_CONF['site_disabled_msg']; } --- 99,115 ---- // Before we do anything else, check to ensure site is enabled ! if (isset($_CONF['site_enabled']) && !$_CONF['site_enabled']) { ! ! if (empty($_CONF['site_disabled_msg'])) { ! header("HTTP/1.1 503 Service Unavailable"); ! header("Status: 503 Service Unavailable"); ! echo $_CONF['site_name'] . ' is temporarily down. Please check back soon.'; ! } else { // if the msg starts with http: assume it's a URL we should redirect to ! if (preg_match("/^(https?):/", $_CONF['site_disabled_msg']) === 1) { ! echo COM_refresh($_CONF['site_disabled_msg']); ! } else { ! header("HTTP/1.1 503 Service Unavailable"); ! header("Status: 503 Service Unavailable"); echo $_CONF['site_disabled_msg']; } *************** *** 3968,3972 **** function COM_emailUserTopics() { ! global $_CONF, $_TABLES, $LANG08, $LANG24; $subject = strip_tags( $_CONF['site_name'] . $LANG08[30] . strftime( '%Y-%m-%d', time() )); --- 3966,3970 ---- function COM_emailUserTopics() { ! global $_CONF, $_TABLES, $LANG04, $LANG08, $LANG24; $subject = strip_tags( $_CONF['site_name'] . $LANG08[30] . strftime( '%Y-%m-%d', time() )); From mjervis at qs1489.pair.com Fri Jul 4 14:26:28 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Fri, 04 Jul 2008 18:26:28 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system/classes story.class.php, 1.30, 1.31 Message-ID: <20080704182628.880CE10FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system/classes In directory qs1489.pair.com:/tmp/cvs-serv38402/system/classes Modified Files: story.class.php Log Message: PHP 5.0 compatibility for story submissions (I think): http://www.geeklog.net/forum/viewtopic.php?showtopic=83570 Index: story.class.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** story.class.php 3 Jul 2008 19:44:31 -0000 1.30 --- story.class.php 4 Jul 2008 18:26:25 -0000 1.31 *************** *** 796,799 **** --- 796,800 ---- // Use what we have: $this->_tid = $topic; + $this->_date = time(); } *************** *** 806,809 **** --- 807,811 ---- $this->_expire = time(); + $this->_date = time(); $this->_expiredate = 0; From dhaun at qs1489.pair.com Fri Jul 4 16:58:34 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Fri, 04 Jul 2008 20:58:34 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs config.html, 1.89, 1.90 history, 1.679, 1.680 theme.html, 1.85, 1.86 Message-ID: <20080704205835.AA19B10FE12@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv55786/public_html/docs Modified Files: config.html history theme.html Log Message: Minor documentation updates Index: config.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/config.html,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** config.html 22 May 2008 19:55:32 -0000 1.89 --- config.html 4 Jul 2008 20:58:32 -0000 1.90 *************** *** 1200,1204 **** session_cookie_timeout 7200 ! Session cookie timeout (in seconds). cookie_path --- 1200,1204 ---- session_cookie_timeout 7200 ! Session cookie timeout in seconds (7200 = 2 hours). cookie_path Index: theme.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/theme.html,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** theme.html 1 Jun 2008 07:39:18 -0000 1.85 --- theme.html 4 Jul 2008 20:58:32 -0000 1.86 *************** *** 197,201 **** !

Theme changes in Geeklog 1.5.0

XHTML support

--- 197,222 ---- !

Theme changes in Geeklog 1.5.1

! !

Multilingual blocks

! !

The multi-language support for blocks introduced in Geeklog 1.5.1 relies on ! disabled blocks being swapped in dynamically. If you are using ! Geeklog's multi-language support, you may need to modify the piece of PHP code ! in your theme's functions.php so that it picks the correct templates ! for these multilingual blocks:

! ! 
$lang = COM_getLanguageId();
! if (empty($lang)) {
!     $result = DB_query("SELECT onleft,name FROM {$_TABLES['blocks']} WHERE is_enabled = 1");
! } else {
!     $result = DB_query("SELECT onleft,name FROM {$_TABLES['blocks']}");
! }
! !

Prior to Geeklog 1.5.1, you will probably only find the first SQL request ! in your functions.php file.

! ! !

Theme changes in Geeklog 1.5.0

XHTML support

Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.679 retrieving revision 1.680 diff -C2 -d -r1.679 -r1.680 *** history 4 Jul 2008 11:58:53 -0000 1.679 --- history 4 Jul 2008 20:58:32 -0000 1.680 *************** *** 4,7 **** --- 4,14 ---- ------------ + - Send a HTTP status code 503 "Service Unavailable" when the site is disabled + [Dirk] + - Hide the database password when the database backup failed and we're logging + the mysqldump command [Dirk] + - Disable OpenID login when new registrations are disabled [Dirk] + - Allow to unset Configuration options again after they have been "restored", + i.e. enabled (bug #0000664) [Dirk] - Adopted hack to allow multilingual blocks (bug #0000626) [Dirk] - Fixed SQL error in story submissions (reported by Chase) [Mike] From dhaun at qs1489.pair.com Sun Jul 6 16:15:14 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 06 Jul 2008 20:15:14 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/calendar index.php, 1.26, 1.27 Message-ID: <20080706201514.07D02F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/calendar In directory qs1489.pair.com:/tmp/cvs-serv61114/public_html/calendar Modified Files: index.php Log Message: Fixed Admin delete links in day and week view (bug #680) Index: index.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/calendar/index.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** index.php 23 May 2008 14:40:16 -0000 1.26 --- index.php 6 Jul 2008 20:15:10 -0000 1.27 *************** *** 220,224 **** function getDeleteImageLink($mode, $A, $token) { ! global $_CONF, $LANG_CAL_ADMIN, $LANG_CAL_2, $_IMAGE_TYPE; $retval = ''; --- 220,224 ---- function getDeleteImageLink($mode, $A, $token) { ! global $_CONF, $LANG_ADMIN, $LANG_CAL_2, $_IMAGE_TYPE; $retval = ''; *************** *** 239,245 **** $A['perm_group'], $A['perm_members'], $A['perm_anon']) == 3) { $retval = COM_createLink($img, $_CONF['site_admin_url'] ! . '/plugins/calendar/index.php?mode=' . $LANG_CAL_ADMIN[22] ! . '&eid=' . $A['eid'] . '&' . CSRF_TOKEN . '=' ! . $token); } } --- 239,245 ---- $A['perm_group'], $A['perm_members'], $A['perm_anon']) == 3) { $retval = COM_createLink($img, $_CONF['site_admin_url'] ! . '/plugins/calendar/index.php?mode=' ! . $LANG_ADMIN['delete'] . '&eid=' . $A['eid'] . '&' ! . CSRF_TOKEN . '=' . $token); } } From dhaun at qs1489.pair.com Sun Jul 6 16:17:01 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 06 Jul 2008 20:17:01 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/calendar functions.inc, 1.92, 1.93 Message-ID: <20080706201701.3DC20F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/calendar In directory qs1489.pair.com:/tmp/cvs-serv61586/plugins/calendar Modified Files: functions.inc Log Message: Search for author didn't work Index: functions.inc =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/functions.inc,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** functions.inc 3 Jul 2008 18:00:50 -0000 1.92 --- functions.inc 6 Jul 2008 20:16:59 -0000 1.93 *************** *** 940,945 **** * */ ! function CALENDAR_deleteOld() { global $_CONF, $LANG_CAL_ADMIN; $msg = ''; $event_list = array(); --- 940,947 ---- * */ ! function CALENDAR_deleteOld() ! { global $_CONF, $LANG_CAL_ADMIN; + $msg = ''; $event_list = array(); *************** *** 962,969 **** } } // Since this function is used for deletion only, its necessary to say that // zero were deleted instead of just leaving this message away. ! COM_numberFormat($c); // just in case we have more than 999).. $msg .= "{$LANG_CAL_ADMIN[36]}: $c\n"; return $msg; } --- 964,973 ---- } } + // Since this function is used for deletion only, its necessary to say that // zero were deleted instead of just leaving this message away. ! COM_numberFormat($c); // just in case we have more than 999 ... $msg .= "{$LANG_CAL_ADMIN[36]}: $c\n"; + return $msg; } *************** *** 1635,1638 **** --- 1639,1645 ---- } } + if (!empty($author)) { + $sql .= "AND (owner_id = '$author')"; + } $sql .= COM_getPermSQL ('AND'); $sql .= ' GROUP BY datestart, eid, title, description, location, dateend, timestart, timeend, allday, event_type ORDER BY datestart DESC '; From dhaun at qs1489.pair.com Sun Jul 6 16:18:24 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 06 Jul 2008 20:18:24 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.709,1.710 Message-ID: <20080706201824.91DE1F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv61811/public_html Modified Files: lib-common.php Log Message: Minor improvements in the error handling Index: lib-common.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v retrieving revision 1.709 retrieving revision 1.710 diff -C2 -d -r1.709 -r1.710 *** lib-common.php 4 Jul 2008 18:19:43 -0000 1.709 --- lib-common.php 6 Jul 2008 20:18:22 -0000 1.710 *************** *** 1931,1934 **** --- 1931,1938 ---- $timestamp = strftime( '%c' ); + if (!isset($_CONF['path_log']) && ($actionid != 2)) { + $actionid = 3; + } + switch( $actionid ) { *************** *** 1946,1950 **** break; ! case 2: $retval .= COM_startBlock( $LANG01[55] . ' ' . $timestamp, '', COM_getBlockTemplate( '_msg_block', 'header' )) --- 1950,1954 ---- break; ! case 2: $retval .= COM_startBlock( $LANG01[55] . ' ' . $timestamp, '', COM_getBlockTemplate( '_msg_block', 'header' )) *************** *** 1954,1957 **** --- 1958,1965 ---- break; + case 3: + $retval = nl2br($logentry); + break; + default: $logfile = $_CONF['path_log'] . 'error.log'; *************** *** 6475,6479 **** * If we have a root user, then output detailed error message: */ ! if( ( is_array($_USER) && function_exists('SEC_inGroup') ) || $_CONF['rootdebug'] ) { if($_CONF['rootdebug'] || SEC_inGroup('Root')) --- 6483,6487 ---- * If we have a root user, then output detailed error message: */ ! if( ( is_array($_USER) && function_exists('SEC_inGroup') ) || (isset($_CONF['rootdebug']) && $_CONF['rootdebug']) ) { if($_CONF['rootdebug'] || SEC_inGroup('Root')) *************** *** 6501,6505 **** if( array_key_exists('path_system', $_CONF) ) { ! require_once($_CONF['path_system'].'lib-custom.php'); if( function_exists('CUSTOM_handleError') ) { --- 6509,6515 ---- if( array_key_exists('path_system', $_CONF) ) { ! if (file_exists($_CONF['path_system'].'lib-custom.php')) { ! require_once($_CONF['path_system'].'lib-custom.php'); ! } if( function_exists('CUSTOM_handleError') ) { *************** *** 6514,6527 **** /* Does the theme implement an error message html file? */ ! if(file_exists($_CONF['path_layout'].'errormessage.html')) ! { // NOTE: NOT A TEMPLATE! JUST HTML! ! include($_CONF['path_layout'].'errormessage.html'); } else { /* Otherwise, display simple error message */ echo(" ! {$_CONF['site_name']} - An Error Occurred --- 6524,6541 ---- /* Does the theme implement an error message html file? */ ! if (!empty($_CONF['path_layout']) && ! file_exists($_CONF['path_layout'] . 'errormessage.html')) { // NOTE: NOT A TEMPLATE! JUST HTML! ! include $_CONF['path_layout'] . 'errormessage.html'; } else { /* Otherwise, display simple error message */ + $title = "An Error Occurred"; + if (!empty($_CONF['site_name'])) { + $title = $_CONF['site_name'] . ' - ' . $title; + } echo(" ! {$title} From dhaun at qs1489.pair.com Sun Jul 6 16:20:34 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 06 Jul 2008 20:20:34 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin user.php,1.206,1.207 Message-ID: <20080706202034.1886DF7410@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin In directory qs1489.pair.com:/tmp/cvs-serv62310/public_html/admin Modified Files: user.php Log Message: Allow creation of banned users Index: user.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/user.php,v retrieving revision 1.206 retrieving revision 1.207 diff -C2 -d -r1.206 -r1.207 *** user.php 7 Jun 2008 12:41:44 -0000 1.206 --- user.php 6 Jul 2008 20:20:32 -0000 1.207 *************** *** 68,72 **** * */ ! function GROUP_checkList ($table, $selection, $where='', $selected='', $orderby='') { global $_TABLES, $LANG_ACCESS; --- 68,72 ---- * */ ! function GROUP_checkList($table, $selection, $where='', $selected='', $orderby='') { global $_TABLES, $LANG_ACCESS; *************** *** 75,100 **** $sql = "SELECT $selection FROM $table"; ! if (!empty ($where)) { $sql .= " WHERE $where"; } ! if (!empty ($orderby)) { $sql .= " ORDER BY $orderby"; } ! $result = DB_query ($sql); ! $nrows = DB_numRows ($result); ! if (empty ($selected)) { ! $S = array (); } else { ! $S = explode (' ', $selected); } for ($i = 0; $i < $nrows; $i++) { ! $A = DB_fetchArray ($result, true); $readonly = false; $input = ''; $retval .= '' ! . $input . stripslashes ($A[1]) . '' . LB; } else { $input .= ' name="' . $table . '[]" value="' . $A[0] . '"'; ! $retval .= $input . XHTML . '>' . stripslashes ($A[1]) . '' . LB; } } --- 115,123 ---- . $A[0] . '" checked="checked"' . XHTML . '>'; $retval .= '' ! . $input . stripslashes($A[1]) . '' . LB; } else { $input .= ' name="' . $table . '[]" value="' . $A[0] . '"'; ! $retval .= $input . XHTML . '>' . stripslashes($A[1]) ! . '' . LB; } } *************** *** 269,287 **** $user_templates->set_var('do_not_use_spaces', ''); ! $statusarray = array (USER_ACCOUNT_AWAITING_ACTIVATION => $LANG28[43], ! USER_ACCOUNT_ACTIVE => $LANG28[45] ); $allow_ban = true; ! if ($A['uid'] == $_USER['uid']) { ! $allow_ban = false; // do not allow to ban yourself ! } else if (SEC_inGroup('Root',$A['uid'])) { // is this user a root user? ! $count_root_sql = "SELECT COUNT(ug_uid) AS root_count FROM {$_TABLES['group_assignments']} " ! . "WHERE ug_main_grp_id = 1 GROUP BY ug_uid;"; ! $count_root_result = DB_query($count_root_sql); ! $C = DB_fetchArray($count_root_result); // how many are left? ! if ($C['root_count'] < 2) { ! $allow_ban = false; // prevent banning the last root user } } --- 271,290 ---- $user_templates->set_var('do_not_use_spaces', ''); ! $statusarray = array(USER_ACCOUNT_AWAITING_ACTIVATION => $LANG28[43], ! USER_ACCOUNT_ACTIVE => $LANG28[45] ); $allow_ban = true; ! if (!empty($uid)) { ! if ($A['uid'] == $_USER['uid']) { ! $allow_ban = false; // do not allow to ban yourself ! } else if (SEC_inGroup('Root', $A['uid'])) { // editing a Root user? ! $count_root_sql = "SELECT COUNT(ug_uid) AS root_count FROM {$_TABLES['group_assignments']} WHERE ug_main_grp_id = 1 GROUP BY ug_uid;"; ! $count_root_result = DB_query($count_root_sql); ! $C = DB_fetchArray($count_root_result); // how many are left? ! if ($C['root_count'] < 2) { ! $allow_ban = false; // prevent banning the last root user ! } } } *************** *** 291,295 **** } ! if ($_CONF['usersubmission'] == 1) { $statusarray[USER_ACCOUNT_AWAITING_APPROVAL] = $LANG28[44]; } --- 294,298 ---- } ! if (($_CONF['usersubmission'] == 1) && !empty($uid)) { $statusarray[USER_ACCOUNT_AWAITING_APPROVAL] = $LANG28[44]; } *************** *** 524,530 **** $uid = USER_createAccount ($username, $email, $passwd, $fullname, $homepage); ! if (($uid > 1) && ($_CONF['usersubmission'] == 1)) { ! // we don't want to queue new users created by a User Admin ! DB_query ("UPDATE {$_TABLES['users']} SET status = " . USER_ACCOUNT_AWAITING_ACTIVATION . " WHERE uid = $uid"); } } else { --- 527,532 ---- $uid = USER_createAccount ($username, $email, $passwd, $fullname, $homepage); ! if ($uid > 1) { ! DB_query("UPDATE {$_TABLES['users']} SET status = $userstatus WHERE uid = $uid"); } } else { *************** *** 564,568 **** if( ($_CONF['usersubmission'] == 1) && ($oldstatus == USER_ACCOUNT_AWAITING_APPROVAL) && ($userstatus == USER_ACCOUNT_ACTIVE) ) { - //USER_sendActivationEmail($username, $email); USER_createAndSendPassword ($username, $email, $uid); } --- 566,569 ---- *************** *** 724,728 **** $user_templates->set_var ('lang_updatelist', $LANG28[66]); ! for ($i = 0; $i < count ($opt_arr); $i++) { $selector = ''; if ($usr_type == $opt_arr[$i]['sel']) { --- 725,730 ---- $user_templates->set_var ('lang_updatelist', $LANG28[66]); ! $num_opts = count($opt_arr); ! for ($i = 0; $i < $num_opts; $i++) { $selector = ''; if ($usr_type == $opt_arr[$i]['sel']) { *************** *** 1060,1064 **** addslashes ($emailAddr)); ! if ($ucount == 0 && $ecount == 0) { // user doesn't already exist $uid = USER_createAccount ($userName, $emailAddr, '', --- 1062,1066 ---- addslashes ($emailAddr)); ! if (($ucount == 0) && ($ecount == 0)) { // user doesn't already exist $uid = USER_createAccount ($userName, $emailAddr, '', From dhaun at qs1489.pair.com Sun Jul 6 16:38:17 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 06 Jul 2008 20:38:17 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.680,1.681 Message-ID: <20080706203817.023C7F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv64597/public_html/docs Modified Files: history Log Message: Updated list of changes Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.680 retrieving revision 1.681 diff -C2 -d -r1.680 -r1.681 *** history 4 Jul 2008 20:58:32 -0000 1.680 --- history 6 Jul 2008 20:38:15 -0000 1.681 *************** *** 4,7 **** --- 4,10 ---- ------------ + - Allow creation of banned users, i.e. ban the user on account creation [Dirk] + - Minor improvements in the error handling, e.g. preventing Geeklog from + creating error.log files outside the logs directory [Dirk] - Send a HTTP status code 503 "Service Unavailable" when the site is disabled [Dirk] *************** *** 40,43 **** --- 43,48 ---- Calendar plugin --------------- + - Fixed Admin delete links in day and week view (bug #0000680) [Dirk] + - Search for an event's "author" didn't work [Dirk] - Calendar block now includes events from the current day (in progress or all day events, bug 0000604, patch from forums) (really) [Mike] From dhaun at qs1489.pair.com Mon Jul 7 06:10:04 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Mon, 07 Jul 2008 10:10:04 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.45, 1.46 Message-ID: <20080707101004.4F41DF740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system/classes In directory qs1489.pair.com:/tmp/cvs-serv64600/system/classes Modified Files: config.class.php Log Message: $sql_query -> $sql for consistency (and to prevent stupid copy&paste errors like the one I made ...) Index: config.class.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** config.class.php 4 Jul 2008 14:46:07 -0000 1.45 --- config.class.php 7 Jul 2008 10:10:01 -0000 1.46 *************** *** 109,114 **** global $_TABLES; ! $sql_query = "SELECT name, value, group_name FROM {$_TABLES['conf_values']} WHERE (type <> 'subgroup') AND (type <> 'fieldset')"; ! $result = DB_query($sql_query); while ($row = DB_fetchArray($result)) { if ($row[1] !== 'unset') { --- 109,114 ---- global $_TABLES; ! $sql = "SELECT name, value, group_name FROM {$_TABLES['conf_values']} WHERE (type <> 'subgroup') AND (type <> 'fieldset')"; ! $result = DB_query($sql); while ($row = DB_fetchArray($result)) { if ($row[1] !== 'unset') { *************** *** 163,170 **** $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! $sql_query = "UPDATE {$_TABLES['conf_values']} " . ! "SET value = '{$escaped_val}' WHERE " . ! "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! $this->_DB_escapedQuery($sql_query); $this->config_array[$group][$name] = $value; $this->_post_configuration(); --- 163,170 ---- $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! $sql = "UPDATE {$_TABLES['conf_values']} " . ! "SET value = '{$escaped_val}' WHERE " . ! "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! $this->_DB_escapedQuery($sql); $this->config_array[$group][$name] = $value; $this->_post_configuration(); *************** *** 187,194 **** $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! $sql_query = "UPDATE {$_TABLES['conf_values']} " . ! "SET default_value = '{$escaped_val}' WHERE " . ! "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! $this->_DB_escapedQuery($sql_query); } --- 187,194 ---- $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! $sql = "UPDATE {$_TABLES['conf_values']} " . ! "SET default_value = '{$escaped_val}' WHERE " . ! "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! $this->_DB_escapedQuery($sql); } *************** *** 284,290 **** serialize($default_value)); $Qargs = array_map('addslashes', $Qargs); ! $sql_query = vsprintf($format, $Qargs); ! $this->_DB_escapedQuery($sql_query); $this->config_array[$group][$param_name] = $default_value; --- 284,290 ---- serialize($default_value)); $Qargs = array_map('addslashes', $Qargs); ! $sql = vsprintf($format, $Qargs); ! $this->_DB_escapedQuery($sql); $this->config_array[$group][$param_name] = $default_value; *************** *** 853,858 **** if ($_DB_dbms == 'mssql') { ! $sql_query = str_replace("\\'", "''", $sql_query); ! $sql_query = str_replace('\\"', '"', $sql_query); $_DB->dbQuery($sql, 0, 1); } else { --- 853,858 ---- if ($_DB_dbms == 'mssql') { ! $sql = str_replace("\\'", "''", $sql); ! $sql = str_replace('\\"', '"', $sql); $_DB->dbQuery($sql, 0, 1); } else { From dhaun at qs1489.pair.com Mon Jul 7 14:24:03 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Mon, 07 Jul 2008 18:24:03 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html submit.php,1.122,1.123 Message-ID: <20080707182403.855AFF740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv13387/public_html Modified Files: submit.php Log Message: Cosmetics Index: submit.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/submit.php,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** submit.php 24 Mar 2008 18:36:52 -0000 1.122 --- submit.php 7 Jul 2008 18:24:00 -0000 1.123 *************** *** 294,298 **** COM_updateSpeedlimit ('submit'); ! $result = $story->SaveSubmission(); if( $result == STORY_NO_ACCESS_TOPIC ) { --- 294,298 ---- COM_updateSpeedlimit ('submit'); ! $result = $story->saveSubmission(); if( $result == STORY_NO_ACCESS_TOPIC ) { From dhaun at qs1489.pair.com Mon Jul 7 14:25:37 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Mon, 07 Jul 2008 18:25:37 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional style.css, 1.103, 1.104 Message-ID: <20080707182537.792D4F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional In directory qs1489.pair.com:/tmp/cvs-serv13594/public_html/layout/professional Modified Files: style.css Log Message: Minor syntactical / non-visible corrections (bug #0000683) Index: style.css =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/style.css,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** style.css 1 Jul 2008 19:52:59 -0000 1.103 --- style.css 7 Jul 2008 18:25:35 -0000 1.104 *************** *** 281,287 **** } /* Blocks *********************************************************************/ - .block-box-left { - margin:10px; - } .block-box-left, .block-box-right, --- 281,284 ---- *************** *** 994,1001 **** a.tooltip:hover { z-index:100; ! text-decoration:none } a.tooltip span { ! display: none } a.tooltip:hover span { --- 991,998 ---- a.tooltip:hover { z-index:100; ! text-decoration:none; } a.tooltip span { ! display: none; } a.tooltip:hover span { From dhaun at qs1489.pair.com Mon Jul 7 14:29:10 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Mon, 07 Jul 2008 18:29:10 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system lib-comment.php,1.65,1.66 Message-ID: <20080707182910.76245F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system In directory qs1489.pair.com:/tmp/cvs-serv13936/system Modified Files: lib-comment.php Log Message: Signatures in HTML-formatted comments weren't XHTML compliant Index: lib-comment.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-comment.php,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** lib-comment.php 23 May 2008 10:50:50 -0000 1.65 --- lib-comment.php 7 Jul 2008 18:29:08 -0000 1.66 *************** *** 720,724 **** if (!empty ($sig)) { if (($postmode == 'html') || ($fakepostmode == 'html')) { ! $newcomment .= '

---' . nl2br ($sig); } else { $newcomment .= LB . LB . '---' . LB . $sig; --- 720,725 ---- if (!empty ($sig)) { if (($postmode == 'html') || ($fakepostmode == 'html')) { ! $newcomment .= '

---' . nl2br($sig) ! . '

'; } else { $newcomment .= LB . LB . '---' . LB . $sig; *************** *** 921,925 **** if (!empty ($sig)) { if ($postmode == 'html') { ! $comment .= '

---' . nl2br($sig); } else { $comment .= LB . LB . '---' . LB . $sig; --- 922,926 ---- if (!empty ($sig)) { if ($postmode == 'html') { ! $comment .= '

---' . nl2br($sig) . '

'; } else { $comment .= LB . LB . '---' . LB . $sig; From dhaun at qs1489.pair.com Tue Jul 8 14:42:58 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Tue, 08 Jul 2008 18:42:58 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.710,1.711 Message-ID: <20080708184258.767F9F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv47718/public_html Modified Files: lib-common.php Log Message: Terminate a user's session when they are being banned Index: lib-common.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v retrieving revision 1.710 retrieving revision 1.711 diff -C2 -d -r1.710 -r1.711 *** lib-common.php 6 Jul 2008 20:18:22 -0000 1.710 --- lib-common.php 8 Jul 2008 18:42:54 -0000 1.711 *************** *** 2780,2789 **** * used to be) more compatible than using a HTTP Location: header. * ! * @param string $url URL to send user to * */ function COM_refresh($url) { ! return "\n"; } --- 2780,2792 ---- * used to be) more compatible than using a HTTP Location: header. * ! * @param string $url URL to send user to ! * @return string HTML meta redirect ! * @note This does not need to be XHTML compliant. It may also be used ! * in situations where the XHTML constant is not defined yet ... * */ function COM_refresh($url) { ! return "\n"; } From dhaun at qs1489.pair.com Tue Jul 8 14:43:00 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Tue, 08 Jul 2008 18:43:00 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.681,1.682 Message-ID: <20080708184300.A20DBF7411@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv47718/public_html/docs Modified Files: history Log Message: Terminate a user's session when they are being banned Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.681 retrieving revision 1.682 diff -C2 -d -r1.681 -r1.682 *** history 6 Jul 2008 20:38:15 -0000 1.681 --- history 8 Jul 2008 18:42:54 -0000 1.682 *************** *** 4,7 **** --- 4,10 ---- ------------ + - End a user's session when they are being banned [Dirk] + - Signatures in HTML-formatted comments weren't XHTML compliant [Dirk] + - Minor cleanups in style.css - no actual layout changes (bug #0000683) [Dirk] - Allow creation of banned users, i.e. ban the user on account creation [Dirk] - Minor improvements in the error handling, e.g. preventing Geeklog from From dhaun at qs1489.pair.com Tue Jul 8 14:42:58 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Tue, 08 Jul 2008 18:42:58 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin user.php,1.207,1.208 Message-ID: <20080708184258.80997F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin In directory qs1489.pair.com:/tmp/cvs-serv47718/public_html/admin Modified Files: user.php Log Message: Terminate a user's session when they are being banned Index: user.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/user.php,v retrieving revision 1.207 retrieving revision 1.208 diff -C2 -d -r1.207 -r1.208 *** user.php 6 Jul 2008 20:20:32 -0000 1.207 --- user.php 8 Jul 2008 18:42:54 -0000 1.208 *************** *** 568,571 **** --- 568,574 ---- USER_createAndSendPassword ($username, $email, $uid); } + if ($userstatus == USER_ACCOUNT_DISABLED) { + SESS_endUserSession($uid); + } $userChanged = true; } From dhaun at qs1489.pair.com Tue Jul 8 14:43:00 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Tue, 08 Jul 2008 18:43:00 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system lib-security.php, 1.72, 1.73 lib-sessions.php, 1.45, 1.46 Message-ID: <20080708184300.96609F7410@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system In directory qs1489.pair.com:/tmp/cvs-serv47718/system Modified Files: lib-security.php lib-sessions.php Log Message: Terminate a user's session when they are being banned Index: lib-security.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-security.php,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** lib-security.php 29 Jun 2008 19:02:50 -0000 1.72 --- lib-security.php 8 Jul 2008 18:42:54 -0000 1.73 *************** *** 68,72 **** } ! /* Constants for acount stats */ define('USER_ACCOUNT_DISABLED', 0); // Account is banned/disabled define('USER_ACCOUNT_AWAITING_ACTIVATION', 1); // Account awaiting user to login. --- 68,72 ---- } ! /* Constants for account stats */ define('USER_ACCOUNT_DISABLED', 0); // Account is banned/disabled define('USER_ACCOUNT_AWAITING_ACTIVATION', 1); // Account awaiting user to login. *************** *** 733,736 **** --- 733,737 ---- * @param int $userid Valid uid value. * @return int user status, 0-3 + * @note May not return for banned/non-approved users. * */ *************** *** 744,753 **** // only do redirects if we aren't on users.php in a valid mode (logout or // default) ! if (strpos ($_SERVER['PHP_SELF'], 'users.php') === false) ! { $redirect = true; } else { ! if (empty($_REQUEST['mode']) || ($_REQUEST['mode'] == 'logout')) ! { $redirect = false; } else { --- 745,752 ---- // only do redirects if we aren't on users.php in a valid mode (logout or // default) ! if (strpos($_SERVER['PHP_SELF'], 'users.php') === false) { $redirect = true; } else { ! if (empty($_REQUEST['mode']) || ($_REQUEST['mode'] == 'logout')) { $redirect = false; } else { *************** *** 755,765 **** } } ! if ($status == USER_ACCOUNT_AWAITING_ACTIVATION) ! { DB_change($_TABLES['users'], 'status', USER_ACCOUNT_ACTIVE, 'uid', $userid); } elseif ($status == USER_ACCOUNT_AWAITING_APPROVAL) { // If we aren't on users.php with a default action then go to it ! if ($redirect) ! { COM_accessLog("SECURITY: Attempted Cookie Session login from user awaiting approval $userid."); echo COM_refresh($_CONF['site_url'] . '/users.php?msg=70'); --- 754,762 ---- } } ! if ($status == USER_ACCOUNT_AWAITING_ACTIVATION) { DB_change($_TABLES['users'], 'status', USER_ACCOUNT_ACTIVE, 'uid', $userid); } elseif ($status == USER_ACCOUNT_AWAITING_APPROVAL) { // If we aren't on users.php with a default action then go to it ! if ($redirect) { COM_accessLog("SECURITY: Attempted Cookie Session login from user awaiting approval $userid."); echo COM_refresh($_CONF['site_url'] . '/users.php?msg=70'); *************** *** 767,772 **** } } elseif ($status == USER_ACCOUNT_DISABLED) { ! if ($redirect) ! { COM_accessLog("SECURITY: Attempted Cookie Session login from banned user $userid."); echo COM_refresh($_CONF['site_url'] . '/users.php?msg=69'); --- 764,768 ---- } } elseif ($status == USER_ACCOUNT_DISABLED) { ! if ($redirect) { COM_accessLog("SECURITY: Attempted Cookie Session login from banned user $userid."); echo COM_refresh($_CONF['site_url'] . '/users.php?msg=69'); *************** *** 774,777 **** --- 770,775 ---- } } + + return $status; } Index: lib-sessions.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-sessions.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** lib-sessions.php 11 May 2008 07:25:08 -0000 1.45 --- lib-sessions.php 8 Jul 2008 18:42:54 -0000 1.46 *************** *** 109,123 **** if ($userid > 1) { // Check user status ! SEC_checkUserStatus($userid); ! $user_logged_in = 1; ! SESS_updateSessionTime($sessid, $_CONF['cookie_ip']); ! $userdata = SESS_getUserDataFromId($userid); ! if ($_SESS_VERBOSE) { ! COM_errorLog("Got " . count($userdata) . " pieces of data from userdata",1); ! COM_errorLog(COM_debug($userdata),1); ! // COM_debug($userdata); } - $_USER = $userdata; - $_USER['auto_login'] = false; } else { // Session probably expired, now check permanent cookie --- 109,126 ---- if ($userid > 1) { // Check user status ! $status = SEC_checkUserStatus($userid); ! if (($status == USER_ACCOUNT_ACTIVE) || ! ($status == USER_ACCOUNT_AWAITING_ACTIVATION)) { ! $user_logged_in = 1; ! ! SESS_updateSessionTime($sessid, $_CONF['cookie_ip']); ! $userdata = SESS_getUserDataFromId($userid); ! if ($_SESS_VERBOSE) { ! COM_errorLog("Got " . count($userdata) . " pieces of data from userdata", 1); ! COM_errorLog(COM_debug($userdata), 1); ! } ! $_USER = $userdata; ! $_USER['auto_login'] = false; } } else { // Session probably expired, now check permanent cookie *************** *** 139,149 **** } else if ($userid > 1) { // Check user status ! SEC_checkUserStatus ($userid); ! $user_logged_in = 1; ! $sessid = SESS_newSession ($userid, $_SERVER['REMOTE_ADDR'], $_CONF['session_cookie_timeout'], $_CONF['cookie_ip']); ! SESS_setSessionCookie ($sessid, $_CONF['session_cookie_timeout'], $_CONF['cookie_session'], $_CONF['cookie_path'], $_CONF['cookiedomain'], $_CONF['cookiesecure']); ! $userdata = SESS_getUserDataFromId ($userid); ! $_USER = $userdata; ! $_USER['auto_login'] = true; } } --- 142,156 ---- } else if ($userid > 1) { // Check user status ! $status = SEC_checkUserStatus ($userid); ! if (($status == USER_ACCOUNT_ACTIVE) || ! ($status == USER_ACCOUNT_AWAITING_ACTIVATION)) { ! $user_logged_in = 1; ! ! $sessid = SESS_newSession($userid, $_SERVER['REMOTE_ADDR'], $_CONF['session_cookie_timeout'], $_CONF['cookie_ip']); ! SESS_setSessionCookie($sessid, $_CONF['session_cookie_timeout'], $_CONF['cookie_session'], $_CONF['cookie_path'], $_CONF['cookiedomain'], $_CONF['cookiesecure']); ! $userdata = SESS_getUserDataFromId($userid); ! $_USER = $userdata; ! $_USER['auto_login'] = true; ! } } } *************** *** 180,192 **** } else if ($userid > 1) { // Check user status ! SEC_checkUserStatus ($userid); ! $user_logged_in = 1; ! // Create new session and write cookie ! $sessid = SESS_newSession ($userid, $_SERVER['REMOTE_ADDR'], $_CONF['session_cookie_timeout'], $_CONF['cookie_ip']); ! SESS_setSessionCookie ($sessid, $_CONF['session_cookie_timeout'], $_CONF['cookie_session'], $_CONF['cookie_path'], $_CONF['cookiedomain'], $_CONF['cookiesecure']); ! $userdata = SESS_getUserDataFromId ($userid); ! $_USER = $userdata; ! $_USER['auto_login'] = true; } } --- 187,202 ---- } else if ($userid > 1) { // Check user status ! $status = SEC_checkUserStatus($userid); ! if (($status == USER_ACCOUNT_ACTIVE) || ! ($status == USER_ACCOUNT_AWAITING_ACTIVATION)) { ! $user_logged_in = 1; ! // Create new session and write cookie ! $sessid = SESS_newSession($userid, $_SERVER['REMOTE_ADDR'], $_CONF['session_cookie_timeout'], $_CONF['cookie_ip']); ! SESS_setSessionCookie($sessid, $_CONF['session_cookie_timeout'], $_CONF['cookie_session'], $_CONF['cookie_path'], $_CONF['cookiedomain'], $_CONF['cookiesecure']); ! $userdata = SESS_getUserDataFromId($userid); ! $_USER = $userdata; ! $_USER['auto_login'] = true; ! } } } *************** *** 199,204 **** // Ensure $_USER is set to avoid warnings (path exposure...) ! if(isset($_USER)) ! { return $_USER; } else { --- 209,213 ---- // Ensure $_USER is set to avoid warnings (path exposure...) ! if (isset($_USER)) { return $_USER; } else { *************** *** 352,356 **** if ($_SESS_VERBOSE) { ! COM_errorLog("SQL in SESS_getUserIdFromSession is:\n $sql \n"); } --- 361,365 ---- if ($_SESS_VERBOSE) { ! COM_errorLog("SQL in SESS_getUserIdFromSession is:\n $sql\n"); } From dhaun at qs1489.pair.com Tue Jul 8 14:43:00 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Tue, 08 Jul 2008 18:43:00 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.681,1.682 Message-ID: <20080708184300.A20DBF7411@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv47718/public_html/docs Modified Files: history Log Message: Terminate a user's session when they are being banned Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.681 retrieving revision 1.682 diff -C2 -d -r1.681 -r1.682 *** history 6 Jul 2008 20:38:15 -0000 1.681 --- history 8 Jul 2008 18:42:54 -0000 1.682 *************** *** 4,7 **** --- 4,10 ---- ------------ + - End a user's session when they are being banned [Dirk] + - Signatures in HTML-formatted comments weren't XHTML compliant [Dirk] + - Minor cleanups in style.css - no actual layout changes (bug #0000683) [Dirk] - Allow creation of banned users, i.e. ban the user on account creation [Dirk] - Minor improvements in the error handling, e.g. preventing Geeklog from From dhaun at qs1489.pair.com Tue Jul 8 14:46:24 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Tue, 08 Jul 2008 18:46:24 +0000 Subject: [geeklog-cvs] Geeklog-1.x config.php, 1.260, NONE config.php.dist, 1.3, NONE Message-ID: <20080708184624.BE52FF740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x In directory qs1489.pair.com:/tmp/cvs-serv48067 Removed Files: config.php config.php.dist Log Message: So long, and thanks for all the fish --- config.php DELETED --- --- config.php.dist DELETED --- From dhaun at qs1489.pair.com Sat Jul 12 08:51:27 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 12 Jul 2008 12:51:27 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.682,1.683 Message-ID: <20080712125127.8854CF740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv75047/public_html/docs Modified Files: history Log Message: Fixed SQL error(s) for story submissions by users with story.submit but no further Story Admin permissions (reported by Orion) Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.682 retrieving revision 1.683 diff -C2 -d -r1.682 -r1.683 *** history 8 Jul 2008 18:42:54 -0000 1.682 --- history 12 Jul 2008 12:51:17 -0000 1.683 *************** *** 4,7 **** --- 4,9 ---- ------------ + - Fixed SQL error(s) for story submissions by users with story.submit but no + further Story Admin permissions (reported by Orion) [Dirk] - End a user's session when they are being banned [Dirk] - Signatures in HTML-formatted comments weren't XHTML compliant [Dirk] From dhaun at qs1489.pair.com Sat Jul 12 08:51:27 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 12 Jul 2008 12:51:27 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system/classes story.class.php, 1.31, 1.32 Message-ID: <20080712125127.85586F7411@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system/classes In directory qs1489.pair.com:/tmp/cvs-serv75047/system/classes Modified Files: story.class.php Log Message: Fixed SQL error(s) for story submissions by users with story.submit but no further Story Admin permissions (reported by Orion) Index: story.class.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** story.class.php 4 Jul 2008 18:26:25 -0000 1.31 --- story.class.php 12 Jul 2008 12:51:18 -0000 1.32 *************** *** 918,924 **** --- 918,927 ---- $this->_oldsid = $this->_sid; $this->_date = mktime(); + $this->_featured = 0; $this->_commentcode = $_CONF['comment_code']; $this->_trackbackcode = $_CONF['trackback_code']; + $this->_statuscode = 0; $this->_show_topic_icon = $_CONF['show_topic_icon']; + $this->_owner_id = $_USER['uid']; $this->_group_id = $T['group_id']; $this->_perm_owner = $T['perm_owner']; From dhaun at qs1489.pair.com Sat Jul 12 10:53:47 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 12 Jul 2008 14:53:47 +0000 Subject: [geeklog-cvs] Geeklog-1.x/sql mssql_tableanddata.php, 1.40, 1.41 mysql_tableanddata.php, 1.207, 1.208 Message-ID: <20080712145350.08B46F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/sql In directory qs1489.pair.com:/tmp/cvs-serv89871 Modified Files: mssql_tableanddata.php mysql_tableanddata.php Log Message: $_CONF is not defined when the db is filled - use the relative path to usersettings.php in the welcome story. Index: mssql_tableanddata.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/mssql_tableanddata.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** mssql_tableanddata.php 29 Jun 2008 19:05:06 -0000 1.40 --- mssql_tableanddata.php 12 Jul 2008 14:53:45 -0000 1.41 *************** *** 1701,1705 **** $_SQL[] = "INSERT INTO {$_TABLES['statuscodes']} (code, name) VALUES (10,'Archive')"; ! $_SQL[] = "INSERT INTO {$_TABLES['stories']} (sid, uid, draft_flag, tid, date, title, introtext, bodytext, hits, numemails, comments, related, featured, commentcode, statuscode, postmode, frontpage, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('welcome',2,0,'Geeklog',getdate(),'Welcome to Geeklog!','

Welcome and let me be the first to congratulate you on installing Geeklog. Please take the time to read everything in the docs directory. Geeklog now has enhanced, user-based security. You should thoroughly understand how these work before you run a production Geeklog Site.\r\r

To log into your new Geeklog site, please use this account:\r

Username: Admin
\rPassword: password

And don''t forget to change your password after logging in!','',100,1,0,'',1,0,0,'html',1,2,3,3,2,2,2)"; $_SQL[] = "INSERT INTO {$_TABLES['storysubmission']} (sid, uid, tid, title, introtext, date, postmode) VALUES ('security-reminder',2,'Geeklog','Are you secure?','

This is a reminder to secure your site once you have Geeklog up and running. What you should do:

\r\r
    \r
  1. Change the default password for the Admin account.
    2. \r
  2. Remove the install directory (you won''t need it any more).
    3. \r
',getdate(),'html')"; --- 1701,1705 ---- $_SQL[] = "INSERT INTO {$_TABLES['statuscodes']} (code, name) VALUES (10,'Archive')"; ! $_SQL[] = "INSERT INTO {$_TABLES['stories']} (sid, uid, draft_flag, tid, date, title, introtext, bodytext, hits, numemails, comments, related, featured, commentcode, statuscode, postmode, frontpage, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('welcome',2,0,'Geeklog',getdate(),'Welcome to Geeklog!','

Welcome and let me be the first to congratulate you on installing Geeklog. Please take the time to read everything in the docs directory. Geeklog now has enhanced, user-based security. You should thoroughly understand how these work before you run a production Geeklog Site.\r\r

To log into your new Geeklog site, please use this account:\r

Username: Admin
\rPassword: password

And don''t forget to change your password after logging in!','',100,1,0,'',1,0,0,'html',1,2,3,3,2,2,2)"; $_SQL[] = "INSERT INTO {$_TABLES['storysubmission']} (sid, uid, tid, title, introtext, date, postmode) VALUES ('security-reminder',2,'Geeklog','Are you secure?','

This is a reminder to secure your site once you have Geeklog up and running. What you should do:

\r\r
    \r
  1. Change the default password for the Admin account.
    2. \r
  2. Remove the install directory (you won''t need it any more).
    3. \r
',getdate(),'html')"; Index: mysql_tableanddata.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/mysql_tableanddata.php,v retrieving revision 1.207 retrieving revision 1.208 diff -C2 -d -r1.207 -r1.208 *** mysql_tableanddata.php 25 May 2008 09:47:04 -0000 1.207 --- mysql_tableanddata.php 12 Jul 2008 14:53:45 -0000 1.208 *************** *** 951,955 **** $_DATA[] = "INSERT INTO {$_TABLES['statuscodes']} (code, name) VALUES (10,'Archive') "; ! $_DATA[] = "INSERT INTO {$_TABLES['stories']} (sid, uid, draft_flag, tid, date, title, introtext, bodytext, hits, numemails, comments, related, featured, commentcode, statuscode, postmode, frontpage, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('welcome',2,0,'Geeklog',NOW(),'Welcome to Geeklog!','

Welcome and let me be the first to congratulate you on installing Geeklog. Please take the time to read everything in the docs directory. Geeklog now has enhanced, user-based security. You should thoroughly understand how these work before you run a production Geeklog Site.

\r

To log into your new Geeklog site, please use this account:

\r

Username: Admin
\rPassword: password

And don\'t forget to change your password after logging in!

','',100,1,0,'',1,0,0,'html',1,2,3,3,2,2,2) "; $_DATA[] = "INSERT INTO {$_TABLES['storysubmission']} (sid, uid, tid, title, introtext, date, postmode) VALUES ('security-reminder',2,'Geeklog','Are you secure?','

This is a reminder to secure your site once you have Geeklog up and running. What you should do:

\r\r
    \r
  1. Change the default password for the Admin account.
    2. \r
  2. Remove the install directory (you won\'t need it any more).
    3. \r
',NOW(),'html') "; --- 951,955 ---- $_DATA[] = "INSERT INTO {$_TABLES['statuscodes']} (code, name) VALUES (10,'Archive') "; ! $_DATA[] = "INSERT INTO {$_TABLES['stories']} (sid, uid, draft_flag, tid, date, title, introtext, bodytext, hits, numemails, comments, related, featured, commentcode, statuscode, postmode, frontpage, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('welcome',2,0,'Geeklog',NOW(),'Welcome to Geeklog!','

Welcome and let me be the first to congratulate you on installing Geeklog. Please take the time to read everything in the docs directory. Geeklog now has enhanced, user-based security. You should thoroughly understand how these work before you run a production Geeklog Site.

\r

To log into your new Geeklog site, please use this account:

\r

Username: Admin
\rPassword: password

And don\'t forget to change your password after logging in!

','',100,1,0,'',1,0,0,'html',1,2,3,3,2,2,2) "; $_DATA[] = "INSERT INTO {$_TABLES['storysubmission']} (sid, uid, tid, title, introtext, date, postmode) VALUES ('security-reminder',2,'Geeklog','Are you secure?','

This is a reminder to secure your site once you have Geeklog up and running. What you should do:

\r\r
    \r
  1. Change the default password for the Admin account.
    2. \r
  2. Remove the install directory (you won\'t need it any more).
    3. \r
',NOW(),'html') "; From geeklog-cvs at lists.geeklog.net Sat Jul 12 13:07:24 2008 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 12 Jul 2008 13:07:24 -0400 Subject: [geeklog-cvs] Geeklog-SoC: So long, and thanks for all the fish Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1c6ebe2c7c16 changeset: 6225:1c6ebe2c7c16 user: dirk at prospero.local date: Sat Jul 12 19:07:00 2008 +0200 description: So long, and thanks for all the fish diffstat: 2 files changed, 1933 deletions(-) config.php | 976 ------------------------------------------------------- config.php.dist | 957 ----------------------------------------------------- diffs (truncated from 1941 to 300 lines): diff -r b19508403571 -r 1c6ebe2c7c16 config.php --- a/config.php Tue Jul 01 17:04:45 2008 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,976 +0,0 @@ - 'mail', // can be one of 'mail', 'sendmail', 'smtp' - - // sendmail parameters (only needed for 'backend' => 'sendmail') - 'sendmail_path' => '/usr/bin/sendmail', - 'sendmail_args' => '', - - // SMTP parameters (only needed for 'backend' => 'smtp') - 'host' => 'smtp.example.com', - 'port' => '25', - 'auth' => false, - 'username' => 'smtp-username', - 'password' => 'smtp-password' -); - -// +---------------------------------------------------------------------------+ -// | OTHER DATABASE SETTINGS | -// | | -// | Database type and database backup settings. | -// +---------------------------------------------------------------------------+ - -$_DB_dbms = 'mysql'; // can be either 'mysql' or 'mssql' (Microsoft SQL Server) - - -// the following options are for MySQL only - -// optional settings for making database backups from within Geeklog -$_CONF['allow_mysqldump'] = 1; // 1 = on, 0 = off - -// full path of the mysqldump executable (Windows users: add ".exe"!) -$_DB_mysqldump_path = '/usr/bin/mysqldump'; - -// additional options for mysqldump -// If you're using InnoDB tables, include '--single-transaction' or you -// may end up with inconsistent backups! -$_CONF['mysqldump_options'] = '-Q'; - - -// +---------------------------------------------------------------------------+ -// | SITE SETTINGS | -// | | -// | These settings help define your Geeklog site. | -// +---------------------------------------------------------------------------+ -$_CONF['theme'] = 'professional'; // default theme - -// List of entries that you want to see in the site's menu bar (if you're using -// a theme that uses the {menu_elements} variable in its header.thtml). -// Choose any combination of the following (order here = order in the menu). -$_CONF['menu_elements'] = array -( - // 'home', // link to homepage - 'contribute', // contribute / "submit a story" link - 'search', // link to advanced search - 'stats', // link to site stats - 'directory', // link to list of past stories - // 'prefs', // link to user's preferences - 'plugins' // links added by plugins, like {plg_menu_elements} - // 'custom' // for custom links (see lib-custom.php) -); - -// you shouldn't need to edit the following -$_CONF['layout_url'] = $_CONF['site_url'] . '/layout/' . $_CONF['theme']; -$_CONF['path_themes'] = $_CONF['path_html'] . 'layout/'; -$_CONF['path_layout'] = $_CONF['path_themes'] . $_CONF['theme'] . '/'; - -// stops new registrations if set to true. -$_CONF['disable_new_user_registration'] = false; // set to true to block users. - -// optional settings (1 = on, 0 = off) -$_CONF['allow_user_themes'] = 1; -$_CONF['allow_user_language'] = 1; -$_CONF['allow_user_photo'] = 1; // allow users to upload self-photo - -// Allow users to change their username (if set to 1). -$_CONF['allow_username_change'] = 0; - -// Allow users to delete their account (if set to 1). -$_CONF['allow_account_delete'] = 0; - -// hides the list of authors from the preferences -$_CONF['hide_author_exclusion'] = 0; - -// Used by COM_getDisplayName to return Members's Full Name else username -$_CONF['show_fullname'] = 0; // 1 = show user's full name - -// Used by COM_getDisplayName to return users remote login service, if they have one. -$_CONF['show_servicename'] = true; // Set to false to not show it. - -// +---------------------------------------------------------------------------+ -// | Support for custom user registration form and account details | -// | Requires custom functions to be written that can be placed in lib-custom | -// | Function hooks are in users.php, usersettings.php and admin/user.php | -// +---------------------------------------------------------------------------+ -$_CONF['custom_registration'] = false; // Set to true if you have custom code - -// +---------------------------------------------------------------------------+ -// | Support for various remote methods to create users and log in, | -// | in addition to the classic Geeklog-only internal account. | -// +---------------------------------------------------------------------------+ -$_CONF['user_login_method'] = array( - 'standard' => true, // Geeklog's built-in login method - // Note: can not be disabled yet - 'openid' => false, // Set to true to enable OpenID remote login support. - '3rdparty' => false // Set to true to enable various other remote - // authentification methods (requires custom classes in - // system/classes/authentication). -); - - -// +---------------------------------------------------------------------------+ -// | Define action to be taken by Spam-X module if spam detected | -// | Current Spam-X module supports two actions which can be combined | -// | Additional classes can be added as well as other plugin extensions | -// | Actions: 128 = ignore comment and redirect to homepage | -// | 8 = mail admin message | -// | 136 (SUM) ignore and email admin | -// +---------------------------------------------------------------------------+ -$_CONF['spamx'] = 128; // Default to ignore comment. - -// +---------------------------------------------------------------------------+ -// | Sort the links in the admin block and the admin panel. | -// +---------------------------------------------------------------------------+ -$_CONF['sort_admin'] = true; - -// +---------------------------------------------------------------------------+ -// | Path to user files relative to the $_CONF['site_url'] (no trailing slash) | -// | Relative Directory where the Editor Image Library store | -// +---------------------------------------------------------------------------+ -$_CONF_FCK['imagelibrary'] = '/images/library'; - -// +---------------------------------------------------------------------------+ -// | LOCALE SETTINGS | From dhaun at qs1489.pair.com Sun Jul 13 08:04:02 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 13 Jul 2008 12:04:02 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs install.html,1.55,1.56 Message-ID: <20080713120402.00060F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv30773/public_html/docs Modified Files: install.html Log Message: Prepare install script for post-1.5.0 upgrades Index: install.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/install.html,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** install.html 23 May 2008 15:22:57 -0000 1.55 --- install.html 13 Jul 2008 12:03:59 -0000 1.56 *************** *** 59,63 ****

  • Unpack the downloaded tarball file by running:

    !

    tar -zxvf geeklog-1.5.0.tar.gz

    Note: Some users have reported that WinZip corrupts certain Geeklog files during decompression. This will cause errors during the installation process. You are strongly urged not to use WinZip. Try 7-Zip or WinRAR if you must decompress the file locally.

    --- 59,63 ----

  • Unpack the downloaded tarball file by running:

    !

    tar -zxvf geeklog-1.5.1.tar.gz

    Note: Some users have reported that WinZip corrupts certain Geeklog files during decompression. This will cause errors during the installation process. You are strongly urged not to use WinZip. Try 7-Zip or WinRAR if you must decompress the file locally.

    *************** *** 67,73 ****
  • !

    Place the contents of geeklog-1.5.0/public_html/ into your web root directory on your web server. The web root directory is often named "public_html", "htdocs", or "www".

    !

    Next, place the remaining contents of geeklog-1.5.0/ into either the parent directory of your root web directory (recommended) or any other non public folder and the installation wizard will attempt to locate them automatically. If it cannot you will be asked to specify their paths during installation. This is done as a security measure to prevent access to Geeklog system files by Internet users.

    Note: If your hosting provider does not allow you to place files outside of your root web directory:

    --- 67,73 ----
  • !

    Place the contents of geeklog-1.5.1/public_html/ into your web root directory on your web server. The web root directory is often named "public_html", "htdocs", or "www".

    !

    Next, place the remaining contents of geeklog-1.5.1/ into either the parent directory of your root web directory (recommended) or any other non public folder and the installation wizard will attempt to locate them automatically. If it cannot you will be asked to specify their paths during installation. This is done as a security measure to prevent access to Geeklog system files by Internet users.

    Note: If your hosting provider does not allow you to place files outside of your root web directory:

    *************** *** 107,119 ****

  • Unpack the downloaded tarball file by running:

    !

    tar -zxvf geeklog-1.5.0.tar.gz

    Note: Some users have reported that WinZip corrupts certain Geeklog files during decompression. This will cause errors during the installation process. You are strongly urged not to use WinZip. Try 7-Zip or WinRAR if you must decompress the file locally.

  • !

    Place the contents of geeklog-1.5.0/ into the same directory your old installation was located. For instance, if your old Geeklog was in /usr/home/www/geeklog/, then your new installation should also be in /usr/home/www/geeklog/.

    • !
  • !

    When upgrading from Geeklog 1.4.1 or earlier: Put the config.php files from your old install back into their place now (the main config.php and those for the plugins). The install script will read these files during the upgrade to pre-populate the new Configuration admin panel with your settings. If you skip this step, you will end up with default settings for Geeklog and the pre-installed plugins.

  • --- 107,122 ----

  • Unpack the downloaded tarball file by running:

    !

    tar -zxvf geeklog-1.5.1.tar.gz

    Note: Some users have reported that WinZip corrupts certain Geeklog files during decompression. This will cause errors during the installation process. You are strongly urged not to use WinZip. Try 7-Zip or WinRAR if you must decompress the file locally.

  • !

    Place the contents of geeklog-1.5.1/ into the same directory your old installation was located. For instance, if your old Geeklog was in /usr/home/www/geeklog/, then your new installation should also be in /usr/home/www/geeklog/.

    • !
  • Depending on the version you're upgrading from: !
      !

    • When upgrading from Geeklog 1.4.1 or earlier: Put the config.php files from your old install back into their place now (the main config.php and those for the plugins). The install script will read these files during the upgrade to pre-populate the new Configuration admin panel with your settings. If you skip this step, you will end up with default settings for Geeklog and the pre-installed plugins.

      • !

    • When upgrading from Geeklog 1.5.0 or later: Put the db-config.php and siteconfig.php from your old install back into their place now, overwriting the files of the same name that came in the tarball. Otherwise, you would have to enter your database credentials and other information during the upgrade process again.

      • !
  • From dhaun at qs1489.pair.com Sun Jul 13 08:04:02 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 13 Jul 2008 12:04:02 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install index.php, 1.48, 1.49 Message-ID: <20080713120402.F10C3F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install In directory qs1489.pair.com:/tmp/cvs-serv30773/public_html/admin/install Modified Files: index.php Log Message: Prepare install script for post-1.5.0 upgrades Index: index.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** index.php 26 Jun 2008 21:33:42 -0000 1.48 --- index.php 13 Jul 2008 12:03:59 -0000 1.49 *************** *** 42,55 **** // this should help expose parse errors even when // display_errors is set to Off in php.ini ! if (function_exists ('ini_set')) { ! ini_set ('display_errors', '1'); } ! error_reporting (E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR); ! if (!defined ("LB")) { define("LB", "\n"); } ! if (!defined ('VERSION')) { ! define('VERSION', '1.5.0'); } if (!defined('XHTML')) { --- 42,55 ---- // this should help expose parse errors even when // display_errors is set to Off in php.ini ! if (function_exists('ini_set')) { ! ini_set('display_errors', '1'); } ! error_reporting(E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR); ! if (!defined("LB")) { define("LB", "\n"); } ! if (!defined('VERSION')) { ! define('VERSION', '1.5.1'); } if (!defined('XHTML')) { *************** *** 108,111 **** --- 108,215 ---- + /** + * Check if we can skip upgrade steps (post-1.5.0) + * + * If we're doing an upgrade from 1.5.0 or later and we have the necessary + * DB credentials, skip the forms and upgrade directly. + * + * @param string $dbconfig_path path to db-config.php + * @param string $siteconfig_path path to siteconfig.php + * @return string database version, if possible + * @note Will not return if upgrading from 1.5.0 or later. + * + */ + function INST_checkPost150Upgrade($dbconfig_path, $siteconfig_path) + { + global $_CONF, $_TABLES, $_DB, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass; + + require $dbconfig_path; + require $siteconfig_path; + + $connected = false; + $version = ''; + + switch ($_DB_dbms) { + case 'mysql': + $db_handle = @mysql_connect($_DB_host, $_DB_user, $_DB_pass); + if ($db_handle) { + $connected = @mysql_select_db($_DB_name, $db_handle); + } + break; + + case 'mssql': + $db_handle = @mssql_connect($_DB_host, $_DB_user, $_DB_pass); + if ($db_handle) { + $connected = @mssql_select_db($_DB_name, $db_handle); + } + break; + + default: + $connected = false; + break; + } + + if ($connected) { + require $_CONF['path_system'] . 'lib-database.php'; + + $version = INST_identifyGeeklogVersion(); + + switch ($_DB_dbms) { + case 'mysql': + @mysql_close($db_handle); + break; + + case 'mssql': + @mssql_close($db_handle); + break; + } + + if (!empty($version) && ($version != VERSION) && + (substr($version, 0, 4) == '1.5.')) { + + // this is a 1.5.x version, so upgrade directly + $req_string = 'index.php?mode=upgrade&step=3' + . '&dbconfig_path=' . $dbconfig_path + . '&version=' . $version; + + header('Location: ' . $req_string); + exit; + } + } + + return $version; + } + + + /** + * Set VERSION constant in siteconfig.php after successful upgrade + * + * @param string $siteconfig_path path to siteconfig.php + * @return void + * + */ + function INST_setVersion($siteconfig_path) + { + global $LANG_INSTALL; + + $siteconfig_file = fopen($siteconfig_path, 'r'); + $siteconfig_data = fread($siteconfig_file, filesize($siteconfig_path)); + fclose($siteconfig_file); + + $siteconfig_data = preg_replace + ( + '/define\s*\(\'VERSION\',[^;]*;/', + "define('VERSION', '" . VERSION . "');", + $siteconfig_data + ); + + $siteconfig_file = fopen($siteconfig_path, 'w'); + if (!fwrite($siteconfig_file, $siteconfig_data)) { + exit($LANG_INSTALL[26] . ' ' . $LANG_INSTALL[28]); + } + fclose($siteconfig_file); + } + + /* * Installer engine *************** *** 128,131 **** --- 232,247 ---- require_once $dbconfig_path; // Get the current DB info + if ($install_type == 'upgrade') { + $v = INST_checkPost150Upgrade($dbconfig_path, $siteconfig_path); + // will skip to step 3 if possible, otherwise return here + + if ($v == VERSION) { + // looks like we're already up to date + $display .= '

    ' . $LANG_INSTALL[74] . '

    ' . LB + . '

    ' . $LANG_INSTALL[75] . '

    '; + return; + } + } + // Set all the form values either with their defaults or with received POST data. // The only instance where you'd get POST data would be if the user has to *************** *** 430,434 **** } else { ! $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','1.3.8','1.3.9','1.3.10','1.3.11','1.4.0','1.4.1'); if (empty($curv)) { // If we were unable to determine the current GL --- 546,550 ---- } else { ! $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','1.3.8','1.3.9','1.3.10','1.3.11','1.4.0','1.4.1','1.5.0'); if (empty($curv)) { // If we were unable to determine the current GL *************** *** 609,631 **** if (INST_doDatabaseUpgrades($version, $use_innodb)) { ! // After updating the database we'll want to update some of the information from the form. ! $site_name = isset($_POST['site_name']) ? $_POST['site_name'] : (isset($_GET['site_name']) ? $_GET['site_name'] : '') ; ! $site_slogan = isset($_POST['site_slogan']) ? $_POST['site_slogan'] : (isset($_GET['site_slogan']) ? $_GET['site_slogan'] : '') ; ! $site_url = isset($_POST['site_url']) ? $_POST['site_url'] : (isset($_GET['site_url']) ? $_GET['site_url'] : '') ; ! $site_admin_url = isset($_POST['site_admin_url']) ? $_POST['site_admin_url'] : (isset($_GET['site_admin_url']) ? $_GET['site_admin_url'] : '') ; ! $site_mail = isset($_POST['site_mail']) ? $_POST['site_mail'] : (isset($_GET['site_mail']) ? $_GET['site_mail'] : '') ; ! $noreply_mail = isset($_POST['noreply_mail']) ? $_POST['noreply_mail'] : (isset($_GET['noreply_mail']) ? $_GET['noreply_mail'] : '') ; ! require_once $_CONF['path_system'] . 'classes/config.class.php'; ! $config = config::get_instance(); ! $config->set('site_name', urldecode($site_name)); ! $config->set('site_slogan', urldecode($site_slogan)); ! $config->set('site_url', urldecode($site_url)); ! $config->set('site_admin_url', urldecode($site_admin_url)); ! $config->set('site_mail', urldecode($site_mail)); ! $config->set('noreply_mail', urldecode($noreply_mail)); ! $config->set_default('default_photo', urldecode($site_url) . '/default.jpg'); ! INST_checkPlugins(); // Great, installation is complete, redirect to success page --- 725,749 ---- if (INST_doDatabaseUpgrades($version, $use_innodb)) { ! if (version_compare($version, '1.5.0') == -1) { ! // After updating the database we'll want to update some of the information from the form. ! $site_name = isset($_POST['site_name']) ? $_POST['site_name'] : (isset($_GET['site_name']) ? $_GET['site_name'] : '') ; ! $site_slogan = isset($_POST['site_slogan']) ? $_POST['site_slogan'] : (isset($_GET['site_slogan']) ? $_GET['site_slogan'] : '') ; ! $site_url = isset($_POST['site_url']) ? $_POST['site_url'] : (isset($_GET['site_url']) ? $_GET['site_url'] : '') ; ! $site_admin_url = isset($_POST['site_admin_url']) ? $_POST['site_admin_url'] : (isset($_GET['site_admin_url']) ? $_GET['site_admin_url'] : '') ; ! $site_mail = isset($_POST['site_mail']) ? $_POST['site_mail'] : (isset($_GET['site_mail']) ? $_GET['site_mail'] : '') ; ! $noreply_mail = isset($_POST['noreply_mail']) ? $_POST['noreply_mail'] : (isset($_GET['noreply_mail']) ? $_GET['noreply_mail'] : '') ; ! require_once $_CONF['path_system'] . 'classes/config.class.php'; ! $config = config::get_instance(); ! $config->set('site_name', urldecode($site_name)); ! $config->set('site_slogan', urldecode($site_slogan)); ! $config->set('site_url', urldecode($site_url)); ! $config->set('site_admin_url', urldecode($site_admin_url)); ! $config->set('site_mail', urldecode($site_mail)); ! $config->set('noreply_mail', urldecode($noreply_mail)); ! $config->set_default('default_photo', urldecode($site_url) . '/default.jpg'); ! INST_checkPlugins(); ! } // Great, installation is complete, redirect to success page *************** *** 784,787 **** --- 902,906 ---- case 'mysql': $test = array( + '1.5.1' => array("SELECT name FROM {$_TABLES['vars']} WHERE name = 'database_version'", 'database_version'), '1.5.0' => array("DESCRIBE {$_TABLES['storysubmission']} bodytext",''), '1.4.1' => array("SELECT ft_name FROM {$_TABLES['features']} WHERE ft_name = 'syndication.edit'", 'syndication.edit'), *************** *** 799,802 **** --- 918,922 ---- case 'mssql': $test = array( + '1.5.1' => array("SELECT name FROM {$_TABLES['vars']} WHERE name = 'database_version'", 'database_version'), '1.5.0' => array("DESCRIBE {$_TABLES['storysubmission']} bodytext",''), '1.4.1' => array("SELECT ft_name FROM {$_TABLES['features']} WHERE ft_name = 'syndication.edit'", 'syndication.edit') *************** *** 1484,1487 **** --- 1604,1615 ---- break; + case '1.5.0': + require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.5.0_to_1.5.1.php'; + INST_updateDB($_SQL); + + $current_gl_version = '1.5.1'; + $_SQL = ''; + break; + default: $done = true; *************** *** 1489,1495 **** } // delete the security check flag on every update to force the user // to run admin/sectest.php again ! DB_delete ($_TABLES['vars'], 'name', 'security_check'); return true; --- 1617,1627 ---- } + INST_setVersion($siteconfig_path); + // delete the security check flag on every update to force the user // to run admin/sectest.php again ! DB_delete($_TABLES['vars'], 'name', 'security_check'); ! ! DB_change($_TABLES['vars'], 'value', VERSION, 'name', 'database_version'); return true; From dhaun at qs1489.pair.com Sun Jul 13 08:04:08 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 13 Jul 2008 12:04:08 +0000 Subject: [geeklog-cvs] Geeklog-1.x/sql/updates mssql_1.5.0_to_1.5.1.php, NONE, 1.1 mysql_1.5.0_to_1.5.1.php, NONE, 1.1 Message-ID: <20080713120408.9960CF7412@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates In directory qs1489.pair.com:/tmp/cvs-serv30773/sql/updates Added Files: mssql_1.5.0_to_1.5.1.php mysql_1.5.0_to_1.5.1.php Log Message: Prepare install script for post-1.5.0 upgrades --- NEW FILE: mssql_1.5.0_to_1.5.1.php --- --- NEW FILE: mysql_1.5.0_to_1.5.1.php --- From dhaun at qs1489.pair.com Sun Jul 13 08:04:02 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 13 Jul 2008 12:04:02 +0000 Subject: [geeklog-cvs] Geeklog-1.x/sql mssql_tableanddata.php, 1.41, 1.42 mysql_tableanddata.php, 1.208, 1.209 Message-ID: <20080713120403.7C53DF7410@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/sql In directory qs1489.pair.com:/tmp/cvs-serv30773/sql Modified Files: mssql_tableanddata.php mysql_tableanddata.php Log Message: Prepare install script for post-1.5.0 upgrades Index: mssql_tableanddata.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/mssql_tableanddata.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** mssql_tableanddata.php 12 Jul 2008 14:53:45 -0000 1.41 --- mssql_tableanddata.php 13 Jul 2008 12:03:59 -0000 1.42 *************** *** 1736,1739 **** --- 1736,1740 ---- $_SQL[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('last_scheduled_run','')"; $_SQL[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('spamx.counter','0')"; + $_SQL[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('database_version','1.5.1')"; $_SQL[] = "INSERT INTO {$_TABLES['trackbackcodes']} (code, name) VALUES (0,'Trackback Enabled')"; Index: mysql_tableanddata.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/mysql_tableanddata.php,v retrieving revision 1.208 retrieving revision 1.209 diff -C2 -d -r1.208 -r1.209 *** mysql_tableanddata.php 12 Jul 2008 14:53:45 -0000 1.208 --- mysql_tableanddata.php 13 Jul 2008 12:03:59 -0000 1.209 *************** *** 983,986 **** --- 983,987 ---- $_DATA[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('last_scheduled_run','') "; $_DATA[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('spamx.counter','0') "; + $_DATA[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('database_version','1.5.1') "; $_DATA[] = "INSERT INTO {$_TABLES['trackbackcodes']} (code, name) VALUES (0,'Trackback Enabled') "; From dhaun at qs1489.pair.com Sun Jul 13 08:04:02 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 13 Jul 2008 12:04:02 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install index.php, 1.48, 1.49 Message-ID: <20080713120402.F10C3F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install In directory qs1489.pair.com:/tmp/cvs-serv30773/public_html/admin/install Modified Files: index.php Log Message: Prepare install script for post-1.5.0 upgrades Index: index.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** index.php 26 Jun 2008 21:33:42 -0000 1.48 --- index.php 13 Jul 2008 12:03:59 -0000 1.49 *************** *** 42,55 **** // this should help expose parse errors even when // display_errors is set to Off in php.ini ! if (function_exists ('ini_set')) { ! ini_set ('display_errors', '1'); } ! error_reporting (E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR); ! if (!defined ("LB")) { define("LB", "\n"); } ! if (!defined ('VERSION')) { ! define('VERSION', '1.5.0'); } if (!defined('XHTML')) { --- 42,55 ---- // this should help expose parse errors even when // display_errors is set to Off in php.ini ! if (function_exists('ini_set')) { ! ini_set('display_errors', '1'); } ! error_reporting(E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR); ! if (!defined("LB")) { define("LB", "\n"); } ! if (!defined('VERSION')) { ! define('VERSION', '1.5.1'); } if (!defined('XHTML')) { *************** *** 108,111 **** --- 108,215 ---- + /** + * Check if we can skip upgrade steps (post-1.5.0) + * + * If we're doing an upgrade from 1.5.0 or later and we have the necessary + * DB credentials, skip the forms and upgrade directly. + * + * @param string $dbconfig_path path to db-config.php + * @param string $siteconfig_path path to siteconfig.php + * @return string database version, if possible + * @note Will not return if upgrading from 1.5.0 or later. + * + */ + function INST_checkPost150Upgrade($dbconfig_path, $siteconfig_path) + { + global $_CONF, $_TABLES, $_DB, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass; + + require $dbconfig_path; + require $siteconfig_path; + + $connected = false; + $version = ''; + + switch ($_DB_dbms) { + case 'mysql': + $db_handle = @mysql_connect($_DB_host, $_DB_user, $_DB_pass); + if ($db_handle) { + $connected = @mysql_select_db($_DB_name, $db_handle); + } + break; + + case 'mssql': + $db_handle = @mssql_connect($_DB_host, $_DB_user, $_DB_pass); + if ($db_handle) { + $connected = @mssql_select_db($_DB_name, $db_handle); + } + break; + + default: + $connected = false; + break; + } + + if ($connected) { + require $_CONF['path_system'] . 'lib-database.php'; + + $version = INST_identifyGeeklogVersion(); + + switch ($_DB_dbms) { + case 'mysql': + @mysql_close($db_handle); + break; + + case 'mssql': + @mssql_close($db_handle); + break; + } + + if (!empty($version) && ($version != VERSION) && + (substr($version, 0, 4) == '1.5.')) { + + // this is a 1.5.x version, so upgrade directly + $req_string = 'index.php?mode=upgrade&step=3' + . '&dbconfig_path=' . $dbconfig_path + . '&version=' . $version; + + header('Location: ' . $req_string); + exit; + } + } + + return $version; + } + + + /** + * Set VERSION constant in siteconfig.php after successful upgrade + * + * @param string $siteconfig_path path to siteconfig.php + * @return void + * + */ + function INST_setVersion($siteconfig_path) + { + global $LANG_INSTALL; + + $siteconfig_file = fopen($siteconfig_path, 'r'); + $siteconfig_data = fread($siteconfig_file, filesize($siteconfig_path)); + fclose($siteconfig_file); + + $siteconfig_data = preg_replace + ( + '/define\s*\(\'VERSION\',[^;]*;/', + "define('VERSION', '" . VERSION . "');", + $siteconfig_data + ); + + $siteconfig_file = fopen($siteconfig_path, 'w'); + if (!fwrite($siteconfig_file, $siteconfig_data)) { + exit($LANG_INSTALL[26] . ' ' . $LANG_INSTALL[28]); + } + fclose($siteconfig_file); + } + + /* * Installer engine *************** *** 128,131 **** --- 232,247 ---- require_once $dbconfig_path; // Get the current DB info + if ($install_type == 'upgrade') { + $v = INST_checkPost150Upgrade($dbconfig_path, $siteconfig_path); + // will skip to step 3 if possible, otherwise return here + + if ($v == VERSION) { + // looks like we're already up to date + $display .= '

    ' . $LANG_INSTALL[74] . '

    ' . LB + . '

    ' . $LANG_INSTALL[75] . '

    '; + return; + } + } + // Set all the form values either with their defaults or with received POST data. // The only instance where you'd get POST data would be if the user has to *************** *** 430,434 **** } else { ! $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','1.3.8','1.3.9','1.3.10','1.3.11','1.4.0','1.4.1'); if (empty($curv)) { // If we were unable to determine the current GL --- 546,550 ---- } else { ! $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','1.3.8','1.3.9','1.3.10','1.3.11','1.4.0','1.4.1','1.5.0'); if (empty($curv)) { // If we were unable to determine the current GL *************** *** 609,631 **** if (INST_doDatabaseUpgrades($version, $use_innodb)) { ! // After updating the database we'll want to update some of the information from the form. ! $site_name = isset($_POST['site_name']) ? $_POST['site_name'] : (isset($_GET['site_name']) ? $_GET['site_name'] : '') ; ! $site_slogan = isset($_POST['site_slogan']) ? $_POST['site_slogan'] : (isset($_GET['site_slogan']) ? $_GET['site_slogan'] : '') ; ! $site_url = isset($_POST['site_url']) ? $_POST['site_url'] : (isset($_GET['site_url']) ? $_GET['site_url'] : '') ; ! $site_admin_url = isset($_POST['site_admin_url']) ? $_POST['site_admin_url'] : (isset($_GET['site_admin_url']) ? $_GET['site_admin_url'] : '') ; ! $site_mail = isset($_POST['site_mail']) ? $_POST['site_mail'] : (isset($_GET['site_mail']) ? $_GET['site_mail'] : '') ; ! $noreply_mail = isset($_POST['noreply_mail']) ? $_POST['noreply_mail'] : (isset($_GET['noreply_mail']) ? $_GET['noreply_mail'] : '') ; ! require_once $_CONF['path_system'] . 'classes/config.class.php'; ! $config = config::get_instance(); ! $config->set('site_name', urldecode($site_name)); ! $config->set('site_slogan', urldecode($site_slogan)); ! $config->set('site_url', urldecode($site_url)); ! $config->set('site_admin_url', urldecode($site_admin_url)); ! $config->set('site_mail', urldecode($site_mail)); ! $config->set('noreply_mail', urldecode($noreply_mail)); ! $config->set_default('default_photo', urldecode($site_url) . '/default.jpg'); ! INST_checkPlugins(); // Great, installation is complete, redirect to success page --- 725,749 ---- if (INST_doDatabaseUpgrades($version, $use_innodb)) { ! if (version_compare($version, '1.5.0') == -1) { ! // After updating the database we'll want to update some of the information from the form. ! $site_name = isset($_POST['site_name']) ? $_POST['site_name'] : (isset($_GET['site_name']) ? $_GET['site_name'] : '') ; ! $site_slogan = isset($_POST['site_slogan']) ? $_POST['site_slogan'] : (isset($_GET['site_slogan']) ? $_GET['site_slogan'] : '') ; ! $site_url = isset($_POST['site_url']) ? $_POST['site_url'] : (isset($_GET['site_url']) ? $_GET['site_url'] : '') ; ! $site_admin_url = isset($_POST['site_admin_url']) ? $_POST['site_admin_url'] : (isset($_GET['site_admin_url']) ? $_GET['site_admin_url'] : '') ; ! $site_mail = isset($_POST['site_mail']) ? $_POST['site_mail'] : (isset($_GET['site_mail']) ? $_GET['site_mail'] : '') ; ! $noreply_mail = isset($_POST['noreply_mail']) ? $_POST['noreply_mail'] : (isset($_GET['noreply_mail']) ? $_GET['noreply_mail'] : '') ; ! require_once $_CONF['path_system'] . 'classes/config.class.php'; ! $config = config::get_instance(); ! $config->set('site_name', urldecode($site_name)); ! $config->set('site_slogan', urldecode($site_slogan)); ! $config->set('site_url', urldecode($site_url)); ! $config->set('site_admin_url', urldecode($site_admin_url)); ! $config->set('site_mail', urldecode($site_mail)); ! $config->set('noreply_mail', urldecode($noreply_mail)); ! $config->set_default('default_photo', urldecode($site_url) . '/default.jpg'); ! INST_checkPlugins(); ! } // Great, installation is complete, redirect to success page *************** *** 784,787 **** --- 902,906 ---- case 'mysql': $test = array( + '1.5.1' => array("SELECT name FROM {$_TABLES['vars']} WHERE name = 'database_version'", 'database_version'), '1.5.0' => array("DESCRIBE {$_TABLES['storysubmission']} bodytext",''), '1.4.1' => array("SELECT ft_name FROM {$_TABLES['features']} WHERE ft_name = 'syndication.edit'", 'syndication.edit'), *************** *** 799,802 **** --- 918,922 ---- case 'mssql': $test = array( + '1.5.1' => array("SELECT name FROM {$_TABLES['vars']} WHERE name = 'database_version'", 'database_version'), '1.5.0' => array("DESCRIBE {$_TABLES['storysubmission']} bodytext",''), '1.4.1' => array("SELECT ft_name FROM {$_TABLES['features']} WHERE ft_name = 'syndication.edit'", 'syndication.edit') *************** *** 1484,1487 **** --- 1604,1615 ---- break; + case '1.5.0': + require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.5.0_to_1.5.1.php'; + INST_updateDB($_SQL); + + $current_gl_version = '1.5.1'; + $_SQL = ''; + break; + default: $done = true; *************** *** 1489,1495 **** } // delete the security check flag on every update to force the user // to run admin/sectest.php again ! DB_delete ($_TABLES['vars'], 'name', 'security_check'); return true; --- 1617,1627 ---- } + INST_setVersion($siteconfig_path); + // delete the security check flag on every update to force the user // to run admin/sectest.php again ! DB_delete($_TABLES['vars'], 'name', 'security_check'); ! ! DB_change($_TABLES['vars'], 'value', VERSION, 'name', 'database_version'); return true; From dhaun at qs1489.pair.com Sun Jul 13 11:03:54 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 13 Jul 2008 15:03:54 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/links index.php,1.39,1.40 Message-ID: <20080713150355.1F42EF740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/links In directory qs1489.pair.com:/tmp/cvs-serv53940/public_html/links Modified Files: index.php Log Message: Fixed passing the category on multi-page link lists Index: index.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/links/index.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** index.php 1 Jul 2008 19:52:59 -0000 1.39 --- index.php 13 Jul 2008 15:03:52 -0000 1.40 *************** *** 314,325 **** } if ($pages > 0) { ! if (($_LI_CONF['linkcols'] > 0) && isset($currentcategory)) { ! $catlink = '?category=' . urlencode ($currentcategory); } else { $catlink = ''; } ! $linklist->set_var ('page_navigation', ! COM_printPageNavigation ($_CONF['site_url'] ! . '/links/index.php' . $catlink, $page, $pages)); } else { $linklist->set_var ('page_navigation', ''); --- 314,325 ---- } if ($pages > 0) { ! if (($_LI_CONF['linkcols'] > 0) && !empty($currentcid)) { ! $catlink = '?category=' . urlencode($currentcid); } else { $catlink = ''; } ! $linklist->set_var('page_navigation', ! COM_printPageNavigation($_CONF['site_url'] ! . '/links/index.php' . $catlink, $page, $pages)); } else { $linklist->set_var ('page_navigation', ''); From dhaun at qs1489.pair.com Sun Jul 13 11:03:54 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 13 Jul 2008 15:03:54 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.683,1.684 Message-ID: <20080713150354.0417EF740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv53940/public_html/docs Modified Files: history Log Message: Fixed passing the category on multi-page link lists Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.683 retrieving revision 1.684 diff -C2 -d -r1.683 -r1.684 *** history 12 Jul 2008 12:51:17 -0000 1.683 --- history 13 Jul 2008 15:03:51 -0000 1.684 *************** *** 55,58 **** --- 55,59 ---- Links plugin ------------ + - Fixed passing the category on multi-page link lists [Dirk] - Fixed new category silently overwriting an existing category if they had the same id (part 2 of bug #0000659) [Dirk] From dhaun at qs1489.pair.com Sun Jul 13 12:47:22 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 13 Jul 2008 16:47:22 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.711,1.712 Message-ID: <20080713164722.B03D3F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv66333/public_html Modified Files: lib-common.php Log Message: Introduced new variable {page_title_and_site_name} for header.thtml so that we can have "Site Name - Site Slogan" in the frontpage's title again Index: lib-common.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v retrieving revision 1.711 retrieving revision 1.712 diff -C2 -d -r1.711 -r1.712 *** lib-common.php 8 Jul 2008 18:42:54 -0000 1.711 --- lib-common.php 13 Jul 2008 16:47:19 -0000 1.712 *************** *** 984,987 **** --- 984,1001 ---- $header->set_var( 'site_name', $_CONF['site_name']); + if (COM_onFrontpage()) { + $title_and_name = $_CONF['site_name']; + if (!empty($pagetitle)) { + $title_and_name .= ' - ' . $pagetitle; + } + } else { + $title_and_name = ''; + if (!empty($pagetitle)) { + $title_and_name = $pagetitle . ' - '; + } + $title_and_name .= $_CONF['site_name']; + } + $header->set_var('page_title_and_site_name', $title_and_name); + $langAttr = ''; if( !empty( $_CONF['languages'] ) && !empty( $_CONF['language_files'] )) From dhaun at qs1489.pair.com Sun Jul 13 12:47:22 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 13 Jul 2008 16:47:22 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.684,1.685 Message-ID: <20080713164722.B720DF740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv66333/public_html/docs Modified Files: history Log Message: Introduced new variable {page_title_and_site_name} for header.thtml so that we can have "Site Name - Site Slogan" in the frontpage's title again Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.684 retrieving revision 1.685 diff -C2 -d -r1.684 -r1.685 *** history 13 Jul 2008 15:03:51 -0000 1.684 --- history 13 Jul 2008 16:47:20 -0000 1.685 *************** *** 4,7 **** --- 4,9 ---- ------------ + - Introduced new variable {page_title_and_site_name} for header.thtml so that + we can have "Site Name - Site Slogan" in the frontpage's title again [Dirk] - Fixed SQL error(s) for story submissions by users with story.submit but no further Story Admin permissions (reported by Orion) [Dirk] From dhaun at qs1489.pair.com Sun Jul 13 12:47:22 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 13 Jul 2008 16:47:22 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.684,1.685 Message-ID: <20080713164722.B720DF740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv66333/public_html/docs Modified Files: history Log Message: Introduced new variable {page_title_and_site_name} for header.thtml so that we can have "Site Name - Site Slogan" in the frontpage's title again Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.684 retrieving revision 1.685 diff -C2 -d -r1.684 -r1.685 *** history 13 Jul 2008 15:03:51 -0000 1.684 --- history 13 Jul 2008 16:47:20 -0000 1.685 *************** *** 4,7 **** --- 4,9 ---- ------------ + - Introduced new variable {page_title_and_site_name} for header.thtml so that + we can have "Site Name - Site Slogan" in the frontpage's title again [Dirk] - Fixed SQL error(s) for story submissions by users with story.submit but no further Story Admin permissions (reported by Orion) [Dirk] From dhaun at qs1489.pair.com Sun Jul 13 14:08:29 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 13 Jul 2008 18:08:29 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional header.thtml, 1.34, 1.35 Message-ID: <20080713180829.DF959F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional In directory qs1489.pair.com:/tmp/cvs-serv76000/public_html/layout/professional Modified Files: header.thtml Log Message: It would probably help if we actually used the new variable ... Index: header.thtml =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/header.thtml,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** header.thtml 2 Jan 2008 14:24:51 -0000 1.34 --- header.thtml 13 Jul 2008 18:08:27 -0000 1.35 *************** *** 2,6 **** ! {page_title}{page_site_splitter}{site_name} --- 2,6 ---- ! {page_title_and_site_name} From dhaun at qs1489.pair.com Sun Jul 13 14:08:51 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 13 Jul 2008 18:08:51 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs docstyle.css, 1.9, 1.10 theme.html, 1.86, 1.87 Message-ID: <20080713180851.EDE57F7410@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv76035/public_html/docs Modified Files: docstyle.css theme.html Log Message: Documentation update Index: docstyle.css =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/docstyle.css,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** docstyle.css 17 Jan 2007 06:02:42 -0000 1.9 --- docstyle.css 13 Jul 2008 18:08:49 -0000 1.10 *************** *** 89,93 **** .codeheader { font-family: Courier, "Courier New", monospace; } - a:link { color: #2222FF; background: transparent; } a:visited { color: #2222FF; background: transparent; } --- 89,92 ---- *************** *** 99,100 **** --- 98,105 ---- a[name] { color: black; background: transparent; } + a.wikipedia { + text-decoration:none; + color:black; + border-bottom:1px dotted black; + } + Index: theme.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/theme.html,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** theme.html 4 Jul 2008 20:58:32 -0000 1.86 --- theme.html 13 Jul 2008 18:08:49 -0000 1.87 *************** *** 217,220 **** --- 217,236 ---- in your functions.php file.

    +

    Other changes

    + +
      +
    • In Geeklog 1.5.0, the behaviour of the variable {page_title} + changed so that it now only contains the actual page title or the site's + slogan (in earlier versions, it contained both the site's name and either + the page title or the site's slogan). This was done so that the combination + {page_title}{page_site_splitter}{site_name} could be used + to place the page title before the site's name for better SEO. If you prefer + to have the site's name first on the index page and the page title first on + all other pages, you can now use the new variable + {page_title_and_site_name}
      • +
    +

    Theme changes in Geeklog 1.5.0

    *************** *** 441,446 **** This variable is supposed to be used by a plugin that implements CAPTCHAs and will simply be ! empty when no such plugin is installed.
    • --- 457,462 ---- This variable is supposed to be used by a plugin that implements CAPTCHAs ! and will simply be empty when no such plugin is installed. From dhaun at qs1489.pair.com Tue Jul 15 03:58:26 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Tue, 15 Jul 2008 07:58:26 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.42, 1.42.2.1 Message-ID: <20080715075826.8B402F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system/classes In directory qs1489.pair.com:/tmp/cvs-serv20161 Modified Files: Tag: geeklog_1_5_0_1 config.class.php Log Message: Ported fixes over from the Trunk: Allow $_CONF overrides in siteconfig.php (bug #673); allow disabling "restored" entries (bug #664) Index: config.class.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v retrieving revision 1.42 retrieving revision 1.42.2.1 diff -C2 -d -r1.42 -r1.42.2.1 *** config.class.php 14 Jun 2008 15:28:01 -0000 1.42 --- config.class.php 15 Jul 2008 07:58:23 -0000 1.42.2.1 *************** *** 103,107 **** * * @return array(string => mixed) This is a reference to the ! * config array */ function &initConfig() --- 103,107 ---- * * @return array(string => mixed) This is a reference to the ! * config array */ function &initConfig() *************** *** 109,117 **** global $_TABLES; ! $sql_query = "SELECT name, value, group_name FROM {$_TABLES['conf_values']} WHERE (type <> 'subgroup') AND (type <> 'fieldset')"; ! $result = DB_query($sql_query); while ($row = DB_fetchArray($result)) { if ($row[1] !== 'unset') { ! $this->config_array[$row[2]][$row[0]] = unserialize($row[1]); } } --- 109,120 ---- global $_TABLES; ! $sql = "SELECT name, value, group_name FROM {$_TABLES['conf_values']} WHERE (type <> 'subgroup') AND (type <> 'fieldset')"; ! $result = DB_query($sql); while ($row = DB_fetchArray($result)) { if ($row[1] !== 'unset') { ! if (!array_key_exists($row[2], $this->config_array) || ! !array_key_exists($row[0], $this->config_array[$row[2]])) { ! $this->config_array[$row[2]][$row[0]] = unserialize($row[1]); ! } } } *************** *** 155,173 **** function set($name, $value, $group='Core') { ! global $_TABLES, $_DB, $_DB_dbms; $escaped_val = addslashes(serialize($value)); $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! $sql_query = "UPDATE {$_TABLES['conf_values']} " . ! "SET value = '{$escaped_val}' WHERE " . ! "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! if ($_DB_dbms == 'mssql') { ! $sql_query = str_replace("\\'","''",$sql_query); ! $sql_query = str_replace('\\"','"',$sql_query); ! $_DB->dbQuery($sql_query, 0, 1); ! } else { ! DB_query($sql_query); ! } $this->config_array[$group][$name] = $value; $this->_post_configuration(); --- 158,170 ---- function set($name, $value, $group='Core') { ! global $_TABLES; $escaped_val = addslashes(serialize($value)); $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! $sql = "UPDATE {$_TABLES['conf_values']} " . ! "SET value = '{$escaped_val}' WHERE " . ! "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! $this->_DB_escapedQuery($sql); $this->config_array[$group][$name] = $value; $this->_post_configuration(); *************** *** 185,203 **** function set_default($name, $value, $group = 'Core') { ! global $_TABLES, $_DB, $_DB_dbms; $escaped_val = addslashes(serialize($value)); $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! $sql_query = "UPDATE {$_TABLES['conf_values']} " . ! "SET default_value = '{$escaped_val}' WHERE " . ! "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! if ($_DB_dbms == 'mssql') { ! $sql_query = str_replace("\\'", "''", $sql_query); ! $sql_query = str_replace('\\"', '"', $sql_query); ! $_DB->dbQuery($sql_query, 0, 1); ! } else { ! DB_query($sql_query); ! } } --- 182,194 ---- function set_default($name, $value, $group = 'Core') { ! global $_TABLES; $escaped_val = addslashes(serialize($value)); $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! $sql = "UPDATE {$_TABLES['conf_values']} " . ! "SET default_value = '{$escaped_val}' WHERE " . ! "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! $this->_DB_escapedQuery($sql); } *************** *** 208,214 **** $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! $sql = "UPDATE {$_TABLES['conf_values']} SET value = default_value " . ! "WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! DB_query($sql); } --- 199,215 ---- $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! ! $result = DB_query("SELECT value, default_value FROM {$_TABLES['conf_values']} WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"); ! list($value, $default_value) = DB_fetchArray($result); ! ! $sql = "UPDATE {$_TABLES['conf_values']} "; ! if ($value == 'unset') { ! $default_value = addslashes($default_value); ! $sql .= "SET value = '{$default_value}', default_value = 'unset:{$default_value}'"; ! } else { ! $sql .= "SET value = default_value"; ! } ! $sql .= " WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! $this->_DB_escapedQuery($sql); } *************** *** 219,225 **** $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! $sql = "UPDATE {$_TABLES['conf_values']} SET value = 'unset' " . ! "WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! DB_query($sql); } --- 220,232 ---- $escaped_name = addslashes($name); $escaped_grp = addslashes($group); ! $default_value = DB_getItem($_TABLES['conf_values'], 'default_value', ! "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"); ! $sql = "UPDATE {$_TABLES['conf_values']} SET value = 'unset'"; ! if (substr($default_value, 0, 6) == 'unset:') { ! $default_value = addslashes(substr($default_value, 6)); ! $sql .= ", default_value = '{$default_value}'"; ! } ! $sql .= " WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; ! $this->_DB_escapedQuery($sql); } *************** *** 255,262 **** * @param boolean $set whether or not this parameter is set */ ! function add( $param_name, $default_value, $type, $subgroup, $fieldset, $selection_array=null, $sort=0, $set=true, $group='Core') { ! global $_TABLES, $_DB, $_DB_dbms; $format = 'INSERT INTO %1$s (name, value, type, ' . --- 262,269 ---- * @param boolean $set whether or not this parameter is set */ ! function add($param_name, $default_value, $type, $subgroup, $fieldset, $selection_array=null, $sort=0, $set=true, $group='Core') { ! global $_TABLES; $format = 'INSERT INTO %1$s (name, value, type, ' . *************** *** 277,289 **** serialize($default_value)); $Qargs = array_map('addslashes', $Qargs); ! $sql_query = vsprintf($format, $Qargs); ! if ($_DB_dbms == 'mssql') { ! $sql_query = str_replace("\\'","''",$sql_query); ! $sql_query = str_replace('\\"','""',$sql_query); ! $_DB->dbQuery($sql_query, 0, 1); ! } else { ! DB_query($sql_query); ! } $this->config_array[$group][$param_name] = $default_value; --- 284,290 ---- serialize($default_value)); $Qargs = array_map('addslashes', $Qargs); ! $sql = vsprintf($format, $Qargs); ! $this->_DB_escapedQuery($sql); $this->config_array[$group][$param_name] = $default_value; *************** *** 297,301 **** { DB_delete($GLOBALS['_TABLES']['conf_values'], ! array("name","group_name"), array(addslashes($param_name), addslashes($group))); unset($this->config_array[$group][$param_name]); --- 298,302 ---- { DB_delete($GLOBALS['_TABLES']['conf_values'], ! array('name', 'group_name'), array(addslashes($param_name), addslashes($group))); unset($this->config_array[$group][$param_name]); *************** *** 313,317 **** $q_string = "SELECT name, type, selectionArray, " ! . "fieldset, value FROM {$_TABLES['conf_values']}" . " WHERE group_name='{$group}' AND subgroup='{$subgroup}' " . " AND (type <> 'fieldset' AND type <> 'subgroup') " . --- 314,318 ---- $q_string = "SELECT name, type, selectionArray, " ! . "fieldset, value, default_value FROM {$_TABLES['conf_values']}" . " WHERE group_name='{$group}' AND subgroup='{$subgroup}' " . " AND (type <> 'fieldset' AND type <> 'subgroup') " . *************** *** 327,330 **** --- 328,336 ---- while ($row = DB_fetchArray($Qresult)) { $cur = $row; + if (substr($cur[5], 0, 6) == 'unset:') { + $cur[5] = true; + } else { + $cur[5] = false; + } $res[$cur[3]][$cur[0]] = array('display_name' => *************** *** 341,345 **** 'value' => (($cur[4] == 'unset') ? ! 'unset' : unserialize($cur[4]))); } --- 347,352 ---- 'value' => (($cur[4] == 'unset') ? ! 'unset' : unserialize($cur[4])), ! 'reset' => $cur[5]); } *************** *** 444,448 **** $outerloopcntr = 1; if (count($groups) > 0) { ! $t->set_block('menugroup','subgroup-selector','subgroups'); foreach ($groups as $group) { $t->set_var("select_id", ($group === $grp ? 'id="current"' : '')); --- 451,455 ---- $outerloopcntr = 1; if (count($groups) > 0) { ! $t->set_block('menugroup', 'subgroup-selector', 'subgroups'); foreach ($groups as $group) { $t->set_var("select_id", ($group === $grp ? 'id="current"' : '')); *************** *** 502,506 **** $e['type'], $e['value'], ! $e['selectionArray']); } $this->_UI_get_fs($grp, $fs_contents, $fset, $t); --- 509,514 ---- $e['type'], $e['value'], ! $e['selectionArray'], false, ! $e['reset']); } $this->_UI_get_fs($grp, $fs_contents, $fset, $t); *************** *** 569,573 **** function _UI_get_conf_element($group, $name, $display_name, $type, $val, ! $selectionArray = null , $deletable = 0) { global $_CONF, $LANG_CONFIG; --- 577,582 ---- function _UI_get_conf_element($group, $name, $display_name, $type, $val, ! $selectionArray = null , $deletable = false, ! $allow_reset = false) { global $_CONF, $LANG_CONFIG; *************** *** 599,604 **** $t->set_var('delete', $t->parse('output', 'delete-button')); } else { ! //$t->set_var('unset_link', ! // "(X)"); if (($a = strrchr($name, '[')) !== FALSE) { $on = substr($a, 1, -1); --- 608,615 ---- $t->set_var('delete', $t->parse('output', 'delete-button')); } else { ! if ($allow_reset) { ! $t->set_var('unset_link', ! "(X)"); ! } if (($a = strrchr($name, '[')) !== FALSE) { $on = substr($a, 1, -1); *************** *** 665,669 **** $name . '[' . $valkey . ']', $display_name . '[' . $valkey . ']', ! substr($type, 1), $valval, $selectionArray); } return $result; --- 676,681 ---- $name . '[' . $valkey . ']', $display_name . '[' . $valkey . ']', ! substr($type, 1), $valval, $selectionArray, ! false); } return $result; *************** *** 830,833 **** --- 842,862 ---- return $retval; } + + /** + * Helper function: Fix escaped SQL requests for MS SQL, if necessary + * + */ + function _DB_escapedQuery($sql) + { + global $_DB, $_DB_dbms; + + if ($_DB_dbms == 'mssql') { + $sql = str_replace("\\'", "''", $sql); + $sql = str_replace('\\"', '"', $sql); + $_DB->dbQuery($sql, 0, 1); + } else { + DB_query($sql); + } + } } From dhaun at qs1489.pair.com Tue Jul 15 04:26:54 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Tue, 15 Jul 2008 08:26:54 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/links index.php, 1.38, 1.38.2.1 Message-ID: <20080715082654.B2C65F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/links In directory qs1489.pair.com:/tmp/cvs-serv23674 Modified Files: Tag: geeklog_1_5_0_1 index.php Log Message: Fixed passing the category on multi-page link lists (ported over from the Trunk) Index: index.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/links/index.php,v retrieving revision 1.38 retrieving revision 1.38.2.1 diff -C2 -d -r1.38 -r1.38.2.1 *** index.php 12 Jun 2008 19:45:26 -0000 1.38 --- index.php 15 Jul 2008 08:26:51 -0000 1.38.2.1 *************** *** 314,319 **** } if ($pages > 0) { ! if (($_LI_CONF['linkcols'] > 0) && isset($currentcategory)) { ! $catlink = '?category=' . urlencode ($currentcategory); } else { $catlink = ''; --- 314,319 ---- } if ($pages > 0) { ! if (($_LI_CONF['linkcols'] > 0) && !empty($currentcid)) { ! $catlink = '?category=' . urlencode($currentcid); } else { $catlink = ''; From dhaun at qs1489.pair.com Tue Jul 15 04:28:48 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Tue, 15 Jul 2008 08:28:48 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/calendar index.php, 1.26, 1.26.2.1 Message-ID: <20080715082848.A94E9F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/calendar In directory qs1489.pair.com:/tmp/cvs-serv23886 Modified Files: Tag: geeklog_1_5_0_1 index.php Log Message: Fixed Admin delete links in day and week view (bug #680; ported over from the Trunk) Index: index.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/calendar/index.php,v retrieving revision 1.26 retrieving revision 1.26.2.1 diff -C2 -d -r1.26 -r1.26.2.1 *** index.php 23 May 2008 14:40:16 -0000 1.26 --- index.php 15 Jul 2008 08:28:45 -0000 1.26.2.1 *************** *** 220,224 **** function getDeleteImageLink($mode, $A, $token) { ! global $_CONF, $LANG_CAL_ADMIN, $LANG_CAL_2, $_IMAGE_TYPE; $retval = ''; --- 220,224 ---- function getDeleteImageLink($mode, $A, $token) { ! global $_CONF, $LANG_ADMIN, $LANG_CAL_2, $_IMAGE_TYPE; $retval = ''; *************** *** 239,245 **** $A['perm_group'], $A['perm_members'], $A['perm_anon']) == 3) { $retval = COM_createLink($img, $_CONF['site_admin_url'] ! . '/plugins/calendar/index.php?mode=' . $LANG_CAL_ADMIN[22] ! . '&eid=' . $A['eid'] . '&' . CSRF_TOKEN . '=' ! . $token); } } --- 239,245 ---- $A['perm_group'], $A['perm_members'], $A['perm_anon']) == 3) { $retval = COM_createLink($img, $_CONF['site_admin_url'] ! . '/plugins/calendar/index.php?mode=' ! . $LANG_ADMIN['delete'] . '&eid=' . $A['eid'] . '&' ! . CSRF_TOKEN . '=' . $token); } } From dhaun at qs1489.pair.com Tue Jul 15 04:32:07 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Tue, 15 Jul 2008 08:32:07 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin database.php, 1.49, 1.49.2.1 Message-ID: <20080715083207.BF216F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin In directory qs1489.pair.com:/tmp/cvs-serv24240 Modified Files: Tag: geeklog_1_5_0_1 database.php Log Message: Hide the database password when the database backup failed and we're logging the mysqldump command (ported over from the Trunk) Index: database.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/database.php,v retrieving revision 1.49 retrieving revision 1.49.2.1 diff -C2 -d -r1.49 -r1.49.2.1 *** database.php 7 Jun 2008 12:41:44 -0000 1.49 --- database.php 15 Jul 2008 08:32:03 -0000 1.49.2.1 *************** *** 184,187 **** --- 184,192 ---- $command .= " $_DB_name > \"$backupfile\""; + $log_command = $command; + if (!empty($_DB_pass)) { + $log_command = str_replace(" -p$_DB_pass", ' -p*****', $command); + } + if (function_exists('is_executable')) { $canExec = is_executable($_DB_mysqldump_path); *************** *** 197,201 **** $retval .= COM_showMessage(94); COM_errorLog('Backup Filesize was less than 1kb', 1); ! COM_errorLog("Command used for mysqldump: $command", 1); } } else { --- 202,206 ---- $retval .= COM_showMessage(94); COM_errorLog('Backup Filesize was less than 1kb', 1); ! COM_errorLog("Command used for mysqldump: $log_command", 1); } } else { *************** *** 206,210 **** 'footer')); COM_errorLog('Backup Error: Bad path or mysqldump does not exist', 1); ! COM_errorLog("Command used for mysqldump: $command", 1); } } else { --- 211,215 ---- 'footer')); COM_errorLog('Backup Error: Bad path or mysqldump does not exist', 1); ! COM_errorLog("Command used for mysqldump: $log_command", 1); } } else { From geeklog-cvs at lists.geeklog.net Sat Jul 19 03:49:48 2008 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 19 Jul 2008 03:49:48 -0400 Subject: [geeklog-cvs] Geeklog-SoC: Ported fixes over from the Trunk: Allow $_CONF over... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5d8a28d64a81 changeset: 6227:5d8a28d64a81 user: dirk at prospero.local date: Sat Jul 19 09:48:58 2008 +0200 description: Ported fixes over from the Trunk: Allow $_CONF overrides in siteconfig.php (bug #673); allow disabling "restored" entries (bug #664) diffstat: 1 file changed, 81 insertions(+), 52 deletions(-) system/classes/config.class.php | 133 +++++++++++++++++++++++---------------- diffs (280 lines): diff -r 601b71c8131c -r 5d8a28d64a81 system/classes/config.class.php --- a/system/classes/config.class.php Fri Jul 18 00:17:33 2008 +0100 +++ b/system/classes/config.class.php Sat Jul 19 09:48:58 2008 +0200 @@ -29,7 +29,7 @@ // | | // +---------------------------------------------------------------------------+ // -// $Id: config.class.php,v 1.42 2008/06/14 15:28:01 dhaun Exp $ +// $Id: config.class.php,v 1.42.2.1 2008/07/15 07:58:23 dhaun Exp $ class config { var $dbconfig_file; @@ -102,17 +102,20 @@ * track of this reference, and the set function will mutate it. * * @return array(string => mixed) This is a reference to the - * config array + * config array */ function &initConfig() { global $_TABLES; - $sql_query = "SELECT name, value, group_name FROM {$_TABLES['conf_values']} WHERE (type <> 'subgroup') AND (type <> 'fieldset')"; - $result = DB_query($sql_query); + $sql = "SELECT name, value, group_name FROM {$_TABLES['conf_values']} WHERE (type <> 'subgroup') AND (type <> 'fieldset')"; + $result = DB_query($sql); while ($row = DB_fetchArray($result)) { if ($row[1] !== 'unset') { - $this->config_array[$row[2]][$row[0]] = unserialize($row[1]); + if (!array_key_exists($row[2], $this->config_array) || + !array_key_exists($row[0], $this->config_array[$row[2]])) { + $this->config_array[$row[2]][$row[0]] = unserialize($row[1]); + } } } $this->_post_configuration(); @@ -154,21 +157,15 @@ */ function set($name, $value, $group='Core') { - global $_TABLES, $_DB, $_DB_dbms; + global $_TABLES; $escaped_val = addslashes(serialize($value)); $escaped_name = addslashes($name); $escaped_grp = addslashes($group); - $sql_query = "UPDATE {$_TABLES['conf_values']} " . - "SET value = '{$escaped_val}' WHERE " . - "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; - if ($_DB_dbms == 'mssql') { - $sql_query = str_replace("\\'","''",$sql_query); - $sql_query = str_replace('\\"','"',$sql_query); - $_DB->dbQuery($sql_query, 0, 1); - } else { - DB_query($sql_query); - } + $sql = "UPDATE {$_TABLES['conf_values']} " . + "SET value = '{$escaped_val}' WHERE " . + "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; + $this->_DB_escapedQuery($sql); $this->config_array[$group][$name] = $value; $this->_post_configuration(); } @@ -184,21 +181,15 @@ */ function set_default($name, $value, $group = 'Core') { - global $_TABLES, $_DB, $_DB_dbms; + global $_TABLES; $escaped_val = addslashes(serialize($value)); $escaped_name = addslashes($name); $escaped_grp = addslashes($group); - $sql_query = "UPDATE {$_TABLES['conf_values']} " . - "SET default_value = '{$escaped_val}' WHERE " . - "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; - if ($_DB_dbms == 'mssql') { - $sql_query = str_replace("\\'", "''", $sql_query); - $sql_query = str_replace('\\"', '"', $sql_query); - $_DB->dbQuery($sql_query, 0, 1); - } else { - DB_query($sql_query); - } + $sql = "UPDATE {$_TABLES['conf_values']} " . + "SET default_value = '{$escaped_val}' WHERE " . + "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; + $this->_DB_escapedQuery($sql); } function restore_param($name, $group) @@ -207,9 +198,19 @@ $escaped_name = addslashes($name); $escaped_grp = addslashes($group); - $sql = "UPDATE {$_TABLES['conf_values']} SET value = default_value " . - "WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; - DB_query($sql); + + $result = DB_query("SELECT value, default_value FROM {$_TABLES['conf_values']} WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"); + list($value, $default_value) = DB_fetchArray($result); + + $sql = "UPDATE {$_TABLES['conf_values']} "; + if ($value == 'unset') { + $default_value = addslashes($default_value); + $sql .= "SET value = '{$default_value}', default_value = 'unset:{$default_value}'"; + } else { + $sql .= "SET value = default_value"; + } + $sql .= " WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; + $this->_DB_escapedQuery($sql); } function unset_param($name, $group) @@ -218,9 +219,15 @@ $escaped_name = addslashes($name); $escaped_grp = addslashes($group); - $sql = "UPDATE {$_TABLES['conf_values']} SET value = 'unset' " . - "WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; - DB_query($sql); + $default_value = DB_getItem($_TABLES['conf_values'], 'default_value', + "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"); + $sql = "UPDATE {$_TABLES['conf_values']} SET value = 'unset'"; + if (substr($default_value, 0, 6) == 'unset:') { + $default_value = addslashes(substr($default_value, 6)); + $sql .= ", default_value = '{$default_value}'"; + } + $sql .= " WHERE name = '{$escaped_name}' AND group_name = '{$escaped_grp}'"; + $this->_DB_escapedQuery($sql); } /** @@ -254,10 +261,10 @@ * * @param boolean $set whether or not this parameter is set */ - function add( $param_name, $default_value, $type, $subgroup, $fieldset, + function add($param_name, $default_value, $type, $subgroup, $fieldset, $selection_array=null, $sort=0, $set=true, $group='Core') { - global $_TABLES, $_DB, $_DB_dbms; + global $_TABLES; $format = 'INSERT INTO %1$s (name, value, type, ' . 'subgroup, group_name, selectionArray, sort_order,'. @@ -276,15 +283,9 @@ $fieldset, serialize($default_value)); $Qargs = array_map('addslashes', $Qargs); - $sql_query = vsprintf($format, $Qargs); + $sql = vsprintf($format, $Qargs); - if ($_DB_dbms == 'mssql') { - $sql_query = str_replace("\\'","''",$sql_query); - $sql_query = str_replace('\\"','""',$sql_query); - $_DB->dbQuery($sql_query, 0, 1); - } else { - DB_query($sql_query); - } + $this->_DB_escapedQuery($sql); $this->config_array[$group][$param_name] = $default_value; } @@ -296,7 +297,7 @@ function del($param_name, $group) { DB_delete($GLOBALS['_TABLES']['conf_values'], - array("name","group_name"), + array('name', 'group_name'), array(addslashes($param_name), addslashes($group))); unset($this->config_array[$group][$param_name]); } @@ -312,7 +313,7 @@ global $_TABLES, $LANG_confignames, $LANG_configselects; $q_string = "SELECT name, type, selectionArray, " - . "fieldset, value FROM {$_TABLES['conf_values']}" . + . "fieldset, value, default_value FROM {$_TABLES['conf_values']}" . " WHERE group_name='{$group}' AND subgroup='{$subgroup}' " . " AND (type <> 'fieldset' AND type <> 'subgroup') " . " ORDER BY fieldset,sort_order ASC"; @@ -326,6 +327,11 @@ } while ($row = DB_fetchArray($Qresult)) { $cur = $row; + if (substr($cur[5], 0, 6) == 'unset:') { + $cur[5] = true; + } else { + $cur[5] = false; + } $res[$cur[3]][$cur[0]] = array('display_name' => (array_key_exists($cur[0], $LANG_confignames[$group]) ? @@ -340,7 +346,8 @@ $LANG_configselects[$group][$cur[2]] : null), 'value' => (($cur[4] == 'unset') ? - 'unset' : unserialize($cur[4]))); + 'unset' : unserialize($cur[4])), + 'reset' => $cur[5]); } return $res; @@ -443,7 +450,7 @@ $groups = $this->_get_groups(); $outerloopcntr = 1; if (count($groups) > 0) { - $t->set_block('menugroup','subgroup-selector','subgroups'); + $t->set_block('menugroup', 'subgroup-selector', 'subgroups'); foreach ($groups as $group) { $t->set_var("select_id", ($group === $grp ? 'id="current"' : '')); $t->set_var("group_select_value", $group); @@ -501,7 +508,8 @@ $e['display_name'], $e['type'], $e['value'], - $e['selectionArray']); + $e['selectionArray'], false, + $e['reset']); } $this->_UI_get_fs($grp, $fs_contents, $fset, $t); } @@ -568,7 +576,8 @@ } function _UI_get_conf_element($group, $name, $display_name, $type, $val, - $selectionArray = null , $deletable = 0) + $selectionArray = null , $deletable = false, + $allow_reset = false) { global $_CONF, $LANG_CONFIG; @@ -598,8 +607,10 @@ if ($deletable) { $t->set_var('delete', $t->parse('output', 'delete-button')); } else { - //$t->set_var('unset_link', - // "(X)"); + if ($allow_reset) { + $t->set_var('unset_link', + "(X)"); + } if (($a = strrchr($name, '[')) !== FALSE) { $on = substr($a, 1, -1); $o = str_replace(array('[', ']'), array('_', ''), $name); @@ -664,7 +675,8 @@ $result .= config::_UI_get_conf_element($group, $name . '[' . $valkey . ']', $display_name . '[' . $valkey . ']', - substr($type, 1), $valval, $selectionArray); + substr($type, 1), $valval, $selectionArray, + false); } return $result; } elseif (strpos($type, "*") === 0 || strpos($type, "%") === 0) { @@ -829,6 +841,23 @@ return $retval; } + + /** + * Helper function: Fix escaped SQL requests for MS SQL, if necessary + * + */ + function _DB_escapedQuery($sql) + { + global $_DB, $_DB_dbms; + + if ($_DB_dbms == 'mssql') { + $sql = str_replace("\\'", "''", $sql); + $sql = str_replace('\\"', '"', $sql); + $_DB->dbQuery($sql, 0, 1); + } else { + DB_query($sql); + } + } } ?> From blaine at qs1489.pair.com Sat Jul 19 15:22:43 2008 From: blaine at qs1489.pair.com (Blaine Lang) Date: Sat, 19 Jul 2008 19:22:43 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.712,1.713 Message-ID: <20080719192244.9D4D1F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv52134 Modified Files: lib-common.php Log Message: Change to COM_showMessage to add a test for the $plugin parm. If the variable $plugin if not passed into the function, it may still be set in one of the $_REQUEST parms. This was a change suggested by jmucchiello - bugtracker #618 Index: lib-common.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v retrieving revision 1.712 retrieving revision 1.713 diff -C2 -d -r1.712 -r1.713 *** lib-common.php 13 Jul 2008 16:47:19 -0000 1.712 --- lib-common.php 19 Jul 2008 19:22:37 -0000 1.713 *************** *** 3845,3849 **** } } ! $retval .= '
    '; foreach( $html as $tag => $attr ) --- 3845,3849 ---- } } ! $retval .= '
    '; foreach( $html as $tag => $attr ) *************** *** 4440,4443 **** --- 4440,4446 ---- $retval = ''; + if (empty($plugin) AND !empty($_REQUEST['plugin'])) { + $plugin = COM_applyFilter($_REQUEST['plugin']); + }; if ($msg > 0) { From dhaun at qs1489.pair.com Sun Jul 20 06:32:59 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 20 Jul 2008 10:32:59 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history, 1.662.2.2, 1.662.2.3 Message-ID: <20080720103303.17979F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv93691/public_html/docs Modified Files: Tag: geeklog_1_5_0_1 history Log Message: Ported story submission / permission fixes over from the Trunk Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.662.2.2 retrieving revision 1.662.2.3 diff -C2 -d -r1.662.2.2 -r1.662.2.3 *** history 20 Jul 2008 10:25:00 -0000 1.662.2.2 --- history 20 Jul 2008 10:32:57 -0000 1.662.2.3 *************** *** 6,9 **** --- 6,14 ---- Geeklog 1.5.0-1 is a "bugfixes only" update for Geeklog 1.5.0 + - Fixed SQL error(s) for story submissions by users with story.submit but no + further Story Admin permissions (reported by Orion) [Dirk] + - Stories with a publishing date in the future and stories with the draft flag + set were accessible if you knew their story id (bug #0000678) [Mike] + - Fixed SQL error in story submissions (reported by Chase) [Mike] - Corrected error handling to prevent creation of error.log files outside the logs directory [Dirk] From dhaun at qs1489.pair.com Sun Jul 20 06:33:03 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 20 Jul 2008 10:33:03 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system/classes story.class.php, 1.27.2.1, 1.27.2.2 Message-ID: <20080720103304.EEAD0F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system/classes In directory qs1489.pair.com:/tmp/cvs-serv93691/system/classes Modified Files: Tag: geeklog_1_5_0_1 story.class.php Log Message: Ported story submission / permission fixes over from the Trunk Index: story.class.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v retrieving revision 1.27.2.1 retrieving revision 1.27.2.2 diff -C2 -d -r1.27.2.1 -r1.27.2.2 *** story.class.php 20 Jun 2008 19:10:38 -0000 1.27.2.1 --- story.class.php 20 Jul 2008 10:32:57 -0000 1.27.2.2 *************** *** 496,499 **** --- 496,501 ---- } elseif ($this->_access == 2 && $mode != 'view') { return STORY_EDIT_DENIED; + } elseif ((($this->_access == 2) && ($mode == 'view')) && (($this->_draft_flag == 1) || ($this->_date > time()))) { + return STORY_INVALID_SID; } } else { *************** *** 794,797 **** --- 796,800 ---- // Use what we have: $this->_tid = $topic; + $this->_date = time(); } *************** *** 802,805 **** --- 805,812 ---- { $array = $_POST; + + $this->_expire = time(); + $this->_date = time(); + $this->_expiredate = 0; // Handle Magic GPC Garbage: *************** *** 814,817 **** --- 821,828 ---- $this->_unixdate = COM_applyFilter($array['date'], true); + if (!isset($array['bodytext'])) { + $array['bodytext'] = ''; + } + /* Then load the title, intro and body */ if (($array['postmode'] == 'html') || ($array['postmode'] == 'adveditor')) { *************** *** 907,913 **** --- 918,927 ---- $this->_oldsid = $this->_sid; $this->_date = mktime(); + $this->_featured = 0; $this->_commentcode = $_CONF['comment_code']; $this->_trackbackcode = $_CONF['trackback_code']; + $this->_statuscode = 0; $this->_show_topic_icon = $_CONF['show_topic_icon']; + $this->_owner_id = $_USER['uid']; $this->_group_id = $T['group_id']; $this->_perm_owner = $T['perm_owner']; From dhaun at qs1489.pair.com Sun Jul 20 13:17:11 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 20 Jul 2008 17:17:11 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.685,1.686 Message-ID: <20080720171711.9CF88F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv15217/public_html/docs Modified Files: history Log Message: Provide nicer URLs to story search results when URL rewriting is enabled (bug #0000665) Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.685 retrieving revision 1.686 diff -C2 -d -r1.685 -r1.686 *** history 13 Jul 2008 16:47:20 -0000 1.685 --- history 20 Jul 2008 17:17:08 -0000 1.686 *************** *** 4,7 **** --- 4,10 ---- ------------ + - Provide nicer URLs to story search results when URL rewriting is enabled + (bug #0000665, based on a patch by Sami Barakat) [Dirk] + - Better support for plugin messages (bug #0000618) [Blaine] - Introduced new variable {page_title_and_site_name} for header.thtml so that we can have "Site Name - Site Slogan" in the frontpage's title again [Dirk] From dhaun at qs1489.pair.com Sun Jul 20 13:17:13 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 20 Jul 2008 17:17:13 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system/classes search.class.php, 1.66, 1.67 Message-ID: <20080720171713.BA165F7410@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system/classes In directory qs1489.pair.com:/tmp/cvs-serv15217/system/classes Modified Files: search.class.php Log Message: Provide nicer URLs to story search results when URL rewriting is enabled (bug #0000665) Index: search.class.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/search.class.php,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** search.class.php 11 May 2008 07:25:08 -0000 1.66 --- search.class.php 20 Jul 2008 17:17:09 -0000 1.67 *************** *** 304,313 **** $A['title'] = str_replace ('$', '$', $A['title']); $thetime = COM_getUserDateTimeFormat ($A['day']); ! if (empty($this->_query)) { ! $articleUrl = COM_buildUrl($_CONF['site_url'] ! . '/article.php?story=' . $A['sid']); ! } else { ! $articleUrl = $_CONF['site_url'] . '/article.php?story=' ! . $A['sid'] . '&query=' . urlencode($this->_query); } $author = htmlspecialchars($this->_displayName($A['username'], --- 304,312 ---- $A['title'] = str_replace ('$', '$', $A['title']); $thetime = COM_getUserDateTimeFormat ($A['day']); ! $articleUrl = COM_buildUrl($_CONF['site_url'] ! . '/article.php?story=' . $A['sid']); ! if (!empty($this->_query)) { ! $articleUrl .= (strpos($articleUrl, '?') ? '&' : '?') ! . 'query=' . urlencode($this->_query); } $author = htmlspecialchars($this->_displayName($A['username'], From dhaun at qs1489.pair.com Mon Jul 21 16:15:44 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Mon, 21 Jul 2008 20:15:44 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.686,1.687 Message-ID: <20080721201544.D8B48F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv92103/public_html/docs Modified Files: history Log Message: Keep letter case intact when highlighting a search query string (patch provided by Sami Barakat) Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.686 retrieving revision 1.687 diff -C2 -d -r1.686 -r1.687 *** history 20 Jul 2008 17:17:08 -0000 1.686 --- history 21 Jul 2008 20:15:41 -0000 1.687 *************** *** 4,7 **** --- 4,9 ---- ------------ + - Keep letter case intact when highlighting a search query string (patch + provided by Sami Barakat) - Provide nicer URLs to story search results when URL rewriting is enabled (bug #0000665, based on a patch by Sami Barakat) [Dirk] From dhaun at qs1489.pair.com Mon Jul 21 16:15:44 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Mon, 21 Jul 2008 20:15:44 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.713,1.714 Message-ID: <20080721201544.B8571F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv92103/public_html Modified Files: lib-common.php Log Message: Keep letter case intact when highlighting a search query string (patch provided by Sami Barakat) Index: lib-common.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v retrieving revision 1.713 retrieving revision 1.714 diff -C2 -d -r1.713 -r1.714 *** lib-common.php 19 Jul 2008 19:22:37 -0000 1.713 --- lib-common.php 21 Jul 2008 20:15:41 -0000 1.714 *************** *** 5709,5713 **** { $searchword = preg_quote( str_replace( "'", "\'", $searchword )); ! $text = preg_replace( '/(\>(((?>[^><]+)|(?R))*)\<)/ie', "preg_replace('/(?>$searchword+)/i','$searchword','\\0')", '' . $text . '' ); } } --- 5709,5713 ---- { $searchword = preg_quote( str_replace( "'", "\'", $searchword )); ! $text = preg_replace( '/(\>(((?>[^><]+)|(?R))*)\<)/ie', "preg_replace('/(?>$searchword+)/i','\\\\0','\\0')", '' . $text . '' ); } } From dhaun at qs1489.pair.com Wed Jul 23 15:34:15 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Wed, 23 Jul 2008 19:34:15 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system lib-webservices.php,1.38,1.39 Message-ID: <20080723193415.EBDF1F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system In directory qs1489.pair.com:/tmp/cvs-serv12341/system Modified Files: lib-webservices.php Log Message: Improved compatibility with AtomPub clients, e.g. MarsEdit Index: lib-webservices.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-webservices.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** lib-webservices.php 28 Jun 2008 19:37:40 -0000 1.38 --- lib-webservices.php 23 Jul 2008 19:34:13 -0000 1.39 *************** *** 467,470 **** --- 467,471 ---- switch ($type) { case 'text': + case 'text/plain': $args['content'] = (string) $node->nodeValue; $args['content_type'] = 'text'; *************** *** 472,475 **** --- 473,477 ---- case 'html': + case 'text/html': $args['content'] = (string) $node->nodeValue; $args['content_type'] = 'html'; *************** *** 578,581 **** --- 580,585 ---- $args[$node->localName][$node->firstChild->localName] = $child_node->firstChild->nodeValue; } + } elseif ($child_node->nodeType == XML_CDATA_SECTION_NODE) { + $args[$node->localName] = $child_node->nodeValue; } } From dhaun at qs1489.pair.com Thu Jul 24 05:40:38 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Thu, 24 Jul 2008 09:40:38 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system lib-webservices.php, 1.37, 1.37.2.1 Message-ID: <20080724094038.DFC09F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system In directory qs1489.pair.com:/tmp/cvs-serv83208/system Modified Files: Tag: geeklog_1_5_0_1 lib-webservices.php Log Message: Ported AtomPub compatibility improvements over from the Trunk Index: lib-webservices.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-webservices.php,v retrieving revision 1.37 retrieving revision 1.37.2.1 diff -C2 -d -r1.37 -r1.37.2.1 *** lib-webservices.php 31 May 2008 21:42:27 -0000 1.37 --- lib-webservices.php 24 Jul 2008 09:40:35 -0000 1.37.2.1 *************** *** 457,460 **** --- 457,461 ---- switch ($type) { case 'text': + case 'text/plain': $args['content'] = (string) $node->nodeValue; $args['content_type'] = 'text'; *************** *** 462,465 **** --- 463,467 ---- case 'html': + case 'text/html': $args['content'] = (string) $node->nodeValue; $args['content_type'] = 'html'; *************** *** 568,571 **** --- 570,575 ---- $args[$node->localName][$node->firstChild->localName] = $child_node->firstChild->nodeValue; } + } elseif ($child_node->nodeType == XML_CDATA_SECTION_NODE) { + $args[$node->localName] = $child_node->nodeValue; } } From geeklog-cvs at lists.geeklog.net Thu Jul 24 05:44:16 2008 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Thu, 24 Jul 2008 05:44:16 -0400 Subject: [geeklog-cvs] Geeklog-SoC: Ported AtomPub compatibility improvements over from... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7c3c7a6924af changeset: 6229:7c3c7a6924af user: dirk at prospero.local date: Thu Jul 24 11:44:00 2008 +0200 description: Ported AtomPub compatibility improvements over from the Trunk diffstat: 1 file changed, 5 insertions(+), 1 deletion(-) system/lib-webservices.php | 6 +++++- diffs (35 lines): diff -r 7de5a7ba5006 -r 7c3c7a6924af system/lib-webservices.php --- a/system/lib-webservices.php Tue Jul 22 21:46:21 2008 +0100 +++ b/system/lib-webservices.php Thu Jul 24 11:44:00 2008 +0200 @@ -29,7 +29,7 @@ // | | // +---------------------------------------------------------------------------+ // -// $Id: lib-webservices.php,v 1.37 2008/05/31 21:42:27 dhaun Exp $ +// $Id: lib-webservices.php,v 1.37.2.1 2008/07/24 09:40:35 dhaun Exp $ if (strpos ($_SERVER['PHP_SELF'], 'lib-webservices.php') !== false) { die ('This file can not be used on its own!'); @@ -456,11 +456,13 @@ switch ($type) { case 'text': + case 'text/plain': $args['content'] = (string) $node->nodeValue; $args['content_type'] = 'text'; break; case 'html': + case 'text/html': $args['content'] = (string) $node->nodeValue; $args['content_type'] = 'html'; break; @@ -567,6 +569,8 @@ if ($child_node->firstChild->nodeType == XML_TEXT_NODE) { $args[$node->localName][$node->firstChild->localName] = $child_node->firstChild->nodeValue; } + } elseif ($child_node->nodeType == XML_CDATA_SECTION_NODE) { + $args[$node->localName] = $child_node->nodeValue; } } } From dhaun at qs1489.pair.com Sat Jul 26 03:41:31 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 07:41:31 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system lib-webservices.php,1.39,1.40 Message-ID: <20080726074131.B9F57F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system In directory qs1489.pair.com:/tmp/cvs-serv73897/system Modified Files: lib-webservices.php Log Message: More compatibility improvements, mostly for (draft flag) Index: lib-webservices.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-webservices.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** lib-webservices.php 23 Jul 2008 19:34:13 -0000 1.39 --- lib-webservices.php 26 Jul 2008 07:41:29 -0000 1.40 *************** *** 41,44 **** --- 41,45 ---- $WS_ATOM_NS = 'http://www.w3.org/2005/Atom'; $WS_APP_NS = 'http://www.w3.org/2007/app'; + $WS_APP_NS2 = 'http://purl.org/atom/app#'; $WS_EXTN_NS = 'http://www.geeklog.net/xmlns/app/gl'; *************** *** 538,542 **** if (($node->namespaceURI != $WS_ATOM_NS) && ! ($node->namespaceURI != $WS_APP_NS ) && ($node->namespaceURI != $WS_EXTN_NS)) { continue; --- 539,544 ---- if (($node->namespaceURI != $WS_ATOM_NS) && ! ($node->namespaceURI != $WS_APP_NS) && ! ($node->namespaceURI != $WS_APP_NS2) && ($node->namespaceURI != $WS_EXTN_NS)) { continue; *************** *** 563,566 **** --- 565,587 ---- WS_getContent($args, $atom_doc, $node); break; + case 'control': + if ($node->nodeType == XML_ELEMENT_NODE) { + $child_nodes = $node->childNodes; + if ($child_nodes == null) { + continue; + } + $args[$node->localName] = array(); + for ($i = 0; $i < $child_nodes->length; $i++) { + $child_node = $child_nodes->item($i); + if ($child_node->nodeType == XML_ELEMENT_NODE) { + if ($child_node->firstChild->nodeType == XML_TEXT_NODE) { + $args[$node->localName][$child_node->localName] + = $child_node->firstChild->nodeValue; + break; + } + } + } + } + break; default: if ($node->nodeType == XML_ELEMENT_NODE) { *************** *** 598,602 **** $args['publish_second'] = date('s', strtotime($args['updated'])); ! if (isset($args['control'])) { foreach ($args['control'] as $key => $value) { if ($key == 'draft') { --- 619,623 ---- $args['publish_second'] = date('s', strtotime($args['updated'])); ! if (isset($args['control']) && is_array($args['control'])) { foreach ($args['control'] as $key => $value) { if ($key == 'draft') { From dhaun at qs1489.pair.com Sat Jul 26 07:18:02 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 11:18:02 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system lib-webservices.php,1.40,1.41 Message-ID: <20080726111802.90B69F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system In directory qs1489.pair.com:/tmp/cvs-serv94439/system Modified Files: lib-webservices.php Log Message: Missing global declaration (note to self: make namespace name constants ...) Index: lib-webservices.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-webservices.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** lib-webservices.php 26 Jul 2008 07:41:29 -0000 1.40 --- lib-webservices.php 26 Jul 2008 11:18:00 -0000 1.41 *************** *** 510,514 **** function WS_xmlToArgs(&$args) { ! global $_USER, $WS_EXTN_NS, $WS_ATOM_NS, $WS_APP_NS; /* Previous data in args is NOT deleted */ --- 510,514 ---- function WS_xmlToArgs(&$args) { ! global $_USER, $WS_EXTN_NS, $WS_ATOM_NS, $WS_APP_NS, $WS_APP_NS2; /* Previous data in args is NOT deleted */ From dhaun at qs1489.pair.com Sat Jul 26 09:44:08 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 13:44:08 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional style.css, 1.104, 1.105 Message-ID: <20080726134408.6C007F7410@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional In directory qs1489.pair.com:/tmp/cvs-serv9735/public_html/layout/professional Modified Files: style.css Log Message: Cop-out fix for bug #0000671: Don't display the icon for external links when the text direction is 'rtl' (e.g. Hebrew) Index: style.css =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/style.css,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** style.css 7 Jul 2008 18:25:35 -0000 1.104 --- style.css 26 Jul 2008 13:43:58 -0000 1.105 *************** *** 272,279 **** } .ext-link-rtl { - background-color: transparent; - background: url(./images/external.png) left center no-repeat; - background-attachment: scroll; - padding-left: 13px; } .strike { --- 272,275 ---- From dhaun at qs1489.pair.com Sat Jul 26 09:44:01 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 13:44:01 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history, 1.687, 1.688 theme.html, 1.87, 1.88 Message-ID: <20080726134431.B90C5F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv9735/public_html/docs Modified Files: history theme.html Log Message: Cop-out fix for bug #0000671: Don't display the icon for external links when the text direction is 'rtl' (e.g. Hebrew) Index: theme.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/theme.html,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** theme.html 13 Jul 2008 18:08:49 -0000 1.87 --- theme.html 26 Jul 2008 13:43:58 -0000 1.88 *************** *** 231,234 **** --- 231,240 ---- all other pages, you can now use the new variable {page_title_and_site_name} +
  • In the Links plugin, links have an icon indicating that it's an external + link (taking the user away from the current site). This icon did not show + up properly for RTL languages (e.g Hebrew), making the link text unreadable. + Since we could not find a way to make it show up properly in this case, the + icon is not displayed when the text direction is switched to 'rtl' + (for now).
    • Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.687 retrieving revision 1.688 diff -C2 -d -r1.687 -r1.688 *** history 21 Jul 2008 20:15:41 -0000 1.687 --- history 26 Jul 2008 13:43:58 -0000 1.688 *************** *** 4,7 **** --- 4,9 ---- ------------ + - Cop-out fix for bug #0000671: Don't display the icon for external links when + the text direction is 'rtl' (e.g. Hebrew) [Dirk, Mike] - Keep letter case intact when highlighting a search query string (patch provided by Sami Barakat) From dhaun at qs1489.pair.com Sat Jul 26 12:25:18 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 16:25:18 +0000 Subject: [geeklog-cvs] Geeklog-1.x/language english.php, 1.338, 1.339 english_utf-8.php, 1.122, 1.123 Message-ID: <20080726162519.80C72F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/language In directory qs1489.pair.com:/tmp/cvs-serv25529/language Modified Files: english.php english_utf-8.php Log Message: Feature request #0000154: Added a "Subscribe to ..." option for easy subscription to topic feeds Index: english.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english.php,v retrieving revision 1.338 retrieving revision 1.339 diff -C2 -d -r1.338 -r1.339 *** english.php 4 Jul 2008 14:46:06 -0000 1.338 --- english.php 26 Jul 2008 16:25:16 -0000 1.339 *************** *** 548,552 **** 3 => 'Printable Story Format', 4 => 'Story Options', ! 5 => 'PDF Story Format' ); --- 548,553 ---- 3 => 'Printable Story Format', 4 => 'Story Options', ! 5 => 'PDF Story Format', ! 6 => "Subscribe to '%s'" ); Index: english_utf-8.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english_utf-8.php,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** english_utf-8.php 4 Jul 2008 14:46:06 -0000 1.122 --- english_utf-8.php 26 Jul 2008 16:25:16 -0000 1.123 *************** *** 548,552 **** 3 => 'Printable Story Format', 4 => 'Story Options', ! 5 => 'PDF Story Format' ); --- 548,553 ---- 3 => 'Printable Story Format', 4 => 'Story Options', ! 5 => 'PDF Story Format', ! 6 => "Subscribe to '%s'" ); From dhaun at qs1489.pair.com Sat Jul 26 12:25:19 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 16:25:19 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html article.php,1.97,1.98 Message-ID: <20080726162519.B8D66F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv25529/public_html Modified Files: article.php Log Message: Feature request #0000154: Added a "Subscribe to ..." option for easy subscription to topic feeds Index: article.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/article.php,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** article.php 4 Jul 2008 14:57:56 -0000 1.97 --- article.php 26 Jul 2008 16:25:16 -0000 1.98 *************** *** 291,296 **** $story_template->set_var ('lang_pdf_story', $LANG11[5]); } ! $related = STORY_whatsRelated ($story->displayElements('related'), ! $story->displayElements('uid'), $story->displayElements('tid')); if (!empty ($related)) { $related = COM_startBlock ($LANG11[1], '', --- 291,315 ---- $story_template->set_var ('lang_pdf_story', $LANG11[5]); } ! if ($_CONF['backend'] == 1) { ! $tid = $story->displayElements('tid'); ! $result = DB_query("SELECT filename, title, format FROM {$_TABLES['syndication']} WHERE type = 'geeklog' AND topic = '$tid' AND is_enabled = 1"); ! $feeds = DB_numRows($result); ! for ($i = 0; $i < $feeds; $i++) { ! list($filename, $title, $format) = DB_fetchArray($result); ! $feedUrl = SYND_getFeedUrl($filename); ! $feedTitle = sprintf($LANG11[6], $title); ! $feedType = SYND_getMimeType($format); ! $feedClass = 'feed-link'; ! if (!empty($LANG_DIRECTION) && ($LANG_DIRECTION == 'rtl')) { ! $feedClass .= '-rtl'; ! } ! $story_options[] = COM_createLink($feedTitle, $feedUrl, ! array('type' => $feedType, ! 'class' => $feedClass)); ! } ! } ! $related = STORY_whatsRelated($story->displayElements('related'), ! $story->displayElements('uid'), ! $story->displayElements('tid')); if (!empty ($related)) { $related = COM_startBlock ($LANG11[1], '', From dhaun at qs1489.pair.com Sat Jul 26 12:25:19 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 16:25:19 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional/images feed.png, NONE, 1.1 Message-ID: <20080726162520.92CDBF7410@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/images In directory qs1489.pair.com:/tmp/cvs-serv25529/public_html/layout/professional/images Added Files: feed.png Log Message: Feature request #0000154: Added a "Subscribe to ..." option for easy subscription to topic feeds --- NEW FILE: feed.png --- (This appears to be a binary file; contents omitted.) From dhaun at qs1489.pair.com Sat Jul 26 12:25:19 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 16:25:19 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional/images feed.png, NONE, 1.1 Message-ID: <20080726162520.92CDBF7410@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/images In directory qs1489.pair.com:/tmp/cvs-serv25529/public_html/layout/professional/images Added Files: feed.png Log Message: Feature request #0000154: Added a "Subscribe to ..." option for easy subscription to topic feeds --- NEW FILE: feed.png --- (This appears to be a binary file; contents omitted.) From dhaun at qs1489.pair.com Sat Jul 26 12:25:20 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 16:25:20 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system lib-syndication.php,1.41,1.42 Message-ID: <20080726162520.6B36BF7413@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system In directory qs1489.pair.com:/tmp/cvs-serv25529/system Modified Files: lib-syndication.php Log Message: Feature request #0000154: Added a "Subscribe to ..." option for easy subscription to topic feeds Index: lib-syndication.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-syndication.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** lib-syndication.php 26 Jun 2008 21:16:00 -0000 1.41 --- lib-syndication.php 26 Jul 2008 16:25:17 -0000 1.42 *************** *** 676,678 **** --- 676,693 ---- } + /** + * Helper function: Return MIME type for a feed format + * + * @param string $format internal name of the feed format, e.g. Atom-1.0 + * @return string MIME type, e.g. application/atom+xml + * + */ + function SYND_getMimeType($format) + { + $fmt = explode('-', $format); + $type = strtolower($fmt[0]); + + return 'application/' . $type . '+xml'; + } + ?> From dhaun at qs1489.pair.com Sat Jul 26 12:25:19 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 16:25:19 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional style.css, 1.105, 1.106 Message-ID: <20080726162520.51E7DF7411@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional In directory qs1489.pair.com:/tmp/cvs-serv25529/public_html/layout/professional Modified Files: style.css Log Message: Feature request #0000154: Added a "Subscribe to ..." option for easy subscription to topic feeds Index: style.css =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/style.css,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** style.css 26 Jul 2008 13:43:58 -0000 1.105 --- style.css 26 Jul 2008 16:25:16 -0000 1.106 *************** *** 267,271 **** .ext-link { background-color: transparent; ! background: url(./images/external.png) right center no-repeat; background-attachment: scroll; padding-right: 13px; --- 267,271 ---- .ext-link { background-color: transparent; ! background: url(./images/external.png) center right no-repeat; background-attachment: scroll; padding-right: 13px; *************** *** 273,276 **** --- 273,284 ---- .ext-link-rtl { } + .feed-link { + background-color: transparent; + background: url(./images/feed.png) center right no-repeat; + background-attachment: scroll; + padding: 2px 16px 2px 0px; + } + .feed-link-rtl { + } .strike { text-decoration: line-through; From dhaun at qs1489.pair.com Sat Jul 26 12:25:19 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 16:25:19 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history, 1.688, 1.689 theme.html, 1.88, 1.89 Message-ID: <20080726162520.5C9DBF7412@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv25529/public_html/docs Modified Files: history theme.html Log Message: Feature request #0000154: Added a "Subscribe to ..." option for easy subscription to topic feeds Index: theme.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/theme.html,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** theme.html 26 Jul 2008 13:43:58 -0000 1.88 --- theme.html 26 Jul 2008 16:25:16 -0000 1.89 *************** *** 237,240 **** --- 237,244 ---- icon is not displayed when the text direction is switched to 'rtl' (for now). +
  • Added an optional feed-link class to be used for links to + feeds (e.g. the new Story Option entry for topic feeds). In the Professional + theme, a small feed icon (images/feed.png) is used as a background + image for these links.
    • Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.688 retrieving revision 1.689 diff -C2 -d -r1.688 -r1.689 *** history 26 Jul 2008 13:43:58 -0000 1.688 --- history 26 Jul 2008 16:25:16 -0000 1.689 *************** *** 4,7 **** --- 4,10 ---- ------------ + - If there is a feed for a topic, there will now be a "Subscribe to ..." option + in the Story Options block for every story for that topic (feature request + #0000154) [Dirk] - Cop-out fix for bug #0000671: Don't display the icon for external links when the text direction is 'rtl' (e.g. Hebrew) [Dirk, Mike] From dhaun at qs1489.pair.com Sat Jul 26 12:25:19 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 16:25:19 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history, 1.688, 1.689 theme.html, 1.88, 1.89 Message-ID: <20080726162520.5C9DBF7412@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv25529/public_html/docs Modified Files: history theme.html Log Message: Feature request #0000154: Added a "Subscribe to ..." option for easy subscription to topic feeds Index: theme.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/theme.html,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** theme.html 26 Jul 2008 13:43:58 -0000 1.88 --- theme.html 26 Jul 2008 16:25:16 -0000 1.89 *************** *** 237,240 **** --- 237,244 ---- icon is not displayed when the text direction is switched to 'rtl' (for now). +
  • Added an optional feed-link class to be used for links to + feeds (e.g. the new Story Option entry for topic feeds). In the Professional + theme, a small feed icon (images/feed.png) is used as a background + image for these links.
    • Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.688 retrieving revision 1.689 diff -C2 -d -r1.688 -r1.689 *** history 26 Jul 2008 13:43:58 -0000 1.688 --- history 26 Jul 2008 16:25:16 -0000 1.689 *************** *** 4,7 **** --- 4,10 ---- ------------ + - If there is a feed for a topic, there will now be a "Subscribe to ..." option + in the Story Options block for every story for that topic (feature request + #0000154) [Dirk] - Cop-out fix for bug #0000671: Don't display the icon for external links when the text direction is 'rtl' (e.g. Hebrew) [Dirk, Mike] From dhaun at qs1489.pair.com Sat Jul 26 12:40:45 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 16:40:45 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional functions.php, 1.14, 1.15 Message-ID: <20080726164045.1FBC2F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional In directory qs1489.pair.com:/tmp/cvs-serv27086/public_html/layout/professional Modified Files: functions.php Log Message: Don't use the block...-list template files for the User Functions block for anonymous users (invalid HTML due to the
      tags) Index: functions.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/functions.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** functions.php 4 Jul 2008 11:58:54 -0000 1.14 --- functions.php 26 Jul 2008 16:40:42 -0000 1.15 *************** *** 37,41 **** $_BLOCK_TEMPLATE['admin_block'] = 'blockheader-list.thtml,blockfooter-list.thtml'; $_BLOCK_TEMPLATE['section_block'] = 'blockheader-list.thtml,blockfooter-list.thtml'; ! $_BLOCK_TEMPLATE['user_block'] = 'blockheader-list.thtml,blockfooter-list.thtml'; ?> --- 37,43 ---- $_BLOCK_TEMPLATE['admin_block'] = 'blockheader-list.thtml,blockfooter-list.thtml'; $_BLOCK_TEMPLATE['section_block'] = 'blockheader-list.thtml,blockfooter-list.thtml'; ! if (!COM_isAnonUser()) { ! $_BLOCK_TEMPLATE['user_block'] = 'blockheader-list.thtml,blockfooter-list.thtml'; ! } ?> From dhaun at qs1489.pair.com Sat Jul 26 14:58:50 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 18:58:50 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/links/language german.php, 1.9, 1.10 german_formal.php, 1.7, 1.8 german_formal_utf-8.php, 1.7, 1.8 german_utf-8.php, 1.7, 1.8 Message-ID: <20080726185850.9DB26F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/links/language In directory qs1489.pair.com:/tmp/cvs-serv43819/plugins/links/language Modified Files: german.php german_formal.php german_formal_utf-8.php german_utf-8.php Log Message: Some preliminary German translations Index: german_formal_utf-8.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/language/german_formal_utf-8.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** german_formal_utf-8.php 13 Jun 2008 19:51:21 -0000 1.7 --- german_formal_utf-8.php 26 Jul 2008 18:58:48 -0000 1.8 *************** *** 111,114 **** --- 111,115 ---- $PLG_links_MESSAGE15 = 'Keine ausreichenden Rechte, diese Kategorie zu l??schen.'; $PLG_links_MESSAGE16 = 'So eine Kategorie existiert nicht.'; + $PLG_links_MESSAGE17 = 'Diese Kategorie-ID existiert schon.'; // Messages for the plugin upgrade Index: german_utf-8.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/language/german_utf-8.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** german_utf-8.php 13 Jun 2008 19:51:21 -0000 1.7 --- german_utf-8.php 26 Jul 2008 18:58:48 -0000 1.8 *************** *** 111,114 **** --- 111,115 ---- $PLG_links_MESSAGE15 = 'Keine ausreichenden Rechte, diese Kategorie zu l??schen.'; $PLG_links_MESSAGE16 = 'So eine Kategorie existiert nicht.'; + $PLG_links_MESSAGE17 = 'Diese Kategorie-ID existiert schon.'; // Messages for the plugin upgrade Index: german_formal.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/language/german_formal.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** german_formal.php 13 Jun 2008 19:51:21 -0000 1.7 --- german_formal.php 26 Jul 2008 18:58:48 -0000 1.8 *************** *** 111,114 **** --- 111,115 ---- $PLG_links_MESSAGE15 = 'Keine ausreichenden Rechte, diese Kategorie zu l?schen.'; $PLG_links_MESSAGE16 = 'So eine Kategorie existiert nicht.'; + $PLG_links_MESSAGE17 = 'Diese Kategorie-ID existiert schon.'; // Messages for the plugin upgrade Index: german.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/language/german.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** german.php 13 Jun 2008 19:51:21 -0000 1.9 --- german.php 26 Jul 2008 18:58:48 -0000 1.10 *************** *** 111,114 **** --- 111,115 ---- $PLG_links_MESSAGE15 = 'Keine ausreichenden Rechte, diese Kategorie zu l?schen.'; $PLG_links_MESSAGE16 = 'So eine Kategorie existiert nicht.'; + $PLG_links_MESSAGE17 = 'Diese Kategorie-ID existiert schon.'; // Messages for the plugin upgrade From dhaun at qs1489.pair.com Sat Jul 26 14:58:50 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sat, 26 Jul 2008 18:58:50 +0000 Subject: [geeklog-cvs] Geeklog-1.x/language german.php, 1.195, 1.196 german_formal.php, 1.100, 1.101 german_formal_utf-8.php, 1.53, 1.54 german_utf-8.php, 1.84, 1.85 Message-ID: <20080726185850.6C5E4F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/language In directory qs1489.pair.com:/tmp/cvs-serv43819/language Modified Files: german.php german_formal.php german_formal_utf-8.php german_utf-8.php Log Message: Some preliminary German translations Index: german_formal_utf-8.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/german_formal_utf-8.php,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** german_formal_utf-8.php 13 Jun 2008 19:51:21 -0000 1.53 --- german_formal_utf-8.php 26 Jul 2008 18:58:47 -0000 1.54 *************** *** 552,556 **** 3 => 'Druckf??hige Version', 4 => 'Optionen', ! 5 => 'Als PDF' ); --- 552,557 ---- 3 => 'Druckf??hige Version', 4 => 'Optionen', ! 5 => 'Als PDF', ! 6 => "Feed '%s' abonnieren" ); *************** *** 1583,1587 **** 'reset_form' => 'Angaben zur??cksetzen', 'changes_made' => '??nderungen wurden erfolgreich ??bernommen', ! 'title' => 'Konfigurations-Manager' ); --- 1584,1589 ---- 'reset_form' => 'Angaben zur??cksetzen', 'changes_made' => '??nderungen wurden erfolgreich ??bernommen', ! 'title' => 'Konfigurations-Manager', ! 'disable' => 'Funktion deaktivieren' ); Index: german_utf-8.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/german_utf-8.php,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** german_utf-8.php 13 Jun 2008 19:51:21 -0000 1.84 --- german_utf-8.php 26 Jul 2008 18:58:47 -0000 1.85 *************** *** 551,555 **** 3 => 'Druckf??hige Version', 4 => 'Optionen', ! 5 => 'Als PDF' ); --- 551,556 ---- 3 => 'Druckf??hige Version', 4 => 'Optionen', ! 5 => 'Als PDF', ! 6 => "Feed '%s' abonnieren" ); *************** *** 1582,1586 **** 'reset_form' => 'Angaben zur??cksetzen', 'changes_made' => '??nderungen wurden erfolgreich ??bernommen', ! 'title' => 'Konfigurations-Manager' ); --- 1583,1588 ---- 'reset_form' => 'Angaben zur??cksetzen', 'changes_made' => '??nderungen wurden erfolgreich ??bernommen', ! 'title' => 'Konfigurations-Manager', ! 'disable' => 'Funktion deaktivieren' ); Index: german_formal.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/german_formal.php,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** german_formal.php 13 Jun 2008 19:51:21 -0000 1.100 --- german_formal.php 26 Jul 2008 18:58:47 -0000 1.101 *************** *** 552,556 **** 3 => 'Druckf?hige Version', 4 => 'Optionen', ! 5 => 'Als PDF' ); --- 552,557 ---- 3 => 'Druckf?hige Version', 4 => 'Optionen', ! 5 => 'Als PDF', ! 6 => "Feed '%s' abonnieren" ); *************** *** 1583,1587 **** 'reset_form' => 'Angaben zur?cksetzen', 'changes_made' => '?nderungen wurden erfolgreich ?bernommen', ! 'title' => 'Konfigurations-Manager' ); --- 1584,1589 ---- 'reset_form' => 'Angaben zur?cksetzen', 'changes_made' => '?nderungen wurden erfolgreich ?bernommen', ! 'title' => 'Konfigurations-Manager', ! 'disable' => 'Funktion deaktivieren' ); Index: german.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/german.php,v retrieving revision 1.195 retrieving revision 1.196 diff -C2 -d -r1.195 -r1.196 *** german.php 13 Jun 2008 19:51:21 -0000 1.195 --- german.php 26 Jul 2008 18:58:47 -0000 1.196 *************** *** 551,555 **** 3 => 'Druckf?hige Version', 4 => 'Optionen', ! 5 => 'Als PDF' ); --- 551,556 ---- 3 => 'Druckf?hige Version', 4 => 'Optionen', ! 5 => 'Als PDF', ! 6 => "Feed '%s' abonnieren" ); *************** *** 1582,1586 **** 'reset_form' => 'Angaben zur?cksetzen', 'changes_made' => '?nderungen wurden erfolgreich ?bernommen', ! 'title' => 'Konfigurations-Manager' ); --- 1583,1588 ---- 'reset_form' => 'Angaben zur?cksetzen', 'changes_made' => '?nderungen wurden erfolgreich ?bernommen', ! 'title' => 'Konfigurations-Manager', ! 'disable' => 'Funktion deaktivieren' ); From dhaun at qs1489.pair.com Sun Jul 27 03:35:59 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 27 Jul 2008 07:35:59 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin syndication.php, 1.55, 1.56 Message-ID: <20080727073559.039EEF740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin In directory qs1489.pair.com:/tmp/cvs-serv37552/public_html/admin Modified Files: syndication.php Log Message: New option "All Frontpage Stories" for article feeds: skip stories that have the "Show only in topic" option set (feature request #0000652) Index: syndication.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/syndication.php,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** syndication.php 7 Jun 2008 12:41:44 -0000 1.55 --- syndication.php 27 Jul 2008 07:35:56 -0000 1.56 *************** *** 115,119 **** if ($num > 0) { ! $options[] = array ('id' => '::all', 'name' => $LANG33[23]); } --- 115,120 ---- if ($num > 0) { ! $options[] = array ('id' => '::all', 'name' => $LANG33[23]); ! $options[] = array ('id' => '::frontpage', 'name' => $LANG33[53]); } From dhaun at qs1489.pair.com Sun Jul 27 03:36:00 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 27 Jul 2008 07:36:00 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.689,1.690 Message-ID: <20080727073600.AB625F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv37552/public_html/docs Modified Files: history Log Message: New option "All Frontpage Stories" for article feeds: skip stories that have the "Show only in topic" option set (feature request #0000652) Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.689 retrieving revision 1.690 diff -C2 -d -r1.689 -r1.690 *** history 26 Jul 2008 16:25:16 -0000 1.689 --- history 27 Jul 2008 07:35:57 -0000 1.690 *************** *** 4,7 **** --- 4,9 ---- ------------ + - New option "All Frontpage Stories" for article feeds: skip stories that have + the "Show only in topic" option set (feature request #0000652) [Dirk] - If there is a feed for a topic, there will now be a "Subscribe to ..." option in the Story Options block for every story for that topic (feature request From dhaun at qs1489.pair.com Sun Jul 27 03:36:00 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 27 Jul 2008 07:36:00 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.689,1.690 Message-ID: <20080727073600.AB625F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv37552/public_html/docs Modified Files: history Log Message: New option "All Frontpage Stories" for article feeds: skip stories that have the "Show only in topic" option set (feature request #0000652) Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.689 retrieving revision 1.690 diff -C2 -d -r1.689 -r1.690 *** history 26 Jul 2008 16:25:16 -0000 1.689 --- history 27 Jul 2008 07:35:57 -0000 1.690 *************** *** 4,7 **** --- 4,9 ---- ------------ + - New option "All Frontpage Stories" for article feeds: skip stories that have + the "Show only in topic" option set (feature request #0000652) [Dirk] - If there is a feed for a topic, there will now be a "Subscribe to ..." option in the Story Options block for every story for that topic (feature request From dhaun at qs1489.pair.com Sun Jul 27 03:36:00 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 27 Jul 2008 07:36:00 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system lib-syndication.php,1.42,1.43 Message-ID: <20080727073600.DA680F7412@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system In directory qs1489.pair.com:/tmp/cvs-serv37552/system Modified Files: lib-syndication.php Log Message: New option "All Frontpage Stories" for article feeds: skip stories that have the "Show only in topic" option set (feature request #0000652) Index: lib-syndication.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-syndication.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** lib-syndication.php 26 Jul 2008 16:25:17 -0000 1.42 --- lib-syndication.php 27 Jul 2008 07:35:58 -0000 1.43 *************** *** 41,45 **** if ($_CONF['trackback_enabled']) { ! require_once ($_CONF['path_system'] . 'lib-trackback.php'); } --- 41,45 ---- if ($_CONF['trackback_enabled']) { ! require_once $_CONF['path_system'] . 'lib-trackback.php'; } *************** *** 47,50 **** --- 47,51 ---- * Check if a feed for all stories needs to be updated. * + * @param bool $frontpage_only true: only articles shown on the frontpage * @param string $update_info list of story ids * @param string $limit number of entries or number of hours *************** *** 54,58 **** * */ ! function SYND_feedUpdateCheckAll( $update_info, $limit, $updated_topic = '', $updated_id = '' ) { global $_CONF, $_TABLES, $_SYND_DEBUG; --- 55,59 ---- * */ ! function SYND_feedUpdateCheckAll( $frontpage_only, $update_info, $limit, $updated_topic = '', $updated_id = '' ) { global $_CONF, $_TABLES, $_SYND_DEBUG; *************** *** 92,95 **** --- 93,99 ---- $where .= " AND (tid IN ($tlist))"; } + if ($frontpage_only) { + $where .= ' AND frontpage = 1'; + } $result = DB_query( "SELECT sid FROM {$_TABLES['stories']} WHERE draft_flag = 0 AND date <= NOW() $where AND perm_anon > 0 ORDER BY date DESC $limitsql" ); *************** *** 187,207 **** * */ ! function SYND_feedUpdateCheck( $topic, $update_data, $limit, $updated_topic = '', $updated_id = '' ) { $is_current = true; ! switch( $topic ) ! { ! case '::all': ! { ! $is_current = SYND_feedUpdateCheckAll( $update_data, $limit, ! $updated_topic, $updated_id ); ! } break; ! default: ! { ! $is_current = SYND_feedUpdateCheckTopic( $topic, $update_data, ! $limit, $updated_topic, $updated_id ); ! } break; } --- 191,212 ---- * */ ! function SYND_feedUpdateCheck($topic, $update_data, $limit, $updated_topic = '', $updated_id = '') { $is_current = true; ! switch($topic) { ! case '::all': ! $is_current = SYND_feedUpdateCheckAll(false, $update_data, $limit, ! $updated_topic, $updated_id); break; ! ! case '::frontpage': ! $is_current = SYND_feedUpdateCheckAll(true, $update_data, $limit, ! $updated_topic, $updated_id); ! break; ! ! default: ! $is_current = SYND_feedUpdateCheckTopic($topic, $update_data, ! $limit, $updated_topic, $updated_id); break; } *************** *** 316,319 **** --- 321,325 ---- * Get content for a feed that holds all stories. * + * @param bool $frontpage_only true: only articles shown on the frontpage * @param string $limit number of entries or number of stories * @param string $link link to homepage *************** *** 324,328 **** * */ ! function SYND_getFeedContentAll( $limit, &$link, &$update, $contentLength, $feedType, $feedVersion, $fid) { global $_TABLES, $_CONF, $LANG01; --- 330,334 ---- * */ ! function SYND_getFeedContentAll($frontpage_only, $limit, &$link, &$update, $contentLength, $feedType, $feedVersion, $fid) { global $_TABLES, $_CONF, $LANG01; *************** *** 367,370 **** --- 373,379 ---- $where .= " AND (tid IN ($tlist))"; } + if ($frontpage_only) { + $where .= ' AND frontpage = 1'; + } $result = DB_query( "SELECT sid,tid,uid,title,introtext,bodytext,postmode,UNIX_TIMESTAMP(date) AS modified,commentcode,trackbackcode FROM {$_TABLES['stories']} WHERE draft_flag = 0 AND date <= NOW() $where AND perm_anon > 0 ORDER BY date DESC $limitsql" ); *************** *** 401,405 **** $storylink = COM_buildUrl( $_CONF['site_url'] . '/article.php?story=' . $row['sid'] ); ! $extensionTags = PLG_getFeedElementExtensions('article', $row['sid'], $feedType, $feedVersion, $fid, '::all'); if( $_CONF['trackback_enabled'] && ($feedType == 'RSS') && ($row['trackbackcode'] >= 0)) { --- 410,414 ---- $storylink = COM_buildUrl( $_CONF['site_url'] . '/article.php?story=' . $row['sid'] ); ! $extensionTags = PLG_getFeedElementExtensions('article', $row['sid'], $feedType, $feedVersion, $fid, ($frontpage_only ? '::frontpage' : '::all')); if( $_CONF['trackback_enabled'] && ($feedType == 'RSS') && ($row['trackbackcode'] >= 0)) { *************** *** 408,421 **** } $article = array( 'title' => $storytitle, ! 'summary' => $storytext, ! 'text' => $fulltext, ! 'link' => $storylink, ! 'uid' => $row['uid'], ! 'author' => COM_getDisplayName( $row['uid'] ), ! 'date' => $row['modified'], ! 'format' => $row['postmode'], ! 'topic' => $topics[$row['tid']], ! 'extensions' => $extensionTags ! ); if($row['commentcode'] >= 0) { --- 417,430 ---- } $article = array( 'title' => $storytitle, ! 'summary' => $storytext, ! 'text' => $fulltext, ! 'link' => $storylink, ! 'uid' => $row['uid'], ! 'author' => COM_getDisplayName( $row['uid'] ), ! 'date' => $row['modified'], ! 'format' => $row['postmode'], ! 'topic' => $topics[$row['tid']], ! 'extensions' => $extensionTags ! ); if($row['commentcode'] >= 0) { *************** *** 423,428 **** } $content[] = $article; - - } --- 432,435 ---- *************** *** 450,457 **** { // Import the feed handling classes: ! require_once( $_CONF['path_system'] ! . '/classes/syndication/parserfactory.class.php' ); ! require_once( $_CONF['path_system'] ! . '/classes/syndication/feedparserbase.class.php' ); // Load the actual feed handlers: --- 457,464 ---- { // Import the feed handling classes: ! require_once $_CONF['path_system'] ! . '/classes/syndication/parserfactory.class.php'; ! require_once $_CONF['path_system'] ! . '/classes/syndication/feedparserbase.class.php'; // Load the actual feed handlers: *************** *** 466,501 **** $feed->lang = $A['language']; ! if( $A['type'] == 'geeklog' ) ! { ! if( $A['topic'] == '::all') ! { ! $content = SYND_getFeedContentAll( $A['limits'], $link, ! $data, $A['content_length'], ! $format[0], $format[1], $fid ); ! } ! else // feed for a single topic only ! { ! $content = SYND_getFeedContentPerTopic( $A['topic'], ! $A['limits'], $link, $data, $A['content_length'], ! $format[0], $format[1], $fid ); } ! } ! else ! { ! $content = PLG_getFeedContent( $A['type'], $fid, $link, $data, $format[0], $format[1] ); // can't randomly change the api to send a max length, so // fix it here: ! if ($A['content_length'] != 1) ! { ! $count = count( $content ); ! for( $i = 0; $i < $count; $i++ ) ! { $content[$i]['summary'] = SYND_truncateSummary( ! $content[$i]['text'], $A['content_length'] ); } } } ! if( empty( $link )) ! { $link = $_CONF['site_url']; } --- 473,505 ---- $feed->lang = $A['language']; ! if ($A['type'] == 'geeklog') { ! if ($A['topic'] == '::all') { ! $content = SYND_getFeedContentAll(false, $A['limits'], ! $link, $data, $A['content_length'], ! $format[0], $format[1], $fid); ! } elseif ($A['topic'] == '::frontpage') { ! $content = SYND_getFeedContentAll(true, $A['limits'], ! $link, $data, $A['content_length'], ! $format[0], $format[1], $fid); ! } else { // feed for a single topic only ! $content = SYND_getFeedContentPerTopic($A['topic'], ! $A['limits'], $link, $data, ! $A['content_length'], $format[0], ! $format[1], $fid); } ! } else { ! $content = PLG_getFeedContent($A['type'], $fid, $link, $data, $format[0], $format[1]); ! // can't randomly change the api to send a max length, so // fix it here: ! if ($A['content_length'] != 1) { ! $count = count($content); ! for ($i = 0; $i < $count; $i++ ) { $content[$i]['summary'] = SYND_truncateSummary( ! $content[$i]['text'], $A['content_length']); } } } ! if (empty($link)) { $link = $_CONF['site_url']; } From dhaun at qs1489.pair.com Sun Jul 27 03:35:58 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 27 Jul 2008 07:35:58 +0000 Subject: [geeklog-cvs] Geeklog-1.x/language english.php, 1.339, 1.340 english_utf-8.php, 1.123, 1.124 german.php, 1.196, 1.197 german_formal.php, 1.101, 1.102 german_formal_utf-8.php, 1.54, 1.55 german_utf-8.php, 1.85, 1.86 Message-ID: <20080727073628.A4975F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/language In directory qs1489.pair.com:/tmp/cvs-serv37552/language Modified Files: english.php english_utf-8.php german.php german_formal.php german_formal_utf-8.php german_utf-8.php Log Message: New option "All Frontpage Stories" for article feeds: skip stories that have the "Show only in topic" option set (feature request #0000652) Index: english_utf-8.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english_utf-8.php,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** english_utf-8.php 26 Jul 2008 16:25:16 -0000 1.123 --- english_utf-8.php 27 Jul 2008 07:35:54 -0000 1.124 *************** *** 1048,1052 **** 21 => 'No', 22 => '(no feeds)', ! 23 => 'all Stories', 24 => 'Feed Editor', 25 => 'Feed Title', --- 1048,1052 ---- 21 => 'No', 22 => '(no feeds)', ! 23 => 'All Stories', 24 => 'Feed Editor', 25 => 'Feed Title', *************** *** 1077,1081 **** 50 => "Relative to site url ({$_CONF['site_url']})", 51 => 'The filename you have chosen is already used by another feed. Please choose a different one.', ! 52 => 'Error: existing Filename' ); --- 1077,1082 ---- 50 => "Relative to site url ({$_CONF['site_url']})", 51 => 'The filename you have chosen is already used by another feed. Please choose a different one.', ! 52 => 'Error: existing Filename', ! 53 => 'All Frontpage Stories' ); Index: german_utf-8.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/german_utf-8.php,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** german_utf-8.php 26 Jul 2008 18:58:47 -0000 1.85 --- german_utf-8.php 27 Jul 2008 07:35:55 -0000 1.86 *************** *** 1050,1054 **** 21 => 'Nein', 22 => '(keine Newsfeeds)', ! 23 => 'alle Artikel', 24 => 'Newsfeed-Editor', 25 => 'Newsfeed-Titel', --- 1050,1054 ---- 21 => 'Nein', 22 => '(keine Newsfeeds)', ! 23 => 'Alle Artikel', 24 => 'Newsfeed-Editor', 25 => 'Newsfeed-Titel', *************** *** 1079,1083 **** 50 => "Relativ zur URL dieser Site ({$_CONF['site_url']})", 51 => 'Der gew??hlte Dateiname wird bereits von einem anderen Newsfeed verwendet. Bitte w??hle einen anderen.', ! 52 => 'Fehler: Dateiname existiert schon' ); --- 1079,1084 ---- 50 => "Relativ zur URL dieser Site ({$_CONF['site_url']})", 51 => 'Der gew??hlte Dateiname wird bereits von einem anderen Newsfeed verwendet. Bitte w??hle einen anderen.', ! 52 => 'Fehler: Dateiname existiert schon', ! 53 => 'Alle auf der Startseite' ); Index: german_formal.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/german_formal.php,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** german_formal.php 26 Jul 2008 18:58:47 -0000 1.101 --- german_formal.php 27 Jul 2008 07:35:55 -0000 1.102 *************** *** 1051,1055 **** 21 => 'Nein', 22 => '(keine Newsfeeds)', ! 23 => 'alle Artikel', 24 => 'Newsfeed-Editor', 25 => 'Newsfeed-Titel', --- 1051,1055 ---- 21 => 'Nein', 22 => '(keine Newsfeeds)', ! 23 => 'Alle Artikel', 24 => 'Newsfeed-Editor', 25 => 'Newsfeed-Titel', *************** *** 1080,1084 **** 50 => "Relativ zur URL dieser Site ({$_CONF['site_url']})", 51 => 'Der gew?hlte Dateiname wird bereits von einem anderen Newsfeed verwendet. Bitte w?hlen Sie einen anderen.', ! 52 => 'Fehler: Dateiname existiert schon' ); --- 1080,1085 ---- 50 => "Relativ zur URL dieser Site ({$_CONF['site_url']})", 51 => 'Der gew?hlte Dateiname wird bereits von einem anderen Newsfeed verwendet. Bitte w?hlen Sie einen anderen.', ! 52 => 'Fehler: Dateiname existiert schon', ! 53 => 'Alle auf der Startseite' ); Index: german.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/german.php,v retrieving revision 1.196 retrieving revision 1.197 diff -C2 -d -r1.196 -r1.197 *** german.php 26 Jul 2008 18:58:47 -0000 1.196 --- german.php 27 Jul 2008 07:35:54 -0000 1.197 *************** *** 1050,1054 **** 21 => 'Nein', 22 => '(keine Newsfeeds)', ! 23 => 'alle Artikel', 24 => 'Newsfeed-Editor', 25 => 'Newsfeed-Titel', --- 1050,1054 ---- 21 => 'Nein', 22 => '(keine Newsfeeds)', ! 23 => 'Alle Artikel', 24 => 'Newsfeed-Editor', 25 => 'Newsfeed-Titel', *************** *** 1079,1083 **** 50 => "Relativ zur URL dieser Site ({$_CONF['site_url']})", 51 => 'Der gew?hlte Dateiname wird bereits von einem anderen Newsfeed verwendet. Bitte w?hle einen anderen.', ! 52 => 'Fehler: Dateiname existiert schon' ); --- 1079,1084 ---- 50 => "Relativ zur URL dieser Site ({$_CONF['site_url']})", 51 => 'Der gew?hlte Dateiname wird bereits von einem anderen Newsfeed verwendet. Bitte w?hle einen anderen.', ! 52 => 'Fehler: Dateiname existiert schon', ! 53 => 'Alle auf der Startseite' ); Index: german_formal_utf-8.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/german_formal_utf-8.php,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** german_formal_utf-8.php 26 Jul 2008 18:58:47 -0000 1.54 --- german_formal_utf-8.php 27 Jul 2008 07:35:55 -0000 1.55 *************** *** 1051,1055 **** 21 => 'Nein', 22 => '(keine Newsfeeds)', ! 23 => 'alle Artikel', 24 => 'Newsfeed-Editor', 25 => 'Newsfeed-Titel', --- 1051,1055 ---- 21 => 'Nein', 22 => '(keine Newsfeeds)', ! 23 => 'Alle Artikel', 24 => 'Newsfeed-Editor', 25 => 'Newsfeed-Titel', *************** *** 1080,1084 **** 50 => "Relativ zur URL dieser Site ({$_CONF['site_url']})", 51 => 'Der gew??hlte Dateiname wird bereits von einem anderen Newsfeed verwendet. Bitte w??hlen Sie einen anderen.', ! 52 => 'Fehler: Dateiname existiert schon' ); --- 1080,1085 ---- 50 => "Relativ zur URL dieser Site ({$_CONF['site_url']})", 51 => 'Der gew??hlte Dateiname wird bereits von einem anderen Newsfeed verwendet. Bitte w??hlen Sie einen anderen.', ! 52 => 'Fehler: Dateiname existiert schon', ! 53 => 'Alle auf der Startseite' ); Index: english.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english.php,v retrieving revision 1.339 retrieving revision 1.340 diff -C2 -d -r1.339 -r1.340 *** english.php 26 Jul 2008 16:25:16 -0000 1.339 --- english.php 27 Jul 2008 07:35:54 -0000 1.340 *************** *** 1048,1052 **** 21 => 'No', 22 => '(no feeds)', ! 23 => 'all Stories', 24 => 'Feed Editor', 25 => 'Feed Title', --- 1048,1052 ---- 21 => 'No', 22 => '(no feeds)', ! 23 => 'All Stories', 24 => 'Feed Editor', 25 => 'Feed Title', *************** *** 1077,1081 **** 50 => "Relative to site url ({$_CONF['site_url']})", 51 => 'The filename you have chosen is already used by another feed. Please choose a different one.', ! 52 => 'Error: existing Filename' ); --- 1077,1082 ---- 50 => "Relative to site url ({$_CONF['site_url']})", 51 => 'The filename you have chosen is already used by another feed. Please choose a different one.', ! 52 => 'Error: existing Filename', ! 53 => 'All Frontpage Stories' ); From dhaun at qs1489.pair.com Sun Jul 27 04:08:20 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 27 Jul 2008 08:08:20 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system lib-story.php,1.125,1.126 Message-ID: <20080727080820.D4244F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system In directory qs1489.pair.com:/tmp/cvs-serv41578/system Modified Files: lib-story.php Log Message: Prefer frontpage feeds over topic feeds for getItemInfo Index: lib-story.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-story.php,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** lib-story.php 1 May 2008 21:01:47 -0000 1.125 --- lib-story.php 27 Jul 2008 08:08:16 -0000 1.126 *************** *** 741,746 **** break; case 'feed': ! $feedfile = DB_getItem ($_TABLES['syndication'], 'filename', ! "topic = '::all'"); if (empty ($feedfile)) { $feedfile = DB_getItem ($_TABLES['syndication'], 'filename', --- 741,750 ---- break; case 'feed': ! $feedfile = DB_getItem($_TABLES['syndication'], 'filename', ! "topic = '::all'"); ! if (empty($feedfile)) { ! $feedfile = DB_getItem($_TABLES['syndication'], 'filename', ! "topic = '::frontpage'"); ! } if (empty ($feedfile)) { $feedfile = DB_getItem ($_TABLES['syndication'], 'filename', From dhaun at qs1489.pair.com Sun Jul 27 05:11:33 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 27 Jul 2008 09:11:33 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html article.php, 1.98, 1.99 lib-common.php, 1.714, 1.715 Message-ID: <20080727091133.92C50F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv48852/public_html Modified Files: article.php lib-common.php Log Message: Renamed the syndication feed type "geeklog" to "article" since that's what they are nowadays Index: lib-common.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v retrieving revision 1.714 retrieving revision 1.715 diff -C2 -d -r1.714 -r1.715 *** lib-common.php 21 Jul 2008 20:15:41 -0000 1.714 --- lib-common.php 27 Jul 2008 09:11:29 -0000 1.715 *************** *** 1858,1865 **** if( $_CONF['backend'] > 0 ) { ! if( !empty( $updated_type ) && ( $updated_type != 'geeklog' )) { // when a plugin's feed is to be updated, skip Geeklog's own feeds ! $sql = "SELECT fid,type,topic,limits,update_info FROM {$_TABLES['syndication']} WHERE (is_enabled = 1) AND (type <> 'geeklog')"; } else --- 1858,1865 ---- if( $_CONF['backend'] > 0 ) { ! if( !empty( $updated_type ) && ( $updated_type != 'article' )) { // when a plugin's feed is to be updated, skip Geeklog's own feeds ! $sql = "SELECT fid,type,topic,limits,update_info FROM {$_TABLES['syndication']} WHERE (is_enabled = 1) AND (type <> 'article')"; } else *************** *** 1874,1878 **** $is_current = true; ! if( $A['type'] == 'geeklog' ) { $is_current = SYND_feedUpdateCheck( $A['topic'], --- 1874,1878 ---- $is_current = true; ! if( $A['type'] == 'article' ) { $is_current = SYND_feedUpdateCheck( $A['topic'], Index: article.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/article.php,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** article.php 26 Jul 2008 16:25:16 -0000 1.98 --- article.php 27 Jul 2008 09:11:29 -0000 1.99 *************** *** 293,297 **** if ($_CONF['backend'] == 1) { $tid = $story->displayElements('tid'); ! $result = DB_query("SELECT filename, title, format FROM {$_TABLES['syndication']} WHERE type = 'geeklog' AND topic = '$tid' AND is_enabled = 1"); $feeds = DB_numRows($result); for ($i = 0; $i < $feeds; $i++) { --- 293,297 ---- if ($_CONF['backend'] == 1) { $tid = $story->displayElements('tid'); ! $result = DB_query("SELECT filename, title, format FROM {$_TABLES['syndication']} WHERE type = 'article' AND topic = '$tid' AND is_enabled = 1"); $feeds = DB_numRows($result); for ($i = 0; $i < $feeds; $i++) { From dhaun at qs1489.pair.com Sun Jul 27 05:11:33 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 27 Jul 2008 09:11:33 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.690,1.691 Message-ID: <20080727091136.87AB4F7410@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv48852/public_html/docs Modified Files: history Log Message: Renamed the syndication feed type "geeklog" to "article" since that's what they are nowadays Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.690 retrieving revision 1.691 diff -C2 -d -r1.690 -r1.691 *** history 27 Jul 2008 07:35:57 -0000 1.690 --- history 27 Jul 2008 09:11:30 -0000 1.691 *************** *** 4,7 **** --- 4,9 ---- ------------ + - Renamed the syndication feed type "geeklog" to "article" since that's what + they are nowadays [Dirk] - New option "All Frontpage Stories" for article feeds: skip stories that have the "Show only in topic" option set (feature request #0000652) [Dirk] From dhaun at qs1489.pair.com Sun Jul 27 05:11:33 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 27 Jul 2008 09:11:33 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin syndication.php, 1.56, 1.57 Message-ID: <20080727091136.7C6EEF740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin In directory qs1489.pair.com:/tmp/cvs-serv48852/public_html/admin Modified Files: syndication.php Log Message: Renamed the syndication feed type "geeklog" to "article" since that's what they are nowadays Index: syndication.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/syndication.php,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** syndication.php 27 Jul 2008 07:35:56 -0000 1.56 --- syndication.php 27 Jul 2008 09:11:30 -0000 1.57 *************** *** 94,103 **** /** ! * Create a list of feed types that Geeklog offers. * * @return string an array with id/name pairs for every feed * */ ! function get_geeklogFeeds () { global $_CONF, $_TABLES, $LANG33; --- 94,103 ---- /** ! * Return list of types available for article feeds * * @return string an array with id/name pairs for every feed * */ ! function get_articleFeeds() { global $_CONF, $_TABLES, $LANG33; *************** *** 191,195 **** * * @param int $fid feed id (0 for new feeds) ! * @param string $type type of feed, e.g. 'geeklog' * @return string HTML for the feed editor * --- 191,195 ---- * * @param int $fid feed id (0 for new feeds) ! * @param string $type type of feed, e.g. 'article' * @return string HTML for the feed editor * *************** *** 288,292 **** $feed_template->set_var ('feed_filename', $A['filename']); $feed_template->set_var ('feed_type', $A['type']); ! $feed_template->set_var ('feed_type_display', ucwords ($A['type'])); $feed_template->set_var ('feed_charset', $A['charset']); $feed_template->set_var ('feed_language', $A['language']); --- 288,296 ---- $feed_template->set_var ('feed_filename', $A['filename']); $feed_template->set_var ('feed_type', $A['type']); ! if ($A['type'] == 'article') { ! $feed_template->set_var('feed_type_display', $LANG33[55]); ! } else { ! $feed_template->set_var('feed_type_display', ucwords($A['type'])); ! } $feed_template->set_var ('feed_charset', $A['charset']); $feed_template->set_var ('feed_language', $A['language']); *************** *** 332,337 **** $feed_template->set_var ('feed_limits_what', $selection); ! if ($A['type'] == 'geeklog') { ! $options = get_geeklogFeeds (); } else { $result = DB_query("SELECT pi_enabled FROM {$_TABLES['plugins']} WHERE pi_name='{$A['type']}'"); --- 336,341 ---- $feed_template->set_var ('feed_limits_what', $selection); ! if ($A['type'] == 'article') { ! $options = get_articleFeeds(); } else { $result = DB_query("SELECT pi_enabled FROM {$_TABLES['plugins']} WHERE pi_name='{$A['type']}'"); *************** *** 390,398 **** // - go directly to the feed editor $retval = COM_siteHeader ('menu', $LANG33[11]) ! . editfeed (0, 'geeklog') . COM_siteFooter (); } else { $selection = '' . LB; ! $selection .= '' . LB; foreach ($plugins as $p) { $selection .= '
    !
    !
    !
    ! {hidden_field} ! {order_selector} ! {mode_selector} ! ! !
    !
    !
    --- 4,9 ---- {start_storylink_anchortag}{story_title}{end_storylink_anchortag} | {num_comments} {lang_comments} | {user_nullname} {lang_login_logout}
    !
    !
    *************** *** 23,27 ****
    !
    {lang_disclaimer} --- 14,27 ----
    !
    !
    ! {hidden_field} ! {order_selector} ! {mode_selector} ! ! !
    !
    !
    {lang_disclaimer} From dhaun at qs1489.pair.com Sun Jul 27 12:50:46 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 27 Jul 2008 16:50:46 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history, 1.691, 1.692 theme.html, 1.89, 1.90 themevars.html, 1.22, 1.23 Message-ID: <20080727165047.3D5EEF7410@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv5218 Modified Files: history theme.html themevars.html Log Message: Documentation updates Index: themevars.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/themevars.html,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** themevars.html 22 May 2008 19:55:32 -0000 1.22 --- themevars.html 27 Jul 2008 16:50:44 -0000 1.23 *************** *** 136,139 **** --- 136,152 ---- Provides a set of predefined link tags, offering additional navigation links and relationship information. + page_title_and_site_name + Geeklog Site - Another Nifty Geeklog Site + As the name suggests, this variable provides the site name and the title + for the current page. The order in which these two are provided depends + on the current location on the website: On the site's frontpage, the + site name comes first. On all the other pages, the current page title + comes first. + page_site_splitter + - (a dash surrounded by spaces) + This variable comes in handy when creating your own page title, as it + will be empty when the {page_title} variable is empty. Use + in combination with {page_title} and + {site_name} (see above). Index: theme.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/theme.html,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** theme.html 26 Jul 2008 16:25:16 -0000 1.89 --- theme.html 27 Jul 2008 16:50:44 -0000 1.90 *************** *** 199,202 **** --- 199,207 ----

    Theme changes in Geeklog 1.5.1

    +

    Note: Themes made for Geeklog 1.5.0 should be compatible with Geeklog 1.5.1. + We only made a few optional additions and a few adjustments for special setups + (e.g. multi-language sites, right-to-left languages) which are detailed + below.

    +

    Multilingual blocks

    *************** *** 241,244 **** --- 246,254 ---- theme, a small feed icon (images/feed.png) is used as a background image for these links. +
  • An optional change to the comment/commentbar.thtml template file + and the commentbar-line2 class in style.css to make + the "Post a comment" button float to the left and easier to see. There were + no changes in functionality and other commentbar layouts will continue to + work as before.
    • Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.691 retrieving revision 1.692 diff -C2 -d -r1.691 -r1.692 *** history 27 Jul 2008 09:11:30 -0000 1.691 --- history 27 Jul 2008 16:50:44 -0000 1.692 *************** *** 4,7 **** --- 4,9 ---- ------------ + - A small tweak to the Professional theme's commentbar to make the "Post a + comment" option easier to find [Dirk] - Renamed the syndication feed type "geeklog" to "article" since that's what they are nowadays [Dirk] From dhaun at qs1489.pair.com Sun Jul 27 14:10:12 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 27 Jul 2008 18:10:12 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system lib-story.php,1.126,1.127 Message-ID: <20080727181012.98783F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system In directory qs1489.pair.com:/tmp/cvs-serv16720 Modified Files: lib-story.php Log Message: E_ALL fixes Index: lib-story.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-story.php,v retrieving revision 1.126 retrieving revision 1.127 diff -C2 -d -r1.126 -r1.127 *** lib-story.php 27 Jul 2008 08:08:16 -0000 1.126 --- lib-story.php 27 Jul 2008 18:10:09 -0000 1.127 *************** *** 1088,1093 **** if ($args['gl_svc']) { ! $args['mode'] = COM_applyBasicFilter($args['mode']); ! $args['editopt'] = COM_applyBasicFilter($args['editopt']); } --- 1088,1097 ---- if ($args['gl_svc']) { ! if (isset($args['mode'])) { ! $args['mode'] = COM_applyBasicFilter($args['mode']); ! } ! if (isset($args['editopt'])) { ! $args['editopt'] = COM_applyBasicFilter($args['editopt']); ! } } *************** *** 1184,1187 **** --- 1188,1194 ---- // END TEST CODE + if (!isset($args['sid'])) { + $args['sid'] = ''; + } $args['sid'] = COM_sanitizeID($args['sid']); if (!$gl_edit) { From dhaun at qs1489.pair.com Sun Jul 27 14:10:12 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 27 Jul 2008 18:10:12 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system/classes story.class.php, 1.32, 1.33 Message-ID: <20080727181012.A4D0EF740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system/classes In directory qs1489.pair.com:/tmp/cvs-serv16720/classes Modified Files: story.class.php Log Message: E_ALL fixes Index: story.class.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** story.class.php 12 Jul 2008 12:51:18 -0000 1.32 --- story.class.php 27 Jul 2008 18:10:10 -0000 1.33 *************** *** 1667,1671 **** // SID's are a special case: $sid = COM_sanitizeID($array['sid']); ! $oldsid = COM_sanitizeID($array['old_sid']); if (empty($sid)) { --- 1667,1675 ---- // SID's are a special case: $sid = COM_sanitizeID($array['sid']); ! if (isset($array['old_sid'])) { ! $oldsid = COM_sanitizeID($array['old_sid'], false); ! } else { ! $oldsid = ''; ! } if (empty($sid)) { *************** *** 1681,1688 **** /* Need to deal with the postdate and expiry date stuff */ ! $publish_ampm = COM_applyFilter($array['publish_ampm']); ! $publish_hour = COM_applyFilter($array['publish_hour'], true); ! $publish_minute = COM_applyFilter($array['publish_minute'], true); ! $publish_second = COM_applyFilter($array['publish_second'], true); if ($publish_ampm == 'pm') { --- 1685,1704 ---- /* Need to deal with the postdate and expiry date stuff */ ! $publish_ampm = ''; ! if (isset($array['publish_ampm'])) { ! $publish_ampm = COM_applyFilter($array['publish_ampm']); ! } ! $publish_hour = 0; ! if (isset($array['publish_hour'])) { ! $publish_hour = COM_applyFilter($array['publish_hour'], true); ! } ! $publish_minute = 0; ! if (isset($array['publish_minute'])) { ! $publish_minute = COM_applyFilter($array['publish_minute'], true); ! } ! $publish_second = 0; ! if (isset($array['publish_second'])) { ! $publish_second = COM_applyFilter($array['publish_second'], true); ! } if ($publish_ampm == 'pm') { *************** *** 1696,1702 **** } ! $publish_year = COM_applyFilter($array['publish_year'], true); ! $publish_month = COM_applyFilter($array['publish_month'], true); ! $publish_day = COM_applyFilter($array['publish_day'], true); $this->_date = strtotime( "$publish_month/$publish_day/$publish_year $publish_hour:$publish_minute:$publish_second"); --- 1712,1727 ---- } ! $publish_year = 0; ! if (isset($array['publish_year'])) { ! $publish_year = COM_applyFilter($array['publish_year'], true); ! } ! $publish_month = 0; ! if (isset($array['publish_month'])) { ! $publish_month = COM_applyFilter($array['publish_month'], true); ! } ! $publish_day = 0; ! if (isset($array['publish_day'])) { ! $publish_day = COM_applyFilter($array['publish_day'], true); ! } $this->_date = strtotime( "$publish_month/$publish_day/$publish_year $publish_hour:$publish_minute:$publish_second"); From dhaun at qs1489.pair.com Sun Jul 27 14:11:28 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Sun, 27 Jul 2008 18:11:28 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system lib-webservices.php,1.41,1.42 Message-ID: <20080727181128.B4B69F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system In directory qs1489.pair.com:/tmp/cvs-serv16921 Modified Files: lib-webservices.php Log Message: Made the namespace URLs constants - no changes in functionality Index: lib-webservices.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-webservices.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** lib-webservices.php 26 Jul 2008 11:18:00 -0000 1.41 --- lib-webservices.php 27 Jul 2008 18:11:26 -0000 1.42 *************** *** 12,15 **** --- 12,16 ---- // | | // | Authors: Ramnath R Iyer - rri AT silentyak DOT com | + // | Dirk Haun - dirk AT haun-online DOT de | // +---------------------------------------------------------------------------+ // | | *************** *** 36,46 **** } $WS_PLUGIN = ''; $WS_INTROSPECTION = false; $WS_TEXT = ''; - $WS_ATOM_NS = 'http://www.w3.org/2005/Atom'; - $WS_APP_NS = 'http://www.w3.org/2007/app'; - $WS_APP_NS2 = 'http://purl.org/atom/app#'; - $WS_EXTN_NS = 'http://www.geeklog.net/xmlns/app/gl'; // Set = true to enable verbose logging (in error.log) --- 37,48 ---- } + define('WS_ATOM_NS', 'http://www.w3.org/2005/Atom'); + define('WS_APP_NS', 'http://www.w3.org/2007/app'); + define('WS_APP_NS2', 'http://purl.org/atom/app#'); + define('WS_EXTN_NS', 'http://www.geeklog.net/xmlns/app/gl'); + $WS_PLUGIN = ''; $WS_INTROSPECTION = false; $WS_TEXT = ''; // Set = true to enable verbose logging (in error.log) *************** *** 151,156 **** function WS_post() { ! global $WS_PLUGIN, $WS_ATOM_NS, $WS_APP_NS, $WS_EXTN_NS, $WS_VERBOSE, ! $_CONF; if ($WS_VERBOSE) { --- 153,157 ---- function WS_post() { ! global $_CONF, $WS_PLUGIN, $WS_VERBOSE; if ($WS_VERBOSE) { *************** *** 201,208 **** $atom_doc = new DOMDocument('1.0', 'utf-8'); ! $entry_elem = $atom_doc->createElementNS($WS_ATOM_NS, 'atom:entry'); $atom_doc->appendChild($entry_elem); ! $atom_doc->createAttributeNS($WS_APP_NS, 'app:entry'); ! $atom_doc->createAttributeNS($WS_EXTN_NS, 'gl:entry'); WS_arrayToEntryXML($out, $svc_msg['output_fields'], $entry_elem, $atom_doc); --- 202,209 ---- $atom_doc = new DOMDocument('1.0', 'utf-8'); ! $entry_elem = $atom_doc->createElementNS(WS_ATOM_NS, 'atom:entry'); $atom_doc->appendChild($entry_elem); ! $atom_doc->createAttributeNS(WS_APP_NS, 'app:entry'); ! $atom_doc->createAttributeNS(WS_EXTN_NS, 'gl:entry'); WS_arrayToEntryXML($out, $svc_msg['output_fields'], $entry_elem, $atom_doc); *************** *** 221,226 **** function WS_put() { ! global $WS_PLUGIN, $WS_ATOM_NS, $WS_APP_NS, $WS_EXTN_NS, $WS_VERBOSE, ! $_CONF; if ($WS_VERBOSE) { --- 222,226 ---- function WS_put() { ! global $_CONF, $WS_PLUGIN, $WS_VERBOSE; if ($WS_VERBOSE) { *************** *** 262,267 **** function WS_get() { ! global $WS_PLUGIN, $WS_INTROSPECTION, $WS_ATOM_NS, $WS_APP_NS, $WS_EXTN_NS, ! $WS_VERBOSE, $_CONF, $_PLUGINS; if ($WS_VERBOSE) { --- 262,266 ---- function WS_get() { ! global $_CONF, $WS_PLUGIN, $WS_INTROSPECTION, $WS_VERBOSE, $_PLUGINS; if ($WS_VERBOSE) { *************** *** 296,303 **** $atom_doc = new DOMDocument('1.0', 'utf-8'); ! $root_elem = $atom_doc->createElementNS($WS_APP_NS, 'app:service'); $atom_doc->appendChild($root_elem); ! $atom_doc->createAttributeNS($WS_ATOM_NS, 'atom:service'); ! $atom_doc->createAttributeNS($WS_EXTN_NS, 'gl:service'); $workspace = $atom_doc->createElement('app:workspace'); --- 295,302 ---- $atom_doc = new DOMDocument('1.0', 'utf-8'); ! $root_elem = $atom_doc->createElementNS(WS_APP_NS, 'app:service'); $atom_doc->appendChild($root_elem); ! $atom_doc->createAttributeNS(WS_ATOM_NS, 'atom:service'); ! $atom_doc->createAttributeNS(WS_EXTN_NS, 'gl:service'); $workspace = $atom_doc->createElement('app:workspace'); *************** *** 367,374 **** $atom_doc = new DOMDocument('1.0', 'utf-8'); ! $entry_elem = $atom_doc->createElementNS($WS_ATOM_NS, 'atom:entry'); $atom_doc->appendChild($entry_elem); ! $atom_doc->createAttributeNS($WS_APP_NS, 'app:entry'); ! $atom_doc->createAttributeNS($WS_EXTN_NS, 'gl:entry'); WS_arrayToEntryXML($out, $svc_msg['output_fields'], $entry_elem, $atom_doc); --- 366,373 ---- $atom_doc = new DOMDocument('1.0', 'utf-8'); ! $entry_elem = $atom_doc->createElementNS(WS_ATOM_NS, 'atom:entry'); $atom_doc->appendChild($entry_elem); ! $atom_doc->createAttributeNS(WS_APP_NS, 'app:entry'); ! $atom_doc->createAttributeNS(WS_EXTN_NS, 'gl:entry'); WS_arrayToEntryXML($out, $svc_msg['output_fields'], $entry_elem, $atom_doc); *************** *** 378,385 **** $atom_doc = new DOMDocument('1.0', 'utf-8'); ! $feed_elem = $atom_doc->createElementNS($WS_ATOM_NS, 'atom:feed'); $atom_doc->appendChild($feed_elem); ! $atom_doc->createAttributeNS($WS_APP_NS, 'app:feed'); ! $atom_doc->createAttributeNS($WS_EXTN_NS, 'gl:feed'); $feed_id = $atom_doc->createElement('atom:id', $_CONF['site_name']); --- 377,384 ---- $atom_doc = new DOMDocument('1.0', 'utf-8'); ! $feed_elem = $atom_doc->createElementNS(WS_ATOM_NS, 'atom:feed'); $atom_doc->appendChild($feed_elem); ! $atom_doc->createAttributeNS(WS_APP_NS, 'app:feed'); ! $atom_doc->createAttributeNS(WS_EXTN_NS, 'gl:feed'); $feed_id = $atom_doc->createElement('atom:id', $_CONF['site_name']); *************** *** 426,431 **** function WS_delete() { ! global $WS_PLUGIN, $WS_ATOM_NS, $WS_APP_NS, $WS_EXTN_NS, $WS_VERBOSE, ! $_CONF; if ($WS_VERBOSE) { --- 425,429 ---- function WS_delete() { ! global $_CONF, $WS_PLUGIN, $WS_VERBOSE; if ($WS_VERBOSE) { *************** *** 510,514 **** function WS_xmlToArgs(&$args) { ! global $_USER, $WS_EXTN_NS, $WS_ATOM_NS, $WS_APP_NS, $WS_APP_NS2; /* Previous data in args is NOT deleted */ --- 508,512 ---- function WS_xmlToArgs(&$args) { ! global $_USER; /* Previous data in args is NOT deleted */ *************** *** 526,530 **** /* Get the action, if it exists */ ! $action_element = $entry_element->getElementsByTagNameNS($WS_EXTN_NS, 'action')->item(0); $action = ''; if ($action_element != null) { --- 524,528 ---- /* Get the action, if it exists */ ! $action_element = $entry_element->getElementsByTagNameNS(WS_EXTN_NS, 'action')->item(0); $action = ''; if ($action_element != null) { *************** *** 538,545 **** $node = $nodes->item($index); ! if (($node->namespaceURI != $WS_ATOM_NS) && ! ($node->namespaceURI != $WS_APP_NS) && ! ($node->namespaceURI != $WS_APP_NS2) && ! ($node->namespaceURI != $WS_EXTN_NS)) { continue; } --- 536,543 ---- $node = $nodes->item($index); ! if (($node->namespaceURI != WS_ATOM_NS) && ! ($node->namespaceURI != WS_APP_NS) && ! ($node->namespaceURI != WS_APP_NS2) && ! ($node->namespaceURI != WS_EXTN_NS)) { continue; } *************** *** 551,555 **** $args['author_name'] = (string)($author_name_element->firstChild->nodeValue); } ! $author_uid_element = $node->getElementsByTagNameNS($WS_EXTN_NS, 'uid')->item(0); if ($author_uid_element != null) { $args['uid'] = (string)($author_uid_element->firstChild->nodeValue); --- 549,553 ---- $args['author_name'] = (string)($author_name_element->firstChild->nodeValue); } ! $author_uid_element = $node->getElementsByTagNameNS(WS_EXTN_NS, 'uid')->item(0); if ($author_uid_element != null) { $args['uid'] = (string)($author_uid_element->firstChild->nodeValue); *************** *** 642,646 **** function WS_arrayToEntryXML($arr, $extn_elements, &$entry_elem, &$atom_doc) { ! global $WS_PLUGIN, $WS_ATOM_NS, $WS_APP_NS, $WS_EXTN_NS, $_CONF; /* Standard Atom elements */ --- 640,644 ---- function WS_arrayToEntryXML($arr, $extn_elements, &$entry_elem, &$atom_doc) { ! global $_CONF, $WS_PLUGIN; /* Standard Atom elements */ *************** *** 951,955 **** $WS_TEXT .= $text; - } --- 949,952 ---- *************** *** 962,966 **** echo $WS_TEXT; - } --- 959,962 ---- From dhaun at qs1489.pair.com Mon Jul 28 15:35:49 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Mon, 28 Jul 2008 19:35:49 +0000 Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages services.inc.php, 1.12, 1.13 Message-ID: <20080728193549.CE16FF740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages In directory qs1489.pair.com:/tmp/cvs-serv13199/plugins/staticpages Modified Files: services.inc.php Log Message: Use . Thanks to Daniel Jalkut for the reminder ... Index: services.inc.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/services.inc.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** services.inc.php 28 Jun 2008 21:20:34 -0000 1.12 --- services.inc.php 28 Jul 2008 19:35:46 -0000 1.13 *************** *** 567,570 **** --- 567,571 ---- // This date format is PHP 5 only, // but only the web-service uses the value + $output['published'] = date('c', strtotime($output['sp_date'])); $output['updated'] = date('c', strtotime($output['sp_date'])); $output['id'] = $page; *************** *** 623,626 **** --- 624,628 ---- if($args['gl_svc']) { // This date format is PHP 5 only, but only the web-service uses the value + $output_item['published'] = date('c', strtotime($output_item['sp_date'])); $output_item['updated'] = date('c', strtotime($output_item['sp_date'])); $output_item['id'] = $output_item['sp_id']; From dhaun at qs1489.pair.com Mon Jul 28 15:35:49 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Mon, 28 Jul 2008 19:35:49 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system lib-story.php, 1.127, 1.128 lib-webservices.php, 1.42, 1.43 Message-ID: <20080728193549.EA0C0F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system In directory qs1489.pair.com:/tmp/cvs-serv13199/system Modified Files: lib-story.php lib-webservices.php Log Message: Use . Thanks to Daniel Jalkut for the reminder ... Index: lib-webservices.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-webservices.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** lib-webservices.php 27 Jul 2008 18:11:26 -0000 1.42 --- lib-webservices.php 28 Jul 2008 19:35:46 -0000 1.43 *************** *** 560,563 **** --- 560,569 ---- $args['updated'] = (string)$node->firstChild->nodeValue; break; + case 'edited': + $args['edited'] = (string)$node->firstChild->nodeValue; + break; + case 'published': + $args['published'] = (string)$node->firstChild->nodeValue; + break; case 'content': WS_getContent($args, $atom_doc, $node); *************** *** 607,619 **** } ! if (empty($args['updated'])) { ! $args['updated'] = date('c'); } ! $args['publish_month'] = date('m', strtotime($args['updated'])); ! $args['publish_year'] = date('Y', strtotime($args['updated'])); ! $args['publish_day'] = date('d', strtotime($args['updated'])); ! $args['publish_hour'] = date('H', strtotime($args['updated'])); ! $args['publish_minute'] = date('i', strtotime($args['updated'])); ! $args['publish_second'] = date('s', strtotime($args['updated'])); if (isset($args['control']) && is_array($args['control'])) { --- 613,630 ---- } ! $timestamp = date('c'); ! if (!empty($args['published'])) { ! $timestamp = $args['published']; ! } elseif (!empty($args['updated'])) { ! $timestamp = $args['updated']; ! } elseif (!empty($args['edited'])) { ! $timestamp = $args['edited']; } ! $args['publish_month'] = date('m', strtotime($timestamp)); ! $args['publish_year'] = date('Y', strtotime($timestamp)); ! $args['publish_day'] = date('d', strtotime($timestamp)); ! $args['publish_hour'] = date('H', strtotime($timestamp)); ! $args['publish_minute'] = date('i', strtotime($timestamp)); ! $args['publish_second'] = date('s', strtotime($timestamp)); if (isset($args['control']) && is_array($args['control'])) { *************** *** 647,650 **** --- 658,666 ---- $entry_elem->appendChild($id); + if (!empty($arr['published'])) { + $published = $atom_doc->createElement('atom:published', $arr['published']); + $entry_elem->appendChild($published); + } + $updated = $atom_doc->createElement('atom:updated', $arr['updated']); $entry_elem->appendChild($updated); Index: lib-story.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-story.php,v retrieving revision 1.127 retrieving revision 1.128 diff -C2 -d -r1.127 -r1.128 *** lib-story.php 27 Jul 2008 18:10:09 -0000 1.127 --- lib-story.php 28 Jul 2008 19:35:46 -0000 1.128 *************** *** 1569,1572 **** --- 1569,1573 ---- $output['id'] = $output['sid']; $output['category'] = array($output['tid']); + $output['published'] = date('c', $output['date']); $output['updated'] = date('c', $output['date']); if (empty($output['bodytext'])) { *************** *** 1654,1657 **** --- 1655,1659 ---- $output_item['id'] = $output_item['sid']; $output_item['category'] = array($output_item['tid']); + $output_item['published'] = date('c', $output_item['date']); $output_item['updated'] = date('c', $output_item['date']); if (empty($output_item['bodytext'])) { From mjervis at qs1489.pair.com Tue Jul 29 15:06:43 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Tue, 29 Jul 2008 19:06:43 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.692,1.693 Message-ID: <20080729190646.CF72AF740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv95522/public_html/docs Modified Files: history Log Message: Fix for bug #0000696 (formatting of RSS feed dates) from Mystral_KK (also happens to fix issues on windows with rubbish timezones) Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.692 retrieving revision 1.693 diff -C2 -d -r1.692 -r1.693 *** history 27 Jul 2008 16:50:44 -0000 1.692 --- history 29 Jul 2008 19:06:41 -0000 1.693 *************** *** 4,7 **** --- 4,8 ---- ------------ + - Fix for date formatting in RSS fields (bug #0000696) [mystral_kk] - A small tweak to the Professional theme's commentbar to make the "Post a comment" option easier to find [Dirk] From mjervis at qs1489.pair.com Tue Jul 29 15:06:48 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Tue, 29 Jul 2008 19:06:48 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system/classes/syndication rss.feed.class.php, 1.14, 1.15 Message-ID: <20080729190648.0DDB0F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system/classes/syndication In directory qs1489.pair.com:/tmp/cvs-serv95522/system/classes/syndication Modified Files: rss.feed.class.php Log Message: Fix for bug #0000696 (formatting of RSS feed dates) from Mystral_KK (also happens to fix issues on windows with rubbish timezones) Index: rss.feed.class.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/syndication/rss.feed.class.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** rss.feed.class.php 19 Feb 2008 06:49:02 -0000 1.14 --- rss.feed.class.php 29 Jul 2008 19:06:41 -0000 1.15 *************** *** 270,287 **** function _RFC822DateFormat($timestamp='') { - // Cache the current timezone: - $cache_timezone = setlocale(LC_TIME,0); - // Time locales that will give us the required output - $timezones = array('en_GB','en_US'); - setlocale(LC_TIME,$timezones); // set to whichever the system supports. // format the date if(!empty($timestamp)) { ! $time = strftime( '%a, %d %b %Y %H:%M:%S %z', $timestamp); } else { ! $time = strftime( '%a, %d %b %Y %H:%M:%S %z' ); } - // Set the timezone back - setlocale(LC_TIME, $cache_timezone); // return the time return $time; --- 270,280 ---- function _RFC822DateFormat($timestamp='') { // format the date if(!empty($timestamp)) { ! $time = date( 'r', $timestamp); } else { ! $time = date( 'r' ); } // return the time return $time; From dhaun at qs1489.pair.com Wed Jul 30 05:02:36 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Wed, 30 Jul 2008 09:02:36 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs spamx.html,1.26,1.27 Message-ID: <20080730090236.15DC5F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv9505 Modified Files: spamx.html Log Message: We don't ship the Project Honeypot filter, so no need to list it ... Index: spamx.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/spamx.html,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** spamx.html 22 May 2008 19:55:32 -0000 1.26 --- spamx.html 30 Jul 2008 09:02:30 -0000 1.27 *************** *** 60,64 ****
  • IP of URL Filter
  • HTTP Header Filter
    • !
  • Project Honeypot Filter
    • --- 60,64 ----
  • IP of URL Filter
  • HTTP Header Filter
    • !