Changeset 235 for trunk/lib/Utilities.inc.php

Timestamp:

Mar 7, 2007 11:32:07 AM (17 years ago)

Author:

quinn

Message:

Q - fixed some fv->err() usage bugs, increased resolution of textColor(), improved formatting of some Utilities.inc.php functions.

File:

• trunk/lib/Utilities.inc.php (modified) (4 diffs)

trunk/lib/Utilities.inc.php

@@ -150 +150 @@
 function getTextColor($text, $method=1)
 {
-    $r = substr(md5($text), 0, 1);
-    $g = substr(md5($text), 1, 1);
-    $b = substr(md5($text), 2, 1);
+    $hash = md5($text);
+    $rgb = array(
+        substr($hash, 0, 1),
+        substr($hash, 1, 1),
+        substr($hash, 2, 1),
+        substr($hash, 3, 1),
+        substr($hash, 4, 1),
+        substr($hash, 5, 1),
+    );
 
     switch ($method) {
-    case 2 :
-        if (hexdec($r) > hexdec('c')) {
-            $r = dechex(hexdec('f') - hexdec($r));
-        }
-        if (hexdec($g) > hexdec('c')) {
-            $g = dechex(hexdec('f') - hexdec($g));
-        }
-        if (hexdec($b) > hexdec('c')) {
-            $b = dechex(hexdec('f') - hexdec($b));
-        }
-        break;
-
     case 1 :
     default :
-        $r = dechex(round(hexdec($r) * .8));
-        $g = dechex(round(hexdec($g) * .8));
-        $b = dechex(round(hexdec($b) * .6));
+        // Reduce all hex values slighly to avoid all white.
+        array_walk($rgb, create_function('&$v', '$v = dechex(round(hexdec($v) * 0.87));'));
         break;
-    }
-
-    return $r . $r . $g . $g . $b . $b;
+    case 2 :
+        foreach ($rgb as $i => $v) {
+            if (hexdec($v) > hexdec('c')) {
+                $rgb[$i] = dechex(hexdec('f') - hexdec($v));
+            }
+        }
+        break;
+    }
+
+    return join('', $rgb);
 }
 
@@ -392 +392 @@
  * @return array              URL with array elements as URL key=value arguments.
  */
-function urlEncodeArray($data, $prefix='', $_return=true) {
+function urlEncodeArray($data, $prefix='', $_return=true)
+{
 
     // Data is stored in static variable.
@@ -428 +429 @@
  * @return string url         A string ready to append to a url.
  */
-function urlEncodeArrayToString($data, $prefix='') {
+function urlEncodeArrayToString($data, $prefix='')
+{
 
     $array_args = urlEncodeArray($data, $prefix);
@@ -708 +710 @@
  * will see data before the page is finished processing.
  */
-function flushBuffer() {
+function flushBuffer()
+{
     echo str_repeat('          ', 205);
     flush();