[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.