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

[phpwiki-checkins] SF.net SVN: phpwiki:[9470] trunk/SOAP.php

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

Revision: 9470
          http://sourceforge.net/p/phpwiki/code/9470
Author:   vargenau
Date:     2015-01-14 14:08:19 +0000 (Wed, 14 Jan 2015)
Log Message:
-----------
Rewrite with with native PHP 5 SOAP

Modified Paths:
--------------
    trunk/SOAP.php

Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php	2015-01-14 12:55:08 UTC (rev 9469)
+++ trunk/SOAP.php	2015-01-14 14:08:19 UTC (rev 9470)
@@ -14,30 +14,20 @@
  *   Or do it dynamically in the soap class? No, the client must connect to us.
  *
  * @author: Reini Urban
+ * @author: Marc-Etienne Vargenau
+ *          Rewrite with with native PHP 5 SOAP
  */
 define ("WIKI_SOAP", true);
 define ("PHPWIKI_NOMAIN", true);
 
-include_once './index.php';
-include_once 'lib/main.php';
+require_once (dirname(__FILE__) . '/lib/prepend.php');
+require_once(dirname(__FILE__) . '/lib/IniConfig.php');
+IniConfig(dirname(__FILE__) . "/config/config.ini");
+require_once(dirname(__FILE__) . '/lib/main.php');
 
-/*
-// bypass auth and request loop for now.
-// require_once('lib/prepend.php');
-include_once 'index.php';
-
-//require_once('lib/stdlib.php');
-require_once 'lib/WikiDB.php';
-require_once 'lib/config.php';
-class WikiRequest extends Request {}
-$request = new WikiRequest();
-require_once 'lib/PagePerm.php';
-require_once 'lib/WikiUser.php';
-require_once 'lib/WikiGroup.php';
-*/
-
 function checkCredentials(&$server, &$credentials, $access, $pagename)
 {
+/*
     // check the "Authorization: Basic '.base64_encode("$this->username:$this->password").'\r\n'" header
     if (isset($server->header['Authorization'])) {
         $line = base64_decode(str_replace("Basic ", "", trim($server->header['Authorization'])));
@@ -62,36 +52,11 @@
         'passwd' => $credentials['password']));
     if (!mayAccessPage($access, $pagename))
         $server->fault(401, '', "no permission");
+*/
 }
 
-$GLOBALS['SERVER_NAME'] = SERVER_URL;
-$GLOBALS['SCRIPT_NAME'] = DATA_PATH . "/SOAP.php";
-$url = SERVER_URL . DATA_PATH . "/SOAP.php";
-
-// Local or external wdsl support is experimental.
-// It works without also. Just the client has to
-// know the wdsl definitions.
-$server = new soap_server( /* 'PhpWiki.wdsl' */);
-// Now change the server url to ours, because in the wdsl is the original PhpWiki address
-//   <soap:address location="http://phpwiki.sourceforge.net/phpwiki/SOAP.php" />
-//   <soap:operation soapAction="http://phpwiki.sourceforge.net/phpwiki/SOAP.php" />
-
-$server->ports[$server->currentPort]['location'] = $url;
-$server->bindings[$server->ports[$server->currentPort]['binding']]['endpoint'] = $url;
-$server->soapaction = $url; // soap_transport_http
-
-$actions = array('getPageContent', 'getPageRevision', 'getCurrentRevision',
-    'getPageMeta', 'doSavePage', 'getAllPagenames',
-    'getBackLinks', 'doTitleSearch', 'doFullTextSearch',
-    'getRecentChanges', 'listLinks', 'listPlugins',
-    'getPluginSynopsis', 'callPlugin', 'listRelations',
-    'linkSearch'
-);
-foreach ($actions as $action) {
-    $server->register($actions);
-    $server->operations[$actions]['soapaction'] = $url;
-}
-
+class PhpWikiSoapServer
+{
 //todo: check and set credentials
 // requiredAuthorityForPage($action);
 // require 'edit' access
@@ -104,8 +69,9 @@
     $current = $page->getCurrentRevision();
     $meta = $current->_data;
     $meta['summary'] = sprintf(_("SOAP Request %s", $credentials['username'])); // from user or IP ?
-    $version = $current->getVersion();
-    return $page->save($content, $version + 1, $meta);
+    // $version = $current->getVersion();
+    // return $page->save($content, $version + 1, $meta);
+    return $page->save($content, 5, $meta);
 }
 
 // require 'view' access
@@ -127,7 +93,7 @@
     checkCredentials($server, $credentials, 'view', $pagename);
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     $page = $dbi->getPage($pagename);
-    $rev = $page->getCurrentRevision();
+    $rev = $page->getRevision($revision);
     $text = $rev->getPackedContent();
     return $text;
 }
@@ -137,12 +103,12 @@
 {
     global $server;
     checkCredentials($server, $credentials, 'view', $pagename);
-    if (!mayAccessPage('view', $pagename))
-        $server->fault(401, '', "no permission");
+    // if (!mayAccessPage('view', $pagename))
+    //     $server->fault(401, '', "no permission");
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     $page = $dbi->getPage($pagename);
-    $rev = $page->getCurrentRevision();
-    $version = $current->getVersion();
+    // $rev = $page->getCurrentRevision();
+    $version = $page->getVersion();
     return (double)$version;
 }
 
@@ -192,6 +158,8 @@
 // require 'view' access to TitleSearch
 function doTitleSearch($s, $credentials = false)
 {
+    require_once 'lib/TextSearchQuery.php';
+
     global $server;
     checkCredentials($server, $credentials, 'view', _("TitleSearch"));
     $dbi = WikiDB::open($GLOBALS['DBParams']);
@@ -207,6 +175,8 @@
 // require 'view' access to FullTextSearch
 function doFullTextSearch($s, $credentials = false)
 {
+    require_once 'lib/TextSearchQuery.php';
+
     global $server;
     checkCredentials($server, $credentials, 'view', _("FullTextSearch"));
     $dbi = WikiDB::open($GLOBALS['DBParams']);
@@ -341,10 +311,11 @@
 {
     global $server;
     checkCredentials($server, $credentials, 'view', _("HomePage"));
+    $dbi = WikiDB::open($GLOBALS['DBParams']);
     $also_attributes = $option & 2;
     $only_attributes = $option & 2 and !($option & 1);
     $sorted = !($option & 4);
-    return $dbh->listRelations($also_attributes,
+    return $dbi->listRelations($also_attributes,
         $only_attributes,
         $sorted);
 }
@@ -374,8 +345,12 @@
     return $links->asArray();
 }
 
-$server->service($GLOBALS['HTTP_RAW_POST_DATA']);
+}
 
+$server=new SoapServer('PhpWiki.wsdl');
+$server->setClass('PhpWikiSoapServer');
+$server->handle();
+
 // Local Variables:
 // mode: php
 // tab-width: 8

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

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

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

Revision: 9469
          http://sourceforge.net/p/phpwiki/code/9469
Author:   vargenau
Date:     2015-01-14 12:55:08 +0000 (Wed, 14 Jan 2015)
Log Message:
-----------
Always create global $request and $WikiTheme

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2015-01-14 12:53:03 UTC (rev 9468)
+++ trunk/lib/main.php	2015-01-14 12:55:08 UTC (rev 9469)
@@ -1473,8 +1473,14 @@
 }
 
 // don't run the main loop for special requests (test, getimg, xmlrpc, soap, ...)
-if (!defined('PHPWIKI_NOMAIN') or !PHPWIKI_NOMAIN)
+if (!defined('PHPWIKI_NOMAIN') or !PHPWIKI_NOMAIN) {
     main();
+} else {
+    // We need the global $request and $WikiTheme
+    $request = new WikiRequest();
+    require_once 'lib/WikiTheme.php';
+    $WikiTheme = new WikiTheme('default');
+}
 
 // Local Variables:
 // mode: php

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9468] trunk/PhpWiki.wsdl

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

Revision: 9468
          http://sourceforge.net/p/phpwiki/code/9468
Author:   vargenau
Date:     2015-01-14 12:53:03 +0000 (Wed, 14 Jan 2015)
Log Message:
-----------
Add <operation name="getCurrentRevision"> and <operation name="getPageMeta">

Modified Paths:
--------------
    trunk/PhpWiki.wsdl

Modified: trunk/PhpWiki.wsdl
===================================================================
--- trunk/PhpWiki.wsdl	2015-01-13 14:03:30 UTC (rev 9467)
+++ trunk/PhpWiki.wsdl	2015-01-14 12:53:03 UTC (rev 9468)
@@ -158,6 +158,14 @@
             <input message="tns:getPageRevision"/>
             <output message="tns:getPageContentResponse"/>
         </operation>
+        <operation name="getCurrentRevision">
+            <input message="tns:getPageRevision"/>
+            <output message="tns:getPageContentResponse"/>
+        </operation>
+        <operation name="getPageMeta">
+            <input message="tns:getPageMeta"/>
+            <output message="tns:getPageMetaResponse"/>
+        </operation>
         <operation name="doSavePage">
             <input message="tns:doSavePage"/>
             <output message="tns:doSavePageResponse"/>

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

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

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

Revision: 9465
          http://sourceforge.net/p/phpwiki/code/9465
Author:   vargenau
Date:     2015-01-12 10:13:52 +0000 (Mon, 12 Jan 2015)
Log Message:
-----------
SUBPAGE_SEPARATOR --> /

Modified Paths:
--------------
    trunk/themes/Crao/templates/navbar.tmpl
    trunk/themes/default/templates/navbar.tmpl
    trunk/themes/wikilens/templates/navbar.tmpl

Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl	2015-01-12 10:09:13 UTC (rev 9464)
+++ trunk/themes/Crao/templates/navbar.tmpl	2015-01-12 10:13:52 UTC (rev 9465)
@@ -26,7 +26,7 @@
       $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
       $dbi = $request->getDbh();
       if ($dbi->isWikiPage($UserCalPageTitle)) {
-        $UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time());
+        $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
         //$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
 ?>
 <?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?><?php echo $SEP?>

Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl	2015-01-12 10:09:13 UTC (rev 9464)
+++ trunk/themes/default/templates/navbar.tmpl	2015-01-12 10:13:52 UTC (rev 9465)
@@ -25,11 +25,11 @@
 <?php } ?>
 <?php if (!empty($user)) { ?>
 <?php
-      /* Today's calendar page for the user, if the Calender subpage is defined. */
-      $UserCalPageTitle = $user->getId() . SUBPAGE_SEPARATOR . _("Calendar");
-      $dbi = $request->getDbh();
-      if ($dbi->isWikiPage($UserCalPageTitle)) {
-        $UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time());
+    /* Today's calendar page for the user, if the Calender subpage is defined. */
+    $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
+    $dbi = $request->getDbh();
+    if ($dbi->isWikiPage($UserCalPageTitle)) {
+        $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
         //$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
         ?>
 <?php echo $SEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>

Modified: trunk/themes/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl	2015-01-12 10:09:13 UTC (rev 9464)
+++ trunk/themes/wikilens/templates/navbar.tmpl	2015-01-12 10:13:52 UTC (rev 9465)
@@ -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:[9462] trunk

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

Revision: 9462
          http://sourceforge.net/p/phpwiki/code/9462
Author:   vargenau
Date:     2015-01-12 09:53:40 +0000 (Mon, 12 Jan 2015)
Log Message:
-----------
HTML::Raw --> HTML::raw

Modified Paths:
--------------
    trunk/lib/InlineParser.php
    trunk/lib/PageList.php
    trunk/lib/WikiTheme.php
    trunk/lib/loadsave.php
    trunk/lib/stdlib.php
    trunk/lib/wikilens/RatingsDb.php
    trunk/themes/MonoBook/templates/signin.tmpl
    trunk/themes/MonoBook/themeinfo.php
    trunk/themes/Sidebar/templates/navbar.tmpl
    trunk/themes/Sidebar/templates/signin.tmpl
    trunk/themes/Sidebar/themeinfo.php
    trunk/themes/wikilens/templates/body.tmpl

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2015-01-09 17:04:47 UTC (rev 9461)
+++ trunk/lib/InlineParser.php	2015-01-12 09:53:40 UTC (rev 9462)
@@ -1168,7 +1168,7 @@
 
     function markup($match)
     {
-        return HTML::Raw($this->_entities[$match]);
+        return HTML::raw($this->_entities[$match]);
     }
 }
 
@@ -1178,7 +1178,7 @@
 
     function markup($match)
     {
-        return HTML::Raw($match);
+        return HTML::raw($match);
     }
 }
 
@@ -1189,7 +1189,7 @@
 
     function markup($match)
     {
-        return HTML::Raw($match);
+        return HTML::raw($match);
     }
 }
 

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2015-01-09 17:04:47 UTC (rev 9461)
+++ trunk/lib/PageList.php	2015-01-12 09:53:40 UTC (rev 9462)
@@ -1834,7 +1834,7 @@
 
     // comma=1
     // Condense list without a href links: "Page1, Page2, ..."
-    // Alternative $seperator = HTML::Raw(' · ')
+    // Alternative $seperator = HTML::raw(' · ')
     // FIXME: only unique list entries, esp. with nopage
     private function generateCommaListAsString()
     {

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2015-01-09 17:04:47 UTC (rev 9461)
+++ trunk/lib/WikiTheme.php	2015-01-12 09:53:40 UTC (rev 9462)
@@ -1585,7 +1585,7 @@
     function initDoubleClickEdit()
     {
         if (!$this->HTML_DUMP_SUFFIX)
-            $this->addMoreAttr('body', 'DoubleClickEdit', HTML::Raw(" ondblclick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\""));
+            $this->addMoreAttr('body', 'DoubleClickEdit', HTML::raw(" ondblclick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\""));
     }
 
     // Immediate title search results via XMLHTML(HttpRequest)
@@ -1597,7 +1597,7 @@
         static $already = 0;
         if (!$this->HTML_DUMP_SUFFIX and !$already) {
             $this->addMoreAttr('body', 'LiveSearch',
-                HTML::Raw(" onload=\"liveSearchInit()"));
+                HTML::raw(" onload=\"liveSearchInit()"));
             $this->addMoreHeaders(JavaScript('var liveSearchURI="'
                 . WikiURL(_("TitleSearch"), array(), true) . '";'));
             $this->addMoreHeaders(JavaScript('', array
@@ -1977,7 +1977,7 @@
         $page_content = $revision->getTransformedContent();
         //$cache = &$page->_wikidb->_cache;
         $counter = 0;
-        $sp = HTML::Raw('· ');
+        $sp = HTML::raw('· ');
         foreach ($page_content->getWikiPageLinks() as $link) {
             $linkto = $link['linkto'];
             if (!$request->_dbi->isWikiPage($linkto)) continue;
@@ -2002,7 +2002,7 @@
         $page = $request->getPage($request->getArg('pagename'));
         $cache = &$page->_wikidb->_cache;
         $counter = 0;
-        $sp = HTML::Raw('· ');
+        $sp = HTML::raw('· ');
         foreach ($cache->getWikiPageLinks() as $link) {
             $linkto = $link['linkto'];
             if ($linkto) {

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2015-01-09 17:04:47 UTC (rev 9461)
+++ trunk/lib/loadsave.php	2015-01-12 09:53:40 UTC (rev 9462)
@@ -1070,7 +1070,7 @@
                 HiddenInputs($request->getArgs(), false, array('verify')),
                 HiddenInputs(array('verify' => 1)),
                 Button('submit:verify', _("Yes"), 'button'),
-                HTML::Raw(' '),
+                HTML::raw(' '),
                 Button('submit:cancel', _("Cancel"), 'button'))
         );
         $rev = $page->getRevision($version);

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2015-01-09 17:04:47 UTC (rev 9461)
+++ trunk/lib/stdlib.php	2015-01-12 09:53:40 UTC (rev 9462)
@@ -321,7 +321,7 @@
             $prefix = false;
         }
         $text = HTML::span(array('style' => 'white-space: nowrap'),
-            $last_word, HTML::Raw(' '), $icon);
+            $last_word, HTML::raw(' '), $icon);
         if ($prefix)
             $text = HTML($prefix, $text);
         return $text;

Modified: trunk/lib/wikilens/RatingsDb.php
===================================================================
--- trunk/lib/wikilens/RatingsDb.php	2015-01-09 17:04:47 UTC (rev 9461)
+++ trunk/lib/wikilens/RatingsDb.php	2015-01-12 09:53:40 UTC (rev 9462)
@@ -318,7 +318,7 @@
         }
         if (defined('RATING_EXTERNAL') and RATING_EXTERNAL) {
             // how call mysuggest.exe? as CGI or natively
-            //$rating = HTML::Raw("<!--#include virtual=".RATING_ENGINE." -->");
+            //$rating = HTML::raw("<!--#include virtual=".RATING_ENGINE." -->");
             $args = "-u$user -p$page -malpha"; // --top 10
             if (isset($dimension))
                 $args .= " -d$dimension";

Modified: trunk/themes/MonoBook/templates/signin.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/signin.tmpl	2015-01-09 17:04:47 UTC (rev 9461)
+++ trunk/themes/MonoBook/templates/signin.tmpl	2015-01-12 09:53:40 UTC (rev 9462)
@@ -1,5 +1,5 @@
 <?php // On MonoBook we do away with only GET urls, no form.
-  $sp = HTML::Raw("&nbsp;"); $id = $user->UserName();
+  $sp = HTML::raw("&nbsp;"); $id = $user->UserName();
 ?>
 <div class="portlet" id="p-personal"><div class="pBody">
  <ul>

Modified: trunk/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/themes/MonoBook/themeinfo.php	2015-01-09 17:04:47 UTC (rev 9461)
+++ trunk/themes/MonoBook/themeinfo.php	2015-01-12 09:53:40 UTC (rev 9462)
@@ -82,7 +82,7 @@
     {
         $this->addMoreHeaders(JavaScript("var ta;\nvar skin = '" . $this->_name . "';\n"));
         $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("wikibits.js"))));
-        $this->addMoreAttr('body', "class-ns-0", HTML::Raw('class="ns-0"'));
+        $this->addMoreAttr('body', "class-ns-0", HTML::raw('class="ns-0"'));
 
         // CSS file defines fonts, colors and background images for this
         // style.  The companion '*-heavy.css' file isn't defined, it's just

Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl	2015-01-09 17:04:47 UTC (rev 9461)
+++ trunk/themes/Sidebar/templates/navbar.tmpl	2015-01-12 09:53:40 UTC (rev 9462)
@@ -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/Sidebar/templates/signin.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/signin.tmpl	2015-01-09 17:04:47 UTC (rev 9461)
+++ trunk/themes/Sidebar/templates/signin.tmpl	2015-01-12 09:53:40 UTC (rev 9462)
@@ -1,12 +1,12 @@
 <div class="portlet" id="p-personal"><div class="pBody"><ul>
 <?php if ($user->isAuthenticated()) {
-     $sp = HTML::Raw("&nbsp;"); $id = $user->getAuthenticatedId(); ?>
+     $sp = HTML::raw("&nbsp;"); $id = $user->getAuthenticatedId(); ?>
      <li id="pt-mypages"><?php echo WikiLink("RecentChangesMyPages", 'auto', HTML($sp,"MyPages",$sp)) ?></li>
      <li id="pt-mychanges"><?php echo WikiLink("MyRecentChanges", 'auto', HTML($sp,"MyChanges",$sp)) ?></li>
      <li id="pt-userpage"><?php echo WikiLink($id, 'auto', HTML($sp,$id,$sp)) ?></li>
      <li id="pt-logout"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'), $sp,_("Logout"),$sp) ?></li>
 <?php } elseif (ALLOW_ANON_USER) {
-  $sp = HTML::Raw("&nbsp;"); $id = $user->getAuthenticatedId();
+  $sp = HTML::raw("&nbsp;"); $id = $user->getAuthenticatedId();
   if ($id) { ?>
     <li id="pt-userpage"><?php echo WikiLink($id, 'auto', HTML($sp,$id,$sp)) ?></li>
   <?php } ?>

Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php	2015-01-09 17:04:47 UTC (rev 9461)
+++ trunk/themes/Sidebar/themeinfo.php	2015-01-12 09:53:40 UTC (rev 9462)
@@ -104,7 +104,7 @@
     {
         // hack for navbar.tmpl to hide the buttonseparator
         if ($name == "navbar") {
-            $this->setButtonSeparator(HTML::Raw("<br />\n&nbsp;&middot;&nbsp;"));
+            $this->setButtonSeparator(HTML::raw("<br />\n&nbsp;&middot;&nbsp;"));
         }
         if ($name == "actionbar" || $name == "signin") {
             $this->setButtonSeparator(" ");

Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl	2015-01-09 17:04:47 UTC (rev 9461)
+++ trunk/themes/wikilens/templates/body.tmpl	2015-01-12 09:53:40 UTC (rev 9462)
@@ -17,7 +17,7 @@
 <h1><?php echo $HEADER ?>
 <?php if (!empty($user) && $user->isSignedIn()) {
   $loader = new WikiPluginLoader();
-  printXML(HTML::Raw("&nbsp;&nbsp;"));
+  printXML(HTML::raw("&nbsp;&nbsp;"));
   printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup));
 } ?> </h1>
 

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

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

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

Revision: 9464
          http://sourceforge.net/p/phpwiki/code/9464
Author:   vargenau
Date:     2015-01-12 10:09:13 +0000 (Mon, 12 Jan 2015)
Log Message:
-----------
HTML::Table --> HTML::table

Modified Paths:
--------------
    trunk/lib/diff.php
    trunk/lib/plugin/Diff.php

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2015-01-12 10:05:48 UTC (rev 9463)
+++ trunk/lib/diff.php	2015-01-12 10:09:13 UTC (rev 9464)
@@ -341,7 +341,7 @@
     if ($old and $old->getVersion() == 0)
         $old = false;
 
-    $html->pushContent(HTML::Table(PageInfoRow(_("Newer page:"), $new,
+    $html->pushContent(HTML::table(PageInfoRow(_("Newer page:"), $new,
             $request, empty($version)),
         PageInfoRow(_("Older page:"), $old,
             $request, false)));

Modified: trunk/lib/plugin/Diff.php
===================================================================
--- trunk/lib/plugin/Diff.php	2015-01-12 10:05:48 UTC (rev 9463)
+++ trunk/lib/plugin/Diff.php	2015-01-12 10:09:13 UTC (rev 9464)
@@ -173,7 +173,7 @@
         if ($old and $old->getVersion() == 0)
             $old = false;
 
-        $html->pushContent(HTML::Table($this->PageInfoRow(_("Newer page:"), $new,
+        $html->pushContent(HTML::table($this->PageInfoRow(_("Newer page:"), $new,
                 $request),
             $this->PageInfoRow(_("Older page:"), $old,
                 $request)));

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

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

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

Revision: 9463
          http://sourceforge.net/p/phpwiki/code/9463
Author:   vargenau
Date:     2015-01-12 10:05:48 +0000 (Mon, 12 Jan 2015)
Log Message:
-----------
HTML::Button --> HTML::button

Modified Paths:
--------------
    trunk/themes/default/templates/navbar.tmpl
    trunk/themes/wikilens/templates/navbar.tmpl

Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl	2015-01-12 09:53:40 UTC (rev 9462)
+++ trunk/themes/default/templates/navbar.tmpl	2015-01-12 10:05:48 UTC (rev 9463)
@@ -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/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl	2015-01-12 09:53:40 UTC (rev 9462)
+++ trunk/themes/wikilens/templates/navbar.tmpl	2015-01-12 10:05:48 UTC (rev 9463)
@@ -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:[9460] trunk/SOAP.php

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

Revision: 9460
          http://sourceforge.net/p/phpwiki/code/9460
Author:   vargenau
Date:     2015-01-09 15:50:25 +0000 (Fri, 09 Jan 2015)
Log Message:
-----------
Use consistent case

Modified Paths:
--------------
    trunk/SOAP.php

Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php	2015-01-09 15:48:19 UTC (rev 9459)
+++ trunk/SOAP.php	2015-01-09 15:50:25 UTC (rev 9460)
@@ -289,7 +289,7 @@
     require_once 'lib/WikiPlugin.php';
     $w = new WikiPluginLoader();
     $synopsis = '';
-    $p = $w->getPlugin($pluginName, false); // second arg?
+    $p = $w->getPlugin($pluginname, false); // second arg?
     // trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only
     if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
         $plugin_args = '';

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

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

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

Revision: 9459
          http://sourceforge.net/p/phpwiki/code/9459
Author:   vargenau
Date:     2015-01-09 15:48:19 +0000 (Fri, 09 Jan 2015)
Log Message:
-----------
Remove nusoap

Modified Paths:
--------------
    trunk/SOAP.php
    trunk/lib/Google.php
    trunk/locale/.exclude
    trunk/locale/Makefile
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/update-makefile.sh
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Removed Paths:
-------------
    trunk/lib/nusoap/

Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php	2015-01-09 15:40:00 UTC (rev 9458)
+++ trunk/SOAP.php	2015-01-09 15:48:19 UTC (rev 9459)
@@ -19,8 +19,6 @@
 
 include_once './index.php';
 include_once 'lib/main.php';
-if (!loadExtension('soap'))
-    require_once 'lib/nusoap/nusoap.php';
 
 /*
 // bypass auth and request loop for now.

Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php	2015-01-09 15:40:00 UTC (rev 9458)
+++ trunk/lib/Google.php	2015-01-09 15:48:19 UTC (rev 9459)
@@ -169,7 +169,6 @@
             return false;
         } else
             $this->license_key = GOOGLE_LICENSE_KEY;
-        require_once 'lib/nusoap/nusoap.php';
 
         $this->soapclient = new soapclient(SERVER_URL . NormalizeWebFileName("GoogleSearch.wsdl"), "wsdl");
         $this->proxy = $this->soapclient->getProxy();

Modified: trunk/locale/.exclude
===================================================================
--- trunk/locale/.exclude	2015-01-09 15:40:00 UTC (rev 9458)
+++ trunk/locale/.exclude	2015-01-09 15:48:19 UTC (rev 9459)
@@ -1,26 +1 @@
-lib/template_lite/
-lib/pear/
 lib/WikiDB/adodb/
-lib/nusoap/
-lib/fpdf/
-lib/XMLRPC/
-lib/AccessLog.php
-lib/ASCIIMathPHP/
-lib/WikiDB/backend/cvsclient.php
-lib/weather_class_inc.php
-lib/plugin/NewUserWelcomePage.php
-lib/plugin/GridTable.php
-lib/plugin/RdfDefinition.php
-lib/plugin/WikiAccessRestrictions.php
-lib/plugin/WikiAdminSetAclSimple.php
-lib/plugin/WikiAdminMassRevert.php
-lib/plugin/WikiSettings.php
-lib/plugin/WikiUserAdministration.php
-lib/plugin/BlockQuote.php
-lib/plugin/SpecialTag.php
-themes/default/tiny_mce/
-themes/wikilens/templates/newuserwelcomepage.tmpl
-themes/wikilens/templates/categorypage.tmpl
-themes/archX/
-themes/film/
-themes/AVL/

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2015-01-09 15:40:00 UTC (rev 9458)
+++ trunk/locale/Makefile	2015-01-09 15:48:19 UTC (rev 9459)
@@ -70,6 +70,8 @@
 mo: zh/LC_MESSAGES/phpwiki.mo
 #
 ${POT_FILE}: ../lib/ArchiveCleaner.php
+${POT_FILE}: ../lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
+${POT_FILE}: ../lib/ASCIIMathPHP/ASCIIMathPHP.class.php
 ${POT_FILE}: ../lib/AtomParser.php
 ${POT_FILE}: ../lib/BlockParser.php
 ${POT_FILE}: ../lib/CachedMarkup.php
@@ -237,6 +239,7 @@
 ${POT_FILE}: ../lib/plugin/WikiAdminSearchReplace.php
 ${POT_FILE}: ../lib/plugin/WikiAdminSelect.php
 ${POT_FILE}: ../lib/plugin/WikiAdminSetAcl.php
+${POT_FILE}: ../lib/plugin/WikiAdminSetAclSimple.php
 ${POT_FILE}: ../lib/plugin/WikiAdminSetExternal.php
 ${POT_FILE}: ../lib/plugin/WikiAdminUtils.php
 ${POT_FILE}: ../lib/plugin/WikiBlog.php
@@ -342,6 +345,7 @@
 ${POT_FILE}: ../lib/XmlParser.php
 ${POT_FILE}: ../lib/XmlRpcClient.php
 ${POT_FILE}: ../lib/XmlRpcServer.php
+${POT_FILE}: ../lib/XMLRPC/utils.php
 ${POT_FILE}: ../lib/ziplib.php
 ${POT_FILE}: ../themes/alphatest.php
 ${POT_FILE}: ../themes/blog/lib/RecentChanges.php
@@ -483,8 +487,10 @@
 ${POT_FILE}: ../themes/SpaceWiki/lib/RecentChanges.php
 ${POT_FILE}: ../themes/SpaceWiki/themeinfo.php
 ${POT_FILE}: ../themes/wikilens/templates/body.tmpl
+${POT_FILE}: ../themes/wikilens/templates/categorypage.tmpl
 ${POT_FILE}: ../themes/wikilens/templates/head.tmpl
 ${POT_FILE}: ../themes/wikilens/templates/navbar.tmpl
+${POT_FILE}: ../themes/wikilens/templates/newuserwelcomepage.tmpl
 ${POT_FILE}: ../themes/wikilens/templates/ratings.tmpl
 ${POT_FILE}: ../themes/wikilens/templates/top.tmpl
 ${POT_FILE}: ../themes/wikilens/themeinfo.php

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	2015-01-09 15:40:00 UTC (rev 9458)
+++ trunk/locale/po/de.po	2015-01-09 15:48:19 UTC (rev 9459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-19 14:34+0100\n"
+"POT-Creation-Date: 2015-01-09 16:45+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -769,23 +769,6 @@
 msgid "User %s removed page %s"
 msgstr "Seite gelöscht %s von Benutzer %s"
 
-msgid "E-mail address confirmation"
-msgstr "E-Mail Bestätigung"
-
-#, php-format
-msgid ""
-"Someone, probably you from IP address %s, has registered an\n"
-"account \"%s\" with this e-mail address on %s.\n"
-"\n"
-"To confirm that this account really does belong to you and activate\n"
-"e-mail features on %s, open this link in your browser:\n"
-"\n"
-"%s\n"
-"\n"
-"If this is *not* you, don't follow the link. This confirmation code\n"
-"will expire at %s."
-msgstr ""
-
 msgid "Optimizing database"
 msgstr "Datenbank wird optimiert"
 
@@ -3815,6 +3798,9 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr "Alle leeren Seiten endgültig entfernen, die nicht verlinkt sind."
 
+msgid "E-mail address confirmation"
+msgstr "E-Mail Bestätigung"
+
 msgid "Convert cached_html"
 msgstr ""
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015-01-09 15:40:00 UTC (rev 9458)
+++ trunk/locale/po/es.po	2015-01-09 15:48:19 UTC (rev 9459)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-19 14:34+0100\n"
+"POT-Creation-Date: 2015-01-09 16:45+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -753,23 +753,6 @@
 msgid "User %s removed page %s"
 msgstr "El usuarios %s eliminado página %s"
 
-msgid "E-mail address confirmation"
-msgstr "Verificación Del Email"
-
-#, php-format
-msgid ""
-"Someone, probably you from IP address %s, has registered an\n"
-"account \"%s\" with this e-mail address on %s.\n"
-"\n"
-"To confirm that this account really does belong to you and activate\n"
-"e-mail features on %s, open this link in your browser:\n"
-"\n"
-"%s\n"
-"\n"
-"If this is *not* you, don't follow the link. This confirmation code\n"
-"will expire at %s."
-msgstr ""
-
 msgid "Optimizing database"
 msgstr "Base de datos óptima"
 
@@ -3710,6 +3693,9 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
+msgid "E-mail address confirmation"
+msgstr "Verificación Del Email"
+
 msgid "Convert cached_html"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015-01-09 15:40:00 UTC (rev 9458)
+++ trunk/locale/po/fr.po	2015-01-09 15:48:19 UTC (rev 9459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-19 14:34+0100\n"
+"POT-Creation-Date: 2015-01-09 16:45+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -753,23 +753,6 @@
 msgid "User %s removed page %s"
 msgstr "L'utilisateur %s a supprimé la page %s"
 
-msgid "E-mail address confirmation"
-msgstr "Vérification de l'adresse électronique"
-
-#, php-format
-msgid ""
-"Someone, probably you from IP address %s, has registered an\n"
-"account \"%s\" with this e-mail address on %s.\n"
-"\n"
-"To confirm that this account really does belong to you and activate\n"
-"e-mail features on %s, open this link in your browser:\n"
-"\n"
-"%s\n"
-"\n"
-"If this is *not* you, don't follow the link. This confirmation code\n"
-"will expire at %s."
-msgstr ""
-
 msgid "Optimizing database"
 msgstr "Optimisation de la base de données"
 
@@ -3769,6 +3752,9 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
+msgid "E-mail address confirmation"
+msgstr "Vérification de l'adresse électronique"
+
 msgid "Convert cached_html"
 msgstr ""
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015-01-09 15:40:00 UTC (rev 9458)
+++ trunk/locale/po/it.po	2015-01-09 15:48:19 UTC (rev 9459)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-19 14:34+0100\n"
+"POT-Creation-Date: 2015-01-09 16:45+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -741,23 +741,6 @@
 msgid "User %s removed page %s"
 msgstr "Utente %s pagina %s rimossa"
 
-msgid "E-mail address confirmation"
-msgstr ""
-
-#, php-format
-msgid ""
-"Someone, probably you from IP address %s, has registered an\n"
-"account \"%s\" with this e-mail address on %s.\n"
-"\n"
-"To confirm that this account really does belong to you and activate\n"
-"e-mail features on %s, open this link in your browser:\n"
-"\n"
-"%s\n"
-"\n"
-"If this is *not* you, don't follow the link. This confirmation code\n"
-"will expire at %s."
-msgstr ""
-
 msgid "Optimizing database"
 msgstr "Base di dati d'ottimizzazione"
 
@@ -3679,6 +3662,9 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
+msgid "E-mail address confirmation"
+msgstr ""
+
 msgid "Convert cached_html"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015-01-09 15:40:00 UTC (rev 9458)
+++ trunk/locale/po/ja.po	2015-01-09 15:48:19 UTC (rev 9459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-19 14:34+0100\n"
+"POT-Creation-Date: 2015-01-09 16:45+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -730,23 +730,6 @@
 msgid "User %s removed page %s"
 msgstr "ページをロックしました。"
 
-msgid "E-mail address confirmation"
-msgstr ""
-
-#, php-format
-msgid ""
-"Someone, probably you from IP address %s, has registered an\n"
-"account \"%s\" with this e-mail address on %s.\n"
-"\n"
-"To confirm that this account really does belong to you and activate\n"
-"e-mail features on %s, open this link in your browser:\n"
-"\n"
-"%s\n"
-"\n"
-"If this is *not* you, don't follow the link. This confirmation code\n"
-"will expire at %s."
-msgstr ""
-
 #, fuzzy
 msgid "Optimizing database"
 msgstr "%s を最適化中です"
@@ -3738,6 +3721,9 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
+msgid "E-mail address confirmation"
+msgstr ""
+
 msgid "Convert cached_html"
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015-01-09 15:40:00 UTC (rev 9458)
+++ trunk/locale/po/nl.po	2015-01-09 15:48:19 UTC (rev 9459)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-19 14:34+0100\n"
+"POT-Creation-Date: 2015-01-09 16:45+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -732,23 +732,6 @@
 msgid "User %s removed page %s"
 msgstr ""
 
-msgid "E-mail address confirmation"
-msgstr ""
-
-#, php-format
-msgid ""
-"Someone, probably you from IP address %s, has registered an\n"
-"account \"%s\" with this e-mail address on %s.\n"
-"\n"
-"To confirm that this account really does belong to you and activate\n"
-"e-mail features on %s, open this link in your browser:\n"
-"\n"
-"%s\n"
-"\n"
-"If this is *not* you, don't follow the link. This confirmation code\n"
-"will expire at %s."
-msgstr ""
-
 msgid "Optimizing database"
 msgstr ""
 
@@ -3671,6 +3654,9 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
+msgid "E-mail address confirmation"
+msgstr ""
+
 msgid "Convert cached_html"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015-01-09 15:40:00 UTC (rev 9458)
+++ trunk/locale/po/phpwiki.pot	2015-01-09 15:48:19 UTC (rev 9459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-19 14:34+0100\n"
+"POT-Creation-Date: 2015-01-09 16:45+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -726,23 +726,6 @@
 msgid "User %s removed page %s"
 msgstr ""
 
-msgid "E-mail address confirmation"
-msgstr ""
-
-#, php-format
-msgid ""
-"Someone, probably you from IP address %s, has registered an\n"
-"account \"%s\" with this e-mail address on %s.\n"
-"\n"
-"To confirm that this account really does belong to you and activate\n"
-"e-mail features on %s, open this link in your browser:\n"
-"\n"
-"%s\n"
-"\n"
-"If this is *not* you, don't follow the link. This confirmation code\n"
-"will expire at %s."
-msgstr ""
-
 msgid "Optimizing database"
 msgstr ""
 
@@ -3663,6 +3646,9 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
+msgid "E-mail address confirmation"
+msgstr ""
+
 msgid "Convert cached_html"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015-01-09 15:40:00 UTC (rev 9458)
+++ trunk/locale/po/sv.po	2015-01-09 15:48:19 UTC (rev 9459)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-19 14:34+0100\n"
+"POT-Creation-Date: 2015-01-09 16:45+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -727,23 +727,6 @@
 msgid "User %s removed page %s"
 msgstr ""
 
-msgid "E-mail address confirmation"
-msgstr ""
-
-#, php-format
-msgid ""
-"Someone, probably you from IP address %s, has registered an\n"
-"account \"%s\" with this e-mail address on %s.\n"
-"\n"
-"To confirm that this account really does belong to you and activate\n"
-"e-mail features on %s, open this link in your browser:\n"
-"\n"
-"%s\n"
-"\n"
-"If this is *not* you, don't follow the link. This confirmation code\n"
-"will expire at %s."
-msgstr ""
-
 msgid "Optimizing database"
 msgstr ""
 
@@ -3664,6 +3647,9 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
+msgid "E-mail address confirmation"
+msgstr ""
+
 msgid "Convert cached_html"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015-01-09 15:40:00 UTC (rev 9458)
+++ trunk/locale/po/zh.po	2015-01-09 15:48:19 UTC (rev 9459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-19 14:34+0100\n"
+"POT-Creation-Date: 2015-01-09 16:45+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -758,24 +758,6 @@
 msgstr "頁面已被鎖定"
 
 #, fuzzy
-msgid "E-mail address confirmation"
-msgstr "Email 驗證"
-
-#, php-format
-msgid ""
-"Someone, probably you from IP address %s, has registered an\n"
-"account \"%s\" with this e-mail address on %s.\n"
-"\n"
-"To confirm that this account really does belong to you and activate\n"
-"e-mail features on %s, open this link in your browser:\n"
-"\n"
-"%s\n"
-"\n"
-"If this is *not* you, don't follow the link. This confirmation code\n"
-"will expire at %s."
-msgstr ""
-
-#, fuzzy
 msgid "Optimizing database"
 msgstr "最佳化 %s"
 
@@ -3827,6 +3809,10 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
+#, fuzzy
+msgid "E-mail address confirmation"
+msgstr "Email 驗證"
+
 msgid "Convert cached_html"
 msgstr ""
 

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

Modified: trunk/locale/update-makefile.sh
===================================================================
--- trunk/locale/update-makefile.sh	2015-01-09 15:40:00 UTC (rev 9458)
+++ trunk/locale/update-makefile.sh	2015-01-09 15:48:19 UTC (rev 9459)
@@ -35,11 +35,10 @@
 # Find all php and html source code which should be scanned
 # by xgettext() for localizeable strings.
 # find ../lib fails on cygwin
-# TODO: autogenerate .exclude list from CVS/Entries
 pot_file_deps () {
-    test -f .exclude || ( echo lib/pear/ > .exclude; echo lib/WikiDB/adodb/ > .exclude; echo lib/nusoap/ > .exclude )
-    (cd ..; find lib themes \( -type d -regex '\(^lib/pear\)\|\(^lib/WikiDB/adodb\)\|\(^lib/nusoap\)' \) -prune -o \( -type f -a -name \*.php -o -name \*.tmpl \)) |
-        egrep -v '(^lib/pear)|(^lib/WikiDB/adodb)|(^lib/nusoap)' |
+    test -f .exclude || ( echo lib/pear/ > .exclude; echo lib/WikiDB/adodb/ > .exclude )
+    (cd ..; find lib themes \( -type d -regex '\(^lib/pear\)\|\(^lib/WikiDB/adodb\)' \) -prune -o \( -type f -a -name \*.php -o -name \*.tmpl \)) |
+        egrep -v '(^lib/pear)|(^lib/WikiDB/adodb)' |
         grep -v -f .exclude |
 	sed 's|^|${POT_FILE}: ../|;' |
 	sort

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:[9458] trunk/lib

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

Revision: 9458
          http://sourceforge.net/p/phpwiki/code/9458
Author:   vargenau
Date:     2015-01-09 15:40:00 +0000 (Fri, 09 Jan 2015)
Log Message:
-----------
Add public/private; update PHP Doc; remove unused functions

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2015-01-06 17:29:35 UTC (rev 9457)
+++ trunk/lib/MailNotify.php	2015-01-09 15:40:00 UTC (rev 9458)
@@ -52,7 +52,7 @@
 class MailNotify
 {
 
-    function MailNotify($pagename)
+    function __construct($pagename)
     {
         $this->pagename = $pagename; /* which page */
         $this->emails = array(); /* to which addresses */
@@ -62,7 +62,7 @@
         $this->from = $this->fromId();
     }
 
-    function fromId()
+    private function fromId()
     {
         global $request;
         if (defined('FUSIONFORGE') and FUSIONFORGE) {
@@ -72,13 +72,13 @@
         }
     }
 
-    function fromEmail()
+    private function fromEmail()
     {
         global $request;
         return $this->userEmail($request->_user->getId(), false);
     }
 
-    function userEmail($userid, $doverify = true)
+    private function userEmail($userid, $doverify = true)
     {
         global $request;
 
@@ -108,14 +108,17 @@
     }
 
     /**
-     * getPageChangeEmails($notify)
-     * @param  $notify: hash ( page => (userid => userhash) )
-     * @return array
-     *         unique array of ($emails, $userids)
+     * getPageChangeEmails
+     * @param  array $notify  hash ( page => (userid => userhash) )
+     * @return array          unique array of ($emails, $userids)
      */
-    function getPageChangeEmails($notify)
+    public function getPageChangeEmails($notify)
     {
+        /**
+         * @var WikiRequest $request
+         */
         global $request;
+
         $emails = array();
         $userids = array();
         foreach ($notify as $page => $users) {
@@ -176,10 +179,14 @@
         return array($this->emails, $this->userids);
     }
 
-    function sendMail($subject,
-                      $content,
-                      $notice = false,
-                      $silent = true)
+    /**
+     * @param string $subject Subject of the e-mail
+     * @param string $content Content of the e-mail
+     * @param bool $notice    Message used when triggering error
+     * @param bool $silent    If true, do not trigger error
+     * @return bool           Return false in case of error
+     */
+    public function sendMail($subject, $content, $notice = false, $silent = true)
     {
         // Add WIKI_NAME to Subject
         $subject = "[" . WIKI_NAME . "] " . $subject;
@@ -187,7 +194,7 @@
         $encoded_subject = $this->subject_encode($subject);
         $emails = $this->emails;
         // Do not send if modification is from FusionForge admin
-        if ((defined('FUSIONFORGE') and FUSIONFORGE) and ($this->fromId() == ADMIN_USER)) {
+        if ((defined('FUSIONFORGE') && FUSIONFORGE) && ($this->fromId() == ADMIN_USER)) {
             return true;
         }
         if (!$notice) {
@@ -249,7 +256,7 @@
      * Send udiff for a changed page to multiple users.
      * See rename and remove methods also
      */
-    function sendPageChangeNotification(&$wikitext, $version, &$meta)
+    private function sendPageChangeNotification(&$wikitext, $version, &$meta)
     {
 
         global $request;
@@ -306,21 +313,28 @@
 
     /**
      * Support mass rename / remove (TBD)
+     * @param string $to New page name
      */
-    function sendPageRenameNotification($to)
+    private function sendPageRenameNotification($to)
     {
         $pagename = $this->pagename;
         $editedby = sprintf(_("Renamed by: %s"), $this->fromId());
         $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");
+        $this->sendMail($subject, $editedby . "\n" . $link . "\n\n" . "Renamed $pagename to $to");
     }
 
-    /**
+    /*
      * The handlers:
      */
-    function onChangePage(&$wikidb, &$wikitext, $version, &$meta)
+
+    /**
+     * @param WikiDB $wikidb
+     * @param string $wikitext
+     * @param string $version
+     * @param array $meta
+     */
+    public function onChangePage(&$wikidb, &$wikitext, $version, &$meta)
     {
         /**
          * @var WikiRequest $request
@@ -342,7 +356,12 @@
         }
     }
 
-    function onDeletePage(&$wikidb, $pagename)
+    /**
+     * @param WikiDB $wikidb
+     * @param string $pagename
+     * @return bool
+     */
+    public function onDeletePage(&$wikidb, $pagename)
     {
         /**
          * @var WikiRequest $request
@@ -365,7 +384,12 @@
         return $result;
     }
 
-    function onRenamePage(&$wikidb, $oldpage, $new_pagename)
+    /**
+     * @param WikiDB $wikidb
+     * @param string $oldpage
+     * @param string $new_pagename
+     */
+    public function onRenamePage(&$wikidb, $oldpage, $new_pagename)
     {
         /**
          * @var WikiRequest $request
@@ -384,76 +408,8 @@
         }
     }
 
-    /**
-     * Send mail to user and store the cookie in the db
-     * wikiurl?action=ConfirmEmail&id=bla
-     */
-    function sendEmailConfirmation($email, $userid)
+    private function subject_encode($subject)
     {
-        global $request;
-        $id = rand_ascii_readable(16);
-        $wikidb = $request->getDbh();
-        $data = $wikidb->get('ConfirmEmail');
-        while (!empty($data[$id])) { // id collision
-            $id = rand_ascii_readable(16);
-        }
-        $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
-account \"%s\" with this e-mail address on %s.
-
-To confirm that this account really does belong to you and activate
-e-mail features on %s, open this link in your browser:
-
-%s
-
-If this is *not* you, don't follow the link. This confirmation code
-will expire at %s.",
-            $ip, $userid, WIKI_NAME, WIKI_NAME,
-            WikiURL(HOME_PAGE, array('action' => 'ConfirmEmail',
-                    'id' => $id),
-                true),
-            CTime($expire_date));
-        $this->sendMail($subject, $content, "", true);
-        $data[$id] = array('email' => $email,
-            'userid' => $userid,
-            'expire' => $expire_date);
-        $wikidb->set('ConfirmEmail', $data);
-        return '';
-    }
-
-    function checkEmailConfirmation()
-    {
-        global $request;
-        $wikidb = $request->getDbh();
-        $data = $wikidb->get('ConfirmEmail');
-        $id = $request->getArg('id');
-        if (empty($data[$id])) { // id not found
-            return HTML(HTML::h1("Confirm E-mail address"),
-                HTML::h1("Sorry! Wrong URL"));
-        }
-        // upgrade the user
-        $userid = $data['userid'];
-        $u = $request->getUser();
-        if ($u->UserName() == $userid) { // lucky: current user (session)
-            $request->_user->_level = WIKIAUTH_USER;
-            $request->_prefs->set('emailVerified', true);
-        } else { // not current user
-            $u = WikiUser($userid);
-            $u->getPreferences();
-            $u->_level = WIKIAUTH_USER;
-            $request->setUser($u);
-            $request->_prefs->set('emailVerified', true);
-        }
-        unset($data[$id]);
-        $wikidb->set('ConfirmEmail', $data);
-        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");

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2015-01-06 17:29:35 UTC (rev 9457)
+++ trunk/lib/WikiDB.php	2015-01-09 15:40:00 UTC (rev 9458)
@@ -41,6 +41,11 @@
 class WikiDB
 {
     /**
+     * @var WikiDB_backend $_backend
+     */
+    public $_backend;
+
+    /**
      * @see open()
      */
     function __construct(&$backend, $dbparams)

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2015-01-06 17:29:35 UTC (rev 9457)
+++ trunk/lib/main.php	2015-01-09 15:40:00 UTC (rev 9458)
@@ -47,6 +47,9 @@
 
 class WikiRequest extends Request
 {
+    /**
+     * @var WikiDB $_dbi
+     */
     public $_dbi;
 
     function __construct()

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

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

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

Revision: 9457
          http://sourceforge.net/p/phpwiki/code/9457
Author:   vargenau
Date:     2015-01-06 17:29:35 +0000 (Tue, 06 Jan 2015)
Log Message:
-----------
Update ReleaseNotes: Fix Bug#648 Call to protected method

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

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015-01-06 16:56:26 UTC (rev 9456)
+++ trunk/pgsrc/ReleaseNotes	2015-01-06 17:29:35 UTC (rev 9457)
@@ -1,4 +1,4 @@
-Date: Wed, 26 Nov 2014 14:19:39 +0000
+Date: Tue,  6 Jan 2015 18:23:55 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -8,8 +8,9 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
-== 1.5.3 2014-11-XX Marc-Etienne Vargenau ==
+== 1.5.3 2015-01-XX Marc-Etienne Vargenau ==
 
+* Fix Bug#648 Call to protected method
 * easier file upload: forbidden characters in filename are replaced by dashes (instead of rejecting upload)
 * improve handling of image insertion icon in edit toolbar (icon did not always appear after image uploading)
 * bigger wikipaging font

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

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

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

Revision: 9456
          http://sourceforge.net/p/phpwiki/code/9456
Author:   vargenau
Date:     2015-01-06 16:56:26 +0000 (Tue, 06 Jan 2015)
Log Message:
-----------
function text_search must be public (reported by Harold Hallikainen); harmonize parameters

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/ADODB.php
    trunk/lib/WikiDB/backend/PDO.php
    trunk/lib/WikiDB/backend/PearDB.php
    trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
    trunk/lib/WikiDB/backend/PearDB_pgsql.php
    trunk/lib/WikiDB/backend/cvs.php
    trunk/lib/WikiDB/backend.php

Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2015-01-06 16:19:51 UTC (rev 9455)
+++ trunk/lib/WikiDB/backend/ADODB.php	2015-01-06 16:56:26 UTC (rev 9456)
@@ -845,7 +845,8 @@
         return $row[0];
     }
 
-    function get_all_pages($include_empty = false, $sortby = '', $limit = '', $exclude = '')
+    public function get_all_pages($include_empty = false,
+                                  $sortby = '', $limit = '', $exclude = '')
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
@@ -909,8 +910,8 @@
     /**
      * Title and fulltext search.
      */
-    function text_search($search, $fullsearch = false,
-                         $sortby = '', $limit = '', $exclude = '')
+    public function text_search($search, $fulltext = false,
+                                $sortby = '', $limit = '', $exclude = '')
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
@@ -923,7 +924,7 @@
         $field_list = $this->page_tbl_field_list;
         $searchobj = new WikiDB_backend_ADODB_search($search, $dbh);
 
-        if ($fullsearch) {
+        if ($fulltext) {
             $table .= ", $recent_tbl";
             $join_clause .= " AND $page_tbl.id=$recent_tbl.id";
 
@@ -950,7 +951,7 @@
             $result = $dbh->Execute($sql);
         }
         $iter = new WikiDB_backend_ADODB_iter($this, $result, $field_list);
-        if ($fullsearch)
+        if ($fulltext)
             $iter->stoplisted = $searchobj->stoplisted;
         return $iter;
     }

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2015-01-06 16:19:51 UTC (rev 9455)
+++ trunk/lib/WikiDB/backend/PDO.php	2015-01-06 16:56:26 UTC (rev 9456)
@@ -832,7 +832,8 @@
         return $sth->fetchColumn();
     }
 
-    function get_all_pages($include_empty = false, $sortby = '', $limit = '', $exclude = '')
+    public function get_all_pages($include_empty = false,
+                                  $sortby = '', $limit = '', $exclude = '')
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
@@ -888,8 +889,8 @@
     /**
      * Title and fulltext search.
      */
-    function text_search($search, $fullsearch = false,
-                         $sortby = '', $limit = '', $exclude = '')
+    public function text_search($search, $fulltext = false,
+                                $sortby = '', $limit = '', $exclude = '')
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
@@ -903,7 +904,7 @@
         $field_list = $this->page_tbl_field_list;
         $searchobj = new WikiDB_backend_PDO_search($search, $dbh);
 
-        if ($fullsearch) {
+        if ($fulltext) {
             $table .= ", $recent_tbl";
             $join_clause .= " AND $page_tbl.id=$recent_tbl.id";
 

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2015-01-06 16:19:51 UTC (rev 9455)
+++ trunk/lib/WikiDB/backend/PearDB.php	2015-01-06 16:56:26 UTC (rev 9456)
@@ -648,7 +648,8 @@
         return $row['result'];
     }
 
-    function get_all_pages($include_empty = false, $sortby = '', $limit = '', $exclude = '')
+    public function get_all_pages($include_empty = false,
+                                  $sortby = '', $limit = '', $exclude = '')
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
@@ -707,11 +708,11 @@
     }
 
     /**
-     * Title search.
+     * Text search (title or full text)
      * Todo: exclude
      */
-    function text_search($search, $fulltext = false, $sortby = '', $limit = '',
-                         $exclude = '')
+    public function text_search($search, $fulltext = false,
+                                $sortby = '', $limit = '', $exclude = '')
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);

Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015-01-06 16:19:51 UTC (rev 9455)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015-01-06 16:56:26 UTC (rev 9456)
@@ -317,7 +317,8 @@
         return new WikiDB_backend_PearDB_iter($this, $result);
     }
 
-    function get_all_pages($include_empty = false, $sortby = '', $limit = '', $exclude = '')
+    public function get_all_pages($include_empty = false,
+                                  $sortby = '', $limit = '', $exclude = '')
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
@@ -584,10 +585,10 @@
     }
 
     /**
-     * Title search.
+     * Text search (title or full text)
      */
-    function text_search($search, $fulltext = false, $sortby = '', $limit = '',
-                         $exclude = '')
+    public function text_search($search, $fulltext = false,
+                                $sortby = '', $limit = '', $exclude = '')
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);

Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_pgsql.php	2015-01-06 16:19:51 UTC (rev 9455)
+++ trunk/lib/WikiDB/backend/PearDB_pgsql.php	2015-01-06 16:56:26 UTC (rev 9456)
@@ -217,10 +217,10 @@
     }
 
     /**
-     * Title search.
+     * Text search (title or full text)
      */
-    function text_search($search, $fulltext = false, $sortby = '', $limit = '',
-                         $exclude = '')
+    public function text_search($search, $fulltext = false,
+                                $sortby = '', $limit = '', $exclude = '')
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);

Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php	2015-01-06 16:19:51 UTC (rev 9455)
+++ trunk/lib/WikiDB/backend/cvs.php	2015-01-06 16:56:26 UTC (rev 9456)
@@ -407,16 +407,18 @@
         return new WikiDB_backend_dumb_AllRevisionsIter($this, $pagename);
     } */
 
-    function get_all_pages($include_empty = false, $orderby = false, $limit = '', $exclude = '')
+    public function get_all_pages($include_empty = false,
+                                  $sortby = '', $limit = '', $exclude = '')
     {
         // FIXME: this ignores the parameters.
         return new Cvs_Backend_Array_Iterator(
             $this->_getAllFileNamesInDir($this->_docDir));
     }
 
-    function text_search($search, $fullsearch = false, $orderby = false, $limit = '', $exclude = '')
+    public function text_search($search, $fulltext = false,
+                                $sortby = '', $limit = '', $exclude = '')
     {
-        if ($fullsearch) {
+        if ($fulltext) {
             $iter = new Cvs_Backend_Full_Search_Iterator(
                 $this->_getAllFileNamesInDir($this->_docDir),
                 $search,

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2015-01-06 16:19:51 UTC (rev 9455)
+++ trunk/lib/WikiDB/backend.php	2015-01-06 16:56:26 UTC (rev 9456)
@@ -307,7 +307,7 @@
      * Pages should be returned in alphabetical order if that is
      * feasible.
      *
-     * @param bool $include_defaulted
+     * @param bool $include_empty
      * If set, even pages with no content will be returned
      * --- but still only if they have at least one revision (not
      * counting the default revision 0) entered in the database.
@@ -316,12 +316,13 @@
      * are not returned as these pages are considered to be
      * non-existing.
      *
-     * @param bool $orderby
+     * @param string $sortby
      * @param string $limit
      * @param string $exclude
      * @return object A WikiDB_backend_iterator.
      */
-    abstract public function get_all_pages($include_defaulted, $orderby = false, $limit = '', $exclude = '');
+    abstract public function get_all_pages($include_empty,
+                                           $sortby = '', $limit = '', $exclude = '');
 
     /**
      * Title or full text search.
@@ -343,8 +344,8 @@
      *
      * @see WikiDB::titleSearch
      */
-    protected function text_search($search, $fulltext = false, $sortby = '',
-                         $limit = '', $exclude = '')
+    public function text_search($search, $fulltext = false,
+                                $sortby = '', $limit = '', $exclude = '')
     {
         // This method implements a simple linear search
         // through all the pages in the database.

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

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

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

Revision: 9455
          http://sourceforge.net/p/phpwiki/code/9455
Author:   vargenau
Date:     2015-01-06 16:19:51 +0000 (Tue, 06 Jan 2015)
Log Message:
-----------
Typo

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

Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mysql.php	2014-12-19 15:49:55 UTC (rev 9454)
+++ trunk/lib/WikiDB/backend/ADODB_mysql.php	2015-01-06 16:19:51 UTC (rev 9455)
@@ -3,7 +3,7 @@
 require_once 'lib/WikiDB/backend/ADODB.php';
 
 /*
- * PROBLEM: mysql seems to be the simpliest (or most stupid) db on earth.
+ * PROBLEM: mysql seems to be the simplest (or most stupid) db on earth.
  * (tested with 4.0.18)
  * See http://sql-info.de/mysql/gotchas.html for mysql specific quirks.
  *

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9454] trunk/lib/HtmlElement.php

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

Revision: 9454
          http://sourceforge.net/p/phpwiki/code/9454
Author:   vargenau
Date:     2014-12-19 15:49:55 +0000 (Fri, 19 Dec 2014)
Log Message:
-----------
Remove dead URL

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

Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php	2014-12-19 15:49:15 UTC (rev 9453)
+++ trunk/lib/HtmlElement.php	2014-12-19 15:49:55 UTC (rev 9454)
@@ -658,14 +658,12 @@
  */
 function JavaScript($js, $script_args = array())
 {
-    $default_script_args = array( //'version' => 'JavaScript', // not xhtml conformant
-        'type' => 'text/javascript');
+    $default_script_args = array('type' => 'text/javascript');
     $script_args = $script_args ? array_merge($default_script_args, $script_args)
         : $default_script_args;
     if (empty($js))
         return HTML(HTML::script($script_args), "\n");
     else
-        // see http://devedge.netscape.com/viewsource/2003/xhtml-style-script/
         return HTML(HTML::script($script_args,
             new RawXml((ENABLE_XHTML_XML ? "\n//<![CDATA[" : "\n<!--//")
                 . "\n" . trim($js) . "\n"

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9453] trunk/lib/WikiPlugin.php

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

Revision: 9453
          http://sourceforge.net/p/phpwiki/code/9453
Author:   vargenau
Date:     2014-12-19 15:49:15 +0000 (Fri, 19 Dec 2014)
Log Message:
-----------
Indent

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

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2014-12-19 15:32:20 UTC (rev 9452)
+++ trunk/lib/WikiPlugin.php	2014-12-19 15:49:15 UTC (rev 9453)
@@ -384,7 +384,8 @@
     {
         if (!$request) {
             $request =& $GLOBALS['request'];
-        } $dbi = $request->getDbh();
+        }
+        $dbi = $request->getDbh();
         return $this->makeBox('', $this->run($dbi, $args, $request, $basepage));
     }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9452] trunk/lib/ArchiveCleaner.php

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

Revision: 9452
          http://sourceforge.net/p/phpwiki/code/9452
Author:   vargenau
Date:     2014-12-19 15:32:20 +0000 (Fri, 19 Dec 2014)
Log Message:
-----------
Update PHP Doc

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

Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php	2014-12-19 13:37:02 UTC (rev 9451)
+++ trunk/lib/ArchiveCleaner.php	2014-12-19 15:32:20 UTC (rev 9452)
@@ -27,10 +27,10 @@
     }
 
     /**
-     * @param $revision
+     * @param WikiDB_PageRevision $revision
      * @return bool
      */
-    function isMergeable($revision)
+    private function isMergeable($revision)
     {
         if (!$revision->get('is_minor_edit'))
             return false;
@@ -44,21 +44,18 @@
             && $author_id == $previous->get('author_id');
     }
 
-    function cleanDatabase($dbi)
+    /**
+     * @param WikiDB_Page $page
+     */
+    public function cleanPageRevisions($page)
     {
-        $iter = $dbi->getAllPages();
-        while ($page = $iter->next())
-            $this->cleanPageRevisions($page);
-    }
-
-    function cleanPageRevisions($page)
-    {
         $INFINITY = 0x7fffffff;
 
         $expire = &$this->expire_params;
         $counter = array();
-        foreach (array('major', 'minor', 'author') as $class)
-            $counter[$class] = new ArchiveCleaner_Counter($expire[$class]);
+        $counter['major'] = new ArchiveCleaner_Counter($expire['major']);
+        $counter['minor'] = new ArchiveCleaner_Counter($expire['minor']);
+        $counter['author'] = new ArchiveCleaner_Counter($expire['author']);
         // shortcut to keep all
         if (($counter['minor']->min_keep == $INFINITY)
             and ($counter['major']->min_keep == $INFINITY)
@@ -134,7 +131,11 @@
 
     }
 
-    function computeAge($revision)
+    /**
+     * @param WikiDB_PageRevision $revision
+     * @return float|int
+     */
+    private function computeAge($revision)
     {
         $supplanted = $revision->get('_supplanted');
 
@@ -160,6 +161,10 @@
         return ($this->now - $supplanted) / (24 * 3600);
     }
 
+    /**
+     * @param WikiDB_PageRevision $revision
+     * @return bool
+     */
     function keep($revision)
     {
         $INFINITY = 0x7fffffff;

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

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

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

Revision: 9448
          http://sourceforge.net/p/phpwiki/code/9448
Author:   vargenau
Date:     2014-12-18 17:08:11 +0000 (Thu, 18 Dec 2014)
Log Message:
-----------
Add public/protected/private

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

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2014-12-17 14:35:04 UTC (rev 9447)
+++ trunk/lib/loadsave.php	2014-12-18 17:08:11 UTC (rev 9448)
@@ -1327,10 +1327,10 @@
         $this->_includefiles = $_include;
         $this->_exclude = $exclude;
         $this->_skiplist = array();
-        parent::FileSet($dirname);
+        parent::__construct($dirname);
     }
 
-    function _filenameSelector($fn)
+    protected function _filenameSelector($fn)
     {
         $incl = &$this->_includefiles;
         $excl = &$this->_exclude;

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-12-17 14:35:04 UTC (rev 9447)
+++ trunk/lib/stdlib.php	2014-12-18 17:08:11 UTC (rev 9448)
@@ -657,20 +657,20 @@
 
 class Stack
 {
-    function Stack()
+    function __construct()
     {
         $this->items = array();
         $this->size = 0;
     }
 
-    function push($item)
+    public function push($item)
     {
         $this->items[$this->size] = $item;
         $this->size++;
         return true;
     }
 
-    function pop()
+    public function pop()
     {
         if ($this->size == 0) {
             return false; // stack is empty
@@ -679,12 +679,12 @@
         return $this->items[$this->size];
     }
 
-    function cnt()
+    public function cnt()
     {
         return $this->size;
     }
 
-    function top()
+    public function top()
     {
         if ($this->size)
             return $this->items[$this->size - 1];
@@ -768,9 +768,7 @@
         return $WikiTheme->linkBadWikiWord($wikipage, $url);
     }
 
-    return HTML::a(array('href' => WikiURL($pagename, $args),
-            'class' => $class),
-        $text);
+    return HTML::a(array('href' => WikiURL($pagename, $args), 'class' => $class), $text);
 }
 
 /**
@@ -890,7 +888,7 @@
             $this->shortName, join(', ', $warnings));
     }
 
-    function _pagename($page)
+    private function _pagename($page)
     {
         if (is_a($page, 'WikiDB_Page'))
             return $page->getName();
@@ -901,7 +899,7 @@
         return $page;
     }
 
-    function _normalize_bad_pagename($name)
+    private function _normalize_bad_pagename($name)
     {
         trigger_error("Bad pagename: " . $name, E_USER_WARNING);
 
@@ -922,7 +920,7 @@
      * which cannot be deleted anymore, because unknown chars are compressed.
      * So BEFORE importing a file _check must be done !!!
      */
-    function _check($pagename)
+    private function _check($pagename)
     {
         // Compress internal white-space to single space character.
         $pagename = preg_replace('/[\s\xa0]+/', ' ', $orig = $pagename);
@@ -972,7 +970,7 @@
  * Converts all tabs to (the appropriate number of) spaces.
  *
  * @param string $str
- * @param integer $tab_width
+ * @param int $tab_width
  * @return string
  */
 function expand_tabs($str, $tab_width = 8)
@@ -1338,7 +1336,7 @@
 
 class fileSet
 {
-    function fileSet($directory, $filepattern = false)
+    function __construct($directory, $filepattern = false)
     {
         $this->_fileList = array();
         $this->_pattern = $filepattern;
@@ -1374,7 +1372,7 @@
      * (This was a function LoadDir in lib/loadsave.php)
      * See also http://www.php.net/manual/en/function.readdir.php
      */
-    function getFiles($exclude = '', $sortby = '', $limit = '')
+    public function getFiles($exclude = '', $sortby = '', $limit = '')
     {
         $list = $this->_fileList;
 
@@ -1400,7 +1398,7 @@
         return $list;
     }
 
-    function _filenameSelector($filename)
+    protected function _filenameSelector($filename)
     {
         if (!$this->_pattern)
             return true;
@@ -1419,7 +1417,7 @@
      * A file is considered an image when the suffix matches one from
      * INLINE_IMAGES.
      */
-    function _filenameSelector($filename)
+    protected function _filenameSelector($filename)
     {
         return is_image($filename);
     }
@@ -1427,7 +1425,7 @@
 
 class imageOrVideoSet extends fileSet
 {
-    function _filenameSelector($filename)
+    protected function _filenameSelector($filename)
     {
         return is_image($filename) or is_video($filename);
     }
@@ -1638,7 +1636,7 @@
     /**
      * Show the alert box.
      */
-    function show()
+    public function show()
     {
         global $request;
 
@@ -1651,7 +1649,7 @@
         $request->finish();
     }
 
-    function _getButtons()
+    private function _getButtons()
     {
         global $request;
 

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

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

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

Revision: 9447
          http://sourceforge.net/p/phpwiki/code/9447
Author:   vargenau
Date:     2014-12-17 14:35:04 +0000 (Wed, 17 Dec 2014)
Log Message:
-----------
Remove EMailConfirm (unused)

Modified Paths:
--------------
    trunk/locale/Makefile

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2014-12-17 14:33:42 UTC (rev 9446)
+++ trunk/locale/Makefile	2014-12-17 14:35:04 UTC (rev 9447)
@@ -315,7 +315,6 @@
 ${POT_FILE}: ../lib/WikiUser/AdoDb.php
 ${POT_FILE}: ../lib/WikiUser/BogoLogin.php
 ${POT_FILE}: ../lib/WikiUser/Db.php
-${POT_FILE}: ../lib/WikiUser/EMailConfirm.php
 ${POT_FILE}: ../lib/WikiUser/Facebook.php
 ${POT_FILE}: ../lib/WikiUser/File.php
 ${POT_FILE}: ../lib/WikiUser/Forbidden.php

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

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

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

Revision: 9446
          http://sourceforge.net/p/phpwiki/code/9446
Author:   vargenau
Date:     2014-12-17 14:33:42 +0000 (Wed, 17 Dec 2014)
Log Message:
-----------
Remove EMailConfirm (unused)

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

Removed Paths:
-------------
    trunk/lib/WikiUser/EMailConfirm.php

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2014-12-17 14:25:01 UTC (rev 9445)
+++ trunk/TODO	2014-12-17 14:33:42 UTC (rev 9446)
@@ -38,7 +38,6 @@
 * ATOM (experimentally done), TrackBack, PingBack services (take it from DokuWiki)
 * finish Blog theme
 * lang: mapping
-* WikiUser/EMailConfirm (?)
 * ImportMediaWiki, ImportRdf, ImportOwl, ExportMediaWiki, ExportRdf, ExportOwl
 * WikiUser/OpenID (from DokuWiki) - Status::in_work
 * more meta stuff: OpenSearch, format=dc (Dublin Core)

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2014-12-17 14:25:01 UTC (rev 9445)
+++ trunk/lib/MailNotify.php	2014-12-17 14:33:42 UTC (rev 9446)
@@ -31,7 +31,6 @@
  *   [Watch] WatchPage - add a page, or delete watch handlers into the users
  *                       pref[notifyPages] slot.
  *   My WatchList      - view or edit list/regex of pref[notifyPages].
- *   EMailConfirm methods: send and verify
  *
  * Helper functions:
  *   getPageChangeEmails

Deleted: trunk/lib/WikiUser/EMailConfirm.php
===================================================================
--- trunk/lib/WikiUser/EMailConfirm.php	2014-12-17 14:25:01 UTC (rev 9445)
+++ trunk/lib/WikiUser/EMailConfirm.php	2014-12-17 14:33:42 UTC (rev 9446)
@@ -1,67 +0,0 @@
-<?php
-
-/*
- * Copyright (C) 2006 ReiniUrban
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-class _EMailConfirmPassUser
-    extends _PassUser
-    /**
-     * Unconfirmed users have ANON access,
-     * confirmed users are equal to passusers WIKIAUTH_USER.
-     *
-     * Users give their email at registration, phpwiki sends a link per email,
-     * user clicks on url link to verify, user is confirmed.
-     *
-     * Preferences are handled in _PassUser
-     */
-{
-    // This can only be called from _PassUser, because the parent class
-    // sets the pref methods, before this class is initialized.
-    function _EMailConfirmPassUser($UserName = '', $prefs = false, $file = '')
-    {
-        if (!$this->_prefs and is_a($this, "_EMailPassUser")) {
-            if ($prefs) $this->_prefs = $prefs;
-            if (!isset($this->_prefs->_method))
-                _PassUser::_PassUser($UserName);
-        }
-        $this->_userid = $UserName;
-        return $this;
-    }
-
-    function userExists()
-    {
-        if (!$this->isValidName($this->_userid)) {
-            return $this->_tryNextUser();
-        }
-        $this->_authmethod = 'EMailConfirm';
-        // check the prefs for emailVerified
-        if ($this->_prefs->get('emailVerified'))
-            return true;
-        return $this->_tryNextUser();
-    }
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:

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

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

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

Revision: 9445
          http://sourceforge.net/p/phpwiki/code/9445
Author:   vargenau
Date:     2014-12-17 14:25:01 +0000 (Wed, 17 Dec 2014)
Log Message:
-----------
Remove unused

Modified Paths:
--------------
    trunk/lib/Template.php
    trunk/lib/WikiDB/backend/ADODB.php
    trunk/lib/WikiDB/backend/PDO.php
    trunk/lib/WikiPlugin.php
    trunk/lib/WikiUser.php
    trunk/lib/display.php
    trunk/lib/pdf.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/stdlib.php

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2014-12-17 14:23:56 UTC (rev 9444)
+++ trunk/lib/Template.php	2014-12-17 14:25:01 UTC (rev 9445)
@@ -288,7 +288,7 @@
     if (!isset($args['HEADER']))
         $args['HEADER'] = SplitPagename($title);
 
-    global $HIDE_TOOLBARS, $NO_BASEHREF, $WikiTheme;
+    global $HIDE_TOOLBARS, $WikiTheme;
     $HIDE_TOOLBARS = true;
     if (!$WikiTheme->DUMP_MODE)
         $WikiTheme->DUMP_MODE = 'HTML';

Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2014-12-17 14:23:56 UTC (rev 9444)
+++ trunk/lib/WikiDB/backend/ADODB.php	2014-12-17 14:25:01 UTC (rev 9445)
@@ -280,7 +280,7 @@
         $dbh = &$this->_dbh;
         $page_tbl = $this->_table_names['page_tbl'];
         if (empty($data)) $data = '';
-        $rs = $dbh->Execute("UPDATE $page_tbl"
+        $dbh->Execute("UPDATE $page_tbl"
                 . " SET cached_html=?"
                 . " WHERE pagename=?",
             array($data, $pagename));
@@ -1366,7 +1366,6 @@
     function next()
     {
         $result = &$this->_result;
-        $backend = &$this->_backend;
         if (!$result || $result->EOF) {
             $this->free();
             return false;

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2014-12-17 14:23:56 UTC (rev 9444)
+++ trunk/lib/WikiDB/backend/PDO.php	2014-12-17 14:25:01 UTC (rev 9445)
@@ -1321,7 +1321,6 @@
 
     function write_accesslog(&$entry)
     {
-        global $request;
         $dbh = &$this->_dbh;
         $log_tbl = $entry->_accesslog->logtable;
         $dbh->prepare("INSERT INTO $log_tbl"

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2014-12-17 14:23:56 UTC (rev 9444)
+++ trunk/lib/WikiPlugin.php	2014-12-17 14:25:01 UTC (rev 9445)
@@ -322,7 +322,6 @@
             'class' => $args['class'],
             'accept-charset' => 'UTF-8'));
         if (!USE_PATH_INFO) {
-            $pagename = $request->get('pagename');
             $form->pushContent(HTML::input(array('type' => 'hidden',
                 'name' => 'pagename',
                 'value' => $args['targetpage'])));

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2014-12-17 14:23:56 UTC (rev 9444)
+++ trunk/lib/WikiUser.php	2014-12-17 14:25:01 UTC (rev 9445)
@@ -1254,7 +1254,7 @@
         while ($user and $user->_userid) {
             $user = UpgradeUser($this, $user);
             if ($user->userExists()) {
-                $user = UpgradeUser($this, $user);
+                UpgradeUser($this, $user);
                 return true;
             }
             // prevent endless loop. does this work on all PHP's?
@@ -1405,7 +1405,7 @@
             while ($user = new $class($this->_userid, $this->_prefs)) {
                 $user = UpgradeUser($this, $user);
                 if ($user->userExists()) {
-                    $user = UpgradeUser($this, $user);
+                    UpgradeUser($this, $user);
                     return true;
                 }
                 if ($class == "_ForbiddenPassUser") return false;

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2014-12-17 14:23:56 UTC (rev 9444)
+++ trunk/lib/display.php	2014-12-17 14:25:01 UTC (rev 9445)
@@ -157,7 +157,7 @@
         if ($format == 'pdf') {
             require_once 'lib/pdf.php';
             array_unshift($args['VALID_LINKS'], $pagename);
-            ConvertAndDisplayPdfPageList($request, $pagelist, $args);
+            ConvertAndDisplayPdfPageList($request, $pagelist);
         } elseif ($format == 'ziphtml') { // need to fix links
             require_once 'lib/loadsave.php';
             array_unshift($args['VALID_LINKS'], $pagename);

Modified: trunk/lib/pdf.php
===================================================================
--- trunk/lib/pdf.php	2014-12-17 14:23:56 UTC (rev 9444)
+++ trunk/lib/pdf.php	2014-12-17 14:25:01 UTC (rev 9445)
@@ -28,13 +28,12 @@
  * htmldoc or ghostscript + html2ps or docbook (dbdoclet, xsltproc, fop)
  * http://www.easysw.com/htmldoc
  */
-function ConvertAndDisplayPdfPageList(&$request, $pagelist, $args = array())
+function ConvertAndDisplayPdfPageList(&$request, $pagelist)
 {
     global $WikiTheme;
     if (empty($request->_is_buffering_output))
         $request->buffer_output(false /*'nocompress'*/);
     $pagename = $request->getArg('pagename');
-    $dest = $request->getArg('dest');
     $request->setArg('dest', false);
     $request->setArg('format', false);
     include_once 'lib/display.php';

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2014-12-17 14:23:56 UTC (rev 9444)
+++ trunk/lib/plugin/ModeratedPage.php	2014-12-17 14:25:01 UTC (rev 9445)
@@ -304,8 +304,6 @@
             $this->cleanup_and_notify($request, $args, $moderation);
             // start from scratch, dispatch the action as in lib/main to the action handler
             $request->discardOutput();
-            $oldargs = $request->args;
-            $olduser = $request->_user;
             $request->args = $moderation['args'];
             $request->_user->_userid = $moderation['userid']; // keep current perms but fake the id.
             // TODO: fake author ip also

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-12-17 14:23:56 UTC (rev 9444)
+++ trunk/lib/stdlib.php	2014-12-17 14:25:01 UTC (rev 9445)
@@ -2019,8 +2019,6 @@
     if (empty($line)) return $options;
 
     // First we have an attribute name.
-    $attribute = "";
-    $value = "";
 
     $i = 0;
     while (($i < strlen($line)) && ($line[$i] != '=')) {

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

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

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

Revision: 9444
          http://sourceforge.net/p/phpwiki/code/9444
Author:   vargenau
Date:     2014-12-17 14:23:56 +0000 (Wed, 17 Dec 2014)
Log Message:
-----------
Add $this

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

Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php	2014-12-16 13:44:44 UTC (rev 9443)
+++ trunk/lib/WikiDB/backend/cvs.php	2014-12-17 14:23:56 UTC (rev 9444)
@@ -961,16 +961,16 @@
                          $documentDir = ".")
     {
         $this->Cvs_Backend_Array_Iterator($arrayValue);
-        $_searchString = $searchString;
-        $_docDir = $documentDir;
+        $this->_searchString = $searchString;
+        $this->_docDir = $documentDir;
     }
 
     function next()
     {
         do {
             $pageName = Cvs_Backend_Array_Iterator::next();
-        } while (!$this->_searchFile($_searchString,
-            $_docDir . "/" . $pageName));
+        } while (!$this->_searchFile($this->_searchString,
+            $this->_docDir . "/" . $pageName));
 
         return $pageName;
     }
@@ -1006,7 +1006,7 @@
                          $searchString = "")
     {
         parent::__construct($arrayValue);
-        $_searchString = $searchString;
+        $this->_searchString = $searchString;
     }
 
     function next()

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

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

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

Revision: 9443
          http://sourceforge.net/p/phpwiki/code/9443
Author:   vargenau
Date:     2014-12-16 13:44:44 +0000 (Tue, 16 Dec 2014)
Log Message:
-----------
Add Composer and Twig

Added Paths:
-----------
    trunk/composer.json
    trunk/composer.lock
    trunk/vendor/
    trunk/vendor/autoload.php
    trunk/vendor/bin/
    trunk/vendor/bin/composer
    trunk/vendor/composer/
    trunk/vendor/composer/ClassLoader.php
    trunk/vendor/composer/autoload_classmap.php
    trunk/vendor/composer/autoload_namespaces.php
    trunk/vendor/composer/autoload_psr4.php
    trunk/vendor/composer/autoload_real.php
    trunk/vendor/composer/installed.json
    trunk/vendor/twig/
    trunk/vendor/twig/twig/
    trunk/vendor/twig/twig/.editorconfig
    trunk/vendor/twig/twig/.gitignore
    trunk/vendor/twig/twig/.travis.yml
    trunk/vendor/twig/twig/CHANGELOG
    trunk/vendor/twig/twig/LICENSE
    trunk/vendor/twig/twig/README.rst
    trunk/vendor/twig/twig/composer.json
    trunk/vendor/twig/twig/doc/
    trunk/vendor/twig/twig/doc/advanced.rst
    trunk/vendor/twig/twig/doc/advanced_legacy.rst
    trunk/vendor/twig/twig/doc/api.rst
    trunk/vendor/twig/twig/doc/coding_standards.rst
    trunk/vendor/twig/twig/doc/deprecated.rst
    trunk/vendor/twig/twig/doc/filters/
    trunk/vendor/twig/twig/doc/filters/abs.rst
    trunk/vendor/twig/twig/doc/filters/batch.rst
    trunk/vendor/twig/twig/doc/filters/capitalize.rst
    trunk/vendor/twig/twig/doc/filters/convert_encoding.rst
    trunk/vendor/twig/twig/doc/filters/date.rst
    trunk/vendor/twig/twig/doc/filters/date_modify.rst
    trunk/vendor/twig/twig/doc/filters/default.rst
    trunk/vendor/twig/twig/doc/filters/escape.rst
    trunk/vendor/twig/twig/doc/filters/first.rst
    trunk/vendor/twig/twig/doc/filters/format.rst
    trunk/vendor/twig/twig/doc/filters/index.rst
    trunk/vendor/twig/twig/doc/filters/join.rst
    trunk/vendor/twig/twig/doc/filters/json_encode.rst
    trunk/vendor/twig/twig/doc/filters/keys.rst
    trunk/vendor/twig/twig/doc/filters/last.rst
    trunk/vendor/twig/twig/doc/filters/length.rst
    trunk/vendor/twig/twig/doc/filters/lower.rst
    trunk/vendor/twig/twig/doc/filters/merge.rst
    trunk/vendor/twig/twig/doc/filters/nl2br.rst
    trunk/vendor/twig/twig/doc/filters/number_format.rst
    trunk/vendor/twig/twig/doc/filters/raw.rst
    trunk/vendor/twig/twig/doc/filters/replace.rst
    trunk/vendor/twig/twig/doc/filters/reverse.rst
    trunk/vendor/twig/twig/doc/filters/round.rst
    trunk/vendor/twig/twig/doc/filters/slice.rst
    trunk/vendor/twig/twig/doc/filters/sort.rst
    trunk/vendor/twig/twig/doc/filters/split.rst
    trunk/vendor/twig/twig/doc/filters/striptags.rst
    trunk/vendor/twig/twig/doc/filters/title.rst
    trunk/vendor/twig/twig/doc/filters/trim.rst
    trunk/vendor/twig/twig/doc/filters/upper.rst
    trunk/vendor/twig/twig/doc/filters/url_encode.rst
    trunk/vendor/twig/twig/doc/functions/
    trunk/vendor/twig/twig/doc/functions/attribute.rst
    trunk/vendor/twig/twig/doc/functions/block.rst
    trunk/vendor/twig/twig/doc/functions/constant.rst
    trunk/vendor/twig/twig/doc/functions/cycle.rst
    trunk/vendor/twig/twig/doc/functions/date.rst
    trunk/vendor/twig/twig/doc/functions/dump.rst
    trunk/vendor/twig/twig/doc/functions/include.rst
    trunk/vendor/twig/twig/doc/functions/index.rst
    trunk/vendor/twig/twig/doc/functions/max.rst
    trunk/vendor/twig/twig/doc/functions/min.rst
    trunk/vendor/twig/twig/doc/functions/parent.rst
    trunk/vendor/twig/twig/doc/functions/random.rst
    trunk/vendor/twig/twig/doc/functions/range.rst
    trunk/vendor/twig/twig/doc/functions/source.rst
    trunk/vendor/twig/twig/doc/functions/template_from_string.rst
    trunk/vendor/twig/twig/doc/index.rst
    trunk/vendor/twig/twig/doc/installation.rst
    trunk/vendor/twig/twig/doc/internals.rst
    trunk/vendor/twig/twig/doc/intro.rst
    trunk/vendor/twig/twig/doc/recipes.rst
    trunk/vendor/twig/twig/doc/tags/
    trunk/vendor/twig/twig/doc/tags/autoescape.rst
    trunk/vendor/twig/twig/doc/tags/block.rst
    trunk/vendor/twig/twig/doc/tags/do.rst
    trunk/vendor/twig/twig/doc/tags/embed.rst
    trunk/vendor/twig/twig/doc/tags/extends.rst
    trunk/vendor/twig/twig/doc/tags/filter.rst
    trunk/vendor/twig/twig/doc/tags/flush.rst
    trunk/vendor/twig/twig/doc/tags/for.rst
    trunk/vendor/twig/twig/doc/tags/from.rst
    trunk/vendor/twig/twig/doc/tags/if.rst
    trunk/vendor/twig/twig/doc/tags/import.rst
    trunk/vendor/twig/twig/doc/tags/include.rst
    trunk/vendor/twig/twig/doc/tags/index.rst
    trunk/vendor/twig/twig/doc/tags/macro.rst
    trunk/vendor/twig/twig/doc/tags/sandbox.rst
    trunk/vendor/twig/twig/doc/tags/set.rst
    trunk/vendor/twig/twig/doc/tags/spaceless.rst
    trunk/vendor/twig/twig/doc/tags/use.rst
    trunk/vendor/twig/twig/doc/tags/verbatim.rst
    trunk/vendor/twig/twig/doc/templates.rst
    trunk/vendor/twig/twig/doc/tests/
    trunk/vendor/twig/twig/doc/tests/constant.rst
    trunk/vendor/twig/twig/doc/tests/defined.rst
    trunk/vendor/twig/twig/doc/tests/divisibleby.rst
    trunk/vendor/twig/twig/doc/tests/empty.rst
    trunk/vendor/twig/twig/doc/tests/even.rst
    trunk/vendor/twig/twig/doc/tests/index.rst
    trunk/vendor/twig/twig/doc/tests/iterable.rst
    trunk/vendor/twig/twig/doc/tests/null.rst
    trunk/vendor/twig/twig/doc/tests/odd.rst
    trunk/vendor/twig/twig/doc/tests/sameas.rst
    trunk/vendor/twig/twig/ext/
    trunk/vendor/twig/twig/ext/twig/
    trunk/vendor/twig/twig/ext/twig/.gitignore
    trunk/vendor/twig/twig/ext/twig/config.m4
    trunk/vendor/twig/twig/ext/twig/config.w32
    trunk/vendor/twig/twig/ext/twig/php_twig.h
    trunk/vendor/twig/twig/ext/twig/twig.c
    trunk/vendor/twig/twig/lib/
    trunk/vendor/twig/twig/lib/Twig/
    trunk/vendor/twig/twig/lib/Twig/Autoloader.php
    trunk/vendor/twig/twig/lib/Twig/Compiler.php
    trunk/vendor/twig/twig/lib/Twig/CompilerInterface.php
    trunk/vendor/twig/twig/lib/Twig/Environment.php
    trunk/vendor/twig/twig/lib/Twig/Error/
    trunk/vendor/twig/twig/lib/Twig/Error/Loader.php
    trunk/vendor/twig/twig/lib/Twig/Error/Runtime.php
    trunk/vendor/twig/twig/lib/Twig/Error/Syntax.php
    trunk/vendor/twig/twig/lib/Twig/Error.php
    trunk/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
    trunk/vendor/twig/twig/lib/Twig/ExpressionParser.php
    trunk/vendor/twig/twig/lib/Twig/Extension/
    trunk/vendor/twig/twig/lib/Twig/Extension/Core.php
    trunk/vendor/twig/twig/lib/Twig/Extension/Debug.php
    trunk/vendor/twig/twig/lib/Twig/Extension/Escaper.php
    trunk/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
    trunk/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
    trunk/vendor/twig/twig/lib/Twig/Extension/Staging.php
    trunk/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
    trunk/vendor/twig/twig/lib/Twig/Extension.php
    trunk/vendor/twig/twig/lib/Twig/ExtensionInterface.php
    trunk/vendor/twig/twig/lib/Twig/Filter/
    trunk/vendor/twig/twig/lib/Twig/Filter/Function.php
    trunk/vendor/twig/twig/lib/Twig/Filter/Method.php
    trunk/vendor/twig/twig/lib/Twig/Filter/Node.php
    trunk/vendor/twig/twig/lib/Twig/Filter.php
    trunk/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
    trunk/vendor/twig/twig/lib/Twig/FilterInterface.php
    trunk/vendor/twig/twig/lib/Twig/Function/
    trunk/vendor/twig/twig/lib/Twig/Function/Function.php
    trunk/vendor/twig/twig/lib/Twig/Function/Method.php
    trunk/vendor/twig/twig/lib/Twig/Function/Node.php
    trunk/vendor/twig/twig/lib/Twig/Function.php
    trunk/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
    trunk/vendor/twig/twig/lib/Twig/FunctionInterface.php
    trunk/vendor/twig/twig/lib/Twig/Lexer.php
    trunk/vendor/twig/twig/lib/Twig/LexerInterface.php
    trunk/vendor/twig/twig/lib/Twig/Loader/
    trunk/vendor/twig/twig/lib/Twig/Loader/Array.php
    trunk/vendor/twig/twig/lib/Twig/Loader/Chain.php
    trunk/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
    trunk/vendor/twig/twig/lib/Twig/Loader/String.php
    trunk/vendor/twig/twig/lib/Twig/LoaderInterface.php
    trunk/vendor/twig/twig/lib/Twig/Markup.php
    trunk/vendor/twig/twig/lib/Twig/Node/
    trunk/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
    trunk/vendor/twig/twig/lib/Twig/Node/Block.php
    trunk/vendor/twig/twig/lib/Twig/Node/BlockReference.php
    trunk/vendor/twig/twig/lib/Twig/Node/Body.php
    trunk/vendor/twig/twig/lib/Twig/Node/Do.php
    trunk/vendor/twig/twig/lib/Twig/Node/Embed.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Filter/
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary/
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
    trunk/vendor/twig/twig/lib/Twig/Node/Expression.php
    trunk/vendor/twig/twig/lib/Twig/Node/Flush.php
    trunk/vendor/twig/twig/lib/Twig/Node/For.php
    trunk/vendor/twig/twig/lib/Twig/Node/ForLoop.php
    trunk/vendor/twig/twig/lib/Twig/Node/If.php
    trunk/vendor/twig/twig/lib/Twig/Node/Import.php
    trunk/vendor/twig/twig/lib/Twig/Node/Include.php
    trunk/vendor/twig/twig/lib/Twig/Node/Macro.php
    trunk/vendor/twig/twig/lib/Twig/Node/Module.php
    trunk/vendor/twig/twig/lib/Twig/Node/Print.php
    trunk/vendor/twig/twig/lib/Twig/Node/Sandbox.php
    trunk/vendor/twig/twig/lib/Twig/Node/SandboxedModule.php
    trunk/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
    trunk/vendor/twig/twig/lib/Twig/Node/Set.php
    trunk/vendor/twig/twig/lib/Twig/Node/SetTemp.php
    trunk/vendor/twig/twig/lib/Twig/Node/Spaceless.php
    trunk/vendor/twig/twig/lib/Twig/Node/Text.php
    trunk/vendor/twig/twig/lib/Twig/Node.php
    trunk/vendor/twig/twig/lib/Twig/NodeInterface.php
    trunk/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
    trunk/vendor/twig/twig/lib/Twig/NodeTraverser.php
    trunk/vendor/twig/twig/lib/Twig/NodeVisitor/
    trunk/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
    trunk/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
    trunk/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
    trunk/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
    trunk/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
    trunk/vendor/twig/twig/lib/Twig/Parser.php
    trunk/vendor/twig/twig/lib/Twig/ParserInterface.php
    trunk/vendor/twig/twig/lib/Twig/Sandbox/
    trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
    trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
    trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
    trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
    trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
    trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
    trunk/vendor/twig/twig/lib/Twig/SimpleFilter.php
    trunk/vendor/twig/twig/lib/Twig/SimpleFunction.php
    trunk/vendor/twig/twig/lib/Twig/SimpleTest.php
    trunk/vendor/twig/twig/lib/Twig/Template.php
    trunk/vendor/twig/twig/lib/Twig/TemplateInterface.php
    trunk/vendor/twig/twig/lib/Twig/Test/
    trunk/vendor/twig/twig/lib/Twig/Test/Function.php
    trunk/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
    trunk/vendor/twig/twig/lib/Twig/Test/Method.php
    trunk/vendor/twig/twig/lib/Twig/Test/Node.php
    trunk/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
    trunk/vendor/twig/twig/lib/Twig/Test.php
    trunk/vendor/twig/twig/lib/Twig/TestCallableInterface.php
    trunk/vendor/twig/twig/lib/Twig/TestInterface.php
    trunk/vendor/twig/twig/lib/Twig/Token.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/
    trunk/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/Block.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/Do.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/For.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/From.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/If.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/Import.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/Include.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/Set.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser/Use.php
    trunk/vendor/twig/twig/lib/Twig/TokenParser.php
    trunk/vendor/twig/twig/lib/Twig/TokenParserBroker.php
    trunk/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
    trunk/vendor/twig/twig/lib/Twig/TokenParserInterface.php
    trunk/vendor/twig/twig/lib/Twig/TokenStream.php
    trunk/vendor/twig/twig/phpunit.xml.dist
    trunk/vendor/twig/twig/test/
    trunk/vendor/twig/twig/test/Twig/
    trunk/vendor/twig/twig/test/Twig/Tests/
    trunk/vendor/twig/twig/test/Twig/Tests/AutoloaderTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/CompilerTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/EnvironmentTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/ErrorTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/ExpressionParserTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Extension/
    trunk/vendor/twig/twig/test/Twig/Tests/Extension/CoreTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Extension/SandboxTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/FileCachingTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/base.html
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/index.html
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/unclosed_tag.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_trait.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array_call.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/binary.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/bitwise.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/comparison.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/divisibleby.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/dotdot.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ends_with.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/grouping.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/literals.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/magic_call.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/matches.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/method_call.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/operators_as_variables.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/postfix.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/sameas.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/starts_with.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/strings.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_noelse.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_nothen.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/two_word_operators_as_variables.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary_precedence.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/abs.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_float.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_empty_fill.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_exact_elements.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_fill.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/convert_encoding.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format_interval.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_immutable.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_interval.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_modify.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_namedargs.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/default.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/dynamic_filter.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_html_attr.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_non_supported_charset.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/first.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/force_escape.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/format.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/join.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/json_encode.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/last.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length_utf8.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/merge.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/nl2br.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format_default.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/replace.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/reverse.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/round.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/slice.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/sort.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/special_chars.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split_utf8.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/trim.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode_deprecated.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/attribute.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/block.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/constant.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/cycle.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date_namedargs.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump_array.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dynamic_function.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/assignment.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/autoescaping.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/basic.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/expression.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/ignore_missing.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing_nested.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/template_instance.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/templates_as_array.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_context.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_variables.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/max.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/min.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/range.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/recursive_block_with_inheritance.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/source.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/special_chars.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/template_from_string.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/default_values.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/nested_calls.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/reserved_variables.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/simple.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/with_filters.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/combined_debug_info.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/empty_token.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/issue_1143.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/multi_word_tests.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/simple_xml_element.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/basic.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/blocks.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/double_escaping.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/functions.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/literal.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/nested.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/objects.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/raw.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/strategy.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/type.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters_arguments.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_pre_escape_filters.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/basic.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/block_unique_name.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/special_chars.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/basic.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/error_line.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/multiple.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/nested.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/with_extends.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/basic.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/json_encode.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/multiple.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/nested.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_for_tag.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_if_tag.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/condition.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/context.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/else.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/inner_variables.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys_and_values.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context_local.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined_cond.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/nested_else.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects_countable.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/recursive.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/values.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/from.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/basic.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/expression.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/basic.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/expression.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/ignore_missing.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing_nested.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/only.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/template_instance.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/templates_as_array.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/with_variables.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/basic.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr2.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/conditional.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/dynamic.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/empty.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/multiple.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_inheritance.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_change.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_in_a_block.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_isolation.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_nested.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/template_instance.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/use.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/basic.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/endmacro_name.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/external.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/from.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/global.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/self_import.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/special_chars.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/super_globals.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/basic.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/mixed_usage_with_raw.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/whitespace_control.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid1.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid2.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/simple.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/basic.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture-empty.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/expression.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/spaceless/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/spaceless/simple.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/special_chars.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/trim_block.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/aliases.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/basic.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep_empty.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance2.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple_aliases.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block2.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block3.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/basic.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/whitespace_control.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/array.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/constant.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/defined.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/empty.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/even.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in_with_objects.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/iterable.test
    trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/odd.test
    trunk/vendor/twig/twig/test/Twig/Tests/IntegrationTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/LexerTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/ArrayTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/ChainTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/FilesystemTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named/
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named/index.html
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_bis/
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_bis/index.html
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_final/
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_final/index.html
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_ter/
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_ter/index.html
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal/
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal/index.html
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_bis/
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_bis/index.html
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_final/
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_final/index.html
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_ter/
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_ter/index.html
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme1/
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme1/blocks.html.twig
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme2/
    trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme2/blocks.html.twig
    trunk/vendor/twig/twig/test/Twig/Tests/NativeExtensionTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/
    trunk/vendor/twig/twig/test/Twig/Tests/Node/AutoEscapeTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/BlockReferenceTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/BlockTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/DoTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/ArrayTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/AssignNameTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AddTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AndTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ConcatTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/DivTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/FloorDivTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ModTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/MulTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/OrTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/SubTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/CallTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/ConditionalTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/ConstantTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/FilterTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/FunctionTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/GetAttrTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/NameTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/FilterInclude.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/FunctionInclude.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/TestInclude.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/ParentTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/TestTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NegTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NotTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/PosTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/ForTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/IfTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/ImportTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/IncludeTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/MacroTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/ModuleTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/PrintTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/SandboxTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/SandboxedModuleTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/SandboxedPrintTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/SetTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/SpacelessTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/Node/TextTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/NodeVisitor/
    trunk/vendor/twig/twig/test/Twig/Tests/NodeVisitor/OptimizerTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/ParserTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/TemplateTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/TokenStreamTest.php
    trunk/vendor/twig/twig/test/Twig/Tests/escapingTest.php
    trunk/vendor/twig/twig/test/bootstrap.php

Added: trunk/composer.json
===================================================================
--- trunk/composer.json	                        (rev 0)
+++ trunk/composer.json	2014-12-16 13:44:44 UTC (rev 9443)
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "twig/twig": "~1.0"
+    }
+}

Added: trunk/composer.lock
===================================================================
--- trunk/composer.lock	                        (rev 0)
+++ trunk/composer.lock	2014-12-16 13:44:44 UTC (rev 9443)
@@ -0,0 +1,75 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "a31e651ea26a527432562441b3545e0a",
+    "packages": [
+        {
+            "name": "twig/twig",
+            "version": "v1.16.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/Twig.git",
+                "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/42f758d9fe2146d1f0470604fc05ee43580873fc",
+                "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.16-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Twig_": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fa...@sy...",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Armin Ronacher",
+                    "email": "arm...@ac...",
+                    "role": "Project Founder"
+                },
+                {
+                    "name": "Twig Team",
+                    "homepage": "https://github.com/fabpot/Twig/graphs/contributors",
+                    "role": "Contributors"
+                }
+            ],
+            "description": "Twig, the flexible, fast, and secure template language for PHP",
+            "homepage": "http://twig.sensiolabs.org",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2014-10-17 12:53:44"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": []
+}

Added: trunk/vendor/autoload.php
===================================================================
--- trunk/vendor/autoload.php	                        (rev 0)
+++ trunk/vendor/autoload.php	2014-12-16 13:44:44 UTC (rev 9443)
@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer' . '/autoload_real.php';
+
+return ComposerAutoloaderInitac3ac6a53c444c96c86cc3afe46d2f91::getLoader();

Added: trunk/vendor/bin/composer
===================================================================
(Binary files differ)

Index: trunk/vendor/bin/composer
===================================================================
--- trunk/vendor/bin/composer	2014-12-11 18:00:59 UTC (rev 9442)
+++ trunk/vendor/bin/composer	2014-12-16 13:44:44 UTC (rev 9443)

Property changes on: trunk/vendor/bin/composer
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/vendor/composer/ClassLoader.php
===================================================================
--- trunk/vendor/composer/ClassLoader.php	                        (rev 0)
+++ trunk/vendor/composer/ClassLoader.php	2014-12-16 13:44:44 UTC (rev 9443)
@@ -0,0 +1,387 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <nad...@na...>
+ *     Jordi Boggiano <j.b...@se...>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0 class loader
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fa...@sy...>
+ * @author Jordi Boggiano <j.b...@se...>
+ */
+class ClassLoader
+{
+    // PSR-4
+    private $prefixLengthsPsr4 = array();
+    private $prefixDirsPsr4 = array();
+    private $fallbackDirsPsr4 = array();
+
+    // PSR-0
+    private $prefixesPsr0 = array();
+    private $fallbackDirsPsr0 = array();
+
+    private $useIncludePath = false;
+    private $classMap = array();
+
+    public function getPrefixes()
+    {
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
+        }
+
+        return array();
+    }
+
+    public function getPrefixesPsr4()
+    {
+        return $this->prefixDirsPsr4;
+    }
+
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirsPsr0;
+    }
+
+    public function getFallbackDirsPsr4()
+    {
+        return $this->fallbackDirsPsr4;
+    }
+
+    public function getClassMap()
+    {
+        return $this->classMap;
+    }
+
+    /**
+     * @param array $classMap Class to filename map
+     */
+    public function addClassMap(array $classMap)
+    {
+        if ($this->classMap) {
+            $this->classMap = array_merge($this->classMap, $classMap);
+        } else {
+            $this->classMap = $classMap;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix, either
+     * appending or prepending to the ones previously set for this prefix.
+     *
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
+     */
+    public function add($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            if ($prepend) {
+                $this->fallbackDirsPsr0 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr0
+                );
+            } else {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $this->fallbackDirsPsr0,
+                    (array) $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $this->prefixesPsr0[$first][$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace, either
+     * appending or prepending to the ones previously set for this namespace.
+     *
+     * @param string       $prefix  The prefix/namespace, with trailing '\\'
+     * @param array|string $paths   The PSR-0 base directories
+     * @param bool         $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                $this->fallbackDirsPsr4 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr4
+                );
+            } else {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $this->fallbackDirsPsr4,
+                    (array) $paths
+                );
+            }
+        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $this->prefixDirsPsr4[$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix,
+     * replacing any others previously set for this prefix.
+     *
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
+     */
+    public function set($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr0 = (array) $paths;
+        } else {
+            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace,
+     * replacing any others previously set for this namespace.
+     *
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setPsr4($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr4 = (array) $paths;
+        } else {
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include path for class files.
+     *
+     * @param bool $useIncludePath
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return bool
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param  string    $class The name of the class
+     * @return bool|null True if loaded, null otherwise
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            includeFile($file);
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|false The path if found, false otherwise
+     */
+    public function findFile($class)
+    {
+        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
+        if ('\\' == $class[0]) {
+            $class = substr($class, 1);
+        }
+
+        // class map lookup
+        if (isset($this->classMap[$class])) {
+            return $this->classMap[$class];
+        }
+
+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if ($file === null && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if ($file === null) {
+            // Remember that this class does not exist.
+            return $this->classMap[$class] = false;
+        }
+
+        return $file;
+    }
+
+    private function findFileWithExtension($class, $ext)
+    {
+        // PSR-4 lookup
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+        $first = $class[0];
+        if (isset($this->prefixLengthsPsr4[$first])) {
+            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-4 fallback dirs
+        foreach ($this->fallbackDirsPsr4 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 lookup
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+        }
+
+        if (isset($this->prefixesPsr0[$first])) {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-0 fallback dirs
+        foreach ($this->fallbackDirsPsr0 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 include paths.
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+            return $file;
+        }
+    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+    include $file;
+}

Added: trunk/vendor/composer/autoload_classmap.php
===================================================================
--- trunk/vendor/composer/autoload_classmap.php	                        (rev 0)
+++ trunk/vendor/composer/autoload_classmap.php	2014-12-16 13:44:44 UTC (rev 9443)
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+);

Added: trunk/vendor/composer/autoload_namespaces.php
===================================================================
--- trunk/vendor/composer/autoload_namespaces.php	                        (rev 0)
+++ trunk/vendor/composer/autoload_namespaces.php	2014-12-16 13:44:44 UTC (rev 9443)
@@ -0,0 +1,10 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+    'Twig_' => array($vendorDir . '/twig/twig/lib'),
+);

...
 
[truncated message content]

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

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

Revision: 9442
          http://sourceforge.net/p/phpwiki/code/9442
Author:   vargenau
Date:     2014-12-11 18:00:59 +0000 (Thu, 11 Dec 2014)
Log Message:
-----------
Add public/protected/private

Modified Paths:
--------------
    trunk/lib/diff.php
    trunk/lib/diff3.php
    trunk/lib/difflib.php

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2014-12-10 17:54:49 UTC (rev 9441)
+++ trunk/lib/diff.php	2014-12-11 18:00:59 UTC (rev 9442)
@@ -20,7 +20,7 @@
         $this->_tag = '~begin';
     }
 
-    function _flushGroup($new_tag)
+    private function _flushGroup($new_tag)
     {
         if ($this->_group !== false) {
             if (!$this->_line)
@@ -34,7 +34,7 @@
         $this->_tag = $new_tag;
     }
 
-    function _flushLine($new_tag)
+    private function _flushLine($new_tag)
     {
         $this->_flushGroup($new_tag);
         if ($this->_line)
@@ -42,7 +42,7 @@
         $this->_line = HTML();
     }
 
-    function addWords($words, $tag = '')
+    public function addWords($words, $tag = '')
     {
         if ($tag != $this->_tag)
             $this->_flushGroup($tag);
@@ -61,7 +61,7 @@
         }
     }
 
-    function getLines()
+    public function getLines()
     {
         $this->_flushLine('~done');
         return $this->_lines;
@@ -79,7 +79,7 @@
             $orig_stripped, $final_stripped);
     }
 
-    function _split($lines)
+    private function _split($lines)
     {
         // FIXME: fix POSIX char class.
         if (!preg_match_all('/ ( [^\S\n]+ | [[:alnum:]]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
@@ -91,7 +91,7 @@
         return array($m[0], $m[1]);
     }
 
-    function orig()
+    public function orig()
     {
         $orig = new _HWLDF_WordAccumulator;
 
@@ -104,7 +104,7 @@
         return $orig->getLines();
     }
 
-    function _final()
+    public function _final()
     {
         $final = new _HWLDF_WordAccumulator;
 
@@ -143,31 +143,31 @@
         parent::__construct($context_lines);
     }
 
-    function _start_diff()
+    protected function _start_diff()
     {
         $this->_top = HTML::div(array('class' => 'diff'));
     }
 
-    function _end_diff()
+    protected function _end_diff()
     {
         $val = $this->_top;
         unset($this->_top);
         return $val;
     }
 
-    function _start_block($header)
+    protected function _start_block($header)
     {
         $this->_block = HTML::div(array('class' => 'block'),
             HTML::samp($header));
     }
 
-    function _end_block()
+    protected function _end_block()
     {
         $this->_top->pushContent($this->_block);
         unset($this->_block);
     }
 
-    function _lines($lines, $class, $prefix = false, $elem = false)
+    protected function _lines($lines, $class, $prefix = false, $elem = false)
     {
         if (!$prefix)
             $prefix = HTML::raw('&nbsp;');
@@ -183,22 +183,22 @@
         $this->_block->pushContent($div);
     }
 
-    function _context($lines)
+    protected function _context($lines)
     {
         $this->_lines($lines, 'context');
     }
 
-    function _deleted($lines)
+    protected function _deleted($lines)
     {
         $this->_lines($lines, 'deleted', '-', 'del');
     }
 
-    function _added($lines)
+    protected function _added($lines)
     {
         $this->_lines($lines, 'added', '+', 'ins');
     }
 
-    function _changed($orig, $final)
+    protected function _changed($orig, $final)
     {
         $diff = new WordLevelDiff($orig, $final);
         $this->_lines($diff->orig(), 'original', '-');

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2014-12-10 17:54:49 UTC (rev 9441)
+++ trunk/lib/diff3.php	2014-12-11 18:00:59 UTC (rev 9442)
@@ -21,7 +21,7 @@
         $this->final2 = $final2 ? $final2 : array();
     }
 
-    function merged()
+    protected function merged()
     {
         if (!isset($this->_merged)) {
             if ($this->final1 === $this->final2)
@@ -34,7 +34,7 @@
         return $this->_merged;
     }
 
-    function is_conflict()
+    protected function is_conflict()
     {
         return $this->merged() === false;
     }
@@ -51,12 +51,12 @@
         $this->final2 = &$this->orig;
     }
 
-    function merged()
+    protected function merged()
     {
         return $this->orig;
     }
 
-    function is_conflict()
+    protected function is_conflict()
     {
         return false;
     }
@@ -73,40 +73,42 @@
         $this->_init();
     }
 
-    function _init()
+    private function _init()
     {
-        $this->orig = $this->final1 = $this->final2 = array();
+        $this->orig = array();
+        $this->final1 = array();
+        $this->final2 = array();
     }
 
-    function _append(&$array, $lines)
+    private function _append(&$array, $lines)
     {
         array_splice($array, sizeof($array), 0, $lines);
     }
 
-    function input($lines)
+    public function input($lines)
     {
         if ($lines)
             $this->_append($this->orig, $lines);
     }
 
-    function out1($lines)
+    public function out1($lines)
     {
         if ($lines)
             $this->_append($this->final1, $lines);
     }
 
-    function out2($lines)
+    public function out2($lines)
     {
         if ($lines)
             $this->_append($this->final2, $lines);
     }
 
-    function is_empty()
+    private function is_empty()
     {
         return !$this->orig && !$this->final1 && !$this->final2;
     }
 
-    function finish()
+    public function finish()
     {
         if ($this->is_empty())
             return false;
@@ -128,7 +130,7 @@
             $eng->diff($orig, $final2));
     }
 
-    function __diff3($edits1, $edits2)
+    private function __diff3($edits1, $edits2)
     {
         $blocks = array();
         $bb = new _Diff3_BlockBuilder;
@@ -136,11 +138,6 @@
         $e1 = current($edits1);
         $e2 = current($edits2);
         while ($e1 || $e2) {
-//          echo "====\n";
-//          print_r($e1);
-//          print_r($e2);
-//          echo "====\n";
-
             if ($e1 && $e2 && $e1->type == 'copy' && $e2->type == 'copy') {
                 // We have copy blocks from both diffs.  This is the (only)
                 // time we want to emit a diff3 copy block.
@@ -195,7 +192,7 @@
         return $blocks;
     }
 
-    function merged_output($label1 = false, $label2 = false)
+    public function merged_output($label1 = false, $label2 = false)
     {
         $lines = array();
         foreach ($this->blocks as $block) {

Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php	2014-12-10 17:54:49 UTC (rev 9441)
+++ trunk/lib/difflib.php	2014-12-11 18:00:59 UTC (rev 9442)
@@ -14,14 +14,14 @@
     public $orig;
     public $final;
 
-    abstract function reverse();
+    abstract public function reverse();
 
-    function norig()
+    public function norig()
     {
         return $this->orig ? sizeof($this->orig) : 0;
     }
 
-    function nfinal()
+    public function nfinal()
     {
         return $this->final ? sizeof($this->final) : 0;
     }
@@ -39,7 +39,7 @@
         $this->final = $final;
     }
 
-    function reverse()
+    public function reverse()
     {
         return new _DiffOp_Copy($this->final, $this->orig);
     }
@@ -55,7 +55,7 @@
         $this->final = false;
     }
 
-    function reverse()
+    public function reverse()
     {
         return new _DiffOp_Add($this->orig);
     }
@@ -71,7 +71,7 @@
         $this->orig = false;
     }
 
-    function reverse()
+    public function reverse()
     {
         return new _DiffOp_Delete($this->final);
     }
@@ -87,7 +87,7 @@
         $this->final = $final;
     }
 
-    function reverse()
+    public function reverse()
     {
         return new _DiffOp_Change($this->final, $this->orig);
     }
@@ -125,7 +125,7 @@
     public $seq;
     public $in_seq;
 
-    function diff($from_lines, $to_lines)
+    public function diff($from_lines, $to_lines)
     {
         $n_from = sizeof($from_lines);
         $n_to = sizeof($to_lines);
@@ -229,7 +229,7 @@
      * match.  The caller must trim matching lines from the beginning and end
      * of the portions it is going to specify.
      */
-    function _diag($xoff, $xlim, $yoff, $ylim, $nchunks)
+    private function _diag($xoff, $xlim, $yoff, $ylim, $nchunks)
     {
         $flip = false;
 
@@ -303,7 +303,7 @@
         return array($this->lcs, $seps);
     }
 
-    function _lcs_pos($ypos)
+    private function _lcs_pos($ypos)
     {
         $end = $this->lcs;
         if ($end == 0 || $ypos > $this->seq[$end]) {
@@ -340,7 +340,7 @@
      * Note that XLIM, YLIM are exclusive bounds.
      * All line numbers are origin-0 and discarded lines are not counted.
      */
-    function _compareseq($xoff, $xlim, $yoff, $ylim)
+    private function _compareseq($xoff, $xlim, $yoff, $ylim)
     {
         // Slide down the bottom initial diagonal.
         while ($xoff < $xlim && $yoff < $ylim
@@ -397,7 +397,7 @@
      *
      * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
      */
-    function _shift_boundaries($lines, &$changed, $other_changed)
+    private function _shift_boundaries($lines, &$changed, $other_changed)
     {
         $i = 0;
         $j = 0;
@@ -526,35 +526,14 @@
     {
         $eng = new _DiffEngine;
         $this->edits = $eng->diff($from_lines, $to_lines);
-        //$this->_check($from_lines, $to_lines);
     }
 
     /**
-     * Compute reversed Diff.
-     *
-     * SYNOPSIS:
-     *
-     *  $diff = new Diff($lines1, $lines2);
-     *  $rev = $diff->reverse();
-     * @return object A Diff object representing the inverse of the
-     *                original diff.
-     */
-    function reverse()
-    {
-        $rev = $this;
-        $rev->edits = array();
-        foreach ($this->edits as $edit) {
-            $rev->edits[] = $edit->reverse();
-        }
-        return $rev;
-    }
-
-    /**
      * Check for empty diff.
      *
      * @return bool True iff two sequences were identical.
      */
-    function isEmpty()
+    public function isEmpty()
     {
         foreach ($this->edits as $edit) {
             if ($edit->type != 'copy')
@@ -564,23 +543,6 @@
     }
 
     /**
-     * Compute the length of the Longest Common Subsequence (LCS).
-     *
-     * This is mostly for diagnostic purposed.
-     *
-     * @return int The length of the LCS.
-     */
-    function lcs()
-    {
-        $lcs = 0;
-        foreach ($this->edits as $edit) {
-            if ($edit->type == 'copy')
-                $lcs += sizeof($edit->orig);
-        }
-        return $lcs;
-    }
-
-    /**
      * Get the original set of lines.
      *
      * This reconstructs the $from_lines parameter passed to the
@@ -588,7 +550,7 @@
      *
      * @return array The original sequence of strings.
      */
-    function orig()
+    public function orig()
     {
         $lines = array();
 
@@ -607,7 +569,7 @@
      *
      * @return array The sequence of strings.
      */
-    function _final()
+    public function _final()
     {
         $lines = array();
 
@@ -617,37 +579,6 @@
         }
         return $lines;
     }
-
-    /**
-     * Check a Diff for validity.
-     *
-     * This is here only for debugging purposes.
-     * @param string $from_lines
-     * @param string $to_lines
-     */
-    function _check($from_lines, $to_lines)
-    {
-        if (serialize($from_lines) != serialize($this->orig()))
-            trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
-        if (serialize($to_lines) != serialize($this->_final()))
-            trigger_error("Reconstructed final doesn't match", E_USER_ERROR);
-
-        $rev = $this->reverse();
-        if (serialize($to_lines) != serialize($rev->orig()))
-            trigger_error("Reversed original doesn't match", E_USER_ERROR);
-        if (serialize($from_lines) != serialize($rev->_final()))
-            trigger_error("Reversed final doesn't match", E_USER_ERROR);
-
-        $prevtype = 'none';
-        foreach ($this->edits as $edit) {
-            if ($prevtype == $edit->type)
-                trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
-            $prevtype = $edit->type;
-        }
-
-        $lcs = $this->lcs();
-        trigger_error("Diff okay: LCS = $lcs", E_USER_NOTICE);
-    }
 }
 
 /**
@@ -738,7 +669,7 @@
      * @param $diff object A Diff object.
      * @return string The formatted output.
      */
-    function format($diff)
+    public function format($diff)
     {
 
         $xi = $yi = 1;
@@ -793,7 +724,7 @@
         return $this->_end_diff();
     }
 
-    function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
+    private function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
     {
         $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
         foreach ($edits as $edit) {
@@ -808,19 +739,19 @@
         $this->_end_block();
     }
 
-    function _start_diff()
+    protected function _start_diff()
     {
         ob_start();
     }
 
-    function _end_diff()
+    protected function _end_diff()
     {
         $val = ob_get_contents();
         ob_end_clean();
         return $val;
     }
 
-    function _block_header($xbeg, $xlen, $ybeg, $ylen)
+    protected function _block_header($xbeg, $xlen, $ybeg, $ylen)
     {
         if ($xlen > 1)
             $xbeg .= "," . ($xbeg + $xlen - 1);
@@ -830,37 +761,37 @@
         return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
     }
 
-    function _start_block($header)
+    protected function _start_block($header)
     {
         echo $header;
     }
 
-    function _end_block()
+    protected function _end_block()
     {
     }
 
-    function _lines($lines, $prefix = ' ')
+    protected function _lines($lines, $prefix = ' ')
     {
         foreach ($lines as $line)
             echo "$prefix $line\n";
     }
 
-    function _context($lines)
+    protected function _context($lines)
     {
         $this->_lines($lines);
     }
 
-    function _added($lines)
+    protected function _added($lines)
     {
         $this->_lines($lines, ">");
     }
 
-    function _deleted($lines)
+    protected function _deleted($lines)
     {
         $this->_lines($lines, "<");
     }
 
-    function _changed($orig, $final)
+    protected function _changed($orig, $final)
     {
         $this->_deleted($orig);
         echo "---\n";
@@ -881,7 +812,7 @@
         $this->trailing_context_lines = $context_lines;
     }
 
-    function _block_header($xbeg, $xlen, $ybeg, $ylen)
+    protected function _block_header($xbeg, $xlen, $ybeg, $ylen)
     {
         if ($xlen != 1)
             $xbeg .= "," . $xlen;
@@ -890,17 +821,17 @@
         return "@@ -$xbeg +$ybeg @@\n";
     }
 
-    function _added($lines)
+    protected function _added($lines)
     {
         $this->_lines($lines, "+");
     }
 
-    function _deleted($lines)
+    protected function _deleted($lines)
     {
         $this->_lines($lines, "-");
     }
 
-    function _changed($orig, $final)
+    protected function _changed($orig, $final)
     {
         $this->_deleted($orig);
         $this->_added($final);
@@ -926,7 +857,7 @@
         $this->trailing_context_lines = $context_lines;
     }
 
-    function _lines($lines, $prefix = '')
+    protected function _lines($lines, $prefix = '')
     {
         if (!$prefix == '')
             echo "$prefix\n";
@@ -936,22 +867,22 @@
             echo "$prefix\n";
     }
 
-    function _added($lines)
+    protected function _added($lines)
     {
         $this->_lines($lines, ">>>>>>>");
     }
 
-    function _deleted($lines)
+    protected function _deleted($lines)
     {
         $this->_lines($lines, "<<<<<<<");
     }
 
-    function _block_header($xbeg, $xlen, $ybeg, $ylen)
+    protected function _block_header($xbeg, $xlen, $ybeg, $ylen)
     {
         return "";
     }
 
-    function _changed($orig, $final)
+    protected function _changed($orig, $final)
     {
         $this->_deleted($orig);
         $this->_added($final);

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

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

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

Revision: 9441
          http://sourceforge.net/p/phpwiki/code/9441
Author:   vargenau
Date:     2014-12-10 17:54:49 +0000 (Wed, 10 Dec 2014)
Log Message:
-----------
No space at end of line

Modified Paths:
--------------
    trunk/lib/WikiTheme.php
    trunk/lib/main.php
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/Template.php
    trunk/lib/plugin/WikiAdminSearchReplace.php
    trunk/lib/stdlib.php

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2014-12-09 17:24:27 UTC (rev 9440)
+++ trunk/lib/WikiTheme.php	2014-12-10 17:54:49 UTC (rev 9441)
@@ -201,7 +201,7 @@
          * @var WikiRequest $request
          */
         global $request;
- 
+
         $this->_name = $theme_name;
         $this->_themes_dir = NormalizeLocalFileName("themes");
         $this->_path = defined('PHPWIKI_DIR') ? NormalizeLocalFileName("") : "";

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2014-12-09 17:24:27 UTC (rev 9440)
+++ trunk/lib/main.php	2014-12-10 17:54:49 UTC (rev 9441)
@@ -381,7 +381,7 @@
         if (!empty($HTTP_GET_VARS['start_debug'])) // zend ide support
             return WikiURL($pagename, array('action' => $action, 'start_debug' => 1));
         elseif ($action == 'edit')
-            return WikiURL($pagename); 
+            return WikiURL($pagename);
         else
             return WikiURL($pagename, array('action' => $action));
     }

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2014-12-09 17:24:27 UTC (rev 9440)
+++ trunk/lib/plugin/IncludePage.php	2014-12-10 17:54:49 UTC (rev 9441)
@@ -68,7 +68,7 @@
             $this->run($request->_dbi, $argstr, $request, $basepage);
         }
 
-        $backlinks[] = array('linkto' => $page->name); 
+        $backlinks[] = array('linkto' => $page->name);
         return $backlinks;
     }
 

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2014-12-09 17:24:27 UTC (rev 9440)
+++ trunk/lib/plugin/Template.php	2014-12-10 17:54:49 UTC (rev 9441)
@@ -100,7 +100,7 @@
             $this->run($request->_dbi, $argstr, $request, $basepage);
         }
 
-        $backlinks[] = array('linkto' => $page->name); 
+        $backlinks[] = array('linkto' => $page->name);
         return $backlinks;
     }
 

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2014-12-09 17:24:27 UTC (rev 9440)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2014-12-10 17:54:49 UTC (rev 9441)
@@ -116,7 +116,7 @@
         } else {
            $columns = array_merge($args,
                                   // with highlighted search for SearchReplace
-                                  array('types' => array('hi_content' 
+                                  array('types' => array('hi_content'
                     => new _PageList_Column_content('rev:hi_content', _("Content")))));
         }
 

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-12-09 17:24:27 UTC (rev 9440)
+++ trunk/lib/stdlib.php	2014-12-10 17:54:49 UTC (rev 9441)
@@ -895,7 +895,7 @@
         if (is_a($page, 'WikiDB_Page'))
             return $page->getName();
         elseif (is_a($page, 'WikiDB_PageRevision'))
-            return $page->getPageName(); 
+            return $page->getPageName();
         elseif (is_a($page, 'WikiPageName'))
             return $page->name;
         return $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:[9440] trunk/themes/default/templates/editpage.tmpl

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

Revision: 9440
          http://sourceforge.net/p/phpwiki/code/9440
Author:   vargenau
Date:     2014-12-09 17:24:27 +0000 (Tue, 09 Dec 2014)
Log Message:
-----------
Change syntax to please Template

Modified Paths:
--------------
    trunk/themes/default/templates/editpage.tmpl

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2014-12-09 15:29:48 UTC (rev 9439)
+++ trunk/themes/default/templates/editpage.tmpl	2014-12-09 17:24:27 UTC (rev 9440)
@@ -21,7 +21,11 @@
   <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
   <br class="clear-floats" />
   <table class="fullwidth">
-    <tr><td><?php if (isset($EDIT_TOOLBAR)) echo $EDIT_TOOLBAR ?></td>
+    <tr><td>
+    <?php if (isset($EDIT_TOOLBAR)) { ?>
+        <?php echo $EDIT_TOOLBAR ?>
+    <?php } ?>
+        </td>
         <td class="align-right"><div id="editarea-size">
     <?php echo _("Size")._(":") ?>
     <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>

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