Removed benchmarking code

Author: itsrachelfish

wiki/src/actions/history.php

@@ -2,8 +2,6 @@
 
 function history($path, $action, $title, $content)
 {
-    global $benchmark;
-    $benchmark->start("Viewing History: $path");
     $Head = '<meta name="robots" content="noindex, nofollow" />';
     $content['PageNav']->Active("Page History");
 
@@ -29,8 +27,6 @@ function history($path, $action, $title, $content)
     $next = mysql_fetch_array($nextQuery);
     $previous = mysql_fetch_array($previousQuery);	
 
-    $benchmark->log('Page Queries');
-        
     if(is_numeric($action[1]))
     {
         $PreviousQuery = mysql_query("Select `Content` from `Wiki_Edits` where `ID` < '$action[1]' and `Archived` = 0 order by `ID` desc limit 1");
@@ -74,11 +70,8 @@ function history($path, $action, $title, $content)
             $content['ExtraNav']->Add("Archive This Edit", FormatPath("/$path/")."?archive/$action[1]");
         }
 
-        $benchmark->log('Before Formatting');
         $title[] = FishFormat($PageTitle, "strip");
-        $benchmark->log('Title Stripped');
         $PageContent = FishFormat($PageContent);
-        $benchmark->log('Body Formatted');
 
         $previousPath = FormatPath("/$path/?history/{$previous['ID']}");
         $nextPath = FormatPath("/$path/?history/{$next['ID']}");
@@ -170,14 +163,6 @@ function history($path, $action, $title, $content)
     </script>
     
 JavaScript;
-
-
-    $benchmark->save();
-
-    if($_SESSION['admin'])
-    {
-        $benchmark->display();
-    }
 
     return array($title, $content);
 }

wiki/src/actions/view.php

@@ -2,14 +2,10 @@
 
 function view($path, $action, $title, $content)
 {
-    global $benchmark;
-    $benchmark->start("Viewing: $path");
     $content['PageNav']->Active("View Page");
 
     $PageQuery = mysql_query("SELECT `ID`,`Title`,`Content`,`Edits`,`Views`,`EditTime` FROM `Wiki_Pages` WHERE `Path`='$path'");
     list($PageID, $PageTitle, $PageContent, $PageEdits, $pageViews, $PageEditTime) = mysql_fetch_array($PageQuery);
-
-    $benchmark->log('Page Query');
 
     $tagQuery = mysql_query("Select tags.`tag`, stats.`count`
                                 from `Wiki_Tags` as tags,
@@ -18,8 +14,6 @@ function view($path, $action, $title, $content)
                                 where tags.`pageID` = '$PageID'
                                     and stats.`tag` = tags.`tag`");
 
-    $benchmark->log('Tag Query');
-                                    
     while(list($tagName, $tagCount) = mysql_fetch_array($tagQuery))
     {
         $plural = 's';
@@ -38,8 +32,6 @@ function view($path, $action, $title, $content)
         $tagLinks = "<hr />Tags: $tagLinks";
     }
 
-    $benchmark->log('Tags Processed');
-    
     $PageTitle = PageTitler($PageTitle);
 
     if(empty($PageContent))
@@ -69,14 +61,10 @@ function view($path, $action, $title, $content)
         $content['ExtraNav']->Add("Rename This Page", FormatPath("/$path/")."?rename");
     }
 
-    $benchmark->log('Before Formatting');
     $title[] = FishFormat($PageTitle, "strip");
-    $benchmark->log('Title Stripped');
     $content['Title'] .= FishFormat($PageTitle);
-    $benchmark->log('Title Formatted');
     $content['Body'] .= FishFormat($PageContent);
-    $benchmark->log('Body Formatted');
-
+    
     if($PageEdits)
     {
         $EditCount = count(explode(",", $PageEdits));
@@ -93,13 +81,6 @@ function view($path, $action, $title, $content)
         $content['Tags'] = $tagLinks;
         $content['Footer'] = "<b>".number_format($pageViews)."</b> page view{$viewPlural}. <b>$EditCount</b> edit{$Plural} &ensp;&mdash;&ensp; Last modified <b>$PageEditTime</b>.";
     }
-
-    $benchmark->save();
-
-    if($_SESSION['admin'])
-    {
-        $benchmark->display();
-    }
 
     return array($title, $content);
 }

wiki/src/markup/fishformat.php

@@ -3,7 +3,7 @@
 /*
  * Fish format!
  * 
- * Version 0.1
+ * Version 0.2
  * 
  */
 
@@ -14,16 +14,8 @@
 require "view.php";
 require "edit.php";
 
-if(!class_exists(Benchmark))
-{
-    include_once(__DIR__ . "/../benchmark.php");
-    $benchmark = new Benchmark;
-}
-
 function FishFormat($text, $action='markup')
 {
-    global $benchmark;
-
     switch($action)
     {
         case "strip":
@@ -83,40 +75,30 @@ function FishFormat($text, $action='markup')
         default:            
             $output = $text;
             $output = str_replace("    ", "   ", $output);
-            $benchmark->log('Spaces Replaced');
-
 
             // Links with custom text
             $output = preg_replace_callback('/(?:{{|\[\[)([\w -@\/~]+?)\|([\w -@\/~]+?)(?:\]\]|}})/', "custom_link", $output);
-            $benchmark->log('Custom Links Replaced');
 
             // Basic links
             $output = preg_replace_callback('/(?:{{|\[\[)([\w -@\/~]+?)(?:\]\]|}})(s)?/', "basic_link", $output);
-            $benchmark->log('Basic Links Replaced');
 
             // Replace semicolon tags with HTML entities (for writing documentation)
             $output = str_replace(array(":{", "}:", ':[', ']:'), array("{", "}", "[", "]"), $output);
-            $benchmark->log('Braces Replaced');
-
+            
             // Allow HTML comments
             $output = str_replace(array('&lt;!--', '--&gt;'), array('<!--', '-->'), $output);
-            $benchmark->log('Comments Replaced');
 
             // Remove HTML comments so they aren't parsed for markup
             $output = remove_comments($output);
-            $benchmark->log('Comments Removed');
 
             // Pasrse content for markup
             $parser = new Parser();
             $parsed = $parser->parse($output);
-            $benchmark->log('Markup Parsed');
-            
+
             $output = view_markup($parsed['text'], $parsed['tags']);
-            $benchmark->log('Markup Formatted');
 
             // Put comments back in
             $output = replace_comments($output);
-            $benchmark->log('Comments Returned');
 
             // Random replacements / emoticon type things
             $Search[':Z'] = "<span class='warning'>:Z</span>";
@@ -132,7 +114,6 @@ function FishFormat($text, $action='markup')
 
             // Ordered and unordered lists
             $output = preg_replace_callback("/(?:(?:^|\n)\s*(\*|\-|\#)\s+[^\n]+(?:\n|$))+/m", 'replace_lists', $output);
-            $benchmark->log('Lists Replaced');
 
             // Strip newlines around comments
             $output = preg_replace('{\n*(<!--|-->)\n*}', "\\1", $output);