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

[phpwiki-checkins] SF.net SVN: phpwiki:[7142] trunk/themes/default/ajax.js

[<ru...@us...>]

Revision: 7142
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7142&view=rev
Author:   rurban
Date:     2009-09-17 10:50:20 +0000 (Thu, 17 Sep 2009)

Log Message:
-----------
fix last folderArrowPath change: missing /

Modified Paths:
--------------
    trunk/themes/default/ajax.js

Modified: trunk/themes/default/ajax.js
===================================================================
--- trunk/themes/default/ajax.js	2009-09-17 10:26:37 UTC (rev 7141)
+++ trunk/themes/default/ajax.js	2009-09-17 10:50:20 UTC (rev 7142)
@@ -43,7 +43,7 @@
         }
         if (img) {
             if (!folderArrowPath) folderArrowPath = stylepath + 'images/';
-            img.src = folderArrowPath + 'folderArrowOpen.png';
+            img.src = folderArrowPath + '/folderArrowOpen.png';
         }
     }
 }
@@ -105,7 +105,7 @@
         //alert("showHideAsync "+uri+" "+id+"\nloading...");
         var img = document.getElementById(id+'-img');
         if (img)
-            img.src = folderArrowPath + 'folderArrowLoading.gif';
+            img.src = folderArrowPath + '/folderArrowLoading.gif';
         cShowHide = new showHide(id)
         cShowHide.hXMLHttp.open( 'GET', uri, true )
         cShowHide.hXMLHttp.send( null )


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7141] trunk/lib/main.php

[<ru...@us...>]

Revision: 7141
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7141&view=rev
Author:   rurban
Date:     2009-09-17 10:26:37 +0000 (Thu, 17 Sep 2009)

Log Message:
-----------
* stabilize RPC2.php usage on wrong mime types
* support action=rename&to=newpagename

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2009-09-17 10:15:21 UTC (rev 7140)
+++ trunk/lib/main.php	2009-09-17 10:26:37 UTC (rev 7141)
@@ -898,9 +898,10 @@
                 return 'soap';
             // Detect XML-RPC requests.
             if ($this->isPost()
-                && ($this->get('CONTENT_TYPE') == 'text/xml' 
-                    or $this->get('CONTENT_TYPE') == 'application/xml')
-                && strstr($GLOBALS['HTTP_RAW_POST_DATA'], '<methodCall>')
+                && ((defined("WIKI_XMLRPC") and WIKI_XMLRPC)
+                    or ($this->get('CONTENT_TYPE') == 'text/xml' 
+                        or $this->get('CONTENT_TYPE') == 'application/xml')
+                    && strstr($GLOBALS['HTTP_RAW_POST_DATA'], '<methodCall>'))
                )
             {
                 return 'xmlrpc';
@@ -1057,9 +1058,15 @@
         if ($action) {
             if (!$this->getArg('s'))
                 $this->setArg('s', $this->getArg('pagename'));
-            $this->setArg('verify',1);
+            $this->setArg('verify', 1); // only for POST
             if ($this->getArg('action') != 'rename')
                 $this->setArg('action',  $action);
+            elseif($this->getArg('to') && empty($this->args['admin_rename'])) {
+                $this->args['admin_rename']
+                  = array('from'   => $this->getArg('s'),
+                          'to'     => $this->getArg('to'),
+                          'action' => 'select');
+            }
             $this->actionpage($action);
         } else {
             trigger_error($page.": Cannot find action page", E_USER_WARNING);


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7140] trunk/lib/WikiTheme.php

[<ru...@us...>]

Revision: 7140
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7140&view=rev
Author:   rurban
Date:     2009-09-17 10:15:21 +0000 (Thu, 17 Sep 2009)

Log Message:
-----------
remove all folderArrow images but default. use global var folderArrowPath

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

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2009-09-17 10:13:01 UTC (rev 7139)
+++ trunk/lib/WikiTheme.php	2009-09-17 10:15:21 UTC (rev 7140)
@@ -1414,11 +1414,13 @@
             $script_url = deduce_script_name();
             if ((DEBUG & _DEBUG_REMOTE) and isset($_GET['start_debug']))
                 $script_url .= ("?start_debug=".$_GET['start_debug']);
+            $folderArrowPath = dirname($this->_findData('images/folderArrowLoading.gif'));
             $pagename = $request->getArg('pagename');
             $js = "var data_path = '". javascript_quote_string(DATA_PATH) ."';\n"
                 ."var pagename  = '". javascript_quote_string($pagename) ."';\n"
                 ."var script_url= '". javascript_quote_string($script_url) ."';\n"
                 ."var stylepath = data_path+'/".javascript_quote_string($this->_theme)."/';\n"
+                ."var folderArrowPath = '".javascript_quote_string($folderArrowPath)."';\n"
                 ."var use_path_info = " . (USE_PATH_INFO ? "true" : "false") .";\n";
             $this->addMoreHeaders(JavaScript($js));
 	    $already = 1;


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

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

[<ru...@us...>]

Revision: 7139
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7139&view=rev
Author:   rurban
Date:     2009-09-17 10:13:01 +0000 (Thu, 17 Sep 2009)

Log Message:
-----------
remove all folderArrow images but default. use global var folderArrowPath

Modified Paths:
--------------
    trunk/themes/default/ajax.js
    trunk/themes/default/templates/login.tmpl

Removed Paths:
-------------
    trunk/themes/Crao/images/folderArrowClosed.png
    trunk/themes/Crao/images/folderArrowLoading.gif
    trunk/themes/Crao/images/folderArrowOpen.png
    trunk/themes/Hawaiian/images/folderArrowClosed.png
    trunk/themes/Hawaiian/images/folderArrowLoading.gif
    trunk/themes/Hawaiian/images/folderArrowOpen.png
    trunk/themes/MacOSX/images/folderArrowClosed.png
    trunk/themes/MacOSX/images/folderArrowLoading.gif
    trunk/themes/MacOSX/images/folderArrowOpen.png
    trunk/themes/MonoBook/images/folderArrowClosed.png
    trunk/themes/MonoBook/images/folderArrowLoading.gif
    trunk/themes/MonoBook/images/folderArrowOpen.png
    trunk/themes/Portland/images/folderArrowClosed.png
    trunk/themes/Portland/images/folderArrowLoading.gif
    trunk/themes/Portland/images/folderArrowOpen.png
    trunk/themes/Sidebar/images/folderArrowClosed.png
    trunk/themes/Sidebar/images/folderArrowLoading.gif
    trunk/themes/Sidebar/images/folderArrowOpen.png
    trunk/themes/SpaceWiki/images/folderArrowClosed.png
    trunk/themes/SpaceWiki/images/folderArrowLoading.gif
    trunk/themes/SpaceWiki/images/folderArrowOpen.png
    trunk/themes/Wordpress/images/folderArrowClosed.png
    trunk/themes/Wordpress/images/folderArrowLoading.gif
    trunk/themes/Wordpress/images/folderArrowOpen.png
    trunk/themes/blog/images/folderArrowClosed.png
    trunk/themes/blog/images/folderArrowLoading.gif
    trunk/themes/blog/images/folderArrowOpen.png
    trunk/themes/gforge/images/folderArrowClosed.png
    trunk/themes/gforge/images/folderArrowLoading.gif
    trunk/themes/gforge/images/folderArrowOpen.png
    trunk/themes/shamino_com/images/folderArrowClosed.png
    trunk/themes/shamino_com/images/folderArrowLoading.gif
    trunk/themes/shamino_com/images/folderArrowOpen.png
    trunk/themes/smaller/images/
    trunk/themes/wikilens/images/folderArrowClosed.png
    trunk/themes/wikilens/images/folderArrowLoading.gif
    trunk/themes/wikilens/images/folderArrowOpen.png

Deleted: trunk/themes/Crao/images/folderArrowClosed.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/Crao/images/folderArrowLoading.gif
===================================================================
(Binary files differ)

Deleted: trunk/themes/Crao/images/folderArrowOpen.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/Hawaiian/images/folderArrowClosed.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/Hawaiian/images/folderArrowLoading.gif
===================================================================
(Binary files differ)

Deleted: trunk/themes/Hawaiian/images/folderArrowOpen.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/MacOSX/images/folderArrowClosed.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/MacOSX/images/folderArrowLoading.gif
===================================================================
(Binary files differ)

Deleted: trunk/themes/MacOSX/images/folderArrowOpen.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/MonoBook/images/folderArrowClosed.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/MonoBook/images/folderArrowLoading.gif
===================================================================
(Binary files differ)

Deleted: trunk/themes/MonoBook/images/folderArrowOpen.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/Portland/images/folderArrowClosed.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/Portland/images/folderArrowLoading.gif
===================================================================
(Binary files differ)

Deleted: trunk/themes/Portland/images/folderArrowOpen.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/Sidebar/images/folderArrowClosed.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/Sidebar/images/folderArrowLoading.gif
===================================================================
(Binary files differ)

Deleted: trunk/themes/Sidebar/images/folderArrowOpen.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/SpaceWiki/images/folderArrowClosed.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/SpaceWiki/images/folderArrowLoading.gif
===================================================================
(Binary files differ)

Deleted: trunk/themes/SpaceWiki/images/folderArrowOpen.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/Wordpress/images/folderArrowClosed.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/Wordpress/images/folderArrowLoading.gif
===================================================================
(Binary files differ)

Deleted: trunk/themes/Wordpress/images/folderArrowOpen.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/blog/images/folderArrowClosed.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/blog/images/folderArrowLoading.gif
===================================================================
(Binary files differ)

Deleted: trunk/themes/blog/images/folderArrowOpen.png
===================================================================
(Binary files differ)

Modified: trunk/themes/default/ajax.js
===================================================================
--- trunk/themes/default/ajax.js	2009-09-17 10:11:31 UTC (rev 7138)
+++ trunk/themes/default/ajax.js	2009-09-17 10:13:01 UTC (rev 7139)
@@ -28,10 +28,10 @@
                 if (newbody == null) {
                     alert("showHideDone "+this.id+"\nno xml children from "+this.hXMLHttp.responseText);
                 }
-                // We cannot just insert the responseXML into the DOM. 
-                // well gecko can, but the others not. 
-                // So convert the XML tree it on the fly into HTML nodes. 
-                // I never saw this before, I needed that, so I think I 
+                // We cannot just insert the responseXML into the DOM.
+                // well gecko can, but the others not.
+                // So convert the XML tree it on the fly into HTML nodes.
+                // I never saw this before. I needed that, so I think I
                 // invented that sort of rich mashup.
                 var hContainer = CreateHtmlFromXml(newbody);
                 hContainer.className = 'wikitext';
@@ -41,8 +41,10 @@
                 alert("showHideDone "+this.id+"\nerror no xml from "+this.hXMLHttp.responseText);
             }
         }
-        if (img)
-            img.src = stylepath + 'images/folderArrowOpen.png';
+        if (img) {
+            if (!folderArrowPath) folderArrowPath = stylepath + 'images/';
+            img.src = folderArrowPath + 'folderArrowOpen.png';
+        }
     }
 }
 
@@ -55,15 +57,15 @@
 
 var cShowHide;
 
-/* recursive xml => html converter. This might need a attribute type checker
-   in a bad world. e.g. disable all on* events */
+/* recursive xml => html converter. 
+   This might need a attribute type checker in a bad world. 
+   e.g. disable all on* events */
 function CreateHtmlFromXml (xml) {
     if (xml == null) {
         return document.createElement('xml');
     }
     var xmltype = xml.nodeName;
     var html;
-    // we have either text or node elements
     if (xmltype == '#text') {
         html = document.createTextNode( xml.nodeValue );
         html.nodeValue = xml.nodeValue;
@@ -99,10 +101,11 @@
         showHideFolder(id);
     }
     else {
+        if (!folderArrowPath) folderArrowPath = stylepath + 'images/';
         //alert("showHideAsync "+uri+" "+id+"\nloading...");
         var img = document.getElementById(id+'-img');
         if (img)
-            img.src = stylepath + 'images/folderArrowLoading.gif';
+            img.src = folderArrowPath + 'folderArrowLoading.gif';
         cShowHide = new showHide(id)
         cShowHide.hXMLHttp.open( 'GET', uri, true )
         cShowHide.hXMLHttp.send( null )

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2009-09-17 10:11:31 UTC (rev 7138)
+++ trunk/themes/default/templates/login.tmpl	2009-09-17 10:13:01 UTC (rev 7139)
@@ -9,6 +9,13 @@
 <br class="clear-floats" />
 
 <?php 
+$dbh = $request->getDbh();
+if (READONLY) {
+  echo asXML(HTML::h2("System is locked as read-only for maintenance"));
+} elseif ($dbh->readonly) {
+  echo asXML(HTML::h2("Database is locked as read-only for maintenance"));
+}
+
 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",

Deleted: trunk/themes/gforge/images/folderArrowClosed.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/gforge/images/folderArrowLoading.gif
===================================================================
(Binary files differ)

Deleted: trunk/themes/gforge/images/folderArrowOpen.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/shamino_com/images/folderArrowClosed.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/shamino_com/images/folderArrowLoading.gif
===================================================================
(Binary files differ)

Deleted: trunk/themes/shamino_com/images/folderArrowOpen.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/wikilens/images/folderArrowClosed.png
===================================================================
(Binary files differ)

Deleted: trunk/themes/wikilens/images/folderArrowLoading.gif
===================================================================
(Binary files differ)

Deleted: trunk/themes/wikilens/images/folderArrowOpen.png
===================================================================
(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:[7138] trunk/themes/wikilens/wikilens.js

[<ru...@us...>]

Revision: 7138
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7138&view=rev
Author:   rurban
Date:     2009-09-17 10:11:31 +0000 (Thu, 17 Sep 2009)

Log Message:
-----------
firebug lint: declare var

Modified Paths:
--------------
    trunk/themes/wikilens/wikilens.js

Modified: trunk/themes/wikilens/wikilens.js
===================================================================
--- trunk/themes/wikilens/wikilens.js	2009-09-17 08:44:13 UTC (rev 7137)
+++ trunk/themes/wikilens/wikilens.js	2009-09-17 10:11:31 UTC (rev 7138)
@@ -37,7 +37,7 @@
       title = title+' '+msg_curr_prediction+ curr_pred+' '+ratings[curr_pred*2];
     }
   }
-  for (i=1; i<=10; i++) {
+  for (var i=1; i<=10; i++) {
     var imgName = imgId + i;
     var imgSrc = rateit_imgsrc;
     if (init) {


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

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

[<ru...@us...>]

Revision: 7137
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7137&view=rev
Author:   rurban
Date:     2009-09-17 08:44:13 +0000 (Thu, 17 Sep 2009)

Log Message:
-----------
new titleSearch option 16 for fallback if not found

Modified Paths:
--------------
    trunk/lib/XmlRpcServer.php
    trunk/themes/default/templates/search.tmpl

Modified: trunk/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php	2009-09-17 08:40:19 UTC (rev 7136)
+++ trunk/lib/XmlRpcServer.php	2009-09-17 08:44:13 UTC (rev 7137)
@@ -636,7 +636,7 @@
 $wiki_dmap['titleSearch']
 = array('signature'     => array(array($xmlrpcArray, $xmlrpcString, $xmlrpcString)),
         'documentation' => "Return matching pagenames. 
-Option 1: caseexact, 2: regex, 4: starts_with, 8: exact",
+Option 1: caseexact, 2: regex, 4: starts_with, 8: exact, 16: fallback",
         'function'      => 'titleSearch');
 
 function titleSearch($params)
@@ -653,6 +653,7 @@
 
     $case_exact = $option & 1;
     $regex      = $option & 2;
+    $fallback   = $option & 16;
     if (!$regex) {
         if ($option & 4) { // STARTS_WITH
             $regex = true;
@@ -675,7 +676,17 @@
     $pages = array();
     while ($page = $iterator->next()) {
         $pages[] = short_string($page->getName());
-    } 
+    }
+    // On failure try again broader (substring + case inexact)
+    if ($fallback and empty($pages)) {
+        $query = new TextSearchQuery(short_string_decode($ParamPageName->scalarval()), false, 
+                                     $regex ? 'auto' : 'none');
+        $dbh = $request->getDbh();
+        $iterator = $dbh->titleSearch($query);
+        while ($page = $iterator->next()) {
+            $pages[] = short_string($page->getName());
+        }
+    }
     return new xmlrpcresp(new xmlrpcval($pages, "array"));
 }
 

Modified: trunk/themes/default/templates/search.tmpl
===================================================================
--- trunk/themes/default/templates/search.tmpl	2009-09-17 08:40:19 UTC (rev 7136)
+++ trunk/themes/default/templates/search.tmpl	2009-09-17 08:44:13 UTC (rev 7137)
@@ -20,7 +20,7 @@
    class="dropdown" id="searchInput" title="<?=_("LiveSearch") . " [$p-f]"?>" 
    style="width:115px;"
    acdropdown="true" autocomplete_complete="false" autocomplete_matchsubstring="false"
-   autocomplete_list="xmlrpc:wiki.titleSearch [S] 4<?= $request->getArg("start_debug") ? " debug" : "" ?>" />
+   autocomplete_list="xmlrpc:wiki.titleSearch [S] 20<?= $request->getArg("start_debug") ? " debug" : "" ?>" />
 <?php } elseif (ENABLE_LIVESEARCH) { ?>
    type="text" id="livesearch" title="<?=_("LiveSearch") . " [$p-f]"?>" 
    onKeypress="liveSearchStart()"


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7136] trunk/lib/plugin/WikiAdminRename.php

[<ru...@us...>]

Revision: 7136
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7136&view=rev
Author:   rurban
Date:     2009-09-17 08:40:19 +0000 (Thu, 17 Sep 2009)

Log Message:
-----------
* break overlong lines
* skip handled errors
* let the WikiDB + backend do the database changes

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

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2009-09-16 14:58:48 UTC (rev 7135)
+++ trunk/lib/plugin/WikiAdminRename.php	2009-09-17 08:40:19 UTC (rev 7136)
@@ -26,7 +26,7 @@
  * @author:  Reini Urban <ru...@x-...>
  *
  * KNOWN ISSUES:
- *   Requires PHP 4.2.
+ *   Requires PHP 4.2 at least.
  */
 require_once('lib/PageList.php');
 require_once('lib/plugin/WikiAdminSelect.php');
@@ -68,13 +68,16 @@
             return str_replace($from, $to, $name);
     }
 
-    function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks=false, $createredirect=false) {
+    function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks=false, 
+                         $createredirect=false) 
+    {
         $result = HTML::div();
         $ul = HTML::ul();
         $count = 0;
         $post_args = $request->getArg('admin_rename');
-        $options = array('regex' => @$post_args['regex'],
-                         'icase' => @$post_args['icase']);
+        $options = 
+          array('regex' => isset($post_args['regex']) ? $post_args['regex'] : null,
+                'icase' => isset($post_args['icase']) ? $post_args['icase'] : null);
         foreach ($pages as $name) {
             if ( ($newname = $this->renameHelper($name, $from, $to, $options)) 
                  and $newname != $name )
@@ -86,21 +89,12 @@
                     $ul->pushContent(HTML::li(fmt("Access denied to rename page '%s'.",
                                                   WikiLink($name))));
                 elseif ( $dbi->renamePage($name, $newname, $updatelinks)) {
-                    /* not yet implemented for all backends */
-                    $page = $dbi->getPage($newname);
-                    $current = $page->getCurrentRevision();
-                    $version = $current->getVersion();
-                    $meta = $current->_data;
-                    $text = $current->getPackedContent();
-                    $meta['summary'] = sprintf(_("Renamed page from '%s' to '%s'"), $name, $newname);
-                    $meta['is_minor_edit'] = 1;
-                    $meta['author'] = $request->_user->UserName();
-                    unset($meta['mtime']); // force new date
-                    $page->save($text, $version + 1, $meta);
                     if ($createredirect) {
                         $page = $dbi->getPage($name);
                         $text = "<<RedirectTo page=\"" . $newname . "\">>";
-                        $meta['summary'] = sprintf(_("Renaming created redirect page from '%s' to '%s'"), $name, $newname);
+                        $meta['summary'] = 
+                            sprintf(_("Renaming created redirect page from '%s' to '%s'"),
+                                    $name, $newname);
                         $meta['is_minor_edit'] = 0;
                         $meta['author'] = $request->_user->UserName();
                         $page->save($text, 1, $meta);
@@ -121,9 +115,11 @@
             $dbi->touch();
             $result->setAttr('class', 'feedback');
             if ($count == 1) {
-                $result->pushContent(HTML::p("One page has been permanently renamed:"));
+                $result->pushContent(HTML::p(
+                  "One page has been permanently renamed:"));
             } else {
-                $result->pushContent(HTML::p(fmt("%s pages have been permanently renamed:", $count)));
+                $result->pushContent(HTML::p(
+                  fmt("%s pages have been permanently renamed:", $count)));
             }
             $result->pushContent($ul);
             return $result;
@@ -176,17 +172,18 @@
                                           !empty($post_args['updatelinks']),
                                           !empty($post_args['createredirect']));
             }
-            if ($post_args['action'] == 'select') {
-                if (!empty($post_args['from']))
-                    $next_action = 'verify';
-                foreach ($p as $name => $c) {
-                    $pages[$name] = 1;
-                }
+        }
+        if ($post_args['action'] == 'select') {
+            if (!empty($post_args['from']))
+                $next_action = 'verify';
+            foreach ($p as $name => $c) {
+                $pages[$name] = 1;
             }
         }
         if ($next_action == 'select' and empty($pages)) {
             // List all pages to select from.
-            $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']);
+            $pages = $this->collectPages($pages, $dbi, $args['sortby'],
+                                         $args['limit'], $args['exclude']);
         }
         /*if ($next_action == 'verify') {
             $args['info'] = "checkbox,pagename,renamed_pagename";
@@ -223,8 +220,9 @@
             }
         }
 
-        $buttons = HTML::p(Button('submit:admin_rename[rename]', $button_label, 'wikiadmin'),
-                           Button('submit:admin_rename[cancel]', _("Cancel"), 'button'));
+        $buttons = HTML::p
+            (Button('submit:admin_rename[rename]', $button_label, 'wikiadmin'),
+             Button('submit:admin_rename[cancel]', _("Cancel"), 'button'));
 
         if ($singlepage === false) {
             $list = $pagelist->getContent();
@@ -244,7 +242,8 @@
                               HiddenInputs(array('admin_rename[action]' => $next_action)),
                               ENABLE_PAGEPERM
                               ? ''
-                              : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN))));
+                              : HiddenInputs(array('require_authority_for_post'
+                                                   => WIKIAUTH_ADMIN))));
     }
 
     function checkBox (&$post_args, $name, $msg) {
@@ -269,14 +268,18 @@
 					    'size' => 90,
 					    'value' => $post_args['to'])));
         if ($singlepage === false) {
-	    $this->_tablePush($table, '', $this->checkBox($post_args, 'regex', _("Regex?")));
-            $this->_tablePush($table, '', $this->checkBox($post_args, 'icase', _("Case insensitive?")));
+	    $this->_tablePush($table, '', 
+                              $this->checkBox($post_args, 'regex', _("Regex?")));
+            $this->_tablePush($table, '', 
+                              $this->checkBox($post_args, 'icase', _("Case insensitive?")));
         }
 	if (DEBUG) // not yet stable
-	    $this->_tablePush($table, '', $this->checkBox($post_args, 'updatelinks', 
-						      _("Change pagename in all linked pages also?")));
-	$this->_tablePush($table, '', $this->checkBox($post_args, 'createredirect', 
-						      _("Create redirect from old to new name?")));
+	    $this->_tablePush($table, '', 
+                              $this->checkBox($post_args, 'updatelinks', 
+                                _("Change pagename in all linked pages also?")));
+	$this->_tablePush($table, '', 
+                          $this->checkBox($post_args, 'createredirect', 
+                                          _("Create redirect from old to new name?")));
         $header->pushContent($table);
         return $header;
     }
@@ -294,10 +297,12 @@
         $options = array('regex' => @$post_args['regex'],
                          'icase' => @$post_args['icase']);
                          
-        $value = $post_args ? WikiPlugin_WikiAdminRename::renameHelper($page_handle->getName(), 
-                                                          $post_args['from'], $post_args['to'],
-                                                          $options)
-                            : $page_handle->getName();                              
+        $value = $post_args 
+            ? WikiPlugin_WikiAdminRename::renameHelper
+                ($page_handle->getName(), 
+                 $post_args['from'], $post_args['to'],
+                 $options)
+            : $page_handle->getName();                              
         $div = HTML::div(" => ",HTML::input(array('type' => 'text',
                                                   'name' => 'rename[]',
                                                   'value' => $value)));


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7135] trunk/themes/gforge/pgsrc/SpecialPages

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

Revision: 7135
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7135&view=rev
Author:   vargenau
Date:     2009-09-16 14:58:48 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
Custom SpecialPages for Gforge

Added Paths:
-----------
    trunk/themes/gforge/pgsrc/SpecialPages

Added: trunk/themes/gforge/pgsrc/SpecialPages
===================================================================
--- trunk/themes/gforge/pgsrc/SpecialPages	                        (rev 0)
+++ trunk/themes/gforge/pgsrc/SpecialPages	2009-09-16 14:58:48 UTC (rev 7135)
@@ -0,0 +1,46 @@
+Date: Mon, 14 Sep 2009 10:09:46 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
+X-Rcs-Id: $Id: SpecialPages 7114 2009-09-14 08:11:32Z vargenau $
+Content-Type: application/x-phpwiki;
+  pagename=SpecialPages;
+  flags=EXTERNAL_PAGE;
+  markup=2;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+{| cellpadding=5
+|- valign=top
+|
+== Help
+* [[Help:../Help|Help]]
+* [[Help:../PhpWikiManual|PhpWikiManual]]
+|
+== Pages
+* [[AllPages]]
+* [[AllUserPages]]
+* [[AllPagesCreatedByMe]]
+* [[AllPagesOwnedByMe]]
+* [[AllPagesLastEditedByMe]]
+* [[NewPagesPerUser]]
+* [[LockedPages]]
+* [[OrphanedPages]]
+* [[MostPopular]]
+* [[LeastPopular]]
+* [[WantedPages]]
+* [[RandomPage]]
+|
+== Users
+* [[AllUsers]]
+
+== Categories
+* [[CategoryCategory]]
+|
+== Changes
+* [[RecentChanges]]
+* [[FullRecentChanges]]
+* [[RecentEdits]]
+* [[MyRecentChanges]]
+* [[MyRecentEdits]]
+* [[RecentChangesMyPages]]
+* [[RecentNewPages]]
+|}


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7134] trunk/lib/MailNotify.php

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

Revision: 7134
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7134&view=rev
Author:   vargenau
Date:     2009-09-16 14:45:35 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
Removed comment; whitespace

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2009-09-16 14:15:11 UTC (rev 7133)
+++ trunk/lib/MailNotify.php	2009-09-16 14:45:35 UTC (rev 7134)
@@ -287,7 +287,6 @@
             $content .= $wikitext;
         }
         $editedby = sprintf(_("Edited by: %s"), $this->from);
-        //$editedby = sprintf(_("Edited by: %s"), $meta['author']);
         $this->sendMail($subject, 
                         $editedby."\n".$difflink."\n\n".$content);
     }
@@ -334,19 +333,19 @@
 
     function onDeletePage (&$wikidb, $pagename) {
         $result = true;
-	/* Generate notification emails? */
-	if (! $wikidb->isWikiPage($pagename) and !isa($GLOBALS['request'],'MockRequest')) {
-	    $notify = $wikidb->get('notify');
-	    if (!empty($notify) and is_array($notify)) {
-		//TODO: deferr it (quite a massive load if you remove some pages).
-		$this->getPageChangeEmails($notify);
-		if (!empty($this->emails)) {
+        /* Generate notification emails? */
+        if (! $wikidb->isWikiPage($pagename) and !isa($GLOBALS['request'],'MockRequest')) {
+            $notify = $wikidb->get('notify');
+            if (!empty($notify) and is_array($notify)) {
+                //TODO: deferr it (quite a massive load if you remove some pages).
+                $this->getPageChangeEmails($notify);
+                if (!empty($this->emails)) {
                     $subject = sprintf(_("User %s removed page %s"), $this->from, $pagename);
                     $result = $this->sendMail($subject, $subject."\n\n");
-		}
-	    }
-	}
-	return $result;
+                }
+            }
+        }
+        return $result;
     }
 
     function onRenamePage (&$wikidb, $oldpage, $new_pagename) {


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

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

[<ru...@us...>]

Revision: 7133
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7133&view=rev
Author:   rurban
Date:     2009-09-16 14:15:11 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
add some latest fixes

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

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2009-09-16 14:08:38 UTC (rev 7132)
+++ trunk/pgsrc/ReleaseNotes	2009-09-16 14:15:11 UTC (rev 7133)
@@ -51,6 +51,9 @@
 * fix Bug#1992172 Interwiki link does not work in ~RichTable (vargenau)
 * fix Bug#2010748 Missing image
 * fix Bug#1831881 Fatal database error when sorting columns (vargenau)
+* fix PageList prev/next links on multi-columns lists, improve handling of ordered lists
+* allow single "0" as not-empty page content
+* fix action=rename, support new optional argument to=newpagename
 
 === Changes
 - changed ~SemanticSearch query semantics: all regex=auto terms with no regex chars (.+*?^$")
@@ -94,6 +97,7 @@
 * New preference to avoid e-mail notifications for minor edits on Wiki (vargenau)
 * No decoration for abbreviations when printing (vargenau)
 * Add CSS3 code for page headers and footers (works for PDF generation with Prince XML) (vargenau)
+* Remove superfluous scrollbar from printable pre's
 
 === New
 * ~PageList supports listtype=ul,ol,dl. dl used by FullTextSearch


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7132] trunk/themes/MonoBook/IEFixes.js

[<ru...@us...>]

Revision: 7132
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7132&view=rev
Author:   rurban
Date:     2009-09-16 14:08:38 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
fix MSIE warning on actions/formats without logo

Modified Paths:
--------------
    trunk/themes/MonoBook/IEFixes.js

Modified: trunk/themes/MonoBook/IEFixes.js
===================================================================
--- trunk/themes/MonoBook/IEFixes.js	2009-09-16 14:07:45 UTC (rev 7131)
+++ trunk/themes/MonoBook/IEFixes.js	2009-09-16 14:08:38 UTC (rev 7132)
@@ -12,7 +12,7 @@
 // png alpha transparency fixes
 function fixalpha(){
     // bg
-    if(version >= 5.5) {
+    if(version >= 5.5 && document.getElementById('p-logo')) {
         var logoa = document.getElementById('p-logo').firstChild;
         var bg = logoa.currentStyle.backgroundImage;
         if (bg.match(/\.png/i) != null){


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7131] trunk/themes/MonoBook/commonPrint.css

[<ru...@us...>]

Revision: 7131
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7131&view=rev
Author:   rurban
Date:     2009-09-16 14:07:45 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
remove scrollbar from printable pre's

Modified Paths:
--------------
    trunk/themes/MonoBook/commonPrint.css

Modified: trunk/themes/MonoBook/commonPrint.css
===================================================================
--- trunk/themes/MonoBook/commonPrint.css	2009-09-16 13:52:46 UTC (rev 7130)
+++ trunk/themes/MonoBook/commonPrint.css	2009-09-16 14:07:45 UTC (rev 7131)
@@ -201,7 +201,7 @@
     white-space: pre;
     font-size: 8pt;
     overflow: auto;
-    padding: 1em 0;
+    padding: 0;
 }
 
 table.listing,


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7130] trunk/themes/gforge/pgsrc/HomePage

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

Revision: 7130
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7130&view=rev
Author:   vargenau
Date:     2009-09-16 13:52:46 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
Some more links

Modified Paths:
--------------
    trunk/themes/gforge/pgsrc/HomePage

Modified: trunk/themes/gforge/pgsrc/HomePage
===================================================================
--- trunk/themes/gforge/pgsrc/HomePage	2009-09-16 13:23:59 UTC (rev 7129)
+++ trunk/themes/gforge/pgsrc/HomePage	2009-09-16 13:52:46 UTC (rev 7130)
@@ -1,4 +1,4 @@
-Date: Mon,  1 Jun 2009 15:44:45 +0000
+Date: Wed, 16 Sep 2009 15:50:33 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20070828)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -14,6 +14,16 @@
 |bordercolor=green
 }}
 
-{{titlebar|title=What is a wiki?}}
+{| cellpadding=5
+|- valign=top
+| width=50% | {{titlebar|title=What is a wiki?}}
 
 The wiki will allow you to easily create web pages to share information about your project. You can experiment in the [[SandBox]].
+
+| width=50% | {{titlebar|title=I need help}}
+
+* Learn about [[Help:AddingPages|adding pages]].
+* Check [[Help:TextFormattingRules|text formatting rules]].
+* Browse all [[Help:../Help|Help pages]].
+
+|}


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7129] trunk/pgsrc/Help

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

Revision: 7129
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7129&view=rev
Author:   vargenau
Date:     2009-09-16 13:23:59 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
Add limit, no paging

Modified Paths:
--------------
    trunk/pgsrc/Help

Modified: trunk/pgsrc/Help
===================================================================
--- trunk/pgsrc/Help	2009-09-16 12:54:07 UTC (rev 7128)
+++ trunk/pgsrc/Help	2009-09-16 13:23:59 UTC (rev 7129)
@@ -1,4 +1,4 @@
-Date: Wed, 10 Jun 2009 16:30:14 +0000
+Date: Wed, 16 Sep 2009 15:23:10 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -10,7 +10,7 @@
 
 The following **Help pages** are available.
 
-<<ListSubpages cols||=3 sortby||=pagename noheader||=1 >>
+<<ListSubpages cols||=3 sortby||=pagename noheader||=1 limit=1000 >>
 
 <noinclude>
 ----


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7128] trunk/lib/MailNotify.php

[<ru...@us...>]

Revision: 7128
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7128&view=rev
Author:   rurban
Date:     2009-09-16 12:54:07 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
always prefix mails with [WIKI_NAME]

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2009-09-16 09:12:00 UTC (rev 7127)
+++ trunk/lib/MailNotify.php	2009-09-16 12:54:07 UTC (rev 7128)
@@ -1,6 +1,6 @@
 <?php
 rcs_id('$Id$');
-/* Copyright (C) 2006-2007 Reini Urban
+/* Copyright (C) 2006-2007,2009 Reini Urban
  * Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
@@ -181,10 +181,8 @@
                       $notice = false,
                       $silent = true)
     {
-        if (defined('GFORGE') and GFORGE) {
-            // Add WIKI_NAME to Subject
-            $subject = "[".WIKI_NAME."] ".$subject;
-        }
+        // Add WIKI_NAME to Subject
+        $subject = "[".WIKI_NAME."] ".$subject;
         // Encode $subject if needed
         $encoded_subject = $this->subject_encode($subject);
         $emails = $this->emails;
@@ -213,7 +211,8 @@
 	    if (!$ok) {
 		global $ErrorManager;
 		// get last error message
-		$last_err = $ErrorManager->_postponed_errors[count($ErrorHandler->_postponed_errors)-1];
+		$last_err = 
+                    $ErrorManager->_postponed_errors[count($ErrorHandler->_postponed_errors)-1];
 		fwrite($f, "\nX-MailFailure: " . $last_err);
 	    }
 	    fwrite($f, "\nDate: " . CTime());
@@ -304,7 +303,6 @@
                 array($this->pagename, $to, $meta, $this->emails, $this->userids);
         } else {
             $pagename = $this->pagename;
-            //$editedby = sprintf(_("Edited by: %s"), $meta['author']) . ' ' . $meta['author_id'];
             $editedby = sprintf(_("Edited by: %s"), $this->from);
             $subject = sprintf(_("Page rename %s to %s"), $pagename, $to);
             $link = WikiURL($to, true);
@@ -379,7 +377,7 @@
         while(!empty($data[$id])) { // id collision
             $id = rand_ascii_readable(16);
         }
-        $subject = WIKI_NAME . " " . _("e-mail address confirmation");
+        $subject = _("E-Mail address confirmation");
         $ip = $request->get('REMOTE_HOST');
         $expire_date = time() + 7*86400;
         $content = fmt("Someone, probably you from IP address %s, has registered an


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7127] trunk/lib/MailNotify.php

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

Revision: 7127
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7127&view=rev
Author:   vargenau
Date:     2009-09-16 09:12:00 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
No need to send empty page content; improved subject

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2009-09-16 09:04:10 UTC (rev 7126)
+++ trunk/lib/MailNotify.php	2009-09-16 09:12:00 UTC (rev 7127)
@@ -343,26 +343,11 @@
 		//TODO: deferr it (quite a massive load if you remove some pages).
 		$this->getPageChangeEmails($notify);
 		if (!empty($this->emails)) {
-		    $editedby = sprintf(_("Removed by: %s"), $this->from); // Todo: host_id
-		    //$emails = join(',', $this->emails);
-		    $subject = sprintf(_("Page removed %s"), $pagename);
-		    $page = $wikidb->getPage($pagename);
-		    $rev = $page->getCurrentRevision(true);
-		    $content = $rev->getPackedContent();
-                    $result = $this->sendMail($subject, 
-                                              $editedby."\n"."Deleted $pagename"."\n\n".$content);
+                    $subject = sprintf(_("User %s removed page %s"), $this->from, $pagename);
+                    $result = $this->sendMail($subject, $subject."\n\n");
 		}
 	    }
 	}
-	//How to create a RecentChanges entry with explaining summary? Dynamically
-	/*
-	  $page = $this->getPage($pagename);
-	  $current = $page->getCurrentRevision();
-	  $meta = $current->_data;
-	  $version = $current->getVersion();
-	  $meta['summary'] = _("removed");
-	  $page->save($current->getPackedContent(), $version + 1, $meta);
-	*/
 	return $result;
     }
 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7126] trunk/themes/MonoBook/templates/actionbar.tmpl

[<ru...@us...>]

Revision: 7126
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7126&view=rev
Author:   rurban
Date:     2009-09-16 09:04:10 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
oops, revert. already in Views

Modified Paths:
--------------
    trunk/themes/MonoBook/templates/actionbar.tmpl

Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl	2009-09-16 09:01:57 UTC (rev 7125)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl	2009-09-16 09:04:10 UTC (rev 7126)
@@ -68,9 +68,6 @@
        <?= ActionButton('chown') ?>
        <?= ActionButton('setacl') ?>
      <?php }} ?>
-     <?php if ($isAdmin or mayAccessPage('edit', $pagename)) { ?>
-      <?= ActionButton('rename') ?>
-     <?php } ?>
      <?php if (!empty($revision) and ($isAdmin or mayAccessPage('remove', $pagename))) { ?>
       <?= ActionButton('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
       <?= ActionButton('remove') ?>


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7125] trunk/themes/MonoBook/templates/actionbar.tmpl

[<ru...@us...>]

Revision: 7125
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7125&view=rev
Author:   rurban
Date:     2009-09-16 09:01:57 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
add ActionButton rename

Modified Paths:
--------------
    trunk/themes/MonoBook/templates/actionbar.tmpl

Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl	2009-09-16 08:45:06 UTC (rev 7124)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl	2009-09-16 09:01:57 UTC (rev 7125)
@@ -68,6 +68,9 @@
        <?= ActionButton('chown') ?>
        <?= ActionButton('setacl') ?>
      <?php }} ?>
+     <?php if ($isAdmin or mayAccessPage('edit', $pagename)) { ?>
+      <?= ActionButton('rename') ?>
+     <?php } ?>
      <?php if (!empty($revision) and ($isAdmin or mayAccessPage('remove', $pagename))) { ?>
       <?= ActionButton('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
       <?= ActionButton('remove') ?>


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

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

[<ru...@us...>]

Revision: 7124
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7124&view=rev
Author:   rurban
Date:     2009-09-16 08:45:06 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
hasDefaultContents: allow not-empty page content "0"

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

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2009-09-16 08:23:59 UTC (rev 7123)
+++ trunk/lib/WikiDB.php	2009-09-16 08:45:06 UTC (rev 7124)
@@ -1481,7 +1481,9 @@
 {
     //var $_transformedContent = false; // set by WikiDB_Page::save()
     
-    function WikiDB_PageRevision(&$wikidb, $pagename, $version, $versiondata = false) {
+    function WikiDB_PageRevision(&$wikidb, $pagename, $version, 
+                                 $versiondata = false) 
+    {
         $this->_wikidb = &$wikidb;
         $this->_pagename = $pagename;
         $this->_version = $version;
@@ -1527,7 +1529,9 @@
      */
     function hasDefaultContents() {
         $data = &$this->_data;
-        return empty($data['%content']); // FIXME: what if it's the number 0? <>'' or === false
+        if (!isset($data['%content'])) return true;
+        if ($data['%content'] === true) return false;
+        return $data['%content'] === false or $data['%content'] === "";
     }
 
     /**


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

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

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

Revision: 7123
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7123&view=rev
Author:   vargenau
Date:     2009-09-16 08:23:59 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
Encode the notification mail subject if it contains non-ASCII characters

Modified Paths:
--------------
    trunk/lib/MailNotify.php
    trunk/lib/stdlib.php

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2009-09-16 08:20:16 UTC (rev 7122)
+++ trunk/lib/MailNotify.php	2009-09-16 08:23:59 UTC (rev 7123)
@@ -181,6 +181,12 @@
                       $notice = false,
                       $silent = true)
     {
+        if (defined('GFORGE') and GFORGE) {
+            // Add WIKI_NAME to Subject
+            $subject = "[".WIKI_NAME."] ".$subject;
+        }
+        // Encode $subject if needed
+        $encoded_subject = $this->subject_encode($subject);
         $emails = $this->emails;
         $from = $this->from;
         // Do not send if modification is from Gforge admin
@@ -197,7 +203,7 @@
                    "Content-Transfer-Encoding: 8bit";
 
         $ok = mail(($to = array_shift($emails)),
-                 "[".WIKI_NAME."] ".$subject, 
+                   $encoded_subject, 
 		   $subject."\n".$content,
 		   $headers
 		   );
@@ -211,7 +217,7 @@
 		fwrite($f, "\nX-MailFailure: " . $last_err);
 	    }
 	    fwrite($f, "\nDate: " . CTime());
-	    fwrite($f, "\nSubject: $subject");
+	    fwrite($f, "\nSubject: $encoded_subject");
 	    fwrite($f, "\nFrom: $from");
 	    fwrite($f, "\nTo: $to");
 	    fwrite($f, "\nBcc: ".join(',', $emails));
@@ -250,7 +256,7 @@
             return;
         }
         $backend = &$request->_dbi->_backend;
-        $subject = _("Page change").' '.urlencode($this->pagename);
+        $subject = _("Page change").' '.($this->pagename);
         $previous = $backend->get_previous_version($this->pagename, $version);
         if (!isset($meta['mtime'])) $meta['mtime'] = time();
         if ($previous) {
@@ -300,7 +306,7 @@
             $pagename = $this->pagename;
             //$editedby = sprintf(_("Edited by: %s"), $meta['author']) . ' ' . $meta['author_id'];
             $editedby = sprintf(_("Edited by: %s"), $this->from);
-            $subject = sprintf(_("Page rename %s to %s"), urlencode($pagename), urlencode($to));
+            $subject = sprintf(_("Page rename %s to %s"), $pagename, $to);
             $link = WikiURL($to, true);
             $this->sendMail($subject, 
                             $editedby."\n".$link."\n\n"."Renamed $pagename to $to");
@@ -339,7 +345,7 @@
 		if (!empty($this->emails)) {
 		    $editedby = sprintf(_("Removed by: %s"), $this->from); // Todo: host_id
 		    //$emails = join(',', $this->emails);
-		    $subject = sprintf(_("Page removed %s"), urlencode($pagename));
+		    $subject = sprintf(_("Page removed %s"), $pagename);
 		    $page = $wikidb->getPage($pagename);
 		    $rev = $page->getCurrentRevision(true);
 		    $content = $rev->getPackedContent();
@@ -449,6 +455,25 @@
         return HTML(HTML::h1("Confirm E-mail address"),
                     HTML::p("Your e-mail address has now been confirmed."));
     }
+
+    function subject_encode ($subject) {
+        // We need to encode the subject if it contains non-ASCII characters
+        // The page name may contain non-ASCII characters, as well as
+        // the translation of the messages, e.g. _("PageChange Notification of %s");
+
+        // If all characters are ASCII, do nothing
+        if (isAsciiString($subject)) {
+            return $subject;
+        }
+
+        // Let us try quoted printable first
+        if (function_exists('quoted_printable_encode')) { // PHP 5.3
+            return quoted_printable_encode($subject);
+        }
+
+        // If not, encode in base64 (less human-readable)
+        return base64_encode($subject);
+    }
 }
 
 // Local Variables:

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2009-09-16 08:20:16 UTC (rev 7122)
+++ trunk/lib/stdlib.php	2009-09-16 08:23:59 UTC (rev 7123)
@@ -1980,6 +1980,14 @@
 }
 
 /**
+ * isAsciiString($string)
+ */
+function isAsciiString($s) {
+    $ptrASCII  = '[\x00-\x7F]';
+    return preg_match("/^($ptrASCII)*$/s", $s);
+}
+
+/**
  * isUtf8String($string) - cheap utf-8 detection
  *
  * segfaults for strings longer than 10kb!


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

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

[<ru...@us...>]

Revision: 7122
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7122&view=rev
Author:   rurban
Date:     2009-09-16 08:20:16 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
* rename_page: delete at last

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

Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php	2009-09-16 08:03:30 UTC (rev 7121)
+++ trunk/lib/WikiDB/backend/dbaBase.php	2009-09-16 08:20:16 UTC (rev 7122)
@@ -228,7 +228,6 @@
             return false;
 
         $links = $this->_linkdb->get_links($pagename, false, false);
-        $this->_pagedb->delete($pagename);
         $data['pagename'] = $to;
         $this->_pagedb->set($to,
                             (int)$version . ':'
@@ -245,6 +244,7 @@
         $this->_linkdb->set_links($to, $links);
         // better: update all back-/inlinks for all outlinks.
 
+        $this->_pagedb->delete($pagename);
 	return 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:[7121] trunk/lib/WikiDB/backend/dbaBase.php

[<ru...@us...>]

Revision: 7121
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7121&view=rev
Author:   rurban
Date:     2009-09-16 08:03:30 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
* rename_page() fix typo $GLOBAS
* break long lines

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

Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php	2009-09-15 17:05:52 UTC (rev 7120)
+++ trunk/lib/WikiDB/backend/dbaBase.php	2009-09-16 08:03:30 UTC (rev 7121)
@@ -86,7 +86,10 @@
     	// cleanup v?Pagename UNKNOWN0x0
     	$errs = array();
         $pagedb = &$this->_pagedb;
-        for ($page = $pagedb->firstkey(); $page !== false; $page = $pagedb->nextkey()) {
+        for ($page = $pagedb->firstkey();
+             $page !== false;
+             $page = $pagedb->nextkey())
+        {
             if (!$page) {
             	$errs[] = "empty page $page";
                 trigger_error("empty page $page deleted", E_USER_WARNING);
@@ -98,7 +101,7 @@
             $vdata = $this->_versiondb->get($version.":".$page);
             if ($vdata === false)
                 continue; // linkrelations
-            // we also had for some internal version vdata is serialized strings (of array), 
+            // we also had for some internal version vdata is serialized strings, 
             // need to unserialize it twice. We rather purge it.
             if (!is_string($vdata) 
                 or $vdata == 'UNKNOWN

[phpwiki-checkins] SF.net SVN: phpwiki:[7120] trunk/themes/gforge/interwiki.map

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

Revision: 7120
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7120&view=rev
Author:   vargenau
Date:     2009-09-15 17:05:52 +0000 (Tue, 15 Sep 2009)

Log Message:
-----------
Same interwiki.map except for Help interwiki that points to "help" project

Added Paths:
-----------
    trunk/themes/gforge/interwiki.map

Added: trunk/themes/gforge/interwiki.map
===================================================================
--- trunk/themes/gforge/interwiki.map	                        (rev 0)
+++ trunk/themes/gforge/interwiki.map	2009-09-15 17:05:52 UTC (rev 7120)
@@ -0,0 +1,135 @@
+Status Status
+Category Category
+Help /wiki/g/help/Help/
+Relation SearchRelations?s=
+Talk %s/Discussion
+User %s
+AIWiki http://www.ifi.unizh.ch/ailab/aiwiki/aiw.cgi?
+ALife http://news.alife.org/wiki/index.php?
+AbbeNormal http://www.ourpla.net/cgi-bin/pikie.cgi?
+AcadWiki http://xarch.tu-graz.ac.at/autocad/wiki/
+Acronym http://www.acronymfinder.com/af-query.asp?String=exact&Acronym=
+Advogato http://www.advogato.org/
+Annotation http://bayle.stanford.edu/crit/nph-med.cgi/
+AnnotationWiki http://www.seedwiki.com/page.cfm?wikiid=368&doc=
+AviSynth http://www.avisynth.org/
+AwarenessWiki http://taoriver.net/aware/
+BcWireless http://www.bcwireless.net/wiki-moinmoin/moin.cgi/
+BenefitsWiki http://www.benefitslink.com/cgi-bin/wiki.cgi?
+BridgesWiki http://c2.com/w2/bridges/
+bsdWiki http://profile.sh/syswiki/index.php?
+C2find http://c2.com/cgi/wiki?FindPage&value=
+CLiki http://ww.telent.net/cliki/
+Cache http://www.google.com/search?q=cache:
+CmWiki http://www.ourpla.net/cgi-bin/wiki.pl?
+CreationMatters http://www.ourpla.net/cgi-bin/wiki.pl?
+CPAN http://search.cpan.org/
+DeWikiPedia http://de.wikipedia.org/wiki/
+DejaNews http://www.deja.com/=dnc/getdoc.xp?AN=
+Dict http://www.dict.org/bin/Dict?Database=*&Form=Dict1&Strategy=*&Query=
+Dictionary http://www.dict.org/bin/Dict?Database=*&Form=Dict1&Strategy=*&Query=
+DiveIntoOsx http://diveintoosx.org/
+DocBook http://docbook.org/wiki/moin.cgi/
+DolphinWiki http://www.object-arts.com/wiki/html/Dolphin/
+DseWiki http://www.wikiservice.at/dse/wiki.cgi?
+EfnetCeeWiki http://purl.net/wiki/c/
+EfnetCppWiki http://purl.net/wiki/cpp/
+EfnetPythonWiki http://purl.net/wiki/python/
+EfnetXmlWiki http://purl.net/wiki/xml/
+EljWiki http://elj.sourceforge.net/phpwiki/index.php/
+EmacsWiki http://www.emacswiki.org/cgi-bin/wiki.pl?
+EoWikiPedia http://eo.wikipedia.org/wiki/
+FinalEmpire http://final-empire.sourceforge.net/cgi-bin/wiki.pl?
+Foldoc http://www.foldoc.org/foldoc/foldoc.cgi?
+FoxWiki http://fox.wikis.com/wc.dll?Wiki~
+FrWikiPedia http://fr.wikipedia.org/wiki/
+FreeBSDman http://www.FreeBSD.org/cgi/man.cgi?apropos=1&query=
+FreeNetworks http://www.freenetworks.org/index.cgi/
+FreshMeat http://freshmeat.net/
+Froogle http://froogle.google.com/froogle?q=
+Google http://www.google.com/search?q=
+GoogleGroups http://groups.google.com/groups?q=
+GreenCheese http://www.greencheese.org/
+HammondWiki http://www.dairiki.org/HammondWiki/index.php3?
+Haribeau http://wiki.haribeau.de/cgi-bin/wiki.pl?
+IAWiki http://www.IAwiki.net/
+IMDB http://us.imdb.com/Title?
+ISBN http://www.amazon.com/exec/obidos/ISBN=
+IfDef http://ifdef.undef.net/
+JTF http://www.justthefaqs.org/?page=
+JargonFile http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=
+JiniWiki http://www.cdegroot.com/cgi-bin/jini?
+JspWiki http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=
+KmWiki http://www.voght.com/cgi-bin/pywiki?
+KnowHow http://www2.iro.umontreal.ca/~paquetse/cgi-bin/wiki.cgi?
+LanifexWiki http://opt.lanifex.com/cgi-bin/wiki.pl?
+LegoWiki http://www.object-arts.com/wiki/html/Lego-Robotics/
+LinuxWiki http://www.linuxwiki.de/
+LugKR http://lug-kr.sourceforge.net/cgi-bin/lugwiki.pl?
+MACCAWS http://www.maccaws.com/wiki/
+MathSongsWiki http://SeedWiki.com/page.cfm?wikiid=237&doc=
+MbTest http://www.usemod.com/cgi-bin/mbtest.pl?
+MeatBall http://www.usemod.com/cgi-bin/mb.pl?
+MetaWiki http://sunir.org/apps/meta.pl?
+MetaWikiPedia http://meta.wikipedia.com/wiki/
+MoinMoin http://moinmoin.wikiwikiweb.de/
+MoinMaster http://moinmaster.wikiwikiweb.de/
+MuWeb http://www.dunstable.com/scripts/MuWebWeb?
+NetVillage http://www.netbros.com/?
+OpenWiki http://openwiki.com/?
+OrgPatterns http://www.bell-labs.com/cgi-user/OrgPatterns/OrgPatterns?
+OsFaq2 http://www.mega-tokyo.com/osfaq2/index.php/
+PPR http://c2.com/cgi/wiki?
+PangalacticOrg http://www.pangalactic.org/Wiki/
+PersonalTelco http://www.personaltelco.net/index.cgi/
+php-function http://www.php.net/%s
+php-lookup http://www.php.net/manual-lookup.php?pattern=
+PhpWiki http://phpwiki.sourceforge.net/phpwiki/
+PhpWikiCvs http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/pgsrc/%s?view=log
+PhpWikiSvn http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/pgsrc/%s?view=log
+PhpWikiDemo http://phpwiki.sourceforge.net/demo/
+PhpWikiTest http://phpwiki.sourceforge.net/test/
+Pikie http://pikie.darktech.org/cgi/pikie?
+PlWikiPedia http://pl.wikipedia.org/wiki/
+PolitizenWiki http://www.politizen.com/wiki.asp?
+PoundPython http://twistedmatrix.com/wiki/python/
+PurlNet http://www.palowireless.com/zigbee/
+PyWiki http://www.voght.com/cgi-bin/pywiki?
+PythonInfo http://www.python.org/cgi-bin/moinmoin/
+PythonWiki http://www.pythonwiki.de/
+RFC http://www.faqs.org/rfcs/rfc%s.html
+RussellFreedom http://www.russellfreedom.com/
+SVGWiki http://www.protocol7.com/svg-wiki/default.asp?
+SeaPig http://www.seapig.org/ 
+SeattleWireless http://seattlewireless.net/?
+SenseisLibrary http://senseis.xmp.net/?
+Shakti http://cgi.algonet.se/htbin/cgiwrap/pgd/ShaktiWiki/
+SourceForge http://sourceforge.net/
+Squeak http://minnow.cc.gatech.edu/squeak/
+StrikiWiki http://ch.twi.tudelft.nl/~mostert/striki/teststriki.pl?
+TMwiki http://www.EasyTopicMaps.com/?page=
+TWiki http://twiki.org/cgi-bin/view/
+Tavi http://tavi.sourceforge.net/index.php?
+Thesaurus http://www.thesaurus.com/cgi-bin/search?config=roget&words=
+Thinki http://www.thinkware.se/cgi-bin/thinki.cgi/
+TmNet http://www.technomanifestos.net/?
+Unreal http://wiki.beyondunreal.com/wiki/
+UseMod http://www.usemod.com/cgi-bin/wiki.pl?
+VisualWorks http://wiki.cs.uiuc.edu/VisualWorks/
+WakkaWiki http://www.wakkawiki.com/
+WebDevWikiNL http://www.promo-it.nl/WebDevWiki/index.php?page=
+WebSeitzWiki http://webseitz.fluxent.com/wiki/
+Why http://clublet.com/c/c/why?
+Wiktionary http://wiktionary.org/wiki/
+Wiki http://c2.com/cgi/wiki?
+WikiLens http://www.wikilens.org/wiki.php/
+WikiWikiWireless http://www.andaluciawireless.net/
+Wikibooks http://wikibooks.org/wiki/
+WikiPedia http://www.wikipedia.com/wiki/
+Wikiquote http://wikiquote.org/wiki/
+Wikisource http://wikisource.org/wiki/
+WikiWorld http://WikiWorld.com/wiki/index.php/
+WikkiTikkiTavi http://tavi.sourceforge.net/
+WLUG http://www.wlug.org.nz/
+YpsiEyeball http://sknkwrks.dyndns.org:1957/writewiki/wiki.pl?
+ZWiki http://www.zwiki.org/


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7119] trunk/pgsrc/Help%2FNewPagesPerUserPlugin

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

Revision: 7119
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7119&view=rev
Author:   vargenau
Date:     2009-09-15 15:47:00 +0000 (Tue, 15 Sep 2009)

Log Message:
-----------
No tilde needed

Modified Paths:
--------------
    trunk/pgsrc/Help%2FNewPagesPerUserPlugin

Modified: trunk/pgsrc/Help%2FNewPagesPerUserPlugin
===================================================================
--- trunk/pgsrc/Help%2FNewPagesPerUserPlugin	2009-09-15 15:16:38 UTC (rev 7118)
+++ trunk/pgsrc/Help%2FNewPagesPerUserPlugin	2009-09-15 15:47:00 UTC (rev 7119)
@@ -52,10 +52,10 @@
 == Example
 
 {{{
-<<~NewPagesPerUser links=0>>
+<<NewPagesPerUser links=0>>
 }}}
 
-<<~NewPagesPerUser links=0>>
+<<NewPagesPerUser links=0>>
 
 == Author
 * [[PhpWiki:ReiniUrban|Reini Urban]]


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7118] trunk/lib/IniConfig.php

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

Revision: 7118
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7118&view=rev
Author:   vargenau
Date:     2009-09-15 15:16:38 +0000 (Tue, 15 Sep 2009)

Log Message:
-----------
Add NewPagesPerUser in action pages list

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

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2009-09-15 08:02:20 UTC (rev 7117)
+++ trunk/lib/IniConfig.php	2009-09-15 15:16:38 UTC (rev 7118)
@@ -619,6 +619,7 @@
       .'FindPage:FullTextSearch:FuzzyPages:'
       .'LikePages:LinkDatabase:LinkSearch:ListRelations:'
       .'ModeratedPage:MostPopular:'
+      .'NewPagesPerUser:'
       .'OrphanedPages:'
       .'PageDump:PageHistory:PageInfo:PluginManager:'
       .'RandomPage:RecentChanges:RecentComments:RelatedChanges:'


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