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

Timestamp:

May 3, 2014 11:09:03 PM (10 years ago)

Author:

anonymous

Message:

Convert tabs to spaces, and lineendings to LF in all files.

File:

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

trunk/lib/Utilities.inc.php

@@ -29 +29 @@
  * Print variable dump.
  *
- * @param  mixed    $var        The variable to dump.
- * @param  bool     $display    Print the dump in <pre> tags or hide it in html comments (non-CLI only).
- * @param  bool     $var_dump   Use var_dump instead of print_r.
- * @param  string   $file       Value of __FILE__.
- * @param  string   $line       Value of __LINE__
+ * @param  mixed    $var        The variable to dump.
+ * @param  bool     $display    Print the dump in <pre> tags or hide it in html comments (non-CLI only).
+ * @param  bool     $var_dump   Use var_dump instead of print_r.
+ * @param  string   $file       Value of __FILE__.
+ * @param  string   $line       Value of __LINE__
  */
 function dump($var, $display=false, $var_dump=false, $file='', $line='')
@@ -45 +45 @@
         var_dump($var);
     } else {
-        // Print human-readable descriptions of invisible types.
-        if (null === $var) {
-            echo '(null)';
-        } else if (true === $var) {
-            echo '(bool: true)';
-        } else if (false === $var) {
-            echo '(bool: false)';
-        } else if (is_scalar($var) && '' === $var) {
-            echo '(empty string)';
-        } else if (is_scalar($var) && preg_match('/^\s+$/', $var)) {
-            echo '(only white space)';
-        } else {
-            print_r($var);
-        }
+        // Print human-readable descriptions of invisible types.
+        if (null === $var) {
+            echo '(null)';
+        } else if (true === $var) {
+            echo '(bool: true)';
+        } else if (false === $var) {
+            echo '(bool: false)';
+        } else if (is_scalar($var) && '' === $var) {
+            echo '(empty string)';
+        } else if (is_scalar($var) && preg_match('/^\s+$/', $var)) {
+            echo '(only white space)';
+        } else {
+            print_r($var);
+        }
     }
     if (defined('_CLI')) {
@@ -144 +144 @@
 function oTxt($text, $preserve_html=false)
 {
-    $app =& App::getInstance();
+    $app =& App::getInstance();
 
     $search = array();
@@ -546 +546 @@
 function filePutContents($filename, $content)
 {
-    $app =& App::getInstance();
+    $app =& App::getInstance();
 
     // Open file for writing and truncate to zero length.
@@ -754 +754 @@
 function escapedList($in, $separator="', '")
 {
-    $db =& DB::getInstance();
+    $db =& DB::getInstance();
 
     if (is_array($in) && !empty($in)) {
@@ -982 +982 @@
 function mailmanAddMember($email, $list, $send_welcome_message=false)
 {
-    $app =& App::getInstance();
-
-    $add_members = '/usr/lib/mailman/bin/add_members';
+    $app =& App::getInstance();
+
+    $add_members = '/usr/lib/mailman/bin/add_members';
     // FIXME: checking of executable is disabled.
     if (true || is_executable($add_members) && is_readable($add_members)) {
@@ -1014 +1014 @@
 function mailmanRemoveMember($email, $list, $send_user_ack=false)
 {
-    $app =& App::getInstance();
+    $app =& App::getInstance();
 
     $remove_members = '/usr/lib/mailman/bin/remove_members';