Bug:

Submitted by:
Merge after:
String:: -> Horde_String & Util:: -> Horde_Util:: conversions.

I gave in and ran a sed script to try to get the rest of these changed.
Here's the commands I ran:
find . -type f | xargs fgrep -l ' String::' | xargs sed -i '' -e 's/ String::/ Horde_String::/g'
find . -type f | xargs fgrep -l '(String::' | xargs sed -i '' -e 's/(String::/(Horde_String::/g'
find . -type f | xargs grep -l '^String::' | xargs sed -i '' -e 's/^String::/Horde_String::/g'

I then went through and removed files that shouldn't be updated (docs files
and package.xml files).  Hopefully, false positives have been kept to a
minimum.

diff --git a/graphgen.php b/graphgen.php
index 9ef8a92..d997bbf 100644 (file)
--- a/graphgen.php
+++ b/graphgen.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: incubator/operator/graphgen.php,v 1.9 2009/05/31 17:14:08 bklang Exp $
+ * $Horde: incubator/operator/graphgen.php,v 1.10 2009/06/10 05:24:30 slusarz Exp $
  *
  * Copyright 2008 The Horde Project <http://www.horde.org>
  *
@@ -19,9 +19,9 @@ require_once 'Image/Graph.php';
 #setlocale(LC_ALL, NLS::select());
 setlocale(LC_ALL, 'en_US');
 
-$graphtype = Util::getFormData('graph');
+$graphtype = Horde_Util::getFormData('graph');
 $graphinfo = Operator::getGraphInfo($graphtype);
-$cachekey = Util::getFormData('key');
+$cachekey = Horde_Util::getFormData('key');
 
 $stats = unserialize($cache->get($cachekey, 0));
 

diff --git a/templates/common-header.inc b/templates/common-header.inc
index 788389c..d6551a5 100644 (file)
--- a/templates/common-header.inc
+++ b/templates/common-header.inc
@@ -26,4 +26,4 @@ Horde::includeScriptFiles();
 <?php echo Horde::stylesheetLink('operator') ?>
 </head>
 
-<body<?php if ($bc = Util::nonInputVar('bodyClass')) echo ' class="' . $bc . '"' ?><?php if ($bi = Util::nonInputVar('bodyId')) echo ' id="' . $bi . '"'; ?>>
+<body<?php if ($bc = Horde_Util::nonInputVar('bodyClass')) echo ' class="' . $bc . '"' ?><?php if ($bi = Horde_Util::nonInputVar('bodyId')) echo ' id="' . $bi . '"'; ?>>

diff --git a/viewgraph.php b/viewgraph.php
index 2aab8ec..218fa7b 100644 (file)
--- a/viewgraph.php
+++ b/viewgraph.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: incubator/operator/viewgraph.php,v 1.9 2009/01/06 17:51:06 jan Exp $
+ * $Horde: incubator/operator/viewgraph.php,v 1.10 2009/06/10 05:24:30 slusarz Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -85,11 +85,11 @@ if (!empty($stats)) {
     $numcalls_graph = $minutes_graph = $failed_graph =
                       Horde::applicationUrl('graphgen.php');
     
-    $numcalls_graph = Util::addParameter($numcalls_graph, array(
+    $numcalls_graph = Horde_Util::addParameter($numcalls_graph, array(
         'graph' => 'numcalls', 'key' => $cachekey));
-    $minutes_graph = Util::addParameter($minutes_graph, array(
+    $minutes_graph = Horde_Util::addParameter($minutes_graph, array(
         'graph' => 'minutes', 'key' => $cachekey));
-    $failed_graph = Util::addParameter($failed_graph, array(
+    $failed_graph = Horde_Util::addParameter($failed_graph, array(
         'graph' => 'failed', 'key' => $cachekey));
 }