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

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

Revision: 9433
          http://sourceforge.net/p/phpwiki/code/9433
Author:   vargenau
Date:     2014-12-08 17:16:56 +0000 (Mon, 08 Dec 2014)
Log Message:
-----------
Remove unused

Modified Paths:
--------------
    trunk/lib/loadsave.php
    trunk/lib/plugin/WikiBlog.php

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2014-12-08 17:14:15 UTC (rev 9432)
+++ trunk/lib/loadsave.php	2014-12-08 17:16:56 UTC (rev 9433)
@@ -724,7 +724,6 @@
     }
     $page_iter->free();
 
-    $attrib = false; //array('is_ascii' => 0);
     if (!empty($WikiTheme->dumped_images) and is_array($WikiTheme->dumped_images)) {
         // @mkdir("$directory/images");
         foreach ($WikiTheme->dumped_images as $img_file) {
@@ -866,7 +865,7 @@
 //
 ////////////////////////////////////////////////////////////////
 
-function SavePage(&$request, &$pageinfo, $source, $filename)
+function SavePage(&$request, &$pageinfo, $source)
 {
     static $overwite_all = false;
     $pagedata = $pageinfo['pagedata']; // Page level meta-data.
@@ -912,10 +911,8 @@
     $edit = $request->getArg('edit');
     if ($merging) {
         if (isset($edit['keep_old'])) {
-            $merging = false;
             $skip = true;
         } elseif (isset($edit['overwrite'])) {
-            $merging = false;
             $overwrite = true;
         } elseif ($current and (!$current->hasDefaultContents())
             && ($current->getPackedContent() != $content)
@@ -949,7 +946,6 @@
         $versiondata['author'] = ADMIN_USER;
         $versiondata['author_id'] = ADMIN_USER;
         $mesg->pushContent(' - ', _("New page"));
-        $isnew = true;
     } else {
         if ((!$current->hasDefaultContents())
             && ($current->getPackedContent() != $content)
@@ -978,7 +974,6 @@
                     $current->getVersion()));
             $skip = true;
         }
-        $isnew = false;
     }
 
     if (!$skip) {
@@ -1001,7 +996,6 @@
         $f = str_replace(sprintf(_("plain file %s"), ''), '', $f);
         //check if uploaded file? they pass just the content, but the file is gone
         if (@stat($f)) {
-            global $WikiTheme;
             $meb = Button(array('action' => 'loadfile',
                     'merge' => true,
                     'source' => $f),
@@ -1222,7 +1216,7 @@
  * because the sql passwords are in plaintext there. And the webserver must be able to read it.
  * Detected by Santtu Jarvi.
  */
-function LoadFile(&$request, $filename, $text = false, $mtime = false)
+function LoadFile(&$request, $filename, $text = false)
 {
     if (preg_match("/config$/", dirname($filename)) // our or other config
         and preg_match("/config.*\.ini/", basename($filename))
@@ -1233,8 +1227,6 @@
     }
     if (!is_string($text)) {
         // Read the file.
-        $stat = stat($filename);
-        $mtime = $stat[9];
         $text = implode("", file($filename));
     }
 
@@ -1244,9 +1236,6 @@
     // FIXME: basename("filewithnoslashes") seems to return garbage sometimes.
     $basename = basename("/dummy/" . $filename);
 
-    if (!$mtime)
-        $mtime = time(); // Last resort.
-
     $default_pagename = rawurldecode($basename);
     if (($parts = ParseMimeifiedPages($text))) {
         if (count($parts) > 1)
@@ -1256,8 +1245,7 @@
             // force overwrite
             if (count($parts) > 1)
                 $request->setArg('overwrite', 1);
-            SavePage($request, $pageinfo, sprintf(_("MIME file %s"),
-                $filename), $basename);
+            SavePage($request, $pageinfo, sprintf(_("MIME file %s"), $filename));
         }
         if (count($parts) > 1)
             if ($overwrite)
@@ -1267,8 +1255,7 @@
     } elseif (($pageinfo = ParseSerializedPage($text, $default_pagename,
         $request->getUser()))
     ) {
-        SavePage($request, $pageinfo, sprintf(_("Serialized file %s"),
-            $filename), $basename);
+        SavePage($request, $pageinfo, sprintf(_("Serialized file %s"), $filename));
     } else {
         // plain old file
         $user = $request->getUser();
@@ -1281,8 +1268,7 @@
             'content' => preg_replace('/[ \t\r]*\n/', "\n",
                 chop($text))
         );
-        SavePage($request, $pageinfo, sprintf(_("plain file %s"), $filename),
-            $basename);
+        SavePage($request, $pageinfo, sprintf(_("plain file %s")));
     }
 }
 
@@ -1303,7 +1289,7 @@
             continue;
         }
         longer_timeout($timeout); // longer timeout per page
-        LoadFile($request, $fn, $data, $attrib['mtime']);
+        LoadFile($request, $fn, $data);
     }
 }
 
@@ -1446,7 +1432,7 @@
  */
 function SetupWiki(&$request)
 {
-    global $GenericPages, $LANG;
+    global $GenericPages;
 
     //FIXME: This is a hack (err, "interim solution")
     // This is a bogo-bogo-login:  Login without
@@ -1456,7 +1442,6 @@
     //
     // This really needs to be cleaned up...
     // (I'm working on it.)
-    $real_user = $request->_user;
     $request->_user = new _BogoUser(ADMIN_USER);
 
     StartLoadDump($request, _("Loading up virgin wiki"));

Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php	2014-12-08 17:14:15 UTC (rev 9432)
+++ trunk/lib/plugin/WikiBlog.php	2014-12-08 17:16:56 UTC (rev 9433)
@@ -229,7 +229,7 @@
                     'pagedata' => array(),
                     'versiondata' => array('author' => $blog_meta['creator'], 'is_minor_edit' => 1),
                 );
-                SavePage($request, $pageinfo, '', '');
+                SavePage($request, $pageinfo, '');
             }
             $redirected = $prefix . $pagename . '/' . preg_replace("/T.*/", "", "$time");
             if (!$dbi->isWikiPage($redirected)) {
@@ -240,7 +240,7 @@
                     'pagedata' => array(),
                     'versiondata' => array('author' => $blog_meta['creator'], 'is_minor_edit' => 1),
                 );
-                SavePage($request, $pageinfo, '', '');
+                SavePage($request, $pageinfo, '');
             }
 
             $p = $dbi->getPage($prefix . $pagename . '/'

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