' . $LANG_INSTALL[45] . ' ' . INST_helpLink('site_url') . ' ' . $LANG_INSTALL[46] . '

' . $LANG_INSTALL[47] . ' ' . INST_helpLink('site_admin_url') . ' ' . $LANG_INSTALL[46] . '

' . $LANG_INSTALL[45] . ' ' . INST_helpLink('site_url') . ' ' . $LANG_INSTALL[46] . '

' . $LANG_INSTALL[47] . ' ' . INST_helpLink('site_admin_url') . ' ' . $LANG_INSTALL[46] . '

' . $LANG_INSTALL[3] . '

' . $LANG_INSTALL[38] . '' . LB - . $LANG_INSTALL[84] . '' . $_PATH['db-config.php'] . '' . $LANG_INSTALL[85] . LB + . $LANG_INSTALL[84] . '' . htmlspecialchars($_PATH['db-config.php']) . '' . $LANG_INSTALL[85] . LB . '

' . LB . '

' . LB @@ -1149,8 +1150,8 @@ $upgr_class = ($LANG_DIRECTION == 'rtl') ? 'upgrade-rtl' : 'upgrade' ; $display .= '

' . $LANG_INSTALL[101] . ' ' . $display_step . ' - ' . $LANG_INSTALL[23] . '

' . LB . '

' . LB - . '' . LB - . '' . LB + . '' . LB + . '' . LB . '' . LB . '' . LB . '' . LB @@ -1167,8 +1168,8 @@ case 'write_paths': // Get the paths from the previous page - $_PATH = array('db-config.php' => urldecode($_REQUEST['dbconfig_path']), - 'public_html/' => urldecode($_REQUEST['public_html_path'])); + $_PATH = array('db-config.php' => INST_sanitizePath(urldecode($_REQUEST['dbconfig_path'])), + 'public_html/' => INST_sanitizePath(urldecode($_REQUEST['public_html_path']))); $dbconfig_path = str_replace('db-config.php', '', $_PATH['db-config.php']); // Edit siteconfig.php and enter the correct GL path and system directory path diff -r c68579cefb03 -r ac040e7736bf public_html/admin/install/install-plugins.php --- a/public_html/admin/install/install-plugins.php Sat Jun 06 14:43:42 2009 +0200 +++ b/public_html/admin/install/install-plugins.php Sun Jun 07 10:14:11 2009 +0200 @@ -63,8 +63,9 @@ } -$dbconfig_path = (isset($_REQUEST['dbconfig_path'])) ? $_REQUEST['dbconfig_path'] : $gl_path . '/db-config.php'; -$step = (isset($_REQUEST['step'])) ? $_REQUEST['step'] : 1; +$dbconfig_path = (isset($_POST['dbconfig_path'])) ? $_POST['dbconfig_path'] : ((isset($_GET['dbconfig_path'])) ? $_GET['dbconfig_path'] : $gl_path . '/db-config.php'); +$dbconfig_path = INST_sanitizePath($dbconfig_path); +tep = isset($_GET['step']) ? $_GET['step'] : (isset($_POST['step']) ? $_POST['step'] : 1); // $display holds all the outputted HTML and content $display = INST_getHeader($LANG_PLUGINS[2] . ' 3 - ' . $LANG_PLUGINS[1]); // Grab the beginning HTML for the installer theme. diff -r c68579cefb03 -r ac040e7736bf public_html/admin/install/lib-install.php --- a/public_html/admin/install/lib-install.php Sat Jun 06 14:43:42 2009 +0200 +++ b/public_html/admin/install/lib-install.php Sun Jun 07 10:14:11 2009 +0200 @@ -65,6 +65,8 @@ define('SUPPORTED_PHP_VER', '4.3.0'); } +$_REQUEST = array_merge($_GET, $_POST); + if (empty($LANG_DIRECTION)) { $LANG_DIRECTION = 'ltr'; } @@ -1149,4 +1151,20 @@ DB_change($_TABLES['vars'], 'value', $version, 'name', 'database_version'); } +/** +* Filter path value for junk and injections +* +* @param string $path a path on the file system +* @return string filtered path value +* +*/ +function INST_sanitizePath($path) +{ + $path = strip_tags($path); + $path = str_replace(array('"', "'"), '', $path); + $path = str_replace('..', '', $path); + + return $path; +} + ?> diff -r c68579cefb03 -r ac040e7736bf public_html/admin/install/migrate.php --- a/public_html/admin/install/migrate.php Sat Jun 06 14:43:42 2009 +0200 +++ b/public_html/admin/install/migrate.php Sun Jun 07 10:14:11 2009 +0200 @@ -246,8 +246,9 @@ } -$dbconfig_path = (isset($_REQUEST['dbconfig_path'])) ? $_REQUEST['dbconfig_path'] : $gl_path . '/db-config.php'; -$step = (isset($_REQUEST['step'])) ? $_REQUEST['step'] : 1; +$dbconfig_path = (isset($_POST['dbconfig_path'])) ? $_POST['dbconfig_path'] : ((isset($_GET['dbconfig_path'])) ? $_GET['dbconfig_path'] : $gl_path . '/db-config.php'); +$dbconfig_path = INST_sanitizePath($dbconfig_path); +$step = isset($_GET['step']) ? $_GET['step'] : (isset($_POST['step']) ? $_POST['step'] : 1); $backup_dir = $_CONF['path'] . 'backups/'; // $display holds all the outputted HTML and content @@ -313,7 +314,7 @@ . '' . LB . '' . LB . '' . LB - . '' . LB + . '' . LB . '

' . $LANG_INSTALL[34] . ' ' . INST_helpLink('db_type') . '

' . LB @@ -321,8 +322,8 @@ . '

' . $LANG_INSTALL[40] . ' ' . INST_helpLink('db_name') . '

' . LB . '

' . $LANG_INSTALL[41] . ' ' . INST_helpLink('db_user') . '

' . LB . '

' . $LANG_INSTALL[42] . ' ' . INST_helpLink('db_pass') . '

' . LB - . '

' . $LANG_INSTALL[45] . ' ' . INST_helpLink('site_url') . ' ' . $LANG_INSTALL[46] . '

' . LB - . '

' . $LANG_INSTALL[47] . ' ' . INST_helpLink('site_admin_url') . ' ' . $LANG_INSTALL[46] . '

' . LB; + . '

' . $LANG_INSTALL[45] . ' ' . INST_helpLink('site_url') . ' ' . $LANG_INSTALL[46] . '

' . LB + . '

' . $LANG_INSTALL[47] . ' ' . INST_helpLink('site_admin_url') . ' ' . $LANG_INSTALL[46] . '

' . LB; // Identify the backup files in backups/ and order them newest to oldest $sql_files = glob($backup_dir . '*.sql'); @@ -492,12 +493,12 @@ if (isset($_REQUEST['db'])) { // Write the database info to db-config.php - if (!INST_writeConfig($_REQUEST['dbconfig_path'], $DB)) { From geeklog-cvs at lists.geeklog.net Sun Jun 7 12:09:09 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 07 Jun 2009 12:09:09 -0400 Subject: [geeklog-cvs] geeklog: Removed the outdated plugin development page and link t... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/48e0663d018b changeset: 7086:48e0663d018b user: Dirk Haun date: Sun Jun 07 10:41:55 2009 +0200 description: Removed the outdated plugin development page and link to the wiki instead. diffstat: public_html/docs/english/index.html | 3 +- public_html/docs/english/plugin.html | 561 ---------------------------------------- 2 files changed, 1 insertions(+), 563 deletions(-) diffs (truncated from 579 to 300 lines): diff -r 4bb93b0a1040 -r 48e0663d018b public_html/docs/english/index.html --- a/public_html/docs/english/index.html Sun Jun 07 10:21:14 2009 +0200 +++ b/public_html/docs/english/index.html Sun Jun 07 10:41:55 2009 +0200 @@ -44,9 +44,8 @@

Trackback, Pingback, Ping

Geeklog's API

Support

List of Changes

diff -r 4bb93b0a1040 -r 48e0663d018b public_html/docs/english/plugin.html --- a/public_html/docs/english/plugin.html Sun Jun 07 10:21:14 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,561 +0,0 @@ - - - - Geeklog Documentation - Plugin Development - - - - -

- - -

Plugin Development

- -

Note: Unfortunately, this document is slightly out of date. -While the API functions described in here are still correct, several new -functions are missing. If in doubt, please also see the file -system/lib-plugins.php which implements the plugin interface.

- -

If you find these API descriptions too terse, you may also want to consult -the more extensive Plugin Developers Guide.

- -

Overview
Geeklog Plugin API Functions -
- Moderation Functions
- Admin and User Menu Functions
- Search Functions
- Comment Functions
- Stats Function
- Uninstall Function
- User Functions
- Profile Functions
- Misc. Functions
- Feed Functions
Implementing your Admin Interface
Preparing your Geeklog Plugin Distribution
How To Install A Geeklog Plugin
Deliver Your Plugin!

- -

Overview

- -

Geeklog is becoming more and more popular each day and we, the -Geeklog developers, are amazed at some of the great hacks people have -made to extend their Geeklog installation to fit their own -needs. At the same time, the Geeklog development team is -continually adding new features that make Geeklog even better. We -have realized the need for Geeklog to support two threads of -development: core geeklog code and plugin-code. By building in the -infrastructure needed to extend Geeklog's functionality through -plugins we can make a clean seperation between the Geeklog codebase -and plugin code so that we can concentrate on making Geeklog's core -code better while others can develop plugins so that Geeklog fits -their needs. With that said, Geeklog now has a Plugin application -program interface (API). - -

At the highest level, the Geeklog Plugin API is generic code that -is called in strategic places in the Geeklog codebase that allow function -of plugins to be called. This will allow your plugin the following features: - -

Ability for your plugin to be submission-based so that users can submit - objects to your plugin. You can then visit the command and - control center in Geeklog to moderate the submissions for your plugin.
Allow your plugin to show up in the Admin block and User block on each - Geeklog page.
Allow your plugin to be searched via the Geeklog search page.
Allow stats for your plugin to show up on the site statistics page.
Allow your plugin the ability to use Geeklog's comment engine.
Allow you to use the power of Geeklog's code library (lib-common.php) in - your own plugin code.
Allow you full flexibility on what your plugin does. Geeklog does not - dictate your plugins power.

- -

Functions for writing plugins

- -

The below functions are what you need to write your own plugin including -any extra parameters that you need to pass in. Towards the end of the -page, there is also a Description of the API, just incase you need it to -help understand in the plugin process. - -

-Note about <plugin name>: You will see references to -<plugin name> in all the functions below. The <plugin -name> values will come from you the name of your plugin tarfile. All plugin -tarfiles have a strict naming convention that they must follow and it is:

- -

- <plugin name>_<plugin version>_<geeklog version>.tar.gz -

- -

e.g. photos_1.0_1.3.tar.gz

- - -

Moderation functions

- -

First note that there are limitations in the current Geeklog codebase that -will force you to name your plugin tables used for submission in a -specific manner. All moderated Geeklog items such as stories and -links are comprised of two tables. The first is a main table where -all visible items are stored. The second is a submission table where -submitted user items sit until an administrator approves them. When -approved the item is moved from the submission table to the main -table. So for example, if you are writing a book review plugin -that allows users to submit book reviews then we will pick bookreviews -for your main table (this MUST also be your plugin name you pick) and -then your submission table MUST be named bookreviewssubmission. Why -force the names? Because in the geeklog code the submission table for all -stories is coded as <main name>submission. So since we picked -bookreviews for our main table (and plugin name) the submission table -must be named bookreviewssubmission. - -

If you want your plugin to be moderated like Geeklog stories -and links then you must implement these functions.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Table 1. Moderation functions
Function	Description of Function
plugin_submit_<plugin name>	Shows the submission form for your plugin.
plugin_itemlist_<plugin name>	Shows any items needing moderation for your plugin on moderation.php
plugin_savesubmission_<plugin name>	Saves submitted item from a user in <plugin name>submission table
plugin_moderationdelete_<plugin name>	Takes an ID into <plugin name>submission table and deletes it
plugin_moderationapprove_<plugin name>	Takes an ID into <plugin name>submission and moves it to the main table called <plugin name>
plugin_moderationvalues_<plugin name>	Returns the primary key column name, the main - table name (called <plugin name>) and the list of fields from that - table that you'd like to have show up on the moderation page.

- -

Admin and User Menu functions

- -

If you want your plugin to effect the Admin and User Function blocks -that show up on every Geeklog page then you must implement these -functions.

- - - - - - - - - - - - - - - - - - - - - - - - - - - -

Table 2. Admin and User functions
Function	Description of Function
plugin_adminoptions_<plugin name>	Will show options under the Admin - Functions block for your plugin
plugin_getuseroption_<plugin - name>	Will show options under the User - Functions block for your plugin
plugin_adminedit_<plugin - name>	Shows the links at the top of admin/plugins/<plugin - name>.php for New and Admin Home. This is for consistency sake only
plugin_submissioncount_<plugin - name>	Shows the number of submissions - pending for you plugin. This is usually just "dbcount(<plugin - name>submission);"
plugin_cclabel_<plugin - name>	Returns array of your plugin image - and a label for your plugin. This is called to show your plugin - in the command and control block on moderation.php

- -

Search Functions

- -

If you want your plugin to be searchable, implement these functions.

- - - - - - - - - - - - - - - -

Table 3. Search functions
Function	Description of Function
plugin_getsearchtypes_<plugin - name>	You will probably want to add a - new type in the Type drop down on search.php. This function prints - the option tags needed. make sure that the value tag is <plugin name>
plugin_dopluginsearch_<plugin - name>	Takes the search criteria and lets - you build search results for your plugin. This returns a string - array of table rows, one row for each record returned by your search.

- -

Comment Function

- -

If you want your plugin to support comments and use the Geeklog comment -engine, then you need to implement these functions in your plugin -functions.inc file:

- - - - - - - - - - - - - - - - - - - -

Table 4. Comment functions
Function	Description of Function
plugin_handlecomment_<plugin name>	- This function expects the comment id (primary index in the comment table) and and type of operation (either 'save' or 'delete') to perform on the comment. It will update the plugin record with the total number of comments for this plugin item. It then handles the refresh or redirection of the user back to the plugin instead of the main site page.
plugin_commentform_<plugin name>	- This function expects a number of parameters and is called from Geeklog article.php and comment.php. Parameters are: comment_id (primary key), comment_mode (nested, flat, threaded, none, order (Ascending or Descending) and reply (Was the reply submit button used on the comment bar). - Only comment_id is mandatory.
plugin_commentparent_<plugin name>	- Optional function which can be called from your plugin_commentform function to also display the plugin parent above the comments. This is how Geeklog articles are displayed with the story and then the comment bar and associated comments.

- - -

Stats Function

- -

If you want your plugin to show up on the stats page then you must -implement this function.

- - - - - - - - - - - -

Table 5. Stats function
Function	Description of Function
plugin_showstats_<plugin - name>	This function takes a showsitestats - flag. If set to 1, this function shows the overall stats for your - plugin in the site statistics box. If it is set to 2 it shows the - statistic blocks for you plugin (similar to Top Ten Viewed Stories and -Top Ten Commented Stories).

- -

Uninstall Function

- -

If you want to give your plugin the ability to uninstall itself then you must implement this function.

- - - - From geeklog-cvs at lists.geeklog.net Sun Jun 7 15:25:27 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 07 Jun 2009 15:25:27 -0400 Subject: [geeklog-cvs] geeklog: When manually adding or removing plugins in the XMLSite... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3a4524178456 changeset: 7088:3a4524178456 user: Dirk Haun date: Sun Jun 07 20:04:45 2009 +0200 description: When manually adding or removing plugins in the XMLSitemap plugin, automatically add/remove corresponding entries for priority and frequency (part of bug #0000898) diffstat: plugins/xmlsitemap/functions.inc | 39 ++++++++++++++++++++++++++++++++++++--- public_html/docs/history | 5 +++++ 2 files changed, 41 insertions(+), 3 deletions(-) diffs (75 lines): diff -r a257d2843389 -r 3a4524178456 plugins/xmlsitemap/functions.inc --- a/plugins/xmlsitemap/functions.inc Sun Jun 07 19:07:00 2009 +0200 +++ b/plugins/xmlsitemap/functions.inc Sun Jun 07 20:04:45 2009 +0200 @@ -344,13 +344,14 @@ 'weekly', 'monthly', 'yearly', 'never'); if (!is_numeric($key) AND in_array($key, $enabled_plugins) - AND (in_array($value, $valid_change_freqs))) { - $valids[$key] = $value; + AND in_array($value, $valid_change_freqs)) { + $valids[$key] = $value; } break; default: - trigger_error('XMLSITEMAP_checkChange: "' . $name . '" not implemented'); + trigger_error('XMLSITEMAP_checkChange: "' . $name + . '" not implemented'); break; } } @@ -366,6 +367,38 @@ $config = config::get_instance(); $config->set($name, $valids, 'xmlsitemap'); } + + if ($name == 'types') { + /** + * The list of plugins in the sitemap changed. Make sure we have + * priorities and frequencies for all active plugins and remove + * those for inactive plugins. + */ + $priorities = array(); + $frequencies = array(); + foreach ($enabled_plugins as $plugin) { + if (in_array($plugin, $_XMLSMAP_CONF['types'])) { + // plugin is active: ensure we have prio. + freq. entries + if (isset($_XMLSMAP_CONF['priorities'][$plugin])) { + $priorities[$plugin] = $_XMLSMAP_CONF['priorities'][$plugin]; + } else { + $priorities[$plugin] = 0.5; + } + if (isset($_XMLSMAP_CONF['frequencies'][$plugin])) { + $frequencies[$plugin] = $_XMLSMAP_CONF['frequencies'][$plugin]; + } else { + $frequencies[$plugin] = 'daily'; + } + } + } + + require_once $_CONF['path_system'] . 'classes/config.class.php'; + $config = config::get_instance(); + ksort($priorities); + $config->set('priorities', $priorities, 'xmlsitemap'); + ksort($frequencies); + $config->set('frequencies', $frequencies, 'xmlsitemap'); + } } /** diff -r a257d2843389 -r 3a4524178456 public_html/docs/history --- a/public_html/docs/history Sun Jun 07 19:07:00 2009 +0200 +++ b/public_html/docs/history Sun Jun 07 20:04:45 2009 +0200 @@ -29,6 +29,11 @@ become orphaned (part of bug #0000901) [Dirk] - When deleting a static page, also delete its comments (bug #0000901) [Dirk] +XMLSitemap plugin +----------------- +- When manually adding or removing plugins, automatically add/remove + corresponding entries for priority and frequency (part of bug #0000898) [Dirk] + May 31, 2009 (1.6.0b2) ------------ From geeklog-cvs at lists.geeklog.net Sun Jun 7 15:25:27 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 07 Jun 2009 15:25:27 -0400 Subject: [geeklog-cvs] geeklog: Add the Polls plugin to the sitemap by default (part of... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/05151f340a85 changeset: 7089:05151f340a85 user: Dirk Haun date: Sun Jun 07 20:14:43 2009 +0200 description: Add the Polls plugin to the sitemap by default (part of bug #0000898) diffstat: plugins/xmlsitemap/install_defaults.php | 8 +++++--- public_html/docs/history | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diffs (44 lines): diff -r 3a4524178456 -r 05151f340a85 plugins/xmlsitemap/install_defaults.php --- a/plugins/xmlsitemap/install_defaults.php Sun Jun 07 20:04:45 2009 +0200 +++ b/plugins/xmlsitemap/install_defaults.php Sun Jun 07 20:14:43 2009 +0200 @@ -58,7 +58,7 @@ $_XMLSMAP_DEFAULT['mobile_sitemap_file'] = 'mobile_sitemap.xml'; // Content types -$_XMLSMAP_DEFAULT['types'] = array('article', 'staticpages', 'calendar'); +$_XMLSMAP_DEFAULT['types'] = array('article', 'calendar', 'polls', 'staticpages'); // Plugins to exclude from sitemap $_XMLSMAP_DEFAULT['exclude'] = array('links'); @@ -66,16 +66,18 @@ // Priorities (must be between 0.0 and 1.0; default value is 0.5) $_XMLSMAP_DEFAULT['priorities'] = array( 'article' => 0.5, - 'staticpages' => 0.5, 'calendar' => 0.5, + 'polls' => 0.5, + 'staticpages' => 0.5 ); // Frequencies (must be one of 'always', 'hourly', 'daily', 'weekly', // 'monthly', 'yearly', 'never') $_XMLSMAP_DEFAULT['frequencies'] = array( 'article' => 'daily', - 'staticpages' => 'weekly', 'calendar' => 'daily', + 'polls' => 'daily', + 'staticpages' => 'weekly' ); /** diff -r 3a4524178456 -r 05151f340a85 public_html/docs/history --- a/public_html/docs/history Sun Jun 07 20:04:45 2009 +0200 +++ b/public_html/docs/history Sun Jun 07 20:14:43 2009 +0200 @@ -31,6 +31,7 @@ XMLSitemap plugin ----------------- +- Add the Polls plugin to the sitemap by default (part of bug #0000898) [Dirk] - When manually adding or removing plugins, automatically add/remove corresponding entries for priority and frequency (part of bug #0000898) [Dirk] From geeklog-cvs at lists.geeklog.net Sun Jun 7 15:25:26 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 07 Jun 2009 15:25:26 -0400 Subject: [geeklog-cvs] geeklog: Removed debug code Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/a257d2843389 changeset: 7087:a257d2843389 user: Dirk Haun date: Sun Jun 07 19:07:00 2009 +0200 description: Removed debug code diffstat: plugins/polls/functions.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 48e0663d018b -r a257d2843389 plugins/polls/functions.inc --- a/plugins/polls/functions.inc Sun Jun 07 10:41:55 2009 +0200 +++ b/plugins/polls/functions.inc Sun Jun 07 19:07:00 2009 +0200 @@ -1245,7 +1245,7 @@ if ($pid != '*') { $sql .= ' LIMIT 1'; } -COM_errorLog($sql); + $result = DB_query($sql); $numRows = DB_numRows($result); From geeklog-cvs at lists.geeklog.net Sun Jun 7 16:12:50 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 07 Jun 2009 16:12:50 -0400 Subject: [geeklog-cvs] geeklog: HTML fix: missing quote Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b9d11e8f0cd0 changeset: 7090:b9d11e8f0cd0 user: Dirk Haun date: Sun Jun 07 22:03:46 2009 +0200 description: HTML fix: missing quote diffstat: system/lib-admin.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 05151f340a85 -r b9d11e8f0cd0 system/lib-admin.php --- a/system/lib-admin.php Sun Jun 07 20:14:43 2009 +0200 +++ b/system/lib-admin.php Sun Jun 07 22:03:46 2009 +0200 @@ -1074,7 +1074,7 @@ } if ($not_present) { $retval = ''; + . $A['pi_name'] . ']" disabled="disabled"' . XHTML . '>'; } else { $retval = ' Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3bfab85d3b7c changeset: 7091:3bfab85d3b7c user: Dirk Haun date: Sun Jun 07 22:12:33 2009 +0200 description: HTML fix: extra diffstat: public_html/docs/english/index.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b9d11e8f0cd0 -r 3bfab85d3b7c public_html/docs/english/index.html --- a/public_html/docs/english/index.html Sun Jun 07 22:03:46 2009 +0200 +++ b/public_html/docs/english/index.html Sun Jun 07 22:12:33 2009 +0200 @@ -105,7 +105,7 @@

Plugin support with API for developers.

A fully configurable block system, with php-in-block support.

Well organized codebase, use of PHP's Object-Oriented features.

Thin database abstraction layer allowing Geeklog to be ported to DBMS's

Thin database abstraction layer allowing Geeklog to be ported to DBMS's other than the defaults (MySQL and MSSQL supported directly).

From geeklog-cvs at lists.geeklog.net Mon Jun 8 19:37:05 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Mon, 08 Jun 2009 19:37:05 -0400 Subject: [geeklog-cvs] geeklog: Fixed isLeapYear() bug Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0e32d93126e5 changeset: 7092:0e32d93126e5 user: Sean Clark date: Mon Jun 08 19:35:00 2009 -0400 description: Fixed isLeapYear() bug diffstat: system/classes/calendar.class.php | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diffs (48 lines): diff -r 3bfab85d3b7c -r 0e32d93126e5 system/classes/calendar.class.php --- a/system/classes/calendar.class.php Sun Jun 07 22:12:33 2009 +0200 +++ b/system/classes/calendar.class.php Mon Jun 08 19:35:00 2009 -0400 @@ -177,7 +177,7 @@ */ function getDayOfWeek($day = 1, $month = 1, $year = '') { - if (empty($year)) { + if (empty($year)) { $year = $this->_default_year; } @@ -225,7 +225,14 @@ $year = $this->_default_year; } - if (round(($year - 2000)/4) == (($year - 2000)/4)){ + if (($year % 4) == 0) { + if (($year % 100) == 0) { + if (($year % 400) == 0) { + return 1; + } else { + return 0; + } + } return 1; } else { return 0; @@ -351,8 +358,8 @@ */ function getMonthName($month = 1) { - $month = $month - 1; - if (empty($this->_lang_months)) $this->setLanguage(); + $month = $month - 1; + if (empty($this->_lang_months)) $this->setLanguage(); switch ($month) { case 0: @@ -485,7 +492,7 @@ } else { $cur_day = new CalendarDay(); $cur_day->year = $year; - $cur_day->daynumber = $nextday; + $cur_day->daynumber = $nextday; $week[$aw][$wd] = $cur_day; // Bail if we just printed last day From geeklog-cvs at lists.geeklog.net Thu Jun 11 05:25:23 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Thu, 11 Jun 2009 05:25:23 -0400 Subject: [geeklog-cvs] geeklog: Added a config option to send an X-FRAME-OPTIONS HTTP h... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/bd10538057fc changeset: 7093:bd10538057fc user: Dirk Haun date: Thu Jun 11 10:35:38 2009 +0200 description: Added a config option to send an X-FRAME-OPTIONS HTTP header to prevent "clickjacking" diffstat: language/english.php | 4 +++- language/english_utf-8.php | 4 +++- public_html/admin/install/config-install.php | 3 ++- public_html/docs/english/config.html | 11 +++++++++++ public_html/docs/history | 4 +++- public_html/lib-common.php | 4 ++++ sql/updates/mssql_1.5.2_to_1.6.0.php | 5 ++++- sql/updates/mysql_1.5.2_to_1.6.0.php | 5 ++++- 8 files changed, 34 insertions(+), 6 deletions(-) diffs (140 lines): diff -r 3bfab85d3b7c -r bd10538057fc language/english.php --- a/language/english.php Sun Jun 07 22:12:33 2009 +0200 +++ b/language/english.php Thu Jun 11 10:35:38 2009 +0200 @@ -1839,6 +1839,7 @@ 'disable_autolinks' => "Disable Autolinks?", 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => "Censor Mode?", 'censorreplace' => "Censor Replace Text", 'censorlist' => "Censor List", @@ -1947,7 +1948,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); ?> diff -r 3bfab85d3b7c -r bd10538057fc language/english_utf-8.php --- a/language/english_utf-8.php Sun Jun 07 22:12:33 2009 +0200 +++ b/language/english_utf-8.php Thu Jun 11 10:35:38 2009 +0200 @@ -1839,6 +1839,7 @@ 'disable_autolinks' => "Disable Autolinks?", 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => "Censor Mode?", 'censorreplace' => "Censor Replace Text", 'censorlist' => "Censor List", @@ -1947,7 +1948,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); ?> diff -r 3bfab85d3b7c -r bd10538057fc public_html/admin/install/config-install.php --- a/public_html/admin/install/config-install.php Sun Jun 07 22:12:33 2009 +0200 +++ b/public_html/admin/install/config-install.php Thu Jun 11 10:35:38 2009 +0200 @@ -313,7 +313,8 @@ $c->add('cron_schedule_interval',0,'text',7,31,NULL,860,TRUE); $c->add('disable_autolinks',0,'select',7,31,0,1750,TRUE); $c->add('clickable_links',1,'select',7,31,1,1753,TRUE); - $c->add('compressed_output',0,'select',7,31,1,1757,TRUE); + $c->add('compressed_output',0,'select',7,31,1,1756,TRUE); + $c->add('frame_options','DENY','select',7,31,22,1758,TRUE); $c->add('fs_debug', NULL, 'fieldset', 7, 32, NULL, 0, TRUE); $c->add('rootdebug',FALSE,'select',7,32,1,520,TRUE); diff -r 3bfab85d3b7c -r bd10538057fc public_html/docs/english/config.html --- a/public_html/docs/english/config.html Sun Jun 07 22:12:33 2009 +0200 +++ b/public_html/docs/english/config.html Thu Jun 11 10:35:38 2009 +0200 @@ -1368,6 +1368,17 @@ however, result in slightly more load on the webserver.
For now, this feature should be considered experimental and hasn't been implemented for all HTML output yet. + + + +

Table 6. Uninstall function
frame_options	DENY	Protection against Clickjacking: This + option indicates that the site's content should not be displayed in a frame. + This only works, however, when the visitor's browser respects the + `X-FRAME-OPTIONS` HTTP header. Options are to disallow all framing + (Strict), only allow framing from within the same site (Same Origin), or to + allow all framing (disabled). We strongly suggest not to disable + this option.

Miscellaneous: Debug

diff -r 3bfab85d3b7c -r bd10538057fc public_html/docs/history --- a/public_html/docs/history Sun Jun 07 22:12:33 2009 +0200 +++ b/public_html/docs/history Thu Jun 11 10:35:38 2009 +0200 @@ -1,6 +1,6 @@ Geeklog History/Changes: -Jun ??, 2009 (1.6.0rc1) +Jun ??, 2009 (1.6.0b3) ------------ Geeklog 1.6.0 incorporates the following projects implemented during @@ -11,6 +11,8 @@ + Comment moderation and editable comments, by Jared Wenerd Changes since 1.6.0b2: +- Added a config option to send an X-FRAME-OPTIONS HTTP header to prevent + "clickjacking" (requires browser support) [Dirk] - Prevent XSS in the install script (reported independently by Nemesis and MaXe) [Dirk] - Removed old plugin API function plugin_commentsupport from the Calendar, diff -r 3bfab85d3b7c -r bd10538057fc public_html/lib-common.php --- a/public_html/lib-common.php Sun Jun 07 22:12:33 2009 +0200 +++ b/public_html/lib-common.php Thu Jun 11 10:35:38 2009 +0200 @@ -881,6 +881,10 @@ // send out the charset header header('Content-Type: text/html; charset=' . COM_getCharset()); + if (!empty($_CONF['frame_options'])) { + header('X-FRAME-OPTIONS: ' . $_CONF['frame_options']); + } + $header = new Template( $_CONF['path_layout'] ); $header->set_file( array( 'header' => 'header.thtml', diff -r 3bfab85d3b7c -r bd10538057fc sql/updates/mssql_1.5.2_to_1.6.0.php --- a/sql/updates/mssql_1.5.2_to_1.6.0.php Sun Jun 07 22:12:33 2009 +0200 +++ b/sql/updates/mssql_1.5.2_to_1.6.0.php Thu Jun 11 10:35:38 2009 +0200 @@ -131,7 +131,10 @@ $c->add('clickable_links',1,'select',7,31,1,1753,TRUE); // experimental: compress output before sending it to the browser - $c->add('compressed_output',0,'select',7,31,1,1757,TRUE); + $c->add('compressed_output',0,'select',7,31,1,1756,TRUE); + + // for the X-FRAME-OPTIONS header (Clickjacking protection) + $c->add('frame_options','DENY','select',7,31,22,1758,TRUE); return true; } diff -r 3bfab85d3b7c -r bd10538057fc sql/updates/mysql_1.5.2_to_1.6.0.php --- a/sql/updates/mysql_1.5.2_to_1.6.0.php Sun Jun 07 22:12:33 2009 +0200 +++ b/sql/updates/mysql_1.5.2_to_1.6.0.php Thu Jun 11 10:35:38 2009 +0200 @@ -117,7 +117,10 @@ $c->add('clickable_links',1,'select',7,31,1,1753,TRUE); // experimental: compress output before sending it to the browser - $c->add('compressed_output',0,'select',7,31,1,1757,TRUE); + $c->add('compressed_output',0,'select',7,31,1,1756,TRUE); + + // for the X-FRAME-OPTIONS header (Clickjacking protection) + $c->add('frame_options','DENY','select',7,31,22,1758,TRUE); return true; } From geeklog-cvs at lists.geeklog.net Thu Jun 11 05:25:24 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Thu, 11 Jun 2009 05:25:24 -0400 Subject: [geeklog-cvs] geeklog: Updated Japanese language files and Japanese documentat... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0f624aa104a0 changeset: 7094:0f624aa104a0 user: Dirk Haun date: Thu Jun 11 10:58:02 2009 +0200 description: Updated Japanese language files and Japanese documentation, provided by the Geeklog.jp group diffstat: language/japanese_utf-8.php | 44 +- plugins/staticpages/language/japanese_utf-8.php | 8 +- plugins/xmlsitemap/language/japanese_utf-8.php | 6 +- public_html/admin/install/language/japanese_utf-8.php | 16 +- public_html/docs/history | 3 +- public_html/docs/japanese/calendar.html | 109 + public_html/docs/japanese/changes.html | 655 ++++ public_html/docs/japanese/config.html | 1302 +++++++++ public_html/docs/japanese/docstyle.css | 117 + public_html/docs/japanese/history.html | 3108 ++++++++++++++++++++++ public_html/docs/japanese/index.html | 121 + public_html/docs/japanese/install.html | 242 + public_html/docs/japanese/links.html | 141 + public_html/docs/japanese/plugin.html | 433 +++ public_html/docs/japanese/polls.html | 116 + public_html/docs/japanese/readme.html | 194 + public_html/docs/japanese/readme.ja.html | 195 + public_html/docs/japanese/spamx.html | 217 + public_html/docs/japanese/staticpages.html | 225 + public_html/docs/japanese/support.html | 100 + public_html/docs/japanese/theme.html | 830 ++++++ public_html/docs/japanese/themevars.html | 311 ++ public_html/docs/japanese/trackback.html | 102 + 23 files changed, 8558 insertions(+), 37 deletions(-) diffs (truncated from 8830 to 300 lines): diff -r bd10538057fc -r 0f624aa104a0 language/japanese_utf-8.php --- a/language/japanese_utf-8.php Thu Jun 11 10:35:38 2009 +0200 +++ b/language/japanese_utf-8.php Thu Jun 11 10:58:02 2009 +0200 @@ -297,7 +297,7 @@ 60 => '???????????????????????????', 61 => '??????', 62 => '????????????100??????', - 63 => "?????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????????{$_CONF['site_name']}????????????????? ?????????????????????", + 63 => "??????????????????????????????????????????????????????????????????? ????????????????????????????????????????", 64 => '????????????????????????', 65 => '??????????????????????????????', 66 => '??????????????????????????????', @@ -1681,9 +1681,9 @@ 'allow_mysqldump' => 'MySQL???????????????????????????', 'mysqldump_path' => 'mysqldump?????????', 'mysqldump_options' => 'mysqldump??????????????????', - 'mysqldump_filename_mask' => 'Backup File Name Mask', + 'mysqldump_filename_mask' => '?????????????????????????????????????????????', 'theme' => '?????????', - 'doctype' => 'DOCTYPE Declaration', + 'doctype' => 'DOCTYPE??????', 'menu_elements' => '?????????????? ???', 'path_themes' => '???????????????', 'disable_new_user_registration' => '????????????????????????????????????', @@ -1697,16 +1697,16 @@ 'show_servicename' => '??????????????????????????????', 'custom_registration' => '????????????????????????????????????', 'user_login_method' => '??????????????????', - 'spamx' => 'Spam-X', + 'spamx' => '?????????????????????????????????', 'sort_admin' => '???????????????????????????', 'language' => '??????', 'locale' => '????????????', 'date' => '??????', 'daytime' => '??????', 'shortdate' => '???????????????', - 'dateonly' => '???????????????', + 'dateonly' => '????????????', 'timeonly' => '????????????', - 'week_start' => '??????????????????', + 'week_start' => '????????????', 'hour_mode' => '?????????', 'thousand_separator' => '???????????????????????????', 'decimal_separator' => '?????????', @@ -1715,14 +1715,14 @@ 'languages' => '?????????[??????????????????]', 'timezone' => '??????????????????', 'site_disabled_msg' => '??????????????????????????????????????????URL', - 'rootdebug' => 'Root???????????????', + 'rootdebug' => 'Root??????????????????????????????', 'cookie_session' => '?????????????????????????????????', 'cookie_name' => '???????????????????????????', 'cookie_password' => '?????????????????????????????????', 'cookie_theme' => '???????????????????????????', 'cookie_language' => '????????????????????????', 'cookie_tzid' => '????????????????????????????????????', - 'cookie_anon_name' => 'Anon. Username Cookie Name', + 'cookie_anon_name' => '????????????????????????????????????', 'cookie_ip' => '???????????????IP???????????????', 'default_perm_cookie_timeout' => '???????????????????????????????????????', 'session_cookie_timeout' => '??????????????????????????????', @@ -1748,7 +1748,7 @@ 'speedlimit' => '??????????????????', 'skip_preview' => '???????????????????????????????????????', 'advanced_editor' => '???????????????????????????????????????', - 'wikitext_editor' => '??????????????????????????????????????????', + 'wikitext_editor' => 'Wiki?????????????????????????????????', 'cron_schedule_interval' => 'Cron????????????????????????', 'sortmethod' => '???????????????', 'showstorycount' => '????????????????????????', @@ -1813,7 +1813,7 @@ 'debug_image_upload' => '????????????????????????????????????????????????', 'keep_unscaled_image' => '? ??????????????????????', 'allow_user_scaling' => '??????????????????????????????????????????', - 'jpeg_quality' => 'JPEG Quality?', + 'jpeg_quality' => 'JPEG???????', 'max_image_width' => '?? ????????????', 'max_image_height' => '??????????????????', 'max_image_size' => '?????????????????????????????????', @@ -1827,26 +1827,27 @@ 'gravatar_rating' => 'Gravatar???????????????', 'force_photo_width' => '?? ???????????????', 'default_photo' => '????????????????????????', - 'commentspeedlimit' => '??????????????????????????????', - 'comment_limit' => '????????????????????????', - 'comment_mode' => '???????????????????????????', - 'comment_code' => '??????????????????????????????', - 'comment_edit' => 'Allow Comment Edit?', - 'comment_edittime' => 'Comment Edit Time (seconds)', - 'commentsubmission' => 'Queue Comment Submissions', + 'commentspeedlimit' => '??????????????????', + 'comment_limit' => '????????????', + 'comment_mode' => '???????????????', + 'comment_code' => '??????????????????', + 'comment_edit' => '??????????????????????', + 'comment_edittime' => '?????????????????? (???)', + 'commentsubmission' => '???????? ???????????????? ???????', 'passwordspeedlimit' => '???????????????? ????????????????', 'login_attempts' => '??????????????????????????????', 'login_speedlimit' => '??????????????????????????????', 'user_html' => '?????????HTML', 'admin_html' => '???????? HTML', 'advanced_html' => '???????????????????????????????????????HTML', - 'skip_html_filter_for_root' => 'Root????????????HTML??????????????????????????????', + 'skip_html_filter_for_root' => 'Root????????????HTML??????????????????', 'allowed_protocols' => '??????????????????????????????', 'disable_autolinks' => '?????????????????????????????????', 'clickable_links' => 'URL ????????????????????????????', 'compressed_output' => '??????????????????????????????????', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => '??????????????????', - 'censorreplace' => '????????????', + 'censorreplace' => '????????????????????????', 'censorlist' => '??????????????????', 'ip_lookup' => 'IP??????', 'url_rewrite' => 'URL????????????', @@ -1856,7 +1857,7 @@ 'atom_max_stories' => '??????????????????????????????', 'disable_webservices' => '???????????????', 'restrict_webservices' => '????????????', - 'article_comment_close_days' => '???????????????????????????????????? (???????????????)', + 'article_comment_close_days' => '????????????????????????(???????????????)', 'comment_close_rec_stories' => '????????????????????????????????????', 'allow_reply_notifications' => '??????????????????????????????????', 'search_style' => '?????????????????????', @@ -1946,7 +1947,8 @@ 18 => array('?????????????????????' => 0, '????????????????????????? ??????????' => 1, '????????????????????????????????????' => 2, '????????????????????????????????????' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('?????????????????????' => 'phrase', '????????????????????????????????????' => 'all', '???????????????????????????????????????' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); ?> diff -r bd10538057fc -r 0f624aa104a0 plugins/staticpages/language/japanese_utf-8.php --- a/plugins/staticpages/language/japanese_utf-8.php Thu Jun 11 10:35:38 2009 +0200 +++ b/plugins/staticpages/language/japanese_utf-8.php Thu Jun 11 10:58:02 2009 +0200 @@ -136,12 +136,12 @@ 'delete_pages' => '???????? ????????????? ????????????????', 'in_block' => '?????????????????????????????????', 'show_hits' => '???????????????????????????', - 'show_date' => '?????????????????????', - 'filter_html' => 'HTML????????????????????????', + 'show_date' => '?????????????????????', + 'filter_html' => 'HTML??????????????????????????????', 'censor' => '?? ??????????????????', 'default_permissions' => '?????????????????????', 'aftersave' => '?????????????????????????????????', - 'atom_max_items' => '????????????????????????????????????????????????' + 'atom_max_items' => '?????????????????????????????????????????????' ); $LANG_configsubgroups['staticpages'] = array( @@ -159,7 +159,7 @@ 1 => array('??????' => true, '?????????' => false), 2 => array('??????' => 'date', '?????????ID' => 'id', '????????????' => 'title'), 3 => array('??????' => 'date', '?????????ID' => 'id', '????????????' => 'title', '?????????' => 'label'), - 9 => array('??????????????????????????????????????????' => 'item', '????????????????????????????????????' => 'list', '????????????????????????' => 'home', '????????????????????????????????????' => 'admin'), + 9 => array('??????????????????????????????????????????' => 'item', '????????????????????????????????????' => 'list', '????????????????????????' => 'home', '????????????????????????????????????' => 'admin'), 12 => array('??????????????????' => 0, '??????' => 2, '???????????????' => 3) ); diff -r bd10538057fc -r 0f624aa104a0 plugins/xmlsitemap/language/japanese_utf-8.php --- a/plugins/xmlsitemap/language/japanese_utf-8.php Thu Jun 11 10:35:38 2009 +0200 +++ b/plugins/xmlsitemap/language/japanese_utf-8.php Thu Jun 11 10:58:02 2009 +0200 @@ -35,7 +35,7 @@ $LANG_XMLSMAP = array ( 'plugin' => 'XMLSitemap', - 'admin' => 'XMLSitemap??????', + 'admin' => 'XMLSitemap??????', ); // Localization of the Admin Configuration UI @@ -48,8 +48,8 @@ 'sitemap_file' => '?????????????????????????????????', 'mobile_sitemap_file' => '?????????????????????????????????', 'types' => '??????????????????????? ???', - 'exclude' => 'Plugins to exclude from sitemap', - 'priorities' => '', + 'exclude' => '???????????????????????????', + 'priorities' => '???? ????', 'frequencies' => '', ); diff -r bd10538057fc -r 0f624aa104a0 public_html/admin/install/language/japanese_utf-8.php --- a/public_html/admin/install/language/japanese_utf-8.php Thu Jun 11 10:35:38 2009 +0200 +++ b/public_html/admin/install/language/japanese_utf-8.php Thu Jun 11 10:58:02 2009 +0200 @@ -67,7 +67,7 @@ 13 => '??????', 14 => '', 15 => 'Geeklog?????????????????????(RSS)?????????????????????????????????backend????????????????????????????????????????????????????????????', - 16 => 'Migrate', + 16 => '??????', 17 => '????????????????????????????????????????????????userphotos????????????????????????????????????????????????????????????', 18 => '?????????????????????????????????????????????????????????????????????articles????????????????????????????????????????????????????????????', 19 => 'Geeklog????????????????????????????????????????????????????????????Web???????????????????????????????? ??????????????????????????????????????????????? ???????????????????????????????????????????????????????????????', @@ -192,13 +192,13 @@ // migrate.php $LANG_MIGRATE = array( - 0 => '??????????????????????????????????????????????????????????? ??????????????????????????????', + 0 => '??????????????????????????????????????????????????????????????????????????????', 1 => '??????????????????', - 2 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????', - 3 => '?????????????????? public_html/images/articles/, public_html/images/topics/, and public_html/images/userphotos/, ?????????????????????????????????????????????????????????', - 4 => '????????? 1.5.0????????????????????????????????????????????????????????????????????????, config.php ??????????????????????????????????????????????????????????????????', - 5 => '?????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????????????????????????????????????????????????????????????????????????????????????????????????', - 6 => '?????????????????????????????????????????????????????????', + 2 => '???????????????????????????????????????????????????????????????????????????????????????????????????????????????', + 3 => '?????? public_html/images/articles/, public_html/images/topics/, and public_html/images/userphotos/???????????????????????????????????????????????????????????????????????????????????????', + 4 => '1.5.0?????????????????????????????????????????????????????????????????????config.php?????????????????????????????????????????????????????????? ????????????????????????????', + 5 => '?????????????????????????????????????????????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????????????????????????????????????????????????', + 6 => '???????????????????????????????????????', 7 => '??????????????????...', 8 => '??????????????????????????????????????????????????????', 9 => '????????????????????????????????????', @@ -220,7 +220,7 @@ 25 => 'Geeklog?????????????????????????????????????????????????????????', 26 => '????????????: ', 27 => '"', - 28 => '" ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????', + 28 => '" ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????', 29 => '?????? "', 30 => '" ???????????? "', 31 => '" ???????????????????????????????????? ', diff -r bd10538057fc -r 0f624aa104a0 public_html/docs/history --- a/public_html/docs/history Thu Jun 11 10:35:38 2009 +0200 +++ b/public_html/docs/history Thu Jun 11 10:58:02 2009 +0200 @@ -18,7 +18,8 @@ - Removed old plugin API function plugin_commentsupport from the Calendar, Polls, and Static Pages plugins. -- Updated Japanese language files, provided by the Geeklog.jp group +- Updated Japanese language files and Japanese documentation, + provided by the Geeklog.jp group Polls plugin ------------ diff -r bd10538057fc -r 0f624aa104a0 public_html/docs/japanese/calendar.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/public_html/docs/japanese/calendar.html Thu Jun 11 10:58:02 2009 +0200 @@ -0,0 +1,109 @@ + + + + + + ??????????????????????????? | Geeklog?????????????????? + + + + +

+ + +

???????????????????????????

+ +

??????????????????????????????????????????????????????Geeklog??????????????????????????????????????????Geeklog 1.4.1??????????????????????????????????????????????????????

+ +

??????

+ +

????????????????????????????????????????????????????? ??????????????? - ????????????????????????????????? - ??????????????????????????????????????????

+ +

??????????????????????????????

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From geeklog-cvs at lists.geeklog.net Thu Jun 11 05:25:27 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Thu, 11 Jun 2009 05:25:27 -0400 Subject: [geeklog-cvs] geeklog: Synced language files with english.php Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d2feddf4150d changeset: 7095:d2feddf4150d user: Dirk Haun date: Thu Jun 11 11:19:23 2009 +0200 description: Synced language files with english.php diffstat: language/afrikaans.php | 6 ++++-- language/afrikaans_utf-8.php | 6 ++++-- language/bosnian.php | 6 ++++-- language/bosnian_utf-8.php | 6 ++++-- language/bulgarian.php | 6 ++++-- language/bulgarian_utf-8.php | 6 ++++-- language/catalan.php | 6 ++++-- language/catalan_utf-8.php | 6 ++++-- language/chinese_simplified_utf-8.php | 6 ++++-- language/chinese_traditional_utf-8.php | 6 ++++-- language/croatian.php | 6 ++++-- language/croatian_utf-8.php | 6 ++++-- language/czech.php | 6 ++++-- language/czech_utf-8.php | 6 ++++-- language/danish.php | 6 ++++-- language/danish_utf-8.php | 6 ++++-- language/dutch.php | 6 ++++-- language/dutch_utf-8.php | 6 ++++-- language/estonian.php | 6 ++++-- language/estonian_utf-8.php | 6 ++++-- language/farsi_utf-8.php | 6 ++++-- language/finnish.php | 6 ++++-- language/finnish_utf-8.php | 6 ++++-- language/french_canada.php | 6 ++++-- language/french_canada_utf-8.php | 6 ++++-- language/french_france.php | 6 ++++-- language/french_france_utf-8.php | 6 ++++-- language/german.php | 6 ++++-- language/german_formal.php | 6 ++++-- language/german_formal_utf-8.php | 6 ++++-- language/german_utf-8.php | 6 ++++-- language/hebrew_utf-8.php | 6 ++++-- language/hellenic.php | 6 ++++-- language/hellenic_utf-8.php | 6 ++++-- language/indonesian.php | 6 ++++-- language/indonesian_utf-8.php | 6 ++++-- language/italian.php | 6 ++++-- language/italian_utf-8.php | 6 ++++-- language/korean.php | 6 ++++-- language/korean_utf-8.php | 6 ++++-- language/norwegian.php | 6 ++++-- language/norwegian_utf-8.php | 6 ++++-- language/polish.php | 6 ++++-- language/polish_utf-8.php | 6 ++++-- language/portuguese.php | 6 ++++-- language/portuguese_brazil.php | 6 ++++-- language/portuguese_brazil_utf-8.php | 6 ++++-- language/portuguese_utf-8.php | 6 ++++-- language/romanian.php | 6 ++++-- language/romanian_utf-8.php | 6 ++++-- language/russian.php | 6 ++++-- language/russian_utf-8.php | 6 ++++-- language/serbian.php | 6 ++++-- language/serbian_utf-8.php | 6 ++++-- language/slovak.php | 6 ++++-- language/slovak_utf-8.php | 6 ++++-- language/slovenian.php | 6 ++++-- language/slovenian_utf-8.php | 6 ++++-- language/spanish.php | 6 ++++-- language/spanish_argentina.php | 6 ++++-- language/spanish_argentina_utf-8.php | 6 ++++-- language/spanish_utf-8.php | 6 ++++-- language/swedish.php | 6 ++++-- language/swedish_utf-8.php | 6 ++++-- language/turkish.php | 6 ++++-- language/turkish_utf-8.php | 6 ++++-- language/ukrainian.php | 6 ++++-- language/ukrainian_koi8-u.php | 6 ++++-- language/ukrainian_utf-8.php | 6 ++++-- 69 files changed, 276 insertions(+), 138 deletions(-) diffs (truncated from 1587 to 300 lines): diff -r 0f624aa104a0 -r d2feddf4150d language/afrikaans.php --- a/language/afrikaans.php Thu Jun 11 10:58:02 2009 +0200 +++ b/language/afrikaans.php Thu Jun 11 11:19:23 2009 +0200 @@ -1837,6 +1837,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1938,7 +1939,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); -?> +?> \ No newline at end of file diff -r 0f624aa104a0 -r d2feddf4150d language/afrikaans_utf-8.php --- a/language/afrikaans_utf-8.php Thu Jun 11 10:58:02 2009 +0200 +++ b/language/afrikaans_utf-8.php Thu Jun 11 11:19:23 2009 +0200 @@ -1837,6 +1837,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1938,7 +1939,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); -?> +?> \ No newline at end of file diff -r 0f624aa104a0 -r d2feddf4150d language/bosnian.php --- a/language/bosnian.php Thu Jun 11 10:58:02 2009 +0200 +++ b/language/bosnian.php Thu Jun 11 11:19:23 2009 +0200 @@ -1841,6 +1841,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1942,7 +1943,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); -?> +?> \ No newline at end of file diff -r 0f624aa104a0 -r d2feddf4150d language/bosnian_utf-8.php --- a/language/bosnian_utf-8.php Thu Jun 11 10:58:02 2009 +0200 +++ b/language/bosnian_utf-8.php Thu Jun 11 11:19:23 2009 +0200 @@ -1841,6 +1841,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1942,7 +1943,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); -?> +?> \ No newline at end of file diff -r 0f624aa104a0 -r d2feddf4150d language/bulgarian.php --- a/language/bulgarian.php Thu Jun 11 10:58:02 2009 +0200 +++ b/language/bulgarian.php Thu Jun 11 11:19:23 2009 +0200 @@ -1837,6 +1837,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1938,7 +1939,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); -?> +?> \ No newline at end of file diff -r 0f624aa104a0 -r d2feddf4150d language/bulgarian_utf-8.php --- a/language/bulgarian_utf-8.php Thu Jun 11 10:58:02 2009 +0200 +++ b/language/bulgarian_utf-8.php Thu Jun 11 11:19:23 2009 +0200 @@ -1837,6 +1837,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1938,7 +1939,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); -?> +?> \ No newline at end of file diff -r 0f624aa104a0 -r d2feddf4150d language/catalan.php --- a/language/catalan.php Thu Jun 11 10:58:02 2009 +0200 +++ b/language/catalan.php Thu Jun 11 11:19:23 2009 +0200 @@ -1835,6 +1835,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1936,7 +1937,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); -?> +?> \ No newline at end of file diff -r 0f624aa104a0 -r d2feddf4150d language/catalan_utf-8.php --- a/language/catalan_utf-8.php Thu Jun 11 10:58:02 2009 +0200 +++ b/language/catalan_utf-8.php Thu Jun 11 11:19:23 2009 +0200 @@ -1835,6 +1835,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1936,7 +1937,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); -?> +?> \ No newline at end of file diff -r 0f624aa104a0 -r d2feddf4150d language/chinese_simplified_utf-8.php --- a/language/chinese_simplified_utf-8.php Thu Jun 11 10:58:02 2009 +0200 +++ b/language/chinese_simplified_utf-8.php Thu Jun 11 11:19:23 2009 +0200 @@ -1840,6 +1840,7 @@ 'disable_autolinks' => '? ???? Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => '?????????????', 'censorreplace' => '??????????????????', 'censorlist' => '?????????', @@ -1941,7 +1942,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); -?> +?> \ No newline at end of file diff -r 0f624aa104a0 -r d2feddf4150d language/chinese_traditional_utf-8.php --- a/language/chinese_traditional_utf-8.php Thu Jun 11 10:58:02 2009 +0200 +++ b/language/chinese_traditional_utf-8.php Thu Jun 11 11:19:23 2009 +0200 @@ -1840,6 +1840,7 @@ 'disable_autolinks' => '?????? Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => '?????????????', 'censorreplace' => '??????????????????', 'censorlist' => '?????????', @@ -1941,7 +1942,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); -?> +?> \ No newline at end of file diff -r 0f624aa104a0 -r d2feddf4150d language/croatian.php --- a/language/croatian.php Thu Jun 11 10:58:02 2009 +0200 +++ b/language/croatian.php Thu Jun 11 11:19:23 2009 +0200 @@ -1837,6 +1837,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1938,7 +1939,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); -?> +?> \ No newline at end of file diff -r 0f624aa104a0 -r d2feddf4150d language/croatian_utf-8.php --- a/language/croatian_utf-8.php Thu Jun 11 10:58:02 2009 +0200 +++ b/language/croatian_utf-8.php Thu Jun 11 11:19:23 2009 +0200 @@ -1839,6 +1839,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1940,7 +1941,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); -?> +?> \ No newline at end of file diff -r 0f624aa104a0 -r d2feddf4150d language/czech.php --- a/language/czech.php Thu Jun 11 10:58:02 2009 +0200 +++ b/language/czech.php Thu Jun 11 11:19:23 2009 +0200 @@ -1836,6 +1836,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1937,7 +1938,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); -?> +?> \ No newline at end of file diff -r 0f624aa104a0 -r d2feddf4150d language/czech_utf-8.php From geeklog-cvs at lists.geeklog.net Thu Jun 11 05:25:28 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Thu, 11 Jun 2009 05:25:28 -0400 Subject: [geeklog-cvs] geeklog: Merging - forgot to pull Sean's leap year fix first ... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9ce9e9715cad changeset: 7096:9ce9e9715cad user: Dirk Haun date: Thu Jun 11 11:25:01 2009 +0200 description: Merging - forgot to pull Sean's leap year fix first ... diffstat: system/classes/calendar.class.php | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diffs (48 lines): diff -r d2feddf4150d -r 9ce9e9715cad system/classes/calendar.class.php --- a/system/classes/calendar.class.php Thu Jun 11 11:19:23 2009 +0200 +++ b/system/classes/calendar.class.php Thu Jun 11 11:25:01 2009 +0200 @@ -177,7 +177,7 @@ */ function getDayOfWeek($day = 1, $month = 1, $year = '') { - if (empty($year)) { + if (empty($year)) { $year = $this->_default_year; } @@ -225,7 +225,14 @@ $year = $this->_default_year; } - if (round(($year - 2000)/4) == (($year - 2000)/4)){ + if (($year % 4) == 0) { + if (($year % 100) == 0) { + if (($year % 400) == 0) { + return 1; + } else { + return 0; + } + } return 1; } else { return 0; @@ -351,8 +358,8 @@ */ function getMonthName($month = 1) { - $month = $month - 1; - if (empty($this->_lang_months)) $this->setLanguage(); + $month = $month - 1; + if (empty($this->_lang_months)) $this->setLanguage(); switch ($month) { case 0: @@ -485,7 +492,7 @@ } else { $cur_day = new CalendarDay(); $cur_day->year = $year; - $cur_day->daynumber = $nextday; + $cur_day->daynumber = $nextday; $week[$aw][$wd] = $cur_day; // Bail if we just printed last day From geeklog-cvs at lists.geeklog.net Thu Jun 11 08:10:40 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Thu, 11 Jun 2009 08:10:40 -0400 Subject: [geeklog-cvs] geeklog: Document story template change (using {story_text_no_br... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7716140ef6f8 changeset: 7097:7716140ef6f8 user: Dirk Haun date: Thu Jun 11 12:55:01 2009 +0200 description: Document story template change (using {story_text_no_br}; cf. bug #0000892) diffstat: public_html/docs/english/theme.html | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (17 lines): diff -r 9ce9e9715cad -r 7716140ef6f8 public_html/docs/english/theme.html --- a/public_html/docs/english/theme.html Thu Jun 11 11:25:01 2009 +0200 +++ b/public_html/docs/english/theme.html Thu Jun 11 12:55:01 2009 +0200 @@ -209,6 +209,13 @@ (to be used in the <html> element).

Added a space between a story's intro text and body text when using the {story_text_no_br} variable.

The story templates in the Professional theme now use + {story_text_no_br} instead of {story_introtext}, i.e. + there are no <br> tags between a story's intro text and + body text any more. This allows for greater flexibility in formatting a + story (e.g. when using the intro text for teasers) but may result in older + stories being displayed differently now (no visible separation between intro + text and body text).

Bugfix: The variables {contributedby_user} and {contributedby_fullname} were always empty.

The two variables {start_contributedby_anchortag} and From geeklog-cvs at lists.geeklog.net Thu Jun 11 08:10:40 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Thu, 11 Jun 2009 08:10:40 -0400 Subject: [geeklog-cvs] geeklog: Don't insist on an email adress when editing a Remote U... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9920c449e20a changeset: 7098:9920c449e20a user: Dirk Haun date: Thu Jun 11 14:10:30 2009 +0200 description: Don't insist on an email adress when editing a Remote User (bug #0000885) diffstat: public_html/admin/user.php | 27 +++++++++++++++++++++------ public_html/docs/history | 2 ++ 2 files changed, 23 insertions(+), 6 deletions(-) diffs (59 lines): diff -r 7716140ef6f8 -r 9920c449e20a public_html/admin/user.php --- a/public_html/admin/user.php Thu Jun 11 12:55:01 2009 +0200 +++ b/public_html/admin/user.php Thu Jun 11 14:10:30 2009 +0200 @@ -447,13 +447,28 @@ if ($_USER_VERBOSE) COM_errorLog("group size at beginning = " . sizeof($groups),1); if ($passwd != $passwd_conf) { // passwords don't match - return edituser ($uid, 67); + return edituser($uid, 67); } - if (!empty ($username) && !empty ($email)) { + $nameAndEmailOkay = true; + if (empty($username)) { + $nameAndEmailOkay = false; + } elseif (empty($email)) { + if (empty($uid)) { + $nameAndEmailOkay = false; // new users need an email address + } else { + $service = DB_getItem($_TABLES['users'], 'remoteservice', + "uid = $uid"); + if (empty($service)) { + $nameAndEmailOkay = false; // not a remote user - needs email + } + } + } - if (!COM_isEmail ($email)) { - return edituser ($uid, 52); + if ($nameAndEmailOkay) { + + if (!empty($email) && !COM_isEmail($email)) { + return edituser($uid, 52); } $uname = addslashes ($username); @@ -638,8 +653,8 @@ } } else { $retval = COM_siteHeader('menu', $LANG28[1]); - $retval .= COM_errorLog($LANG28[10]); - if (DB_count($_TABLES['users'],'uid',$uid) > 0) { + $retval .= COM_showMessageText($LANG28[10]); + if (DB_count($_TABLES['users'], 'uid', $uid) > 0) { $retval .= edituser($uid); } else { $retval .= edituser(); diff -r 7716140ef6f8 -r 9920c449e20a public_html/docs/history --- a/public_html/docs/history Thu Jun 11 12:55:01 2009 +0200 +++ b/public_html/docs/history Thu Jun 11 14:10:30 2009 +0200 @@ -11,6 +11,8 @@ + Comment moderation and editable comments, by Jared Wenerd Changes since 1.6.0b2: +- Don't insist on an email adress when editing a Remote User (bug #0000885) + [Dirk] - Added a config option to send an X-FRAME-OPTIONS HTTP header to prevent "clickjacking" (requires browser support) [Dirk] - Prevent XSS in the install script (reported independently by Nemesis and MaXe) From geeklog-cvs at lists.geeklog.net Thu Jun 11 10:32:10 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Thu, 11 Jun 2009 10:32:10 -0400 Subject: [geeklog-cvs] geeklog: Replace autotags in search results (bug #0000887) Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8048812c2dfb changeset: 7099:8048812c2dfb user: Dirk Haun date: Thu Jun 11 15:16:08 2009 +0200 description: Replace autotags in search results (bug #0000887) diffstat: public_html/docs/history | 1 + system/classes/search.class.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diffs (23 lines): diff -r 9920c449e20a -r 8048812c2dfb public_html/docs/history --- a/public_html/docs/history Thu Jun 11 14:10:30 2009 +0200 +++ b/public_html/docs/history Thu Jun 11 15:16:08 2009 +0200 @@ -11,6 +11,7 @@ + Comment moderation and editable comments, by Jared Wenerd Changes since 1.6.0b2: +- Replace autotags in search results (bug #0000887) [Dirk] - Don't insist on an email adress when editing a Remote User (bug #0000885) [Dirk] - Added a config option to send an X-FRAME-OPTIONS HTTP header to prevent diff -r 9920c449e20a -r 8048812c2dfb system/classes/search.class.php --- a/system/classes/search.class.php Thu Jun 11 14:10:30 2009 +0200 +++ b/system/classes/search.class.php Thu Jun 11 15:16:08 2009 +0200 @@ -754,7 +754,7 @@ $row['title'] = COM_createLink($row['title'], $row['url']); if ($row['description'] != '' . $LANG09[70] . '') { - $row['description'] = stripslashes($this->_shortenText($this->_query, $row['description'], $this->_wordlength)); + $row['description'] = stripslashes($this->_shortenText($this->_query, PLG_replaceTags($row['description']), $this->_wordlength)); } if ($row['date'] != 'LF_NULL') { From geeklog-cvs at lists.geeklog.net Thu Jun 11 10:32:10 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Thu, 11 Jun 2009 10:32:10 -0400 Subject: [geeklog-cvs] geeklog: Excess whitespace can lead to unexpectedly short search... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/da0af061667f changeset: 7101:da0af061667f user: Dirk Haun date: Thu Jun 11 16:30:20 2009 +0200 description: Excess whitespace can lead to unexpectedly short search results diffstat: system/classes/search.class.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r f869991bf353 -r da0af061667f system/classes/search.class.php --- a/system/classes/search.class.php Thu Jun 11 15:37:17 2009 +0200 +++ b/system/classes/search.class.php Thu Jun 11 16:30:20 2009 +0200 @@ -789,6 +789,8 @@ function _shortenText( $keyword, $text, $num_words = 7 ) { $text = strip_tags($text); + $text = str_replace(array("\011", "\012", "\015"), ' ', trim($text)); + $text = preg_replace('/\s\s+/', ' ', $text); $words = explode(' ', $text); $word_count = count($words); if ($word_count <= $num_words) { From geeklog-cvs at lists.geeklog.net Thu Jun 11 10:32:10 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Thu, 11 Jun 2009 10:32:10 -0400 Subject: [geeklog-cvs] geeklog: E_ALL fix Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f869991bf353 changeset: 7100:f869991bf353 user: Dirk Haun date: Thu Jun 11 15:37:17 2009 +0200 description: E_ALL fix diffstat: system/lib-security.php | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diffs (22 lines): diff -r 8048812c2dfb -r f869991bf353 system/lib-security.php --- a/system/lib-security.php Thu Jun 11 15:16:08 2009 +0200 +++ b/system/lib-security.php Thu Jun 11 15:37:17 2009 +0200 @@ -219,13 +219,14 @@ } } - if ((empty ($_USER['uid']) && ($uid == 1)) || ($uid == $_USER['uid'])) { - if (empty ($_GROUPS)) { - $_GROUPS = SEC_getUserGroups ($uid); + if ((empty($_USER['uid']) && ($uid == 1)) || + (isset($_USER['uid']) && ($uid == $_USER['uid']))) { + if (empty($_GROUPS)) { + $_GROUPS = SEC_getUserGroups($uid); } $groups = $_GROUPS; } else { - $groups = SEC_getUserGroups ($uid); + $groups = SEC_getUserGroups($uid); } if (is_numeric($grp_to_verify)) { From geeklog-cvs at lists.geeklog.net Thu Jun 11 16:23:02 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Thu, 11 Jun 2009 16:23:02 -0400 Subject: [geeklog-cvs] geeklog: Fixed requesting the URL in plugin_getiteminfo Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/536f78878a7a changeset: 7102:536f78878a7a user: Dirk Haun date: Thu Jun 11 18:56:23 2009 +0200 description: Fixed requesting the URL in plugin_getiteminfo diffstat: public_html/docs/history | 1 + system/lib-story.php | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diffs (28 lines): diff -r da0af061667f -r 536f78878a7a public_html/docs/history --- a/public_html/docs/history Thu Jun 11 16:30:20 2009 +0200 +++ b/public_html/docs/history Thu Jun 11 18:56:23 2009 +0200 @@ -11,6 +11,7 @@ + Comment moderation and editable comments, by Jared Wenerd Changes since 1.6.0b2: +- Fixed an error that occured after deleting a trackback [Dirk] - Replace autotags in search results (bug #0000887) [Dirk] - Don't insist on an email adress when editing a Remote User (bug #0000885) [Dirk] diff -r da0af061667f -r 536f78878a7a system/lib-story.php --- a/system/lib-story.php Thu Jun 11 16:30:20 2009 +0200 +++ b/system/lib-story.php Thu Jun 11 18:56:23 2009 +0200 @@ -717,10 +717,9 @@ $fields[] = 'title'; break; case 'url': - if ($sid == '*') { - // in this case, we need the sid to build the URL - $fields[] = 'sid'; - } + // needed for $sp_id == '*', but also in case we're only requesting + // the URL (so that $fields isn't emtpy) + $fields[] = 'sid'; break; default: // nothing to do From geeklog-cvs at lists.geeklog.net Thu Jun 11 16:23:02 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Thu, 11 Jun 2009 16:23:02 -0400 Subject: [geeklog-cvs] geeklog: Ensure we get as many words as requested in the extract... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/a3617b9a512d changeset: 7103:a3617b9a512d user: Dirk Haun date: Thu Jun 11 21:57:08 2009 +0200 description: Ensure we get as many words as requested in the extracts for the search results diffstat: system/classes/search.class.php | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diffs (42 lines): diff -r 536f78878a7a -r a3617b9a512d system/classes/search.class.php --- a/system/classes/search.class.php Thu Jun 11 18:56:23 2009 +0200 +++ b/system/classes/search.class.php Thu Jun 11 21:57:08 2009 +0200 @@ -821,12 +821,20 @@ $start = 0 - $key; $end = $num_words - 1; $end = (($key + $m <= $word_count - 1) ? $key : $word_count - $m - 1); + $abs_length = abs($start) + abs($end) + 1; + if ($abs_length < $num_words) { + $end += ($num_words - $abs_length); + } } else { // Keyword in the middle of text $start = 0 - $m; $end = (($key + $m <= $word_count - 1) ? $m : $word_count - $key - 1); + $abs_length = abs($start) + abs($end) + 1; + if ($abs_length < $num_words) { + $start -= ($num_words - $abs_length); + } $rt = '... '; } } @@ -838,11 +846,14 @@ $end = $num_words - 1; } - for ($i = $start; $i <= $end; $i++) + for ($i = $start; $i <= $end; $i++) { $rt .= $words[$key + $i] . ' '; - $rt .= ' ...'; + } + if ($key + $i != $word_count) { + $rt .= ' ...'; + } - return COM_highlightQuery( $rt, $keyword, 'b' ); + return COM_highlightQuery($rt, $keyword, 'b'); } /** From geeklog-cvs at lists.geeklog.net Fri Jun 12 15:40:58 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Fri, 12 Jun 2009 15:40:58 -0400 Subject: [geeklog-cvs] geeklog: Fixed comment (too much copy&paste ...) Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/88ac73e3784a changeset: 7104:88ac73e3784a user: Dirk Haun date: Thu Jun 11 22:27:08 2009 +0200 description: Fixed comment (too much copy&paste ...) diffstat: system/lib-story.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a3617b9a512d -r 88ac73e3784a system/lib-story.php --- a/system/lib-story.php Thu Jun 11 21:57:08 2009 +0200 +++ b/system/lib-story.php Thu Jun 11 22:27:08 2009 +0200 @@ -717,7 +717,7 @@ $fields[] = 'title'; break; case 'url': - // needed for $sp_id == '*', but also in case we're only requesting + // needed for $sid == '*', but also in case we're only requesting // the URL (so that $fields isn't emtpy) $fields[] = 'sid'; break; From geeklog-cvs at lists.geeklog.net Fri Jun 12 15:40:58 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Fri, 12 Jun 2009 15:40:58 -0400 Subject: [geeklog-cvs] geeklog: Improved selection of text portion to display in search... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/79731422caff changeset: 7105:79731422caff user: Dirk Haun date: Fri Jun 12 11:55:12 2009 +0200 description: Improved selection of text portion to display in search results diffstat: system/classes/search.class.php | 61 +++++++++++++++++++++++++----- 1 files changed, 51 insertions(+), 10 deletions(-) diffs (105 lines): diff -r 88ac73e3784a -r 79731422caff system/classes/search.class.php --- a/system/classes/search.class.php Thu Jun 11 22:27:08 2009 +0200 +++ b/system/classes/search.class.php Fri Jun 12 11:55:12 2009 +0200 @@ -749,7 +749,7 @@ } } - $row['title'] = $this->_shortenText($this->_query, $row['title'], 6); + $row['title'] = $this->_shortenText($this->_query, $row['title'], 8); $row['title'] = stripslashes(str_replace('$', '$', $row['title'])); $row['title'] = COM_createLink($row['title'], $row['url']); @@ -786,10 +786,11 @@ * @return string A short version of the text * */ - function _shortenText( $keyword, $text, $num_words = 7 ) + function _shortenText($keyword, $text, $num_words = 7) { $text = strip_tags($text); $text = str_replace(array("\011", "\012", "\015"), ' ', trim($text)); + $text = str_replace(' ', ' ', $text); $text = preg_replace('/\s\s+/', ' ', $text); $words = explode(' ', $text); $word_count = count($words); @@ -813,24 +814,28 @@ else { $str = substr($text, $pos, $pos_space - $pos); - $key = array_search($str, $words); $m = (int) (($num_words - 1) / 2); - if ($key <= $m) - { + $key = $this->_arraySearch($keyword, $words); + if ($key === false) { + // Keyword(s) not found - show start of text + $key = 0; + $start = 0; + $end = $num_words - 1; + } elseif ($key <= $m) { // Keyword at the start of text $start = 0 - $key; $end = $num_words - 1; - $end = (($key + $m <= $word_count - 1) ? $key : $word_count - $m - 1); + $end = ($key + $m <= $word_count - 1) + ? $key : $word_count - $m - 1; $abs_length = abs($start) + abs($end) + 1; if ($abs_length < $num_words) { $end += ($num_words - $abs_length); } - } - else - { + } else { // Keyword in the middle of text $start = 0 - $m; - $end = (($key + $m <= $word_count - 1) ? $m : $word_count - $key - 1); + $end = ($key + $m <= $word_count - 1) + ? $m : $word_count - $key - 1; $abs_length = abs($start) + abs($end) + 1; if ($abs_length < $num_words) { $start -= ($num_words - $abs_length); @@ -857,6 +862,42 @@ } /** + * Search array of words for keyword(s) + * + * @param string $needle keyword(s), separated by spaces + * @param array $haystack array of words to search through + * @return mixed index in $haystack or false when not found + * @access private + * + */ + function _arraySearch($needle, $haystack) + { + $keywords = explode(' ', $needle); + $num_keywords = count($keywords); + + foreach ($haystack as $key => $value) { + if ($this->_stripos($value, $keywords[0]) !== false) { + if ($num_keywords == 1) { + return $key; + } else { + $matched_all = true; + for ($i = 1; $i < $num_keywords; $i++) { + if ($this->_stripos($haystack[$key + $i], $keywords[$i]) === false) { + $matched_all = false; + break; + } + } + if ($matched_all) { + return $key; + } + } + } + } + + return false; + } + + /** * Finds the similarities between heading names * * Returns the index of a heading that matches a From geeklog-cvs at lists.geeklog.net Sat Jun 13 03:35:35 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 13 Jun 2009 03:35:35 -0400 Subject: [geeklog-cvs] geeklog: Fixed comment Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ea7bbbf5bed4 changeset: 7109:ea7bbbf5bed4 user: Dirk Haun date: Sat Jun 13 09:32:16 2009 +0200 description: Fixed comment From geeklog-cvs at lists.geeklog.net Sat Jun 13 04:35:47 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 13 Jun 2009 04:35:47 -0400 Subject: [geeklog-cvs] geeklog: XHTML fixes Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/711f03b24fef changeset: 7110:711f03b24fef user: Dirk Haun date: Sat Jun 13 10:35:33 2009 +0200 description: XHTML fixes diffstat: public_html/admin/install/index.php | 4 ++-- public_html/admin/install/migrate.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (33 lines): diff -r ea7bbbf5bed4 -r 711f03b24fef public_html/admin/install/index.php --- a/public_html/admin/install/index.php Sat Jun 13 09:32:16 2009 +0200 +++ b/public_html/admin/install/index.php Sat Jun 13 10:35:33 2009 +0200 @@ -1149,7 +1149,7 @@ // Show the "Select your installation method" buttons $upgr_class = ($LANG_DIRECTION == 'rtl') ? 'upgrade-rtl' : 'upgrade' ; $display .= '

' . $LANG_INSTALL[101] . ' ' . $display_step . ' - ' . $LANG_INSTALL[23] . '

' . LB - . '

' . LB + . '

' . LB . '' . LB . '' . LB . '' . LB @@ -1157,7 +1157,7 @@ . '' . LB . '' . LB . '' . LB - . '

' . LB; + . '

' . LB; } break; diff -r ea7bbbf5bed4 -r 711f03b24fef public_html/admin/install/migrate.php --- a/public_html/admin/install/migrate.php Sat Jun 13 09:32:16 2009 +0200 +++ b/public_html/admin/install/migrate.php Sat Jun 13 10:35:33 2009 +0200 @@ -967,7 +967,7 @@ } $display .= '

' . $LANG_MIGRATE[36] . '

' . LB - .'' . LB + .'' . LB . '' . LB . '' . LB . '' . LB From geeklog-cvs at lists.geeklog.net Sat Jun 13 09:41:19 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 13 Jun 2009 09:41:19 -0400 Subject: [geeklog-cvs] geeklog: Fixed handling of $_CONF['comment_close_rec_stories'] (... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/a5fd4b122d3c changeset: 7111:a5fd4b122d3c user: Dirk Haun date: Sat Jun 13 15:39:45 2009 +0200 description: Fixed handling of $_CONF['comment_close_rec_stories'] (bug #0000899) diffstat: public_html/docs/history | 12 +++++++++--- system/lib-comment.php | 23 +++++++++++++---------- system/lib-story.php | 10 ++++++++-- 3 files changed, 30 insertions(+), 15 deletions(-) diffs (127 lines): diff -r 711f03b24fef -r a5fd4b122d3c public_html/docs/history --- a/public_html/docs/history Sat Jun 13 10:35:33 2009 +0200 +++ b/public_html/docs/history Sat Jun 13 15:39:45 2009 +0200 @@ -1,6 +1,6 @@ Geeklog History/Changes: -Jun ??, 2009 (1.6.0b3) +Jun 1?, 2009 (1.6.0b3) ------------ Geeklog 1.6.0 incorporates the following projects implemented during @@ -11,20 +11,26 @@ + Comment moderation and editable comments, by Jared Wenerd Changes since 1.6.0b2: +- Fixed handling of $_CONF['comment_close_rec_stories'] (bug #0000899) [Dirk] +- Improved selection of text portion displayed in search results [Dirk] - Fixed an error that occured after deleting a trackback [Dirk] - Replace autotags in search results (bug #0000887) [Dirk] -- Don't insist on an email adress when editing a Remote User (bug #0000885) +- Don't insist on an email address when editing a Remote User (bug #0000885) [Dirk] - Added a config option to send an X-FRAME-OPTIONS HTTP header to prevent "clickjacking" (requires browser support) [Dirk] - Prevent XSS in the install script (reported independently by Nemesis and MaXe) [Dirk] - Removed old plugin API function plugin_commentsupport from the Calendar, - Polls, and Static Pages plugins. + Polls, and Static Pages plugins [Dirk] - Updated Japanese language files and Japanese documentation, provided by the Geeklog.jp group +Calendar plugin +--------------- +- Fixed leap year check [Sean Clark] + Polls plugin ------------ - Update polls comments when changing a poll's ID so the comments don't become diff -r 711f03b24fef -r a5fd4b122d3c system/lib-comment.php --- a/system/lib-comment.php Sat Jun 13 10:35:33 2009 +0200 +++ b/system/lib-comment.php Sat Jun 13 15:39:45 2009 +0200 @@ -1635,8 +1635,8 @@ } /** - * Disables comments for all stories where current time is past comment expire time and - * enables comments for certain number of most recent stories. + * Disables comments for all stories where current time is past comment expire + * time and enables comments for certain number of most recent stories. * * @copyright Jared Wenerd 2008 * @author Jared Wenerd, wenerd87 AT gmail DOT com @@ -1644,20 +1644,23 @@ function CMT_updateCommentcodes() { global $_CONF, $_TABLES; - + if ($_CONF['comment_close_rec_stories'] > 0) { - $results = DB_query("SELECT sid FROM {$_TABLES['stories']} ORDER BY date DESC LIMIT {$_CONF['comment_close_rec_stories']}"); - while($A = DB_fetchArray($results)) { + $results = DB_query("SELECT sid FROM {$_TABLES['stories']} WHERE (date <= NOW()) AND (draft_flag = 0) ORDER BY date DESC LIMIT {$_CONF['comment_close_rec_stories']}"); + while ($A = DB_fetchArray($results)) { $allowedcomments[] = $A['sid']; } - //update comment codes. - $sql = ''; - foreach ($allowedcomments as $sid) { - $sql .= "AND sid <> '$sid' "; + // update comment codes + $sql = ' AND '; + if (count($allowedcomments) > 1) { + $sql .= "sid NOT IN ('" . implode("','", $allowedcomments) . "')"; + } else { + $sql .= "sid <> '$sid'"; } - $sql = "UPDATE {$_TABLES['stories']} SET commentcode = 1 WHERE commentcode = 0 " . $sql; + $sql = "UPDATE {$_TABLES['stories']} SET commentcode = 1 WHERE (commentcode = 0) AND (date < NOW()) AND (draft_flag = 0)" . $sql; DB_query($sql); } + $sql = "UPDATE {$_TABLES['stories']} SET commentcode = 1 WHERE UNIX_TIMESTAMP(comment_expire) < UNIX_TIMESTAMP() AND UNIX_TIMESTAMP(comment_expire) <> 0"; DB_query($sql); } diff -r 711f03b24fef -r a5fd4b122d3c system/lib-story.php --- a/system/lib-story.php Sat Jun 13 10:35:33 2009 +0200 +++ b/system/lib-story.php Sat Jun 13 15:39:45 2009 +0200 @@ -876,7 +876,9 @@ */ function STORY_doDeleteThisStoryNow($sid) { - global $_TABLES; + global $_CONF, $_TABLES; + + require_once $_CONF['path_system'] . 'lib-comment.php'; STORY_deleteImages($sid); DB_delete($_TABLES['comments'], array('sid', 'type'), @@ -891,6 +893,7 @@ // update RSS feed and Older Stories block COM_rdfUpToDateCheck(); COM_olderStuff(); + CMT_updateCommentcodes(); } /** @@ -928,6 +931,8 @@ return PLG_RET_AUTH_FAILED; } + require_once $_CONF['path_system'] . 'lib-comment.php'; + $gl_edit = false; if (isset($args['gl_edit'])) { $gl_edit = $args['gl_edit']; @@ -1287,7 +1292,8 @@ // update feed(s) and Older Stories block COM_rdfUpToDateCheck('article', $story->DisplayElements('tid'), $sid); - COM_olderStuff (); + COM_olderStuff(); + CMT_updateCommentcodes(); if ($story->type == 'submission') { $output = COM_refresh ($_CONF['site_admin_url'] . '/moderation.php?msg=9'); From geeklog-cvs at lists.geeklog.net Sat Jun 13 12:11:16 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 13 Jun 2009 12:11:16 -0400 Subject: [geeklog-cvs] geeklog: Allow searching by topic (without a query string) again... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/037e7d93b0cf changeset: 7113:037e7d93b0cf user: Dirk Haun date: Sat Jun 13 18:04:05 2009 +0200 description: Allow searching by topic (without a query string) again (reported by Markus Wollschl?ger) diffstat: public_html/docs/history | 2 ++ system/classes/search.class.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diffs (24 lines): diff -r 3d8864e5cccb -r 037e7d93b0cf public_html/docs/history --- a/public_html/docs/history Sat Jun 13 17:17:36 2009 +0200 +++ b/public_html/docs/history Sat Jun 13 18:04:05 2009 +0200 @@ -11,6 +11,8 @@ + Comment moderation and editable comments, by Jared Wenerd Changes since 1.6.0b2: +- Allow searching by topic (without a query string) again (reported by Markus + Wollschl?ger) [Dirk] - Fixed handling of $_CONF['comment_close_rec_stories'] (bug #0000899) [Dirk] - Improved selection of text portion displayed in search results [Dirk] - Fixed an error that occured after deleting a trackback [Dirk] diff -r 3d8864e5cccb -r 037e7d93b0cf system/classes/search.class.php --- a/system/classes/search.class.php Sat Jun 13 17:17:36 2009 +0200 +++ b/system/classes/search.class.php Sat Jun 13 18:04:05 2009 +0200 @@ -475,7 +475,7 @@ // Make sure there is a query string // Full text searches have a minimum word length of 3 by default - if ((empty($this->_query) && empty($this->_author)) || ($_CONF['search_use_fulltext'] && strlen($this->_query) < 3)) + if ((empty($this->_query) && empty($this->_author) && empty($this->_topic)) || ($_CONF['search_use_fulltext'] && strlen($this->_query) < 3)) { $retval = '

' . $LANG09[41] . '

' . LB; $retval .= $this->showForm(); From geeklog-cvs at lists.geeklog.net Sat Jun 13 12:11:15 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 13 Jun 2009 12:11:15 -0400 Subject: [geeklog-cvs] geeklog: Make sure the HTML width attribute has an integer value Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3d8864e5cccb changeset: 7112:3d8864e5cccb user: Dirk Haun date: Sat Jun 13 17:17:36 2009 +0200 description: Make sure the HTML width attribute has an integer value diffstat: plugins/polls/functions.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a5fd4b122d3c -r 3d8864e5cccb plugins/polls/functions.inc --- a/plugins/polls/functions.inc Sat Jun 13 15:39:45 2009 +0200 +++ b/plugins/polls/functions.inc Sat Jun 13 17:17:36 2009 +0200 @@ -864,7 +864,7 @@ if ($scale < 120) { $poll->parse('poll_votes', 'votes_num', true ); } else { - $width = $percent * $scale; + $width = (int)($percent * $scale); $poll->set_var('bar_width', $width); $poll->parse('poll_votes', 'votes_bar', true); } From geeklog-cvs at lists.geeklog.net Sat Jun 13 15:33:17 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 13 Jun 2009 15:33:17 -0400 Subject: [geeklog-cvs] geeklog: Implemented PLG_getCommentUrlId for the Static Pages pl... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/312720d3f539 changeset: 7116:312720d3f539 user: Dirk Haun date: Sat Jun 13 21:28:07 2009 +0200 description: Implemented PLG_getCommentUrlId for the Static Pages plugin diffstat: plugins/staticpages/functions.inc | 21 +++++++++++++++++++++ public_html/docs/history | 1 + 2 files changed, 22 insertions(+), 0 deletions(-) diffs (40 lines): diff -r f6f31488be02 -r 312720d3f539 plugins/staticpages/functions.inc --- a/plugins/staticpages/functions.inc Sat Jun 13 21:18:12 2009 +0200 +++ b/plugins/staticpages/functions.inc Sat Jun 13 21:28:07 2009 +0200 @@ -1368,4 +1368,25 @@ return $retval; } +/** +* Provide URL and ID for the link to a comment's parent +* +* NOTE: The Plugin API does not support $_CONF['url_rewrite'] here, +* so we'll end up with a non-rewritten URL ... +* +* @return array array consisting of the base URL and the ID name +* +*/ +function plugin_getcommenturlid_staticpages() +{ + global $_CONF; + + $tmp = array( + $_CONF['site_url'] . '/staticpages/index.php', + 'page' + ); + + return $tmp; +} + ?> diff -r f6f31488be02 -r 312720d3f539 public_html/docs/history --- a/public_html/docs/history Sat Jun 13 21:18:12 2009 +0200 +++ b/public_html/docs/history Sat Jun 13 21:28:07 2009 +0200 @@ -42,6 +42,7 @@ Static Pages plugin ------------------- +- Implemented PLG_getCommentUrlId [Dirk] - Update static pages comments when changing a page's ID so the comments don't become orphaned (part of bug #0000901) [Dirk] - When deleting a static page, also delete its comments (bug #0000901) [Dirk] From geeklog-cvs at lists.geeklog.net Sat Jun 13 15:33:16 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 13 Jun 2009 15:33:16 -0400 Subject: [geeklog-cvs] geeklog: & -> & Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/cf17ba63ceb9 changeset: 7114:cf17ba63ceb9 user: Dirk Haun date: Sat Jun 13 18:18:12 2009 +0200 description: & -> & diffstat: system/classes/search.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 037e7d93b0cf -r cf17ba63ceb9 system/classes/search.class.php --- a/system/classes/search.class.php Sat Jun 13 18:04:05 2009 +0200 +++ b/system/classes/search.class.php Sat Jun 13 18:18:12 2009 +0200 @@ -745,7 +745,7 @@ } if (isset($this->_append_query[$row[SQL_NAME]]) && $this->_append_query[$row[SQL_NAME]]) { - $row['url'] .= (strpos($row['url'],'?') ? '&' : '?') . 'query=' . urlencode($this->_query); + $row['url'] .= (strpos($row['url'],'?') ? '&' : '?') . 'query=' . urlencode($this->_query); } } From geeklog-cvs at lists.geeklog.net Sat Jun 13 15:33:17 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 13 Jun 2009 15:33:17 -0400 Subject: [geeklog-cvs] geeklog: Implemented PLG_getCommentUrlId for the Polls plugin Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b32249a55222 changeset: 7117:b32249a55222 user: Dirk Haun date: Sat Jun 13 21:29:28 2009 +0200 description: Implemented PLG_getCommentUrlId for the Polls plugin diffstat: plugins/polls/functions.inc | 18 ++++++++++++++++++ public_html/docs/history | 1 + 2 files changed, 19 insertions(+), 0 deletions(-) diffs (37 lines): diff -r 312720d3f539 -r b32249a55222 plugins/polls/functions.inc --- a/plugins/polls/functions.inc Sat Jun 13 21:28:07 2009 +0200 +++ b/plugins/polls/functions.inc Sat Jun 13 21:29:28 2009 +0200 @@ -1347,4 +1347,22 @@ return $retval; } +/** +* Provide URL and ID for the link to a comment's parent +* +* @return array array consisting of the base URL and the ID name +* +*/ +function plugin_getcommenturlid_polls() +{ + global $_CONF; + + $tmp = array( + $_CONF['site_url'] . '/polls/index.php', + 'pid' + ); + + return $tmp; +} + ?> diff -r 312720d3f539 -r b32249a55222 public_html/docs/history --- a/public_html/docs/history Sat Jun 13 21:28:07 2009 +0200 +++ b/public_html/docs/history Sat Jun 13 21:29:28 2009 +0200 @@ -37,6 +37,7 @@ Polls plugin ------------ +- Implemented PLG_getCommentUrlId [Dirk] - Update polls comments when changing a poll's ID so the comments don't become orphaned (part of bug #0000901) [Dirk] From geeklog-cvs at lists.geeklog.net Sat Jun 13 15:33:16 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 13 Jun 2009 15:33:16 -0400 Subject: [geeklog-cvs] geeklog: Made the link to a comment's parent object from the com... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f6f31488be02 changeset: 7115:f6f31488be02 user: Dirk Haun date: Sat Jun 13 21:18:12 2009 +0200 description: Made the link to a comment's parent object from the comment bar work properly for plugins diffstat: public_html/docs/history | 2 ++ system/lib-comment.php | 44 ++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diffs (71 lines): diff -r cf17ba63ceb9 -r f6f31488be02 public_html/docs/history --- a/public_html/docs/history Sat Jun 13 18:18:12 2009 +0200 +++ b/public_html/docs/history Sat Jun 13 21:18:12 2009 +0200 @@ -11,6 +11,8 @@ + Comment moderation and editable comments, by Jared Wenerd Changes since 1.6.0b2: +- Made the link to a comment's parent object from the comment bar work properly + for plugins [Dirk] - Allow searching by topic (without a query string) again (reported by Markus Wollschl?ger) [Dirk] - Fixed handling of $_CONF['comment_close_rec_stories'] (bug #0000899) [Dirk] diff -r cf17ba63ceb9 -r f6f31488be02 system/lib-comment.php --- a/system/lib-comment.php Sat Jun 13 18:18:12 2009 +0200 +++ b/system/lib-comment.php Sat Jun 13 21:18:12 2009 +0200 @@ -93,33 +93,33 @@ $cmt_title = stripslashes($title); $commentbar->set_var('story_title', $cmt_title); // Article's are pre-escaped. - if( $type != 'article' ) { + if ($type != 'article') { $cmt_title = htmlspecialchars($cmt_title); } $commentbar->set_var('comment_title', $cmt_title); - if( $type == 'article' ) { - $articleUrl = COM_buildUrl( $_CONF['site_url'] - . "/article.php?story=$sid" ); - $commentbar->set_var( 'story_link', $articleUrl ); - $commentbar->set_var( 'article_url', $articleUrl ); + if ($type == 'article') { + $articleUrl = COM_buildUrl($_CONF['site_url'] + . "/article.php?story=$sid"); + } else { // for a plugin + /** + * Link to plugin defined link or lacking that a generic link + * that the plugin should support (hopefully) + */ + list($plgurl, $plgid) = PLG_getCommentUrlId($type); + $articleUrl = "$plgurl?$plgid=$sid"; + } - if( $page == 'comment.php' ) { - $commentbar->set_var('story_link', - COM_createLink( - stripslashes( $title ), - $articleUrl, - array('class'=>'non-ul b') - ) - ); - $commentbar->set_var( 'start_storylink_anchortag', '' ); - $commentbar->set_var( 'end_storylink_anchortag', '' ); - } - } else { // for a plugin - // Link to plugin defined link or lacking that a generic link that the plugin should support (hopefully) - list($plgurl, $plgid) = PLG_getCommentUrlId($type); - $commentbar->set_var( 'story_link', "$plgurl?$plgid=$sid" ); + $commentbar->set_var('article_url', $articleUrl); + if ($page == 'comment.php') { + $link = COM_createLink($cmt_title, $articleUrl, + array('class' => 'non-ul b')); + $commentbar->set_var('story_link', $link); + $commentbar->set_var('start_storylink_anchortag', + ''); + $commentbar->set_var('end_storylink_anchortag', ''); + } else { + $commentbar->set_var('story_link', $articleUrl); } if( !empty( $_USER['uid'] ) && ( $_USER['uid'] > 1 )) { From geeklog-cvs at lists.geeklog.net Sat Jun 13 17:49:27 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 13 Jun 2009 17:49:27 -0400 Subject: [geeklog-cvs] geeklog: Update URL in $_CONF['ip_lookup'] during migration Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3ccad374734d changeset: 7118:3ccad374734d user: Dirk Haun date: Sat Jun 13 22:21:51 2009 +0200 description: Update URL in $_CONF['ip_lookup'] during migration diffstat: public_html/admin/install/migrate.php | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r b32249a55222 -r 3ccad374734d public_html/admin/install/migrate.php --- a/public_html/admin/install/migrate.php Sat Jun 13 21:29:28 2009 +0200 +++ b/public_html/admin/install/migrate.php Sat Jun 13 22:21:51 2009 +0200 @@ -785,6 +785,12 @@ $config->set('noreply_mail', $_CONF['noreply_mail']); } + if (! empty($_OLD_CONF['ip_lookup'])) { + $_CONF['ip_lookup'] = str_replace($_OLD_CONF['site_url'], + $_CONF['site_url'], $_OLD_CONF['ip_lookup']); + $config->set('ip_lookup', $_CONF['ip_lookup']); + } + /** * Check for missing plugins */ From geeklog-cvs at lists.geeklog.net Sun Jun 14 10:30:32 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 14 Jun 2009 10:30:32 -0400 Subject: [geeklog-cvs] geeklog: Fixed permissions when searching personal events. Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/53deb21cc6b3 changeset: 7119:53deb21cc6b3 user: Sami Barakat date: Sun Jun 14 15:29:08 2009 +0100 description: Fixed permissions when searching personal events. diffstat: plugins/calendar/functions.inc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (23 lines): diff -r 3ccad374734d -r 53deb21cc6b3 plugins/calendar/functions.inc --- a/plugins/calendar/functions.inc Sat Jun 13 22:21:51 2009 +0200 +++ b/plugins/calendar/functions.inc Sun Jun 14 15:29:08 2009 +0100 @@ -1605,7 +1605,7 @@ */ function plugin_dopluginsearch_calendar($query, $datestart, $dateend, $topic, $type, $author, $keyType, $page, $perpage) { - global $_TABLES, $LANG_CAL_1; + global $_TABLES, $_USER, $LANG_CAL_1; // Make sure the query is SQL safe $query = trim(addslashes($query)); @@ -1615,8 +1615,8 @@ $sql_e .= "FROM {$_TABLES['events']} WHERE 1=1 "; $sql_p = "SELECT eid AS id, title, description, UNIX_TIMESTAMP(datestart) AS date, owner_id AS uid, "; - $sql_p .= "CONCAT('/calendar/event.php?eid=',eid) AS url "; - $sql_p .= "FROM {$_TABLES['personal_events']} WHERE 1=1 "; + $sql_p .= "CONCAT('/calendar/event.php?mode=personal&eid=',eid) AS url "; + $sql_p .= "FROM {$_TABLES['personal_events']} WHERE (uid = {$_USER['uid']}) "; $sql = COM_getPermSQL('AND') . ' '; From geeklog-cvs at lists.geeklog.net Sun Jun 14 10:43:08 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 14 Jun 2009 10:43:08 -0400 Subject: [geeklog-cvs] geeklog: Display user friendly text instead of LF_NULL in search... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1eac383649c6 changeset: 7120:1eac383649c6 user: Sami Barakat date: Sun Jun 14 15:42:23 2009 +0100 description: Display user friendly text instead of LF_NULL in search results diffstat: system/classes/search.class.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 53deb21cc6b3 -r 1eac383649c6 system/classes/search.class.php --- a/system/classes/search.class.php Sun Jun 14 15:29:08 2009 +0100 +++ b/system/classes/search.class.php Sun Jun 14 15:42:23 2009 +0100 @@ -753,7 +753,9 @@ $row['title'] = stripslashes(str_replace('$', '$', $row['title'])); $row['title'] = COM_createLink($row['title'], $row['url']); - if ($row['description'] != '' . $LANG09[70] . '') { + if ($row['description'] == 'LF_NULL') { + $row['description'] = '' . $LANG09[70] . ''; + } elseif ($row['description'] != '' . $LANG09[70] . '') { $row['description'] = stripslashes($this->_shortenText($this->_query, PLG_replaceTags($row['description']), $this->_wordlength)); } From geeklog-cvs at lists.geeklog.net Mon Jun 15 06:53:19 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Mon, 15 Jun 2009 06:53:19 -0400 Subject: [geeklog-cvs] geeklog: Minor improvement: Don't search through the personal ca... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1f0d602ba92b changeset: 7121:1f0d602ba92b user: Dirk Haun date: Mon Jun 15 12:53:08 2009 +0200 description: Minor improvement: Don't search through the personal calendar for anonymous users diffstat: plugins/calendar/functions.inc | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diffs (35 lines): diff -r 1eac383649c6 -r 1f0d602ba92b plugins/calendar/functions.inc --- a/plugins/calendar/functions.inc Sun Jun 14 15:42:23 2009 +0100 +++ b/plugins/calendar/functions.inc Mon Jun 15 12:53:08 2009 +0200 @@ -1610,13 +1610,19 @@ // Make sure the query is SQL safe $query = trim(addslashes($query)); + if (COM_isAnonUser()) { + $uid = 1; + } else { + $uid = $_USER['uid']; + } + $sql_e = "SELECT eid AS id, title, description, UNIX_TIMESTAMP(datestart) AS date, owner_id AS uid, hits, "; $sql_e .= "CONCAT('/calendar/event.php?eid=',eid) AS url "; $sql_e .= "FROM {$_TABLES['events']} WHERE 1=1 "; $sql_p = "SELECT eid AS id, title, description, UNIX_TIMESTAMP(datestart) AS date, owner_id AS uid, "; $sql_p .= "CONCAT('/calendar/event.php?mode=personal&eid=',eid) AS url "; - $sql_p .= "FROM {$_TABLES['personal_events']} WHERE (uid = {$_USER['uid']}) "; + $sql_p .= "FROM {$_TABLES['personal_events']} WHERE (uid = $uid) "; $sql = COM_getPermSQL('AND') . ' '; @@ -1644,6 +1650,10 @@ $search_e->setFTSQL($ftsql_tmp); $search_e->setRank(2); + if (COM_isAnonUser()) { + return $search_e; + } + // Search personal events $search_p = new SearchCriteria('calendar', array($LANG_CAL_1[16],$LANG_CAL_1[23])); $columns = array('title' => 'title', 'location', 'description'); From geeklog-cvs at lists.geeklog.net Mon Jun 15 10:08:46 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Mon, 15 Jun 2009 10:08:46 -0400 Subject: [geeklog-cvs] geeklog: Added support for Bcc - Blind copy. Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3b8700815448 changeset: 7122:3b8700815448 user: blaine Lang date: Mon Jun 15 10:07:53 2009 -0400 description: Added support for Bcc - Blind copy. diffstat: public_html/lib-common.php | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diffs (71 lines): diff -r 1f0d602ba92b -r 3b8700815448 public_html/lib-common.php --- a/public_html/lib-common.php Mon Jun 15 12:53:08 2009 +0200 +++ b/public_html/lib-common.php Mon Jun 15 10:07:53 2009 -0400 @@ -1360,7 +1360,7 @@ } else { $displayRightBlocks = false; } - + if ($displayRightBlocks) { /* Check if an array has been passed that includes the name of a plugin @@ -1379,7 +1379,7 @@ } else { $rblocks = COM_showBlocks( 'right', $topic ); } - + if( empty( $rblocks )) { $footer->set_var( 'geeklog_blocks', ''); @@ -3177,10 +3177,11 @@ * @param boolean $html (optional) true if to be sent as HTML email * @param int $priority (optional) add X-Priority header, if > 0 * @param string $cc (optional) other recipients (name + email) +* @param string $bcc (optional) Blind Copy recipients * @return boolean true if successful, otherwise false * */ -function COM_mail( $to, $subject, $message, $from = '', $html = false, $priority = 0, $cc = '' ) +function COM_mail( $to, $subject, $message, $from = '', $html = false, $priority = 0, $cc = '', $bcc = '' ) { global $_CONF; @@ -3193,6 +3194,7 @@ $to = substr( $to, 0, strcspn( $to, "\r\n" )); $cc = substr( $cc, 0, strcspn( $cc, "\r\n" )); + $bcc = substr( $bcc, 0, strcspn( $bcc, "\r\n" )); $from = substr( $from, 0, strcspn( $from, "\r\n" )); $subject = substr( $subject, 0, strcspn( $subject, "\r\n" )); $subject = COM_emailEscape( $subject ); @@ -3232,6 +3234,10 @@ { $headers['Cc'] = $cc; } + if( !empty( $bcc )) + { + $headers['Bcc'] = $bcc; + } $headers['Date'] = date( 'r' ); // RFC822 formatted date if( $method == 'smtp' ) { @@ -3568,7 +3574,7 @@ $A = DB_fetchArray($result); } } - + if( array_key_exists( 'onleft', $A ) ) { if( $A['onleft'] == 1 ) @@ -4490,7 +4496,7 @@ * * Display one of the predefined messages from the $MESSAGE array. If a plugin * name is provided, display that plugin's message instead. -* +* * @param int $msg ID of message to show * @param string $plugin Optional name of plugin to lookup plugin defined message * @return string HTML block with message From geeklog-cvs at lists.geeklog.net Mon Jun 15 15:52:15 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Mon, 15 Jun 2009 15:52:15 -0400 Subject: [geeklog-cvs] geeklog: Forgot to also add $bcc to the CUSTOM_mail function call Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/2c5f2140eb1e changeset: 7123:2c5f2140eb1e user: blaine Lang date: Mon Jun 15 15:51:47 2009 -0400 description: Forgot to also add $bcc to the CUSTOM_mail function call diffstat: public_html/lib-common.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3b8700815448 -r 2c5f2140eb1e public_html/lib-common.php --- a/public_html/lib-common.php Mon Jun 15 10:07:53 2009 -0400 +++ b/public_html/lib-common.php Mon Jun 15 15:51:47 2009 -0400 @@ -3201,7 +3201,7 @@ if( function_exists( 'CUSTOM_mail' )) { - return CUSTOM_mail( $to, $subject, $message, $from, $html, $priority, $cc ); + return CUSTOM_mail( $to, $subject, $message, $from, $html, $priority, $cc, $bcc ); } include_once( 'Mail.php' ); From geeklog-cvs at lists.geeklog.net Wed Jun 17 06:22:49 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Wed, 17 Jun 2009 06:22:49 -0400 Subject: [geeklog-cvs] geeklog: Recycled some existing bits and pieces for a more promi... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/a10c297ec922 changeset: 7124:a10c297ec922 user: Dirk Haun date: Wed Jun 17 12:19:56 2009 +0200 description: Recycled some existing bits and pieces for a more prominent reminder to remove the install script diffstat: public_html/index.php | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diffs (39 lines): diff -r 2c5f2140eb1e -r a10c297ec922 public_html/index.php --- a/public_html/index.php Mon Jun 15 15:51:47 2009 -0400 +++ b/public_html/index.php Wed Jun 17 12:19:56 2009 +0200 @@ -144,6 +144,35 @@ $display .= COM_showMessage (COM_applyFilter ($_GET['msg'], true), $plugin); } +if (SEC_inGroup('Root')) { + $done = DB_getItem($_TABLES['vars'], 'value', "name = 'security_check'"); + if ($done != 1) { + /** + * we don't have the path to the admin directory, so try to figure it + * out from $_CONF['site_admin_url'] + * @todo FIXME: this duplicates some code from admin/sectest.php + */ + $adminurl = $_CONF['site_admin_url']; + if (strrpos($adminurl, '/') == strlen($adminurl)) { + $adminurl = substr($adminurl, 0, -1); + } + $pos = strrpos($adminurl, '/'); + if ($pos === false) { + // only guessing ... + $installdir = $_CONF['path_html'] . 'admin/install'; + } else { + $installdir = $_CONF['path_html'] . substr($adminurl, $pos + 1) + . '/install'; + } + + if (is_dir($installdir)) { + // deliberatly NOT print the actual path to the install dir + $secmsg = sprintf($LANG_SECTEST['remove_inst'], '') + . ' ' . $MESSAGE[92]; + $display .= COM_showMessageText($secmsg); + } + } +} // Show any Plugin formatted blocks // Requires a plugin to have a function called plugin_centerblock_ From geeklog-cvs at lists.geeklog.net Thu Jun 18 14:17:35 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Thu, 18 Jun 2009 14:17:35 -0400 Subject: [geeklog-cvs] geeklog: (X)HTML fixes (bug #0000907) Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/a6bebd4747e6 changeset: 7125:a6bebd4747e6 user: Dirk Haun date: Thu Jun 18 20:16:20 2009 +0200 description: (X)HTML fixes (bug #0000907) diffstat: public_html/layout/professional/admin/config/config_element.thtml | 2 +- public_html/layout/professional/admin/config/configuration.thtml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (26 lines): diff -r a10c297ec922 -r a6bebd4747e6 public_html/layout/professional/admin/config/config_element.thtml --- a/public_html/layout/professional/admin/config/config_element.thtml Wed Jun 17 12:19:56 2009 +0200 +++ b/public_html/layout/professional/admin/config/config_element.thtml Thu Jun 18 20:16:20 2009 +0200 @@ -22,7 +22,7 @@

diff -r a10c297ec922 -r a6bebd4747e6 public_html/layout/professional/admin/config/configuration.thtml --- a/public_html/layout/professional/admin/config/configuration.thtml Wed Jun 17 12:19:56 2009 +0200 +++ b/public_html/layout/professional/admin/config/configuration.thtml Thu Jun 18 20:16:20 2009 +0200 @@ -35,8 +35,8 @@

?? ???	?????????	??????
???????????????????????????(calendarloginrequired)	?????????(0)	??????(1)???????????????????????????????????????????????????????????????????????????????????? + ?????????????????????????????????????? ??????????????? - ????????????????????????????????? - Geeklog - ??????????????????????????????????????????????????????????????????(loginrequired)????????????????????????? ??????????????????????????????????????????????????????????????????????????????????(1)???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
??????????????????????????????(hidecalendarmenu)	?????????(0)	??????(1)?????????????????????????????????????????????????????????????????????????????????????????????
????????????????????????????????????(personalcalendars)	?????????(0)	??????(1)?????????????????????????????????????????????????????????????????????????????????
????????????????????????????? ???????????????(eventsubmission)	??????(1)	??????(1)?????????????????????????????????????????????????????????????? ??????????? ?????????? ??????????????????????(0)???????????????????????????????????????????????????
?????????????????????????????????(showupcomingevents)	??????(1)	??????(1)?????????????????????????????????????????????????????????????????????????????????
???????????????????????????????????????(upcomingeventsrange)

- - + + {fs_contents}

From geeklog-cvs at lists.geeklog.net Thu Jun 18 16:27:20 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Thu, 18 Jun 2009 16:27:20 -0400 Subject: [geeklog-cvs] geeklog: Fixed IE6 and Safari compatibility issue with sort and ... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/45aff005f42c changeset: 7126:45aff005f42c user: Sami Barakat date: Thu Jun 18 21:25:41 2009 +0100 description: Fixed IE6 and Safari compatibility issue with sort and limit combo boxes in search results (part of bug #0000874) diffstat: public_html/layout/professional/lists/inline/list.thtml | 16 +++++--- public_html/layout/professional/lists/inline/page_limit.thtml | 2 +- public_html/layout/professional/lists/inline/page_sort.thtml | 2 +- public_html/layout/professional/lists/table/list.thtml | 8 ++- public_html/layout/professional/lists/table/page_limit.thtml | 2 +- public_html/layout/professional/lists/table/page_sort.thtml | 2 +- system/classes/listfactory.class.php | 20 +++++----- 7 files changed, 29 insertions(+), 23 deletions(-) diffs (126 lines): diff -r a6bebd4747e6 -r 45aff005f42c public_html/layout/professional/lists/inline/list.thtml --- a/public_html/layout/professional/lists/inline/list.thtml Thu Jun 18 20:16:20 2009 +0200 +++ b/public_html/layout/professional/lists/inline/list.thtml Thu Jun 18 21:25:41 2009 +0100 @@ -1,11 +1,15 @@ {list_top}

- - + + + +

{item_row}

{message}

diff -r a6bebd4747e6 -r 45aff005f42c public_html/layout/professional/lists/inline/page_limit.thtml --- a/public_html/layout/professional/lists/inline/page_limit.thtml Thu Jun 18 20:16:20 2009 +0200 +++ b/public_html/layout/professional/lists/inline/page_limit.thtml Thu Jun 18 21:25:41 2009 +0100 @@ -1,1 +1,1 @@ -{limit_text} +{limit_text} diff -r a6bebd4747e6 -r 45aff005f42c public_html/layout/professional/lists/inline/page_sort.thtml --- a/public_html/layout/professional/lists/inline/page_sort.thtml Thu Jun 18 20:16:20 2009 +0200 +++ b/public_html/layout/professional/lists/inline/page_sort.thtml Thu Jun 18 21:25:41 2009 +0100 @@ -1,1 +1,1 @@ -{sort_text} +{sort_text} diff -r a6bebd4747e6 -r 45aff005f42c public_html/layout/professional/lists/table/list.thtml --- a/public_html/layout/professional/lists/table/list.thtml Thu Jun 18 20:16:20 2009 +0200 +++ b/public_html/layout/professional/lists/table/list.thtml Thu Jun 18 21:25:41 2009 +0100 @@ -1,8 +1,10 @@ {list_top}

- +

diff -r a6bebd4747e6 -r 45aff005f42c public_html/layout/professional/lists/table/page_limit.thtml --- a/public_html/layout/professional/lists/table/page_limit.thtml Thu Jun 18 20:16:20 2009 +0200 +++ b/public_html/layout/professional/lists/table/page_limit.thtml Thu Jun 18 21:25:41 2009 +0100 @@ -1,1 +1,1 @@ -{limit_text} +{limit_text} diff -r a6bebd4747e6 -r 45aff005f42c public_html/layout/professional/lists/table/page_sort.thtml --- a/public_html/layout/professional/lists/table/page_sort.thtml Thu Jun 18 20:16:20 2009 +0200 +++ b/public_html/layout/professional/lists/table/page_sort.thtml Thu Jun 18 21:25:41 2009 +0100 @@ -1,1 +1,1 @@ - + diff -r a6bebd4747e6 -r 45aff005f42c system/classes/listfactory.class.php --- a/system/classes/listfactory.class.php Thu Jun 18 20:16:20 2009 +0200 +++ b/system/classes/listfactory.class.php Thu Jun 18 21:25:41 2009 +0100 @@ -510,20 +510,17 @@ return $retval; } - $subtag = " onmouseover=\"this.style.cursor='pointer';\"" . - " onclick=\"window.location.href='{$this->_page_url}"; - // Draw the page limit select box if ($show_limit) { foreach ($this->_page_limits as $key => $val) { $text = is_numeric($key) ? sprintf($LANG09[67], $val) : $key; - $subtags = $subtag."results=$val';\""; + $href = $this->_page_url . "results=$val"; $selected = $this->_per_page == $val ? ' selected="selected"' : ''; $list_templates->set_var('limit_text', $text); - $list_templates->set_var('limit_subtags', $subtags); + $list_templates->set_var('limit_href', $href); $list_templates->set_var('limit_selected', $selected); $list_templates->parse('page_limit', 'limit', true); } @@ -556,25 +553,28 @@ if ($field['display'] == true && $field['title'] != '') { $text = $sort_text . $field['title']; - $subtags = ''; + $href = ''; $selected = ''; if ($show_sort && $field['sort'] != false) { $direction = $this->_def_sort_arr['direction']; // Show the sort arrow - if ($this->_sort_arr['field'] === $field['name']) - { + if ($this->_sort_arr['field'] === $field['name']) { $selected = $sort_selected; $direction = $this->_sort_arr['direction'] == 'asc' ? 'desc' : 'asc'; } - $subtags = $subtag."order={$field['name']}&direction=$direction';\""; + $href = $this->_page_url . "order={$field['name']}&direction=$direction"; + + if ($this->_style == 'table') { + $text = "$text"; + } } // Write field $list_templates->set_var('sort_text', $text); - $list_templates->set_var('sort_subtags', $subtags); + $list_templates->set_var('sort_href', $href); $list_templates->set_var('sort_selected', $selected); $list_templates->parse('page_sort', 'sort', true); } From geeklog-cvs at lists.geeklog.net Sat Jun 20 10:24:25 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 20 Jun 2009 10:24:25 -0400 Subject: [geeklog-cvs] geeklog: Backed out changeset 3b8700815448 (BCC, part 1) Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/02575bed120a changeset: 7127:02575bed120a user: Dirk Haun date: Sat Jun 20 16:03:38 2009 +0200 description: Backed out changeset 3b8700815448 (BCC, part 1) diffstat: public_html/lib-common.php | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diffs (71 lines): diff -r 3b8700815448 -r 02575bed120a public_html/lib-common.php --- a/public_html/lib-common.php Mon Jun 15 10:07:53 2009 -0400 +++ b/public_html/lib-common.php Sat Jun 20 16:03:38 2009 +0200 @@ -1360,7 +1360,7 @@ } else { $displayRightBlocks = false; } - + if ($displayRightBlocks) { /* Check if an array has been passed that includes the name of a plugin @@ -1379,7 +1379,7 @@ } else { $rblocks = COM_showBlocks( 'right', $topic ); } - + if( empty( $rblocks )) { $footer->set_var( 'geeklog_blocks', ''); @@ -3177,11 +3177,10 @@ * @param boolean $html (optional) true if to be sent as HTML email * @param int $priority (optional) add X-Priority header, if > 0 * @param string $cc (optional) other recipients (name + email) -* @param string $bcc (optional) Blind Copy recipients * @return boolean true if successful, otherwise false * */ -function COM_mail( $to, $subject, $message, $from = '', $html = false, $priority = 0, $cc = '', $bcc = '' ) +function COM_mail( $to, $subject, $message, $from = '', $html = false, $priority = 0, $cc = '' ) { global $_CONF; @@ -3194,7 +3193,6 @@ $to = substr( $to, 0, strcspn( $to, "\r\n" )); $cc = substr( $cc, 0, strcspn( $cc, "\r\n" )); - $bcc = substr( $bcc, 0, strcspn( $bcc, "\r\n" )); $from = substr( $from, 0, strcspn( $from, "\r\n" )); $subject = substr( $subject, 0, strcspn( $subject, "\r\n" )); $subject = COM_emailEscape( $subject ); @@ -3234,10 +3232,6 @@ { $headers['Cc'] = $cc; } - if( !empty( $bcc )) - { - $headers['Bcc'] = $bcc; - } $headers['Date'] = date( 'r' ); // RFC822 formatted date if( $method == 'smtp' ) { @@ -3574,7 +3568,7 @@ $A = DB_fetchArray($result); } } - + if( array_key_exists( 'onleft', $A ) ) { if( $A['onleft'] == 1 ) @@ -4496,7 +4490,7 @@ * * Display one of the predefined messages from the $MESSAGE array. If a plugin * name is provided, display that plugin's message instead. -* +* * @param int $msg ID of message to show * @param string $plugin Optional name of plugin to lookup plugin defined message * @return string HTML block with message From geeklog-cvs at lists.geeklog.net Sat Jun 20 10:24:27 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 20 Jun 2009 10:24:27 -0400 Subject: [geeklog-cvs] geeklog: Updated documentation Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/275a68d472bb changeset: 7131:275a68d472bb user: Dirk Haun date: Sat Jun 20 16:21:23 2009 +0200 description: Updated documentation diffstat: public_html/docs/english/theme.html | 3 +++ public_html/docs/history | 6 +++++- 2 files changed, 8 insertions(+), 1 deletions(-) diffs (35 lines): diff -r c92cfd61bea2 -r 275a68d472bb public_html/docs/english/theme.html --- a/public_html/docs/english/theme.html Sat Jun 20 16:06:51 2009 +0200 +++ b/public_html/docs/english/theme.html Sat Jun 20 16:21:23 2009 +0200 @@ -250,6 +250,9 @@ file: The header (including the icon, links, and the instructions) is now generated by Geeklog. The <table> that contained these elements has been removed from the template file. +

Configuration: config_element.thtml was missing a closing + </option> tag; the <col> tags in + configuration.thtml were not XHTML compliant.

Search

diff -r c92cfd61bea2 -r 275a68d472bb public_html/docs/history --- a/public_html/docs/history Sat Jun 20 16:06:51 2009 +0200 +++ b/public_html/docs/history Sat Jun 20 16:21:23 2009 +0200 @@ -1,6 +1,6 @@ Geeklog History/Changes: -Jun 1?, 2009 (1.6.0b3) +Jun 2?, 2009 (1.6.0b3) ------------ Geeklog 1.6.0 incorporates the following projects implemented during @@ -11,6 +11,10 @@ + Comment moderation and editable comments, by Jared Wenerd Changes since 1.6.0b2: +- Fixed IE6 and Safari compatibility issue with sort and limit combo boxes in + search results (part of bug #0000874) [Sami] +- Fixed HTML in the Configuration (bug #0000907) [Dirk] +- Added a more prominent reminder to remove the install script [Dirk] - Made the link to a comment's parent object from the comment bar work properly for plugins [Dirk] - Allow searching by topic (without a query string) again (reported by Markus From geeklog-cvs at lists.geeklog.net Sat Jun 20 10:24:26 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 20 Jun 2009 10:24:26 -0400 Subject: [geeklog-cvs] geeklog: Backing out Blaine's BCC changes (for later) Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5ea3e9d5a82e changeset: 7129:5ea3e9d5a82e user: Dirk Haun date: Sat Jun 20 16:06:40 2009 +0200 description: Backing out Blaine's BCC changes (for later) diffstat: public_html/lib-common.php | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diffs (71 lines): diff -r 45aff005f42c -r 5ea3e9d5a82e public_html/lib-common.php --- a/public_html/lib-common.php Thu Jun 18 21:25:41 2009 +0100 +++ b/public_html/lib-common.php Sat Jun 20 16:06:40 2009 +0200 @@ -1360,7 +1360,7 @@ } else { $displayRightBlocks = false; } - + if ($displayRightBlocks) { /* Check if an array has been passed that includes the name of a plugin @@ -1379,7 +1379,7 @@ } else { $rblocks = COM_showBlocks( 'right', $topic ); } - + if( empty( $rblocks )) { $footer->set_var( 'geeklog_blocks', ''); @@ -3177,11 +3177,10 @@ * @param boolean $html (optional) true if to be sent as HTML email * @param int $priority (optional) add X-Priority header, if > 0 * @param string $cc (optional) other recipients (name + email) -* @param string $bcc (optional) Blind Copy recipients * @return boolean true if successful, otherwise false * */ -function COM_mail( $to, $subject, $message, $from = '', $html = false, $priority = 0, $cc = '', $bcc = '' ) +function COM_mail( $to, $subject, $message, $from = '', $html = false, $priority = 0, $cc = '' ) { global $_CONF; @@ -3194,7 +3193,6 @@ $to = substr( $to, 0, strcspn( $to, "\r\n" )); $cc = substr( $cc, 0, strcspn( $cc, "\r\n" )); - $bcc = substr( $bcc, 0, strcspn( $bcc, "\r\n" )); $from = substr( $from, 0, strcspn( $from, "\r\n" )); $subject = substr( $subject, 0, strcspn( $subject, "\r\n" )); $subject = COM_emailEscape( $subject ); @@ -3234,10 +3232,6 @@ { $headers['Cc'] = $cc; } - if( !empty( $bcc )) - { - $headers['Bcc'] = $bcc; - } $headers['Date'] = date( 'r' ); // RFC822 formatted date if( $method == 'smtp' ) { @@ -3574,7 +3568,7 @@ $A = DB_fetchArray($result); } } - + if( array_key_exists( 'onleft', $A ) ) { if( $A['onleft'] == 1 ) @@ -4496,7 +4490,7 @@ * * Display one of the predefined messages from the $MESSAGE array. If a plugin * name is provided, display that plugin's message instead. -* +* * @param int $msg ID of message to show * @param string $plugin Optional name of plugin to lookup plugin defined message * @return string HTML block with message From geeklog-cvs at lists.geeklog.net Sat Jun 20 10:24:25 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 20 Jun 2009 10:24:25 -0400 Subject: [geeklog-cvs] geeklog: Backed out changeset 2c5f2140eb1e (BCC, part 2) Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/506c6c7c6cb9 changeset: 7128:506c6c7c6cb9 user: Dirk Haun date: Sat Jun 20 16:04:18 2009 +0200 description: Backed out changeset 2c5f2140eb1e (BCC, part 2) diffstat: public_html/lib-common.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2c5f2140eb1e -r 506c6c7c6cb9 public_html/lib-common.php --- a/public_html/lib-common.php Mon Jun 15 15:51:47 2009 -0400 +++ b/public_html/lib-common.php Sat Jun 20 16:04:18 2009 +0200 @@ -3201,7 +3201,7 @@ if( function_exists( 'CUSTOM_mail' )) { - return CUSTOM_mail( $to, $subject, $message, $from, $html, $priority, $cc, $bcc ); + return CUSTOM_mail( $to, $subject, $message, $from, $html, $priority, $cc ); } include_once( 'Mail.php' ); From geeklog-cvs at lists.geeklog.net Sat Jun 20 10:24:26 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 20 Jun 2009 10:24:26 -0400 Subject: [geeklog-cvs] geeklog: Backing out Blaine's BCC changes (for later) Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c92cfd61bea2 changeset: 7130:c92cfd61bea2 user: Dirk Haun date: Sat Jun 20 16:06:51 2009 +0200 description: Backing out Blaine's BCC changes (for later) diffstat: public_html/lib-common.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5ea3e9d5a82e -r c92cfd61bea2 public_html/lib-common.php --- a/public_html/lib-common.php Sat Jun 20 16:06:40 2009 +0200 +++ b/public_html/lib-common.php Sat Jun 20 16:06:51 2009 +0200 @@ -3199,7 +3199,7 @@ if( function_exists( 'CUSTOM_mail' )) { - return CUSTOM_mail( $to, $subject, $message, $from, $html, $priority, $cc, $bcc ); + return CUSTOM_mail( $to, $subject, $message, $from, $html, $priority, $cc ); } include_once( 'Mail.php' ); From geeklog-cvs at lists.geeklog.net Sat Jun 20 17:54:52 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 20 Jun 2009 17:54:52 -0400 Subject: [geeklog-cvs] geeklog: Escape curly braces in the query string when using "ref... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ed82d9573e1c changeset: 7133:ed82d9573e1c user: Dirk Haun date: Sat Jun 20 20:57:26 2009 +0200 description: Escape curly braces in the query string when using "refine search" diffstat: system/classes/search.class.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 321f355aaf81 -r ed82d9573e1c system/classes/search.class.php --- a/system/classes/search.class.php Sat Jun 20 20:53:47 2009 +0200 +++ b/system/classes/search.class.php Sat Jun 20 20:57:26 2009 +0200 @@ -241,7 +241,10 @@ $searchform->set_var('lang_any_word', $LANG09[45]); $searchform->set_var('lang_titles', $LANG09[69]); - $searchform->set_var ('query', htmlspecialchars ($this->_query)); + $escquery = htmlspecialchars($this->_query); + $escquery = str_replace(array('{', '}'), array('{', '}'), + $escquery); + $searchform->set_var ('query', $escquery); $searchform->set_var ('datestart', $this->_dateStart); $searchform->set_var ('dateend', $this->_dateEnd); From geeklog-cvs at lists.geeklog.net Sat Jun 20 17:54:52 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 20 Jun 2009 17:54:52 -0400 Subject: [geeklog-cvs] geeklog: Escape curly braces when displaying the search query Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/321f355aaf81 changeset: 7132:321f355aaf81 user: Dirk Haun date: Sat Jun 20 20:53:47 2009 +0200 description: Escape curly braces when displaying the search query diffstat: system/classes/search.class.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 275a68d472bb -r 321f355aaf81 system/classes/search.class.php --- a/system/classes/search.class.php Sat Jun 20 16:21:23 2009 +0200 +++ b/system/classes/search.class.php Sat Jun 20 20:53:47 2009 +0200 @@ -660,6 +660,8 @@ $searchtime = $searchtimer->stopTimer(); $escquery = htmlspecialchars($this->_query); + $escquery = str_replace(array('{', '}'), array('{', '}'), + $escquery); if ($this->_keyType == 'any') { $searchQuery = str_replace(' ', "' " . $LANG09[57] . " '", $escquery); From geeklog-cvs at lists.geeklog.net Sat Jun 20 21:57:05 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 20 Jun 2009 21:57:05 -0400 Subject: [geeklog-cvs] geeklog: Updating plugins.php (and language and template files) Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/2f4176dd3cbf changeset: 7134:2f4176dd3cbf user: tim at tim-ubuntu date: Sat Jun 20 21:53:35 2009 -0400 description: Updating plugins.php (and language and template files) diffstat: language/english.php | 28 +- public_html/admin/plugins.php | 255 ++++++++++++++++++- public_html/layout/professional/admin/plugins/search.thtml | 37 ++ system/lib-database.php | 2 + 4 files changed, 316 insertions(+), 6 deletions(-) diffs (truncated from 412 to 300 lines): diff -r 84cdcac317cf -r 2f4176dd3cbf language/english.php --- a/language/english.php Mon May 11 12:16:47 2009 +0200 +++ b/language/english.php Sat Jun 20 21:53:35 2009 -0400 @@ -1075,7 +1075,26 @@ 105 => '(undefined error)', 106 => 'Missing a temporary folder.', 107 => 'Failed to write file to disk.', - 108 => 'File upload stopped by extension.' + 108 => 'File upload stopped by extension.', + + // + // Repository Updates + // + 300 => 'Search for a plugin', + 301 => 'Check for Updates', + 302 => 'List Repositories', + 303 => 'Add Repository', + 304 => 'Update Plugin List', + 305 => 'Search Plugin', + 306 => 'Filter Results', + 307 => 'Plugin Name', + 308 => 'Version', + 309 => 'Repository', + 310 => 'All Repositories', + 311 => 'Install', + 312 => 'Download', + 313 => 'State' + ); ############################################################################### @@ -1240,7 +1259,9 @@ 100 => 'The plugin file you uploaded was not a GZip or Zip compressed archive.', 101 => 'There are no topics (that you have access to). You need at least one topic to be able to submit stories.', 400 => 'Not all required fields have been passed validation', // Error codes in the 400 range reserved for CUSTOM membership - 401 => 'Please enter Fullname' + 401 => 'Please enter Fullname', + // Error codes in the 500 range reserved for Repository Plugin Management + 500 => 'Repository Update Successful' ); ############################################################################### @@ -1860,7 +1881,8 @@ 'search_show_limit' => "Show Page Limits?", 'search_no_data' => "If No Data is Avaliable, Display", 'search_separator' => "Group Separator", - 'search_def_keytype' => "Default Search Method" + 'search_def_keytype' => "Default Search Method", + 'rmanager_moderated ' => "Plugins and Patches must be approved" ); $LANG_configsubgroups['Core'] = array( diff -r 84cdcac317cf -r 2f4176dd3cbf public_html/admin/plugins.php --- a/public_html/admin/plugins.php Mon May 11 12:16:47 2009 +0200 +++ b/public_html/admin/plugins.php Sat Jun 20 21:53:35 2009 -0400 @@ -15,6 +15,7 @@ // | Jason Whittenburg - jwhitten AT securitygeeks DOT com | // | Dirk Haun - dirk AT haun-online DOT de | // | Matt West - matt AT mattdanger DOT net | +// | Tim Patrick - timpatrick12 AT gmail DOT com | // +---------------------------------------------------------------------------+ // | | // | This program is free software; you can redistribute it and/or | @@ -419,6 +420,55 @@ } /** +* Bring up plugin search +* +*/ + +function pluginsearch() +{ + global $_CONF, $_TABLES, $_USER, $LANG32, $LANG_ADMIN; + + $retval = ''; + + $plg_templates = new Template($_CONF['path_layout'] . 'admin/plugins'); + $plg_templates->set_file('search', 'search.thtml'); + $plg_templates->set_var('xhtml', XHTML); + $plg_templates->set_var('site_url', $_CONF['site_url']); + $plg_templates->set_var('site_admin_url', $_CONF['site_admin_url']); + $plg_templates->set_var('layout_url', $_CONF['layout_url']); + $plg_templates->set_var('start_block_editor', COM_startBlock ($LANG32[305], + '', COM_getBlockTemplate ('_admin_block', 'header'))); + $plg_templates->set_var('lang_search', $LANG_ADMIN['search']); + $plg_templates->set_var('lang_cancel', $LANG_ADMIN['cancel']); + $plg_templates->set_var('lang_306', $LANG32[306]); + $plg_templates->set_var('lang_307', $LANG32[307]); + $plg_templates->set_var('lang_308', $LANG32[308]); + $plg_templates->set_var('lang_309', $LANG32[309]); + $plg_templates->set_var('lang_310', $LANG32[310]); + + // Get DB info about current repositories + $result = DB_query("SELECT * FROM {$_TABLES['plugin_repository']};"); + $d2 = ""; + + while ( ($result2 = DB_fetchArray($result)) !== FALSE) { + $d2 .= <<{$result2['repository_url']} +EOO; + } + + $plg_templates->set_var('value_0', $d2); + + $plg_templates->set_var('pi_icon', PLG_getIcon($pi_name)); + $plg_templates->set_var('end_block', + COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'))); + + $retval .= $plg_templates->finish($plg_templates->parse('output', 'search')); + + return $retval; + +} + +/** * List available plugins * * @param string $token Security token @@ -444,7 +494,92 @@ $menu_arr = array ( array('url' => $_CONF['site_admin_url'], - 'text' => $LANG_ADMIN['admin_home'])); + 'text' => $LANG_ADMIN['admin_home']), + array('url' => 'plugins.php?mode=splugin', + 'text' => $LANG32[300]), + array('url' => 'plugins.php?mode=chkupdates', + 'text' => $LANG32[301]), + array('url' => 'plugins.php?mode=lstrepo', + 'text' => $LANG32[302]), + array('url' => 'plugins.php?mode=updatelist', + 'text' => $LANG32[304]), + array('url' => 'plugins.php?mode=addrepo', + 'text' => $LANG32[303]) + ); + + $retval .= COM_startBlock($LANG32[5], '', + COM_getBlockTemplate('_admin_block', 'header')); + + $retval .= ADMIN_createMenu( + $menu_arr, + $LANG32[11], + $_CONF['layout_url'] . '/images/icons/plugins.' . $_IMAGE_TYPE + ); + + $text_arr = array( + 'has_extras' => true, + 'instructions' => $LANG32[11], + 'form_url' => $_CONF['site_admin_url'] . '/plugins.php' + ); + + $query_arr = array( + 'table' => 'plugins', + 'sql' => "SELECT pi_name, pi_version, pi_gl_version, " + ."pi_enabled, pi_homepage FROM {$_TABLES['plugins']} WHERE 1=1", + 'query_fields' => array('pi_name'), + 'default_filter' => '' + ); + + // this is a dummy variable so we know the form has been used if all plugins + // should be disabled in order to disable the last one. + $form_arr = array('bottom' => ''); + + $retval .= ADMIN_list('plugins', 'ADMIN_getListField_plugins', $header_arr, + $text_arr, $query_arr, $defsort_arr, '', $token, '', $form_arr); + $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer')); + + return $retval; +} + +/** +* List search results +* +* @param string $token Security token +* @return string formatted list of plugins +* +*/ +function listsearchedplugins($token) +{ + global $_CONF, $_TABLES, $LANG32, $LANG_ADMIN, $_IMAGE_TYPE; + + require_once $_CONF['path_system'] . 'lib-admin.php'; + + $retval = ''; + $header_arr = array( # display 'text' and use table field 'field' + array('text' => $LANG32[311], 'field' => 'install', 'sort' => false), + array('text' => $LANG32[312], 'field' => 'download', 'sort' => false), + array('text' => $LANG32[16], 'field' => 'pi_name', 'sort' => true), + array('text' => $LANG32[17], 'field' => 'pi_version', 'sort' => true), + array('text' => $LANG32[313], 'field' => 'state', 'sort' => true), + + ); + + $defsort_arr = array('field' => 'pi_name', 'direction' => 'asc'); + + $menu_arr = array ( + array('url' => $_CONF['site_admin_url'], + 'text' => $LANG_ADMIN['admin_home']), + array('url' => 'plugins.php?mode=splugin', + 'text' => $LANG32[300]), + array('url' => 'plugins.php?mode=chkupdates', + 'text' => $LANG32[301]), + array('url' => 'plugins.php?mode=lstrepo', + 'text' => $LANG32[302]), + array('url' => 'plugins.php?mode=updatelist', + 'text' => $LANG32[304]), + array('url' => 'plugins.php?mode=addrepo', + 'text' => $LANG32[303]) + ); $retval .= COM_startBlock($LANG32[5], '', COM_getBlockTemplate('_admin_block', 'header')); @@ -961,7 +1096,7 @@ if (file_exists($base_path . 'sql/' . $_DB_dbms . '_install.php')) { require_once $base_path . 'sql/' . $_DB_dbms . '_install.php'; } - + if (count($_SQL) > 0) { $use_innodb = false; if (($_DB_dbms == 'mysql') && @@ -1152,6 +1287,106 @@ } +/** +* Check for updates to repository (reload) +* +*/ +function updaterepositorylist() +{ + global $_CONF, $_TABLES, $_USER, $LANG32, $LANG_ADMIN; + + // For each repository listing + $query = "SELECT * FROM {$_TABLES['plugin_repository']} WHERE enabled = 1;"; + DB_query($query); + + // Truncate Table + DB_query("TRUNCATE {$_TABLES['plugin_repository_list']};"); + + // Loop through listings + while ( ($result2 = DB_fetchArray($result)) !== FALSE) { + // XML Pull + $reader = new XMLReader(); + + $reader->open($result2['repository_url']); + $plugin = false; + $array_of_values = array(); + $array_of_key_gen = array( + 'id' => false, + 'name' => false, + 'version' => false, + 'db' => false, + 'dependencies' => false, + 'soft_dep' => false, + 'short_des' => false, + 'long_des' => false, + 'credits' => false, + 'vett' => false, + 'downloads' => false, + 'install' => false, + 'state' => false, + 'ext' => false + + ); + + while ($reader->read()) { + // Process + if($reader->name == "plugin") { + // New plugin section + if($plugin == false) { + $plugin = true; + + } + else { + $plugin = false; + + // Insert into the repository listing database the values + $query = << $value) { + $array_of_key_gen[$key] = false; + } + + } + } + + switch ($reader->name) { + case "id": + case "name": + case "version": + case "db": + case "dependencies": + case "soft_dep": + case "short_des": From geeklog-cvs at lists.geeklog.net Sun Jun 21 03:10:53 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 21 Jun 2009 03:10:53 -0400 Subject: [geeklog-cvs] geeklog: Merging branches Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8de1261849a4 changeset: 7135:8de1261849a4 user: Dirk Haun date: Sun Jun 21 09:00:00 2009 +0200 description: Merging branches diffstat: language/english.php | 28 +- public_html/admin/plugins.php | 255 ++++++++++++++++++- public_html/layout/professional/admin/plugins/search.thtml | 37 ++ system/lib-database.php | 2 + 4 files changed, 316 insertions(+), 6 deletions(-) diffs (truncated from 412 to 300 lines): diff -r ed82d9573e1c -r 8de1261849a4 language/english.php --- a/language/english.php Sat Jun 20 20:57:26 2009 +0200 +++ b/language/english.php Sun Jun 21 09:00:00 2009 +0200 @@ -1076,7 +1076,26 @@ 105 => '(undefined error)', 106 => 'Missing a temporary folder.', 107 => 'Failed to write file to disk.', - 108 => 'File upload stopped by extension.' + 108 => 'File upload stopped by extension.', + + // + // Repository Updates + // + 300 => 'Search for a plugin', + 301 => 'Check for Updates', + 302 => 'List Repositories', + 303 => 'Add Repository', + 304 => 'Update Plugin List', + 305 => 'Search Plugin', + 306 => 'Filter Results', + 307 => 'Plugin Name', + 308 => 'Version', + 309 => 'Repository', + 310 => 'All Repositories', + 311 => 'Install', + 312 => 'Download', + 313 => 'State' + ); ############################################################################### @@ -1241,7 +1260,9 @@ 100 => 'The plugin file you uploaded was not a GZip or Zip compressed archive.', 101 => 'There are no topics (that you have access to). You need at least one topic to be able to submit stories.', 400 => 'Not all required fields have been passed validation', // Error codes in the 400 range reserved for CUSTOM membership - 401 => 'Please enter Fullname' + 401 => 'Please enter Fullname', + // Error codes in the 500 range reserved for Repository Plugin Management + 500 => 'Repository Update Successful' ); ############################################################################### @@ -1861,7 +1882,8 @@ 'search_show_sort' => "Allow User to Sort Results?", 'search_show_limit' => "Show Page Limits?", 'search_separator' => "Group Separator", - 'search_def_keytype' => "Default Search Method" + 'search_def_keytype' => "Default Search Method", + 'rmanager_moderated ' => "Plugins and Patches must be approved" ); $LANG_configsubgroups['Core'] = array( diff -r ed82d9573e1c -r 8de1261849a4 public_html/admin/plugins.php --- a/public_html/admin/plugins.php Sat Jun 20 20:57:26 2009 +0200 +++ b/public_html/admin/plugins.php Sun Jun 21 09:00:00 2009 +0200 @@ -15,6 +15,7 @@ // | Jason Whittenburg - jwhitten AT securitygeeks DOT com | // | Dirk Haun - dirk AT haun-online DOT de | // | Matt West - matt AT mattdanger DOT net | +// | Tim Patrick - timpatrick12 AT gmail DOT com | // +---------------------------------------------------------------------------+ // | | // | This program is free software; you can redistribute it and/or | @@ -419,6 +420,55 @@ } /** +* Bring up plugin search +* +*/ + +function pluginsearch() +{ + global $_CONF, $_TABLES, $_USER, $LANG32, $LANG_ADMIN; + + $retval = ''; + + $plg_templates = new Template($_CONF['path_layout'] . 'admin/plugins'); + $plg_templates->set_file('search', 'search.thtml'); + $plg_templates->set_var('xhtml', XHTML); + $plg_templates->set_var('site_url', $_CONF['site_url']); + $plg_templates->set_var('site_admin_url', $_CONF['site_admin_url']); + $plg_templates->set_var('layout_url', $_CONF['layout_url']); + $plg_templates->set_var('start_block_editor', COM_startBlock ($LANG32[305], + '', COM_getBlockTemplate ('_admin_block', 'header'))); + $plg_templates->set_var('lang_search', $LANG_ADMIN['search']); + $plg_templates->set_var('lang_cancel', $LANG_ADMIN['cancel']); + $plg_templates->set_var('lang_306', $LANG32[306]); + $plg_templates->set_var('lang_307', $LANG32[307]); + $plg_templates->set_var('lang_308', $LANG32[308]); + $plg_templates->set_var('lang_309', $LANG32[309]); + $plg_templates->set_var('lang_310', $LANG32[310]); + + // Get DB info about current repositories + $result = DB_query("SELECT * FROM {$_TABLES['plugin_repository']};"); + $d2 = ""; + + while ( ($result2 = DB_fetchArray($result)) !== FALSE) { + $d2 .= <<{$result2['repository_url']} +EOO; + } + + $plg_templates->set_var('value_0', $d2); + + $plg_templates->set_var('pi_icon', PLG_getIcon($pi_name)); + $plg_templates->set_var('end_block', + COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'))); + + $retval .= $plg_templates->finish($plg_templates->parse('output', 'search')); + + return $retval; + +} + +/** * List available plugins * * @param string $token Security token @@ -444,7 +494,92 @@ $menu_arr = array ( array('url' => $_CONF['site_admin_url'], - 'text' => $LANG_ADMIN['admin_home'])); + 'text' => $LANG_ADMIN['admin_home']), + array('url' => 'plugins.php?mode=splugin', + 'text' => $LANG32[300]), + array('url' => 'plugins.php?mode=chkupdates', + 'text' => $LANG32[301]), + array('url' => 'plugins.php?mode=lstrepo', + 'text' => $LANG32[302]), + array('url' => 'plugins.php?mode=updatelist', + 'text' => $LANG32[304]), + array('url' => 'plugins.php?mode=addrepo', + 'text' => $LANG32[303]) + ); + + $retval .= COM_startBlock($LANG32[5], '', + COM_getBlockTemplate('_admin_block', 'header')); + + $retval .= ADMIN_createMenu( + $menu_arr, + $LANG32[11], + $_CONF['layout_url'] . '/images/icons/plugins.' . $_IMAGE_TYPE + ); + + $text_arr = array( + 'has_extras' => true, + 'instructions' => $LANG32[11], + 'form_url' => $_CONF['site_admin_url'] . '/plugins.php' + ); + + $query_arr = array( + 'table' => 'plugins', + 'sql' => "SELECT pi_name, pi_version, pi_gl_version, " + ."pi_enabled, pi_homepage FROM {$_TABLES['plugins']} WHERE 1=1", + 'query_fields' => array('pi_name'), + 'default_filter' => '' + ); + + // this is a dummy variable so we know the form has been used if all plugins + // should be disabled in order to disable the last one. + $form_arr = array('bottom' => ''); + + $retval .= ADMIN_list('plugins', 'ADMIN_getListField_plugins', $header_arr, + $text_arr, $query_arr, $defsort_arr, '', $token, '', $form_arr); + $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer')); + + return $retval; +} + +/** +* List search results +* +* @param string $token Security token +* @return string formatted list of plugins +* +*/ +function listsearchedplugins($token) +{ + global $_CONF, $_TABLES, $LANG32, $LANG_ADMIN, $_IMAGE_TYPE; + + require_once $_CONF['path_system'] . 'lib-admin.php'; + + $retval = ''; + $header_arr = array( # display 'text' and use table field 'field' + array('text' => $LANG32[311], 'field' => 'install', 'sort' => false), + array('text' => $LANG32[312], 'field' => 'download', 'sort' => false), + array('text' => $LANG32[16], 'field' => 'pi_name', 'sort' => true), + array('text' => $LANG32[17], 'field' => 'pi_version', 'sort' => true), + array('text' => $LANG32[313], 'field' => 'state', 'sort' => true), + + ); + + $defsort_arr = array('field' => 'pi_name', 'direction' => 'asc'); + + $menu_arr = array ( + array('url' => $_CONF['site_admin_url'], + 'text' => $LANG_ADMIN['admin_home']), + array('url' => 'plugins.php?mode=splugin', + 'text' => $LANG32[300]), + array('url' => 'plugins.php?mode=chkupdates', + 'text' => $LANG32[301]), + array('url' => 'plugins.php?mode=lstrepo', + 'text' => $LANG32[302]), + array('url' => 'plugins.php?mode=updatelist', + 'text' => $LANG32[304]), + array('url' => 'plugins.php?mode=addrepo', + 'text' => $LANG32[303]) + ); $retval .= COM_startBlock($LANG32[5], '', COM_getBlockTemplate('_admin_block', 'header')); @@ -961,7 +1096,7 @@ if (file_exists($base_path . 'sql/' . $_DB_dbms . '_install.php')) { require_once $base_path . 'sql/' . $_DB_dbms . '_install.php'; } - + if (count($_SQL) > 0) { $use_innodb = false; if (($_DB_dbms == 'mysql') && @@ -1156,6 +1291,106 @@ } +/** +* Check for updates to repository (reload) +* +*/ +function updaterepositorylist() +{ + global $_CONF, $_TABLES, $_USER, $LANG32, $LANG_ADMIN; + + // For each repository listing + $query = "SELECT * FROM {$_TABLES['plugin_repository']} WHERE enabled = 1;"; + DB_query($query); + + // Truncate Table + DB_query("TRUNCATE {$_TABLES['plugin_repository_list']};"); + + // Loop through listings + while ( ($result2 = DB_fetchArray($result)) !== FALSE) { + // XML Pull + $reader = new XMLReader(); + + $reader->open($result2['repository_url']); + $plugin = false; + $array_of_values = array(); + $array_of_key_gen = array( + 'id' => false, + 'name' => false, + 'version' => false, + 'db' => false, + 'dependencies' => false, + 'soft_dep' => false, + 'short_des' => false, + 'long_des' => false, + 'credits' => false, + 'vett' => false, + 'downloads' => false, + 'install' => false, + 'state' => false, + 'ext' => false + + ); + + while ($reader->read()) { + // Process + if($reader->name == "plugin") { + // New plugin section + if($plugin == false) { + $plugin = true; + + } + else { + $plugin = false; + + // Insert into the repository listing database the values + $query = << $value) { + $array_of_key_gen[$key] = false; + } + + } + } + + switch ($reader->name) { + case "id": + case "name": + case "version": + case "db": + case "dependencies": + case "soft_dep": + case "short_des": From geeklog-cvs at lists.geeklog.net Sun Jun 21 03:11:01 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 21 Jun 2009 03:11:01 -0400 Subject: [geeklog-cvs] geeklog: Rolling back Tim's accidental commits Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1fa428bd1f68 changeset: 7136:1fa428bd1f68 user: Dirk Haun date: Sun Jun 21 09:03:43 2009 +0200 description: Rolling back Tim's accidental commits diffstat: language/english.php | 28 +- public_html/admin/plugins.php | 255 +------------------ public_html/layout/professional/admin/plugins/search.thtml | 37 -- system/lib-database.php | 2 - 4 files changed, 6 insertions(+), 316 deletions(-) diffs (truncated from 412 to 300 lines): diff -r 2f4176dd3cbf -r 1fa428bd1f68 language/english.php --- a/language/english.php Sat Jun 20 21:53:35 2009 -0400 +++ b/language/english.php Sun Jun 21 09:03:43 2009 +0200 @@ -1075,26 +1075,7 @@ 105 => '(undefined error)', 106 => 'Missing a temporary folder.', 107 => 'Failed to write file to disk.', - 108 => 'File upload stopped by extension.', - - // - // Repository Updates - // - 300 => 'Search for a plugin', - 301 => 'Check for Updates', - 302 => 'List Repositories', - 303 => 'Add Repository', - 304 => 'Update Plugin List', - 305 => 'Search Plugin', - 306 => 'Filter Results', - 307 => 'Plugin Name', - 308 => 'Version', - 309 => 'Repository', - 310 => 'All Repositories', - 311 => 'Install', - 312 => 'Download', - 313 => 'State' - + 108 => 'File upload stopped by extension.' ); ############################################################################### @@ -1259,9 +1240,7 @@ 100 => 'The plugin file you uploaded was not a GZip or Zip compressed archive.', 101 => 'There are no topics (that you have access to). You need at least one topic to be able to submit stories.', 400 => 'Not all required fields have been passed validation', // Error codes in the 400 range reserved for CUSTOM membership - 401 => 'Please enter Fullname', - // Error codes in the 500 range reserved for Repository Plugin Management - 500 => 'Repository Update Successful' + 401 => 'Please enter Fullname' ); ############################################################################### @@ -1881,8 +1860,7 @@ 'search_show_limit' => "Show Page Limits?", 'search_no_data' => "If No Data is Avaliable, Display", 'search_separator' => "Group Separator", - 'search_def_keytype' => "Default Search Method", - 'rmanager_moderated ' => "Plugins and Patches must be approved" + 'search_def_keytype' => "Default Search Method" ); $LANG_configsubgroups['Core'] = array( diff -r 2f4176dd3cbf -r 1fa428bd1f68 public_html/admin/plugins.php --- a/public_html/admin/plugins.php Sat Jun 20 21:53:35 2009 -0400 +++ b/public_html/admin/plugins.php Sun Jun 21 09:03:43 2009 +0200 @@ -15,7 +15,6 @@ // | Jason Whittenburg - jwhitten AT securitygeeks DOT com | // | Dirk Haun - dirk AT haun-online DOT de | // | Matt West - matt AT mattdanger DOT net | -// | Tim Patrick - timpatrick12 AT gmail DOT com | // +---------------------------------------------------------------------------+ // | | // | This program is free software; you can redistribute it and/or | @@ -420,55 +419,6 @@ } /** -* Bring up plugin search -* -*/ - -function pluginsearch() -{ - global $_CONF, $_TABLES, $_USER, $LANG32, $LANG_ADMIN; - - $retval = ''; - - $plg_templates = new Template($_CONF['path_layout'] . 'admin/plugins'); - $plg_templates->set_file('search', 'search.thtml'); - $plg_templates->set_var('xhtml', XHTML); - $plg_templates->set_var('site_url', $_CONF['site_url']); - $plg_templates->set_var('site_admin_url', $_CONF['site_admin_url']); - $plg_templates->set_var('layout_url', $_CONF['layout_url']); - $plg_templates->set_var('start_block_editor', COM_startBlock ($LANG32[305], - '', COM_getBlockTemplate ('_admin_block', 'header'))); - $plg_templates->set_var('lang_search', $LANG_ADMIN['search']); - $plg_templates->set_var('lang_cancel', $LANG_ADMIN['cancel']); - $plg_templates->set_var('lang_306', $LANG32[306]); - $plg_templates->set_var('lang_307', $LANG32[307]); - $plg_templates->set_var('lang_308', $LANG32[308]); - $plg_templates->set_var('lang_309', $LANG32[309]); - $plg_templates->set_var('lang_310', $LANG32[310]); - - // Get DB info about current repositories - $result = DB_query("SELECT * FROM {$_TABLES['plugin_repository']};"); - $d2 = ""; - - while ( ($result2 = DB_fetchArray($result)) !== FALSE) { - $d2 .= <<{$result2['repository_url']} -EOO; - } - - $plg_templates->set_var('value_0', $d2); - - $plg_templates->set_var('pi_icon', PLG_getIcon($pi_name)); - $plg_templates->set_var('end_block', - COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'))); - - $retval .= $plg_templates->finish($plg_templates->parse('output', 'search')); - - return $retval; - -} - -/** * List available plugins * * @param string $token Security token @@ -494,92 +444,7 @@ $menu_arr = array ( array('url' => $_CONF['site_admin_url'], - 'text' => $LANG_ADMIN['admin_home']), - array('url' => 'plugins.php?mode=splugin', - 'text' => $LANG32[300]), - array('url' => 'plugins.php?mode=chkupdates', - 'text' => $LANG32[301]), - array('url' => 'plugins.php?mode=lstrepo', - 'text' => $LANG32[302]), - array('url' => 'plugins.php?mode=updatelist', - 'text' => $LANG32[304]), - array('url' => 'plugins.php?mode=addrepo', - 'text' => $LANG32[303]) - ); - - $retval .= COM_startBlock($LANG32[5], '', - COM_getBlockTemplate('_admin_block', 'header')); - - $retval .= ADMIN_createMenu( - $menu_arr, - $LANG32[11], - $_CONF['layout_url'] . '/images/icons/plugins.' . $_IMAGE_TYPE - ); - - $text_arr = array( - 'has_extras' => true, - 'instructions' => $LANG32[11], - 'form_url' => $_CONF['site_admin_url'] . '/plugins.php' - ); - - $query_arr = array( - 'table' => 'plugins', - 'sql' => "SELECT pi_name, pi_version, pi_gl_version, " - ."pi_enabled, pi_homepage FROM {$_TABLES['plugins']} WHERE 1=1", - 'query_fields' => array('pi_name'), - 'default_filter' => '' - ); - - // this is a dummy variable so we know the form has been used if all plugins - // should be disabled in order to disable the last one. - $form_arr = array('bottom' => ''); - - $retval .= ADMIN_list('plugins', 'ADMIN_getListField_plugins', $header_arr, - $text_arr, $query_arr, $defsort_arr, '', $token, '', $form_arr); - $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer')); - - return $retval; -} - -/** -* List search results -* -* @param string $token Security token -* @return string formatted list of plugins -* -*/ -function listsearchedplugins($token) -{ - global $_CONF, $_TABLES, $LANG32, $LANG_ADMIN, $_IMAGE_TYPE; - - require_once $_CONF['path_system'] . 'lib-admin.php'; - - $retval = ''; - $header_arr = array( # display 'text' and use table field 'field' - array('text' => $LANG32[311], 'field' => 'install', 'sort' => false), - array('text' => $LANG32[312], 'field' => 'download', 'sort' => false), - array('text' => $LANG32[16], 'field' => 'pi_name', 'sort' => true), - array('text' => $LANG32[17], 'field' => 'pi_version', 'sort' => true), - array('text' => $LANG32[313], 'field' => 'state', 'sort' => true), - - ); - - $defsort_arr = array('field' => 'pi_name', 'direction' => 'asc'); - - $menu_arr = array ( - array('url' => $_CONF['site_admin_url'], - 'text' => $LANG_ADMIN['admin_home']), - array('url' => 'plugins.php?mode=splugin', - 'text' => $LANG32[300]), - array('url' => 'plugins.php?mode=chkupdates', - 'text' => $LANG32[301]), - array('url' => 'plugins.php?mode=lstrepo', - 'text' => $LANG32[302]), - array('url' => 'plugins.php?mode=updatelist', - 'text' => $LANG32[304]), - array('url' => 'plugins.php?mode=addrepo', - 'text' => $LANG32[303]) - ); + 'text' => $LANG_ADMIN['admin_home'])); $retval .= COM_startBlock($LANG32[5], '', COM_getBlockTemplate('_admin_block', 'header')); @@ -1096,7 +961,7 @@ if (file_exists($base_path . 'sql/' . $_DB_dbms . '_install.php')) { require_once $base_path . 'sql/' . $_DB_dbms . '_install.php'; } - + if (count($_SQL) > 0) { $use_innodb = false; if (($_DB_dbms == 'mysql') && @@ -1287,106 +1152,6 @@ } -/** -* Check for updates to repository (reload) -* -*/ -function updaterepositorylist() -{ - global $_CONF, $_TABLES, $_USER, $LANG32, $LANG_ADMIN; - - // For each repository listing - $query = "SELECT * FROM {$_TABLES['plugin_repository']} WHERE enabled = 1;"; - DB_query($query); - - // Truncate Table - DB_query("TRUNCATE {$_TABLES['plugin_repository_list']};"); - - // Loop through listings - while ( ($result2 = DB_fetchArray($result)) !== FALSE) { - // XML Pull - $reader = new XMLReader(); - - $reader->open($result2['repository_url']); - $plugin = false; - $array_of_values = array(); - $array_of_key_gen = array( - 'id' => false, - 'name' => false, - 'version' => false, - 'db' => false, - 'dependencies' => false, - 'soft_dep' => false, - 'short_des' => false, - 'long_des' => false, - 'credits' => false, - 'vett' => false, - 'downloads' => false, - 'install' => false, - 'state' => false, - 'ext' => false - - ); - - while ($reader->read()) { - // Process - if($reader->name == "plugin") { - // New plugin section - if($plugin == false) { - $plugin = true; - - } - else { - $plugin = false; - - // Insert into the repository listing database the values - $query = << $value) { - $array_of_key_gen[$key] = false; - } - - } - } - - switch ($reader->name) { - case "id": - case "name": - case "version": - case "db": - case "dependencies": - case "soft_dep": - case "short_des": From geeklog-cvs at lists.geeklog.net Sun Jun 21 03:11:07 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 21 Jun 2009 03:11:07 -0400 Subject: [geeklog-cvs] geeklog: Merging heads Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/195d4ef428df changeset: 7137:195d4ef428df user: Dirk Haun date: Sun Jun 21 09:04:01 2009 +0200 description: Merging heads diffstat: .hgtags | 1 + language/afrikaans.php | 12 +- language/afrikaans_utf-8.php | 12 +- language/bosnian.php | 12 +- language/bosnian_utf-8.php | 12 +- language/bulgarian.php | 12 +- language/bulgarian_utf-8.php | 12 +- language/catalan.php | 12 +- language/catalan_utf-8.php | 12 +- language/chinese_simplified_utf-8.php | 12 +- language/chinese_traditional_utf-8.php | 12 +- language/croatian.php | 12 +- language/croatian_utf-8.php | 12 +- language/czech.php | 12 +- language/czech_utf-8.php | 12 +- language/danish.php | 12 +- language/danish_utf-8.php | 12 +- language/dutch.php | 12 +- language/dutch_utf-8.php | 12 +- language/english.php | 10 +- language/english_utf-8.php | 10 +- language/estonian.php | 12 +- language/estonian_utf-8.php | 12 +- language/farsi_utf-8.php | 12 +- language/finnish.php | 12 +- language/finnish_utf-8.php | 12 +- language/french_canada.php | 12 +- language/french_canada_utf-8.php | 12 +- language/french_france.php | 12 +- language/french_france_utf-8.php | 12 +- language/german.php | 14 +- language/german_formal.php | 14 +- language/german_formal_utf-8.php | 14 +- language/german_utf-8.php | 14 +- language/hebrew_utf-8.php | 12 +- language/hellenic.php | 12 +- language/hellenic_utf-8.php | 12 +- language/indonesian.php | 12 +- language/indonesian_utf-8.php | 12 +- language/italian.php | 12 +- language/italian_utf-8.php | 12 +- language/japanese_utf-8.php | 261 +- language/korean.php | 12 +- language/korean_utf-8.php | 12 +- language/norwegian.php | 12 +- language/norwegian_utf-8.php | 12 +- language/polish.php | 12 +- language/polish_utf-8.php | 12 +- language/portuguese.php | 12 +- language/portuguese_brazil.php | 12 +- language/portuguese_brazil_utf-8.php | 12 +- language/portuguese_utf-8.php | 12 +- language/romanian.php | 12 +- language/romanian_utf-8.php | 12 +- language/russian.php | 12 +- language/russian_utf-8.php | 12 +- language/serbian.php | 10 +- language/serbian_utf-8.php | 10 +- language/slovak.php | 12 +- language/slovak_utf-8.php | 12 +- language/slovenian.php | 12 +- language/slovenian_utf-8.php | 12 +- language/spanish.php | 528 +- language/spanish_argentina.php | 12 +- language/spanish_argentina_utf-8.php | 12 +- language/spanish_utf-8.php | 12 +- language/swedish.php | 12 +- language/swedish_utf-8.php | 12 +- language/turkish.php | 12 +- language/turkish_utf-8.php | 12 +- language/ukrainian.php | 12 +- language/ukrainian_koi8-u.php | 12 +- language/ukrainian_utf-8.php | 12 +- plugins/calendar/autoinstall.php | 9 + plugins/calendar/functions.inc | 52 +- plugins/links/autoinstall.php | 9 + plugins/links/functions.inc | 41 +- plugins/polls/autoinstall.php | 9 + plugins/polls/functions.inc | 70 +- plugins/polls/language/chinese_simplified_utf-8.php | 1 + plugins/polls/language/chinese_traditional_utf-8.php | 1 + plugins/polls/language/dutch.php | 1 + plugins/polls/language/dutch_utf-8.php | 1 + plugins/polls/language/english.php | 1 + plugins/polls/language/english_utf-8.php | 1 + plugins/polls/language/estonian.php | 1 + plugins/polls/language/estonian_utf-8.php | 1 + plugins/polls/language/french_canada.php | 1 + plugins/polls/language/french_canada_utf-8.php | 1 + plugins/polls/language/german.php | 1 + plugins/polls/language/german_formal.php | 1 + plugins/polls/language/german_formal_utf-8.php | 1 + plugins/polls/language/german_utf-8.php | 1 + plugins/polls/language/hebrew_utf-8.php | 1 + plugins/polls/language/japanese_utf-8.php | 1 + plugins/polls/language/korean.php | 1 + plugins/polls/language/korean_utf-8.php | 1 + plugins/polls/language/russian.php | 1 + plugins/polls/language/russian_utf-8.php | 1 + plugins/polls/language/slovenian.php | 1 + plugins/polls/language/slovenian_utf-8.php | 1 + plugins/polls/language/spanish.php | 1 + plugins/polls/language/spanish_utf-8.php | 1 + plugins/polls/language/ukrainian.php | 1 + plugins/polls/language/ukrainian_koi8-u.php | 1 + plugins/polls/language/ukrainian_utf-8.php | 1 + plugins/spamx/autoinstall.php | 9 + plugins/staticpages/autoinstall.php | 9 + plugins/staticpages/functions.inc | 121 +- plugins/staticpages/language/chinese_simplified_utf-8.php | 1 + plugins/staticpages/language/chinese_traditional_utf-8.php | 1 + plugins/staticpages/language/czech.php | 3 +- plugins/staticpages/language/czech_utf-8.php | 3 +- plugins/staticpages/language/danish.php | 3 +- plugins/staticpages/language/danish_utf-8.php | 3 +- plugins/staticpages/language/dutch.php | 3 +- plugins/staticpages/language/dutch_utf-8.php | 3 +- plugins/staticpages/language/english.php | 1 + plugins/staticpages/language/english_utf-8.php | 1 + plugins/staticpages/language/estonian.php | 3 +- plugins/staticpages/language/estonian_utf-8.php | 3 +- plugins/staticpages/language/farsi_utf-8.php | 1 + plugins/staticpages/language/french_canada.php | 3 +- plugins/staticpages/language/french_canada_utf-8.php | 3 +- plugins/staticpages/language/german.php | 3 +- plugins/staticpages/language/german_formal.php | 3 +- plugins/staticpages/language/german_formal_utf-8.php | 3 +- plugins/staticpages/language/german_utf-8.php | 3 +- plugins/staticpages/language/hebrew_utf-8.php | 3 +- plugins/staticpages/language/italian.php | 3 +- plugins/staticpages/language/italian_utf-8.php | 3 +- plugins/staticpages/language/japanese_utf-8.php | 11 +- plugins/staticpages/language/korean.php | 3 +- plugins/staticpages/language/korean_utf-8.php | 3 +- plugins/staticpages/language/polish.php | 3 +- plugins/staticpages/language/polish_utf-8.php | 3 +- plugins/staticpages/language/portuguese_brazil.php | 3 +- plugins/staticpages/language/portuguese_brazil_utf-8.php | 3 +- plugins/staticpages/language/slovenian.php | 3 +- plugins/staticpages/language/slovenian_utf-8.php | 3 +- plugins/staticpages/language/spanish.php | 3 +- plugins/staticpages/language/spanish_utf-8.php | 3 +- plugins/staticpages/language/swedish.php | 3 +- plugins/staticpages/language/swedish_utf-8.php | 3 +- plugins/staticpages/language/turkish.php | 3 +- plugins/staticpages/language/turkish_utf-8.php | 3 +- plugins/staticpages/language/ukrainian.php | 3 +- plugins/staticpages/language/ukrainian_koi8-u.php | 3 +- plugins/staticpages/language/ukrainian_utf-8.php | 3 +- plugins/staticpages/services.inc.php | 7 +- plugins/xmlsitemap/autoinstall.php | 35 +- plugins/xmlsitemap/functions.inc | 618 +- plugins/xmlsitemap/install_defaults.php | 21 +- plugins/xmlsitemap/language/english.php | 1 + plugins/xmlsitemap/language/english_utf-8.php | 1 + plugins/xmlsitemap/language/japanese_utf-8.php | 5 +- plugins/xmlsitemap/xmlsitemap.class.php | 2 +- public_html/admin/install/config-install.php | 24 +- public_html/admin/install/index.php | 138 +- public_html/admin/install/install-plugins.php | 5 +- public_html/admin/install/language/japanese_utf-8.php | 306 +- public_html/admin/install/lib-install.php | 22 +- public_html/admin/install/lib-upgrade.php | 2 +- public_html/admin/install/migrate.php | 27 +- public_html/admin/moderation.php | 2 +- public_html/admin/plugins.php | 4 + public_html/admin/plugins/polls/index.php | 2 + public_html/admin/user.php | 27 +- public_html/comment.php | 11 +- public_html/docs/english/changes.html | 2 +- public_html/docs/english/config.html | 23 +- public_html/docs/english/index.html | 7 +- public_html/docs/english/plugin.html | 567 -- public_html/docs/english/theme.html | 10 + public_html/docs/history | 99 +- public_html/docs/japanese/calendar.html | 109 + public_html/docs/japanese/changes.html | 655 ++ public_html/docs/japanese/config.html | 1302 ++++ public_html/docs/japanese/docstyle.css | 117 + public_html/docs/japanese/history.html | 3108 ++++++++++ public_html/docs/japanese/index.html | 121 + public_html/docs/japanese/install.html | 242 + public_html/docs/japanese/links.html | 141 + public_html/docs/japanese/plugin.html | 433 + public_html/docs/japanese/polls.html | 116 + public_html/docs/japanese/readme.html | 194 + public_html/docs/japanese/readme.ja.html | 195 + public_html/docs/japanese/spamx.html | 217 + public_html/docs/japanese/staticpages.html | 225 + public_html/docs/japanese/support.html | 100 + public_html/docs/japanese/theme.html | 830 ++ public_html/docs/japanese/themevars.html | 311 + public_html/docs/japanese/trackback.html | 102 + public_html/index.php | 29 + public_html/layout/professional/admin/config/config_element.thtml | 2 +- public_html/layout/professional/admin/config/configuration.thtml | 4 +- public_html/layout/professional/article/printable.thtml | 2 +- public_html/layout/professional/lists/inline/list.thtml | 16 +- public_html/layout/professional/lists/inline/page_limit.thtml | 2 +- public_html/layout/professional/lists/inline/page_sort.thtml | 2 +- public_html/layout/professional/lists/table/list.thtml | 8 +- public_html/layout/professional/lists/table/page_limit.thtml | 2 +- public_html/layout/professional/lists/table/page_sort.thtml | 2 +- public_html/lib-common.php | 57 +- public_html/polls/index.php | 49 +- public_html/usersettings.php | 12 +- sql/pgsql_tableanddata.php | 813 ++ sql/updates/mssql_1.5.2_to_1.6.0.php | 28 +- sql/updates/mysql_1.5.2_to_1.6.0.php | 28 +- system/classes/calendar.class.php | 17 +- system/classes/config.class.php | 4 +- system/classes/listfactory.class.php | 39 +- system/classes/search.class.php | 142 +- system/classes/timer.class.php | 2 +- system/databases/mssql.class.php | 8 +- system/databases/mysql.class.php | 2 +- system/databases/pgsql.class.php | 804 ++ system/lib-admin.php | 11 +- system/lib-comment.php | 85 +- system/lib-plugins.php | 339 +- system/lib-security.php | 33 +- system/lib-story.php | 17 +- system/lib-syndication.php | 9 +- 223 files changed, 12708 insertions(+), 2450 deletions(-) diffs (truncated from 22058 to 300 lines): diff -r 1fa428bd1f68 -r 195d4ef428df .hgtags --- a/.hgtags Sun Jun 21 09:03:43 2009 +0200 +++ b/.hgtags Sun Jun 21 09:04:01 2009 +0200 @@ -1,3 +1,4 @@ f51a1417bd7041bea96370434142498438d4e558 geeklog_1_5_0_stable 8abbb13ee513b6cf2c76d702273c3fa118f9bf5c geeklog_1_5_1_stable 0c7d10cbc6bf6c040842707763920ccd9dea6d15 geeklog_1_6_0b1 +b73a34f5e8e667c045173c9dd2a2f3a1b29a37bf geeklog_1_6_0b2 diff -r 1fa428bd1f68 -r 195d4ef428df language/afrikaans.php --- a/language/afrikaans.php Sun Jun 21 09:03:43 2009 +0200 +++ b/language/afrikaans.php Sun Jun 21 09:04:01 2009 +0200 @@ -523,12 +523,13 @@ 61 => 'Verfyn soektog', 62 => '#', 63 => 'Description', - 64 => 'Showing %d - %d of %d results', + 64 => 'Showing %1$d - %2$d of %3$d results', 65 => 'Story', 66 => 'Comment', 67 => 'Show %d Results', 68 => 'Sort By', - 69 => 'Titles Only' + 69 => 'Titles Only', + 70 => 'Not available ...' ); ############################################################################### @@ -973,7 +974,7 @@ 18 => 'Epos', 34 => 'Bestuur en Beheer', 35 => 'Artikel Bydraes', - 36 => 'Comment', + 36 => 'Parent or Comment', 37 => '', 38 => 'Stuur', 39 => 'Daar is geen bydraes op hierdie tydstip wat aksie vereis nie', @@ -1836,6 +1837,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1856,7 +1858,6 @@ 'search_show_type' => 'Show Result Type?', 'search_show_sort' => 'Allow User to Sort Results?', 'search_show_limit' => 'Show Page Limits?', - 'search_no_data' => 'If No Data is Avaliable, Display', 'search_separator' => 'Group Separator', 'search_def_keytype' => 'Default Search Method' ); @@ -1938,7 +1939,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); ?> \ No newline at end of file diff -r 1fa428bd1f68 -r 195d4ef428df language/afrikaans_utf-8.php --- a/language/afrikaans_utf-8.php Sun Jun 21 09:03:43 2009 +0200 +++ b/language/afrikaans_utf-8.php Sun Jun 21 09:04:01 2009 +0200 @@ -523,12 +523,13 @@ 61 => 'Verfyn soektog', 62 => '#', 63 => 'Description', - 64 => 'Showing %d - %d of %d results', + 64 => 'Showing %1$d - %2$d of %3$d results', 65 => 'Story', 66 => 'Comment', 67 => 'Show %d Results', 68 => 'Sort By', - 69 => 'Titles Only' + 69 => 'Titles Only', + 70 => 'Not available ...' ); ############################################################################### @@ -973,7 +974,7 @@ 18 => 'Epos', 34 => 'Bestuur en Beheer', 35 => 'Artikel Bydraes', - 36 => 'Comment', + 36 => 'Parent or Comment', 37 => '', 38 => 'Stuur', 39 => 'Daar is geen bydraes op hierdie tydstip wat aksie vereis nie', @@ -1836,6 +1837,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1856,7 +1858,6 @@ 'search_show_type' => 'Show Result Type?', 'search_show_sort' => 'Allow User to Sort Results?', 'search_show_limit' => 'Show Page Limits?', - 'search_no_data' => 'If No Data is Avaliable, Display', 'search_separator' => 'Group Separator', 'search_def_keytype' => 'Default Search Method' ); @@ -1938,7 +1939,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); ?> \ No newline at end of file diff -r 1fa428bd1f68 -r 195d4ef428df language/bosnian.php --- a/language/bosnian.php Sun Jun 21 09:03:43 2009 +0200 +++ b/language/bosnian.php Sun Jun 21 09:04:01 2009 +0200 @@ -527,12 +527,13 @@ 61 => 'Refine search', 62 => '#', 63 => 'Description', - 64 => 'Showing %d - %d of %d results', + 64 => 'Showing %1$d - %2$d of %3$d results', 65 => 'Story', 66 => 'Comment', 67 => 'Show %d Results', 68 => 'Sort By', - 69 => 'Titles Only' + 69 => 'Titles Only', + 70 => 'Not available ...' ); ############################################################################### @@ -977,7 +978,7 @@ 18 => 'Email', 34 => 'Command and Control', 35 => 'Zahtjev za postavljanje teksta.', - 36 => 'Comment', + 36 => 'Parent or Comment', 37 => '', 38 => 'Potvrdi', 39 => 'Trenutacno nema zahtjeva za administraciju-', @@ -1840,6 +1841,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1860,7 +1862,6 @@ 'search_show_type' => 'Show Result Type?', 'search_show_sort' => 'Allow User to Sort Results?', 'search_show_limit' => 'Show Page Limits?', - 'search_no_data' => 'If No Data is Avaliable, Display', 'search_separator' => 'Group Separator', 'search_def_keytype' => 'Default Search Method' ); @@ -1942,7 +1943,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); ?> \ No newline at end of file diff -r 1fa428bd1f68 -r 195d4ef428df language/bosnian_utf-8.php --- a/language/bosnian_utf-8.php Sun Jun 21 09:03:43 2009 +0200 +++ b/language/bosnian_utf-8.php Sun Jun 21 09:04:01 2009 +0200 @@ -527,12 +527,13 @@ 61 => 'Refine search', 62 => '#', 63 => 'Description', - 64 => 'Showing %d - %d of %d results', + 64 => 'Showing %1$d - %2$d of %3$d results', 65 => 'Story', 66 => 'Comment', 67 => 'Show %d Results', 68 => 'Sort By', - 69 => 'Titles Only' + 69 => 'Titles Only', + 70 => 'Not available ...' ); ############################################################################### @@ -977,7 +978,7 @@ 18 => 'Email', 34 => 'Command and Control', 35 => 'Zahtjev za postavljanje teksta.', - 36 => 'Comment', + 36 => 'Parent or Comment', 37 => '', 38 => 'Potvrdi', 39 => 'Trenutacno nema zahtjeva za administraciju-', @@ -1840,6 +1841,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1860,7 +1862,6 @@ 'search_show_type' => 'Show Result Type?', 'search_show_sort' => 'Allow User to Sort Results?', 'search_show_limit' => 'Show Page Limits?', - 'search_no_data' => 'If No Data is Avaliable, Display', 'search_separator' => 'Group Separator', 'search_def_keytype' => 'Default Search Method' ); @@ -1942,7 +1943,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); ?> \ No newline at end of file diff -r 1fa428bd1f68 -r 195d4ef428df language/bulgarian.php --- a/language/bulgarian.php Sun Jun 21 09:03:43 2009 +0200 +++ b/language/bulgarian.php Sun Jun 21 09:04:01 2009 +0200 @@ -523,12 +523,13 @@ 61 => 'Refine search', 62 => '#', 63 => 'Description', - 64 => 'Showing %d - %d of %d results', + 64 => 'Showing %1$d - %2$d of %3$d results', 65 => 'Story', 66 => 'Comment', 67 => 'Show %d Results', 68 => 'Sort By', - 69 => 'Titles Only' + 69 => 'Titles Only', + 70 => 'Not available ...' ); ############################################################################### @@ -973,7 +974,7 @@ 18 => 'E-mail', 34 => 'Admin Panel', 35 => '????????? ????????', - 36 => 'Comment', + 36 => 'Parent or Comment', 37 => '', 38 => '???????', 39 => '???? ????????? ????????, ????? ?? ??????????? ??? ????????.', @@ -1836,6 +1837,7 @@ 'disable_autolinks' => 'Disable Autolinks?', 'clickable_links' => 'Make URLs clickable?', 'compressed_output' => 'Send compressed output?', + 'frame_options' => 'Protection against "clickjacking"', 'censormode' => 'Censor Mode?', 'censorreplace' => 'Censor Replace Text', 'censorlist' => 'Censor List', @@ -1856,7 +1858,6 @@ 'search_show_type' => 'Show Result Type?', 'search_show_sort' => 'Allow User to Sort Results?', 'search_show_limit' => 'Show Page Limits?', - 'search_no_data' => 'If No Data is Avaliable, Display', 'search_separator' => 'Group Separator', 'search_def_keytype' => 'Default Search Method' ); @@ -1938,7 +1939,8 @@ 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3), 19 => array('Google' => 'google', 'Table' => 'table'), 20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'), - 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict') + 21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'), + 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '') ); ?> \ No newline at end of file diff -r 1fa428bd1f68 -r 195d4ef428df language/bulgarian_utf-8.php --- a/language/bulgarian_utf-8.php Sun Jun 21 09:03:43 2009 +0200 +++ b/language/bulgarian_utf-8.php Sun Jun 21 09:04:01 2009 +0200 @@ -523,12 +523,13 @@ 61 => 'Refine search', 62 => '#', 63 => 'Description', - 64 => 'Showing %d - %d of %d results', + 64 => 'Showing %1$d - %2$d of %3$d results', 65 => 'Story', 66 => 'Comment', 67 => 'Show %d Results', 68 => 'Sort By', - 69 => 'Titles Only' + 69 => 'Titles Only', + 70 => 'Not available ...' ); From geeklog-cvs at lists.geeklog.net Sun Jun 21 03:45:18 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 21 Jun 2009 03:45:18 -0400 Subject: [geeklog-cvs] geeklog: Another attempt to fix a compatibility issue with PHP 4... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/83f7e21538e1 changeset: 7138:83f7e21538e1 user: Dirk Haun date: Sun Jun 21 09:34:35 2009 +0200 description: Another attempt to fix a compatibility issue with PHP 4 (parse error when saving a static page). Thanks to Ben for testing. diffstat: plugins/staticpages/services.inc.php | 3 ++- public_html/docs/history | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diffs (33 lines): diff -r 195d4ef428df -r 83f7e21538e1 plugins/staticpages/services.inc.php --- a/plugins/staticpages/services.inc.php Sun Jun 21 09:04:01 2009 +0200 +++ b/plugins/staticpages/services.inc.php Sun Jun 21 09:34:35 2009 +0200 @@ -62,7 +62,8 @@ global $_CONF, $_TABLES, $_USER, $LANG_ACCESS, $LANG12, $LANG_STATIC, $LANG_LOGIN, $_GROUPS, $_SP_CONF; - if ((PHP_VERSION > 4) && (! $_CONF['disable_webservices'])) { + if (version_compare(PHP_VERSION, '5.0.0', '>=') && + (! $_CONF['disable_webservices'])) { require_once $_CONF['path_system'] . '/lib-webservices.php'; } diff -r 195d4ef428df -r 83f7e21538e1 public_html/docs/history --- a/public_html/docs/history Sun Jun 21 09:04:01 2009 +0200 +++ b/public_html/docs/history Sun Jun 21 09:34:35 2009 +0200 @@ -1,6 +1,6 @@ Geeklog History/Changes: -Jun 2?, 2009 (1.6.0b3) +Jun 21, 2009 (1.6.0b3) ------------ Geeklog 1.6.0 incorporates the following projects implemented during @@ -47,6 +47,8 @@ Static Pages plugin ------------------- +- Another attempt to fix a compatibility issue with PHP 4 (parse error) + [Ben, Dirk] - Implemented PLG_getCommentUrlId [Dirk] - Update static pages comments when changing a page's ID so the comments don't become orphaned (part of bug #0000901) [Dirk] From geeklog-cvs at lists.geeklog.net Sun Jun 21 03:45:18 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 21 Jun 2009 03:45:18 -0400 Subject: [geeklog-cvs] geeklog: 1.6.0b3 Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c255cdae51b7 changeset: 7139:c255cdae51b7 user: Dirk Haun date: Sun Jun 21 09:38:28 2009 +0200 description: 1.6.0b3 diffstat: public_html/admin/install/lib-install.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 83f7e21538e1 -r c255cdae51b7 public_html/admin/install/lib-install.php --- a/public_html/admin/install/lib-install.php Sun Jun 21 09:34:35 2009 +0200 +++ b/public_html/admin/install/lib-install.php Sun Jun 21 09:38:28 2009 +0200 @@ -56,7 +56,7 @@ * This constant defines Geeklog's version number. It will be written to * siteconfig.php and the database (in the latter case minus any suffix). */ - define('VERSION', '1.6.0b2'); + define('VERSION', '1.6.0b3'); } if (!defined('XHTML')) { define('XHTML', ' /'); From geeklog-cvs at lists.geeklog.net Sun Jun 21 04:26:30 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 21 Jun 2009 04:26:30 -0400 Subject: [geeklog-cvs] geeklog: Added tag geeklog_1_6_0b3 for changeset c255cdae51b7 Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8ee034989425 changeset: 7140:8ee034989425 user: Dirk Haun date: Sun Jun 21 10:17:09 2009 +0200 description: Added tag geeklog_1_6_0b3 for changeset c255cdae51b7 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r c255cdae51b7 -r 8ee034989425 .hgtags --- a/.hgtags Sun Jun 21 09:38:28 2009 +0200 +++ b/.hgtags Sun Jun 21 10:17:09 2009 +0200 @@ -2,3 +2,4 @@ 8abbb13ee513b6cf2c76d702273c3fa118f9bf5c geeklog_1_5_1_stable 0c7d10cbc6bf6c040842707763920ccd9dea6d15 geeklog_1_6_0b1 b73a34f5e8e667c045173c9dd2a2f3a1b29a37bf geeklog_1_6_0b2 +c255cdae51b7fead30ea2b8e04350cc70561fcdd geeklog_1_6_0b3 From geeklog-cvs at lists.geeklog.net Sun Jun 21 14:20:23 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 21 Jun 2009 14:20:23 -0400 Subject: [geeklog-cvs] geeklog: - Test commit. Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7e6619f68f5b changeset: 7141:7e6619f68f5b user: pachilor date: Sun Jun 21 19:45:23 2009 +0200 description: - Test commit. From geeklog-cvs at lists.geeklog.net Sun Jun 21 14:28:25 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 21 Jun 2009 14:28:25 -0400 Subject: [geeklog-cvs] geeklog: removed test.txt Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/01a022b79a57 changeset: 7142:01a022b79a57 user: Choplair date: Sun Jun 21 20:28:05 2009 +0200 description: removed test.txt From geeklog-cvs at lists.geeklog.net Sun Jun 21 14:51:42 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 21 Jun 2009 14:51:42 -0400 Subject: [geeklog-cvs] geeklog: Merging branches *sigh* Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/31c3b9a47121 changeset: 7143:31c3b9a47121 user: Dirk Haun date: Sun Jun 21 20:48:37 2009 +0200 description: Merging branches *sigh* From geeklog-cvs at lists.geeklog.net Sun Jun 21 14:56:30 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 21 Jun 2009 14:56:30 -0400 Subject: [geeklog-cvs] geeklog: Fixed database version number (bug #0000865). Just in c... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3e15c8a33aa2 changeset: 7144:3e15c8a33aa2 user: Dirk Haun date: Sun Jun 21 20:56:20 2009 +0200 description: Fixed database version number (bug #0000865). Just in case we ever need to do another 1.5.x release ... diffstat: sql/mssql_tableanddata.php | 2 +- sql/mysql_tableanddata.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 5ff40e9528d9 -r 3e15c8a33aa2 sql/mssql_tableanddata.php --- a/sql/mssql_tableanddata.php Sat Apr 18 10:00:36 2009 +0200 +++ b/sql/mssql_tableanddata.php Sun Jun 21 20:56:20 2009 +0200 @@ -1735,7 +1735,7 @@ $_SQL[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('lastemailedstories','')"; $_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['vars']} (name, value) VALUES ('database_version','1.5.2')"; $_SQL[] = "INSERT INTO {$_TABLES['trackbackcodes']} (code, name) VALUES (0,'Trackback Enabled')"; $_SQL[] = "INSERT INTO {$_TABLES['trackbackcodes']} (code, name) VALUES (-1,'Trackback Disabled')"; diff -r 5ff40e9528d9 -r 3e15c8a33aa2 sql/mysql_tableanddata.php --- a/sql/mysql_tableanddata.php Sat Apr 18 10:00:36 2009 +0200 +++ b/sql/mysql_tableanddata.php Sun Jun 21 20:56:20 2009 +0200 @@ -982,7 +982,7 @@ $_DATA[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('lastemailedstories','') "; $_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['vars']} (name, value) VALUES ('database_version','1.5.2') "; $_DATA[] = "INSERT INTO {$_TABLES['trackbackcodes']} (code, name) VALUES (0,'Trackback Enabled') "; $_DATA[] = "INSERT INTO {$_TABLES['trackbackcodes']} (code, name) VALUES (-1,'Trackback Disabled') "; From geeklog-cvs at lists.geeklog.net Sat Jun 27 07:10:37 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 27 Jun 2009 07:10:37 -0400 Subject: [geeklog-cvs] geeklog: Fixed typos in the install script (bugs #0000913 and #0... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7c8b39785c9e changeset: 7145:7c8b39785c9e user: Dirk Haun date: Sat Jun 27 13:00:19 2009 +0200 description: Fixed typos in the install script (bugs #0000913 and #0000914) diffstat: public_html/admin/install/index.php | 2 +- public_html/admin/install/install-plugins.php | 2 +- public_html/docs/history | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diffs (49 lines): diff -r 31c3b9a47121 -r 7c8b39785c9e public_html/admin/install/index.php --- a/public_html/admin/install/index.php Sun Jun 21 20:48:37 2009 +0200 +++ b/public_html/admin/install/index.php Sat Jun 27 13:00:19 2009 +0200 @@ -982,7 +982,7 @@ // or in public_html have the user enter its location. $form_fields .= '
db-config.php ' . LB . '
' . LB; + . htmlspecialchars($dbconfig_file) . '" size="50"' . XHTML . '>
' . LB; $num_errors++; } else { // See whether the file/directory is located in the default place or in public_html diff -r 31c3b9a47121 -r 7c8b39785c9e public_html/admin/install/install-plugins.php --- a/public_html/admin/install/install-plugins.php Sun Jun 21 20:48:37 2009 +0200 +++ b/public_html/admin/install/install-plugins.php Sat Jun 27 13:00:19 2009 +0200 @@ -65,7 +65,7 @@ $dbconfig_path = (isset($_POST['dbconfig_path'])) ? $_POST['dbconfig_path'] : ((isset($_GET['dbconfig_path'])) ? $_GET['dbconfig_path'] : $gl_path . '/db-config.php'); $dbconfig_path = INST_sanitizePath($dbconfig_path); -tep = isset($_GET['step']) ? $_GET['step'] : (isset($_POST['step']) ? $_POST['step'] : 1); +$step = isset($_GET['step']) ? $_GET['step'] : (isset($_POST['step']) ? $_POST['step'] : 1); // $display holds all the outputted HTML and content $display = INST_getHeader($LANG_PLUGINS[2] . ' 3 - ' . $LANG_PLUGINS[1]); // Grab the beginning HTML for the installer theme. diff -r 31c3b9a47121 -r 7c8b39785c9e public_html/docs/history --- a/public_html/docs/history Sun Jun 21 20:48:37 2009 +0200 +++ b/public_html/docs/history Sat Jun 27 13:00:19 2009 +0200 @@ -1,6 +1,6 @@ Geeklog History/Changes: -Jun 21, 2009 (1.6.0b3) +Jun ??, 2009 (1.6.0rc1) ------------ Geeklog 1.6.0 incorporates the following projects implemented during @@ -10,6 +10,13 @@ + Improved search, by Sami Barakat + Comment moderation and editable comments, by Jared Wenerd +Changes since 1.6.0b3: +- Fixed typos in the install script (bugs #0000913 and #0000914) [Dirk] + + +Jun 21, 2009 (1.6.0b3) +------------ + Changes since 1.6.0b2: - Fixed IE6 and Safari compatibility issue with sort and limit combo boxes in search results (part of bug #0000874) [Sami] From geeklog-cvs at lists.geeklog.net Sat Jun 27 13:29:28 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 27 Jun 2009 13:29:28 -0400 Subject: [geeklog-cvs] geeklog: Set default character set in siteconfig.php during migr... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/84dd4dca30eb changeset: 7146:84dd4dca30eb user: Dirk Haun date: Sat Jun 27 16:21:38 2009 +0200 description: Set default character set in siteconfig.php during migration (cf. bug #0000916) diffstat: public_html/admin/install/migrate.php | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diffs (29 lines): diff -r 7c8b39785c9e -r 84dd4dca30eb public_html/admin/install/migrate.php --- a/public_html/admin/install/migrate.php Sat Jun 27 13:00:19 2009 +0200 +++ b/public_html/admin/install/migrate.php Sat Jun 27 16:21:38 2009 +0200 @@ -576,6 +576,8 @@ */ case 3: + require_once 'lib-upgrade.php'; + // Get the backup filename $backup_file = $_REQUEST['backup_file']; @@ -642,7 +644,15 @@ } else { // Update db-config.php with the table prefix from the backup file. if (!INST_writeConfig($dbconfig_path, $DB)) { - exit($LANG_INSTALL[26] . ' ' . $dbconfig_path . $LANG_INSTALL[58]); + exit($LANG_INSTALL[26] . ' ' . $dbconfig_path + . $LANG_INSTALL[58]); + } + + if (!INST_setDefaultCharset($siteconfig_path, + ($db_connection_charset == 'utf8' + ? 'utf-8' : $LANG_CHARSET))) { + exit($LANG_INSTALL[26] . ' ' . $siteconfig_path + . $LANG_INSTALL[58]); } // Send file to bigdump.php script to do the import. From geeklog-cvs at lists.geeklog.net Sat Jun 27 13:29:28 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 27 Jun 2009 13:29:28 -0400 Subject: [geeklog-cvs] geeklog: Fixed @see Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4c12395cf528 changeset: 7147:4c12395cf528 user: Dirk Haun date: Sat Jun 27 17:51:50 2009 +0200 description: Fixed @see diffstat: plugins/xmlsitemap/autoinstall.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 84dd4dca30eb -r 4c12395cf528 plugins/xmlsitemap/autoinstall.php --- a/plugins/xmlsitemap/autoinstall.php Sat Jun 27 16:21:38 2009 +0200 +++ b/plugins/xmlsitemap/autoinstall.php Sat Jun 27 17:51:50 2009 +0200 @@ -68,7 +68,7 @@ * * @param string $pi_name Plugin name * @return boolean TRUE on success, otherwise FALSE -* @see plugin_initconfig_glsitemap +* @see plugin_initconfig_xmlsitemap * */ function plugin_load_configuration_xmlsitemap($pi_name) From geeklog-cvs at lists.geeklog.net Sat Jun 27 13:29:29 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 27 Jun 2009 13:29:29 -0400 Subject: [geeklog-cvs] geeklog: Re-read configuration during plugin install to ensure p... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4c2dd05c2fd3 changeset: 7148:4c2dd05c2fd3 user: Dirk Haun date: Sat Jun 27 18:51:07 2009 +0200 description: Re-read configuration during plugin install to ensure plugin configs are available diffstat: public_html/admin/install/lib-install.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 4c12395cf528 -r 4c2dd05c2fd3 public_html/admin/install/lib-install.php --- a/public_html/admin/install/lib-install.php Sat Jun 27 17:51:50 2009 +0200 +++ b/public_html/admin/install/lib-install.php Sat Jun 27 18:51:07 2009 +0200 @@ -893,6 +893,10 @@ return false; } + + require_once $_CONF['path'] . 'system/classes/config.class.php'; + $config =& config::get_instance(); + $config->initConfig(); // force re-reading, including new plugin conf } // Finally, register the plugin with Geeklog From geeklog-cvs at lists.geeklog.net Sat Jun 27 13:29:29 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 27 Jun 2009 13:29:29 -0400 Subject: [geeklog-cvs] geeklog: Re-read configuration during plugin install to ensure p... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/17c6fd509397 changeset: 7149:17c6fd509397 user: Dirk Haun date: Sat Jun 27 19:03:35 2009 +0200 description: Re-read configuration during plugin install to ensure plugin configs are available diffstat: public_html/admin/plugins.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 4c2dd05c2fd3 -r 17c6fd509397 public_html/admin/plugins.php --- a/public_html/admin/plugins.php Sat Jun 27 18:51:07 2009 +0200 +++ b/public_html/admin/plugins.php Sat Jun 27 19:03:35 2009 +0200 @@ -1073,6 +1073,10 @@ return false; } + + require_once $_CONF['path'] . 'system/classes/config.class.php'; + $config =& config::get_instance(); + $config->initConfig(); // force re-reading, including new plugin conf } // Finally, register the plugin with Geeklog From geeklog-cvs at lists.geeklog.net Sat Jun 27 13:29:30 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 27 Jun 2009 13:29:30 -0400 Subject: [geeklog-cvs] geeklog: Fixed call to non-mb version of strrpos Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/948bdd6dc34b changeset: 7150:948bdd6dc34b user: Dirk Haun date: Sat Jun 27 19:14:02 2009 +0200 description: Fixed call to non-mb version of strrpos diffstat: system/lib-mbyte.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 17c6fd509397 -r 948bdd6dc34b system/lib-mbyte.php --- a/system/lib-mbyte.php Sat Jun 27 19:03:35 2009 +0200 +++ b/system/lib-mbyte.php Sat Jun 27 19:14:02 2009 +0200 @@ -173,7 +173,11 @@ $result = mb_strrpos($hay, $needle, $offset); } } else { - $result = strrpos($hay, $needle, $offset); + if ($offset === NULL) { + $result = strrpos($hay, $needle); + } else { + $result = strrpos($hay, $needle, $offset); + } } return $result; From geeklog-cvs at lists.geeklog.net Sat Jun 27 13:29:31 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sat, 27 Jun 2009 13:29:31 -0400 Subject: [geeklog-cvs] geeklog: Renamed $hay to $haystack for consistency with the PHP ... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/96bdbb425e54 changeset: 7151:96bdbb425e54 user: Dirk Haun date: Sat Jun 27 19:14:51 2009 +0200 description: Renamed $hay to $haystack for consistency with the PHP manual diffstat: system/lib-mbyte.php | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diffs (72 lines): diff -r 948bdd6dc34b -r 96bdbb425e54 system/lib-mbyte.php --- a/system/lib-mbyte.php Sat Jun 27 19:14:02 2009 +0200 +++ b/system/lib-mbyte.php Sat Jun 27 19:14:51 2009 +0200 @@ -143,7 +143,7 @@ return $result; } -function MBYTE_strpos($hay, $needle, $offset = NULL) +function MBYTE_strpos($haystack, $needle, $offset = NULL) { static $mb_enabled; @@ -151,15 +151,15 @@ $mb_enabled = MBYTE_checkEnabled(); } if ($mb_enabled) { - $result = mb_strpos($hay, $needle, $offset); + $result = mb_strpos($haystack, $needle, $offset); } else { - $result = strpos($hay, $needle, $offset); + $result = strpos($haystack, $needle, $offset); } return $result; } -function MBYTE_strrpos($hay, $needle, $offset = NULL) +function MBYTE_strrpos($haystack, $needle, $offset = NULL) { static $mb_enabled; @@ -168,15 +168,15 @@ } if ($mb_enabled) { if ($offset === NULL) { - $result = mb_strrpos($hay, $needle); + $result = mb_strrpos($haystack, $needle); } else { - $result = mb_strrpos($hay, $needle, $offset); + $result = mb_strrpos($haystack, $needle, $offset); } } else { if ($offset === NULL) { - $result = strrpos($hay, $needle); + $result = strrpos($haystack, $needle); } else { - $result = strrpos($hay, $needle, $offset); + $result = strrpos($haystack, $needle, $offset); } } @@ -233,7 +233,7 @@ /** those are currently not needed in GL, left here if needed later -function MBYTE_substr_count($hay, $needle) +function MBYTE_substr_count($haystack, $needle) { static $mb_enabled; @@ -241,9 +241,9 @@ $mb_enabled = MBYTE_checkEnabled(); } if ($mb_enabled) { - $result = mb_substr_count($hay, $needle, 'utf-8'); + $result = mb_substr_count($haystack, $needle, 'utf-8'); } else { - $result = substr_count($hay, $needle); + $result = substr_count($haystack, $needle); } return $result; From geeklog-cvs at lists.geeklog.net Sun Jun 28 03:40:08 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 28 Jun 2009 03:40:08 -0400 Subject: [geeklog-cvs] geeklog: Fixed include path for db-config.php in bigdump.php (bu... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ef11cd91aa2a changeset: 7153:ef11cd91aa2a user: Dirk Haun date: Sun Jun 28 09:33:20 2009 +0200 description: Fixed include path for db-config.php in bigdump.php (bug #0000915) diffstat: public_html/admin/install/bigdump.php | 3 ++- public_html/docs/history | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diffs (25 lines): diff -r 28fd720fa0de -r ef11cd91aa2a public_html/admin/install/bigdump.php --- a/public_html/admin/install/bigdump.php Sun Jun 28 09:22:09 2009 +0200 +++ b/public_html/admin/install/bigdump.php Sun Jun 28 09:33:20 2009 +0200 @@ -44,8 +44,9 @@ // THIS SCRIPT IS PROVIDED AS IS, WITHOUT ANY WARRANTY OR GUARANTEE OF ANY KIND // +require_once '../../siteconfig.php'; // Database configuration -require_once '../../../db-config.php'; +require_once $_CONF['path'] . 'db-config.php'; require_once 'lib-install.php'; $db_server = $_DB_host; $db_name = $_DB_name; diff -r 28fd720fa0de -r ef11cd91aa2a public_html/docs/history --- a/public_html/docs/history Sun Jun 28 09:22:09 2009 +0200 +++ b/public_html/docs/history Sun Jun 28 09:33:20 2009 +0200 @@ -11,6 +11,7 @@ + Comment moderation and editable comments, by Jared Wenerd Changes since 1.6.0b3: +- Fixed include path for db-config.php in bigdump.php (bug #0000915) [Dirk] - Improved detection of UTF-8 database dumps in migration (bug #0000916) [Dirk] - Fixed typos in the install script (bugs #0000913 and #0000914) [Dirk] From geeklog-cvs at lists.geeklog.net Sun Jun 28 03:40:07 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 28 Jun 2009 03:40:07 -0400 Subject: [geeklog-cvs] geeklog: Improved detection of UTF-8 database dumps in migration... Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/28fd720fa0de changeset: 7152:28fd720fa0de user: Dirk Haun date: Sun Jun 28 09:22:09 2009 +0200 description: Improved detection of UTF-8 database dumps in migration (bug #0000916) diffstat: public_html/admin/install/migrate.php | 5 +++++ public_html/docs/history | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diffs (26 lines): diff -r 96bdbb425e54 -r 28fd720fa0de public_html/admin/install/migrate.php --- a/public_html/admin/install/migrate.php Sat Jun 27 19:14:51 2009 +0200 +++ b/public_html/admin/install/migrate.php Sun Jun 28 09:22:09 2009 +0200 @@ -630,6 +630,11 @@ if (strpos($line, 'SET NAMES utf8') !== false) { $db_connection_charset = 'utf8'; } + } elseif (empty($db_connection_charset) && + strpos($line, 'ENGINE=') !== false) { + if (strpos($line, 'DEFAULT CHARSET=utf8') !== false) { + $db_connection_charset = 'utf8'; + } } } } diff -r 96bdbb425e54 -r 28fd720fa0de public_html/docs/history --- a/public_html/docs/history Sat Jun 27 19:14:51 2009 +0200 +++ b/public_html/docs/history Sun Jun 28 09:22:09 2009 +0200 @@ -11,6 +11,7 @@ + Comment moderation and editable comments, by Jared Wenerd Changes since 1.6.0b3: +- Improved detection of UTF-8 database dumps in migration (bug #0000916) [Dirk] - Fixed typos in the install script (bugs #0000913 and #0000914) [Dirk] From geeklog-cvs at lists.geeklog.net Sun Jun 28 07:14:45 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 28 Jun 2009 07:14:45 -0400 Subject: [geeklog-cvs] geeklog: Geeklog 1.6.0rc1 Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/401071b8493d changeset: 7156:401071b8493d user: Dirk Haun date: Sun Jun 28 10:47:36 2009 +0200 description: Geeklog 1.6.0rc1 diffstat: public_html/admin/install/lib-install.php | 2 +- public_html/docs/history | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (23 lines): diff -r 4b903c727480 -r 401071b8493d public_html/admin/install/lib-install.php --- a/public_html/admin/install/lib-install.php Sun Jun 28 10:37:16 2009 +0200 +++ b/public_html/admin/install/lib-install.php Sun Jun 28 10:47:36 2009 +0200 @@ -56,7 +56,7 @@ * This constant defines Geeklog's version number. It will be written to * siteconfig.php and the database (in the latter case minus any suffix). */ - define('VERSION', '1.6.0b3'); + define('VERSION', '1.6.0rc1'); } if (!defined('XHTML')) { define('XHTML', ' /'); diff -r 4b903c727480 -r 401071b8493d public_html/docs/history --- a/public_html/docs/history Sun Jun 28 10:37:16 2009 +0200 +++ b/public_html/docs/history Sun Jun 28 10:47:36 2009 +0200 @@ -1,6 +1,6 @@ Geeklog History/Changes: -Jun ??, 2009 (1.6.0rc1) +Jun 28, 2009 (1.6.0rc1) ------------ Geeklog 1.6.0 incorporates the following projects implemented during From geeklog-cvs at lists.geeklog.net Sun Jun 28 07:14:44 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 28 Jun 2009 07:14:44 -0400 Subject: [geeklog-cvs] geeklog: Updated default poll Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/259c244273b0 changeset: 7154:259c244273b0 user: Dirk Haun date: Sun Jun 28 10:35:09 2009 +0200 description: Updated default poll diffstat: plugins/polls/sql/mssql_install.php | 10 +++++----- plugins/polls/sql/mysql_install.php | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diffs (40 lines): diff -r ef11cd91aa2a -r 259c244273b0 plugins/polls/sql/mssql_install.php --- a/plugins/polls/sql/mssql_install.php Sun Jun 28 09:33:20 2009 +0200 +++ b/plugins/polls/sql/mssql_install.php Sun Jun 28 10:35:09 2009 +0200 @@ -125,11 +125,11 @@ $DEFVALUES[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (0, 'geeklogfeaturepoll', 'What is the best new feature of Geeklog?');"; $DEFVALUES[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (1, 'geeklogfeaturepoll', 'What is the all-time best feature of Geeklog?');"; -$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 1, 'MS SQL support', 0, '');"; -$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 2, 'Multi-language support', 0, '');"; -$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 3, 'Calendar as a plugin', 0, '');"; -$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 4, 'SLV spam protection', 0, '');"; -$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 5, 'Mass-delete users', 0, '');"; +$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 1, 'Improved Search', 0, '');"; +$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 2, 'Comment Improvements', 0, '');"; +$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 3, 'Site Migration', 0, '');"; +$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 4, 'Plugin Upload', 0, '');"; +$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 5, 'XMLSitemap Plugin', 0, '');"; $DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 6, 'Other', 0, '');"; $DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 1, 'Permissions Handling', 0, '');"; diff -r ef11cd91aa2a -r 259c244273b0 plugins/polls/sql/mysql_install.php --- a/plugins/polls/sql/mysql_install.php Sun Jun 28 09:33:20 2009 +0200 +++ b/plugins/polls/sql/mysql_install.php Sun Jun 28 10:35:09 2009 +0200 @@ -104,11 +104,11 @@ $DEFVALUES[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (0, 'geeklogfeaturepoll', 'What is the best new feature of Geeklog?');"; $DEFVALUES[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (1, 'geeklogfeaturepoll', 'What is the all-time best feature of Geeklog?');"; -$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 1, 'MS SQL support', 0, '');"; -$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 2, 'Multi-language support', 0, '');"; -$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 3, 'Calendar as a plugin', 0, '');"; -$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 4, 'SLV spam protection', 0, '');"; -$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 5, 'Mass-delete users', 0, '');"; +$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 1, 'Improved Search', 0, '');"; +$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 2, 'Comment Improvements', 0, '');"; +$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 3, 'Site Migration', 0, '');"; +$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 4, 'Plugin Upload', 0, '');"; +$DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 5, 'XMLSitemap Plugin', 0, '');"; $DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 6, 'Other', 0, '');"; $DEFVALUES[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 1, 'Permissions Handling', 0, '');"; From geeklog-cvs at lists.geeklog.net Sun Jun 28 07:14:44 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 28 Jun 2009 07:14:44 -0400 Subject: [geeklog-cvs] geeklog: Ignore sitemap.xml Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4b903c727480 changeset: 7155:4b903c727480 user: Dirk Haun date: Sun Jun 28 10:37:16 2009 +0200 description: Ignore sitemap.xml diffstat: .hgignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 259c244273b0 -r 4b903c727480 .hgignore --- a/.hgignore Sun Jun 28 10:35:09 2009 +0200 +++ b/.hgignore Sun Jun 28 10:37:16 2009 +0200 @@ -17,6 +17,8 @@ public_html/siteconfig.php system/lib-custom.php +public_html/sitemap.xml + config.php plugins/calendar/config.php plugins/links/config.php From geeklog-cvs at lists.geeklog.net Sun Jun 28 12:11:28 2009 From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net) Date: Sun, 28 Jun 2009 12:11:28 -0400 Subject: [geeklog-cvs] geeklog: Added tag geeklog_1_6_0rc1 for changeset 401071b8493d Message-ID: details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/998fa67f7f72 changeset: 7157:998fa67f7f72 user: Dirk Haun date: Sun Jun 28 17:58:32 2009 +0200 description: Added tag geeklog_1_6_0rc1 for changeset 401071b8493d diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 401071b8493d -r 998fa67f7f72 .hgtags --- a/.hgtags Sun Jun 28 10:47:36 2009 +0200 +++ b/.hgtags Sun Jun 28 17:58:32 2009 +0200 @@ -3,3 +3,4 @@ 0c7d10cbc6bf6c040842707763920ccd9dea6d15 geeklog_1_6_0b1 b73a34f5e8e667c045173c9dd2a2f3a1b29a37bf geeklog_1_6_0b2 c255cdae51b7fead30ea2b8e04350cc70561fcdd geeklog_1_6_0b3 +401071b8493d706c3cc69a7d7f578d626da70be3 geeklog_1_6_0rc1

{sort_text}{sort_selected}	{sort_text}{sort_selected}

' . $LANG_INSTALL[101] . ' ' . $_REQUEST['display_step'] . ' - ' . $LANG_INSTALL[102] . '

' . $LANG_INSTALL[101] . ' ' . htmlspecialchars($_REQUEST['display_step']) . ' - ' . $LANG_INSTALL[102] . '

' . $LANG_INSTALL[31] . '

' . $LANG_INSTALL[44] . '

' . $LANG_INSTALL[3] . '

' . $LANG_INSTALL[101] . ' ' . $display_step . ' - ' . $LANG_INSTALL[23] . '

Plugin Development

Overview

Functions for writing plugins

Moderation functions

Admin and User Menu functions

Search Functions

Comment Function

Stats Function

Uninstall Function

Miscellaneous: Debug

???????????????????????????

??????

??????????????????????????????

' . $LANG_INSTALL[101] . ' ' . $display_step . ' - ' . $LANG_INSTALL[23] . '

Search