phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] SF.net SVN: phpwiki:[9337] trunk

[<var...@us...>]

Revision: 9337
          http://sourceforge.net/p/phpwiki/code/9337
Author:   vargenau
Date:     2014-11-19 10:23:36 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
Translate strings

Modified Paths:
--------------
    trunk/lib/Request.php
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/lib/Request.php	2014-11-19 10:23:36 UTC (rev 9337)
@@ -420,7 +420,7 @@
             if (ob_get_length()) ob_clean();
             $this->_is_buffering_output = false;
         } else {
-            trigger_error("Not buffering output", E_USER_NOTICE);
+            trigger_error(_("Not buffering output"), E_USER_NOTICE);
         }
     }
 
@@ -604,7 +604,8 @@
         $vars = &$GLOBALS['HTTP_SESSION_VARS'];
         if (!function_usable('ini_get') or ini_get('register_globals'))
             unset($GLOBALS[$key]);
-        if (DEBUG) trigger_error("delete session $key", E_USER_WARNING);
+        if (DEBUG)
+           trigger_error("delete session $key", E_USER_WARNING);
         unset($vars[$key]);
         if (isset($_SESSION)) // php-5.2
             unset($_SESSION[$key]);
@@ -853,7 +854,7 @@
         if ($do_sql) {
             global $DBParams;
             if (!in_array($DBParams['dbtype'], array('SQL', 'ADODB', 'PDO'))) {
-                trigger_error("Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or ADODB or PDO.");
+                trigger_error(_("Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or ADODB or PDO."));
             } else {
                 $this->logtable = (!empty($DBParams['prefix']) ? $DBParams['prefix'] : '') . "accesslog";
             }

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/de.po	2014-11-19 10:23:36 UTC (rev 9337)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -4512,6 +4512,9 @@
 "neue Version von %s gespeichert. Bitte entscheiden Sie ob Sie die Seite noch "
 "von der Datenbank permanent löschen wollen."
 
+msgid "Not buffering output"
+msgstr ""
+
 msgid "Upload error: file too big"
 msgstr ""
 
@@ -4531,6 +4534,11 @@
 msgid "the file “%s”"
 msgstr "die Datei »%s«"
 
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
 msgid "Bad URL -- remove all of <, >, \""
 msgstr "URL Formfehler - Entfernen Sie alle Zeichen mit <, >, \""
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/es.po	2014-11-19 10:23:36 UTC (rev 9337)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -4388,6 +4388,9 @@
 "from the database."
 msgstr ""
 
+msgid "Not buffering output"
+msgstr ""
+
 msgid "Upload error: file too big"
 msgstr "Error del upload: archivo demasiado grande"
 
@@ -4407,6 +4410,11 @@
 msgid "the file “%s”"
 msgstr "el archivo %s"
 
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
 msgid "Bad URL -- remove all of <, >, \""
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/fr.po	2014-11-19 10:23:36 UTC (rev 9337)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -4454,6 +4454,9 @@
 "enregistré une nouvelle version de %s. Veuillez vérifier que vous désirez "
 "toujours retirer de façon permanente cette page de la base de données."
 
+msgid "Not buffering output"
+msgstr ""
+
 msgid "Upload error: file too big"
 msgstr ""
 
@@ -4473,6 +4476,11 @@
 msgid "the file “%s”"
 msgstr "le fichier « %s »"
 
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
 msgid "Bad URL -- remove all of <, >, \""
 msgstr "Mauvaise URL -- retirez tous les <, >, \""
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/it.po	2014-11-19 10:23:36 UTC (rev 9337)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -4353,6 +4353,9 @@
 "from the database."
 msgstr ""
 
+msgid "Not buffering output"
+msgstr ""
+
 msgid "Upload error: file too big"
 msgstr ""
 
@@ -4372,6 +4375,11 @@
 msgid "the file “%s”"
 msgstr ""
 
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
 msgid "Bad URL -- remove all of <, >, \""
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/ja.po	2014-11-19 10:23:36 UTC (rev 9337)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -4490,6 +4490,9 @@
 "from the database."
 msgstr ""
 
+msgid "Not buffering output"
+msgstr ""
+
 msgid "Upload error: file too big"
 msgstr ""
 
@@ -4509,6 +4512,11 @@
 msgid "the file “%s”"
 msgstr "MIMEファイル %s"
 
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
 msgid "Bad URL -- remove all of <, >, \""
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/nl.po	2014-11-19 10:23:36 UTC (rev 9337)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -4345,6 +4345,9 @@
 "from the database."
 msgstr ""
 
+msgid "Not buffering output"
+msgstr ""
+
 msgid "Upload error: file too big"
 msgstr ""
 
@@ -4364,6 +4367,11 @@
 msgid "the file “%s”"
 msgstr ""
 
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
 msgid "Bad URL -- remove all of <, >, \""
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/phpwiki.pot	2014-11-19 10:23:36 UTC (rev 9337)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -4337,6 +4337,9 @@
 "from the database."
 msgstr ""
 
+msgid "Not buffering output"
+msgstr ""
+
 msgid "Upload error: file too big"
 msgstr ""
 
@@ -4356,6 +4359,11 @@
 msgid "the file “%s”"
 msgstr ""
 
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
 msgid "Bad URL -- remove all of <, >, \""
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/sv.po	2014-11-19 10:23:36 UTC (rev 9337)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -4338,6 +4338,9 @@
 "from the database."
 msgstr ""
 
+msgid "Not buffering output"
+msgstr ""
+
 msgid "Upload error: file too big"
 msgstr ""
 
@@ -4357,6 +4360,11 @@
 msgid "the file “%s”"
 msgstr ""
 
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
 msgid "Bad URL -- remove all of <, >, \""
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/zh.po	2014-11-19 10:23:36 UTC (rev 9337)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -4568,6 +4568,9 @@
 "從你開始刪除到現在,有人已經儲存了一份 %s 的較新版本. 請檢查以確定你仍想要從資"
 "料庫中永久刪除此頁面."
 
+msgid "Not buffering output"
+msgstr ""
+
 msgid "Upload error: file too big"
 msgstr ""
 
@@ -4587,6 +4590,11 @@
 msgid "the file “%s”"
 msgstr "檔案 “%s”"
 
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
 #, fuzzy
 msgid "Bad URL -- remove all of <, >, \""
 msgstr "錯誤 URL -- 移除所有的 <, >, \""

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9336] trunk/lib/Request.php

[<var...@us...>]

Revision: 9336
          http://sourceforge.net/p/phpwiki/code/9336
Author:   vargenau
Date:     2014-11-19 10:16:06 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
Fix database backend test

Modified Paths:
--------------
    trunk/lib/Request.php

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2014-11-18 17:32:01 UTC (rev 9335)
+++ trunk/lib/Request.php	2014-11-19 10:16:06 UTC (rev 9336)
@@ -838,8 +838,6 @@
      */
     function __construct($logfile, $do_sql = false)
     {
-        //global $request; // request not yet initialized!
-
         $this->logfile = $logfile;
         if ($logfile and !is_writeable($logfile)) {
             trigger_error
@@ -850,16 +848,13 @@
                         'ACCESS_LOG')
                 , E_USER_NOTICE);
         }
-        //$request->_accesslog =& $this;
-        //if (empty($request->_accesslog->entries))
         register_shutdown_function("Request_AccessLogEntry_shutdown_function");
 
         if ($do_sql) {
-            if (!$request->_dbi->isSQL()) {
+            global $DBParams;
+            if (!in_array($DBParams['dbtype'], array('SQL', 'ADODB', 'PDO'))) {
                 trigger_error("Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or ADODB or PDO.");
             } else {
-                global $DBParams;
-                //$this->_dbi =& $request->_dbi;
                 $this->logtable = (!empty($DBParams['prefix']) ? $DBParams['prefix'] : '') . "accesslog";
             }
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9335] trunk/locale

[<var...@us...>]

Revision: 9335
          http://sourceforge.net/p/phpwiki/code/9335
Author:   vargenau
Date:     2014-11-18 17:32:01 +0000 (Tue, 18 Nov 2014)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/Makefile
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2014-11-18 17:21:14 UTC (rev 9334)
+++ trunk/locale/Makefile	2014-11-18 17:32:01 UTC (rev 9335)
@@ -92,24 +92,7 @@
 ${POT_FILE}: ../lib/ErrorManager.php
 ${POT_FILE}: ../lib/ExternalReferrer.php
 ${POT_FILE}: ../lib/FileFinder.php
-${POT_FILE}: ../lib/font/chinese.php
-${POT_FILE}: ../lib/font/courierbi.php
-${POT_FILE}: ../lib/font/courierb.php
-${POT_FILE}: ../lib/font/courieri.php
-${POT_FILE}: ../lib/font/courier.php
-${POT_FILE}: ../lib/font/helveticabi.php
-${POT_FILE}: ../lib/font/helveticab.php
-${POT_FILE}: ../lib/font/helveticai.php
-${POT_FILE}: ../lib/font/helvetica.php
-${POT_FILE}: ../lib/font/japanese.php
-${POT_FILE}: ../lib/font/symbol.php
-${POT_FILE}: ../lib/font/timesbi.php
-${POT_FILE}: ../lib/font/timesb.php
-${POT_FILE}: ../lib/font/timesi.php
-${POT_FILE}: ../lib/font/times.php
-${POT_FILE}: ../lib/font/zapfdingbats.php
 ${POT_FILE}: ../lib/fortune.php
-${POT_FILE}: ../lib/gif.php
 ${POT_FILE}: ../lib/Google.php
 ${POT_FILE}: ../lib/HtmlElement.php
 ${POT_FILE}: ../lib/HtmlParser.php
@@ -442,7 +425,6 @@
 ${POT_FILE}: ../themes/MacOSX/buttons/de/index.php
 ${POT_FILE}: ../themes/MacOSX/buttons/en/index.php
 ${POT_FILE}: ../themes/MacOSX/buttons/index.php
-${POT_FILE}: ../themes/MacOSX/images/index.php
 ${POT_FILE}: ../themes/MacOSX/lib/RecentChanges.php
 ${POT_FILE}: ../themes/MacOSX/themeinfo.php
 ${POT_FILE}: ../themes/MonoBook/templates/actionbar.tmpl

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2014-11-18 17:21:14 UTC (rev 9334)
+++ trunk/locale/po/de.po	2014-11-18 17:32:01 UTC (rev 9335)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 19:10+0200\n"
+"POT-Creation-Date: 2014-11-18 18:29+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-11-18 17:21:14 UTC (rev 9334)
+++ trunk/locale/po/es.po	2014-11-18 17:32:01 UTC (rev 9335)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 19:10+0200\n"
+"POT-Creation-Date: 2014-11-18 18:29+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-11-18 17:21:14 UTC (rev 9334)
+++ trunk/locale/po/fr.po	2014-11-18 17:32:01 UTC (rev 9335)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 19:10+0200\n"
+"POT-Creation-Date: 2014-11-18 18:29+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-11-18 17:21:14 UTC (rev 9334)
+++ trunk/locale/po/it.po	2014-11-18 17:32:01 UTC (rev 9335)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 19:10+0200\n"
+"POT-Creation-Date: 2014-11-18 18:29+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-11-18 17:21:14 UTC (rev 9334)
+++ trunk/locale/po/ja.po	2014-11-18 17:32:01 UTC (rev 9335)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 19:10+0200\n"
+"POT-Creation-Date: 2014-11-18 18:29+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-11-18 17:21:14 UTC (rev 9334)
+++ trunk/locale/po/nl.po	2014-11-18 17:32:01 UTC (rev 9335)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 19:10+0200\n"
+"POT-Creation-Date: 2014-11-18 18:29+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-11-18 17:21:14 UTC (rev 9334)
+++ trunk/locale/po/phpwiki.pot	2014-11-18 17:32:01 UTC (rev 9335)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 19:10+0200\n"
+"POT-Creation-Date: 2014-11-18 18:29+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-11-18 17:21:14 UTC (rev 9334)
+++ trunk/locale/po/sv.po	2014-11-18 17:32:01 UTC (rev 9335)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 19:10+0200\n"
+"POT-Creation-Date: 2014-11-18 18:29+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-11-18 17:21:14 UTC (rev 9334)
+++ trunk/locale/po/zh.po	2014-11-18 17:32:01 UTC (rev 9335)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 19:10+0200\n"
+"POT-Creation-Date: 2014-11-18 18:29+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9334] trunk/lib/BlockParser.php

[<var...@us...>]

Revision: 9334
          http://sourceforge.net/p/phpwiki/code/9334
Author:   vargenau
Date:     2014-11-18 17:21:14 +0000 (Tue, 18 Nov 2014)
Log Message:
-----------
PHP Doc

Modified Paths:
--------------
    trunk/lib/BlockParser.php

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2014-11-18 17:15:15 UTC (rev 9333)
+++ trunk/lib/BlockParser.php	2014-11-18 17:21:14 UTC (rev 9334)
@@ -117,14 +117,13 @@
      * If that fails, match the whole RegexpSet, starting after the position of the
      * previous match.
      *
-     * @param $text string Text to search.
+     * @param string $text Text to search.
+     * @param RegexpSet_match $prevMatch
      *
-     * @param $prevMatch A RegexpSet_match object
-     *
      * $prevMatch should be a match object obtained by a previous
      * match upon the same value of $text.
      *
-     * @return object A RegexpSet_match object, or false if no match.
+     * @return RegexpSet_match|bool A RegexpSet_match object, or false if no match.
      */
     function nextMatch($text, $prevMatch)
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9333] trunk/lib/Request.php

[<var...@us...>]

Revision: 9333
          http://sourceforge.net/p/phpwiki/code/9333
Author:   vargenau
Date:     2014-11-18 17:15:15 +0000 (Tue, 18 Nov 2014)
Log Message:
-----------
Do not use void function result

Modified Paths:
--------------
    trunk/lib/Request.php

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2014-11-18 17:12:05 UTC (rev 9332)
+++ trunk/lib/Request.php	2014-11-18 17:15:15 UTC (rev 9333)
@@ -511,12 +511,12 @@
             unset($val->_HomePagehandle);
             unset($val->_auth_dbi);
         }
-        return $this->session->set($key, $val);
+        $this->session->set($key, $val);
     }
 
     function deleteSessionVar($key)
     {
-        return $this->session->delete($key);
+        $this->session->delete($key);
     }
 
     function getCookieVar($key)
@@ -526,12 +526,12 @@
 
     function setCookieVar($key, $val, $lifetime_in_days = false, $path = false)
     {
-        return $this->cookies->set($key, $val, $lifetime_in_days, $path);
+        $this->cookies->set($key, $val, $lifetime_in_days, $path);
     }
 
     function deleteCookieVar($key)
     {
-        return $this->cookies->delete($key);
+        $this->cookies->delete($key);
     }
 
     function getUploadedFile($key)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9332] trunk/lib/AccessLog.php

[<var...@us...>]

Revision: 9332
          http://sourceforge.net/p/phpwiki/code/9332
Author:   vargenau
Date:     2014-11-18 17:12:05 +0000 (Tue, 18 Nov 2014)
Log Message:
-----------
Remove lib/AccessLog.php, classes moved to lib/Request.php

Removed Paths:
-------------
    trunk/lib/AccessLog.php

Deleted: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php	2014-11-18 17:06:22 UTC (rev 9331)
+++ trunk/lib/AccessLog.php	2014-11-18 17:12:05 UTC (rev 9332)
@@ -1,770 +0,0 @@
-<?php
-
-/*
- * Copyright 2005, 2007 Reini Urban
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/**
- * Read and write file and SQL accesslog. Write sequentially.
- *
- * Read from file per pagename: Hits
- *
- */
-
-/**
- * Create NCSA "combined" log entry for current request.
- * Also needed for advanced spam prevention.
- * global object holding global state (sql or file, entries, to dump)
- */
-class Request_AccessLog
-{
-    /**
-     * @param string $logfile Log file name.
-     * @param bool $do_sql
-     */
-    function __construct($logfile, $do_sql = false)
-    {
-        //global $request; // request not yet initialized!
-
-        $this->logfile = $logfile;
-        if ($logfile and !is_writeable($logfile)) {
-            trigger_error
-            (sprintf(_("%s is not writable."), _("The PhpWiki access log file"))
-                    . "\n"
-                    . sprintf(_("Please ensure that %s is writable, or redefine %s in config/config.ini."),
-                        sprintf(_("the file “%s”"), ACCESS_LOG),
-                        'ACCESS_LOG')
-                , E_USER_NOTICE);
-        }
-        //$request->_accesslog =& $this;
-        //if (empty($request->_accesslog->entries))
-        register_shutdown_function("Request_AccessLogEntry_shutdown_function");
-
-        if ($do_sql) {
-            if (!$request->_dbi->isSQL()) {
-                trigger_error("Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or ADODB or PDO.");
-            } else {
-                global $DBParams;
-                //$this->_dbi =& $request->_dbi;
-                $this->logtable = (!empty($DBParams['prefix']) ? $DBParams['prefix'] : '') . "accesslog";
-            }
-        }
-        $this->entries = array();
-        $this->entries[] = new Request_AccessLogEntry($this);
-    }
-
-    function _do($cmd, &$arg)
-    {
-        if ($this->entries)
-            for ($i = 0; $i < count($this->entries); $i++)
-                $this->entries[$i]->$cmd($arg);
-    }
-
-    function push(&$request)
-    {
-        $this->_do('push', $request);
-    }
-
-    function setSize($arg)
-    {
-        $this->_do('setSize', $arg);
-    }
-
-    function setStatus($arg)
-    {
-        $this->_do('setStatus', $arg);
-    }
-
-    function setDuration($arg)
-    {
-        $this->_do('setDuration', $arg);
-    }
-
-    /**
-     * Read sequentially all previous entries from the beginning.
-     * while ($logentry = Request_AccessLogEntry::read()) ;
-     * For internal log analyzers: RecentReferrers, WikiAccessRestrictions
-     */
-    function read()
-    {
-        return $this->logtable ? $this->read_sql() : $this->read_file();
-    }
-
-    /**
-     * Return iterator of referrer items reverse sorted (latest first).
-     *
-     * @param int $limit
-     * @param bool $external_only
-     * @return WikiDB_Array_generic_iter
-     */
-    function get_referer($limit = 15, $external_only = false)
-    {
-        if ($external_only) { // see stdlin.php:isExternalReferrer()
-            $base = SERVER_URL;
-            $blen = strlen($base);
-        }
-        if (!empty($this->_dbi)) {
-            // check same hosts in referer and request and remove them
-            $ext_where = " AND LEFT(referer,$blen) <> " . $this->_dbi->quote($base)
-                . " AND LEFT(referer,$blen) <> LEFT(CONCAT(" . $this->_dbi->quote(SERVER_URL) . ",request_uri),$blen)";
-            return $this->_read_sql_query("(referer <>'' AND NOT(ISNULL(referer)))"
-                . ($external_only ? $ext_where : '')
-                . " ORDER BY time_stamp DESC"
-                . ($limit ? " LIMIT $limit" : ""));
-        } else {
-            $iter = new WikiDB_Array_generic_iter(0);
-            $logs =& $iter->_array;
-            while ($logentry = $this->read_file()) {
-                if (!empty($logentry->referer)
-                    and (!$external_only or (substr($logentry->referer, 0, $blen) != $base))
-                ) {
-                    $iter->_array[] = $logentry;
-                    if ($limit and count($logs) > $limit)
-                        array_shift($logs);
-                }
-            }
-            $logs = array_reverse($logs);
-            $logs = array_slice($logs, 0, min($limit, count($logs)));
-            return $iter;
-        }
-    }
-
-    /**
-     * Read sequentially backwards all previous entries from log file.
-     * FIXME!
-     */
-    function read_file()
-    {
-        global $request;
-        if ($this->logfile) $this->logfile = ACCESS_LOG; // support Request_AccessLog::read
-
-        if (empty($this->reader)) // start at the beginning
-            $this->reader = fopen($this->logfile, "r");
-        if ($s = fgets($this->reader)) {
-            $entry = new Request_AccessLogEntry($this);
-            $re = '/^(\S+)\s(\S+)\s(\S+)\s\[(.+?)\] "([^"]+)" (\d+) (\d+) "([^"]*)" "([^"]*)"$/';
-            if (preg_match($re, $s, $m)) {
-                list(, $entry->host, $entry->ident, $entry->user, $entry->time,
-                    $entry->request, $entry->status, $entry->size,
-                    $entry->referer, $entry->user_agent) = $m;
-            }
-            return $entry;
-        } else { // until the end
-            fclose($this->reader);
-            return false;
-        }
-    }
-
-    function _read_sql_query($where = '')
-    {
-        global $request;
-        $dbh =& $request->_dbi;
-        $log_tbl =& $this->logtable;
-        return $dbh->genericSqlIter("SELECT *,request_uri as request,request_time as time,remote_user as user,"
-            . "remote_host as host,agent as user_agent"
-            . " FROM $log_tbl"
-            . ($where ? " WHERE $where" : ""));
-    }
-
-    function read_sql($where = '')
-    {
-        if (empty($this->sqliter))
-            $this->sqliter = $this->_read_sql_query($where);
-        return $this->sqliter->next();
-    }
-
-    /* done in request->finish() before the db is closed */
-    function write_sql()
-    {
-        global $request;
-        $dbh =& $request->_dbi;
-        if (isset($this->entries) and $dbh and $dbh->isOpen())
-            foreach ($this->entries as $entry) {
-                $entry->write_sql();
-            }
-    }
-
-    /* done in the shutdown callback */
-    function write_file()
-    {
-        if (isset($this->entries) and $this->logfile)
-            foreach ($this->entries as $entry) {
-                $entry->write_file();
-            }
-        unset($this->entries);
-    }
-
-    /* in an ideal world... */
-    function write()
-    {
-        if ($this->logfile) $this->write_file();
-        if ($this->logtable) $this->write_sql();
-        unset($this->entries);
-    }
-}
-
-class Request_AccessLogEntry
-{
-    /**
-     * The log entry will be automatically appended to the log file or
-     * SQL table when the current request terminates.
-     *
-     * If you want to modify a Request_AccessLogEntry before it gets
-     * written (e.g. via the setStatus and setSize methods) you should
-     * use an '&' on the constructor, so that you're working with the
-     * original (rather than a copy) object.
-     *
-     * <pre>
-     *    $log_entry = & new Request_AccessLogEntry("/tmp/wiki_access_log");
-     *    $log_entry->setStatus(401);
-     *    $log_entry->push($request);
-     * </pre>
-     *
-     */
-    function __construct(&$accesslog)
-    {
-        $this->_accesslog = $accesslog;
-        $this->logfile = $accesslog->logfile;
-        $this->time = time();
-        $this->status = 200; // see setStatus()
-        $this->size = 0; // see setSize()
-    }
-
-    /**
-     * @param $request object  Request object for current request.
-     */
-    function push(&$request)
-    {
-        $this->host = $request->get('REMOTE_HOST');
-        $this->ident = $request->get('REMOTE_IDENT');
-        if (!$this->ident)
-            $this->ident = '-';
-        $user = $request->getUser();
-        if ($user->isAuthenticated())
-            $this->user = $user->UserName();
-        else
-            $this->user = '-';
-        $this->request = join(' ', array($request->get('REQUEST_METHOD'),
-            $request->get('REQUEST_URI'),
-            $request->get('SERVER_PROTOCOL')));
-        $this->referer = (string)$request->get('HTTP_REFERER');
-        $this->user_agent = (string)$request->get('HTTP_USER_AGENT');
-    }
-
-    /**
-     * Set result status code.
-     *
-     * @param $status integer  HTTP status code.
-     */
-    function setStatus($status)
-    {
-        $this->status = $status;
-    }
-
-    /**
-     * Set response size.
-     *
-     * @param $size integer
-     */
-    function setSize($size = 0)
-    {
-        $this->size = (int)$size;
-    }
-
-    function setDuration($seconds)
-    {
-        // Pear DB does not correctly quote , in floats using ?. e.g. in european locales.
-        // Workaround:
-        $this->duration = str_replace(",", ".", sprintf("%f", $seconds));
-    }
-
-    /**
-     * Get time zone offset.
-     *
-     * This is a static member function.
-     *
-     * @param int|bool $time Unix timestamp (defaults to current time).
-     * @return string Zone offset, e.g. "-0800" for PST.
-     */
-    function _zone_offset($time = false)
-    {
-        if (!$time)
-            $time = time();
-        $offset = date("Z", $time);
-        $negoffset = "";
-        if ($offset < 0) {
-            $negoffset = "-";
-            $offset = -$offset;
-        }
-        $offhours = floor($offset / 3600);
-        $offmins = $offset / 60 - $offhours * 60;
-        return sprintf("%s%02d%02d", $negoffset, $offhours, $offmins);
-    }
-
-    /**
-     * Format time in NCSA format.
-     *
-     * This is a static member function.
-     *
-     * @param int|bool $time Unix timestamp (defaults to current time).
-     * @return string Formatted date & time.
-     */
-    function _ncsa_time($time = false)
-    {
-        if (!$time)
-            $time = time();
-        return date("d/M/Y:H:i:s", $time) .
-            " " . $this->_zone_offset();
-    }
-
-    function write()
-    {
-        if ($this->_accesslog->logfile) $this->write_file();
-        if ($this->_accesslog->logtable) $this->write_sql();
-    }
-
-    /**
-     * Write entry to log file.
-     */
-    function write_file()
-    {
-        $entry = sprintf('%s %s %s [%s] "%s" %d %d "%s" "%s"',
-            $this->host, $this->ident, $this->user,
-            $this->_ncsa_time($this->time),
-            $this->request, $this->status, $this->size,
-            $this->referer, $this->user_agent);
-        if (!empty($this->_accesslog->reader)) {
-            fclose($this->_accesslog->reader);
-            unset($this->_accesslog->reader);
-        }
-        //Error log doesn't provide locking.
-        //error_log("$entry\n", 3, $this->logfile);
-        // Alternate method
-        if (($fp = fopen($this->logfile, "a"))) {
-            flock($fp, LOCK_EX);
-            fputs($fp, "$entry\n");
-            fclose($fp);
-        }
-    }
-
-    /* This is better been done by apache mod_log_sql */
-    /* If ACCESS_LOG_SQL & 2 we do write it by our own */
-    function write_sql()
-    {
-        global $request;
-
-        $dbh =& $request->_dbi;
-        if ($dbh and $dbh->isOpen() and $this->_accesslog->logtable) {
-            //$log_tbl =& $this->_accesslog->logtable;
-            if ($request->get('REQUEST_METHOD') == "POST") {
-                // strangely HTTP_POST_VARS doesn't contain all posted vars.
-                $args = $_POST; // copy not ref. clone not needed on hashes
-                // garble passwords
-                if (!empty($args['auth']['passwd'])) $args['auth']['passwd'] = '<not displayed>';
-                if (!empty($args['dbadmin']['passwd'])) $args['dbadmin']['passwd'] = '<not displayed>';
-                if (!empty($args['pref']['passwd'])) $args['pref']['passwd'] = '<not displayed>';
-                if (!empty($args['pref']['passwd2'])) $args['pref']['passwd2'] = '<not displayed>';
-                $this->request_args = substr(serialize($args), 0, 254); // if VARCHAR(255) is used.
-            } else {
-                $this->request_args = $request->get('QUERY_STRING');
-            }
-            $this->request_method = $request->get('REQUEST_METHOD');
-            $this->request_uri = $request->get('REQUEST_URI');
-            // duration problem: sprintf "%f" might use comma e.g. "100,201" in european locales
-            $dbh->_backend->write_accesslog($this);
-        }
-    }
-}
-
-/**
- * Shutdown callback. Ensures that the file is written.
- *
- * @access private
- * @see Request_AccessLogEntry
- */
-function Request_AccessLogEntry_shutdown_function()
-{
-    global $request;
-
-    if (isset($request->_accesslog->entries) and $request->_accesslog->logfile)
-        foreach ($request->_accesslog->entries as $entry) {
-            $entry->write_file();
-        }
-    unset($request->_accesslog->entries);
-}
-
-// TODO: SQL access methods....
-// (c) 2005 Charles Corrigan (the mysql parts)
-// (c) 2006 Rein Urban (the postgresql parts)
-// from AnalyseAccessLogSql.php
-class Request_AccessLog_SQL
-{
-
-    /**
-     * Build the query string
-     *
-     * FIXME: some or all of these queries may be MySQL specific / non-portable
-     * FIXME: properly quote the string args
-     *
-     * The column names displayed are generated from the actual query column
-     * names, so make sure that each column in the query is given a user
-     * friendly name. Note that the column names are passed to _() and so may be
-     * translated.
-     *
-     * If there are query specific where conditions, then the construction
-     * "    if ($where_conditions<>'')
-     *          $where_conditions = 'WHERE '.$where_conditions.' ';"
-     * should be changed to
-     * "    if ($where_conditions<>'')
-     *          $where_conditions = 'AND '.$where_conditions.' ';"
-     * and in the assignment to query have something like
-     * "    $query= "SELECT "
-     *          ."referer "
-     *          ."FROM $accesslog "
-     *          ."WHERE referer IS NOT NULL "
-     *          .$where_conditions
-     */
-    function _getQueryString(&$args)
-    {
-        // extract any parametrised conditions from the arguments,
-        // in particular, how much history to select
-        $where_conditions = $this->_getWhereConditions($args);
-
-        // get the correct name for the table
-        //FIXME is there a more correct way to do this?
-        global $DBParams, $request;
-        $accesslog = (!empty($DBParams['prefix']) ? $DBParams['prefix'] : '') . "accesslog";
-
-        $query = '';
-        $backend_type = $request->_dbi->_backend->backendType();
-        switch ($backend_type) {
-            case 'mysql':
-                $Referring_URL = "left(referer,length(referer)-instr(reverse(referer),'?'))";
-                break;
-            case 'pgsql':
-            case 'postgres7':
-                $Referring_URL = "substr(referer,0,position('?' in referer))";
-                break;
-            default:
-                $Referring_URL = "referer";
-        }
-        switch ($args['mode']) {
-            case 'referring_urls':
-                if ($where_conditions <> '')
-                    $where_conditions = 'WHERE ' . $where_conditions . ' ';
-                $query = "SELECT "
-                    . "$Referring_URL AS Referring_URL, "
-                    . "count(*) AS Referral_Count "
-                    . "FROM $accesslog "
-                    . $where_conditions
-                    . "GROUP BY Referring_URL";
-                break;
-            case 'external_referers':
-                $args['local_referrers'] = 'false';
-                $where_conditions = $this->_getWhereConditions($args);
-                if ($where_conditions <> '')
-                    $where_conditions = 'WHERE ' . $where_conditions . ' ';
-                $query = "SELECT "
-                    . "$Referring_URL AS Referring_URL, "
-                    . "count(*) AS Referral_Count "
-                    . "FROM $accesslog "
-                    . $where_conditions
-                    . "GROUP BY Referring_URL";
-                break;
-            case 'referring_domains':
-                if ($where_conditions <> '')
-                    $where_conditions = 'WHERE ' . $where_conditions . ' ';
-                switch ($backend_type) {
-                    case 'mysql':
-                        $Referring_Domain = "left(referer, if(locate('/', referer, 8) > 0,locate('/', referer, 8) -1, length(referer)))";
-                        break;
-                    case 'pgsql':
-                    case 'postgres7':
-                        $Referring_Domain = "substr(referer,0,8) || regexp_replace(substr(referer,8), '/.*', '')";
-                        break;
-                    default:
-                        $Referring_Domain = "referer";
-                        break;
-                }
-                $query = "SELECT "
-                    . "$Referring_Domain AS Referring_Domain, "
-                    . "count(*) AS Referral_Count "
-                    . "FROM $accesslog "
-                    . $where_conditions
-                    . "GROUP BY Referring_Domain";
-                break;
-            case 'remote_hosts':
-                if ($where_conditions <> '')
-                    $where_conditions = 'WHERE ' . $where_conditions . ' ';
-                $query = "SELECT "
-                    . "remote_host AS Remote_Host, "
-                    . "count(*) AS Access_Count "
-                    . "FROM $accesslog "
-                    . $where_conditions
-                    . "GROUP BY Remote_Host";
-                break;
-            case 'users':
-                if ($where_conditions <> '')
-                    $where_conditions = 'WHERE ' . $where_conditions . ' ';
-                $query = "SELECT "
-                    . "remote_user AS User, "
-                    . "count(*) AS Access_Count "
-                    . "FROM $accesslog "
-                    . $where_conditions
-                    . "GROUP BY remote_user";
-                break;
-            case 'host_users':
-                if ($where_conditions <> '')
-                    $where_conditions = 'WHERE ' . $where_conditions . ' ';
-                $query = "SELECT "
-                    . "remote_host AS Remote_Host, "
-                    . "remote_user AS User, "
-                    . "count(*) AS Access_Count "
-                    . "FROM $accesslog "
-                    . $where_conditions
-                    . "GROUP BY remote_host, remote_user";
-                break;
-            case "search_bots":
-                // This queries for all entries in the SQL access log table that
-                // have a dns name that I know to be a web search engine crawler and
-                // categorises the results into time buckets as per the list below
-                // 0 - 1 minute - 60
-                // 1 - 1 hour   - 3600     = 60 * 60
-                // 2 - 1 day    - 86400    = 60 * 60 * 24
-                // 3 - 1 week   - 604800   = 60 * 60 * 24 * 7
-                // 4 - 1 month  - 2629800  = 60 * 60 * 24 * 365.25 / 12
-                // 5 - 1 year   - 31557600 = 60 * 60 * 24 * 365.25
-                $now = time();
-                $query = "SELECT "
-                    . "CASE WHEN $now-time_stamp<60 THEN '" . _("0 - last minute") . "' ELSE "
-                    . "CASE WHEN $now-time_stamp<3600 THEN '" . _("1 - 1 minute to 1 hour") . "' ELSE "
-                    . "CASE WHEN $now-time_stamp<86400 THEN '" . _("2 - 1 hour to 1 day") . "' ELSE "
-                    . "CASE WHEN $now-time_stamp<604800 THEN '" . _("3 - 1 day to 1 week") . "' ELSE "
-                    . "CASE WHEN $now-time_stamp<2629800 THEN '" . _("4 - 1 week to 1 month") . "' ELSE "
-                    . "CASE WHEN $now-time_stamp<31557600 THEN '" . _("5 - 1 month to 1 year") . "' ELSE "
-                    . "'" . _("6 - more than 1 year") . "' END END END END END END AS Time_Scale, "
-                    . "remote_host AS Remote_Host, "
-                    . "count(*) AS Access_Count "
-                    . "FROM $accesslog "
-                    . "WHERE (remote_host LIKE '%googlebot.com' "
-                    . "OR remote_host LIKE '%alexa.com' "
-                    . "OR remote_host LIKE '%inktomisearch.com' "
-                    . "OR remote_host LIKE '%msnbot.msn.com') "
-                    . ($where_conditions ? 'AND ' . $where_conditions : '')
-                    . "GROUP BY Time_Scale, remote_host";
-                break;
-            case "search_bots_hits":
-                // This queries for all entries in the SQL access log table that
-                // have a dns name that I know to be a web search engine crawler and
-                // displays the URI that was hit.
-                // If PHPSESSID appears in the URI, just display the URI to the left of this
-                $sessname = session_name();
-                switch ($backend_type) {
-                    case 'mysql':
-                        $Request_URI = "IF(instr(request_uri, '$sessname')=0, request_uri,left(request_uri, instr(request_uri, '$sessname')-2))";
-                        break;
-                    case 'pgsql':
-                    case 'postgres7':
-                        $Request_URI = "regexp_replace(request_uri, '$sessname.*', '')";
-                        break;
-                    default:
-                        $Request_URI = 'request_uri';
-                        break;
-                }
-                $now = time();
-                $query = "SELECT "
-                    . "CASE WHEN $now-time_stamp<60 THEN '" . _("0 - last minute") . "' ELSE "
-                    . "CASE WHEN $now-time_stamp<3600 THEN '" . _("1 - 1 minute to 1 hour") . "' ELSE "
-                    . "CASE WHEN $now-time_stamp<86400 THEN '" . _("2 - 1 hour to 1 day") . "' ELSE "
-                    . "CASE WHEN $now-time_stamp<604800 THEN '" . _("3 - 1 day to 1 week") . "' ELSE "
-                    . "CASE WHEN $now-time_stamp<2629800 THEN '" . _("4 - 1 week to 1 month") . "' ELSE "
-                    . "CASE WHEN $now-time_stamp<31557600 THEN '" . _("5 - 1 month to 1 year") . "' ELSE "
-                    . "'" . _("6 - more than 1 year") . "' END END END END END END AS Time_Scale, "
-                    . "remote_host AS Remote_Host, "
-                    . "$Request_URI AS Request_URI "
-                    . "FROM $accesslog "
-                    . "WHERE (remote_host LIKE '%googlebot.com' "
-                    . "OR remote_host LIKE '%alexa.com' "
-                    . "OR remote_host LIKE '%inktomisearch.com' "
-                    . "OR remote_host LIKE '%msnbot.msn.com') "
-                    . ($where_conditions ? 'AND ' . $where_conditions : '')
-                    . "ORDER BY time_stamp";
-        }
-        return $query;
-    }
-
-    /** Honeypot for xgettext. Those strings are translated dynamically.
-     */
-    function _locale_dummy()
-    {
-        $dummy = array(
-            // mode caption
-            _("referring_urls"),
-            _("external_referers"),
-            _("referring_domains"),
-            _("remote_hosts"),
-            _("users"),
-            _("host_users"),
-            _("search_bots"),
-            _("search_bots_hits"),
-            // period header
-            _("minutes"),
-            _("hours"),
-            _("days"),
-            _("weeks"),
-        );
-    }
-
-    function getDefaultArguments()
-    {
-        return array(
-            'mode' => 'referring_domains',
-            // referring_domains, referring_urls, remote_hosts, users, host_users, search_bots, search_bots_hits
-            'caption' => '',
-            // blank means use the mode as the caption/title for the output
-            'local_referrers' => 'true', // only show external referring sites
-            'period' => '', // the type of period to report:
-            // may be weeks, days, hours, minutes, or blank for all
-            'count' => '0' // the number of periods to report
-        );
-    }
-
-    function table_output()
-    {
-        $query = $this->_getQueryString($args);
-
-        if ($query == '')
-            return HTML::p(sprintf(_("Unrecognised parameter 'mode=%s'"),
-                $args['mode']));
-
-        // get the data back.
-        // Note that this must be done before the final generation ofthe table,
-        // otherwise the headers will not be ready
-        $tbody = $this->_getQueryResults($query, $dbi);
-
-        return HTML::table(array('border' => 1),
-            HTML::caption($this->_getCaption($args)),
-            HTML::thead($this->_theadrow),
-            $tbody);
-    }
-
-    function _getQueryResults($query, &$dbi)
-    {
-        $queryResult = $dbi->genericSqlIter($query);
-        if (!$queryResult) {
-            $tbody = HTML::tbody(HTML::tr(HTML::td(_("<empty>"))));
-        } else {
-            $tbody = HTML::tbody();
-            while ($row = $queryResult->next()) {
-                $this->_setHeaders($row);
-                $tr = HTML::tr();
-                foreach ($row as $value) {
-                    // output a '-' for empty values, otherwise the table looks strange
-                    $tr->pushContent(HTML::td(empty($value) ? '-' : $value));
-                }
-                $tbody->pushContent($tr);
-            }
-        }
-        $queryResult->free();
-        return $tbody;
-    }
-
-    function _setHeaders($row)
-    {
-        if (!$this->_headerSet) {
-            foreach ($row as $key => $value) {
-                $this->_theadrow->pushContent(HTML::th(_($key)));
-            }
-            $this->_headerSet = true;
-        }
-    }
-
-    function _getWhereConditions(&$args)
-    {
-        $where_conditions = '';
-
-        if ($args['period'] <> '') {
-            $since = 0;
-            if ($args['period'] == 'minutes') {
-                $since = 60;
-            } elseif ($args['period'] == 'hours') {
-                $since = 60 * 60;
-            } elseif ($args['period'] == 'days') {
-                $since = 60 * 60 * 24;
-            } elseif ($args['period'] == 'weeks') {
-                $since = 60 * 60 * 24 * 7;
-            }
-            $since = $since * $args['count'];
-            if ($since > 0) {
-                if ($where_conditions <> '')
-                    $where_conditions = $where_conditions . ' AND ';
-                $since = time() - $since;
-                $where_conditions = $where_conditions . "time_stamp > $since";
-            }
-        }
-
-        if ($args['local_referrers'] <> 'true') {
-            global $request;
-            if ($where_conditions <> '')
-                $where_conditions = $where_conditions . ' AND ';
-            $localhost = SERVER_URL;
-            $len = strlen($localhost);
-            $backend_type = $request->_dbi->_backend->backendType();
-            switch ($backend_type) {
-                case 'mysql':
-                    $ref_localhost = "left(referer,$len)<>'$localhost'";
-                    break;
-                case 'pgsql':
-                case 'postgres7':
-                    $ref_localhost = "substr(referer,0,$len)<>'$localhost'";
-                    break;
-                default:
-                    $ref_localhost = "";
-            }
-            $where_conditions = $where_conditions . $ref_localhost;
-        }
-
-        // The assumed contract is that there is a space at the end of the
-        // conditions string, so that following SQL clauses (such as GROUP BY)
-        // will not cause a syntax error
-        if ($where_conditions <> '')
-            $where_conditions = $where_conditions . ' ';
-
-        return $where_conditions;
-    }
-
-    function _getCaption(&$args)
-    {
-        $caption = $args['caption'];
-        if ($caption == '')
-            $caption = gettext($args['mode']);
-        if ($args['period'] <> '' && $args['count'])
-            $caption = $caption . " - " . $args['count'] . " " . gettext($args['period']);
-        return $caption;
-    }
-
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9331] trunk/lib/Request.php

[<var...@us...>]

Revision: 9331
          http://sourceforge.net/p/phpwiki/code/9331
Author:   vargenau
Date:     2014-11-18 17:06:22 +0000 (Tue, 18 Nov 2014)
Log Message:
-----------
Allow PDO.

Modified Paths:
--------------
    trunk/lib/Request.php

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2014-11-18 16:26:56 UTC (rev 9330)
+++ trunk/lib/Request.php	2014-11-18 17:06:22 UTC (rev 9331)
@@ -855,10 +855,10 @@
         register_shutdown_function("Request_AccessLogEntry_shutdown_function");
 
         if ($do_sql) {
-            global $DBParams;
-            if (!in_array($DBParams['dbtype'], array('SQL', 'ADODB'))) {
-                trigger_error("Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or ADODB.");
+            if (!$request->_dbi->isSQL()) {
+                trigger_error("Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or ADODB or PDO.");
             } else {
+                global $DBParams;
                 //$this->_dbi =& $request->_dbi;
                 $this->logtable = (!empty($DBParams['prefix']) ? $DBParams['prefix'] : '') . "accesslog";
             }
@@ -944,7 +944,8 @@
     }
 
     /**
-     * Read sequentially all previous entries from log file.
+     * Read sequentially backwards all previous entries from log file.
+     * FIXME!
      */
     function read_file()
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9330] trunk/lib

[<var...@us...>]

Revision: 9330
          http://sourceforge.net/p/phpwiki/code/9330
Author:   vargenau
Date:     2014-11-18 16:26:56 +0000 (Tue, 18 Nov 2014)
Log Message:
-----------
Get closer lib/AccessLog.php and lib/Request.php

Modified Paths:
--------------
    trunk/lib/AccessLog.php
    trunk/lib/Request.php

Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php	2014-11-18 09:58:08 UTC (rev 9329)
+++ trunk/lib/AccessLog.php	2014-11-18 16:26:56 UTC (rev 9330)
@@ -12,7 +12,7 @@
  *
  * PhpWiki is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
@@ -38,7 +38,7 @@
      * @param string $logfile Log file name.
      * @param bool $do_sql
      */
-    function Request_AccessLog($logfile, $do_sql = false)
+    function __construct($logfile, $do_sql = false)
     {
         //global $request; // request not yet initialized!
 
@@ -171,13 +171,6 @@
         }
     }
 
-    function read_sql($where = '')
-    {
-        if (empty($this->sqliter))
-            $this->sqliter = $this->_read_sql_query($where);
-        return $this->sqliter->next();
-    }
-
     function _read_sql_query($where = '')
     {
         global $request;
@@ -189,6 +182,13 @@
             . ($where ? " WHERE $where" : ""));
     }
 
+    function read_sql($where = '')
+    {
+        if (empty($this->sqliter))
+            $this->sqliter = $this->_read_sql_query($where);
+        return $this->sqliter->next();
+    }
+
     /* done in request->finish() before the db is closed */
     function write_sql()
     {

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2014-11-18 09:58:08 UTC (rev 9329)
+++ trunk/lib/Request.php	2014-11-18 16:26:56 UTC (rev 9330)
@@ -905,7 +905,11 @@
     }
 
     /**
-     * Return iterator of referer items reverse sorted (latest first).
+     * Return iterator of referrer items reverse sorted (latest first).
+     *
+     * @param int $limit
+     * @param bool $external_only
+     * @return WikiDB_Array_generic_iter
      */
     function get_referer($limit = 15, $external_only = false)
     {
@@ -965,7 +969,8 @@
 
     function _read_sql_query($where = '')
     {
-        $dbh =& $GLOBALS['request']->_dbi;
+        global $request;
+        $dbh =& $request->_dbi;
         $log_tbl =& $this->logtable;
         return $dbh->genericSqlIter("SELECT *,request_uri as request,request_time as time,remote_user as user,"
             . "remote_host as host,agent as user_agent"
@@ -983,7 +988,8 @@
     /* done in request->finish() before the db is closed */
     function write_sql()
     {
-        $dbh =& $GLOBALS['request']->_dbi;
+        global $request;
+        $dbh =& $request->_dbi;
         if (isset($this->entries) and $dbh and $dbh->isOpen())
             foreach ($this->entries as $entry) {
                 $entry->write_sql();
@@ -1183,7 +1189,7 @@
 }
 
 /**
- * Shutdown callback.
+ * Shutdown callback. Ensures that the file is written.
  *
  * @access private
  * @see Request_AccessLogEntry

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9329] trunk/themes/MacOSX/images/index.php

[<var...@us...>]

Revision: 9329
          http://sourceforge.net/p/phpwiki/code/9329
Author:   vargenau
Date:     2014-11-18 09:58:08 +0000 (Tue, 18 Nov 2014)
Log Message:
-----------
Remove themes/MacOSX/images/index.php

Removed Paths:
-------------
    trunk/themes/MacOSX/images/index.php

Deleted: trunk/themes/MacOSX/images/index.php
===================================================================
--- trunk/themes/MacOSX/images/index.php	2014-11-18 09:44:16 UTC (rev 9328)
+++ trunk/themes/MacOSX/images/index.php	2014-11-18 09:58:08 UTC (rev 9329)
@@ -1,36 +0,0 @@
-<html>
-<head><title>Alpha Channel Test</title>
-    <script type="text/javascript"><!--
-    var backgroundcolor = new Array();
-    backgroundcolor[0] = '#ffffff';
-    backgroundcolor[1] = '#cccccc';
-    backgroundcolor[2] = '#888888';
-    backgroundcolor[3] = '#444444';
-    backgroundcolor[4] = '#000000';
-    backgroundcolor[5] = '#aa8888';
-    backgroundcolor[6] = '#88aa88';
-    backgroundcolor[7] = '#8888aa';
-    function changebg(color) {
-        document.bgColor = backgroundcolor[color];
-    }
-    //--></script>
-</head>
-<body style="background-color:"#8888aa">
-<?php
-$dir = opendir(".");
-while ($fileName = readdir($dir))
-    if (!(strcmp(substr($fileName, -4), ".png")))
-        print("<img src=\"" . urlencode($fileName) . "\" alt=\"$fileName\" />\n");
-?>
-<hr>
-bgcolor:
-<script type="text/javascript"><!--
-for (var n = 0; n < backgroundcolor.length; n++) {
-    document.write(
-            ' <a href="#" onmouseover="javascript:changebg(' + n + ')">' + backgroundcolor[n] + '</a>'
-    );
-}
-//--></script>
-<hr>
-</body>
-</html>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9328] trunk/lib/WikiDB/backend/cvs.php

[<var...@us...>]

Revision: 9328
          http://sourceforge.net/p/phpwiki/code/9328
Author:   vargenau
Date:     2014-11-18 09:44:16 +0000 (Tue, 18 Nov 2014)
Log Message:
-----------
get_all_pages must be compatible with superclass

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/cvs.php

Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php	2014-11-17 16:33:00 UTC (rev 9327)
+++ trunk/lib/WikiDB/backend/cvs.php	2014-11-18 09:44:16 UTC (rev 9328)
@@ -407,7 +407,7 @@
         return new WikiDB_backend_dumb_AllRevisionsIter($this, $pagename);
     } */
 
-    function get_all_pages($include_empty = false, $sortby = '', $limit = '')
+    function get_all_pages($include_empty = false, $orderby = false, $limit = '', $exclude = '')
     {
         // FIXME: this ignores the parameters.
         return new Cvs_Backend_Array_Iterator(

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9327] trunk/lib/WikiUser.php

[<var...@us...>]

Revision: 9327
          http://sourceforge.net/p/phpwiki/code/9327
Author:   vargenau
Date:     2014-11-17 16:33:00 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
Add class variables

Modified Paths:
--------------
    trunk/lib/WikiUser.php

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2014-11-17 16:25:16 UTC (rev 9326)
+++ trunk/lib/WikiUser.php	2014-11-17 16:33:00 UTC (rev 9327)
@@ -370,6 +370,9 @@
     public $_level = WIKIAUTH_ANON;
     public $_prefs = false;
     public $_HomePagehandle = false;
+    public $_auth_methods;
+    public $_current_method;
+    public $_current_index;
 
     // constructor
     function _WikiUser($UserName = '', $prefs = false)
@@ -937,8 +940,6 @@
     {
         //global $DBAuthParams, $DBParams;
         if ($UserName) {
-            /*if (!$this->isValidName($UserName))
-                return false;*/
             $this->_userid = $UserName;
             if ($this->hasHomePage())
                 $this->_HomePagehandle = $GLOBALS['request']->getPage($this->_userid);
@@ -1030,6 +1031,7 @@
                     return $this;
             }
         }
+        return null;
     }
 
     function getAuthDbh()
@@ -1739,7 +1741,7 @@
             $user = session_get_user();
             return $user->getEmail();
         } else {
-            parent::get($name);
+            return parent::get($name);
         }
     }
 
@@ -1917,6 +1919,7 @@
 class UserPreferences
 {
     public $notifyPagesAll;
+    public $_init;
 
     function __construct($saved_prefs = false)
     {
@@ -2067,7 +2070,8 @@
     function updatePrefs($prefs, $init = false)
     {
         $count = 0;
-        if ($init) $this->_init = $init;
+        if ($init)
+            $this->_init = $init;
         if (is_object($prefs)) {
             $type = 'emailVerified';
             $obj =& $this->_prefs['email'];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9326] trunk/lib/PageList.php

[<var...@us...>]

Revision: 9326
          http://sourceforge.net/p/phpwiki/code/9326
Author:   vargenau
Date:     2014-11-17 16:25:16 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
function explodePageList is static

Modified Paths:
--------------
    trunk/lib/PageList.php

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2014-11-17 16:23:34 UTC (rev 9325)
+++ trunk/lib/PageList.php	2014-11-17 16:25:16 UTC (rev 9326)
@@ -1113,8 +1113,8 @@
      * Limitation: Doesn't split into comma-sep and then expand wildcards.
      * "Test1*,Test2*" is expanded into TextSearch "Test1* Test2*"
      */
-    function explodePageList($input, $include_empty = false, $sortby = '',
-                             $limit = '', $exclude = '')
+    static function explodePageList($input, $include_empty = false, $sortby = '',
+                                    $limit = '', $exclude = '')
     {
         if (empty($input)) {
             return array();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9325] trunk/lib/plugin/PopularTags.php

[<var...@us...>]

Revision: 9325
          http://sourceforge.net/p/phpwiki/code/9325
Author:   vargenau
Date:     2014-11-17 16:23:34 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
Use default value

Modified Paths:
--------------
    trunk/lib/plugin/PopularTags.php

Modified: trunk/lib/plugin/PopularTags.php
===================================================================
--- trunk/lib/plugin/PopularTags.php	2014-11-17 16:22:48 UTC (rev 9324)
+++ trunk/lib/plugin/PopularTags.php	2014-11-17 16:23:34 UTC (rev 9325)
@@ -63,12 +63,12 @@
         extract($args);
 
         $maincat = $dbi->getPage(_("CategoryCategory"));
-        $bi = $maincat->getBackLinks(false);
+        $bi = $maincat->getBackLinks();
         $bl = array();
         while ($b = $bi->next()) {
             $name = $b->getName();
             if (preg_match("/^" . _("Template") . "/", $name)) continue;
-            $pages = $b->getBackLinks(false);
+            $pages = $b->getBackLinks();
             $bl[] = array('name' => $name,
                 'count' => $pages->count());
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9324] trunk/lib/WikiDB.php

[<var...@us...>]

Revision: 9324
          http://sourceforge.net/p/phpwiki/code/9324
Author:   vargenau
Date:     2014-11-17 16:22:48 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
PHP Doc; add static; fix return

Modified Paths:
--------------
    trunk/lib/WikiDB.php

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2014-11-17 15:59:00 UTC (rev 9323)
+++ trunk/lib/WikiDB.php	2014-11-17 16:22:48 UTC (rev 9324)
@@ -47,7 +47,7 @@
      * arguments to determine the proper subclass of WikiDB to
      * instantiate, and then it instantiates it.
      *
-     * @param hash $dbparams Database configuration parameters.
+     * @param array $dbparams Database configuration parameters (hash).
      * Some pertinent parameters are:
      * <dl>
      * <dt> dbtype
@@ -96,7 +96,7 @@
      *
      * @return WikiDB A WikiDB object.
      **/
-    public function open($dbparams)
+    static public function open($dbparams)
     {
         $dbtype = $dbparams{'dbtype'};
         include_once("lib/WikiDB/$dbtype.php");
@@ -213,7 +213,7 @@
     {
         if (!empty($this->readonly)) {
             trigger_error("readonly database", E_USER_WARNING);
-            return;
+            return false;
         }
         // don't create empty revisions of already purged pages.
         if ($this->_backend->get_latest_version($pagename))
@@ -243,13 +243,14 @@
     /**
      * Completely remove the page from the WikiDB, without undo possibility.
      * @param string $pagename Name of page to delete.
+     * @return bool
      * @see deletePage
      */
     public function purgePage($pagename)
     {
         if (!empty($this->readonly)) {
             trigger_error("readonly database", E_USER_WARNING);
-            return;
+            return false;
         }
         $result = $this->_cache->purge_page($pagename);
         $this->deletePage($pagename); // just for the notification
@@ -507,7 +508,7 @@
     {
         if (!empty($this->readonly)) {
             trigger_error("readonly database", E_USER_WARNING);
-            return;
+            return false;
         }
         assert(is_string($from) && $from != '');
         assert(is_string($to) && $to != '');
@@ -610,7 +611,7 @@
 
     function set_db_version($ver)
     {
-        return $this->set('_db_version', (float)$ver);
+        $this->set('_db_version', (float)$ver);
     }
 
     /**
@@ -625,7 +626,7 @@
      * <dt>'_timestamp' <dd> Data used by getTimestamp().
      * </dl>
      *
-     * @return scalar The requested value, or false if the requested data
+     * @return mixed The requested value, or false if the requested data
      * is not set.
      */
     public function get($key)
@@ -754,7 +755,7 @@
                     printSimpleTrace(debug_backtrace());
                 }
                 trigger_error("empty pagename", E_USER_WARNING);
-                return false;
+                return;
             }
         } else {
             assert(is_string($pagename) and $pagename != '');
@@ -905,10 +906,10 @@
      *
      * @param string $content Contents of new revision.
      *
-     * @param hash $metadata Metadata for new revision.
+     * @param array $metadata Metadata for new revision (hash).
      * All values in the hash should be scalars (strings or integers).
      *
-     * @param hash $links List of linkto=>pagename, relation=>pagename which this page links to.
+     * @param array $links List of linkto=>pagename, relation=>pagename which this page links to (hash).
      *
      * @return WikiDB_PageRevision Returns the new WikiDB_PageRevision object. If
      * $version was incorrect, returns false
@@ -917,7 +918,7 @@
     {
         if ($this->_wikidb->readonly) {
             trigger_error("readonly database", E_USER_WARNING);
-            return;
+            return false;
         }
         $backend = &$this->_wikidb->_backend;
         $cache = &$this->_wikidb->_cache;
@@ -1004,7 +1005,7 @@
     {
         if ($this->_wikidb->readonly) {
             trigger_error("readonly database", E_USER_WARNING);
-            return;
+            return false;
         }
         if (is_null($formatted))
             $formatted = new TransformedText($this, $wikitext, $meta);
@@ -1076,7 +1077,6 @@
      */
     public function getCurrentRevision($need_content = true)
     {
-        $backend = &$this->_wikidb->_backend;
         $cache = &$this->_wikidb->_cache;
         $pagename = &$this->_pagename;
 
@@ -1208,8 +1208,7 @@
     /**
      * All Links from other pages to this page.
      */
-    function getBackLinks($include_empty = false, $sortby = '', $limit = '', $exclude = '',
-                          $want_relations = false)
+    function getBackLinks($include_empty = false, $sortby = '', $limit = '', $exclude = '')
     {
         return $this->getLinks(true, $include_empty, $sortby, $limit, $exclude);
     }
@@ -1217,8 +1216,7 @@
     /**
      * Forward Links: All Links from this page to other pages.
      */
-    function getPageLinks($include_empty = false, $sortby = '', $limit = '', $exclude = '',
-                          $want_relations = false)
+    function getPageLinks($include_empty = false, $sortby = '', $limit = '', $exclude = '')
     {
         return $this->getLinks(false, $include_empty, $sortby, $limit, $exclude);
     }
@@ -1293,7 +1291,7 @@
      * <dt>'rating' <dd> Page rating. Handled by plugin/RateIt
      * </dl>
      *
-     * @return scalar The requested value, or false if the requested data
+     * @return mixed The requested value, or false if the requested data
      * is not set.
      */
     public function get($key)
@@ -1316,7 +1314,7 @@
     /**
      * Get all the page meta-data as a hash.
      *
-     * @return hash The page meta-data.
+     * @return array The page meta-data (hash).
      */
     function getMetaData()
     {
@@ -1357,7 +1355,8 @@
                 trigger_error("readonly database", E_USER_WARNING);
                 return;
             }
-            return $backend->set_cached_html($pagename, $newval);
+            $backend->set_cached_html($pagename, $newval);
+            return;
         }
 
         $data = $cache->get_pagedata($pagename);
@@ -1614,8 +1613,6 @@
      */
     function getTransformedContent($pagetype_override = false)
     {
-        $backend = &$this->_wikidb->_backend;
-
         if ($pagetype_override) {
             // Figure out the normal page-type for this page.
             $type = PageType::GetPageType($this->get('pagetype'));
@@ -2230,7 +2227,7 @@
     {
         if (!empty($this->readonly)) {
             trigger_error("readonly database", E_USER_WARNING);
-            return;
+            return false;
         }
         $result = $this->_backend->delete_page($pagename);
         $this->invalidate_cache($pagename);
@@ -2241,7 +2238,7 @@
     {
         if (!empty($this->readonly)) {
             trigger_error("readonly database", E_USER_WARNING);
-            return;
+            return false;
         }
         $result = $this->_backend->purge_page($pagename);
         $this->invalidate_cache($pagename);
@@ -2302,7 +2299,7 @@
             trigger_error("readonly database", E_USER_WARNING);
             return;
         }
-        $new = $this->_backend->set_versiondata($pagename, $version, $data);
+        $this->_backend->set_versiondata($pagename, $version, $data);
         // Update the cache
         $this->_versiondata_cache[$pagename][$version]['1'] = $data;
         $this->_versiondata_cache[$pagename][$version]['0'] = $data;
@@ -2316,7 +2313,7 @@
             trigger_error("readonly database", E_USER_WARNING);
             return;
         }
-        $new = $this->_backend->update_versiondata($pagename, $version, $data);
+        $this->_backend->update_versiondata($pagename, $version, $data);
         // Update the cache
         $this->_versiondata_cache[$pagename][$version]['1'] = $data;
         // FIXME: hack
@@ -2331,7 +2328,7 @@
             trigger_error("readonly database", E_USER_WARNING);
             return;
         }
-        $new = $this->_backend->delete_versiondata($pagename, $version);
+        $this->_backend->delete_versiondata($pagename, $version);
         if (isset($this->_versiondata_cache[$pagename][$version]))
             unset ($this->_versiondata_cache[$pagename][$version]);
         // dirty latest version cache only if latest version gets deleted

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9323] trunk/lib/WikiGroup.php

[<var...@us...>]

Revision: 9323
          http://sourceforge.net/p/phpwiki/code/9323
Author:   vargenau
Date:     2014-11-17 15:59:00 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
Add return

Modified Paths:
--------------
    trunk/lib/WikiGroup.php

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2014-11-17 15:34:21 UTC (rev 9322)
+++ trunk/lib/WikiGroup.php	2014-11-17 15:59:00 UTC (rev 9323)
@@ -136,6 +136,7 @@
                 trigger_error(_("No or unsupported GROUP_METHOD defined"), E_USER_WARNING);
                 return new WikiGroup($not_current);
         }
+        return null;
     }
 
     /** ACL PagePermissions will need those special groups based on the User status only.
@@ -370,8 +371,8 @@
                 // this could get complex so just return an empty array
                 return false;
             default:
-                trigger_error(__sprintf("Unknown special group “%s”", $group),
-                    E_USER_WARNING);
+                trigger_error(__sprintf("Unknown special group “%s”", $group), E_USER_WARNING);
+                return false;
         }
     }
 
@@ -558,7 +559,6 @@
         }
 
         global $request;
-        $dbh = &$request->_dbi;
         $master_page = $request->getPage(CATEGORY_GROUP_PAGE);
         $master_list = $master_page->getLinks(true);
         while ($group_page = $master_list->next()) {
@@ -611,13 +611,13 @@
  */
 class GroupDb extends WikiGroup
 {
-
     public $_is_member, $_group_members, $_user_groups;
 
     function __construct()
     {
-        global $DBAuthParams, $DBParams;
-        //$this->request = &$GLOBALS['request'];
+        global $DBAuthParams;
+        global $request;
+
         $this->username = $this->_getUserName();
         $this->membership = array();
 
@@ -627,7 +627,7 @@
         ) {
             trigger_error(_("No or not enough GROUP_DB SQL statements defined"),
                 E_USER_WARNING);
-            return new GroupNone();
+            return;
         }
         if (empty($this->user)) {
             // use _PassUser::prepare instead
@@ -848,14 +848,12 @@
         $this->membership = array();
 
         if (!defined('AUTH_GROUP_FILE')) {
-            trigger_error(sprintf(_("%s: not defined"), "AUTH_GROUP_FILE"),
-                E_USER_WARNING);
-            return false;
+            trigger_error(sprintf(_("%s: not defined"), "AUTH_GROUP_FILE"), E_USER_WARNING);
+            return;
         }
         if (!file_exists(AUTH_GROUP_FILE)) {
-            trigger_error(sprintf(_("Cannot open AUTH_GROUP_FILE %s"), AUTH_GROUP_FILE),
-                E_USER_WARNING);
-            return false;
+            trigger_error(sprintf(_("Cannot open AUTH_GROUP_FILE %s"), AUTH_GROUP_FILE), E_USER_WARNING);
+            return;
         }
         require_once 'lib/pear/File_Passwd.php';
         $this->_file = new File_Passwd(AUTH_GROUP_FILE, false, AUTH_GROUP_FILE . ".lock");
@@ -998,6 +996,7 @@
             return true;
         if ($this->specialGroup($group))
             return $this->isSpecialMember($group);
+        return false;
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9322] trunk/lib/PagePerm.php

[<var...@us...>]

Revision: 9322
          http://sourceforge.net/p/phpwiki/code/9322
Author:   vargenau
Date:     2014-11-17 15:34:21 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
function dotPerms is static

Modified Paths:
--------------
    trunk/lib/PagePerm.php

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2014-11-17 15:30:45 UTC (rev 9321)
+++ trunk/lib/PagePerm.php	2014-11-17 15:34:21 UTC (rev 9322)
@@ -122,6 +122,7 @@
         return HTML::samp(array('class' => 'inherited', 'style' => 'color:#aaa;'),
             $perm->asRwxString($owner, $group));
     }
+    return '';
 }
 
 function pagePermissionsAcl($type, $perm_tree)
@@ -533,7 +534,7 @@
      * special permissions for dot-files, beginning with '.'
      * maybe also for '_' files?
      */
-    function dotPerms()
+    static function dotPerms()
     {
         $def = array(ACL_ADMIN => true,
             ACL_OWNER => true);
@@ -711,7 +712,6 @@
     function asAclLines()
     {
         $s = '';
-        $line = '';
         $this->sanify();
         foreach ($this->perm as $access => $groups) {
             // unify groups for same access+bool

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9321] trunk/lib/InlineParser.php

[<var...@us...>]

Revision: 9321
          http://sourceforge.net/p/phpwiki/code/9321
Author:   vargenau
Date:     2014-11-17 15:30:45 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
Use __construct

Modified Paths:
--------------
    trunk/lib/InlineParser.php

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2014-11-17 15:24:36 UTC (rev 9320)
+++ trunk/lib/InlineParser.php	2014-11-17 15:30:45 UTC (rev 9321)
@@ -1262,7 +1262,7 @@
     public $_regexps = array();
     public $_markup = array();
 
-    function InlineTransformer($markup_types = false)
+    function __construct($markup_types = false)
     {
         global $request;
         // We need to extend the inline parsers by certain actions, like SearchHighlight,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9320] trunk/lib/WysiwygEdit.php

[<var...@us...>]

Revision: 9320
          http://sourceforge.net/p/phpwiki/code/9320
Author:   vargenau
Date:     2014-11-17 15:24:36 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
PHP Doc

Modified Paths:
--------------
    trunk/lib/WysiwygEdit.php

Modified: trunk/lib/WysiwygEdit.php
===================================================================
--- trunk/lib/WysiwygEdit.php	2014-11-17 15:20:33 UTC (rev 9319)
+++ trunk/lib/WysiwygEdit.php	2014-11-17 15:24:36 UTC (rev 9320)
@@ -42,6 +42,7 @@
      *  *text* => '<b>text<b>'
      *
      * @param $text
+     * @return string
      */
     function ConvertBefore($text)
     {
@@ -58,6 +59,7 @@
      * TODO: Switch over to HtmlParser
      *
      * @param $text
+     * @return string
      */
     function ConvertAfter($text)
     {
@@ -95,6 +97,7 @@
             case 'em':
                 return "_" . $body . "_";
         }
+        return '';
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9319] trunk/lib/InlineParser.php

[<var...@us...>]

Revision: 9319
          http://sourceforge.net/p/phpwiki/code/9319
Author:   vargenau
Date:     2014-11-17 15:20:33 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
Add return

Modified Paths:
--------------
    trunk/lib/InlineParser.php

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2014-11-17 14:57:05 UTC (rev 9318)
+++ trunk/lib/InlineParser.php	2014-11-17 15:20:33 UTC (rev 9319)
@@ -841,6 +841,7 @@
             case '_':
                 return new HtmlElement('i', $body);
         }
+        return null;
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9318] trunk/lib/Google.php

[<var...@us...>]

Revision: 9318
          http://sourceforge.net/p/phpwiki/code/9318
Author:   vargenau
Date:     2014-11-17 14:57:05 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
Remove unused parameter

Modified Paths:
--------------
    trunk/lib/Google.php

Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php	2014-11-17 14:54:11 UTC (rev 9317)
+++ trunk/lib/Google.php	2014-11-17 14:57:05 UTC (rev 9318)
@@ -158,7 +158,7 @@
 class Google
 {
 
-    function Google($maxResults = 10, $license_key = false, $proxy = false)
+    function Google($maxResults = 10, $license_key = false)
     {
         if ($license_key)
             $this->license_key = $license_key;
@@ -255,7 +255,7 @@
      * The return type for cached pages is base64 encoded text.
      *
      * @param string $url - full URL to the page to retrieve
-     * @return string full text of the cached page
+     * @return string|bool full text of the cached page
      */
     function doGetCachedPage($url)
     {
@@ -264,7 +264,9 @@
         // This method gets created automatically!! (some eval'ed code from the soap request)
         $result = $this->proxy->doGetCachedPage($this->license_key,
             $url);
-        if (!empty($result)) return base64_decode($result);
+        if (!empty($result))
+            return base64_decode($result);
+        return false;
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9317] trunk/lib/fortune.php

[<var...@us...>]

Revision: 9317
          http://sourceforge.net/p/phpwiki/code/9317
Author:   vargenau
Date:     2014-11-17 14:54:11 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
Add this

Modified Paths:
--------------
    trunk/lib/fortune.php

Modified: trunk/lib/fortune.php
===================================================================
--- trunk/lib/fortune.php	2014-11-17 14:51:47 UTC (rev 9316)
+++ trunk/lib/fortune.php	2014-11-17 14:54:11 UTC (rev 9317)
@@ -68,12 +68,12 @@
     {
         if (is_file($file) == false) {
             echo "Input must be a file!<br/>";
-            return;
+            return '';
         }
 
         if (($fd = fopen($file, "rb")) == false) {
             echo "Cannot open $file<br/>";
-            return;
+            return '';
         }
         fseek($fd, 24 + 4 * $index);
 
@@ -129,8 +129,9 @@
         fseek($fd, 24, SEEK_SET);
         $i = 0;
 
+        $res = array();
         while (feof($fd) == FALSE) {
-            $res[$i] = readLong($fd);
+            $res[$i] = $this->readLong($fd);
             $i++;
         }
         return $res;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9316] trunk/lib/config.php

[<var...@us...>]

Revision: 9316
          http://sourceforge.net/p/phpwiki/code/9316
Author:   vargenau
Date:     2014-11-17 14:51:47 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
Replace "or" with "||" to get correct priority

Modified Paths:
--------------
    trunk/lib/config.php

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2014-11-17 14:48:27 UTC (rev 9315)
+++ trunk/lib/config.php	2014-11-17 14:51:47 UTC (rev 9316)
@@ -87,7 +87,7 @@
 function isBrowserSafari($version = false)
 {
     $found = browserDetect('Spoofer/');
-    $found = browserDetect('AppleWebKit/') or $found;
+    $found = browserDetect('AppleWebKit/') || $found;
     if ($version)
         return $found and browserVersion() >= $version;
     return $found;
@@ -109,6 +109,7 @@
  * So must defer this to the request loop.
  *
  * @param array $languages
+ * @return string
  */
 function guessing_lang($languages = array())
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9315] trunk/lib/Captcha.php

[<var...@us...>]

Revision: 9315
          http://sourceforge.net/p/phpwiki/code/9315
Author:   vargenau
Date:     2014-11-17 14:48:27 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
Add class variables; add this

Modified Paths:
--------------
    trunk/lib/Captcha.php

Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2014-11-17 14:36:57 UTC (rev 9314)
+++ trunk/lib/Captcha.php	2014-11-17 14:48:27 UTC (rev 9315)
@@ -24,6 +24,15 @@
 
 class Captcha
 {
+    public $meta;
+    public $width;
+    public $height;
+    public $length;
+    public $failed_msg;
+    /**
+     * @var WikiRequest
+     */
+    public $request;
 
     function Captcha($meta = array(), $width = 250, $height = 80)
     {
@@ -80,7 +89,7 @@
     function get_word()
     {
         if (USE_CAPTCHA_RANDOM_WORD)
-            return get_dictionary_word();
+            return $this->get_dictionary_word();
         else
             return rand_ascii_readable($this->length); // lib/stdlib.php
     }
@@ -89,6 +98,7 @@
     {
         // Load In the Word List
         $fp = fopen(findfile("lib/captcha/dictionary"), "r");
+        $text = array();
         while (!feof($fp))
             $text[] = trim(fgets($fp, 1024));
         fclose($fp);
@@ -99,6 +109,7 @@
             $x = mt_rand(0, count($text));
             return $text[$x];
         }
+        return '';
     }
 
     // Draw the Spiral

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9314] trunk/lib/AtomParser.php

[<var...@us...>]

Revision: 9314
          http://sourceforge.net/p/phpwiki/code/9314
Author:   vargenau
Date:     2014-11-17 14:36:57 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
Add return

Modified Paths:
--------------
    trunk/lib/AtomParser.php

Modified: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php	2014-11-15 17:49:36 UTC (rev 9313)
+++ trunk/lib/AtomParser.php	2014-11-17 14:36:57 UTC (rev 9314)
@@ -247,6 +247,7 @@
         } elseif (is_string($element)) {
             return trim($element);
         }
+        return false;
     }
 
     function serialize_tag($tag_name, $attributes)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9313] trunk/lib/RssWriter.php

[<var...@us...>]

Revision: 9313
          http://sourceforge.net/p/phpwiki/code/9313
Author:   vargenau
Date:     2014-11-15 17:49:36 +0000 (Sat, 15 Nov 2014)
Log Message:
-----------
PHP Doc

Modified Paths:
--------------
    trunk/lib/RssWriter.php

Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php	2014-11-15 17:44:51 UTC (rev 9312)
+++ trunk/lib/RssWriter.php	2014-11-15 17:49:36 UTC (rev 9313)
@@ -11,6 +11,10 @@
  */
 class RssWriter extends XmlElement
 {
+    public $_channel;
+    public $_image;
+    public $_textinput;
+
     function __construct()
     {
         parent::__construct('rdf:RDF',
@@ -127,6 +131,11 @@
 
     /**
      * Create a new RDF <em>typedNode</em>.
+     *
+     * @param $type
+     * @param $properties
+     * @param bool $uri
+     * @return XmlElement
      */
     function __node($type, $properties, $uri = false)
     {
@@ -139,6 +148,9 @@
 
     /**
      * Check object URI for uniqueness, create a unique URI if needed.
+     *
+     * @param string $uri
+     * @return string
      */
     function __uniquify_uri($uri)
     {
@@ -153,6 +165,9 @@
 
     /**
      * Convert hash of RDF properties to <em>propertyElt</em>s.
+     *
+     * @param $elements
+     * @return array
      */
     function __elementize($elements)
     {
@@ -170,6 +185,8 @@
 
     /**
      * Check property predicates for XMLNS sanity.
+     *
+     * @param string $name
      */
     function __check_predicate($name)
     {
@@ -185,6 +202,10 @@
 
     /**
      * Create a <em>propertyElt</em> which references another node in the RSS.
+     *
+     * @param $predicate
+     * @param $reference
+     * @return XmlElement
      */
     function __ref($predicate, $reference)
     {
@@ -224,6 +245,12 @@
 
     /**
      * Create a new entry
+     *
+     * @param $type
+     * @param $attr
+     * @param bool $properties
+     * @param bool $uri
+     * @return XmlElement
      */
     function __node($type, $attr, $properties, $uri = false)
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.