phpwiki-checkins Mailing List for PhpWiki (Page 84)

Brought to you by: carstenklapp, dairiki, rurban, vargenau, wainstead

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

You can subscribe to this list here.

2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (43)	Nov (73)	Dec (10)
2001	Jan (34)	Feb (110)	Mar (24)	Apr (44)	May (37)	Jun (22)	Jul (20)	Aug (28)	Sep (50)	Oct (11)	Nov (132)	Dec (595)
2002	Jan (1099)	Feb (579)	Mar (63)	Apr	May	Jun	Jul	Aug (125)	Sep (101)	Oct (25)	Nov (34)	Dec (47)
2003	Jan (82)	Feb (182)	Mar (71)	Apr (3)	May (1)	Jun (3)	Jul	Aug	Sep (14)	Oct (6)	Nov (124)	Dec (68)
2004	Jan (64)	Feb (191)	Mar (199)	Apr (298)	May (252)	Jun (426)	Jul (134)	Aug (13)	Sep (96)	Oct (75)	Nov (232)	Dec (171)
2005	Jan (205)	Feb (165)	Mar (8)	Apr (74)	May (21)	Jun (19)	Jul (37)	Aug (69)	Sep (141)	Oct (118)	Nov (31)	Dec (7)
2006	Jan (5)	Feb (10)	Mar (35)	Apr (24)	May (34)	Jun (29)	Jul (5)	Aug (38)	Sep (30)	Oct (37)	Nov (30)	Dec (86)
2007	Jan (414)	Feb (40)	Mar (18)	Apr (10)	May (66)	Jun (60)	Jul (105)	Aug (55)	Sep (64)	Oct (7)	Nov (11)	Dec (5)
2008	Jan (26)	Feb (28)	Mar (79)	Apr (34)	May (61)	Jun (24)	Jul (29)	Aug (160)	Sep (62)	Oct (70)	Nov (32)	Dec (14)
2009	Jan (140)	Feb (135)	Mar (153)	Apr (53)	May (24)	Jun (138)	Jul (90)	Aug (46)	Sep (72)	Oct (84)	Nov (32)	Dec (4)
2010	Jan (13)	Feb (7)	Mar (14)	Apr (55)	May (89)	Jun (131)	Jul (41)	Aug (38)	Sep (42)	Oct (11)	Nov (27)	Dec (54)
2011	Jan (127)	Feb (16)	Mar (71)	Apr (52)	May (32)	Jun (31)	Jul (4)	Aug	Sep (45)	Oct (26)	Nov (36)	Dec (10)
2012	Jan (23)	Feb (6)	Mar (13)	Apr (18)	May (1)	Jun (4)	Jul (3)	Aug (12)	Sep (57)	Oct (96)	Nov (163)	Dec (124)
2013	Jan (11)	Feb (17)	Mar (7)	Apr (48)	May (15)	Jun (29)	Jul (12)	Aug	Sep (9)	Oct	Nov	Dec (3)
2014	Jan (4)	Feb (1)	Mar (2)	Apr (1)	May (8)	Jun (90)	Jul (104)	Aug (12)	Sep (81)	Oct (139)	Nov (111)	Dec (64)
2015	Jan (46)	Feb (74)	Mar (56)	Apr (61)	May (3)	Jun (7)	Jul (11)	Aug (5)	Sep (15)	Oct (1)	Nov (1)	Dec (15)
2016	Jan (25)	Feb (33)	Mar (24)	Apr (4)	May (24)	Jun (3)	Jul (75)	Aug	Sep (2)	Oct (38)	Nov (4)	Dec (18)
2017	Jan (8)	Feb (1)	Mar (1)	Apr	May (14)	Jun	Jul (5)	Aug (9)	Sep	Oct (23)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar (9)	Apr (60)	May (1)	Jun	Jul (13)	Aug	Sep (11)	Oct	Nov	Dec
2020	Jan	Feb	Mar (15)	Apr (4)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (47)
2021	Jan (24)	Feb (33)	Mar (1)	Apr	May (1)	Jun (64)	Jul (71)	Aug (114)	Sep (82)	Oct (32)	Nov (76)	Dec (86)
2022	Jan (162)	Feb (41)	Mar (11)	Apr (9)	May	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov	Dec (7)
2023	Jan	Feb (1)	Mar (2)	Apr	May	Jun	Jul (25)	Aug	Sep	Oct	Nov (7)	Dec
2024	Jan (7)	Feb (3)	Mar (3)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2025	Jan	Feb (90)	Mar (19)	Apr	May (6)	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 82 83 84 85 86 .. 538 > >> (Page 84 of 538)

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

From: <var...@us...> - 2014-09-25 08:48:06

Revision: 9112
          http://sourceforge.net/p/phpwiki/code/9112
Author:   vargenau
Date:     2014-09-25 08:47:58 +0000 (Thu, 25 Sep 2014)
Log Message:
-----------
Fix Bug#646 Wrong number of links in BackLinks

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2014-09-24 16:13:38 UTC (rev 9111)
+++ trunk/lib/PageList.php	2014-09-25 08:47:58 UTC (rev 9112)
@@ -809,10 +809,12 @@
 
     function addPage($page_handle)
     {
+        $pagename = is_string($page_handle) ? $page_handle : $page_handle->getName();
+        if (in_array($pagename, $this->pageNames())) {
+            return;
+        }
         if (!empty($this->_excluded_pages)) {
-            if (!in_array((is_string($page_handle) ? $page_handle : $page_handle->getName()),
-                $this->_excluded_pages)
-            )
+            if (!in_array($pagename, $this->_excluded_pages))
                 $this->_pages[] = $page_handle;
         } else {
             $this->_pages[] = $page_handle;

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2014-09-24 16:13:38 UTC (rev 9111)
+++ trunk/pgsrc/ReleaseNotes	2014-09-25 08:47:58 UTC (rev 9112)
@@ -1,4 +1,4 @@
-Date: Wed, 24 Sep 2014 18:11:57 +0000
+Date: Thu, 25 Sep 2014 10:11:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -17,6 +17,7 @@
 * fix Bug#647 undefined method WikiDB_backend_dba::WikiDB_backend_dbaBase
 * correct total number of pages for AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastEditedByMe
 * fix Bug#607 BackLinks do not work inside a RichTable
+* fix Bug#646 Wrong number of links in BackLinks
 
 == 1.5.0 2014-07-29 Marc-Etienne Vargenau ==
 

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

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

From: <var...@us...> - 2014-09-24 16:13:42

Revision: 9111
          http://sourceforge.net/p/phpwiki/code/9111
Author:   vargenau
Date:     2014-09-24 16:13:38 +0000 (Wed, 24 Sep 2014)
Log Message:
-----------
Fix #607 BackLinks do not work inside a RichTable; fix Bug#636 Recursive include is not trapped

Modified Paths:
--------------
    trunk/lib/InlineParser.php
    trunk/lib/WikiDB/backend/PearDB.php
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/MediawikiTable.php
    trunk/lib/plugin/OldStyleTable.php
    trunk/lib/plugin/RichTable.php
    trunk/lib/plugin/Template.php
    trunk/lib/plugin/WikicreoleTable.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2014-09-24 15:56:32 UTC (rev 9110)
+++ trunk/lib/InlineParser.php	2014-09-24 16:13:38 UTC (rev 9111)
@@ -513,6 +513,10 @@
             $pagename = $link;
             $anchor = false;
         }
+
+        global $backlinks;
+        $backlinks[] = array('linkto' => $pagename, 'relation' => 0);
+
         return new Cached_WikiLink($pagename, $label, $anchor);
     }
 }

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2014-09-24 15:56:32 UTC (rev 9110)
+++ trunk/lib/WikiDB/backend/PearDB.php	2014-09-24 16:13:38 UTC (rev 9111)
@@ -1161,7 +1161,7 @@
      * ErrorManager which will filter out those spurious messages.)
      * @see _is_false_error, ErrorManager
      */
-    private function _pear_notice_filter($err)
+    function _pear_notice_filter($err)
     {
         return ($err->isNotice()
             && preg_match('|DB[/\\\\]common.php$|', $err->errfile)

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2014-09-24 15:56:32 UTC (rev 9110)
+++ trunk/lib/plugin/IncludePage.php	2014-09-24 16:13:38 UTC (rev 9111)
@@ -61,7 +61,15 @@
         }
         if (!$page or !$page->name)
             return false;
-        return array(array('linkto' => $page->name, 'relation' => 0));
+
+        global $backlinks;
+        if (empty($backlinks)) {
+            global $request;
+            $this->run($request->_dbi, $argstr, $request, $basepage);
+        }
+
+        $backlinks[] = array('linkto' => $page->name, 'relation' => 0); 
+        return $backlinks;
     }
 
     // Avoid warning in:

Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php	2014-09-24 15:56:32 UTC (rev 9110)
+++ trunk/lib/plugin/MediawikiTable.php	2014-09-24 16:13:38 UTC (rev 9111)
@@ -62,8 +62,22 @@
         return array();
     }
 
+    function getWikiPageLinks($argstr, $basepage)
+    {
+        global $backlinks;
+        if (empty($backlinks)) {
+            global $request;
+            $this->run($request->_dbi, $argstr, $request, $basepage);
+        }
+        return $backlinks;
+    }
+
     function run($dbi, $argstr, &$request, $basepage)
     {
+        global $backlinks;
+
+        $backlinks = array();
+
         include_once 'lib/BlockParser.php';
 
         // We allow the compact Mediawiki syntax with:

Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php	2014-09-24 15:56:32 UTC (rev 9110)
+++ trunk/lib/plugin/OldStyleTable.php	2014-09-24 16:13:38 UTC (rev 9111)
@@ -66,8 +66,22 @@
         return;
     }
 
+    function getWikiPageLinks($argstr, $basepage)
+    {
+        global $backlinks;
+        if (empty($backlinks)) {
+            global $request;
+            $this->run($request->_dbi, $argstr, $request, $basepage);
+        }
+        return $backlinks;
+    }
+
     function run($dbi, $argstr, &$request, $basepage)
     {
+        global $backlinks;
+
+        $backlinks = array();
+
         include_once 'lib/InlineParser.php';
 
         $args = $this->getArgs($argstr, $request);

Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php	2014-09-24 15:56:32 UTC (rev 9110)
+++ trunk/lib/plugin/RichTable.php	2014-09-24 16:13:38 UTC (rev 9111)
@@ -40,8 +40,22 @@
         return array();
     }
 
+    function getWikiPageLinks($argstr, $basepage)
+    {
+        global $backlinks;
+        if (empty($backlinks)) {
+            global $request;
+            $this->run($request->_dbi, $argstr, $request, $basepage);
+        }
+        return $backlinks;
+    }
+
     function run($dbi, $argstr, &$request, $basepage)
     {
+        global $backlinks;
+
+        $backlinks = array();
+
         include_once 'lib/BlockParser.php';
 
         $lines = preg_split('/\n/', $argstr);

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2014-09-24 15:56:32 UTC (rev 9110)
+++ trunk/lib/plugin/Template.php	2014-09-24 16:13:38 UTC (rev 9111)
@@ -91,7 +91,15 @@
         }
         if (!$page or !$page->name)
             return false;
-        return array(array('linkto' => $page->name, 'relation' => 0));
+
+        global $backlinks;
+        if (empty($backlinks)) {
+            global $request;
+            $this->run($request->_dbi, $argstr, $request, $basepage);
+        }
+
+        $backlinks[] = array('linkto' => $page->name, 'relation' => 0); 
+        return $backlinks;
     }
 
     function run($dbi, $argstr, &$request, $basepage)

Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php	2014-09-24 15:56:32 UTC (rev 9110)
+++ trunk/lib/plugin/WikicreoleTable.php	2014-09-24 16:13:38 UTC (rev 9111)
@@ -66,8 +66,22 @@
         return;
     }
 
+    function getWikiPageLinks($argstr, $basepage)
+    {
+        global $backlinks;
+        if (empty($backlinks)) {
+            global $request;
+            $this->run($request->_dbi, $argstr, $request, $basepage);
+        }
+        return $backlinks;
+    }
+
     function run($dbi, $argstr, &$request, $basepage)
     {
+        global $backlinks;
+
+        $backlinks = array();
+
         include_once 'lib/InlineParser.php';
 
         $table = array();

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2014-09-24 15:56:32 UTC (rev 9110)
+++ trunk/pgsrc/ReleaseNotes	2014-09-24 16:13:38 UTC (rev 9111)
@@ -1,4 +1,4 @@
-Date: Thu, 18 Sep 2014 15:38:21 +0000
+Date: Wed, 24 Sep 2014 18:11:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -16,6 +16,7 @@
 * fix Bug#636 Recursive include is not trapped
 * fix Bug#647 undefined method WikiDB_backend_dba::WikiDB_backend_dbaBase
 * correct total number of pages for AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastEditedByMe
+* fix Bug#607 BackLinks do not work inside a RichTable
 
 == 1.5.0 2014-07-29 Marc-Etienne Vargenau ==
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9110] trunk/locale/po/zh.po

From: <var...@us...> - 2014-09-24 15:56:40

Revision: 9110
          http://sourceforge.net/p/phpwiki/code/9110
Author:   vargenau
Date:     2014-09-24 15:56:32 +0000 (Wed, 24 Sep 2014)
Log Message:
-----------
Update zh translation

Modified Paths:
--------------
    trunk/locale/po/zh.po

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-09-24 15:49:21 UTC (rev 9109)
+++ trunk/locale/po/zh.po	2014-09-24 15:56:32 UTC (rev 9110)
@@ -478,9 +478,9 @@
 msgid "%s: error while handling error:"
 msgstr "%s: 處理錯誤時發生錯誤:"
 
-#, fuzzy, php-format
+#, php-format
 msgid "File “%s” not found."
-msgstr "%s 找不到."
+msgstr "%s 找不到檔案."
 
 msgid "CategoryGroup"
 msgstr ""

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

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

From: <var...@us...> - 2014-09-24 15:49:28

Revision: 9109
          http://sourceforge.net/p/phpwiki/code/9109
Author:   vargenau
Date:     2014-09-24 15:49:21 +0000 (Wed, 24 Sep 2014)
Log Message:
-----------
Less strings

Modified Paths:
--------------
    trunk/lib/FileFinder.php
    trunk/lib/loadsave.php

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2014-09-24 15:39:05 UTC (rev 9108)
+++ trunk/lib/FileFinder.php	2014-09-24 15:49:21 UTC (rev 9109)
@@ -190,7 +190,7 @@
      */
     private function _not_found($file)
     {
-        trigger_error(sprintf(_("%s: file not found"), $file), E_USER_ERROR);
+        trigger_error(sprintf(_("File “%s” not found."), $file), E_USER_ERROR);
         return false;
     }
 

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2014-09-24 15:39:05 UTC (rev 9108)
+++ trunk/lib/loadsave.php	2014-09-24 15:49:21 UTC (rev 9109)
@@ -1151,7 +1151,7 @@
     }
     $mapfile = FindFile(INTERWIKI_MAP_FILE, 1);
     if (!$goback && !file_exists($mapfile)) {
-        $error_html = sprintf(" " . _("%s: file not found"), INTERWIKI_MAP_FILE);
+        $error_html = sprintf(" " . _("File “%s” not found."), INTERWIKI_MAP_FILE);
         $goback = true;
     }
 

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

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

From: <var...@us...> - 2014-09-24 15:39:14

Revision: 9108
          http://sourceforge.net/p/phpwiki/code/9108
Author:   vargenau
Date:     2014-09-24 15:39:05 +0000 (Wed, 24 Sep 2014)
Log Message:
-----------
Less strings

Modified Paths:
--------------
    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/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-09-24 15:26:51 UTC (rev 9107)
+++ trunk/locale/po/de.po	2014-09-24 15:39:05 UTC (rev 9108)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 17:25+0200\n"
+"POT-Creation-Date: 2014-09-24 17:31+0200\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."
@@ -483,8 +483,8 @@
 msgstr "%s: Fehler während der Fehlerbehandlung von:"
 
 #, php-format
-msgid "%s: file not found"
-msgstr "»%s«: Datei nicht gefunden"
+msgid "File “%s” not found."
+msgstr "Datei »%s« nicht gefunden."
 
 msgid "CategoryGroup"
 msgstr "KategorieGruppen"
@@ -1648,10 +1648,6 @@
 msgid "Display file information like version, size, date... of uploaded files."
 msgstr ""
 
-#, php-format
-msgid "File “%s” not found."
-msgstr "Datei »%s« nicht gefunden."
-
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
 msgstr ""

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-09-24 15:26:51 UTC (rev 9107)
+++ trunk/locale/po/es.po	2014-09-24 15:39:05 UTC (rev 9108)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 17:25+0200\n"
+"POT-Creation-Date: 2014-09-24 17:31+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -478,8 +478,8 @@
 msgstr "%s: error mientras que maneja error:"
 
 #, php-format
-msgid "%s: file not found"
-msgstr "%s: fichero no encontrado"
+msgid "File “%s” not found."
+msgstr "Fichero “%s” no encontrado."
 
 msgid "CategoryGroup"
 msgstr "GrupoCategoría"
@@ -1618,10 +1618,6 @@
 msgid "Display file information like version, size, date... of uploaded files."
 msgstr ""
 
-#, php-format
-msgid "File “%s” not found."
-msgstr "Fichero “%s” no encontrado."
-
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
 msgstr ""

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-09-24 15:26:51 UTC (rev 9107)
+++ trunk/locale/po/fr.po	2014-09-24 15:39:05 UTC (rev 9108)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 17:25+0200\n"
+"POT-Creation-Date: 2014-09-24 17:31+0200\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."
@@ -479,8 +479,8 @@
 msgstr "%s : erreur pendant la gestion de l'erreur :"
 
 #, php-format
-msgid "%s: file not found"
-msgstr "%s : fichier non trouvé"
+msgid "File “%s” not found."
+msgstr "Fichier « %s » non trouvé."
 
 msgid "CategoryGroup"
 msgstr "CatégorieGroupes"
@@ -1625,10 +1625,6 @@
 msgid "Display file information like version, size, date... of uploaded files."
 msgstr ""
 
-#, php-format
-msgid "File “%s” not found."
-msgstr "Fichier « %s » non trouvé."
-
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
 msgstr ""

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-09-24 15:26:51 UTC (rev 9107)
+++ trunk/locale/po/it.po	2014-09-24 15:39:05 UTC (rev 9108)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 17:25+0200\n"
+"POT-Creation-Date: 2014-09-24 17:31+0200\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"
@@ -468,8 +468,8 @@
 msgstr ""
 
 #, php-format
-msgid "%s: file not found"
-msgstr "%s: file non trovato"
+msgid "File “%s” not found."
+msgstr "File «%s» non trovato."
 
 msgid "CategoryGroup"
 msgstr "CategoriaGruppo"
@@ -1600,10 +1600,6 @@
 msgid "Display file information like version, size, date... of uploaded files."
 msgstr ""
 
-#, php-format
-msgid "File “%s” not found."
-msgstr "File %s non trovato."
-
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
 msgstr ""

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-09-24 15:26:51 UTC (rev 9107)
+++ trunk/locale/po/ja.po	2014-09-24 15:39:05 UTC (rev 9108)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 17:25+0200\n"
+"POT-Creation-Date: 2014-09-24 17:31+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -456,7 +456,7 @@
 msgstr ""
 
 #, php-format
-msgid "%s: file not found"
+msgid "File “%s” not found."
 msgstr "%s: ファイルが見つかりません。"
 
 msgid "CategoryGroup"
@@ -1615,10 +1615,6 @@
 msgid "Display file information like version, size, date... of uploaded files."
 msgstr ""
 
-#, php-format
-msgid "File “%s” not found."
-msgstr "%s: ファイルが見つかりません。"
-
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
 msgstr ""

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-09-24 15:26:51 UTC (rev 9107)
+++ trunk/locale/po/nl.po	2014-09-24 15:39:05 UTC (rev 9108)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 17:25+0200\n"
+"POT-Creation-Date: 2014-09-24 17:31+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -461,7 +461,7 @@
 msgstr ""
 
 #, php-format
-msgid "%s: file not found"
+msgid "File “%s” not found."
 msgstr ""
 
 msgid "CategoryGroup"
@@ -1591,10 +1591,6 @@
 msgid "Display file information like version, size, date... of uploaded files."
 msgstr ""
 
-#, php-format
-msgid "File “%s” not found."
-msgstr ""
-
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
 msgstr ""

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-09-24 15:26:51 UTC (rev 9107)
+++ trunk/locale/po/phpwiki.pot	2014-09-24 15:39:05 UTC (rev 9108)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 17:25+0200\n"
+"POT-Creation-Date: 2014-09-24 17:31+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -455,7 +455,7 @@
 msgstr ""
 
 #, php-format
-msgid "%s: file not found"
+msgid "File “%s” not found."
 msgstr ""
 
 msgid "CategoryGroup"
@@ -1585,10 +1585,6 @@
 msgid "Display file information like version, size, date... of uploaded files."
 msgstr ""
 
-#, php-format
-msgid "File “%s” not found."
-msgstr ""
-
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
 msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-09-24 15:26:51 UTC (rev 9107)
+++ trunk/locale/po/sv.po	2014-09-24 15:39:05 UTC (rev 9108)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 17:25+0200\n"
+"POT-Creation-Date: 2014-09-24 17:31+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -456,8 +456,8 @@
 msgstr ""
 
 #, php-format
-msgid "%s: file not found"
-msgstr "%s: fila ingen funna"
+msgid "File “%s” not found."
+msgstr "Fila “%s” ingen funna."
 
 msgid "CategoryGroup"
 msgstr ""
@@ -1586,10 +1586,6 @@
 msgid "Display file information like version, size, date... of uploaded files."
 msgstr ""
 
-#, php-format
-msgid "File “%s” not found."
-msgstr "Fila “%s” ingen funna."
-
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
 msgstr ""

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-09-24 15:26:51 UTC (rev 9107)
+++ trunk/locale/po/zh.po	2014-09-24 15:39:05 UTC (rev 9108)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 17:25+0200\n"
+"POT-Creation-Date: 2014-09-24 17:31+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -478,9 +478,9 @@
 msgid "%s: error while handling error:"
 msgstr "%s: 處理錯誤時發生錯誤:"
 
-#, php-format
-msgid "%s: file not found"
-msgstr "%s: 找不到檔案"
+#, fuzzy, php-format
+msgid "File “%s” not found."
+msgstr "%s 找不到."
 
 msgid "CategoryGroup"
 msgstr ""
@@ -1657,10 +1657,6 @@
 msgid "Display file information like version, size, date... of uploaded files."
 msgstr ""
 
-#, fuzzy, php-format
-msgid "File “%s” not found."
-msgstr "%s 找不到."
-
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
 msgstr ""

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:[9107] trunk

From: <var...@us...> - 2014-09-24 15:27:00

Revision: 9107
          http://sourceforge.net/p/phpwiki/code/9107
Author:   vargenau
Date:     2014-09-24 15:26:51 +0000 (Wed, 24 Sep 2014)
Log Message:
-----------
Use smart quotes

Modified Paths:
--------------
    trunk/lib/EditToolbar.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/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2014-09-24 14:55:21 UTC (rev 9106)
+++ trunk/lib/EditToolbar.php	2014-09-24 15:26:51 UTC (rev 9107)
@@ -50,8 +50,8 @@
 uri_undo_d_btn = '" . $undo_d_btn . "'
 msg_undo_d_alt = '" . _("Undo disabled") . "'
 msg_do_undo    = '" . _("Operation undone") . "'
-msg_replfound  = '" . _("Substring \"\\1\" found \\2 times. Replace with \"\\3\"?") . "'
-msg_replnot    = '" . _("String \"%s\" not found.") . "'
+msg_replfound  = '" . _("Substring “\\1” found \\2 times. Replace with “\\3”?") . "'
+msg_replnot    = '" . _("String “%s” not found.") . "'
 msg_repl_title     = '" . _("Search & Replace") . "'
 msg_repl_search    = '" . _("Search for") . "'
 msg_repl_replace_with = '" . _("Replace with") . "'

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-09-24 14:55:21 UTC (rev 9106)
+++ trunk/locale/po/de.po	2014-09-24 15:26:51 UTC (rev 9107)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 16:51+0200\n"
+"POT-Creation-Date: 2014-09-24 17:25+0200\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."
@@ -354,12 +354,12 @@
 msgid "Operation undone"
 msgstr "Aktion rückgängig gemacht"
 
-msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"
-msgstr "Substring \"\\1\" \\2 mal gefunden. Ersetze mit \"\\3\"?"
+msgid "Substring “\\1” found \\2 times. Replace with “\\3”?"
+msgstr "Substring »\\1« \\2 mal gefunden. Ersetze mit »\\3«?"
 
 #, php-format
-msgid "String \"%s\" not found."
-msgstr "Zeichenkette \"%s\" nicht gefunden."
+msgid "String “%s” not found."
+msgstr "Zeichenkette »%s« nicht gefunden."
 
 msgid "Search & Replace"
 msgstr "Suchen & Ersetzen"

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-09-24 14:55:21 UTC (rev 9106)
+++ trunk/locale/po/es.po	2014-09-24 15:26:51 UTC (rev 9107)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 16:51+0200\n"
+"POT-Creation-Date: 2014-09-24 17:25+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -349,12 +349,12 @@
 msgid "Operation undone"
 msgstr "Operación deshecha"
 
-msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"
+msgid "Substring “\\1” found \\2 times. Replace with “\\3”?"
 msgstr ""
 
 #, php-format
-msgid "String \"%s\" not found."
-msgstr "Secuencia \"%s\" no encontrado."
+msgid "String “%s” not found."
+msgstr "Secuencia «%s» no encontrado."
 
 msgid "Search & Replace"
 msgstr "Busque Y Substituya"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-09-24 14:55:21 UTC (rev 9106)
+++ trunk/locale/po/fr.po	2014-09-24 15:26:51 UTC (rev 9107)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 16:51+0200\n"
+"POT-Creation-Date: 2014-09-24 17:25+0200\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."
@@ -348,14 +348,14 @@
 msgid "Operation undone"
 msgstr "Opération annulée"
 
-msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"
+msgid "Substring “\\1” found \\2 times. Replace with “\\3”?"
 msgstr ""
-"La sous-chaîne \"\\1\" a été trouvée \\2 fois. Faut-il la remplacer par "
-"\"\\3\" ?"
+"La sous-chaîne « \\1 » a été trouvée \\2 fois. Faut-il la remplacer par « "
+"\\3 » ?"
 
 #, php-format
-msgid "String \"%s\" not found."
-msgstr "Chaîne \"%s\" non trouvée."
+msgid "String “%s” not found."
+msgstr "Chaîne « %s » non trouvée."
 
 msgid "Search & Replace"
 msgstr "Rechercher & Remplacer"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-09-24 14:55:21 UTC (rev 9106)
+++ trunk/locale/po/it.po	2014-09-24 15:26:51 UTC (rev 9107)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 16:51+0200\n"
+"POT-Creation-Date: 2014-09-24 17:25+0200\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"
@@ -339,12 +339,12 @@
 msgid "Operation undone"
 msgstr ""
 
-msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"
+msgid "Substring “\\1” found \\2 times. Replace with “\\3”?"
 msgstr ""
 
 #, php-format
-msgid "String \"%s\" not found."
-msgstr "\"%s\" non trovato."
+msgid "String “%s” not found."
+msgstr "«%s» non trovato."
 
 msgid "Search & Replace"
 msgstr ""

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-09-24 14:55:21 UTC (rev 9106)
+++ trunk/locale/po/ja.po	2014-09-24 15:26:51 UTC (rev 9107)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 16:51+0200\n"
+"POT-Creation-Date: 2014-09-24 17:25+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -327,11 +327,11 @@
 msgid "Operation undone"
 msgstr ""
 
-msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"
+msgid "Substring “\\1” found \\2 times. Replace with “\\3”?"
 msgstr ""
 
 #, php-format
-msgid "String \"%s\" not found."
+msgid "String “%s” not found."
 msgstr ""
 
 msgid "Search & Replace"
@@ -1011,9 +1011,9 @@
 msgid " ... around “%s”"
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "“%s” not found"
-msgstr "%s: ファイルが見つかりません。"
+msgstr ""
 
 #, php-format
 msgid "page permission inherited from %s"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-09-24 14:55:21 UTC (rev 9106)
+++ trunk/locale/po/nl.po	2014-09-24 15:26:51 UTC (rev 9107)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 16:51+0200\n"
+"POT-Creation-Date: 2014-09-24 17:25+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -332,11 +332,11 @@
 msgid "Operation undone"
 msgstr ""
 
-msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"
+msgid "Substring “\\1” found \\2 times. Replace with “\\3”?"
 msgstr ""
 
 #, php-format
-msgid "String \"%s\" not found."
+msgid "String “%s” not found."
 msgstr ""
 
 msgid "Search & Replace"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-09-24 14:55:21 UTC (rev 9106)
+++ trunk/locale/po/phpwiki.pot	2014-09-24 15:26:51 UTC (rev 9107)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 16:51+0200\n"
+"POT-Creation-Date: 2014-09-24 17:25+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -326,11 +326,11 @@
 msgid "Operation undone"
 msgstr ""
 
-msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"
+msgid "Substring “\\1” found \\2 times. Replace with “\\3”?"
 msgstr ""
 
 #, php-format
-msgid "String \"%s\" not found."
+msgid "String “%s” not found."
 msgstr ""
 
 msgid "Search & Replace"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-09-24 14:55:21 UTC (rev 9106)
+++ trunk/locale/po/sv.po	2014-09-24 15:26:51 UTC (rev 9107)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 16:51+0200\n"
+"POT-Creation-Date: 2014-09-24 17:25+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -327,12 +327,12 @@
 msgid "Operation undone"
 msgstr ""
 
-msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"
+msgid "Substring “\\1” found \\2 times. Replace with “\\3”?"
 msgstr ""
 
 #, php-format
-msgid "String \"%s\" not found."
-msgstr "\"%s\" ingen funna."
+msgid "String “%s” not found."
+msgstr "”%s” ingen funna."
 
 msgid "Search & Replace"
 msgstr ""

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-09-24 14:55:21 UTC (rev 9106)
+++ trunk/locale/po/zh.po	2014-09-24 15:26:51 UTC (rev 9107)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-24 16:51+0200\n"
+"POT-Creation-Date: 2014-09-24 17:25+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -340,12 +340,12 @@
 msgid "Operation undone"
 msgstr ""
 
-msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"
+msgid "Substring “\\1” found \\2 times. Replace with “\\3”?"
 msgstr ""
 
-#, fuzzy, php-format
-msgid "String \"%s\" not found."
-msgstr "未找到頁面 %s."
+#, php-format
+msgid "String “%s” not found."
+msgstr ""
 
 msgid "Search & Replace"
 msgstr "搜尋與取代"

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:[9106] trunk/locale

From: <var...@us...> - 2014-09-24 14:55:32

Revision: 9106
          http://sourceforge.net/p/phpwiki/code/9106
Author:   vargenau
Date:     2014-09-24 14:55:21 +0000 (Wed, 24 Sep 2014)
Log Message:
-----------
Update French translation

Modified Paths:
--------------
    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/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-09-22 08:39:06 UTC (rev 9105)
+++ trunk/locale/po/de.po	2014-09-24 14:55:21 UTC (rev 9106)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 15:01+0200\n"
+"POT-Creation-Date: 2014-09-24 16:51+0200\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-09-22 08:39:06 UTC (rev 9105)
+++ trunk/locale/po/es.po	2014-09-24 14:55:21 UTC (rev 9106)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 15:01+0200\n"
+"POT-Creation-Date: 2014-09-24 16:51+0200\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-09-22 08:39:06 UTC (rev 9105)
+++ trunk/locale/po/fr.po	2014-09-24 14:55:21 UTC (rev 9106)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 15:01+0200\n"
+"POT-Creation-Date: 2014-09-24 16:51+0200\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."
@@ -20,11 +20,11 @@
 "From: Pierrick Meignen <mei...@wa...>\n"
 
 msgid "BAD semantic relation link"
-msgstr ""
+msgstr "MAUVAIS lien de relation sémantique"
 
 #, php-format
 msgid "Attribute %s, base value: %s"
-msgstr ""
+msgstr "Attribut %s, valeur de base : %s"
 
 #, php-format
 msgid "Attribute %s, value: %s"
@@ -39,9 +39,10 @@
 
 msgid "Typed in verification word mismatch ... are you a bot?"
 msgstr ""
+"Vous avez entré un mauvais mot de vérification ... êtes-vous un robot ?"
 
 msgid "Type word above:"
-msgstr ""
+msgstr "Tapez le mot ci-dessus :"
 
 #, php-format
 msgid "The DBA handler %s is unsupported!"
@@ -137,7 +138,7 @@
 
 #, php-format
 msgid "Unsupported argument: %s=%s"
-msgstr ""
+msgstr "Argument non supporté: %s=%s"
 
 #, php-format
 msgid "BackLinks for %s"
@@ -166,7 +167,7 @@
 "cette page."
 
 msgid "&version=-1 might help."
-msgstr ""
+msgstr "&version=-1 peut faire l'affaire."
 
 #, php-format
 msgid "Edit: %s"
@@ -202,17 +203,17 @@
 msgstr "Trop de liens externes."
 
 msgid "SpamAssassin reports: "
-msgstr ""
+msgstr "Rapports de SpamAssassin : "
 
 msgid "External links contain blocked domains:"
-msgstr ""
+msgstr "Les liens externes contiennent des domaines bloqués :"
 
 #, php-format
 msgid "%s is listed at %s with %s"
-msgstr ""
+msgstr "%s est listé à %s avec %s"
 
 msgid "Spam Prevention"
-msgstr ""
+msgstr "Prévention du spam"
 
 msgid "This page edit seems to contain spam and was therefore not saved."
 msgstr ""
@@ -349,6 +350,8 @@
 
 msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"
 msgstr ""
+"La sous-chaîne \"\\1\" a été trouvée \\2 fois. Faut-il la remplacer par "
+"\"\\3\" ?"
 
 #, php-format
 msgid "String \"%s\" not found."
@@ -528,7 +531,7 @@
 msgstr "Modifié par : %s"
 
 msgid "Loaded the following pages:"
-msgstr ""
+msgstr "Les pages suivantes ont été chargées :"
 
 msgid "LoadDump"
 msgstr "RécupérationDeLaPage"
@@ -701,7 +704,7 @@
 
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
-msgstr ""
+msgstr "Source vide ou inexistante. Impossible de charger : %s"
 
 #, php-format
 msgid "Bad file type: %s"
@@ -888,7 +891,7 @@
 msgstr "télécharger une sauvegarde HTML ZIP de ce wiki"
 
 msgid "use"
-msgstr ""
+msgstr "utiliser"
 
 msgid "Browsing pages"
 msgstr "Navigation en cours"
@@ -1098,7 +1101,7 @@
 msgstr "mineur"
 
 msgid "Illegal 'limit' argument: must be numeric"
-msgstr ""
+msgstr "Valeur illégale pour l'argument 'limit' : ce doit être un nombre"
 
 msgid "Rename"
 msgstr "Renommer"
@@ -1166,6 +1169,8 @@
 
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
+"ATTENTION : la page InterWikiMap n'est pas verrouillée, les liens ne sont "
+"pas utilisés."
 
 msgid "Discussion"
 msgstr "Discussion"
@@ -1303,18 +1308,18 @@
 msgstr "Apposez le texte à n'importe quelle page de ce wiki."
 
 msgid "Appending at the end."
-msgstr ""
+msgstr "Ajout à la fin."
 
 msgid "AppendText"
 msgstr "ApposezLeTexte"
 
 #, php-format
 msgid "Page could not be updated. %s doesn't exist!"
-msgstr ""
+msgstr "La page n'a pas pu être mise à jour. %s n'existe pas !"
 
 #, php-format
 msgid "AppendText to %s"
-msgstr ""
+msgstr "Ajouter du texte à %s"
 
 msgid "Page successfully updated."
 msgstr "Page mise à jour avec succès."
@@ -1324,10 +1329,10 @@
 msgstr "Aller à %s."
 
 msgid "Render ASCII Math as MathML."
-msgstr ""
+msgstr "Afficher des maths en ASCII sous forme de MathML."
 
 msgid "Render inline ASCII SVG."
-msgstr ""
+msgstr "Afficher de l'ASCII sous forme de SVG."
 
 msgid "Atom Aggregator Plugin."
 msgstr "Greffon Atom."
@@ -1426,7 +1431,7 @@
 msgstr "Nouvelle entrée"
 
 msgid "No Blog Entries"
-msgstr ""
+msgstr "Pas d'entrées dans le blog"
 
 msgid "A simple plugin for <div class=boxright> with wikimarkup."
 msgstr ""
@@ -1457,7 +1462,7 @@
 msgstr "Créer une page wiki de catégorie."
 
 msgid "Render SVG charts."
-msgstr ""
+msgstr "Afficher des diagrammes SVG."
 
 msgid "Embed hidden comments in WikiPages."
 msgstr "Cacher des commentaires dans une page wiki."
@@ -1469,20 +1474,20 @@
 msgstr "Créer une page wiki avec le nom demandé."
 
 msgid "Cannot create page with empty name!"
-msgstr ""
+msgstr "Impossible de créer une page avec un nom vide !"
 
 msgid "CreatePage failed"
-msgstr ""
+msgstr "La création de la page a échoué"
 
 #, php-format
 msgid "Do you really want to create the page “%s”?"
 msgstr "Voulez-vous réellement créer la page « %s » ?"
 
 msgid "The new page you want to create will be a subpage."
-msgstr ""
+msgstr "La nouvelle page qui vous voulez créer sera une sous-page."
 
 msgid "Subpages cannot be created unless the parent page exists."
-msgstr ""
+msgstr "Les sous-pages ne peuvent être créées quand la page mère n'existe pas."
 
 msgid ""
 "Subpages with ending space are not allowed as directory name on Windows."
@@ -1496,17 +1501,17 @@
 msgstr "Créée par CréerUnePage"
 
 msgid "Create a Table of Contents and automatically link to headers."
-msgstr ""
+msgstr "Créer une table des matières et lier les titres."
 
 msgid "Error: firstlevelstyle must be 'number', 'letter' or 'roman'"
-msgstr ""
+msgstr "Erreur : firstlevelstyle doit être 'number', 'letter' ou 'roman'"
 
 #, php-format
 msgid "Illegal access to page %s: no read access"
 msgstr "Accès en lecture interdit pour la page « %s »."
 
 msgid "Error: version must be a positive integer."
-msgstr ""
+msgstr "Erreur : la version doit être un entier positif."
 
 #, php-format
 msgid "%s: no such revision %d."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-09-22 08:39:06 UTC (rev 9105)
+++ trunk/locale/po/it.po	2014-09-24 14:55:21 UTC (rev 9106)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 15:01+0200\n"
+"POT-Creation-Date: 2014-09-24 16:51+0200\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-09-22 08:39:06 UTC (rev 9105)
+++ trunk/locale/po/ja.po	2014-09-24 14:55:21 UTC (rev 9106)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 15:01+0200\n"
+"POT-Creation-Date: 2014-09-24 16:51+0200\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-09-22 08:39:06 UTC (rev 9105)
+++ trunk/locale/po/nl.po	2014-09-24 14:55:21 UTC (rev 9106)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 15:01+0200\n"
+"POT-Creation-Date: 2014-09-24 16:51+0200\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-09-22 08:39:06 UTC (rev 9105)
+++ trunk/locale/po/phpwiki.pot	2014-09-24 14:55:21 UTC (rev 9106)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 15:01+0200\n"
+"POT-Creation-Date: 2014-09-24 16:51+0200\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-09-22 08:39:06 UTC (rev 9105)
+++ trunk/locale/po/sv.po	2014-09-24 14:55:21 UTC (rev 9106)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 15:01+0200\n"
+"POT-Creation-Date: 2014-09-24 16:51+0200\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-09-22 08:39:06 UTC (rev 9105)
+++ trunk/locale/po/zh.po	2014-09-24 14:55:21 UTC (rev 9106)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 15:01+0200\n"
+"POT-Creation-Date: 2014-09-24 16:51+0200\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:[9105] trunk/themes

From: <var...@us...> - 2014-09-22 08:39:10

Revision: 9105
          http://sourceforge.net/p/phpwiki/code/9105
Author:   vargenau
Date:     2014-09-22 08:39:06 +0000 (Mon, 22 Sep 2014)
Log Message:
-----------
Class "tablesorter" is not needed

Modified Paths:
--------------
    trunk/themes/Crao/templates/bottom.tmpl
    trunk/themes/blog/templates/bottom.tmpl

Modified: trunk/themes/Crao/templates/bottom.tmpl
===================================================================
--- trunk/themes/Crao/templates/bottom.tmpl	2014-09-19 17:20:07 UTC (rev 9104)
+++ trunk/themes/Crao/templates/bottom.tmpl	2014-09-22 08:39:06 UTC (rev 9105)
@@ -9,7 +9,6 @@
 <script>
 jQuery(document).ready(function()
     {
-        jQuery(".sortable").addClass("tablesorter");
         jQuery(".sortable").tablesorter();
     }
 );

Modified: trunk/themes/blog/templates/bottom.tmpl
===================================================================
--- trunk/themes/blog/templates/bottom.tmpl	2014-09-19 17:20:07 UTC (rev 9104)
+++ trunk/themes/blog/templates/bottom.tmpl	2014-09-22 08:39:06 UTC (rev 9105)
@@ -12,7 +12,6 @@
 <script>
 jQuery(document).ready(function()
     {
-        jQuery(".sortable").addClass("tablesorter");
         jQuery(".sortable").tablesorter();
     }
 );

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9104] trunk/themes/fusionforge

From: <var...@us...> - 2014-09-19 17:20:10

Revision: 9104
          http://sourceforge.net/p/phpwiki/code/9104
Author:   vargenau
Date:     2014-09-19 17:20:07 +0000 (Fri, 19 Sep 2014)
Log Message:
-----------
Remove reference to alcatel-lucent

Modified Paths:
--------------
    trunk/themes/fusionforge/fusionforge.css

Added Paths:
-----------
    trunk/themes/fusionforge/images/error.png
    trunk/themes/fusionforge/images/info.png
    trunk/themes/fusionforge/images/success.png
    trunk/themes/fusionforge/images/warning.png

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2014-09-19 17:17:33 UTC (rev 9103)
+++ trunk/themes/fusionforge/fusionforge.css	2014-09-19 17:20:07 UTC (rev 9104)
@@ -808,7 +808,7 @@
 div.success, div.feedback,
 p.success, p.feedback {
     color: #4F8A10;
-    background-image: url('/themes/base-alcatel-lucent/images/success.png');
+    background-image: url('images/success.png');
 }
 
 div.feedback p, div.feedback li,
@@ -819,7 +819,7 @@
 div.warning, div.warning_msg,
 p.warning, p.warning_msg {
     color: #9F6000;
-    background-image: url('/themes/base-alcatel-lucent/images/warning.png');
+    background-image: url('images/warning.png');
 }
 
 div.warning p, div.warning_msg p,
@@ -830,7 +830,7 @@
 div.error,
 p.error {
     color: #D8000C;
-    background-image: url('/themes/base-alcatel-lucent/images/error.png');
+    background-image: url('images/error.png');
 }
 
 div.error p,
@@ -841,7 +841,7 @@
 div.information,
 p.information {
     color: #00529B;
-    background-image: url('/themes/base-alcatel-lucent/images/info.png');
+    background-image: url('images/info.png');
 }
 
 .error, .warning, .debug, .hint {

Added: trunk/themes/fusionforge/images/error.png
===================================================================
(Binary files differ)

Index: trunk/themes/fusionforge/images/error.png
===================================================================
--- trunk/themes/fusionforge/images/error.png	2014-09-19 17:17:33 UTC (rev 9103)
+++ trunk/themes/fusionforge/images/error.png	2014-09-19 17:20:07 UTC (rev 9104)

Property changes on: trunk/themes/fusionforge/images/error.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/fusionforge/images/info.png
===================================================================
(Binary files differ)

Index: trunk/themes/fusionforge/images/info.png
===================================================================
--- trunk/themes/fusionforge/images/info.png	2014-09-19 17:17:33 UTC (rev 9103)
+++ trunk/themes/fusionforge/images/info.png	2014-09-19 17:20:07 UTC (rev 9104)

Property changes on: trunk/themes/fusionforge/images/info.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/fusionforge/images/success.png
===================================================================
(Binary files differ)

Index: trunk/themes/fusionforge/images/success.png
===================================================================
--- trunk/themes/fusionforge/images/success.png	2014-09-19 17:17:33 UTC (rev 9103)
+++ trunk/themes/fusionforge/images/success.png	2014-09-19 17:20:07 UTC (rev 9104)

Property changes on: trunk/themes/fusionforge/images/success.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/fusionforge/images/warning.png
===================================================================
(Binary files differ)

Index: trunk/themes/fusionforge/images/warning.png
===================================================================
--- trunk/themes/fusionforge/images/warning.png	2014-09-19 17:17:33 UTC (rev 9103)
+++ trunk/themes/fusionforge/images/warning.png	2014-09-19 17:20:07 UTC (rev 9104)

Property changes on: trunk/themes/fusionforge/images/warning.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9103] trunk/themes/fusionforge/fusionforge-print.css

From: <var...@us...> - 2014-09-19 17:17:40

Revision: 9103
          http://sourceforge.net/p/phpwiki/code/9103
Author:   vargenau
Date:     2014-09-19 17:17:33 +0000 (Fri, 19 Sep 2014)
Log Message:
-----------
Do not print "none" sorting icon

Modified Paths:
--------------
    trunk/themes/fusionforge/fusionforge-print.css

Modified: trunk/themes/fusionforge/fusionforge-print.css
===================================================================
--- trunk/themes/fusionforge/fusionforge-print.css	2014-09-19 16:57:47 UTC (rev 9102)
+++ trunk/themes/fusionforge/fusionforge-print.css	2014-09-19 17:17:33 UTC (rev 9103)
@@ -97,7 +97,7 @@
 }
 
 /* Do not print "none" sorting icon */
-img[src="/wiki/themes/fusionforge/buttons/no_order.png"] {
+img[src="/wiki/themes/fusionforge/buttons/sort_none.gif"] {
     display: none;
 }
 

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

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

From: <var...@us...> - 2014-09-19 16:57:56

Revision: 9102
          http://sourceforge.net/p/phpwiki/code/9102
Author:   vargenau
Date:     2014-09-19 16:57:47 +0000 (Fri, 19 Sep 2014)
Log Message:
-----------
Initial RPM for phpwiki (RHEL6 with mysql)

Modified Paths:
--------------
    trunk/Makefile
    trunk/config/config-dist.ini
    trunk/config/phpwiki.spec

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2014-09-19 16:54:44 UTC (rev 9101)
+++ trunk/Makefile	2014-09-19 16:57:47 UTC (rev 9102)
@@ -1,151 +1,16 @@
-# gnu make only
+VERSION=1.5.0
+RPMBUILD=rpmbuild
 
-# user-definable settings:
-# for mysqladmin
-DBADMIN_USER=root
-DBADMIN_PASS=secret
+clean:
+	rm -fr /tmp/phpwiki-$(VERSION) /tmp/phpwiki-$(VERSION).tar.gz
 
-# etags (GNU Emacs 21.4.x)
-ETAGS_21_5=$(shell etags --version|egrep "Ctags 5.[6789]")
-ifeq ("$(ETAGS_21_5)", "")
-  ETAGS_STDIN = /usr/bin/etags -
-else
-  # new etags (GNU Emacs 21.5.x)
-  ETAGS_STDIN = /usr/bin/etags -L -
-endif
+/tmp/phpwiki-$(VERSION).tar.gz:
+	rm -fr /tmp/phpwiki-$(VERSION)
+	cp -a . /tmp/phpwiki-$(VERSION)
+	cd /tmp; tar zcf /tmp/phpwiki-$(VERSION).tar.gz phpwiki-$(VERSION)
+	rm -fr /tmp/phpwiki-$(VERSION)
 
-VERSION=$(shell admin/dump-version.pl)
-
-ifeq ("$(VERSION)", "")
-  TARDIST = phpwiki.tar.bz2
-else
-  TARDIST = phpwiki-$(VERSION).tar.bz2
-endif
-DB_SQLITE_DBFILE = /tmp/phpwiki-sqlite.db
-
-# ****************************************************************************
-# get db params from config/config.ini
-
-#DATABASE_TYPE=SQL
-DATABASE_TYPE := $(shell config/make-dbhelper.pl -v=DATABASE_TYPE config/config.ini)
-PROCESS_DSN=0
-ifeq (${DATABASE_TYPE},SQL)
-  PROCESS_DSN=1
-else
-  ifeq (${DATABASE_TYPE},ADODB) 
-    PROCESS_DSN=1
-  endif
-endif
-
-ifeq (${PROCESS_DSN},1)
-  # get db params from config/config.ini DATABASE_DSN setting (only if SQL or ADODB)
-  DATABASE_DSN := $(shell config/make-dbhelper.pl -v=DATABASE_DSN config/config.ini)
-  #DB_DBTYPE=mysql
-  DB_DBTYPE := $(word 1,${DATABASE_DSN})
-  #DB_DB=phpwiki
-  DB_DB   := $(word 2,${DATABASE_DSN})
-  #DB_USER=wikiuser
-  DB_USER := $(word 3,${DATABASE_DSN})
-  #DB_PASS=
-  DB_PASS := $(word 4,${DATABASE_DSN})
-  #Todo: read optional DBADMIN_USER and DBADMIN_PASS settings from config.ini
-  DBADMIN_OPTS=-u$(DBADMIN_USER) -p$(DBADMIN_PASS)
-else
-  DB_DBTYPE=${DATABASE_TYPE}
-endif
-
-# ****************************************************************************
-PHP_SRC := $(wildcard *.php ./lib/*.php ./lib/WikiDB/*.php ./lib/plugin/*.php)
-
-.PHONY: all install locale mysql pqsql sqlite dbtest install-config dist
-
-all:  TAGS
-
-TAGS:  $(PHP_SRC)
-	if [ -f $@ ]; then /bin/mv -f $@ $@~; fi
-#	etags $(PHP_SRC)
-	/usr/bin/find . \( -type d -regex '\(^\./lib/pear\)\|\(^\./lib/WikiDB/adodb\)\|\(^\./lib/nusoap\)\|\(^\./lib/fpdf\)\|\(^\./locale/.*/LC_MESSAGES\)' \) -prune -o -type f -name \*.php | grep .php | $(ETAGS_STDIN)
-
-TAGS.full:  $(PHP_SRC)
-	if [ -f $@ ]; then /usr/bin/mv -f $@ $@~; fi
-	/usr/bin/find . -name \*.php -o -name \*.tmpl | $(ETAGS_STDIN) --langmap="HTML:.tmpl" -f $@
-# older etags needed this:
-#	/usr/bin/find . -type f -name \*.php -o -name \*.tmpl | etags - -o $@
-
-locale: 
-	cd locale
-	make
-
-install: install-config install-database
-
-install-config: config/config.ini
-
-config/config.ini: config/config-dist.ini
-	cp config/config-dist.ini $@
-	echo "You must edit config/config.ini, at least set the ADMIN_PASSWD"
-	${EDITOR} $@
-
-# helpers for database installation
-install-database: ${DB_DBTYPE}
-
-dba:
-
-cvs:
-
-# maybe setup permissions
-file:
-
-dbtest:
-	echo DATABASE_TYPE=${DATABASE_TYPE} DB_DBTYPE=${DB_DBTYPE} DB_DB=$(DB_DB) DB_USER=${DB_USER} DB_PASS=${DB_PASS} DBADMIN_OPTS=$(DBADMIN_OPTS)
-
-# initialize the database
-# TODO: compare /var/mysql/data/$(DB_DB) timestamp against schemas/mysql.sql
-mysql:
-	mysqladmin $(DB_OPTS) create $(DB_DB)
-	mysql $(DB_OPTS) -e "GRANT select,insert,update,delete,lock tables ON $(DB_DB).* \
-TO $(DB_USER)@localhost IDENTIFIED BY '$(DB_PASS)';"
-	mysql $(DB_OPTS) $(DB_DB) < schemas/mysql-initialize.sql
-
-# initialize the database
-pqsql:
-	su postmaster
-	createdb $(DB_DB)
-	ifeq ($(DB_PASS),"")
-	  createuser -D -A -P $(DB_USER)
-	else
-	  createuser -D -A $(DB_USER)
-	endif
-	psql $(DB_DB) -f schemas/psql-initialize.sql
-	logout
-
-# initialize the database
-sqlite:	$(DB_SQLITE_DBFILE)
-	sqlite $(DB_SQLITE_DBFILE) < schemas/sqlite-initialize.sql
-
-# update the database
-${DB_SQLITE_DBFILE}: schemas/sqlite.sql
-	echo ".dump" | sqlite ${DB_SQLITE_DBFILE} > dump.sql
-	mv ${DB_SQLITE_DBFILE} ${DB_SQLITE_DBFILE}.old
-	sqlite $(DB_SQLITE_DBFILE) < dump.sql
-
-dist: $(TARDIST)
-
-cvstar: ../$(TARDIST)
-
-# --exclude='\.*'
-../$(TARDIST) : $(PHP_SRC)
-	  tar cfj $(TARDIST) --exclude=CVS \
-		--exclude=config.ini \
-		--exclude='*~'     \
-		--exclude='*.bak'  \
-		--exclude='*.orig' \
-		--exclude='*.rej'  \
-		--exclude=uploads  \
-		--exclude=.patches \
-		--exclude=TAGS     \
-		--exclude=TAGS.full \
-		--exclude='*.tar.bz2' \
-		.
-
-$(TARDIST) : $(PHP_SRC)
-	svn list -R | egrep -v "/\$" | tar cfj $(TARDIST)
+rpm: /tmp/phpwiki-$(VERSION).tar.gz
+	mkdir -p ~/rpmbuild/SOURCES/
+	cp /tmp/phpwiki-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
+	$(RPMBUILD) -bb config/phpwiki.spec

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2014-09-19 16:54:44 UTC (rev 9101)
+++ trunk/config/config-dist.ini	2014-09-19 16:57:47 UTC (rev 9102)
@@ -237,7 +237,7 @@
 ; You might have to set it to false, if your PHP doesn't support crypt().
 ; To use plain text passwords, in particular for the ADMIN_PASSWD, set
 ; ENCRYPTED_PASSWD to false.
-ENCRYPTED_PASSWD = true
+ENCRYPTED_PASSWD = false
 
 ; Visitor Hostname Lookup
 ;
@@ -918,7 +918,7 @@
 ;
 ; If you set DEFAULT_LANGUAGE to the empty string, the users 
 ; preferred language as determined by the browser setting will be used.
-;DEFAULT_LANGUAGE = en
+DEFAULT_LANGUAGE = en
 
 ; WIKI_PGSRC -- specifies the source for the initial page contents of
 ; the Wiki. The setting of WIKI_PGSRC only has effect when the wiki is

Modified: trunk/config/phpwiki.spec
===================================================================
--- trunk/config/phpwiki.spec	2014-09-19 16:54:44 UTC (rev 9101)
+++ trunk/config/phpwiki.spec	2014-09-19 16:57:47 UTC (rev 9102)
@@ -1,28 +1,25 @@
+#
+# RPM spec file for FusionForge
+#
+# Initial work by Jesse Becker <jb...@no...>
+# Reworked for 1.5.x by Alain Peyrat <al...@fr...>
+#
+# Copyright (C) 2014 Alain Peyrat
+#
 
-Summary: PHP-based Wiki webapplication
-Name: phpwiki
-Version: 1.3.11
-Release: 1
+# Global Definitions
+%define WIKI_NAME       PhpWiki
+%define ADMIN_USER      admin
+%define ADMIN_PASSWD    myadmin
 
+%define DB_NAME         phpwiki
+%define DB_USER         phpwiki
+%define DB_PASSWD       phpwikipw
 
-#############################################
-# User options here
-#############################################
+%define httpduser       apache
+%define httpdgroup      apache
 
-#These are setup mostly for my local config. 
-#Edit to taste, add salt, and boil for 3 minutes.
-
-%define WIKI_NAME NU-Wiki
-%define ADMIN_USER	<PHPWiki admin account name here>
-%define ADMIN_PASSWD	<encrypted admin account PW here, see passencrypt.php>
-
-%define DB_NAME		<database name>
-%define DB_USER		<database user account>
-%define DB_PASSWD	<database account password>
-
-%define HTTPD_UID	apache
-
-%define ACCESS_LOG	/var/log/httpd/phpwiki_access.log
+%define ACCESS_LOG      %{_var}/log/%{name}/%{name}_access.log
 %define DATABASE_TYPE	SQL
 %define DATABASE_DSN	mysql://%{admin_user}:%{admin_passwd}
 %define DEBUG		0
@@ -37,29 +34,27 @@
 %define AUTH_SESS_LEVEL	""
 %define AUTH_GROUP_FILE	""
 
+# Disable debug binary detection & generation to speed up process.
+%global debug_package %{nil}
 
-
+# RPM spec preamble
+Summary: PHP-based Wiki webapplication
+Name: phpwiki
+Version: 1.5.0
+Release: 1
+BuildArch: noarch
+License: GPL
 Group: Applications/Internet
-License: GPL
+Source: http://easynews.dl.sourceforge.net/sourceforge/phpwiki/%{name}-%{version}.tar.gz
 URL: http://sourceforge.net/projects/phpwiki/
-
-Packager: Jesse Becker <jb...@no...>
-Vendor: Northwestern University
-
-Source: http://easynews.dl.sourceforge.net/sourceforge/phpwiki/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Packager: Alain Peyrat <al...@fr...>
 
-
 #Relocation!
 Prefix: /var/www
 
-Requires: php php-mysql
+Requires: httpd, php, php-pear, php-mysql
 
-# For some systems (like older RH)
-Requires:  apache
-#For newer systems
-#Requires: httpd, php-pear
-
 Autoreq: 0
 
 %define dest %{buildroot}/%{prefix}/%{name}
@@ -71,13 +66,16 @@
 authentication, ACL's.
 
 %prep
-%setup 
+%setup
 
 %install
 %{__rm} -rf %{buildroot}
+
+%{__install} -m 755 -d %{buildroot}%{_var}/log/phpwiki
+
 %{__mkdir} -p %{dest}
 %{__cp} -r config lib locale pgsrc themes schemas uploads %{dest}
-%{__cp} favicon.ico *.php *.wsdl *.wdsl wiki %{dest}
+%{__cp} favicon.ico *.php wiki %{dest}
 
 cd %{dest}/config
 perl -p	\
@@ -107,11 +105,6 @@
 %{__rm} -rf %{buildroot}
 
 %post
-touch %{ACCESS_LOG}
-if [ -f %{ACCESS_LOG} ]; then
-	chown %{HTTPD_UID} %{ACCESS_LOG}
-	chmod 644 %{ACCESS_LOG}
-fi
 
 cd %{prefix}/%{name}
 mysqladmin create %{DB_NAME}
@@ -123,30 +116,17 @@
 
 mysqladmin reload
 
-cat schemas/mysql.sql | mysql %{DB_NAME} 
+cat schemas/mysql-initialize.sql | mysql %{DB_NAME}
 
-
 %files
-%defattr(-, root, root, 0755)
-%doc README UPGRADING LICENSE INSTALL doc Makefile tests
+%defattr(-, root, root)
+%doc README UPGRADING LICENSE INSTALL doc Makefile
+%attr(0775, %{httpduser}, %{httpdgroup}) %dir %{_var}/log/%{name}
+%{prefix}/%{name}
 
-%{prefix}/%{name}/*.php
-%{prefix}/%{name}/*.wsdl
-%{prefix}/%{name}/wiki
+%changelog
+* Fri Sep 19 2014 - Alain Peyrat <al...@fr...> - 1.5.0-1
+- Reworked for 1.5.0
 
-%{prefix}/%{name}/lib
-%{prefix}/%{name}/locale
-%{prefix}/%{name}/pgsrc
-%{prefix}/%{name}/themes
-%{prefix}/%{name}/schemas
-%{prefix}/%{name}/config/config-default.ini
-%dir %{prefix}/%{name}/uploads
-
-%config %{prefix}/%{name}/uploads/.htaccess
-%config %{prefix}/%{name}/config/config.ini
-
-
-
-%changelog
 * Tue May 19 2005 Jesse Becker <jb...@no...>
 - Initial build

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

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

From: <var...@us...> - 2014-09-19 16:54:48

Revision: 9101
          http://sourceforge.net/p/phpwiki/code/9101
Author:   vargenau
Date:     2014-09-19 16:54:44 +0000 (Fri, 19 Sep 2014)
Log Message:
-----------
Harmonize sort buttons

Modified Paths:
--------------
    trunk/lib/PageList.php
    trunk/themes/Crao/crao.css
    trunk/themes/Hawaiian/Hawaiian.css
    trunk/themes/MacOSX/MacOSX.css
    trunk/themes/MonoBook/monobook.css
    trunk/themes/Portland/portland.css
    trunk/themes/Sidebar/sidebar.css
    trunk/themes/SpaceWiki/SpaceWiki.css
    trunk/themes/Wordpress/Wordpress.css
    trunk/themes/blog/Kubrick.css
    trunk/themes/default/phpwiki.css
    trunk/themes/fusionforge/fusionforge.css
    trunk/themes/shamino_com/shamino_com.css
    trunk/themes/wikilens/wikilens.css

Added Paths:
-----------
    trunk/themes/default/buttons/sort_down.gif
    trunk/themes/default/buttons/sort_none.gif
    trunk/themes/default/buttons/sort_up.gif

Removed Paths:
-------------
    trunk/themes/default/buttons/asc_order.png
    trunk/themes/default/buttons/desc_order.png
    trunk/themes/default/buttons/no_order.png
    trunk/themes/default/images/sort_down.gif
    trunk/themes/default/images/sort_none.gif
    trunk/themes/default/images/sort_up.gif
    trunk/themes/fusionforge/buttons/asc_order.png
    trunk/themes/fusionforge/buttons/desc_order.png
    trunk/themes/fusionforge/buttons/no_order.png

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2014-09-19 13:02:16 UTC (rev 9100)
+++ trunk/lib/PageList.php	2014-09-19 16:54:44 UTC (rev 9101)
@@ -108,7 +108,7 @@
         if (!$WikiTheme->DUMP_MODE /* or in_array($this->_field, PageList::sortable_columns()) */) {
             // TODO: add to multiple comma-delimited sortby args: "+hits,+pagename"
             $src = false;
-            $noimg_src = $WikiTheme->getButtonURL('no_order');
+            $noimg_src = $WikiTheme->getButtonURL('sort_none');
             if ($noimg_src)
                 $noimg = HTML::img(array('src' => $noimg_src,
                     'alt' => '.'));
@@ -117,7 +117,7 @@
             if ($pagelist->sortby($colNum, 'check')) { // show icon? request or plugin arg
                 $sortby = $pagelist->sortby($colNum, 'flip_order');
                 $desc = (substr($sortby, 0, 1) == '-'); // +pagename or -pagename
-                $src = $WikiTheme->getButtonURL($desc ? 'asc_order' : 'desc_order');
+                $src = $WikiTheme->getButtonURL($desc ? 'sort_up' : 'sort_down');
                 $reverse = $desc ? _("reverse") . " " : "";
             } else {
                 // initially unsorted

Modified: trunk/themes/Crao/crao.css
===================================================================
--- trunk/themes/Crao/crao.css	2014-09-19 13:02:16 UTC (rev 9100)
+++ trunk/themes/Crao/crao.css	2014-09-19 16:54:44 UTC (rev 9101)
@@ -1305,7 +1305,7 @@
 }
 
 table.sortable th.header {
-    background-image: url(../default/images/sort_none.gif);
+    background-image: url(../default/buttons/sort_none.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -1313,7 +1313,7 @@
 }
 
 table.sortable th.headerSortUp {
-    background-image: url(../default/images/sort_up.gif);
+    background-image: url(../default/buttons/sort_up.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -1321,7 +1321,7 @@
 }
 
 table.sortable th.headerSortDown {
-    background-image: url(../default/images/sort_down.gif);
+    background-image: url(../default/buttons/sort_down.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;

Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css	2014-09-19 13:02:16 UTC (rev 9100)
+++ trunk/themes/Hawaiian/Hawaiian.css	2014-09-19 16:54:44 UTC (rev 9101)
@@ -677,7 +677,7 @@
 }
 
 table.sortable th.header {
-    background-image: url(../default/images/sort_none.gif);
+    background-image: url(../default/buttons/sort_none.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -685,7 +685,7 @@
 }
 
 table.sortable th.headerSortUp {
-    background-image: url(../default/images/sort_up.gif);
+    background-image: url(../default/buttons/sort_up.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -693,7 +693,7 @@
 }
 
 table.sortable th.headerSortDown {
-    background-image: url(../default/images/sort_down.gif);
+    background-image: url(../default/buttons/sort_down.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;

Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css	2014-09-19 13:02:16 UTC (rev 9100)
+++ trunk/themes/MacOSX/MacOSX.css	2014-09-19 16:54:44 UTC (rev 9101)
@@ -1201,7 +1201,7 @@
 }
 
 table.sortable th.header {
-    background-image: url(../default/images/sort_none.gif);
+    background-image: url(../default/buttons/sort_none.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -1209,7 +1209,7 @@
 }
 
 table.sortable th.headerSortUp {
-    background-image: url(../default/images/sort_up.gif);
+    background-image: url(../default/buttons/sort_up.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -1217,7 +1217,7 @@
 }
 
 table.sortable th.headerSortDown {
-    background-image: url(../default/images/sort_down.gif);
+    background-image: url(../default/buttons/sort_down.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;

Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css	2014-09-19 13:02:16 UTC (rev 9100)
+++ trunk/themes/MonoBook/monobook.css	2014-09-19 16:54:44 UTC (rev 9101)
@@ -2252,7 +2252,7 @@
 }
 
 table.sortable th.header {
-    background-image: url(../default/images/sort_none.gif);
+    background-image: url(../default/buttons/sort_none.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -2260,7 +2260,7 @@
 }
 
 table.sortable th.headerSortUp {
-    background-image: url(../default/images/sort_up.gif);
+    background-image: url(../default/buttons/sort_up.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -2268,7 +2268,7 @@
 }
 
 table.sortable th.headerSortDown {
-    background-image: url(../default/images/sort_down.gif);
+    background-image: url(../default/buttons/sort_down.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;

Modified: trunk/themes/Portland/portland.css
===================================================================
--- trunk/themes/Portland/portland.css	2014-09-19 13:02:16 UTC (rev 9100)
+++ trunk/themes/Portland/portland.css	2014-09-19 16:54:44 UTC (rev 9101)
@@ -186,7 +186,7 @@
 }
 
 table.sortable th.header {
-    background-image: url(../default/images/sort_none.gif);
+    background-image: url(../default/buttons/sort_none.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -194,7 +194,7 @@
 }
 
 table.sortable th.headerSortUp {
-    background-image: url(../default/images/sort_up.gif);
+    background-image: url(../default/buttons/sort_up.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -202,7 +202,7 @@
 }
 
 table.sortable th.headerSortDown {
-    background-image: url(../default/images/sort_down.gif);
+    background-image: url(../default/buttons/sort_down.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2014-09-19 13:02:16 UTC (rev 9100)
+++ trunk/themes/Sidebar/sidebar.css	2014-09-19 16:54:44 UTC (rev 9101)
@@ -2306,7 +2306,7 @@
 }
 
 table.sortable th.header {
-    background-image: url(../default/images/sort_none.gif);
+    background-image: url(../default/buttons/sort_none.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -2314,7 +2314,7 @@
 }
 
 table.sortable th.headerSortUp {
-    background-image: url(../default/images/sort_up.gif);
+    background-image: url(../default/buttons/sort_up.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -2322,7 +2322,7 @@
 }
 
 table.sortable th.headerSortDown {
-    background-image: url(../default/images/sort_down.gif);
+    background-image: url(../default/buttons/sort_down.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;

Modified: trunk/themes/SpaceWiki/SpaceWiki.css
===================================================================
--- trunk/themes/SpaceWiki/SpaceWiki.css	2014-09-19 13:02:16 UTC (rev 9100)
+++ trunk/themes/SpaceWiki/SpaceWiki.css	2014-09-19 16:54:44 UTC (rev 9101)
@@ -1037,7 +1037,7 @@
 }
 
 table.sortable th.header {
-    background-image: url(../default/images/sort_none.gif);
+    background-image: url(../default/buttons/sort_none.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -1045,7 +1045,7 @@
 }
 
 table.sortable th.headerSortUp {
-    background-image: url(../default/images/sort_up.gif);
+    background-image: url(../default/buttons/sort_up.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -1053,7 +1053,7 @@
 }
 
 table.sortable th.headerSortDown {
-    background-image: url(../default/images/sort_down.gif);
+    background-image: url(../default/buttons/sort_down.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;

Modified: trunk/themes/Wordpress/Wordpress.css
===================================================================
--- trunk/themes/Wordpress/Wordpress.css	2014-09-19 13:02:16 UTC (rev 9100)
+++ trunk/themes/Wordpress/Wordpress.css	2014-09-19 16:54:44 UTC (rev 9101)
@@ -1118,7 +1118,7 @@
 }
 
 table.sortable th.header {
-    background-image: url(../default/images/sort_none.gif);
+    background-image: url(../default/buttons/sort_none.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -1126,7 +1126,7 @@
 }
 
 table.sortable th.headerSortUp {
-    background-image: url(../default/images/sort_up.gif);
+    background-image: url(../default/buttons/sort_up.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -1134,7 +1134,7 @@
 }
 
 table.sortable th.headerSortDown {
-    background-image: url(../default/images/sort_down.gif);
+    background-image: url(../default/buttons/sort_down.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;

Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css	2014-09-19 13:02:16 UTC (rev 9100)
+++ trunk/themes/blog/Kubrick.css	2014-09-19 16:54:44 UTC (rev 9101)
@@ -1024,7 +1024,7 @@
 }
 
 table.sortable th.header {
-    background-image: url(../default/images/sort_none.gif);
+    background-image: url(../default/buttons/sort_none.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -1032,7 +1032,7 @@
 }
 
 table.sortable th.headerSortUp {
-    background-image: url(../default/images/sort_up.gif);
+    background-image: url(../default/buttons/sort_up.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -1040,7 +1040,7 @@
 }
 
 table.sortable th.headerSortDown {
-    background-image: url(../default/images/sort_down.gif);
+    background-image: url(../default/buttons/sort_down.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;

Deleted: trunk/themes/default/buttons/asc_order.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/default/buttons/desc_order.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/default/buttons/no_order.png
===================================================================
(Binary files differ)

Copied: trunk/themes/default/buttons/sort_down.gif (from rev 9100, trunk/themes/default/images/sort_down.gif)
===================================================================
(Binary files differ)

Copied: trunk/themes/default/buttons/sort_none.gif (from rev 9100, trunk/themes/default/images/sort_none.gif)
===================================================================
(Binary files differ)

Copied: trunk/themes/default/buttons/sort_up.gif (from rev 9100, trunk/themes/default/images/sort_up.gif)
===================================================================
(Binary files differ)

Deleted: trunk/themes/default/images/sort_down.gif
===================================================================
(Binary files differ)

Deleted: trunk/themes/default/images/sort_none.gif
===================================================================
(Binary files differ)

Deleted: trunk/themes/default/images/sort_up.gif
===================================================================
(Binary files differ)

Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css	2014-09-19 13:02:16 UTC (rev 9100)
+++ trunk/themes/default/phpwiki.css	2014-09-19 16:54:44 UTC (rev 9101)
@@ -1291,7 +1291,7 @@
 }
 
 table.sortable th.header {
-    background-image: url(../default/images/sort_none.gif);
+    background-image: url(../default/buttons/sort_none.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -1299,7 +1299,7 @@
 }
 
 table.sortable th.headerSortUp {
-    background-image: url(../default/images/sort_up.gif);
+    background-image: url(../default/buttons/sort_up.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -1307,7 +1307,7 @@
 }
 
 table.sortable th.headerSortDown {
-    background-image: url(../default/images/sort_down.gif);
+    background-image: url(../default/buttons/sort_down.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;

Deleted: trunk/themes/fusionforge/buttons/asc_order.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/fusionforge/buttons/desc_order.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/fusionforge/buttons/no_order.png
===================================================================
(Binary files differ)

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2014-09-19 13:02:16 UTC (rev 9100)
+++ trunk/themes/fusionforge/fusionforge.css	2014-09-19 16:54:44 UTC (rev 9101)
@@ -154,7 +154,7 @@
 }
 
 table.sortable th.header {
-    background-image: url(../default/images/sort_none.gif);
+    background-image: url(../default/buttons/sort_none.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -162,7 +162,7 @@
 }
 
 table.sortable th.headerSortUp {
-    background-image: url(../default/images/sort_up.gif);
+    background-image: url(../default/buttons/sort_up.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -170,7 +170,7 @@
 }
 
 table.sortable th.headerSortDown {
-    background-image: url(../default/images/sort_down.gif);
+    background-image: url(../default/buttons/sort_down.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;

Modified: trunk/themes/shamino_com/shamino_com.css
===================================================================
--- trunk/themes/shamino_com/shamino_com.css	2014-09-19 13:02:16 UTC (rev 9100)
+++ trunk/themes/shamino_com/shamino_com.css	2014-09-19 16:54:44 UTC (rev 9101)
@@ -395,7 +395,7 @@
 }
 
 table.sortable th.header {
-    background-image: url(../default/images/sort_none.gif);
+    background-image: url(../default/buttons/sort_none.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -403,7 +403,7 @@
 }
 
 table.sortable th.headerSortUp {
-    background-image: url(../default/images/sort_up.gif);
+    background-image: url(../default/buttons/sort_up.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -411,7 +411,7 @@
 }
 
 table.sortable th.headerSortDown {
-    background-image: url(../default/images/sort_down.gif);
+    background-image: url(../default/buttons/sort_down.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;

Modified: trunk/themes/wikilens/wikilens.css
===================================================================
--- trunk/themes/wikilens/wikilens.css	2014-09-19 13:02:16 UTC (rev 9100)
+++ trunk/themes/wikilens/wikilens.css	2014-09-19 16:54:44 UTC (rev 9101)
@@ -43,7 +43,7 @@
 }
 
 table.sortable th.header {
-    background-image: url(../default/images/sort_none.gif);
+    background-image: url(../default/buttons/sort_none.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -51,7 +51,7 @@
 }
 
 table.sortable th.headerSortUp {
-    background-image: url(../default/images/sort_up.gif);
+    background-image: url(../default/buttons/sort_up.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;
@@ -59,7 +59,7 @@
 }
 
 table.sortable th.headerSortDown {
-    background-image: url(../default/images/sort_down.gif);
+    background-image: url(../default/buttons/sort_down.gif);
     cursor: pointer;
     background-repeat: no-repeat;
     background-position: center right;

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

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

From: <var...@us...> - 2014-09-19 13:02:25

Revision: 9100
          http://sourceforge.net/p/phpwiki/code/9100
Author:   vargenau
Date:     2014-09-19 13:02:16 +0000 (Fri, 19 Sep 2014)
Log Message:
-----------
"<no matches>" --> "No matches"

Modified Paths:
--------------
    trunk/lib/PageList.php
    trunk/lib/plugin/FullTextSearch.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/PageList.php
===================================================================
--- trunk/lib/PageList.php	2014-09-19 12:57:02 UTC (rev 9099)
+++ trunk/lib/PageList.php	2014-09-19 13:02:16 UTC (rev 9100)
@@ -696,7 +696,7 @@
                     $this->_options['limit']);
             $this->_excluded_pages = $exclude;
         }
-        $this->_messageIfEmpty = _("<no matches>");
+        $this->_messageIfEmpty = _("No matches");
     }
 
     // Currently PageList takes these arguments:

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2014-09-19 12:57:02 UTC (rev 9099)
+++ trunk/lib/plugin/FullTextSearch.php	2014-09-19 13:02:16 UTC (rev 9100)
@@ -112,7 +112,7 @@
         if ($limit and $count >= $limit) //todo: pager link to list of next matches
             $list->pushContent(HTML::dd(fmt("only %d pages displayed", $limit)));
         if (!$list->getContent())
-            $list->pushContent(HTML::dd(_("<no matches>")));
+            $list->pushContent(HTML::dd(_("No matches")));
 
         if (!empty($pages->stoplisted))
             $list = HTML(HTML::p(fmt(_("Ignored stoplist words “%s”"),

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-09-19 12:57:02 UTC (rev 9099)
+++ trunk/locale/po/de.po	2014-09-19 13:02:16 UTC (rev 9100)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-18 16:30+0200\n"
+"POT-Creation-Date: 2014-09-19 15:01+0200\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."
@@ -1062,8 +1062,8 @@
 msgid "default page permission"
 msgstr "Vorgabe Zugriffsrecht"
 
-msgid "<no matches>"
-msgstr "<nichts gefunden>"
+msgid "No matches"
+msgstr "Nichts gefunden"
 
 msgid "Content"
 msgstr "Inhalt"

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-09-19 12:57:02 UTC (rev 9099)
+++ trunk/locale/po/es.po	2014-09-19 13:02:16 UTC (rev 9100)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-18 16:30+0200\n"
+"POT-Creation-Date: 2014-09-19 15:01+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -1043,8 +1043,8 @@
 msgid "default page permission"
 msgstr ""
 
-msgid "<no matches>"
-msgstr "<ningunos fósforos>"
+msgid "No matches"
+msgstr "Ningunos fósforos"
 
 msgid "Content"
 msgstr "Contenido"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-09-19 12:57:02 UTC (rev 9099)
+++ trunk/locale/po/fr.po	2014-09-19 13:02:16 UTC (rev 9100)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-18 16:30+0200\n"
+"POT-Creation-Date: 2014-09-19 15:01+0200\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."
@@ -1040,8 +1040,8 @@
 msgid "default page permission"
 msgstr "permission de page par défaut"
 
-msgid "<no matches>"
-msgstr "<aucun résultat>"
+msgid "No matches"
+msgstr "Aucun résultat"
 
 msgid "Content"
 msgstr "Contenu"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-09-19 12:57:02 UTC (rev 9099)
+++ trunk/locale/po/it.po	2014-09-19 13:02:16 UTC (rev 9100)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-18 16:30+0200\n"
+"POT-Creation-Date: 2014-09-19 15:01+0200\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"
@@ -1027,8 +1027,8 @@
 msgid "default page permission"
 msgstr ""
 
-msgid "<no matches>"
-msgstr "<nessuna corrispondenza>"
+msgid "No matches"
+msgstr "Nessuna corrispondenza"
 
 msgid "Content"
 msgstr "Indice"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-09-19 12:57:02 UTC (rev 9099)
+++ trunk/locale/po/ja.po	2014-09-19 13:02:16 UTC (rev 9100)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-18 16:30+0200\n"
+"POT-Creation-Date: 2014-09-19 15:01+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1025,8 +1025,8 @@
 msgid "default page permission"
 msgstr ""
 
-msgid "<no matches>"
-msgstr "<一致しません>"
+msgid "No matches"
+msgstr "一致しません"
 
 msgid "Content"
 msgstr "コンテンツ"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-09-19 12:57:02 UTC (rev 9099)
+++ trunk/locale/po/nl.po	2014-09-19 13:02:16 UTC (rev 9100)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-18 16:30+0200\n"
+"POT-Creation-Date: 2014-09-19 15:01+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -1018,7 +1018,7 @@
 msgid "default page permission"
 msgstr ""
 
-msgid "<no matches>"
+msgid "No matches"
 msgstr ""
 
 msgid "Content"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-09-19 12:57:02 UTC (rev 9099)
+++ trunk/locale/po/phpwiki.pot	2014-09-19 13:02:16 UTC (rev 9100)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-18 16:30+0200\n"
+"POT-Creation-Date: 2014-09-19 15:01+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1012,7 +1012,7 @@
 msgid "default page permission"
 msgstr ""
 
-msgid "<no matches>"
+msgid "No matches"
 msgstr ""
 
 msgid "Content"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-09-19 12:57:02 UTC (rev 9099)
+++ trunk/locale/po/sv.po	2014-09-19 13:02:16 UTC (rev 9100)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-18 16:30+0200\n"
+"POT-Creation-Date: 2014-09-19 15:01+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -1013,8 +1013,8 @@
 msgid "default page permission"
 msgstr ""
 
-msgid "<no matches>"
-msgstr "<ingen matchar>"
+msgid "No matches"
+msgstr "Ingen matchar"
 
 msgid "Content"
 msgstr "Innehåll"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-09-19 12:57:02 UTC (rev 9099)
+++ trunk/locale/po/zh.po	2014-09-19 13:02:16 UTC (rev 9100)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-18 16:30+0200\n"
+"POT-Creation-Date: 2014-09-19 15:01+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -1057,8 +1057,8 @@
 msgid "default page permission"
 msgstr "預設頁面權限"
 
-msgid "<no matches>"
-msgstr "<沒有相符>"
+msgid "No matches"
+msgstr "沒有相符"
 
 msgid "Content"
 msgstr "內容"

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:[9099] trunk/lib/PageList.php

From: <var...@us...> - 2014-09-19 12:57:06

Revision: 9099
          http://sourceforge.net/p/phpwiki/code/9099
Author:   vargenau
Date:     2014-09-19 12:57:02 +0000 (Fri, 19 Sep 2014)
Log Message:
-----------
Add return value

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2014-09-19 12:44:06 UTC (rev 9098)
+++ trunk/lib/PageList.php	2014-09-19 12:57:02 UTC (rev 9099)
@@ -850,18 +850,18 @@
         //FIXME. only on sf.net
         if (!is_object($page_handle)) {
             trigger_error("PageList: Invalid page_handle $page_handle", E_USER_WARNING);
-            return;
+            return false;
         }
         if (!isset($page_handle)
             or empty($page_handle)
             or (!empty($this->_excluded_pages)
-                and in_array($page_handle->getName(), $this->_excluded_pages))
-        )
-            return; // exclude page.
-
+                and in_array($page_handle->getName(), $this->_excluded_pages))) {
+            return false; // exclude page.
+        }
         // enforce view permission
-        if (!mayAccessPage('view', $page_handle->getName()))
-            return;
+        if (!mayAccessPage('view', $page_handle->getName())) {
+            return false;
+        }
 
         $group = (int)($i / $this->_group_rows);
         $class = ($group % 2) ? 'oddrow' : 'evenrow';
@@ -1626,7 +1626,9 @@
     // FIXME: only unique list entries, esp. with nopage
     function _generateList($caption = '')
     {
-        if (empty($this->_pages)) return; // stop recursion
+        if (empty($this->_pages)) {
+            return false; // stop recursion
+        }
         if (!isset($this->_options['listtype']))
             $this->_options['listtype'] = '';
         foreach ($this->_pages as $pagenum => $page) {

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

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

From: <var...@us...> - 2014-09-19 12:44:09

Revision: 9098
          http://sourceforge.net/p/phpwiki/code/9098
Author:   vargenau
Date:     2014-09-19 12:44:06 +0000 (Fri, 19 Sep 2014)
Log Message:
-----------
htmlspecialchars_decode exists for PHP >= 5.1

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

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2014-09-19 12:42:04 UTC (rev 9097)
+++ trunk/lib/config.php	2014-09-19 12:44:06 UTC (rev 9098)
@@ -315,16 +315,6 @@
     return preg_match("%^${requri}[^/]*$%", $GLOBALS['HTTP_SERVER_VARS']['SCRIPT_NAME']);
 }
 
-// htmlspecialchars_decode exists for PHP >= 5.1
-if (!function_exists('htmlspecialchars_decode')) {
-
-    function htmlspecialchars_decode($text)
-    {
-        return strtr($text, array_flip(get_html_translation_table(HTML_SPECIALCHARS)));
-    }
-
-}
-
 /**
  * safe php4 definition for clone.
  * php5 copies objects by reference, but we need to clone "deep copy" in some places.

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

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

From: <var...@us...> - 2014-09-19 12:42:08

Revision: 9097
          http://sourceforge.net/p/phpwiki/code/9097
Author:   vargenau
Date:     2014-09-19 12:42:04 +0000 (Fri, 19 Sep 2014)
Log Message:
-----------
str_ireplace exists in PHP 5

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

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2014-09-19 10:09:57 UTC (rev 9096)
+++ trunk/lib/config.php	2014-09-19 12:42:04 UTC (rev 9097)
@@ -315,38 +315,6 @@
     return preg_match("%^${requri}[^/]*$%", $GLOBALS['HTTP_SERVER_VARS']['SCRIPT_NAME']);
 }
 
-// needed < php5
-// by bradhuizenga at softhome dot net from the php docs
-if (!function_exists('str_ireplace')) {
-    function str_ireplace($find, $replace, $string)
-    {
-        if (!is_array($find)) $find = array($find);
-        if (!is_array($replace)) {
-            if (!is_array($find))
-                $replace = array($replace);
-            else {
-                // this will duplicate the string into an array the size of $find
-                $c = count($find);
-                $rString = $replace;
-                unset($replace);
-                for ($i = 0; $i < $c; $i++) {
-                    $replace[$i] = $rString;
-                }
-            }
-        }
-        foreach ($find as $fKey => $fItem) {
-            $between = explode(strtolower($fItem), strtolower($string));
-            $pos = 0;
-            foreach ($between as $bKey => $bItem) {
-                $between[$bKey] = substr($string, $pos, strlen($bItem));
-                $pos += strlen($bItem) + strlen($fItem);
-            }
-            $string = implode($replace[$fKey], $between);
-        }
-        return ($string);
-    }
-}
-
 // htmlspecialchars_decode exists for PHP >= 5.1
 if (!function_exists('htmlspecialchars_decode')) {
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9096] trunk/lib/plugin/WikicreoleTable.php

From: <var...@us...> - 2014-09-19 10:10:04

Revision: 9096
          http://sourceforge.net/p/phpwiki/code/9096
Author:   vargenau
Date:     2014-09-19 10:09:57 +0000 (Fri, 19 Sep 2014)
Log Message:
-----------
Use two loops to avoid warning

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

Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php	2014-09-18 14:32:14 UTC (rev 9095)
+++ trunk/lib/plugin/WikicreoleTable.php	2014-09-19 10:09:57 UTC (rev 9096)
@@ -104,7 +104,13 @@
             for ($j = 0; $j < $nb_cols; $j++) {
                 if (!isset($table[$i][$j])) {
                     $table[$i][$j] = '';
-                } elseif (preg_match('/@@/', $table[$i][$j])) {
+                }
+            }
+        }
+
+        for ($i = 0; $i < $nb_rows; $i++) {
+            for ($j = 0; $j < $nb_cols; $j++) {
+                if (preg_match('/@@/', $table[$i][$j])) {
                     $table[$i][$j] = $this->compute_table_cell($table, $i, $j, $nb_rows, $nb_cols);
                 }
             }

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

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

From: <var...@us...> - 2014-09-18 14:32:23

Revision: 9095
          http://sourceforge.net/p/phpwiki/code/9095
Author:   vargenau
Date:     2014-09-18 14:32:14 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
correct total number of pages for AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastEditedByMe; remove brackets in message

Modified Paths:
--------------
    trunk/lib/plugin/AllPages.php
    trunk/lib/plugin/LinkDatabase.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/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php	2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/lib/plugin/AllPages.php	2014-09-18 14:32:14 UTC (rev 9095)
@@ -62,70 +62,55 @@
         $caption = _("All pages in this wiki (%d total):");
 
         if (!empty($args['userpages'])) {
-            $pages = PageList::allUserPages($args['include_empty'],
-                $args['sortby'], ''
-            );
+            $pages = PageList::allUserPages($args['include_empty'], $args['sortby'], '');
             $caption = _("List of user-created pages (%d total):");
-            $args['count'] = $request->getArg('count');
+            $args['count'] = count($pages);
         } elseif (!empty($args['owner'])) {
-            $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'],
-                $args['sortby'], ''
-            );
-            $args['count'] = $request->getArg('count');
-            if (!$args['count'])
-                $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']);
-            $caption = fmt("List of pages owned by [%s] (%d total):",
+            $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'], $args['sortby'], '');
+            $args['count'] = count($pages);
+            $caption = fmt("List of pages owned by %s (%d total):",
                 WikiLink($args['owner'] == '[]'
                         ? $request->_user->getAuthenticatedId()
                         : $args['owner'],
                     'if_known'), $args['count']);
         } elseif (!empty($args['author'])) {
-            $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'],
-                $args['sortby'], ''
-            );
-            $args['count'] = $request->getArg('count');
-            if (!$args['count'])
-                $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']);
-            $caption = fmt("List of pages last edited by [%s] (%d total):",
+            $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'], $args['sortby'], '');
+            $args['count'] = count($pages);
+            $caption = fmt("List of pages last edited by %s (%d total):",
                 WikiLink($args['author'] == '[]'
                         ? $request->_user->getAuthenticatedId()
                         : $args['author'],
                     'if_known'), $args['count']);
         } elseif (!empty($args['creator'])) {
-            $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'],
-                $args['sortby'], ''
-            );
-            $args['count'] = $request->getArg('count');
-            if (!$args['count'])
-                $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']);
-            $caption = fmt("List of pages created by [%s] (%d total):",
+            $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'], $args['sortby'], '');
+            $args['count'] = count($pages);
+            $caption = fmt("List of pages created by %s (%d total):",
                 WikiLink($args['creator'] == '[]'
                         ? $request->_user->getAuthenticatedId()
                         : $args['creator'],
                     'if_known'), $args['count']);
-            //} elseif ($pages) {
-            //    $args['count'] = count($pages);
+        } elseif ($pages) {
+            $args['count'] = count($pages);
         } else {
             if (!$request->getArg('count'))
                 $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']);
             else
                 $args['count'] = $request->getArg('count');
         }
-        if (empty($args['count']) and !empty($pages))
+        if (empty($args['count']) and !empty($pages)) {
             $args['count'] = count($pages);
+        }
         $pagelist = new PageList($args['info'], $args['exclude'], $args);
-        if (!$args['noheader']) $pagelist->setCaption($caption);
+        if (!$args['noheader']) {
+            $pagelist->setCaption($caption);
+        }
 
-        // deleted pages show up as version 0.
-        //if ($args['include_empty'])
-        //    $pagelist->_addColumn('version');
-
         if ($pages !== false)
             $pagelist->addPageList($pages);
         else
             $pagelist->addPages($dbi->getAllPages($args['include_empty'], $args['sortby'],
                 $args['limit']));
-		return $pagelist;
+        return $pagelist;
     }
 }
 

Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php	2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/lib/plugin/LinkDatabase.php	2014-09-18 14:32:14 UTC (rev 9095)
@@ -83,21 +83,21 @@
             $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'],
                 $args['sortby'], $args['limit']);
             if ($args['owner'])
-                $caption = fmt("List of pages owned by [%s] (%d total):",
+                $caption = fmt("List of pages owned by %s (%d total):",
                     WikiLink($args['owner'], 'if_known'),
                     count($pages));
         } elseif (!empty($args['author'])) {
             $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'],
                 $args['sortby'], $args['limit']);
             if ($args['author'])
-                $caption = fmt("List of pages last edited by [%s] (%d total):",
+                $caption = fmt("List of pages last edited by %s (%d total):",
                     WikiLink($args['author'], 'if_known'),
                     count($pages));
         } elseif (!empty($args['creator'])) {
             $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'],
                 $args['sortby'], $args['limit']);
             if ($args['creator'])
-                $caption = fmt("List of pages created by [%s] (%d total):",
+                $caption = fmt("List of pages created by %s (%d total):",
                     WikiLink($args['creator'], 'if_known'),
                     count($pages));
         } else {

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-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/de.po	2014-09-18 14:32:14 UTC (rev 9095)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\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."
@@ -1231,21 +1231,17 @@
 msgstr "Liste der Benutzer erzeugten Seiten (%d insgesamt):"
 
 #, php-format
-msgid "List of pages owned by [%s] (%d total):"
-msgstr "Liste der Seiten owned by [%s] (%d insgesamt):"
+msgid "List of pages owned by %s (%d total):"
+msgstr "Liste der Seiten owned by %s (%d insgesamt):"
 
 #, php-format
-msgid "List of pages last edited by [%s] (%d total):"
-msgstr "Liste der Seiten last edited by [%s] (%d insgesamt):"
+msgid "List of pages last edited by %s (%d total):"
+msgstr "Liste der Seiten last edited by %s (%d insgesamt):"
 
 #, php-format
-msgid "List of pages created by [%s] (%d total):"
-msgstr "Liste der Seiten erzeugt von [%s] (%d insgesamt):"
+msgid "List of pages created by %s (%d total):"
+msgstr "Liste der Seiten erzeugt von %s (%d insgesamt):"
 
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr "Dauer: %s s"
-
 msgid "List all once authenticated users."
 msgstr "Liste alle eingetragenen Benutzer."
 
@@ -6050,6 +6046,9 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+#~ msgid "Elapsed time: %s s"
+#~ msgstr "Dauer: %s s"
+
 #~ msgid "The current page has no subpages defined."
 #~ msgstr "Diese Seite hat keine zugewiesenen Unterseiten."
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/es.po	2014-09-18 14:32:14 UTC (rev 9095)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -1213,21 +1213,17 @@
 msgstr ""
 
 #, php-format
-msgid "List of pages owned by [%s] (%d total):"
+msgid "List of pages owned by %s (%d total):"
 msgstr ""
 
 #, php-format
-msgid "List of pages last edited by [%s] (%d total):"
+msgid "List of pages last edited by %s (%d total):"
 msgstr ""
 
 #, php-format
-msgid "List of pages created by [%s] (%d total):"
+msgid "List of pages created by %s (%d total):"
 msgstr ""
 
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr ""
-
 msgid "List all once authenticated users."
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/fr.po	2014-09-18 14:32:14 UTC (rev 9095)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\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."
@@ -1208,21 +1208,17 @@
 msgstr "Liste des pages créées par les utilisateurs (%d au total) :"
 
 #, php-format
-msgid "List of pages owned by [%s] (%d total):"
-msgstr "Liste des pages possédées par [%s] (%d au total) :"
+msgid "List of pages owned by %s (%d total):"
+msgstr "Liste des pages possédées par %s (%d au total) :"
 
 #, php-format
-msgid "List of pages last edited by [%s] (%d total):"
-msgstr "Liste des pages modifiées en dernier par [%s] (%d au total) :"
+msgid "List of pages last edited by %s (%d total):"
+msgstr "Liste des pages modifiées en dernier par %s (%d au total) :"
 
 #, php-format
-msgid "List of pages created by [%s] (%d total):"
-msgstr "Liste des pages créées par [%s] (%d au total) :"
+msgid "List of pages created by %s (%d total):"
+msgstr "Liste des pages créées par %s (%d au total) :"
 
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr "Temps écoulé : %s s"
-
 msgid "List all once authenticated users."
 msgstr "Énumérez tous les utilisateurs une fois authentifiés."
 
@@ -3273,7 +3269,7 @@
 
 #, php-format
 msgid "Wanted Pages for %s (%d total):"
-msgstr "Pages recherchées pour %s  dans ce wiki (%d au total) :"
+msgstr "Pages recherchées pour %s dans ce wiki (%d au total) :"
 
 #, php-format
 msgid "Wanted Pages in this wiki (%d total):"
@@ -5952,6 +5948,9 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "Elapsed time: %s s"
+#~ msgstr "Temps écoulé : %s s"
+
 #~ msgid "The current page has no subpages defined."
 #~ msgstr "La page actuelle n'a aucune sous-page définie."
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/it.po	2014-09-18 14:32:14 UTC (rev 9095)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\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"
@@ -1195,21 +1195,17 @@
 msgstr ""
 
 #, php-format
-msgid "List of pages owned by [%s] (%d total):"
+msgid "List of pages owned by %s (%d total):"
 msgstr ""
 
 #, php-format
-msgid "List of pages last edited by [%s] (%d total):"
+msgid "List of pages last edited by %s (%d total):"
 msgstr ""
 
 #, php-format
-msgid "List of pages created by [%s] (%d total):"
+msgid "List of pages created by %s (%d total):"
 msgstr ""
 
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr ""
-
 msgid "List all once authenticated users."
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/ja.po	2014-09-18 14:32:14 UTC (rev 9095)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1199,21 +1199,17 @@
 msgstr ""
 
 #, php-format
-msgid "List of pages owned by [%s] (%d total):"
+msgid "List of pages owned by %s (%d total):"
 msgstr ""
 
 #, php-format
-msgid "List of pages last edited by [%s] (%d total):"
+msgid "List of pages last edited by %s (%d total):"
 msgstr ""
 
 #, php-format
-msgid "List of pages created by [%s] (%d total):"
+msgid "List of pages created by %s (%d total):"
 msgstr ""
 
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr ""
-
 #, fuzzy
 msgid "List all once authenticated users."
 msgstr "%sでソートします。"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/nl.po	2014-09-18 14:32:14 UTC (rev 9095)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -1186,21 +1186,17 @@
 msgstr ""
 
 #, php-format
-msgid "List of pages owned by [%s] (%d total):"
+msgid "List of pages owned by %s (%d total):"
 msgstr ""
 
 #, php-format
-msgid "List of pages last edited by [%s] (%d total):"
+msgid "List of pages last edited by %s (%d total):"
 msgstr ""
 
 #, php-format
-msgid "List of pages created by [%s] (%d total):"
+msgid "List of pages created by %s (%d total):"
 msgstr ""
 
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr ""
-
 msgid "List all once authenticated users."
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/phpwiki.pot	2014-09-18 14:32:14 UTC (rev 9095)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1180,21 +1180,17 @@
 msgstr ""
 
 #, php-format
-msgid "List of pages owned by [%s] (%d total):"
+msgid "List of pages owned by %s (%d total):"
 msgstr ""
 
 #, php-format
-msgid "List of pages last edited by [%s] (%d total):"
+msgid "List of pages last edited by %s (%d total):"
 msgstr ""
 
 #, php-format
-msgid "List of pages created by [%s] (%d total):"
+msgid "List of pages created by %s (%d total):"
 msgstr ""
 
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr ""
-
 msgid "List all once authenticated users."
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/sv.po	2014-09-18 14:32:14 UTC (rev 9095)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -1181,21 +1181,17 @@
 msgstr ""
 
 #, php-format
-msgid "List of pages owned by [%s] (%d total):"
+msgid "List of pages owned by %s (%d total):"
 msgstr ""
 
 #, php-format
-msgid "List of pages last edited by [%s] (%d total):"
+msgid "List of pages last edited by %s (%d total):"
 msgstr ""
 
 #, php-format
-msgid "List of pages created by [%s] (%d total):"
+msgid "List of pages created by %s (%d total):"
 msgstr ""
 
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr ""
-
 msgid "List all once authenticated users."
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/zh.po	2014-09-18 14:32:14 UTC (rev 9095)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -1233,21 +1233,17 @@
 msgstr "%s 所需要的頁面 (共 %d):"
 
 #, fuzzy, php-format
-msgid "List of pages owned by [%s] (%d total):"
+msgid "List of pages owned by %s (%d total):"
 msgstr "%s 所需要的頁面 (共 %d):"
 
 #, php-format
-msgid "List of pages last edited by [%s] (%d total):"
+msgid "List of pages last edited by %s (%d total):"
 msgstr ""
 
 #, fuzzy, php-format
-msgid "List of pages created by [%s] (%d total):"
+msgid "List of pages created by %s (%d total):"
 msgstr "%s 所需要的頁面 (共 %d):"
 
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr "經過時間: %s s"
-
 msgid "List all once authenticated users."
 msgstr ""
 
@@ -6112,6 +6108,9 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
+#~ msgid "Elapsed time: %s s"
+#~ msgstr "經過時間: %s s"
+
 #~ msgid "The current page has no subpages defined."
 #~ msgstr "目前頁面沒有定義任何子頁面."
 

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:[9094] trunk

From: <var...@us...> - 2014-09-18 14:28:29

Revision: 9094
          http://sourceforge.net/p/phpwiki/code/9094
Author:   vargenau
Date:     2014-09-18 14:28:21 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
No tabs

Modified Paths:
--------------
    trunk/lib/WysiwygEdit/FCKeditor.php
    trunk/lib/plugin/WikicreoleTable.php
    trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss
    trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki
    trunk/locale/it/pgsrc/PaginaDiProva

Modified: trunk/lib/WysiwygEdit/FCKeditor.php
===================================================================
--- trunk/lib/WysiwygEdit/FCKeditor.php	2014-09-18 14:21:42 UTC (rev 9093)
+++ trunk/lib/WysiwygEdit/FCKeditor.php	2014-09-18 14:28:21 UTC (rev 9094)
@@ -26,9 +26,9 @@
         $this->_htmltextid = "edit-content"; // FCKEditor1;
         $this->_wikitextid = "editareawiki";
         $this->_jsdefault = "
-oFCKeditor.BasePath	= '$this->BasePath';
-oFCKeditor.Height	= 300;
-// oFCKeditor.ToolbarSet	= 'Basic' ;
+oFCKeditor.BasePath = '$this->BasePath';
+oFCKeditor.Height = 300;
+// oFCKeditor.ToolbarSet = 'Basic' ;
 oFCKeditor.Config.DefaultLanguage = '$LANG';
 oFCKeditor.Config.LinkBrowserURL  = oFCKeditor.BasePath + 'editor/filemanager/browser/default/browser.html?Connector=connectors/php/connector.php';
 oFCKeditor.Config.ImageBrowserURL = oFCKeditor.BasePath + 'editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/php/connector.php';
@@ -66,7 +66,7 @@
         $out = HTML(
             JavaScript("
 var oFCKeditor = new FCKeditor( '$htmltextid' ) ;
-oFCKeditor.Value	= '" . $textarea->_content[0]->asXML() . "';"
+oFCKeditor.Value = '" . $textarea->_content[0]->asXML() . "';"
                 . $this->_jsdefault . "
 oFCKeditor.Create();"),
             HTML::div(array("id" => $this->_wikitextid,

Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php	2014-09-18 14:21:42 UTC (rev 9093)
+++ trunk/lib/plugin/WikicreoleTable.php	2014-09-18 14:28:21 UTC (rev 9094)
@@ -158,11 +158,11 @@
     /**
      * Compute cell in spreadsheet table
      * @param array $table: two-dimensional table
-	 * @param int $i: first index of cell to compute
-	 * @param int $j: second index of cell to compute
-	 * @param int $imax: first table dimension
-	 * @param int $jmax: second table dimension
-	 * @return int
+     * @param int $i: first index of cell to compute
+     * @param int $j: second index of cell to compute
+     * @param int $imax: first table dimension
+     * @param int $jmax: second table dimension
+     * @return int
      */
     private function compute_table_cell($table, $i, $j, $imax, $jmax)
     {

Modified: trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss	2014-09-18 14:21:42 UTC (rev 9093)
+++ trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss	2014-09-18 14:28:21 UTC (rev 9094)
@@ -52,7 +52,7 @@
 * sources ~PhpWikiRss pour PhpWiki:RecentChanges :
 {{{
   <<RssFeed feed=PhpWikiRss description="PhpWiki:RecentChanges"
-	           url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>>
+            url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>>
 }}}
 
 * [PhpWikiDemo:sidebar/]  _Exemple barre verticale_

Modified: trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki	2014-09-18 14:21:42 UTC (rev 9093)
+++ trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki	2014-09-18 14:28:21 UTC (rev 9094)
@@ -7,4 +7,4 @@
 Content-Transfer-Encoding: binary
 
 <<RssFeed feed=PhpWikiRecentChanges description="PhpWiki:RecentChanges"
-	         url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>>
+          url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>>

Modified: trunk/locale/it/pgsrc/PaginaDiProva
===================================================================
--- trunk/locale/it/pgsrc/PaginaDiProva	2014-09-18 14:21:42 UTC (rev 9093)
+++ trunk/locale/it/pgsrc/PaginaDiProva	2014-09-18 14:28:21 UTC (rev 9094)
@@ -37,39 +37,39 @@
 **    l2
 ----
  old lists
-	* level 1
-	* l1
-		*l2
-		*l2
-			*l3
-			*l3
-				*l4
-			*l3
-					*l5
-			*l3
-	#one
-	#two
-		#one
-		#two
-	*l1
-		#three
-		#four
-	*l1
-		*l2
-		# one
-		# two
+    * level 1
+    * l1
+        *l2
+        *l2
+            *l3
+            *l3
+                *l4
+            *l3
+                    *l5
+            *l3
+    #one
+    #two
+        #one
+        #two
+    *l1
+        #three
+        #four
+    *l1
+        *l2
+        # one
+        # two
 
  preformatted text
  some more text
 
-	*l1
-				*l4
-	# number
-	# number
+    *l1
+                *l4
+    # number
+    # number
 this is a plain paragraph
-	* bullet
+    * bullet
 this is a plain paragraph again
-	# number
+    # number
 ----
 **Link tests**
 # normal: FrontPage

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9093] trunk/themes

From: <var...@us...> - 2014-09-18 14:21:47

Revision: 9093
          http://sourceforge.net/p/phpwiki/code/9093
Author:   vargenau
Date:     2014-09-18 14:21:42 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
No tabs

Modified Paths:
--------------
    trunk/themes/Crao/templates/wikiblog.tmpl
    trunk/themes/MonoBook/templates/actionbar.tmpl
    trunk/themes/MonoBook/templates/body.tmpl
    trunk/themes/MonoBook/templates/browse-footer.tmpl
    trunk/themes/MonoBook/templates/navbar.tmpl
    trunk/themes/Sidebar/templates/actionbar.tmpl
    trunk/themes/Sidebar/templates/body.tmpl
    trunk/themes/Sidebar/templates/navbar.tmpl
    trunk/themes/Wordpress/templates/signin.tmpl
    trunk/themes/blog/templates/wikiblog.tmpl
    trunk/themes/default/templates/categorypage.tmpl
    trunk/themes/default/templates/comment.tmpl
    trunk/themes/default/templates/login.tmpl
    trunk/themes/default/templates/navbar.tmpl
    trunk/themes/default/templates/online.tmpl
    trunk/themes/default/templates/signin.tmpl
    trunk/themes/default/templates/wikiblog.tmpl
    trunk/themes/smaller/templates/signin.tmpl
    trunk/themes/wikilens/templates/categorypage.tmpl
    trunk/themes/wikilens/templates/navbar.tmpl

Modified: trunk/themes/Crao/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/Crao/templates/wikiblog.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/Crao/templates/wikiblog.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -15,8 +15,8 @@
 if ($rev->get('mtime') != $BLOG_CTIME) {
     $mtime = $WikiTheme->formatDateTime($rev->get('mtime'));
     $modified = HTML::small(array('class' => 'floatright'),
-			    fmt("Comment modified on %s by %s",
-				$mtime, $rev->get('author')));
+                fmt("Comment modified on %s by %s",
+                $mtime, $rev->get('author')));
 }
 ?>
 <div title="<?php echo fmt("Comments on %s by %s.", $BLOG_PARENT, $BLOG_CREATOR)?>"

Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -11,15 +11,15 @@
     <?php if (!string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion"))) { ?>
       <?php $talk = new WikiPageName('Talk:'.$pagename); ?>
       <?php echo ActionButton(array(),
-		       $isActionPage ? _("ActionPage") : _("Article"), 
-		       $talk->getParent(), array('class'=>$isBrowse ? "selected" : "", 'title' => "View the page [alt-c]")) ?>
+               $isActionPage ? _("ActionPage") : _("Article"), 
+               $talk->getParent(), array('class'=>$isBrowse ? "selected" : "", 'title' => "View the page [alt-c]")) ?>
       <?php if (!$isActionPage) { ?>
         <?php if ($dbh->isWikiPage($talk->getName())) { ?>
-	  <?php echo ActionButton(array('action'=>'browse'), _("Discussion"), $talk->getName()) ?>
+      <?php echo ActionButton(array('action'=>'browse'), _("Discussion"), $talk->getName()) ?>
         <?php } else { ?>
-	  <?php echo ActionButton(array('action'=>'create',
-				 'template'=>_("Template/Talk")),
-			   _("Discussion"), $talk->getName()) ?>
+      <?php echo ActionButton(array('action'=>'create',
+                 'template'=>_("Template/Talk")),
+               _("Discussion"), $talk->getName()) ?>
         <?php } ?>
       <?php } ?>
     <?php } else {
@@ -29,7 +29,7 @@
     <?php } ?>
     <?php if (($isAdmin or mayAccessPage('edit', $pagename)) and $revision) { ?>
     <?php echo ActionButton("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page"), false, 
-		     array('id' => 'btn-edit', 'title' => "You can edit this page. Please use the preview button before saving. [alt-e]")) ?>
+             array('id' => 'btn-edit', 'title' => "You can edit this page. Please use the preview button before saving. [alt-e]")) ?>
     <?php } else { ?>
       <?php echo ActionButton("viewsource", _("View Source")) ?>
     <?php } ?>
@@ -51,7 +51,7 @@
 
     <?php if ( $user->isSignedIn() ) { ?>
       <?php echo ActionButton(_("WatchPage"), _("Watch"), false, 
-		       array('title'=>"Add/Remove this to/from the list of pages you're monitoring for changes [alt-l]")) ?>
+               array('title'=>"Add/Remove this to/from the list of pages you're monitoring for changes [alt-l]")) ?>
     <?php } ?>
   </ul>
 </div>

Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/MonoBook/templates/body.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -4,32 +4,32 @@
 <body <?php echo $WikiTheme->getMoreAttr('body') ?> >
     <div id="global-wrapper">
       <div id="column-content">
-	<div id="content">
-	  <?php echo Template('top') ?>
-	  <div id="bodyContent">
-	    <?php echo $CONTENT ?>
+    <div id="content">
+      <?php echo Template('top') ?>
+      <div id="bodyContent">
+        <?php echo $CONTENT ?>
 
-	    <!-- end content -->
-	    <div class="visualClear"></div>
-	  </div>
-	</div>
-	<?php if (empty($NOSIGNIN)) { ?>
-	  <?php echo Template('signin') ?>
-	<?php } ?>
-	<?php echo Template('logo') ?>
+        <!-- end content -->
+        <div class="visualClear"></div>
       </div>
+    </div>
+    <?php if (empty($NOSIGNIN)) { ?>
+      <?php echo Template('signin') ?>
+    <?php } ?>
+    <?php echo Template('logo') ?>
+      </div>
       <div id="column-one">
-	<?php echo Template('navbar') ?>
-	<?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?>
-	  <?php echo Template('actionbar') ?>
-	  <?php echo Template('tags') ?>
-	<?php } ?>
+    <?php echo Template('navbar') ?>
+    <?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?>
+      <?php echo Template('actionbar') ?>
+      <?php echo Template('tags') ?>
+    <?php } ?>
       </div>
       <div id="footer"><?php // for top & bottom toolbars stylesheet ?>
         <?php echo Template('browse-footer') ?>
       </div>
       <div id="bottom">
-	<?php echo Template('bottom') ?>
+    <?php echo Template('bottom') ?>
       </div>
     </div>
 </body>

Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse-footer.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/MonoBook/templates/browse-footer.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -3,7 +3,7 @@
     <div id="f-poweredbyico"><a href="http://www.phpwiki.fr/"><img src="<?php echo $WikiTheme->getImageURL("poweredby_phpwiki_51x31.png") ?>" alt="Powered by PhpWiki" /></a></div>
     <ul id="f-list">
       <li id="f-lastmod"> <?php echo $WikiTheme->getOwnerMessage($page) ?>  <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?> </li>
-	  
+      
       <li id="f-copyright">All text is available under the terms of the <a class="internal" href="http://www.gnu.org/copyleft/fdl.html">GNU Free Documentation License</a> (see <b>
 <?php if ($request->_dbi->isWikiPage(_("Copyrights"))) { ?>
       <?php echo WikiLink(_("Copyrights")) ?>

Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/MonoBook/templates/navbar.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -25,17 +25,17 @@
   <div class="pBody">
 <?php echo Template("search",
              array('SEARCH_BEFORE' => WikiLink(_("FindPage"), "",_("Find page")),
-		   'SEARCH_AFTER' => HTML::input(array('id' => 'searchGoButton',
-						       'type'=>'submit',
-						       'value'=>_("Go"))))) ?>
+           'SEARCH_AFTER' => HTML::input(array('id' => 'searchGoButton',
+                               'type'=>'submit',
+                               'value'=>_("Go"))))) ?>
 <!-- <form action="<?php echo WikiURL(_("TitleSearch"))?>"
       method="get" accept-charset="UTF-8">
       <?php echo WikiLink(_("FindPage"), "searchButton",_("Search:")) ?>
       <input type="hidden" name="auto_redirect" value="1" />
       <input type="text"  name="s" size="12" maxlength="256"
-	      title='<?php echo _("Quick Search")?>'
-	      onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
-	      onmouseout="window.status=''; return true;" />
+          title='<?php echo _("Quick Search")?>'
+          onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
+          onmouseout="window.status=''; return true;" />
     </form>
 -->
   </div>

Modified: trunk/themes/Sidebar/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/actionbar.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/Sidebar/templates/actionbar.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -26,7 +26,7 @@
     <?php echo ActionButton("diff") ?>
     <?php if ($user->isSignedIn()) { ?>
       <?php echo ActionButton(_("WatchPage"), _("Watch"), false, 
-		       array('title'=>_("Add/Remove this to/from the list of pages you're monitoring for changes")." [alt-l]")) ?>
+               array('title'=>_("Add/Remove this to/from the list of pages you're monitoring for changes")." [alt-l]")) ?>
     <?php } ?>
   </ul>
 </div>
@@ -59,7 +59,7 @@
       <?php echo ActionButton(_("PageDump")) ?>
       <?php if (USECACHE) { ?>
        <?php echo ActionButton(array('nocache' => 'purge'), _("PurgeHtmlCache"), $pagename,
-		        array('title'=>_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."))) ?>
+               array('title'=>_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."))) ?>
      <?php }} ?>
   </ul>
   </div>

Modified: trunk/themes/Sidebar/templates/body.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/body.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/Sidebar/templates/body.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -1,34 +1,34 @@
   <body <?php echo $WikiTheme->getMoreAttr('body') ?> >
     <div id="global-wrapper">
       <div id="column-content">
-	<div id="content">
-	  <?php echo Template('top') ?>
-	  <div id="bodyContent">
-	    <?php echo $CONTENT ?>
+    <div id="content">
+      <?php echo Template('top') ?>
+      <div id="bodyContent">
+        <?php echo $CONTENT ?>
 
-	    <!-- end content -->
-	    <div class="visualClear"></div>
-	  </div>
-	</div>
+        <!-- end content -->
+        <div class="visualClear"></div>
+      </div>
+    </div>
 <?php if (!$WikiTheme->DUMP_MODE) { ?>
-	<?php echo Template('logo') ?>
+    <?php echo Template('logo') ?>
         <div id="footer"><?php // for top & bottom toolbars stylesheet ?>
           <?php echo Template('browse-footer') ?>
         </div>
         <div id="bottom">
-	  <?php echo Template('bottom') ?>
+      <?php echo Template('bottom') ?>
         </div>
       </div>
       <div id="column-one">
 <?php if (ALLOW_ANON_USER or $user->isAuthenticated()) { ?>
-	<?php echo Template('navbar') ?>
-	<?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?>
-	  <?php echo Template('actionbar') ?>
-	<?php } ?>
+    <?php echo Template('navbar') ?>
+    <?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?>
+      <?php echo Template('actionbar') ?>
+    <?php } ?>
 <?php } // isAuthenticated ?>
-	<?php if (empty($NOSIGNIN)) { ?>
-	  <?php echo Template('signin', array('NOFORM' => 0)) ?>
-	<?php } ?>
+    <?php if (empty($NOSIGNIN)) { ?>
+      <?php echo Template('signin', array('NOFORM' => 0)) ?>
+    <?php } ?>
       </div>
 <?php } // !DUMP_MODE ?>
     </div>

Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/Sidebar/templates/navbar.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -31,7 +31,7 @@
   <div class="pBody">
 <?php echo Template("search",
              array('SEARCH_BEFORE' => ''/*HTML::h2(WikiLink(_("FindPage")))*/,
-		   'SEARCH_AFTER'  => HTML::Raw('<br /><input type="submit" name="searchtype" value="title" class="searchButton" title="Press to perform a wiki title search" />&nbsp;<input type="submit" name="searchtype" value="fulltext" class="searchButton" title="Wiki fulltext search" />'))) ?>
+             'SEARCH_AFTER'  => HTML::Raw('<br /><input type="submit" name="searchtype" value="title" class="searchButton" title="Press to perform a wiki title search" />&nbsp;<input type="submit" name="searchtype" value="fulltext" class="searchButton" title="Wiki fulltext search" />'))) ?>
   </div>
 </div>
 

Modified: trunk/themes/Wordpress/templates/signin.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/signin.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/Wordpress/templates/signin.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -33,19 +33,19 @@
   </noscript>
 <?php } else {
     $SignInInput = HTML::input(array('type' => 'text',
-				     'name' => "auth[userid]",
-				     'size' => 12,
-				     'maxlength' => 256,
-				     'onchange' => "SignIn(this.form,false);"));
+                     'name' => "auth[userid]",
+                     'size' => 12,
+                     'maxlength' => 256,
+                     'onchange' => "SignIn(this.form,false);"));
     $SignInInput->addTooltip(_("Enter your UserId to sign in"));
     $userid = $user->getId();
     if ($user->isSignedIn())
       echo sprintf(_("You are signed but not authenticated as %s. "),
-		   asXml(HTML::a(array(
-				       'href'=>'#',
-				       'title' => sprintf(_("Click to authenticate as %s"),$userid),
-				       'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),
-				 $userid)));
+           asXml(HTML::a(array(
+                       'href'=>'#',
+                       'title' => sprintf(_("Click to authenticate as %s"),$userid),
+                       'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),
+                 $userid)));
 ?>
   <script type="text/javascript"> <!--
      function SignIn(form,userid) {

Modified: trunk/themes/blog/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/blog/templates/wikiblog.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/blog/templates/wikiblog.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -15,8 +15,8 @@
 // we can't get the version.
 if ($rev->get('mtime') != $BLOG_CTIME) {
     $modified = HTML::small(array('class' => 'floatright'),
-			    fmt("Comment modified on %s by %s",
-				$WikiTheme->formatDateTime($rev->get('mtime')), 
+                fmt("Comment modified on %s by %s",
+                $WikiTheme->formatDateTime($rev->get('mtime')), 
                                 WikiLink($rev->get('author'))));
 }
 ?>

Modified: trunk/themes/default/templates/categorypage.tmpl
===================================================================
--- trunk/themes/default/templates/categorypage.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/default/templates/categorypage.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -30,7 +30,7 @@
   $bpage = "~~[" . $PAGENAME . "]";
 
   $initial_content = "\"This page is in the $bpage category.  You must leave in at least one reference to $bpage in order for this page to be in the $bpage category.  Otherwise, edit this text to describe your page.\"";
-	$adder = "";
+  $adder = "";
 
   $this->_printPlugin("<" . "?plugin-form CreatePage " . $adder . " initial_content=" . $initial_content . " ?" . ">");
 ?>

Modified: trunk/themes/default/templates/comment.tmpl
===================================================================
--- trunk/themes/default/templates/comment.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/default/templates/comment.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -6,7 +6,7 @@
     $buttons = HTML::small(array('class' => 'floatleft'),
                            Button('edit', false, $page));
     if ($user->isAdmin())
-	$buttons->pushContent($SEP, Button('remove', _("Remove Comment"), $page));
+        $buttons->pushContent($SEP, Button('remove', _("Remove Comment"), $page));
 }
 
 // This is a hack, but since we only have a fake PageRevision,
@@ -14,8 +14,8 @@
 if ($rev->get('mtime') != $COMMENT_CTIME) {
     $mtime = $WikiTheme->formatDateTime($rev->get('mtime'));
     $modified = HTML::small(array('class' => 'floatright'),
-			    fmt("Modified on %s by %s",
-				$mtime, $rev->get('author')));
+                fmt("Modified on %s by %s",
+                $mtime, $rev->get('author')));
 }
 ?>
 

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/default/templates/login.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -14,9 +14,9 @@
 
 if (DEBUG & _DEBUG_LOGIN) {
   $t = sprintf("  DEBUG: ALLOW_ANON_EDIT = %s, ALLOW_BOGO_LOGIN = %s, ALLOW_USER_PASSWORDS = %s, ENABLE_PAGEPERM = %s, ", 
-	       ALLOW_ANON_EDIT ? "true" : "false",
-	       ALLOW_BOGO_LOGIN ? "true" : "false",
-	       ALLOW_USER_PASSWORDS ? "true" : "false",
+           ALLOW_ANON_EDIT ? "true" : "false",
+           ALLOW_BOGO_LOGIN ? "true" : "false",
+           ALLOW_USER_PASSWORDS ? "true" : "false",
                ENABLE_PAGEPERM ? "true" : "false");
   if (ALLOW_USER_PASSWORDS) {
     if ($fail_message) { // add for each method the exact failing reason.
@@ -27,7 +27,7 @@
               $t .= " ($fail)";
       }
     } else
-	$t .= sprintf("  USER_AUTH_ORDER: %s", join(" => ", $GLOBALS['USER_AUTH_ORDER']));
+        $t .= sprintf("  USER_AUTH_ORDER: %s", join(" => ", $GLOBALS['USER_AUTH_ORDER']));
         $t .= sprintf(",  USER_AUTH_POLICY: %s", USER_AUTH_POLICY)
             . sprintf(",  PASSWORD_LENGTH_MINIMUM: %s", PASSWORD_LENGTH_MINIMUM);
   }

Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/default/templates/navbar.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -12,7 +12,7 @@
 <?php } ?>
 <?php echo WikiLink(_("RecentChanges"), "button") ?>
 <?php echo $SEP?><?php echo Template('search', 
-		      array('SEARCH_BEFORE' => HTML::Button(_("FindPage"))))
+           array('SEARCH_BEFORE' => HTML::Button(_("FindPage"))))
 ?><?php if (!empty($revision)) { ?>
 <?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"),_("LikePages")) 
 ?><?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"),_("BackLinks")) 

Modified: trunk/themes/default/templates/online.tmpl
===================================================================
--- trunk/themes/default/templates/online.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/default/templates/online.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -18,13 +18,13 @@
   <tr><td class="cat" colspan="2"><?php echo $header ?></td></tr>
   <tr><td class="row1" rowspan="3"><?php echo $ONLINE_ICON ?></td>
       <td class="row1 gensmall"><?php echo fmt("Our users created a total of %d pages.",$NUM_PAGES) ?><br />
-	  <?php echo fmt("We have a total of %d registered users.",$NUM_USERS) ?><br />
+      <?php echo fmt("We have a total of %d registered users.",$NUM_USERS) ?><br />
           <?php echo $NEWEST_USER ? fmt("The newest registered user is %s.",$NEWEST_USER) : ''?>
           </td></tr>
   <?php if ($SESSDATA_BOOL) { ?>
   <tr><td class="row1 gensmall">
           <?php echo fmt("In total there are %d user sessions online. :: Unique %d Registered and %d Guests",
-	          $NUM_ONLINE,$NUM_REGISTERED,$NUM_GUESTS) ?><br />
+              $NUM_ONLINE,$NUM_REGISTERED,$NUM_GUESTS) ?><br />
           <?php echo $MAX_ONLINE_NUM ? fmt("Most users ever online was %d at %s.",$MAX_ONLINE_NUM,$MAX_ONLINE_TIME) : '' ?><br />
           <?php echo fmt("Registered Users Online: ") ?>
 <?php 

Modified: trunk/themes/default/templates/signin.tmpl
===================================================================
--- trunk/themes/default/templates/signin.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/default/templates/signin.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -25,19 +25,19 @@
   <noscript><?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?></noscript>
 <?php } else {
     $SignInInput = HTML::input(array('type' => 'text',
-				     'name' => "auth[userid]",
-				     'size' => 12,
-				     'maxlength' => 256,
-				     'onchange' => "SignIn(this.form,false);"));
+                     'name' => "auth[userid]",
+                     'size' => 12,
+                     'maxlength' => 256,
+                     'onchange' => "SignIn(this.form,false);"));
     $SignInInput->addTooltip(_("Enter your UserId to sign in"));
     $userid = $user->getId();
     if ($user->isSignedIn()) {
         echo sprintf(_("You are signed but not authenticated as %s. "), 
-		   asXml(HTML::a(array(
-				       'href'=>'#',
-				       'title' => sprintf(_("Click to authenticate as %s"),$userid),
-				       'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),
-				 $userid)));
+           asXml(HTML::a(array(
+                       'href'=>'#',
+                       'title' => sprintf(_("Click to authenticate as %s"),$userid),
+                       'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),
+                $userid)));
     }
     $editing_policy = (defined('EDITING_POLICY') and $request->_dbi->isWikiPage(EDITING_POLICY));
     $SignInJS = JavaScript('

Modified: trunk/themes/default/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/default/templates/wikiblog.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/default/templates/wikiblog.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -14,8 +14,8 @@
 // we can't get the version.
 if ($rev->get('mtime') != $BLOG_CTIME) {
     $modified = HTML::small(array('class' => 'floatright'),
-			    fmt("Modified on %s by %s",
-				$WikiTheme->formatDateTime($rev->get('mtime')), 
+                fmt("Modified on %s by %s",
+                $WikiTheme->formatDateTime($rev->get('mtime')), 
                                 WikiLink($rev->get('author'))));
 }
 ?>

Modified: trunk/themes/smaller/templates/signin.tmpl
===================================================================
--- trunk/themes/smaller/templates/signin.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/smaller/templates/signin.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -25,10 +25,10 @@
   <noscript><?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?></noscript>
 <?php } else {
     $SignInInput = HTML::input(array('type' => 'text',
-				     'name' => "auth[userid]",
-				     'size' => 12,
-				     'maxlength' => 256,
-				     'onchange' => "SignIn(this.form,false);"));
+                     'name' => "auth[userid]",
+                     'size' => 12,
+                     'maxlength' => 256,
+                     'onchange' => "SignIn(this.form,false);"));
     if ($user->isSignedIn()) { // cookie
         $SignInInput->setAttr('value', $user->getId());
     }

Modified: trunk/themes/wikilens/templates/categorypage.tmpl
===================================================================
--- trunk/themes/wikilens/templates/categorypage.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/wikilens/templates/categorypage.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -14,19 +14,19 @@
 <br/>
 <?php
 if ($SHOWBUDS){
-	$btn = Button(array('exclude'  => "$EXCLUDE",
-						'category' => "$PAGENAME",
-               			'showbuds' => false),
-                       _("Hide Buddy Ratings in the $SINGULAR category"),
-                 		$PAGENAME);
+    $btn = Button(array('exclude'  => "$EXCLUDE",
+                        'category' => "$PAGENAME",
+                        'showbuds' => false),
+                        _("Hide Buddy Ratings in the $SINGULAR category"),
+                        $PAGENAME);
 
 
 } else {
 $btn = Button(array('exclude'  => "$EXCLUDE",
-						'category' => "$PAGENAME",
+                        'category' => "$PAGENAME",
                        'showbuds' => true),
                        _("Show Buddy Ratings in the $SINGULAR category"),
-                 		$PAGENAME);
+                        $PAGENAME);
 }
                  ?>
 <?php echo $btn ?>
@@ -55,7 +55,7 @@
   $bpage = "~~[" . $PAGENAME . "]";
 
   $initial_content = "\"This page is in the $bpage category.  You must leave in at least one reference to $bpage in order for this page to be in the $bpage category.  Otherwise, edit this text to describe your page.\"";
-	$adder = "";
+  $adder = "";
 
   $this->_printPlugin("<" . "?plugin-form CreatePage " . $adder . " initial_content=" . $initial_content . " ?" . ">");
 ?>

Modified: trunk/themes/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/wikilens/templates/navbar.tmpl	2014-09-18 14:21:42 UTC (rev 9093)
@@ -15,7 +15,7 @@
 <?php } ?>
 <?php echo WikiLink(_("RecentChanges"), "button") ?>
 <?php echo $NSEP?><?php echo Template('search', 
-		      array('SEARCH_BEFORE' => HTML::Button(_("FindPage"))))
+             array('SEARCH_BEFORE' => HTML::Button(_("FindPage"))))
 ?><?php if (!empty($revision)) { ?>
 <?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"),_("LikePages")) 
 ?><?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"),_("BackLinks"))

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9092] trunk/themes/fusionforge/templates/bottom.tmpl

From: <var...@us...> - 2014-09-18 14:20:33

Revision: 9092
          http://sourceforge.net/p/phpwiki/code/9092
Author:   vargenau
Date:     2014-09-18 14:20:25 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
Not needed in Fusionforge

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/bottom.tmpl

Modified: trunk/themes/fusionforge/templates/bottom.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/bottom.tmpl	2014-09-18 13:39:12 UTC (rev 9091)
+++ trunk/themes/fusionforge/templates/bottom.tmpl	2014-09-18 14:20:25 UTC (rev 9092)
@@ -7,13 +7,6 @@
 <?php } ?>
 <script type="text/javascript" src="/wiki/highlight.js/highlight.pack.js"></script>
 <script>
-	hljs.tabReplace = '    ';
-	hljs.initHighlightingOnLoad();
+    hljs.tabReplace = '    ';
+    hljs.initHighlightingOnLoad();
 </script>
-<script>
-jQuery(document).ready(function()
-    {
-        jQuery(".sortable").tablesorter();
-    }
-);
-</script>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9091] trunk/pgsrc/ReleaseNotes

From: <var...@us...> - 2014-09-18 13:39:35

Revision: 9091
          http://sourceforge.net/p/phpwiki/code/9091
Author:   vargenau
Date:     2014-09-18 13:39:12 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
ReleaseNotes: correct total number of pages for AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastEditedByMe

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2014-09-18 13:32:54 UTC (rev 9090)
+++ trunk/pgsrc/ReleaseNotes	2014-09-18 13:39:12 UTC (rev 9091)
@@ -1,4 +1,4 @@
-Date: Thu, 18 Sep 2014 10:26:18 +0000
+Date: Thu, 18 Sep 2014 15:38:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -15,6 +15,7 @@
 * sort tables with [[http://tablesorter.com|tablesorter jQuery plugin]] instead of sortable.js
 * fix Bug#636 Recursive include is not trapped
 * fix Bug#647 undefined method WikiDB_backend_dba::WikiDB_backend_dbaBase
+* correct total number of pages for AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastEditedByMe
 
 == 1.5.0 2014-07-29 Marc-Etienne Vargenau ==
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9090] trunk/lib/plugin/AllPages.php

From: <var...@us...> - 2014-09-18 13:32:56

Revision: 9090
          http://sourceforge.net/p/phpwiki/code/9090
Author:   vargenau
Date:     2014-09-18 13:32:54 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
Remove debug

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

Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php	2014-09-18 13:32:14 UTC (rev 9089)
+++ trunk/lib/plugin/AllPages.php	2014-09-18 13:32:54 UTC (rev 9090)
@@ -44,7 +44,6 @@
                 'noheader' => false,
                 'include_empty' => false,
                 'info' => '',
-                'debug' => false,
                 'userpages' => false
             ));
     }
@@ -60,9 +59,6 @@
 
         $pages = false;
         // Todo: extend given _GET args
-        if (DEBUG && $args['debug']) {
-            $timer = new DebugTimer;
-        }
         $caption = _("All pages in this wiki (%d total):");
 
         if (!empty($args['userpages'])) {
@@ -129,12 +125,7 @@
         else
             $pagelist->addPages($dbi->getAllPages($args['include_empty'], $args['sortby'],
                 $args['limit']));
-        if (DEBUG && $args['debug']) {
-            return HTML($pagelist,
-                HTML::p(fmt("Elapsed time: %s s", $timer->getStats())));
-        } else {
-            return $pagelist;
-        }
+		return $pagelist;
     }
 }
 

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

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

From: <var...@us...> - 2014-09-18 13:32:16

Revision: 9089
          http://sourceforge.net/p/phpwiki/code/9089
Author:   vargenau
Date:     2014-09-18 13:32:14 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
Add static, type compatibility

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2014-09-18 13:31:16 UTC (rev 9088)
+++ trunk/lib/PageList.php	2014-09-18 13:32:14 UTC (rev 9089)
@@ -595,7 +595,7 @@
     public $_sortby = array();
     public $_maxlen = 0;
 
-    function __construct($columns = false, $exclude = false, $options = false)
+    function __construct($columns = false, $exclude = false, $options = array())
     {
         // unique id per pagelist on each page.
         if (!isset($GLOBALS['request']->_pagelist))
@@ -703,7 +703,7 @@
     // 1: info, 2: exclude, 3: hash of options
     // Here we declare which options are supported, so that
     // the calling plugin may simply merge this with its own default arguments
-    function supportedArgs()
+    static function supportedArgs()
     {
         // Todo: add all supported Columns, like locked, minor, ...
         return array( // Currently supported options:
@@ -1830,7 +1830,7 @@
     extends PageList
 {
 
-    function __construct($columns = false, $exclude = '', $options = false)
+    function __construct($columns = false, $exclude = '', $options = array())
     {
         if ($columns) {
             if (!is_array($columns))
@@ -1861,7 +1861,7 @@
     extends PageList
 {
 
-    function __construct($columns = false, $exclude = '', $options = false)
+    function __construct($columns = false, $exclude = '', $options = array())
     {
         if ($columns) {
             if (!is_array($columns))

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9088] trunk/lib/plugin/AllUsers.php

From: <var...@us...> - 2014-09-18 13:31:19

Revision: 9088
          http://sourceforge.net/p/phpwiki/code/9088
Author:   vargenau
Date:     2014-09-18 13:31:16 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
Remove debug

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

Modified: trunk/lib/plugin/AllUsers.php
===================================================================
--- trunk/lib/plugin/AllUsers.php	2014-09-18 12:50:01 UTC (rev 9087)
+++ trunk/lib/plugin/AllUsers.php	2014-09-18 13:31:16 UTC (rev 9088)
@@ -44,8 +44,7 @@
         (
             PageList::supportedArgs(),
             array('noheader' => false,
-                'include_empty' => true,
-                'debug' => false
+                'include_empty' => true
             ));
     }
 
@@ -63,9 +62,6 @@
         $args = $this->getArgs($argstr, $request);
 
         extract($args);
-        if (defined('DEBUG') && DEBUG && $debug) {
-            $timer = new DebugTimer;
-        }
 
         $group = $request->getGroup();
         if (method_exists($group, '_allUsers')) {
@@ -89,20 +85,7 @@
                 $pagelist->addPage(trim($allusers[$i]));
             }
         }
-        /*
-        $page_iter = $dbi->getAllPages($include_empty, $sortby, $limit);
-        while ($page = $page_iter->next()) {
-            if ($page->isUserPage($include_empty))
-                $pagelist->addPage($page);
-        }
-        */
-
-        if (defined('DEBUG') && DEBUG and $debug) {
-            return HTML($pagelist,
-                HTML::p(fmt("Elapsed time: %s s", $timer->getStats())));
-        } else {
-            return $pagelist;
-        }
+        return $pagelist;
     }
 }
 

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

286 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 82 83 84 85 86 .. 538 > >> (Page 84 of 538)