codes****@googl*****
codes****@googl*****
2009年 2月 12日 (木) 01:31:12 JST
Author: tacahi
Date: Wed Feb 11 08:01:00 2009
New Revision: 1166
Modified:
trunk/geeklog-1-jp/language/japanese_utf-8.php
trunk/geeklog-1-jp/plugins/calendar/language/estonian.php
trunk/geeklog-1-jp/plugins/calendar/language/estonian_utf-8.php
trunk/geeklog-1-jp/plugins/staticpages/services.inc.php
trunk/geeklog-1-jp/public_html/admin/install/config-install.php
trunk/geeklog-1-jp/public_html/admin/story.php
trunk/geeklog-1-jp/public_html/comment.php
trunk/geeklog-1-jp/public_html/docs/changed-files
trunk/geeklog-1-jp/public_html/docs/changes.html
trunk/geeklog-1-jp/public_html/docs/history
trunk/geeklog-1-jp/public_html/lib-common.php
trunk/geeklog-1-jp/public_html/siteconfig.php
trunk/geeklog-1-jp/public_html/users.php
trunk/geeklog-1-jp/system/lib-comment.php
trunk/geeklog-1-jp/system/lib-security.php
Log:
Geeklog 1.5.2rc1から1.5.2の変更をマージしました。
Modified: trunk/geeklog-1-jp/language/japanese_utf-8.php
==============================================================================
--- trunk/geeklog-1-jp/language/japanese_utf-8.php (original)
+++ trunk/geeklog-1-jp/language/japanese_utf-8.php Wed Feb 11 08:01:00 2009
@@ -540,7 +540,7 @@
24 => 'メールで紹介された記事はありません。',
25 => 'トラックバックされた記事（上位10件）',
26 => 'トラックバックはありません。',
- 27 => '登録ユーザ数',
+ 27 => 'アクティブユーザ数',
28 => '',
29 => '',
30 => 'ヒット',
Modified: trunk/geeklog-1-jp/plugins/calendar/language/estonian.php
==============================================================================
--- trunk/geeklog-1-jp/plugins/calendar/language/estonian.php (original)
+++ trunk/geeklog-1-jp/plugins/calendar/language/estonian.php Wed Feb 11
08:01:00 2009
@@ -109,7 +109,7 @@
11 => 'Peakalender',
12 => 'Minu kalender',
25 => 'tagasi ',
- 26 => 'K�ik p�evad',
+ 26 => 'Kogu p�ev',
27 => 'N�dal',
28 => 'Isiklik kalender, kasutaja',
29 => 'Avalik kalender',
Modified: trunk/geeklog-1-jp/plugins/calendar/language/estonian_utf-8.php
==============================================================================
--- trunk/geeklog-1-jp/plugins/calendar/language/estonian_utf-8.php
(original)
+++ trunk/geeklog-1-jp/plugins/calendar/language/estonian_utf-8.php Wed Feb
11 08:01:00 2009
@@ -109,7 +109,7 @@
11 => 'Peakalender',
12 => 'Minu kalender',
25 => 'tagasi ',
- 26 => 'Kõik päevad',
+ 26 => 'Kogu päev',
27 => 'Nädal',
28 => 'Isiklik kalender, kasutaja',
29 => 'Avalik kalender',
Modified: trunk/geeklog-1-jp/plugins/staticpages/services.inc.php
==============================================================================
--- trunk/geeklog-1-jp/plugins/staticpages/services.inc.php (original)
+++ trunk/geeklog-1-jp/plugins/staticpages/services.inc.php Wed Feb 11
08:01:00 2009
@@ -8,7 +8,7 @@
//
|
|
// | This file implements the services provided by the 'Static Pages'
plugin. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following
authors: |
+// | Copyright (C) 2000-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Tom Willett - twillett AT users DOT sourceforge DOT
net |
@@ -32,8 +32,10 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: services.inc.php,v 1.13 2008/07/28 19:35:46 dhaun Exp $
+
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'services.inc.php') !==
false) {
+ die('This file can not be used on its own.');
+}
// this must be kept in synch with the actual size of 'sp_id' in the db ...
define('STATICPAGE_MAX_ID_LENGTH', 40);
@@ -51,7 +53,9 @@
global $_CONF, $_TABLES, $_USER, $LANG_ACCESS, $LANG12, $LANG_STATIC,
$LANG_LOGIN, $_GROUPS, $_SP_CONF;
- require_once $_CONF['path_system'] . '/lib-webservices.php';
+ if ((PHP_VERSION > 4) && (! $_CONF['disable_webservices'])) {
+ require_once $_CONF['path_system'] . '/lib-webservices.php';
+ }
$output = '';
@@ -135,7 +139,11 @@
if (isset($args['slug'])) {
$slug = $args['slug'];
}
- $args['sp_id'] = WS_makeId($slug, STATICPAGE_MAX_ID_LENGTH);
+ if (function_exists('WS_makeId')) {
+ $args['sp_id'] = WS_makeId($slug,
STATICPAGE_MAX_ID_LENGTH);
+ } else {
+ $args['sp_id'] = COM_makeSid();
+ }
}
}
Modified: trunk/geeklog-1-jp/public_html/admin/install/config-install.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/install/config-install.php
(original)
+++ trunk/geeklog-1-jp/public_html/admin/install/config-install.php Wed Feb
11 08:01:00 2009
@@ -312,7 +312,7 @@
$c->add('fs_censoring', NULL, 'fieldset', 7, 35, NULL, 0, TRUE);
$c->add('censormode',1,'select',7,35,0,1760,TRUE);
- $c->add('censorreplace','*censormode*','text',7,35,NULL,1770,TRUE);
+ $c->add('censorreplace','*censored*','text',7,35,NULL,1770,TRUE);
$c->add('censorlist',
array('fuck','cunt','fucker','fucking','pussy','cock','c0ck','
cum ','twat','clit','bitch','fuk','fuking','motherfucker'),'%text',7,35,NULL,1780,TRUE);
$c->add('fs_iplookup', NULL, 'fieldset', 7, 36, NULL, 0, TRUE);
Modified: trunk/geeklog-1-jp/public_html/admin/story.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/story.php (original)
+++ trunk/geeklog-1-jp/public_html/admin/story.php Wed Feb 11 08:01:00 2009
@@ -258,8 +258,17 @@
}
$story = new Story();
- if($mode == 'preview')
- {
+ if ($mode == 'preview') {
+ // Handle Magic GPC Garbage:
+ while (list($key, $value) = each($_POST)) {
+ if (!is_array($value)) {
+ $_POST[$key] = COM_stripslashes($value);
+ } else {
+ while (list($subkey, $subvalue) = each($value)) {
+ $value[$subkey] = COM_stripslashes($subvalue);
+ }
+ }
+ }
$result = $story->loadFromArgsArray($_POST);
} else {
$result = $story->loadFromDatabase($sid, $mode);
Modified: trunk/geeklog-1-jp/public_html/comment.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/comment.php (original)
+++ trunk/geeklog-1-jp/public_html/comment.php Wed Feb 11 08:01:00 2009
@@ -8,7 +8,7 @@
//
|
|
// | Let user comment on a story or
plugin. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following
authors: |
+// | Copyright (C) 2000-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT
net |
@@ -32,8 +32,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: comment.php,v 1.116 2008/08/12 19:15:36 mjervis Exp $
/**
* This file is responsible for letting user enter a comment and saving the
@@ -250,7 +248,7 @@
break;
}
- return COM_siteHeader() . $display . COM_siteFooter();
+ return COM_siteHeader('menu', $title) . $display . COM_siteFooter();
}
// MAIN
Modified: trunk/geeklog-1-jp/public_html/docs/changed-files
==============================================================================
--- trunk/geeklog-1-jp/public_html/docs/changed-files (original)
+++ trunk/geeklog-1-jp/public_html/docs/changed-files Wed Feb 11 08:01:00
2009
@@ -1,82 +1,15 @@
-geeklog-1.5.2/language/german.php
-geeklog-1.5.2/language/german_formal.php
-geeklog-1.5.2/language/german_formal_utf-8.php
-geeklog-1.5.2/language/german_utf-8.php
geeklog-1.5.2/language/japanese_utf-8.php
-geeklog-1.5.2/language/polish.php
-geeklog-1.5.2/language/polish_utf-8.php
-geeklog-1.5.2/plugins/calendar/functions.inc
-geeklog-1.5.2/plugins/calendar/language/japanese_utf-8.php
-geeklog-1.5.2/plugins/links/functions.inc
-geeklog-1.5.2/plugins/links/language/japanese_utf-8.php
-geeklog-1.5.2/plugins/links/language/slovenian.php
-geeklog-1.5.2/plugins/links/language/slovenian_utf-8.php
-geeklog-1.5.2/plugins/polls/functions.inc
-geeklog-1.5.2/plugins/polls/install_defaults.php
-geeklog-1.5.2/plugins/polls/language/japanese_utf-8.php
-geeklog-1.5.2/plugins/polls/templates/admin/polleditor.thtml
-geeklog-1.5.2/plugins/spamx/functions.inc
-geeklog-1.5.2/plugins/spamx/language/hebrew_utf-8.php
-geeklog-1.5.2/plugins/spamx/language/japanese_utf-8.php
-geeklog-1.5.2/plugins/staticpages/functions.inc
-geeklog-1.5.2/plugins/staticpages/language/japanese_utf-8.php
+geeklog-1.5.2/plugins/calendar/language/estonian.php
+geeklog-1.5.2/plugins/calendar/language/estonian_utf-8.php
geeklog-1.5.2/plugins/staticpages/services.inc.php
-geeklog-1.5.2/plugins/staticpages/templates/printable.thtml
-geeklog-1.5.2/public_html/admin/install/addindex.php
geeklog-1.5.2/public_html/admin/install/config-install.php
-geeklog-1.5.2/public_html/admin/install/index.php
-geeklog-1.5.2/public_html/admin/install/language/german.php
-geeklog-1.5.2/public_html/admin/install/language/hebrew_utf-8.php
-geeklog-1.5.2/public_html/admin/install/language/polish.php
-geeklog-1.5.2/public_html/admin/moderation.php
-geeklog-1.5.2/public_html/admin/plugins/calendar/install.php
-geeklog-1.5.2/public_html/admin/plugins/links/index.php
-geeklog-1.5.2/public_html/admin/plugins/links/install.php
-geeklog-1.5.2/public_html/admin/plugins/polls/index.php
-geeklog-1.5.2/public_html/admin/plugins/polls/install.php
-geeklog-1.5.2/public_html/admin/plugins/spamx/install.php
-geeklog-1.5.2/public_html/admin/plugins/staticpages/install.php
-geeklog-1.5.2/public_html/admin/plugins.php
geeklog-1.5.2/public_html/admin/story.php
-geeklog-1.5.2/public_html/admin/syndication.php
-geeklog-1.5.2/public_html/admin/topic.php
-geeklog-1.5.2/public_html/admin/user.php
-geeklog-1.5.2/public_html/article.php
-geeklog-1.5.2/public_html/calendar/event.php
-geeklog-1.5.2/public_html/calendar/index.php
+geeklog-1.5.2/public_html/comment.php
geeklog-1.5.2/public_html/docs/changed-files
geeklog-1.5.2/public_html/docs/changes.html
-geeklog-1.5.2/public_html/docs/config.html
geeklog-1.5.2/public_html/docs/history
-geeklog-1.5.2/public_html/docs/theme.html
-geeklog-1.5.2/public_html/layout/professional/admin/config/configuration.thtml
-geeklog-1.5.2/public_html/layout/professional/admin/trackback/trackbackeditor.thtml
-geeklog-1.5.2/public_html/layout/professional/article/printable.thtml
-geeklog-1.5.2/public_html/layout/professional/style.css
geeklog-1.5.2/public_html/lib-common.php
-geeklog-1.5.2/public_html/links/index.php
-geeklog-1.5.2/public_html/profiles.php
geeklog-1.5.2/public_html/siteconfig.php
-geeklog-1.5.2/public_html/staticpages/index.php
geeklog-1.5.2/public_html/users.php
-geeklog-1.5.2/public_html/usersettings.php
-geeklog-1.5.2/readme
-geeklog-1.5.2/sql/mssql_tableanddata.php
-geeklog-1.5.2/sql/mysql_tableanddata.php
-geeklog-1.5.2/sql/updates/mssql_1.4.1_to_1.5.0.php
-geeklog-1.5.2/sql/updates/mssql_1.5.1_to_1.5.2.php
-geeklog-1.5.2/sql/updates/mysql_1.3.9_to_1.3.10.php
-geeklog-1.5.2/sql/updates/mysql_1.4.1_to_1.5.0.php
-geeklog-1.5.2/sql/updates/mysql_1.5.1_to_1.5.2.php
-geeklog-1.5.2/system/classes/calendar.class.php
-geeklog-1.5.2/system/classes/config.class.php
-geeklog-1.5.2/system/classes/downloader.class.php
-geeklog-1.5.2/system/classes/sanitize.class.php
-geeklog-1.5.2/system/classes/story.class.php
-geeklog-1.5.2/system/classes/syndication/feedparserbase.class.php
-geeklog-1.5.2/system/classes/upload.class.php
-geeklog-1.5.2/system/lib-admin.php
geeklog-1.5.2/system/lib-comment.php
-geeklog-1.5.2/system/lib-plugins.php
-geeklog-1.5.2/system/lib-story.php
-geeklog-1.5.2/system/lib-syndication.php
+geeklog-1.5.2/system/lib-security.php
Modified: trunk/geeklog-1-jp/public_html/docs/changes.html
==============================================================================
--- trunk/geeklog-1-jp/public_html/docs/changes.html (original)
+++ trunk/geeklog-1-jp/public_html/docs/changes.html Wed Feb 11 08:01:00
2009
@@ -23,6 +23,8 @@
<ul>
<li>Fixed a bug in the story preview where the story content was lost when
previewing a story with a duplicate story ID.</li>
+<li>Fixed another bug in the story preview that caused extra backslashes to
+ appear in the story's title.</li>
<li>The Trackback editor didn't work since the security token was missing
from
the editor template.</li>
<li>Fixed issues with clickable links in plain text postings.</li>
Modified: trunk/geeklog-1-jp/public_html/docs/history
==============================================================================
--- trunk/geeklog-1-jp/public_html/docs/history (original)
+++ trunk/geeklog-1-jp/public_html/docs/history Wed Feb 11 08:01:00 2009
@@ -1,5 +1,27 @@
Geeklog History/Changes:
+Feb 8, 2009 (1.5.2)
+-----------
+
+- The default replacement text for censored text was supposed to read
+ "censored", not "censormode" [Dirk]
+- Fixed problem with extra backslashes appearing in a story's title during
the
+ story preview when magic_quotes_gpc = On (bug #0000790) [Mike, Dirk]
+- Added missing page title when viewing a single comment [Dirk]
+- Sort groups in the group dropdowns non-case sensitive [Dirk]
+- Display a message when sending the email to report an abusive comment
failed
+ [Dirk]
+- Display a message when sending the email for a new password failed [Dirk]
+
+- Updated Estonian language file for the Calendar plugin, provided by
Artur R�pp
+- Updated Japanese language file, provided by the Geeklog.jp group
+
+Static Pages plugin
+-------------------
+- Fixed parse error when saving a static page (reported by greenteagod).
This
+ problem was only introduced in 1.5.2rc1 [Dirk]
+
+
Jan 24, 2009 (1.5.2rc1)
------------
Modified: trunk/geeklog-1-jp/public_html/lib-common.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/lib-common.php (original)
+++ trunk/geeklog-1-jp/public_html/lib-common.php Wed Feb 11 08:01:00 2009
@@ -6750,7 +6750,7 @@
require_once 'Text/Wiki.php';
- $wiki = &new Text_Wiki();
+ $wiki = new Text_Wiki();
$wiki->disableRule('wikilink');
$wiki->disableRule('freelink');
$wiki->disableRule('interwiki');
Modified: trunk/geeklog-1-jp/public_html/siteconfig.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/siteconfig.php (original)
+++ trunk/geeklog-1-jp/public_html/siteconfig.php Wed Feb 11 08:01:00 2009
@@ -38,7 +38,7 @@
define('LB',"\n");
}
if (!defined('VERSION')) {
- define('VERSION', '1.5.2rc1');
+ define('VERSION', '1.5.2');
}
?>
Modified: trunk/geeklog-1-jp/public_html/users.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/users.php (original)
+++ trunk/geeklog-1-jp/public_html/users.php Wed Feb 11 08:01:00 2009
@@ -8,7 +8,7 @@
//
|
|
// | User authentication
module. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following
authors: |
+// | Copyright (C) 2000-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT
net |
@@ -31,8 +31,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: users.php,v 1.170 2008/09/15 18:26:17 mjervis Exp $
/**
* This file handles user authentication
@@ -376,11 +374,10 @@
* User request for a new password - send email with a link and request id
*
* @param username string name of user who requested the new password
-* @param msg int index of message to display (if any)
* @return string form or meta redirect
*
*/
-function requestpassword ($username, $msg = 0)
+function requestpassword($username)
{
global $_CONF, $_TABLES, $LANG04;
@@ -412,13 +409,13 @@
} else {
$mailfrom = $_CONF['site_mail'];
}
- COM_mail ($A['email'], $subject, $mailtext, $mailfrom);
-
- if ($msg) {
- $retval .= COM_refresh
($_CONF['site_url'] . "/index.php?msg=$msg");
+ if (COM_mail ($A['email'], $subject, $mailtext, $mailfrom)) {
+ $msg = 55; // message sent
} else {
- $retval .= COM_refresh ($_CONF['site_url'] . '/index.php');
+ $msg = 85; // problem sending the email
}
+
+ $retval .= COM_refresh
($_CONF['site_url'] . "/index.php?msg=$msg");
COM_updateSpeedlimit ('password');
} else {
$retval .= COM_siteHeader ('menu', $LANG04[17])
@@ -1007,7 +1004,7 @@
"email = '$email' AND ((remoteservice
IS NULL) OR (remoteservice = ''))");
}
if (!empty ($username)) {
- $display .= requestpassword ($username, 55);
+ $display .= requestpassword($username);
} else {
$display = COM_refresh ($_CONF['site_url']
. '/users.php?mode=getpassword');
Modified: trunk/geeklog-1-jp/system/lib-comment.php
==============================================================================
--- trunk/geeklog-1-jp/system/lib-comment.php (original)
+++ trunk/geeklog-1-jp/system/lib-comment.php Wed Feb 11 08:01:00 2009
@@ -1273,10 +1273,14 @@
$mailsubject = $_CONF['site_name'] . ' ' . $LANG03[27];
- COM_mail ($_CONF['site_mail'], $mailsubject, $mailbody);
+ if (COM_mail ($_CONF['site_mail'], $mailsubject, $mailbody)) {
+ $msg = 27; // message sent
+ } else {
+ $msg = 85; // problem sending the email
+ }
COM_updateSpeedlimit ('mail');
- return COM_refresh ($_CONF['site_url'] . '/index.php?msg=27');
+ return COM_refresh ($_CONF['site_url'] . "/index.php?msg=$msg");
}
?>
Modified: trunk/geeklog-1-jp/system/lib-security.php
==============================================================================
--- trunk/geeklog-1-jp/system/lib-security.php (original)
+++ trunk/geeklog-1-jp/system/lib-security.php Wed Feb 11 08:01:00 2009
@@ -8,7 +8,7 @@
//
|
|
// | Geeklog security
library. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following
authors: |
+// | Copyright (C) 2000-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT
net |
@@ -31,8 +31,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: lib-security.php,v 1.75 2008/09/21 08:37:11 dhaun Exp $
/**
* This is the security library for Geeklog. This is used to implement
Geeklog's
@@ -151,7 +149,7 @@
}
}
- ksort($groups);
+ uksort($groups, 'strcasecmp');
if ($_SEC_VERBOSE) {
COM_errorLog("****************leaving
getusergroups(uid=$uid)***************",1);