[geeklog-cvs] geeklog: Fixed parse error when saving a static page (reported b...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/81e157f9d3fb
changeset: 6740:81e157f9d3fb
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jan 31 22:15:27 2009 +0100
description:
Fixed parse error when saving a static page (reported by greenteagod)

diffstat:

2 files changed, 23 insertions(+), 5 deletions(-)
plugins/staticpages/services.inc.php |   18 +++++++++++++-----
public_html/docs/history             |   10 ++++++++++

diffs (67 lines):

diff -r 9c6dd270b547 -r 81e157f9d3fb plugins/staticpages/services.inc.php
--- a/plugins/staticpages/services.inc.php	Sat Jan 31 18:49:22 2009 +0100
+++ b/plugins/staticpages/services.inc.php	Sat Jan 31 22:15:27 2009 +0100
@@ -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();
+            }
         }
     }
 
diff -r 9c6dd270b547 -r 81e157f9d3fb public_html/docs/history
--- a/public_html/docs/history	Sat Jan 31 18:49:22 2009 +0100
+++ b/public_html/docs/history	Sat Jan 31 22:15:27 2009 +0100
@@ -1,4 +1,14 @@
 Geeklog History/Changes:
+
+Feb ??, 2009 (1.5.2)
+------------
+
+- Updated Japanese language file, provided by the Geeklog.jp group
+
+Static Pages plugin
+-------------------
+- Fixed parse error when saving a static page (reported by greenteagod) [Dirk]
+
 
 Jan 24, 2009 (1.5.2rc1)
 ------------