[geeklog-cvs] geeklog: Cosmetics - we don't usually use braces with echo

Sun Sep 18 10:25:59 EDT 2011

changeset 8407:7e643d11f18d
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7e643d11f18d
user: Dirk Haun <dirk at haun-online.de>
date: Sun Sep 18 10:11:18 2011 +0200
description:
Cosmetics - we don't usually use braces with echo

diffstat:

 public_html/lib-common.php |  28 ++++++++++++++--------------
 system/lib-custom.php.dist |   4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diffs (103 lines):

diff -r e596b34806d1 -r 7e643d11f18d public_html/lib-common.php

--- a/public_html/lib-common.php	Sun Sep 18 10:05:28 2011 +0200
+++ b/public_html/lib-common.php	Sun Sep 18 10:11:18 2011 +0200
@@ -6994,27 +6994,27 @@
             if (!empty($_CONF['site_name'])) {
                 $title = $_CONF['site_name'] . ' - ' . $title;
             }
-            echo("<html><head><title>$title</title></head>\n<body>\n");
-
-            echo('<h1>An error has occurred:</h1>');
+            echo "<html><head><title>$title</title></head>\n<body>\n";
+
+            echo '<h1>An error has occurred:</h1>';
             if ($_CONF['rootdebug']) {
-                echo('<h2 style="color: red">This is being displayed as "Root Debugging" is enabled
+                echo '<h2 style="color: red">This is being displayed as "Root Debugging" is enabled
                         in your Geeklog configuration.</h2><p>If this is a production
                         website you <strong><em>must disable</em></strong> this
                         option once you have resolved any issues you are
-                        investigating.</p>');
+                        investigating.</p>';
             } else {
-                echo('<p>(This text is only displayed to users in the group \'Root\')</p>');
+                echo '<p>(This text is only displayed to users in the group \'Root\')</p>';
             }
-            echo("<p>$errno - $errstr @ $errfile line $errline</p>");
+            echo "<p>$errno - $errstr @ $errfile line $errline</p>";
 
             if (!function_exists('SEC_inGroup') || !SEC_inGroup('Root')) {
                 if ('force' != ''.$_CONF['rootdebug']) {
                     $errcontext = COM_rootDebugClean($errcontext);
                 } else {
-                    echo('<h2 style="color: red">Root Debug is set to "force", this
+                    echo '<h2 style="color: red">Root Debug is set to "force", this
                     means that passwords and session cookies are exposed in this
-                    message!!!</h2>');
+                    message!!!</h2>';
                 }
             }
             if (@ini_get('xdebug.default_enable') == 1) {
@@ -7022,7 +7022,7 @@
                 var_dump($errcontext);
                 $errcontext = ob_get_contents();
                 ob_end_clean();
-                echo("$errcontext</body></html>");
+                echo "$errcontext</body></html>";
             } else {
                 $btr = debug_backtrace();
                 if (! empty($btr)) {
@@ -7040,12 +7040,12 @@
                     }
                     echo "</table></font>\n";
                 }
-                echo('<pre>');
+                echo '<pre>';
                 ob_start();
                 var_dump($errcontext);
                 $errcontext = htmlspecialchars(ob_get_contents());
                 ob_end_clean();
-                echo("$errcontext</pre></body></html>");
+                echo "$errcontext</pre></body></html>";
             }
             exit;
         }
@@ -7083,7 +7083,7 @@
         if (!empty($_CONF['site_name'])) {
             $title = $_CONF['site_name'] . ' - ' . $title;
         }
-        echo("
+        echo "
         <html>
             <head>
                 <title>{$title}</title>
@@ -7095,7 +7095,7 @@
             </div>
             </body>
         </html>
-        ");
+        ";
     }
 
     exit;
diff -r e596b34806d1 -r 7e643d11f18d system/lib-custom.php.dist
--- a/system/lib-custom.php.dist	Sun Sep 18 10:05:28 2011 +0200
+++ b/system/lib-custom.php.dist	Sun Sep 18 10:11:18 2011 +0200
@@ -541,7 +541,7 @@
                 "An error has occurred: $errno $errstr @ $errline of $errfile");
         COM_errorLog("Error Handler: $errno $errstr @ $errline of $errfile");
     }
-    echo("
+    echo "
         <html>
             <head>
                 <title>{$_CONF['site_name']} - An error occurred.</title>
@@ -568,7 +568,7 @@
                 </div>
             </body>
         </html>
-        ");
+        ";
     exit;
 }
 */

