OpencachingDeutschland / oc-server3

htdocs/lib/cookie.class.php

Spacing +4 added lines, -4 removed lines

@@ -18,9 +18,9 @@ 
     {
         global $opt;
 
-        if (isset($_COOKIE[$opt['cookie']['name'] . 'data'])) {
+        if (isset($_COOKIE[$opt['cookie']['name'].'data'])) {
             //get the cookievars-array
-            $decoded = base64_decode($_COOKIE[$opt['cookie']['name'] . 'data']);
+            $decoded = base64_decode($_COOKIE[$opt['cookie']['name'].'data']);
 
             if ($decoded !== false) {
                 $this->values = @unserialize($decoded);
@@ -66,7 +66,7 @@ 
         if ($this->changed == true) {
             if (count($this->values) == 0) {
                 setcookie(
-                    $opt['cookie']['name'] . 'data',
+                    $opt['cookie']['name'].'data',
                     false,
                     time() + 31536000,
                     $opt['cookie']['path'],
@@ -75,7 +75,7 @@ 
                 );
             } else {
                 setcookie(
-                    $opt['cookie']['name'] . 'data',
+                    $opt['cookie']['name'].'data',
                     base64_encode(serialize($this->values)),
                     time() + 31536000,
                     $opt['cookie']['path'],

htdocs/lib/clicompatbase.inc.php

Spacing +36 added lines, -36 removed lines

@@ -20,7 +20,7 @@ 
  * $dblink
  ****************************************************************************/
 
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 global $interface_output, $dblink_slave;
 if (!isset($interface_output)) {
@@ -49,9 +49,9 @@ 
 define('regex_statpic_text', '^[a-zA-Z0-9\.\-_ @äüöÄÜÖß=)(\/\\\&*\$+~#!§%;,-?:\[\]{}¹²³\'\"`\|µ°]{0,29}$');
 
 //load default webserver-settings and common includes
-require_once $opt['rootpath'] . 'lib/consts.inc.php';
-require_once $opt['rootpath'] . 'lib/settings.inc.php';
-require_once $opt['rootpath'] . 'lib2/errorhandler.inc.php';
+require_once $opt['rootpath'].'lib/consts.inc.php';
+require_once $opt['rootpath'].'lib/settings.inc.php';
+require_once $opt['rootpath'].'lib2/errorhandler.inc.php';
 
 // check for banned UAs
 $useragent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
@@ -74,7 +74,7 @@ 
 }
 
 // prepare EMail-From
-$emailheaders = 'From: "' . $emailaddr . '" <' . $emailaddr . '>';
+$emailheaders = 'From: "'.$emailaddr.'" <'.$emailaddr.'>';
 
 function logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
 {
@@ -113,7 +113,7 @@ 
 
     while ($nCurPos < mb_strlen($str)) {
         $nNextSep = mb_strlen($str);
-        for ($nSepPos = 0; $nSepPos < mb_strlen($sep); $nSepPos ++) {
+        for ($nSepPos = 0; $nSepPos < mb_strlen($sep); $nSepPos++) {
             $nThisPos = mb_strpos($str, mb_substr($sep, $nSepPos, 1), $nCurPos);
             if ($nThisPos !== false) {
                 if ($nNextSep > $nThisPos) {
@@ -189,12 +189,12 @@ 
 
 function getSysConfig($name, $default)
 {
-    return sqlValue('SELECT `value` FROM `sysconfig` WHERE `name`=\'' . sql_escape($name) . '\'', $default);
+    return sqlValue('SELECT `value` FROM `sysconfig` WHERE `name`=\''.sql_escape($name).'\'', $default);
 }
 
 function setSysConfig($name, $value)
 {
-    if (sqlValue('SELECT COUNT(*) FROM sysconfig WHERE name=\'' . sql_escape($name) . '\'', 0) == 1) {
+    if (sqlValue('SELECT COUNT(*) FROM sysconfig WHERE name=\''.sql_escape($name).'\'', 0) == 1) {
         sql(
             "UPDATE `sysconfig` SET `value`='&1' WHERE `name`='&2' LIMIT 1",
             $value,
@@ -294,10 +294,10 @@ 
         // muss dieses & ersetzt werden, oder ist es escaped?
         $escapesCount = 0;
         while ((($nextarg - $escapesCount - 1) > 0) && (mb_substr($sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
-            $escapesCount ++;
+            $escapesCount++;
         }
         if (($escapesCount % 2) == 1) {
-            $nextarg ++;
+            $nextarg++;
         } else {
             $nextchar = mb_substr($sql, $nextarg + 1, 1);
             if (is_numeric($nextchar)) {
@@ -308,7 +308,7 @@ 
                 while (mb_ereg_match('^[0-9]{1}', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = mb_substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -349,13 +349,13 @@ 
                         // Anführungszeichen weg machen und NULL einsetzen
                         $filtered_sql = mb_substr($filtered_sql, 0, mb_strlen($filtered_sql) - 1);
                         $filtered_sql .= 'NULL';
-                        $sqlpos ++;
+                        $sqlpos++;
                     } else {
                         $filtered_sql .= 'NULL';
                     }
                 }
 
-                $sqlpos ++;
+                $sqlpos++;
             } else {
                 $arglength = 0;
                 $arg = '';
@@ -364,7 +364,7 @@ 
                 while (mb_ereg_match('^[a-zA-Z0-9]{1}', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = mb_substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -396,12 +396,12 @@ 
                     $nextarg - $escapesCount - 1,
                     1
                 ) == '\\')) {
-            $escapesCount ++;
+            $escapesCount++;
         }
         if (($escapesCount % 2) == 0) {
             // \& ersetzen durch &
-            $filtered_sql = mb_substr($filtered_sql, 0, $nextarg) . '&' . mb_substr($filtered_sql, $nextarg + 2);
-            $nextarg --;
+            $filtered_sql = mb_substr($filtered_sql, 0, $nextarg).'&'.mb_substr($filtered_sql, $nextarg + 2);
+            $nextarg--;
         }
 
         $nextarg = mb_strpos($filtered_sql, '\&', $nextarg + 2);
@@ -418,14 +418,14 @@ 
     */
 
     if (isset($sql_debug) && ($sql_debug == true)) {
-        require_once $opt['rootpath'] . 'lib/sqldebugger.inc.php';
+        require_once $opt['rootpath'].'lib/sqldebugger.inc.php';
         $result = sqldbg_execute($filtered_sql, $bSlave);
         if ($result === false) {
             sql_error();
         }
     } else {
         // Zeitmessung für die Ausführung
-        require_once $opt['rootpath'] . 'lib/bench.inc.php';
+        require_once $opt['rootpath'].'lib/bench.inc.php';
         $cSqlExecution = new Cbench;
         $cSqlExecution->start();
 
@@ -437,8 +437,8 @@ 
         $cSqlExecution->stop();
 
         if ($sql_warntime > 0 && $cSqlExecution->diff() > $sql_warntime) {
-            $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);
         }
     }
 
@@ -473,7 +473,7 @@ 
     global $db_error;
 
     $db_error += 1;
-    $msql_error = mysql_errno() . ": " . mysql_error();
+    $msql_error = mysql_errno().": ".mysql_error();
     if ($db_error > 1) {
         $msql_error .= "\n(** error recursion **)";
     }
@@ -484,13 +484,13 @@ 
         $email_content .= "\n--------------------\n";
         $email_content .= print_r(debug_backtrace(), true);
         if (admin_errormail($sql_errormail, 'sql_error', $email_content, $emailheaders)) {
-            mb_send_mail($sql_errormail, 'sql_error: ' . $absolute_server_URI, $email_content, $emailheaders);
+            mb_send_mail($sql_errormail, 'sql_error: '.$absolute_server_URI, $email_content, $emailheaders);
         }
     }
 
     if ($interface_output == 'html') {
         // display errorpage
-        $errmsg = $dberrormsg . ($debug_page ? "<br />" . $msql_error : "");
+        $errmsg = $dberrormsg.($debug_page ? "<br />".$msql_error : "");
         if ($db_error <= 1) {
             tpl_errorMsg('sql_error', $errmsg);
         } else {
@@ -504,12 +504,12 @@ 
         exit;
     } elseif ($interface_output == 'plain') {
         echo "\n";
-        echo 'sql_error' . "\n";
+        echo 'sql_error'."\n";
         if ($debug_page) {
-            echo $msql_error . "\n";
+            echo $msql_error."\n";
         }
-        echo '---------' . "\n";
-        echo print_r(debug_backtrace(), true) . "\n";
+        echo '---------'."\n";
+        echo print_r(debug_backtrace(), true)."\n";
         exit;
     }
 
@@ -527,7 +527,7 @@ 
     $email_content .= print_r(debug_backtrace(), true);
 
     if (admin_errormail($sql_errormail, 'sql_warn', $email_content, $emailheaders)) {
-        $sendMail = @mb_send_mail($sql_errormail, 'sql_warn: ' . $absolute_server_URI, $email_content, $emailheaders);
+        $sendMail = @mb_send_mail($sql_errormail, 'sql_warn: '.$absolute_server_URI, $email_content, $emailheaders);
         if ($sendMail === false) {
             throw new \RuntimeException('the E-Mail can not be send.');
         }
@@ -630,7 +630,7 @@ 
     }
 
     if ($dblink != false) {
-        mysql_query("SET NAMES '" . mysql_real_escape_string($opt['charset']['mysql'], $dblink) . "'", $dblink);
+        mysql_query("SET NAMES '".mysql_real_escape_string($opt['charset']['mysql'], $dblink)."'", $dblink);
 
         //database connection established ... set the used database
         if (@mysql_select_db($dbname, $dblink) == false) {
@@ -666,7 +666,7 @@ 
     $nMaxTimeDiff = $opt['db']['slave']['max_behind'];
     if ($usr !== false) {
         $nMaxTimeDiff = sqlValue(
-            "SELECT TIMESTAMP(NOW())-TIMESTAMP(`datExclude`) FROM `sys_repl_exclude` WHERE `user_id`='" . ($usr['userid'] + 0) . "'",
+            "SELECT TIMESTAMP(NOW())-TIMESTAMP(`datExclude`) FROM `sys_repl_exclude` WHERE `user_id`='".($usr['userid'] + 0)."'",
             $opt['db']['slave']['max_behind']
         );
         if ($nMaxTimeDiff > $opt['db']['slave']['max_behind']) {
@@ -675,7 +675,7 @@ 
     }
 
     $id = sqlValue(
-        "SELECT `id`, `weight`*RAND() AS `w` FROM `sys_repl_slaves` WHERE `active`=1 AND `online`=1 AND (TIMESTAMP(NOW())-TIMESTAMP(`last_check`)+`time_diff`<'" . ($nMaxTimeDiff + 0) . "') ORDER BY `w` DESC LIMIT 1",
+        "SELECT `id`, `weight`*RAND() AS `w` FROM `sys_repl_slaves` WHERE `active`=1 AND `online`=1 AND (TIMESTAMP(NOW())-TIMESTAMP(`last_check`)+`time_diff`<'".($nMaxTimeDiff + 0)."') ORDER BY `w` DESC LIMIT 1",
         - 1
     );
 
@@ -747,9 +747,9 @@ 
             $protocol = 'http';
         }
 
-        $site_url = $protocol . strstr($opt['domain'][$domain]['url'], '://');
+        $site_url = $protocol.strstr($opt['domain'][$domain]['url'], '://');
         if (isset($opt['domain'][$domain]['shortlink_domain']) && $opt['domain'][$domain]['shortlink_domain']) {
-            $shortlink_url = $protocol . '://' . $opt['domain'][$domain]['shortlink_domain'] . '/';
+            $shortlink_url = $protocol.'://'.$opt['domain'][$domain]['shortlink_domain'].'/';
         } else {
             $shortlink_url = false;
         }
@@ -769,10 +769,10 @@ 
         $language = $opt['template']['default']['locale'];
     }
     $language = strtolower($language);
-    if (!file_exists($rootpath . '/lang/de/ocstyle/email/' . $language . '/' . $filename . '.email')) {
+    if (!file_exists($rootpath.'/lang/de/ocstyle/email/'.$language.'/'.$filename.'.email')) {
         $language = 'en';
     }
-    $mailtext = read_file($rootpath . '/lang/de/ocstyle/email/' . $language . '/' . $filename . '.email');
+    $mailtext = read_file($rootpath.'/lang/de/ocstyle/email/'.$language.'/'.$filename.'.email');
 
     $urls = get_site_urls($domain);
     $mailtext = mb_ereg_replace("{site_url}", $urls['site_url'], $mailtext);

htdocs/lib/consts.inc.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
  * named consts
  ****************************************************************************/
 
-require_once __DIR__ . '/consts-common.inc.php';
+require_once __DIR__.'/consts-common.inc.php';
 
 // for cachelists
 define('cachelist_type_ignore', 1);

htdocs/lib/common.inc.php

Spacing +44 added lines, -44 removed lines

@@ -35,19 +35,19 @@ 
 if (!isset($rootpath)) {
     $rootpath = './';
 }
-require_once $rootpath . 'lib/clicompatbase.inc.php';
+require_once $rootpath.'lib/clicompatbase.inc.php';
 
 // enforce http or https?
 if (isset($opt['gui']) && $opt['gui'] == GUI_HTML) {
     if ($opt['page']['https']['mode'] == HTTPS_DISABLED) {
         if ($opt['page']['https']['active']) {
-            header('Location: http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
+            header('Location: http://'.$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
         }
         $opt['page']['force_https_login'] = false;
     } else {
         if ($opt['page']['https']['mode'] == HTTPS_ENFORCED) {
             if (!$opt['page']['https']['active']) {
-                header('Location: https://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
+                header('Location: https://'.$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
             }
             $opt['page']['force_https_login'] = true;
         }
@@ -58,12 +58,12 @@ 
 load_domain_settings();
 
 // load HTML specific includes
-require_once $rootpath . 'lib/cookie.class.php';
+require_once $rootpath.'lib/cookie.class.php';
 
 //site in service?
 if ($site_in_service == false) {
     header('Content-type: text/html; charset=utf-8');
-    $page_content = read_file($rootpath . 'html/outofservice.tpl.php');
+    $page_content = read_file($rootpath.'html/outofservice.tpl.php');
     die($page_content);
 }
 
@@ -84,7 +84,7 @@ 
 }
 
 //are there files for this language?
-if (!file_exists($rootpath . 'lang/' . $lang . '/')) {
+if (!file_exists($rootpath.'lang/'.$lang.'/')) {
     die('Critical Error: The specified language does not exist!');
 }
 
@@ -97,22 +97,22 @@ 
 }
 
 //does the style exist?
-if (!file_exists($rootpath . 'lang/' . $lang . '/' . $style . '/')) {
+if (!file_exists($rootpath.'lang/'.$lang.'/'.$style.'/')) {
     $style = 'ocstyle';
 }
 
-if (!file_exists($rootpath . 'lang/' . $lang . '/' . $style . '/')) {
+if (!file_exists($rootpath.'lang/'.$lang.'/'.$style.'/')) {
     die('Critical Error: The specified style does not exist!');
 }
 
 //set up the language path
 if (!isset($langpath)) {
-    $langpath = $rootpath . 'lang/' . $lang;
+    $langpath = $rootpath.'lang/'.$lang;
 }
 
 //set up the style path
 if (!isset($stylepath)) {
-    $stylepath = $langpath . '/' . $style;
+    $stylepath = $langpath.'/'.$style;
 }
 
 //load gettext translation
@@ -121,14 +121,14 @@ 
 //open a databse connection
 db_connect();
 
-require $opt['rootpath'] . 'lib/auth.inc.php';
-require_once $opt['rootpath'] . 'lib2/translate.class.php';
+require $opt['rootpath'].'lib/auth.inc.php';
+require_once $opt['rootpath'].'lib2/translate.class.php';
 
 //load language specific strings
-require_once $langpath . '/expressions.inc.php';
+require_once $langpath.'/expressions.inc.php';
 
 //set up the defaults for the main template
-require_once $stylepath . '/varset.inc.php';
+require_once $stylepath.'/varset.inc.php';
 
 if ($dblink === false) {
     //error while connecting to the database
@@ -156,7 +156,7 @@ 
         tpl_set_var('loginbox', $sLoggedOut);
         tpl_set_var(
             'login_url',
-            ($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '') . 'login.php'
+            ($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '').'login.php'
         );
     } else {
         //user logged in
@@ -170,7 +170,7 @@ 
 $ocpropping = isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], "Ocprop/") !== false;
 
 // zeitmessung
-require_once $rootpath . 'lib/bench.inc.php';
+require_once $rootpath.'lib/bench.inc.php';
 $bScriptExecution = new Cbench;
 $bScriptExecution->start();
 
@@ -334,12 +334,12 @@ 
     // country dropdown
     global $tpl_usercountries;
 
-    tpl_set_var('screen_css_time', filemtime($opt['rootpath'] . "resource2/" . $style . "/css/style_screen.css"));
+    tpl_set_var('screen_css_time', filemtime($opt['rootpath']."resource2/".$style."/css/style_screen.css"));
     tpl_set_var(
         'screen_msie_css_time',
-        filemtime($opt['rootpath'] . "resource2/" . $style . "/css/style_screen_msie.css")
+        filemtime($opt['rootpath']."resource2/".$style."/css/style_screen_msie.css")
     );
-    tpl_set_var('print_css_time', filemtime($opt['rootpath'] . "resource2/" . $style . "/css/style_print.css"));
+    tpl_set_var('print_css_time', filemtime($opt['rootpath']."resource2/".$style."/css/style_print.css"));
 
     if (isset($bScriptExecution)) {
         $bScriptExecution->Stop();
@@ -376,8 +376,8 @@ 
         $ltext = mb_ereg_replace('%1', $lurl, $ltext);
         $ltext = mb_ereg_replace('{site}', $opt['page']['sitename'], $ltext);
 
-        $ld = '<p class="sidebar-maintitle">' . $translate->t('Datalicense', '', '', 0) . '</p>' .
-            '<div style="margin:20px 0 16px 0; width:100%; text-align:center;">' . $ltext . '</div>';
+        $ld = '<p class="sidebar-maintitle">'.$translate->t('Datalicense', '', '', 0).'</p>'.
+            '<div style="margin:20px 0 16px 0; width:100%; text-align:center;">'.$ltext.'</div>';
         tpl_set_var('license_disclaimer', $ld);
     } else {
         tpl_set_var('license_disclaimer', '');
@@ -425,25 +425,25 @@ 
     sql_free_result($rsUserCountries);
 
     //include language specific expressions, so that they are available in the template code
-    include $langpath . '/expressions.inc.php';
+    include $langpath.'/expressions.inc.php';
 
     //load main template
     tpl_set_var('backgroundimage', '<div id="bg1">&nbsp;</div><div id="bg2">&nbsp;</div>');
     tpl_set_var('bodystyle', '');
 
     if (isset($_REQUEST['print']) && $_REQUEST['print'] == 'y') {
-        $sCode = read_file($stylepath . '/main_print.tpl.php');
+        $sCode = read_file($stylepath.'/main_print.tpl.php');
     } else {
         if (isset($_REQUEST['popup']) && $_REQUEST['popup'] == 'y') {
-            $sCode = read_file($stylepath . '/popup.tpl.php');
+            $sCode = read_file($stylepath.'/popup.tpl.php');
         } else {
-            $sCode = read_file($stylepath . '/main.tpl.php');
+            $sCode = read_file($stylepath.'/main.tpl.php');
         }
     }
-    $sCode = '?>' . $sCode;
+    $sCode = '?>'.$sCode;
 
     //does template exist?
-    if (!file_exists($stylepath . '/' . $tplname . '.tpl.php')) {
+    if (!file_exists($stylepath.'/'.$tplname.'.tpl.php')) {
         //set up the error template
         $error = true;
         tpl_set_var('error_msg', htmlspecialchars($error_pagenotexist, ENT_COMPAT, 'UTF-8'));
@@ -452,7 +452,7 @@ 
     }
 
     //read the template
-    $sTemplate = read_file($stylepath . '/' . $tplname . '.tpl.php');
+    $sTemplate = read_file($stylepath.'/'.$tplname.'.tpl.php');
     $sCode = mb_ereg_replace('{template}', $sTemplate, $sCode);
 
     //process translations
@@ -492,7 +492,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");
 }
 
 //redirect to another site to display, i.e. to view a cache after logging
@@ -504,9 +504,9 @@ 
     http_write_no_cache();
 
     if (!preg_match('/^https?:/i', $page)) {
-        header("Location: " . $absolute_server_URI . $page);
+        header("Location: ".$absolute_server_URI.$page);
     } else {
-        header("Location: " . $page);
+        header("Location: ".$page);
     }
 
     exit;
@@ -522,17 +522,17 @@ 
     if (is_array($vars)) {
         foreach ($vars as $varname => $varvalue) {
             if ($no_eval_vars[$varname] == false) {
-                $str = mb_ereg_replace('{' . $varname . '}', $varvalue, $str);
+                $str = mb_ereg_replace('{'.$varname.'}', $varvalue, $str);
             } else {
-                $replave_var_name = 'tpl_replace_var_' . $varname;
+                $replave_var_name = 'tpl_replace_var_'.$varname;
 
                 global $$replave_var_name;
                 $$replave_var_name = $varvalue;
 
                 //replace using php-echo
                 $str = mb_ereg_replace(
-                    '{' . $varname . '}',
-                    '<?php global $' . $replave_var_name . '; echo $tpl_replace_var_' . $varname . '; ?>',
+                    '{'.$varname.'}',
+                    '<?php global $'.$replave_var_name.'; echo $tpl_replace_var_'.$varname.'; ?>',
                     $str
                 );
             }
@@ -565,7 +565,7 @@ 
     }
     $opt['template']['locale'] = $locale;
 
-    bindtextdomain('messages', $rootpath . '/cache2/translate');
+    bindtextdomain('messages', $rootpath.'/cache2/translate');
     set_php_locale();
     textdomain('messages');
 }
@@ -603,7 +603,7 @@ 
     $sResultCode = '';
     $nCurrentPos = 0;
     while ($nCurrentPos < mb_strlen($sCode)) {
-        $nStartOf = mb_strpos($sCode, '{' . 't}', $nCurrentPos);
+        $nStartOf = mb_strpos($sCode, '{'.'t}', $nCurrentPos);
         if ($nStartOf === false) {
             $sResultCode .= mb_substr($sCode, $nCurrentPos, mb_strlen($sCode) - $nCurrentPos);
             $nCurrentPos = mb_strlen($sCode);
@@ -633,8 +633,8 @@ 
 
     $str = $translate->t($str, '', basename(__FILE__), __LINE__);
     $args = func_get_args();
-    for ($nIndex = count($args) - 1; $nIndex > 0; $nIndex --) {
-        $str = str_replace('%' . $nIndex, $args[$nIndex], $str);
+    for ($nIndex = count($args) - 1; $nIndex > 0; $nIndex--) {
+        $str = str_replace('%'.$nIndex, $args[$nIndex], $str);
     }
 
     return $str;
@@ -666,7 +666,7 @@ 
 
     // user specified a country?
     if (isset($usr) && ($usr !== false)) {
-        $sCountry = sqlValue("SELECT `country` FROM `user` WHERE `user_id`='" . ($usr['userid'] + 0) . "'", null);
+        $sCountry = sqlValue("SELECT `country` FROM `user` WHERE `user_id`='".($usr['userid'] + 0)."'", null);
         if ($sCountry != null) {
             return $sCountry;
         }
@@ -732,14 +732,14 @@ 
     mysql_free_result($rs);
 
     $imgtitle = $translate->t('Instructions', '', basename(__FILE__), __LINE__);
-    $imgtitle = "alt='" . $imgtitle . "' title='" . $imgtitle . "'";
+    $imgtitle = "alt='".$imgtitle."' title='".$imgtitle."'";
 
     if (substr($helppage, 0, 1) == "!") {
-        return "<a class='nooutline' href='" . substr($helppage, 1) . "' " . $imgtitle . " target='_blank'>";
+        return "<a class='nooutline' href='".substr($helppage, 1)."' ".$imgtitle." target='_blank'>";
     } else {
         if ($helppage != "" && isset($opt['locale'][$help_locale]['helpwiki'])) {
-            return "<a class='nooutline' href='" . $opt['locale'][$help_locale]['helpwiki'] .
-            str_replace(' ', '_', $helppage) . "' " . $imgtitle . " target='_blank'>";
+            return "<a class='nooutline' href='".$opt['locale'][$help_locale]['helpwiki'].
+            str_replace(' ', '_', $helppage)."' ".$imgtitle." target='_blank'>";
         }
     }
 

htdocs/lib/login.class.php

Spacing +6 added lines, -6 removed lines

@@ -18,13 +18,13 @@ 
  *
  ***************************************************************************/
 
-define('LOGIN_UNKNOWN_ERROR', - 1);     // unkown error occured
-define('LOGIN_OK', 0);            // login succeeded
-define('LOGIN_BADUSERPW', 1);     // bad username or password
+define('LOGIN_UNKNOWN_ERROR', - 1); // unkown error occured
+define('LOGIN_OK', 0); // login succeeded
+define('LOGIN_BADUSERPW', 1); // bad username or password
 define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time
 define('LOGIN_USERNOTACTIVE', 3); // the useraccount locked
 define('LOGIN_EMPTY_USERPASSWORD', 4); // given username/password was empty
-define('LOGIN_LOGOUT_OK', 5);          // logout was successfull
+define('LOGIN_LOGOUT_OK', 5); // logout was successfull
 
 // login times in seconds
 define('LOGIN_TIME', 60 * 60);
@@ -204,9 +204,9 @@ 
 
         // check the number of logins in the last hour ...
         $logins_count = sqlValue(
-            "SELECT COUNT(*) `count` FROM `sys_logins` WHERE `remote_addr`='" . sql_escape(
+            "SELECT COUNT(*) `count` FROM `sys_logins` WHERE `remote_addr`='".sql_escape(
                 $_SERVER['REMOTE_ADDR']
-            ) . "' AND `date_created`>'" . sql_escape(date('Y-m-d H:i:s', time() - 3600)) . "'",
+            )."' AND `date_created`>'".sql_escape(date('Y-m-d H:i:s', time() - 3600))."'",
             0
         );
         if ($logins_count > $opt['page']['max_logins_per_hour']) {

htdocs/lib/eventhandler.inc.php

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
     $userid = $userid + 0;
 
     // data changed - delete statpic of user, if exists - will be recreated on next request
-    if (file_exists('./images/statpics/statpic' . $userid . '.jpg')) {
-        unlink('./images/statpics/statpic' . $userid . '.jpg');
+    if (file_exists('./images/statpics/statpic'.$userid.'.jpg')) {
+        unlink('./images/statpics/statpic'.$userid.'.jpg');
     }
 }
 

htdocs/lib/settings-dist.inc.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
 $style = 'ocstyle';
 
 // include common settings of lib1 and lib2
-require_once $rootpath . 'config2/settings-dist-common.inc.php';
+require_once $rootpath.'config2/settings-dist-common.inc.php';
 
 //id of the node; see list in config2/settings-dist.inc.php
 $oc_nodeid = 0;
@@ -126,7 +126,7 @@ 
 
 // sql debugging
 $sql_allow_debug = 0;
-$sql_debug_cryptkey = 'this is my very, very secret \'secret key\'';  // min. 24 chars
+$sql_debug_cryptkey = 'this is my very, very secret \'secret key\''; // min. 24 chars
 
 // replacements for sql()
 $sql_replacements['db'] = $dbname;
@@ -148,10 +148,10 @@ 
 
 /* default locale
  */
-$opt['template']['default']['locale'] = 'DE';   // can be overwritten by $opt['domain'][<domain>]['locale']
+$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale']
 
 // include all locale settings
-require_once $rootpath . 'config2/locale.inc.php';
+require_once $rootpath.'config2/locale.inc.php';
 
 /* replicated slave databases
  * use same config as in config2/settings.inc.php (!)
@@ -198,7 +198,7 @@ 
         'menustring' => t('Geokrety'),
         'siteid' => 'geokrety',
         'visible' => true,
-        'filename' => 'http://geokrety.org/index.php?lang=' . (isset($locale) ? strtolower($locale) : 'de')
+        'filename' => 'http://geokrety.org/index.php?lang='.(isset($locale) ? strtolower($locale) : 'de')
     ];
 
     $menu[] = [

htdocs/lib/sqldebugger.inc.php

Spacing +22 added lines, -22 removed lines

@@ -9,7 +9,7 @@ 
  * Unicode Reminder メモ
  ****************************************************************************/
 
-require_once $opt['rootpath'] . 'lib/bench.inc.php';
+require_once $opt['rootpath'].'lib/bench.inc.php';
 
 $sqldbg_cmdNo = 0;
 $sqldbg_sumTimes = 0;
@@ -155,9 +155,9 @@ 
     global $sqldbg_cmdNo;
     global $sqldbg_sumTimes;
 
-    $sqldbg_cmdNo ++;
+    $sqldbg_cmdNo++;
 
-    echo '<p class="sqlno"><span class="white">/*</span> SQL command ' . $sqldbg_cmdNo . ' ';
+    echo '<p class="sqlno"><span class="white">/*</span> SQL command '.$sqldbg_cmdNo.' ';
     if ($bSlave) {
         echo '<span class="slave_title">(slave)</span>';
     }
@@ -224,19 +224,19 @@ 
         $bFirstLine = true;
         $nLine = 0;
         $rs = mysql_query($sqlexplain, $dblink);
-        echo '<div class="selrows">Number of selected rows: ' . mysql_num_rows($rs) . '</div>';
+        echo '<div class="selrows">Number of selected rows: '.mysql_num_rows($rs).'</div>';
 
         echo '<table class="firstresultrow" border="1">';
 
         while ($r = sql_fetch_assoc($rs)) {
             $usebr = true;
-            $nLine ++;
+            $nLine++;
             if ($bFirstLine == true) {
-                echo '<tr>' . "\n";
+                echo '<tr>'."\n";
                 foreach ($r as $field => $value) {
-                    echo '<th>' . htmlspecialchars($field, ENT_COMPAT, 'UTF-8') . '</th>' . "\n";
+                    echo '<th>'.htmlspecialchars($field, ENT_COMPAT, 'UTF-8').'</th>'."\n";
                 }
-                echo '</tr>' . "\n";
+                echo '</tr>'."\n";
             }
 
             if ($bFirstLine) {
@@ -246,9 +246,9 @@ 
             }
 
             foreach ($r as $value) {
-                echo '<td>' . htmlspecialchars(($value != null) ? $value : 'NULL', ENT_COMPAT, 'UTF-8') . '</td>';
+                echo '<td>'.htmlspecialchars(($value != null) ? $value : 'NULL', ENT_COMPAT, 'UTF-8').'</td>';
             }
-            echo '</tr>' . "\n";
+            echo '</tr>'."\n";
 
             if ($nLine == 25) {
                 break;
@@ -261,27 +261,27 @@ 
         echo '<table class="explain" border="1">';
 
         $bFirstLine = true;
-        $rs = mysql_query('EXPLAIN EXTENDED ' . $sqlexplain);
+        $rs = mysql_query('EXPLAIN EXTENDED '.$sqlexplain);
         while ($r = sql_fetch_assoc($rs)) {
             if ($bFirstLine == true) {
                 echo '<tr>';
                 foreach ($r as $field => $value) {
-                    echo '<th>' . htmlspecialchars($field, ENT_COMPAT, 'UTF-8') . '</th>';
+                    echo '<th>'.htmlspecialchars($field, ENT_COMPAT, 'UTF-8').'</th>';
                 }
-                echo '</tr>' . "\n";
+                echo '</tr>'."\n";
 
                 $bFirstLine = false;
             }
 
             echo '<tr>';
             foreach ($r as $value) {
-                echo '<td>' . htmlspecialchars(
+                echo '<td>'.htmlspecialchars(
                         ($value != null) ? mb_ereg_replace('\*/', '* /', $value) : 'NULL',
                         ENT_COMPAT,
                         'UTF-8'
-                    ) . '</td>';
+                    ).'</td>';
             }
-            echo '</tr>' . "\n";
+            echo '</tr>'."\n";
         }
         echo '</table>';
         $usebr = true;
@@ -303,14 +303,14 @@ 
         echo '<table>';
         $rs = mysql_query('SHOW WARNINGS', $dblink);
         while ($r = sql_fetch_assoc($rs)) {
-            echo '<tr><td>' . htmlspecialchars($r['Message'], ENT_COMPAT, 'UTF-8') . '</td></tr>';
+            echo '<tr><td>'.htmlspecialchars($r['Message'], ENT_COMPAT, 'UTF-8').'</td></tr>';
         }
         echo '</table>';
         echo '</div>';
     }
 
-    echo '<div class="runtime">Runtime: ' . sprintf('%01.5f', $bSqlExecution->Diff()) . ' sek.</div>';
-    echo '<div class="affectedrows">Number of affected rows: ' . mysql_affected_rows($dblink) . '</div>';
+    echo '<div class="runtime">Runtime: '.sprintf('%01.5f', $bSqlExecution->Diff()).' sek.</div>';
+    echo '<div class="affectedrows">Number of affected rows: '.mysql_affected_rows($dblink).'</div>';
 
     echo '<div class="white">*/</div></div>';
 
@@ -322,7 +322,7 @@ 
     global $sqldbg_sumTimes;
 
     echo '<span class="white">/*</span><div class="allruntime"><hr>';
-    echo 'Runtime sum: ' . sprintf('%01.5f', $sqldbg_sumTimes) . ' sek.<span class="white">*/</span></div>';
+    echo 'Runtime sum: '.sprintf('%01.5f', $sqldbg_sumTimes).' sek.<span class="white">*/</span></div>';
 
     echo '</body></html>';
     exit;
@@ -347,13 +347,13 @@ 
         return '';
     }
 
-    return 'SELECT * ' . mb_substr($sql, $start);
+    return 'SELECT * '.mb_substr($sql, $start);
 }
 
 function sqldbg_insert_nocache($sql)
 {
     if (mb_strtoupper(mb_substr($sql, 0, 7)) == 'SELECT ') {
-        $sql = 'SELECT SQL_NO_CACHE ' . mb_substr($sql, 7);
+        $sql = 'SELECT SQL_NO_CACHE '.mb_substr($sql, 7);
     }
 
     return $sql;

htdocs/lib/auth.inc.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
  * Dont include this file by hand - it will be included from common.inc.php
  ****************************************************************************/
 
-require $opt['rootpath'] . 'lib/login.class.php';
+require $opt['rootpath'].'lib/login.class.php';
 
 $autherr = 0;
 define('AUTHERR_NOERROR', 0);
@@ -36,7 +36,7 @@ 
     if ($login->userid != 0) {
         //set up $usr array
         $usr['userid'] = $login->userid;
-        $usr['email'] = sqlValue("SELECT `email` FROM `user` WHERE `user_id`='" . sql_escape($login->userid) . "'", '');
+        $usr['email'] = sqlValue("SELECT `email` FROM `user` WHERE `user_id`='".sql_escape($login->userid)."'", '');
         $usr['username'] = $login->username;
         $usr['admin'] = $login->admin;
     } else {