OpencachingDeutschland / oc-server3

htdocs/lib2/cookie.class.php

Spacing +5 added lines, -5 removed lines

@@ -24,9 +24,9 @@ 
             if (isset($_REQUEST['SESSION']) && $_REQUEST['SESSION'] != '') {
                 $this->init_session();
             }
-        } elseif (isset($_COOKIE[$opt['session']['cookiename'] . 'data'])) {
+        } elseif (isset($_COOKIE[$opt['session']['cookiename'].'data'])) {
             //get the cookievars-array
-            $decoded = base64_decode($_COOKIE[$opt['session']['cookiename'] . 'data']);
+            $decoded = base64_decode($_COOKIE[$opt['session']['cookiename'].'data']);
 
             if ($decoded !== false) {
                 $this->values = @unserialize($decoded);
@@ -51,7 +51,7 @@ 
 
             if ($opt['session']['check_referer']) {
                 if (isset($_SERVER['REFERER'])) {
-                    if (strtolower(substr('http' + strstr($_SERVER['REFERER'], '://'), 0, strlen($opt['page']['absolute_http_url']))) != strtolower($opt['page']['absolute_http_url'])) {
+                    if (strtolower(substr('http' +strstr($_SERVER['REFERER'], '://'), 0, strlen($opt['page']['absolute_http_url']))) != strtolower($opt['page']['absolute_http_url'])) {
                         $this->createNewSession();
                     }
                 }
@@ -168,7 +168,7 @@ 
             if ($this->changed == true) {
                 if (count($this->values) == 0) {
                     setcookie(
-                        $opt['session']['cookiename'] . 'data',
+                        $opt['session']['cookiename'].'data',
                         false,
                         time() + 31536000,
                         $opt['session']['path'],
@@ -177,7 +177,7 @@ 
                     );
                 } else {
                     setcookie(
-                        $opt['session']['cookiename'] . 'data',
+                        $opt['session']['cookiename'].'data',
                         base64_encode(serialize($this->values)),
                         time() + 31536000,
                         $opt['session']['path'],

htdocs/lib2/translationHandler.class.php

Spacing +20 added lines, -20 removed lines

@@ -32,20 +32,20 @@ 
             return;
         }
 
-        if (!is_dir($opt['rootpath'] . 'cache2/translate/' . $language_lower)) {
-            mkdir($opt['rootpath'] . 'cache2/translate/' . $language_lower);
+        if (!is_dir($opt['rootpath'].'cache2/translate/'.$language_lower)) {
+            mkdir($opt['rootpath'].'cache2/translate/'.$language_lower);
         }
-        if (!is_dir($opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES')) {
-            mkdir($opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES');
+        if (!is_dir($opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES')) {
+            mkdir($opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES');
         }
 
-        $f = fopen($opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES/messages.po', 'w');
+        $f = fopen($opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES/messages.po', 'w');
 
-        fwrite($f, 'msgid ""' . "\n");
-        fwrite($f, 'msgstr ""' . "\n");
-        fwrite($f, '"MIME-Version: 1.0\n"' . "\n");
-        fwrite($f, '"Content-Type: text/plain; charset=UTF-8\n"' . "\n");
-        fwrite($f, '"Content-Transfer-Encoding: 8bit\n"' . "\n");
+        fwrite($f, 'msgid ""'."\n");
+        fwrite($f, 'msgstr ""'."\n");
+        fwrite($f, '"MIME-Version: 1.0\n"'."\n");
+        fwrite($f, '"Content-Type: text/plain; charset=UTF-8\n"'."\n");
+        fwrite($f, '"Content-Transfer-Encoding: 8bit\n"'."\n");
         fwrite($f, "\n");
 
         // English texts in sys_trans_text are more up-to-date than the original translation
@@ -66,10 +66,10 @@ 
         );
 
         $variables = array();
-        $this->loadNodeTextFile($variables, $opt['logic']['node']['id'] . '.txt', $language_lower);
+        $this->loadNodeTextFile($variables, $opt['logic']['node']['id'].'.txt', $language_lower);
         $this->loadNodeTextFile(
             $variables,
-            $opt['logic']['node']['id'] . '-' . $language_lower . '.txt',
+            $opt['logic']['node']['id'].'-'.$language_lower.'.txt',
             $language_lower
         );
 
@@ -78,8 +78,8 @@ 
             if ($trans !== null && $trans != $r['text']) {
                 $trans = $this->substitueVariables($variables, $language_lower, $trans);
 
-                fwrite($f, 'msgid "' . $this->escape_text($r['text']) . '"' . "\n");
-                fwrite($f, 'msgstr "' . $this->escape_text($trans) . '"' . "\n");
+                fwrite($f, 'msgid "'.$this->escape_text($r['text']).'"'."\n");
+                fwrite($f, 'msgstr "'.$this->escape_text($trans).'"'."\n");
                 fwrite($f, "\n");
             }
         }
@@ -89,10 +89,10 @@ 
 
         try {
             exec(
-                'msgfmt -o ' . escapeshellcmd(
-                    $opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES/messages.mo'
-                ) . ' ' . escapeshellcmd(
-                    $opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES/messages.po'
+                'msgfmt -o '.escapeshellcmd(
+                    $opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES/messages.mo'
+                ).' '.escapeshellcmd(
+                    $opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES/messages.po'
                 )
             );
         } catch (Exception $e) {
@@ -189,7 +189,7 @@ 
             sqlf(
                 "INSERT IGNORE INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('&1', '&2', 0)",
                 $lastId,
-                'table:' . $table . ';field=' . $fname
+                'table:'.$table.';field='.$fname
             );
         }
         sql_free_result($rs);
@@ -211,7 +211,7 @@ 
         // generic load
         global $opt;
 
-        $filename = $opt['rootpath'] . '/config2/nodetext/' . $file;
+        $filename = $opt['rootpath'].'/config2/nodetext/'.$file;
         if (file_exists($filename)) {
             $fhandle = fopen($filename, 'r');
 

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/logic/picture.class.php

Spacing +14 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
  *   add/remove etc. is executed instantly
  ***************************************************************************/
 
-require_once __DIR__ . '/const.inc.php';
+require_once __DIR__.'/const.inc.php';
 
 class picture
 {
@@ -95,7 +95,7 @@ 
 
         $sExtension = mb_strtolower(substr($sFilename, strrpos($sFilename, '.') + 1));
 
-        if (strpos(';' . $opt['logic']['pictures']['extensions'] . ';', ';' . $sExtension . ';') !== false) {
+        if (strpos(';'.$opt['logic']['pictures']['extensions'].';', ';'.$sExtension.';') !== false) {
             return true;
         } else {
             return false;
@@ -118,7 +118,7 @@ 
 
         $sUUID = $this->getUUID();
 
-        $this->setUrl($opt['logic']['pictures']['url'] . $sUUID . '.' . $sExtension);
+        $this->setUrl($opt['logic']['pictures']['url'].$sUUID.'.'.$sExtension);
         //$this->setThumbUrl($opt['logic']['pictures']['thumb_url'] . substr($sUUID, 0, 1) . '/' . substr($sUUID, 1, 1) . '/' . $sUUID . '.' . $sExtension);
 
         $this->bFilenamesSet = true;
@@ -158,8 +158,8 @@ 
             $archive = true;
         }
 
-        sql("SET @archive_picop=" . ($archive ? "TRUE" : "FALSE"));
-        sql_slave("SET @archive_picop=" . ($archive ? "TRUE" : "FALSE"));
+        sql("SET @archive_picop=".($archive ? "TRUE" : "FALSE"));
+        sql_slave("SET @archive_picop=".($archive ? "TRUE" : "FALSE"));
 
         sql("SET @original_picid='&1'", $original_id);
         sql_slave("SET @original_picid='&1'", $original_id);
@@ -271,7 +271,7 @@ 
         $url = $this->getUrl();
         $fna = mb_split('\\/', $url);
 
-        return $opt['logic']['pictures']['dir'] . end($fna);
+        return $opt['logic']['pictures']['dir'].end($fna);
     }
 
     public function getThumbFilename()
@@ -289,7 +289,7 @@ 
         $dir1 = mb_strtoupper(mb_substr($filename, 0, 1));
         $dir2 = mb_strtoupper(mb_substr($filename, 1, 1));
 
-        return $opt['logic']['pictures']['thumb_dir'] . $dir1 . '/' . $dir2 . '/' . $filename;
+        return $opt['logic']['pictures']['thumb_dir'].$dir1.'/'.$dir2.'/'.$filename;
     }
 
     public function getLogId()
@@ -435,9 +435,9 @@ 
                 return false;
             } else {
                 // restore picture file
-                $this->setUrl($original_url);        // set the url, so that we can
-                $filename = $this->getFilename();    // .. retreive the file path+name
-                $this->setFilenames($filename);      // now set url(s) from the new uuid
+                $this->setUrl($original_url); // set the url, so that we can
+                $filename = $this->getFilename(); // .. retreive the file path+name
+                $this->setFilenames($filename); // now set url(s) from the new uuid
                 try {
                     rename($this->deleted_filename($filename), $this->getFilename());
                 } catch (Exception $e) {
@@ -514,7 +514,7 @@ 
         $fna[count($fna) - 2] = 'deleted';
         $dp = "";
         foreach ($fna as $fp) {
-            $dp .= "/" . $fp;
+            $dp .= "/".$fp;
         }
 
         return substr($dp, 1);
@@ -538,13 +538,13 @@ 
     public function getPageLink()
     {
         if ($this->getObjectType() == OBJECT_CACHELOG) {
-            $pl = 'viewcache.php?cacheid=' . urlencode($this->getCacheId());
+            $pl = 'viewcache.php?cacheid='.urlencode($this->getCacheId());
             if (!$this->isVisibleOnCachePage()) {
                 $pl .= "&log=A";
             }
-            $pl .= "#log" . urlencode($this->getLogId());
+            $pl .= "#log".urlencode($this->getLogId());
         } elseif ($this->getObjectType() == OBJECT_CACHE) {
-            $pl = 'editcache.php?cacheid=' . urlencode($this->getCacheId()) . '#pictures';
+            $pl = 'editcache.php?cacheid='.urlencode($this->getCacheId()).'#pictures';
         } else {
             $pl = false;
         }

htdocs/lib2/logic/cracklib.inc.php

Braces +2 added lines, -1 removed lines

@@ -75,7 +75,8 @@
 
     // $pw may not contain one of $addwords[]
     foreach ($wordlist as $v) {
-        if (mb_stripos($pw_lc, $v) !== false) {// mb_stripos needs PHP 5.2
+        if (mb_stripos($pw_lc, $v) !== false) {
+// mb_stripos needs PHP 5.2
             return false;
         }
     }

htdocs/lib2/errorhandler.inc.php

Spacing +12 added lines, -12 removed lines

@@ -39,7 +39,7 @@ 
             $errmsg = "";
         }
 
-        require __DIR__ . '/../html/error.php';
+        require __DIR__.'/../html/error.php';
         exit;
     }
 }
@@ -67,8 +67,8 @@ 
     ) {
         $error_handled = true;
 
-        $error = "(" . $error['type'] . ") " . $error['message'] .
-            " at line " . $error['line'] . " of " . $error['file'];
+        $error = "(".$error['type'].") ".$error['message'].
+            " at line ".$error['line']." of ".$error['file'];
         php_errormail($error);
 
         $errtitle = "PHP-Fehler";
@@ -77,7 +77,7 @@ 
             $errmsg = $error;
         }
 
-        require __DIR__ . '/../html/error.php';
+        require __DIR__.'/../html/error.php';
     }
 }
 
@@ -94,7 +94,7 @@ 
     global $opt, $sql_errormail, $absolute_server_URI;
 
     $sendMail = true;
-    $subject = '[' . $opt['page']['domain'] . '] PHP error';
+    $subject = '['.$opt['page']['domain'].'] PHP error';
 
     if (isset($opt['db']['error']['mail']) && $opt['db']['error']['mail'] != '') {
         $sendMail = mb_send_mail($opt['db']['error']['mail'], $subject, $errmsg);
@@ -114,10 +114,10 @@ 
 function admin_errormail($to, $errortype, $message, $headers)
 {
     global $opt;
-    $errorlog_dir = $opt['rootpath'] . 'var/errorlog';
-    $errorlog_path = $errorlog_dir . "/errorlog-" . date("Y-m-d");
+    $errorlog_dir = $opt['rootpath'].'var/errorlog';
+    $errorlog_path = $errorlog_dir."/errorlog-".date("Y-m-d");
 
-    $error_mail_limit = 32768;    // send max 32 KB = ca. 5-20 errors per day/logfile
+    $error_mail_limit = 32768; // send max 32 KB = ca. 5-20 errors per day/logfile
 
     // All errors which may happen here are ignored, to avoid error recursions.
 
@@ -125,7 +125,7 @@ 
         @mkdir($errorlog_dir);
     }
     $old_logsize = @filesize($errorlog_path) + 0;
-    $msg = date("Y-m-d H:i:s.u") . " " . $errortype . "\n" . $message . "\n" .
+    $msg = date("Y-m-d H:i:s.u")." ".$errortype."\n".$message."\n".
         "-------------------------------------------------------------------------\n\n";
     try {
         error_log(
@@ -143,9 +143,9 @@ 
     if ($old_logsize < $error_mail_limit && $new_logsize >= $error_mail_limit) {
         mb_send_mail(
             $to,
-            "too many " . $errortype,
-            "Errors/Warnings are recorded in " . $errorlog_path . ".\n" .
-            "Email Reporting is DISABLED for today now. Please check the logfile\n" .
+            "too many ".$errortype,
+            "Errors/Warnings are recorded in ".$errorlog_path.".\n".
+            "Email Reporting is DISABLED for today now. Please check the logfile\n".
             "and RENAME or delete it when done, so that logging is re-enabled.",
             $headers
         );

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/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'>";
         }
     }