OpencachingDeutschland / oc-server3

htdocs/lib2/edithelper.inc.php

Spacing +4 added lines, -4 removed lines

@@ -83,10 +83,10 @@ 
         $text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');
     } else {
         // convert smilies ...
-        for ($n = 0; $n < count($smiley['image']); $n ++) {
+        for ($n = 0; $n < count($smiley['image']); $n++) {
             $text = mb_ereg_replace(
-                "<img [^>]*?src=[^>]+?" . str_replace('.', '\.', $smiley['file'][$n]) . "[^>]+?>",
-                "[s![" . $smiley['text'][$n] . "]!s]",
+                "<img [^>]*?src=[^>]+?".str_replace('.', '\.', $smiley['file'][$n])."[^>]+?>",
+                "[s![".$smiley['text'][$n]."]!s]",
                 $text
             );
             // the [s[ ]s] is needed to protect the spaces around the smileys
@@ -118,5 +118,5 @@ 
 
 function editorJsPath()
 {
-    return 'resource2/ocstyle/js/editor.js?ft=' . filemtime('resource2/ocstyle/js/editor.js');
+    return 'resource2/ocstyle/js/editor.js?ft='.filemtime('resource2/ocstyle/js/editor.js');
 }

htdocs/lib2/translateAccess.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/logic/const.inc.php';
+require_once __DIR__.'/logic/const.inc.php';
 
 class translateAccess
 {

htdocs/lib2/common.inc.php

Spacing +23 added lines, -23 removed lines

@@ -10,7 +10,7 @@ 
  *  TODO: accept-language des Browser auswerten
  ***************************************************************************/
 
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 function __autoload($class_name)
 {
@@ -20,8 +20,8 @@ 
         return;
     }
 
-    $file1 = $opt['rootpath'] . 'lib2/' . $class_name . '.class.php';
-    $file2 = $opt['rootpath'] . 'lib2/logic/' . $class_name . '.class.php';
+    $file1 = $opt['rootpath'].'lib2/'.$class_name.'.class.php';
+    $file2 = $opt['rootpath'].'lib2/logic/'.$class_name.'.class.php';
     if (file_exists($file1)) {
         require_once $file1;
     } elseif (file_exists($file2)) {
@@ -43,9 +43,9 @@ 
 mb_regex_encoding('UTF-8');
 
 // set options
-require_once $opt['rootpath'] . 'config2/settings-dist.inc.php';
-require_once $opt['rootpath'] . 'config2/settings.inc.php';
-require_once $opt['rootpath'] . 'config2/verify-settings.inc.php';
+require_once $opt['rootpath'].'config2/settings-dist.inc.php';
+require_once $opt['rootpath'].'config2/settings.inc.php';
+require_once $opt['rootpath'].'config2/verify-settings.inc.php';
 
 foreach ($opt['page']['banned_user_agents'] as $ua) {
     if (strpos($useragent, $ua) !== false) {
@@ -69,10 +69,10 @@ 
     }
 }
 
-require_once $opt['rootpath'] . 'lib2/errorhandler.inc.php';
+require_once $opt['rootpath'].'lib2/errorhandler.inc.php';
 configure_php();
 
-require $opt['rootpath'] . 'lib2/cookie.class.php';
+require $opt['rootpath'].'lib2/cookie.class.php';
 normalize_settings();
 set_language();
 set_usercountry();
@@ -85,30 +85,30 @@ 
         $opt['template']['style'] = $opt['template']['default']['style'];
     }
 
-    if (!is_dir($opt['rootpath'] . 'templates2/' . $opt['template']['style'])) {
+    if (!is_dir($opt['rootpath'].'templates2/'.$opt['template']['style'])) {
         $opt['template']['style'] = $opt['template']['default']['style'];
     }
 } else {
     $opt['template']['style'] = $opt['template']['default']['style'];
 }
-$opt['stylepath'] = $opt['rootpath'] . 'templates2/' . $opt['template']['style'] . '/';
+$opt['stylepath'] = $opt['rootpath'].'templates2/'.$opt['template']['style'].'/';
 
 check_useragent();
 
 /* setup smarty
  *
  */
-require $opt['rootpath'] . 'lib2/OcSmarty.class.php';
+require $opt['rootpath'].'lib2/OcSmarty.class.php';
 $tpl = new OcSmarty();
 
 // include all we need
-require_once $opt['rootpath'] . 'lib2/logic/const.inc.php';
-require_once $opt['rootpath'] . 'lib2/error.inc.php';
-require_once $opt['rootpath'] . 'lib2/util.inc.php';
-require_once $opt['rootpath'] . 'lib2/db.inc.php';
-require_once $opt['rootpath'] . 'lib2/login.class.php';
-require_once $opt['rootpath'] . 'lib2/menu.class.php';
-require_once $opt['rootpath'] . 'lib2/logic/labels.inc.php';
+require_once $opt['rootpath'].'lib2/logic/const.inc.php';
+require_once $opt['rootpath'].'lib2/error.inc.php';
+require_once $opt['rootpath'].'lib2/util.inc.php';
+require_once $opt['rootpath'].'lib2/db.inc.php';
+require_once $opt['rootpath'].'lib2/login.class.php';
+require_once $opt['rootpath'].'lib2/menu.class.php';
+require_once $opt['rootpath'].'lib2/logic/labels.inc.php';
 // require_once $opt['rootpath'] . 'lib2/throttle.inc.php';
 
 // apply post configuration
@@ -123,7 +123,7 @@ 
     $login->userid > 0 &&
     sql_value("SELECT `email_problems` FROM `user` WHERE `user_id`='&1'", 0, $login->userid) != 0
 ) {
-    header("Location: verifyemail.php?page=" . basename($_SERVER['REQUEST_URI']));
+    header("Location: verifyemail.php?page=".basename($_SERVER['REQUEST_URI']));
     exit;
 }
 
@@ -148,7 +148,7 @@ 
     }
 
     if (isset($opt['logic']['cachemaps']['wmsurl']) && strstr($opt['logic']['cachemaps']['wmsurl'], '://')) {
-        $opt['logic']['cachemaps']['wmsurl'] = $opt['page']['protocol'] . strstr(
+        $opt['logic']['cachemaps']['wmsurl'] = $opt['page']['protocol'].strstr(
                 $opt['logic']['cachemaps']['wmsurl'],
                 '://'
             );
@@ -236,7 +236,7 @@ 
         $cookie->set('locale', $opt['template']['locale'], $opt['template']['default']['locale']);
     }
 
-    bindtextdomain('messages', $opt['rootpath'] . 'cache2/translate');
+    bindtextdomain('messages', $opt['rootpath'].'cache2/translate');
     set_php_locale();
     textdomain('messages');
 }
@@ -277,13 +277,13 @@ 
     if (strtolower(substr($url, 0, strlen($opt['page']['absolute_http_url']))) == $opt['page']['absolute_http_url']
         && $opt['page']['https']['active']
     ) {
-        return 'https' . strstr($url, '://');
+        return 'https'.strstr($url, '://');
     } elseif (strtolower(
             substr($url, 0, strlen($opt['page']['absolute_https_url']))
         ) == $opt['page']['absolute_https_url']
         && !$opt['page']['https']['active']
     ) {
-        return 'http' . strstr($url, '://');
+        return 'http'.strstr($url, '://');
     } else {
         return $url;
     }

htdocs/lib2/sqldebugger.class.php

Spacing +6 added lines, -6 removed lines

@@ -7,7 +7,7 @@ 
  *  This modules gives you a very usefull SQL debugger for MySQL ...
  ***************************************************************************/
 
-require_once $opt['rootpath'] . 'lib2/bench.inc.php';
+require_once $opt['rootpath'].'lib2/bench.inc.php';
 
 $sqldebugger = new sqldebugger();
 
@@ -48,7 +48,7 @@ 
         $command['mode'] = $db['mode'];
         $command['slave'] = $bQuerySlave;
         $command['server'] = $sServer;
-        $command['dblink'] = '' . $dblink;
+        $command['dblink'] = ''.$dblink;
 
         $bUseExplain = false;
         $sql = trim($sql);
@@ -74,11 +74,11 @@ 
                     break;
                 }
                 $command['result'][] = $r;
-                $c ++;
+                $c++;
             }
             sql_free_result($rs);
 
-            $rs = mysql_query('EXPLAIN EXTENDED ' . $sqlexplain, $dblink);
+            $rs = mysql_query('EXPLAIN EXTENDED '.$sqlexplain, $dblink);
             while ($r = sql_fetch_assoc($rs)) {
                 $command['explain'][] = $r;
             }
@@ -126,13 +126,13 @@ 
             return '';
         }
 
-        return 'SELECT * ' . substr($sql, $start);
+        return 'SELECT * '.substr($sql, $start);
     }
 
     public function insert_nocache($sql)
     {
         if (strtoupper(substr($sql, 0, 7)) == 'SELECT ') {
-            $sql = 'SELECT SQL_NO_CACHE ' . substr($sql, 7);
+            $sql = 'SELECT SQL_NO_CACHE '.substr($sql, 7);
         }
 
         return $sql;

htdocs/lib2/rowEditor.class.php

Spacing +18 added lines, -18 removed lines

@@ -9,7 +9,7 @@ 
 {
     public $sTable;
     public $sAutoIncrementField = null;
-    public $pk;     // (idx:name; type, default, nullable, value, insertfunction)
+    public $pk; // (idx:name; type, default, nullable, value, insertfunction)
     public $fields; // (idx:name; type, default, nullable, value, changed, insertfunction)
 
     // status var
@@ -254,7 +254,7 @@ 
             if ($i == $index) {
                 return $k;
             }
-            $i ++;
+            $i++;
         }
     }
 
@@ -315,12 +315,12 @@ 
         $fselect = array();
         $sql = 'SELECT ';
         foreach ($this->fields as $k => $field) {
-            $fselect[] = '`' . sql_escape($k) . '`';
+            $fselect[] = '`'.sql_escape($k).'`';
         }
         $sql .= join(', ', $fselect);
 
-        $sql .= ' FROM `' . sql_escape($this->sTable) . '`';
-        $sql .= ' WHERE ' . $this->pBuildPK();
+        $sql .= ' FROM `'.sql_escape($this->sTable).'`';
+        $sql .= ' WHERE '.$this->pBuildPK();
 
         return $sql;
     }
@@ -330,9 +330,9 @@ 
         $fwhere = array();
         foreach ($this->pk as $k => $field) {
             if ($field['value'] === null) {
-                $fwhere[] = 'ISNULL(`' . sql_escape($k) . '`)';
+                $fwhere[] = 'ISNULL(`'.sql_escape($k).'`)';
             } else {
-                $fwhere[] = '`' . sql_escape($k) . '`=\'' . sql_escape($field['value']) . '\'';
+                $fwhere[] = '`'.sql_escape($k).'`=\''.sql_escape($field['value']).'\'';
             }
         }
 
@@ -462,7 +462,7 @@ 
 
     public function pBuildInsert()
     {
-        $sql = 'INSERT IGNORE INTO `' . sql_escape($this->sTable) . '` (';
+        $sql = 'INSERT IGNORE INTO `'.sql_escape($this->sTable).'` (';
 
         $sFields = array();
         $sValues = array();
@@ -480,7 +480,7 @@ 
                 continue;
             }
 
-            $sFields[] = '`' . sql_escape($k) . '`';
+            $sFields[] = '`'.sql_escape($k).'`';
 
             if ((($field['insertfunction'] & RE_INSERT_OVERWRITE) == RE_INSERT_OVERWRITE) || (($field['changed'] == false) && ($field['insertfunction'] != RE_INSERT_NOTHING))) {
                 if (($field['insertfunction'] & RE_INSERT_NOW) == RE_INSERT_NOW) {
@@ -492,7 +492,7 @@ 
                 if ($field['value'] === null) {
                     $sValues[] = 'NULL';
                 } else {
-                    $sValues[] = '\'' . sql_escape($this->pFormatValueSql($field['type'], $field['value'])) . '\'';
+                    $sValues[] = '\''.sql_escape($this->pFormatValueSql($field['type'], $field['value'])).'\'';
                 }
             }
         }
@@ -502,7 +502,7 @@ 
                 continue;
             }
 
-            $sFields[] = '`' . sql_escape($k) . '`';
+            $sFields[] = '`'.sql_escape($k).'`';
 
             if ((($field['insertfunction'] & RE_INSERT_OVERWRITE) == RE_INSERT_OVERWRITE) || (($field['changed'] == false) && ($field['insertfunction'] != RE_INSERT_NOTHING))) {
                 if (($field['insertfunction'] & RE_INSERT_NOW) == RE_INSERT_NOW) {
@@ -514,7 +514,7 @@ 
                 if ($field['value'] === null) {
                     $sValues[] = 'NULL';
                 } else {
-                    $sValues[] = '\'' . sql_escape($this->pFormatValueSql($field['type'], $field['value'])) . '\'';
+                    $sValues[] = '\''.sql_escape($this->pFormatValueSql($field['type'], $field['value'])).'\'';
                 }
             }
         }
@@ -528,7 +528,7 @@ 
 
     public function pBuildUpdate()
     {
-        $sql = 'UPDATE IGNORE `' . sql_escape($this->sTable) . '` SET ';
+        $sql = 'UPDATE IGNORE `'.sql_escape($this->sTable).'` SET ';
 
         $sSet = '';
         foreach ($this->fields as $k => $field) {
@@ -538,9 +538,9 @@ 
                 }
 
                 if ($field['value'] === null) {
-                    $sSet .= '`' . sql_escape($k) . '`=NULL';
+                    $sSet .= '`'.sql_escape($k).'`=NULL';
                 } else {
-                    $sSet .= '`' . sql_escape($k) . '`=\'' . sql_escape($this->pFormatValueSql($field['type'], $field['value'])) . '\'';
+                    $sSet .= '`'.sql_escape($k).'`=\''.sql_escape($this->pFormatValueSql($field['type'], $field['value'])).'\'';
                 }
             }
         }
@@ -567,12 +567,12 @@ 
         }
 
         if ($this->fields[$field]['value'] === null) {
-            $sSet = '`' . sql_escape($field) . '`=NULL';
+            $sSet = '`'.sql_escape($field).'`=NULL';
         } else {
-            $sSet = '`' . sql_escape($field) . '`=\'' . sql_escape($this->pFormatValueSql($this->fields[$field]['type'], $this->fields[$field]['value'])) . '\'';
+            $sSet = '`'.sql_escape($field).'`=\''.sql_escape($this->pFormatValueSql($this->fields[$field]['type'], $this->fields[$field]['value'])).'\'';
         }
 
-        $sql = 'UPDATE `' . sql_escape($this->sTable) . '` SET ' . $sSet;
+        $sql = 'UPDATE `'.sql_escape($this->sTable).'` SET '.$sSet;
         $sql .= ' WHERE ';
         $sql .= $this->pBuildPK();
 

htdocs/lib2/RSSParser.class.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
                                     'description' => $item->description
                                 );
                                 // increment counter
-                                $i ++;
+                                $i++;
                                 // htmlspecialchars_decode() works around inconsistent HTML encoding
                                 // e.g. in SMF Forum Threads
                             } elseif (!in_array(htmlspecialchars_decode($item->title), $headlines) &&
@@ -78,9 +78,9 @@ 
                                     'title' => $item->title,
                                     'link' => $item->link
                                 );
-                                $headlines[] = "" . htmlspecialchars_decode($item->title);
+                                $headlines[] = "".htmlspecialchars_decode($item->title);
                                 // increment counter
-                                $i ++;
+                                $i++;
                             }
                         }
                     }

htdocs/lib2/smiley.inc.php

Spacing +2 added lines, -2 removed lines

@@ -90,8 +90,8 @@
 
     $smiley_a = array();
     for ($n = 0; $n < count($smiley['file']); ++ $n) {
-        $smiley['image'][$n] = '<img src="' . $opt['template']['smiley'] . $smiley['file'][$n] . '" alt="' . $smiley['text'][$n] . '" border="0" width="18px" height="18px" />';
-        $smiley['spaced_image'][$n] = ' ' . $smiley['image'][$n] . ' ';
+        $smiley['image'][$n] = '<img src="'.$opt['template']['smiley'].$smiley['file'][$n].'" alt="'.$smiley['text'][$n].'" border="0" width="18px" height="18px" />';
+        $smiley['spaced_image'][$n] = ' '.$smiley['image'][$n].' ';
         $smiley_a[] = [
             'text' => $smiley['text'][$n],
             'file' => $smiley['file'][$n],

htdocs/lib2/OcSmarty.class.php

Spacing +34 added lines, -34 removed lines

@@ -7,9 +7,9 @@ 
  *  Inherit Smarty-Class and extend it
  ***************************************************************************/
 
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once $opt['rootpath'] . 'lib2/db.inc.php';
-require_once $opt['rootpath'] . 'lib2/logic/labels.inc.php';
+require_once __DIR__.'/../vendor/autoload.php';
+require_once $opt['rootpath'].'lib2/db.inc.php';
+require_once $opt['rootpath'].'lib2/logic/labels.inc.php';
 
 class OcSmarty extends Smarty
 {
@@ -17,7 +17,7 @@ 
     public $main_template = 'sys_main';
     public $bench = null;
     public $compile_id = null;
-    public $cache_id = null;    // This is a smarty caching ID, not a caches.cache_id.
+    public $cache_id = null; // This is a smarty caching ID, not a caches.cache_id.
     public $title = '';
     public $menuitem = null;
     public $nowpsearch = false;
@@ -40,17 +40,17 @@ 
     public function __construct()
     {
         global $opt, $sqldebugger;
-        require_once $opt['rootpath'] . 'lib2/bench.inc.php';
+        require_once $opt['rootpath'].'lib2/bench.inc.php';
         $this->bench = new CBench();
         $this->bench->start();
 
         // configuration
         $this->template_dir = $opt['stylepath'];
-        $this->compile_dir = $opt['rootpath'] . 'cache2/smarty/compiled/';
-        $this->cache_dir = $opt['rootpath'] . 'cache2/smarty/cache/';
+        $this->compile_dir = $opt['rootpath'].'cache2/smarty/compiled/';
+        $this->cache_dir = $opt['rootpath'].'cache2/smarty/cache/';
         $this->plugins_dir = [
             'plugins',
-            __DIR__ . '/../src/Oc/SmartyPlugins'
+            __DIR__.'/../src/Oc/SmartyPlugins'
         ];
 
         // disable caching ... if caching is enabled, 1 hour is default
@@ -58,7 +58,7 @@ 
         $this->cache_lifetime = 3600; // default
 
         // register additional functions
-        require_once __DIR__ . '/../src/Oc/SmartyPlugins/block.nocache.php';
+        require_once __DIR__.'/../src/Oc/SmartyPlugins/block.nocache.php';
         $this->register_block('nocache', 'smarty_block_nocache', false);
         $this->load_filter('pre', 't');
 
@@ -73,7 +73,7 @@ 
 
         // process debug level
         if (($opt['debug'] & DEBUG_SQLDEBUGGER) == DEBUG_SQLDEBUGGER) {
-            require_once $opt['rootpath'] . 'lib2/sqldebugger.class.php';
+            require_once $opt['rootpath'].'lib2/sqldebugger.class.php';
         } elseif (($opt['debug'] & DEBUG_OUTOFSERVICE) == DEBUG_OUTOFSERVICE) {
             $this->name = 'sys_outofservice';
             $this->display();
@@ -87,13 +87,13 @@ 
                 $this->target = '';
             }
         } else {
-            $target = basename($_SERVER['PHP_SELF']) . '?';
+            $target = basename($_SERVER['PHP_SELF']).'?';
 
             // REQUEST-Variablen durchlaufen und an target anhaengen
             reset($_REQUEST);
             while (list($varname, $varvalue) = each($_REQUEST)) {
                 if (in_array($varname, $opt['logic']['targetvars'])) {
-                    $target .= urlencode($varname) . '=' . urlencode($varvalue) . '&';
+                    $target .= urlencode($varname).'='.urlencode($varvalue).'&';
                 }
             }
             reset($_REQUEST);
@@ -177,7 +177,7 @@ 
         $optn['page']['absolute_urlpath'] = parse_url($opt['page']['absolute_url'], PHP_URL_PATH);
         $optn['page']['absolute_http_url'] = $opt['page']['absolute_http_url'];
         $optn['page']['default_absolute_url'] = $opt['page']['default_absolute_url'];
-        $optn['page']['login_url'] = ($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '') . 'login.php';
+        $optn['page']['login_url'] = ($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '').'login.php';
         $optn['page']['target'] = $this->target;
         $optn['page']['showdonations'] = $opt['page']['showdonations'];
         $optn['page']['title'] = $opt['page']['title'];
@@ -303,7 +303,7 @@ 
         }
         $this->assign('sys_dbslave', ($db['slave_id'] != - 1));
 
-        if ($this->template_exists($this->name . '.tpl')) {
+        if ($this->template_exists($this->name.'.tpl')) {
             $this->assign('template', $this->name);
         } elseif ($this->name != 'sys_error') {
             $this->error(ERROR_TEMPLATE_NOT_FOUND);
@@ -314,15 +314,15 @@ 
 
         $this->assign(
             'screen_css_time',
-            filemtime($opt['rootpath'] . "resource2/" . $opt['template']['style'] . "/css/style_screen.css")
+            filemtime($opt['rootpath']."resource2/".$opt['template']['style']."/css/style_screen.css")
         );
         $this->assign(
             'screen_msie_css_time',
-            filemtime($opt['rootpath'] . "resource2/" . $opt['template']['style'] . "/css/style_screen_msie.css")
+            filemtime($opt['rootpath']."resource2/".$opt['template']['style']."/css/style_screen_msie.css")
         );
         $this->assign(
             'print_css_time',
-            filemtime($opt['rootpath'] . "resource2/" . $opt['template']['style'] . "/css/style_print.css")
+            filemtime($opt['rootpath']."resource2/".$opt['template']['style']."/css/style_print.css")
         );
 
         // check if the template is compiled
@@ -342,9 +342,9 @@ 
         }
 
         if (($opt['debug'] & DEBUG_SQLDEBUGGER) == DEBUG_SQLDEBUGGER) {
-            require_once $opt['rootpath'] . 'lib2/sqldebugger.class.php';
+            require_once $opt['rootpath'].'lib2/sqldebugger.class.php';
 
-            parent::fetch($this->main_template . '.tpl', $this->get_cache_id(), $this->get_compile_id());
+            parent::fetch($this->main_template.'.tpl', $this->get_cache_id(), $this->get_compile_id());
 
             $this->clear_all_assign();
             $this->main_template = 'sys_sqldebugger';
@@ -361,10 +361,10 @@ 
             $opt['debug'] = $opt['debug'] & ~DEBUG_SQLDEBUGGER;
 
             $this->header();
-            parent::display($this->main_template . '.tpl');
+            parent::display($this->main_template.'.tpl');
         } else {
             $this->header();
-            parent::display($this->main_template . '.tpl', $this->get_cache_id(), $this->get_compile_id());
+            parent::display($this->main_template.'.tpl', $this->get_cache_id(), $this->get_compile_id());
         }
 
         exit;
@@ -385,8 +385,8 @@ 
 
         $args = func_get_args();
         unset($args[0]);
-        for ($i = 1; isset($args[$i]); $i ++) {
-            $this->assign('p' . $i, $args[$i]);
+        for ($i = 1; isset($args[$i]); $i++) {
+            $this->assign('p'.$i, $args[$i]);
         }
 
         $this->name = 'error';
@@ -405,7 +405,7 @@ 
             }
         }
 
-        return parent::is_cached($this->main_template . '.tpl', $this->get_cache_id(), $this->get_compile_id());
+        return parent::is_cached($this->main_template.'.tpl', $this->get_cache_id(), $this->get_compile_id());
     }
 
     public function get_cache_id()
@@ -416,14 +416,14 @@ 
         // Probably this is no safety or stability issue, but to be sure we restrict
         // the ID to a reasonable set of characters:
 
-        return $this->name . '|' . mb_ereg_replace('/[^A-Za-z0-9_\|\-\.]/', '', $this->cache_id);
+        return $this->name.'|'.mb_ereg_replace('/[^A-Za-z0-9_\|\-\.]/', '', $this->cache_id);
     }
 
     public function get_compile_id()
     {
         global $opt;
 
-        return $opt['template']['style'] . '|' . $opt['template']['locale'] . '|' . $this->compile_id;
+        return $opt['template']['style'].'|'.$opt['template']['locale'].'|'.$this->compile_id;
     }
 
     public function redirect($page)
@@ -445,21 +445,21 @@ 
             if (substr($page, 0, 1) == '/') {
                 $page = substr($page, 1);
             }
-            $page = $opt['page']['absolute_url'] . $page;
+            $page = $opt['page']['absolute_url'].$page;
         }
 
         if ($opt['session']['mode'] == SAVE_SESSION) {
             if (defined('SID') && SID != '' && session_id() != '') {
                 if (strpos($page, '?') === false) {
-                    header("Location: " . $page . '?' . urlencode(session_name()) . '=' . urlencode(session_id()));
+                    header("Location: ".$page.'?'.urlencode(session_name()).'='.urlencode(session_id()));
                 } else {
-                    header("Location: " . $page . '&' . urlencode(session_name()) . '=' . urlencode(session_id()));
+                    header("Location: ".$page.'&'.urlencode(session_name()).'='.urlencode(session_id()));
                 }
             } else {
-                header("Location: " . $page);
+                header("Location: ".$page);
             }
         } else {
-            header("Location: " . $page);
+            header("Location: ".$page);
         }
         exit;
     }
@@ -475,8 +475,8 @@ 
 
         // ok ... redirect the get-data
         $target = ($opt['page']['https']['force_login'] ? 'https' : $opt['page']['protocol'])
-            . '://' . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
-        $this->redirect('login.php?target=' . urlencode($target));
+            . '://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"];
+        $this->redirect('login.php?target='.urlencode($target));
     }
 
     public function assign_rs($name, $rs)
@@ -520,7 +520,7 @@ 
             // Date in the past
             header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
             // always modified
-            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+            header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 
             // set the cookie
             $cookie->header();

htdocs/lib2/db.inc.php

Spacing +40 added lines, -40 removed lines

@@ -185,10 +185,10 @@ 
         // & escaped?
         $escapesCount = 0;
         while ((($nextarg - $escapesCount - 1) > 0) && (substr($sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
-            $escapesCount ++;
+            $escapesCount++;
         }
         if (($escapesCount % 2) == 1) {
-            $nextarg ++;
+            $nextarg++;
         } else {
             $nextchar = substr($sql, $nextarg + 1, 1);
             if (is_numeric($nextchar)) {
@@ -199,7 +199,7 @@ 
                 while (preg_match('/^[0-9]{1}/', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -225,13 +225,13 @@ 
                         // strip apostroph and insert NULL
                         $filtered_sql = substr($filtered_sql, 0, strlen($filtered_sql) - 1);
                         $filtered_sql .= 'NULL';
-                        $sqlpos ++;
+                        $sqlpos++;
                     } else {
                         $filtered_sql .= 'NULL';
                     }
                 }
 
-                $sqlpos ++;
+                $sqlpos++;
             } else {
                 $arglength = 0;
                 $arg = '';
@@ -241,7 +241,7 @@ 
                 while (preg_match('/^[a-zA-Z0-9_]{1}/', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -263,7 +263,7 @@ 
                         $filtered_sql .= '`';
                     }
 
-                    $filtered_sql .= sql_escape_backtick($opt['db']['placeholder']['tmpdb']) . '`.`' . sql_escape_backtick($db['temptables'][$arg]);
+                    $filtered_sql .= sql_escape_backtick($opt['db']['placeholder']['tmpdb']).'`.`'.sql_escape_backtick($db['temptables'][$arg]);
 
                     if (substr($sql, $nextarg + $arglength + 1, 1) != '`') {
                         $filtered_sql .= '`';
@@ -288,12 +288,12 @@ 
         $escapesCount = 0;
         while ((($nextarg - $escapesCount - 1) > 0)
             && (substr($filtered_sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
-            $escapesCount ++;
+            $escapesCount++;
         }
         if (($escapesCount % 2) == 0) {
             // strip escapes of &
-            $filtered_sql = substr($filtered_sql, 0, $nextarg) . '&' . substr($filtered_sql, $nextarg + 2);
-            $nextarg --;
+            $filtered_sql = substr($filtered_sql, 0, $nextarg).'&'.substr($filtered_sql, $nextarg + 2);
+            $nextarg--;
         }
 
         $nextarg = strpos($filtered_sql, '\&', $nextarg + 2);
@@ -310,7 +310,7 @@ 
     */
 
     if (isset($db['debug']) && ($db['debug'] == true)) {
-        require_once $opt['rootpath'] . 'lib2/sqldebugger.class.php';
+        require_once $opt['rootpath'].'lib2/sqldebugger.class.php';
         $result = $sqldebugger->execute($filtered_sql, $dblink, ($dblink === $db['dblink_slave']), $db['slave_server']);
         if ($result === false) {
             sql_error($filtered_sql);
@@ -318,7 +318,7 @@ 
     } else {
         // measure time
         if ($opt['db']['warn']['time'] > 0) {
-            require_once $opt['rootpath'] . 'lib2/bench.inc.php';
+            require_once $opt['rootpath'].'lib2/bench.inc.php';
             $cSqlExecution = new Cbench;
             $cSqlExecution->start();
         }
@@ -332,8 +332,8 @@ 
             $cSqlExecution->stop();
 
             if ($cSqlExecution->diff() > $opt['db']['warn']['time']) {
-                $ua = isset($_SERVER['HTTP_USER_AGENT']) ? "\r\n" . $_SERVER['HTTP_USER_AGENT'] : "";
-                sql_warn("execution took " . $cSqlExecution->diff() . " seconds" . $ua);
+                $ua = isset($_SERVER['HTTP_USER_AGENT']) ? "\r\n".$_SERVER['HTTP_USER_AGENT'] : "";
+                sql_warn("execution took ".$cSqlExecution->diff()." seconds".$ua);
             }
         }
     }
@@ -774,7 +774,7 @@ 
     }
 
     if ($db['dblink'] !== false) {
-        mysql_query("SET NAMES '" . mysql_real_escape_string($opt['charset']['mysql'], $db['dblink']) . "'", $db['dblink']);
+        mysql_query("SET NAMES '".mysql_real_escape_string($opt['charset']['mysql'], $db['dblink'])."'", $db['dblink']);
 
         //database connection established ... set the used database
         if (@mysql_select_db($opt['db']['placeholder']['db'], $db['dblink']) == false) {
@@ -837,7 +837,7 @@ 
         AND `online`= 1
         AND (TIMESTAMP(NOW())-TIMESTAMP(`last_check`)+`time_diff`<'&1')
         ORDER BY `w` DESC LIMIT 1",
-        - 1,
+        -1,
         $nMaxTimeDiff
     );
 
@@ -897,7 +897,7 @@ 
         if (mysql_select_db($opt['db']['placeholder']['db'], $db['dblink_slave']) == false)
             sql_error();
 
-        mysql_query("SET NAMES '" . mysql_real_escape_string($opt['charset']['mysql'], $db['dblink_slave']) . "'", $db['dblink_slave']);
+        mysql_query("SET NAMES '".mysql_real_escape_string($opt['charset']['mysql'], $db['dblink_slave'])."'", $db['dblink_slave']);
 
         // initialize temp tables on slave server
         $rs = sqlf_slave("SELECT `threadid`, `name` FROM `sys_temptables` WHERE `threadid`='&1'", mysql_thread_id($db['dblink_slave']));
@@ -1009,7 +1009,7 @@ 
     $errno = mysql_errno();
     $error = mysql_error();
     if ($sqlstatement != "") {
-        $error .= "\n\nSQL statement: " . $sqlstatement;
+        $error .= "\n\nSQL statement: ".$sqlstatement;
     }
 
     if ($db['error'] == true) {
@@ -1018,7 +1018,7 @@ 
         // could not load translations from database)
 
         if ($opt['db']['error']['display'] == true) {
-            $errmsg = 'MySQL error recursion (' . $errno . '): ' . $error;
+            $errmsg = 'MySQL error recursion ('.$errno.'): '.$error;
         } else {
             $errmsg = "";
         }
@@ -1033,13 +1033,13 @@ 
     }
 
     if ($opt['db']['error']['mail'] != '') {
-        $subject = '[' . $opt['page']['domain'] . '] SQL error';
+        $subject = '['.$opt['page']['domain'].'] SQL error';
         if (admin_errormail($opt['db']['error']['mail'],
             $subject,
-            str_replace("\n", "\r\n", $error) . "\n" . print_r(debug_backtrace(), true),
-            "From: " . $opt['mail']['from'])) {
+            str_replace("\n", "\r\n", $error)."\n".print_r(debug_backtrace(), true),
+            "From: ".$opt['mail']['from'])) {
         #
-            require_once $opt['rootpath'] . 'lib2/mail.class.php';
+            require_once $opt['rootpath'].'lib2/mail.class.php';
             $mail = new mail();
             $mail->subject = $subject;
             $mail->to = $opt['db']['error']['mail'];
@@ -1058,13 +1058,13 @@ 
     if ($opt['gui'] == GUI_HTML) {
         if (isset($tpl)) {
             if ($opt['db']['error']['display'] == true) {
-                $tpl->error('MySQL error (' . $errno . '): ' . $error);
+                $tpl->error('MySQL error ('.$errno.'): '.$error);
             } else {
                 $tpl->error('A database command could not be performed.');
             }
         } else {
             if ($opt['db']['error']['display'] == true) {
-                die('<html><body>' . htmlspecialchars('MySQL error (' . $errno . '): ' . str_replace("\n,", "<br />", $error)) . '</body></html>');
+                die('<html><body>'.htmlspecialchars('MySQL error ('.$errno.'): '.str_replace("\n,", "<br />", $error)).'</body></html>');
             } else {
                 die('<html><body>A database command could not be performed</body></html>');
             }
@@ -1072,7 +1072,7 @@ 
     } else {
         // CLI script, simple text output
         if ($opt['db']['error']['display'] == true) {
-            die('MySQL error (' . $errno . '): ' . $error . "\n");
+            die('MySQL error ('.$errno.'): '.$error."\n");
         } else {
             die("A database command could not be performed.\n");
         }
@@ -1084,13 +1084,13 @@ 
     global $opt;
 
     if ($opt['db']['error']['mail'] != '') {
-        $subject = '[' . $opt['page']['domain'] . '] SQL error';
+        $subject = '['.$opt['page']['domain'].'] SQL error';
         if (admin_errormail($opt['db']['error']['mail'],
             $subject,
-            $warnmessage . "\n" . print_r(debug_backtrace(), true),
-            "From: " . $opt['mail']['from'])) {
+            $warnmessage."\n".print_r(debug_backtrace(), true),
+            "From: ".$opt['mail']['from'])) {
         #
-            require_once $opt['rootpath'] . 'lib2/mail.class.php';
+            require_once $opt['rootpath'].'lib2/mail.class.php';
             $mail = new mail();
             $mail->name = 'sql_warn';
             $mail->subject = $subject;
@@ -1110,7 +1110,7 @@ 
     fwrite($f, "SET NAMES 'utf8';\n");
 
     if ($truncate == true) {
-        fwrite($f, "TRUNCATE TABLE `" . sql_escape($table) . "`;\n");
+        fwrite($f, "TRUNCATE TABLE `".sql_escape($table)."`;\n");
     }
 
     while ($r = sql_fetch_assoc($rs)) {
@@ -1118,19 +1118,19 @@ 
         $values = array();
 
         foreach ($r as $k => $v) {
-            $fields[] = '`' . sql_escape($k) . '`';
+            $fields[] = '`'.sql_escape($k).'`';
             if ($v === null) {
                 $values[] = "NULL";
             } else {
-                $values[] = "'" . sql_escape($v) . "'";
+                $values[] = "'".sql_escape($v)."'";
             }
         }
         unset($r);
 
         fwrite(
             $f,
-            "INSERT INTO `" . sql_escape($table) . "` (" . implode(', ', $fields) . ")"
-            . " VALUES (" . implode(', ', $values) . ");\n"
+            "INSERT INTO `".sql_escape($table)."` (".implode(', ', $fields).")"
+            . " VALUES (".implode(', ', $values).");\n"
         );
     }
 }
@@ -1141,14 +1141,14 @@ 
     $rsIndex = sql("SHOW INDEX FROM `&1`", $table);
     while ($r = sql_fetch_assoc($rsIndex)) {
         if ($r['Key_name'] == 'PRIMARY') {
-            $primary[] = '`' . sql_escape($r['Column_name']) . '` ASC';
+            $primary[] = '`'.sql_escape($r['Column_name']).'` ASC';
         }
     }
     sql_free_result($rsIndex);
 
-    $sql = "SELECT * FROM `" . sql_escape($table) . "`";
+    $sql = "SELECT * FROM `".sql_escape($table)."`";
     if (count($primary) > 0) {
-        $sql .= ' ORDER BY ' . implode(', ', $primary);
+        $sql .= ' ORDER BY '.implode(', ', $primary);
     }
 
     $rs = sql($sql);
@@ -1194,8 +1194,8 @@ 
     $sTableSql = preg_replace("/,\n +?(KEY )?`okapi_syncbase`.+?(,)?\n/", "\\2\n", $sTableSql);
 
     fwrite($f, "SET NAMES 'utf8';\n");
-    fwrite($f, "DROP TABLE IF EXISTS `" . sql_escape($table) . "`;\n");
-    fwrite($f, $sTableSql . " ;\n");
+    fwrite($f, "DROP TABLE IF EXISTS `".sql_escape($table)."`;\n");
+    fwrite($f, $sTableSql." ;\n");
 }
 
 function sql_export_structure_to_file($filename, $table)