OpencachingDeutschland / oc-server3

htdocs/config2/settings-sample.inc.php

Spacing +4 added lines, -4 removed lines

@@ -66,8 +66,8 @@ 
  * other parameters may be customized
  */
 $opt['session']['mode'] = SAVE_COOKIE;
-$opt['session']['cookiename'] = '<cookiename>';   // e.g. 'ocde'
-$opt['session']['domain'] = '<.do.main>';  // may be overwritten by $opt['domain'][...]['cookiedomain']
+$opt['session']['cookiename'] = '<cookiename>'; // e.g. 'ocde'
+$opt['session']['domain'] = '<.do.main>'; // may be overwritten by $opt['domain'][...]['cookiedomain']
 
 /* If the Referer was sent by the client and the substring was not found,
  * the embedded session id will be marked as invalid.
@@ -100,7 +100,7 @@ 
 
 /* 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']
 
 /* multi-domain settings
  *
@@ -191,7 +191,7 @@ 
  */
 $opt['lib']['garmin']['domain'] = '<domain>';
 $opt['lib']['garmin']['key'] = '00112233445566778899AABBCCDDEEFF00';
-$opt['lib']['garmin']['url'] = 'http://' . $opt['lib']['garmin']['domain'] . '/';
+$opt['lib']['garmin']['url'] = 'http://'.$opt['lib']['garmin']['domain'].'/';
 $opt['lib']['garmin']['page_url'] = 'http://<domain>/';
 
 // developer.what3words.com API Key

htdocs/config2/settings-dev.inc.php

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
 );
 
 $opt['page']['develsystem'] = true;
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
 
 $opt['mail']['from'] = 'root';
 $opt['mail']['subject'] = '[local.opencaching.de] ';
@@ -102,7 +102,7 @@ 
 $opt['lib']['garmin']['key'] = '00112233445566778899AABBCCDDEEFF00';
 $opt['lib']['garmin']['domain'] = 'local.opencaching.de';
 $opt['lib']['garmin']['url'] = 'http://local.opencaching.de/';
-$opt['lib']['garmin']['page_url'] = $opt['lib']['garmin']['url'] . ($dev_codepath == '*' ? '' : $dev_codepath . 'htdocs/');
+$opt['lib']['garmin']['page_url'] = $opt['lib']['garmin']['url'].($dev_codepath == '*' ? '' : $dev_codepath.'htdocs/');
 
 // developer.what3words.com API Key
 $opt['lib']['w3w']['apikey'] = 'YOURAPIKEY';
@@ -112,7 +112,7 @@ 
 $opt['page']['showsocialmedia'] = true;
 $opt['page']['headoverlay'] = 'oc_head_alpha3';
 
-$opt['logic']['pictures']['dummy']['replacepic'] = $dev_basepath . $dev_codepath . 'htdocs/images/no_image_license.png';
+$opt['logic']['pictures']['dummy']['replacepic'] = $dev_basepath.$dev_codepath.'htdocs/images/no_image_license.png';
 $opt['logic']['license']['disclaimer'] = true;
 $opt['logic']['admin']['listingadmin_notification'] = 'root';
 

htdocs/ownerlogs.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'ownerlogs';
 $tpl->menuitem = MNU_MYPROFILE_OWNERLOGS;
@@ -83,4 +83,4 @@ 
     )
 );
 
-require __DIR__ . '/newlogs.php';
+require __DIR__.'/newlogs.php';

htdocs/searchplugin.php

Spacing +11 added lines, -11 removed lines

@@ -9,7 +9,7 @@ 
  *  also used for waypoint search field.
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'searchplugin';
 
@@ -30,7 +30,7 @@ 
 
 if (($sourceid == 'waypoint-search') && ($userinput != '')) {
     $sourceid = 'mozilla-search';
-    $userinput = 'wp:' . $userinput;
+    $userinput = 'wp:'.$userinput;
 }
 
 if (($sourceid == 'mozilla-search') && ($userinput != '')) {
@@ -56,22 +56,22 @@ 
         $targeturl = 'search.php?showresult=1&expert=0&output=HTML&f_userowner=0&f_userfound=0';
         switch ($searchto) {
             case $keyword_name:
-                $targeturl .= '&utf8=1&sort=byname&searchbyname=1&f_inactive=1&cachename=' . $searchfor;
+                $targeturl .= '&utf8=1&sort=byname&searchbyname=1&f_inactive=1&cachename='.$searchfor;
                 break;
             case $keyword_finder:
-                $targeturl .= '&utf8=1&sort=byname&searchbyfinder=1&f_inactive=0&finder=' . $searchfor;
+                $targeturl .= '&utf8=1&sort=byname&searchbyfinder=1&f_inactive=0&finder='.$searchfor;
                 break;
             case $keyword_owner:
-                $targeturl .= '&utf8=1&sort=byname&searchbyowner=1&f_inactive=0&owner=' . $searchfor;
+                $targeturl .= '&utf8=1&sort=byname&searchbyowner=1&f_inactive=0&owner='.$searchfor;
                 break;
             case $keyword_town:
-                $targeturl .= '&utf8=1&searchbyort=1&f_inactive=1&ort=' . $searchfor . '&sort=' . $order;
+                $targeturl .= '&utf8=1&searchbyort=1&f_inactive=1&ort='.$searchfor.'&sort='.$order;
                 break;
             case $keyword_zipcode:
-                $targeturl .= '&utf8=1&sort=bydistance&searchbyplz=1&f_inactive=1&plz=' . $searchfor . '&sort=' . $order;
+                $targeturl .= '&utf8=1&sort=bydistance&searchbyplz=1&f_inactive=1&plz='.$searchfor.'&sort='.$order;
                 break;
             case $keyword_cacheid:
-                $targeturl .= '&utf8=1&sort=byname&searchbycacheid=1&f_inactive=1&cacheid=' . $searchfor;
+                $targeturl .= '&utf8=1&sort=byname&searchbycacheid=1&f_inactive=1&cacheid='.$searchfor;
                 break;
             case $keyword_wp:
                 $targeturl = 'index.php';
@@ -85,7 +85,7 @@ 
                 }
 
                 if ((($target == 'oc') || ($target == 'gc')) && mb_ereg_match(
-                        '((' . $opt['logic']['ocprefixes'] . '|gc)([a-z0-9]){4,5}|n([a-f0-9]){5,5})$',
+                        '(('.$opt['logic']['ocprefixes'].'|gc)([a-z0-9]){4,5}|n([a-f0-9]){5,5})$',
                         mb_strtolower($searchfor)
                     )
                 ) {
@@ -97,13 +97,13 @@ 
                     // get cache_id from DB
                     // GC/NC waypoints can be duplicates -> return first match with least status number
                     $rs = sql(
-                        "SELECT `cache_id` FROM `caches` INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id` WHERE (`cache_status`.`allow_user_view`=1 OR `caches`.`user_id`='&1') AND " . $wpfield . "='&2' ORDER BY `caches`.`status`,`caches`.`cache_id` LIMIT 0,1",
+                        "SELECT `cache_id` FROM `caches` INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id` WHERE (`cache_status`.`allow_user_view`=1 OR `caches`.`user_id`='&1') AND ".$wpfield."='&2' ORDER BY `caches`.`status`,`caches`.`cache_id` LIMIT 0,1",
                         $login->userid,
                         $searchfor
                     );
                     if (sql_num_rows($rs)) {
                         $record = sql_fetch_array($rs);
-                        $targeturl = 'viewcache.php?cacheid=' . $record['cache_id'];
+                        $targeturl = 'viewcache.php?cacheid='.$record['cache_id'];
                         unset($record);
                     } else {
                         $tpl->error(ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND, $searchfor);

htdocs/removelog.php

Spacing +20 added lines, -20 removed lines

@@ -9,13 +9,13 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/lib/consts.inc.php';
+require_once __DIR__.'/lib/consts.inc.php';
 $opt['gui'] = GUI_HTML;
-require_once __DIR__ . '/lib/common.inc.php';
-require_once $stylepath . '/lib/icons.inc.php';
-require_once __DIR__ . '/lib/recommendation.inc.php';
-require_once __DIR__ . '/lib/logic.inc.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
+require_once $stylepath.'/lib/icons.inc.php';
+require_once __DIR__.'/lib/recommendation.inc.php';
+require_once __DIR__.'/lib/logic.inc.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 //Preprocessing
 if ($error == false) {
@@ -29,7 +29,7 @@ 
         $tplname = 'login';
 
         tpl_set_var('username', '');
-        tpl_set_var('target', htmlspecialchars('removelog.php?logid=' . urlencode($log_id), ENT_COMPAT, 'UTF-8'));
+        tpl_set_var('target', htmlspecialchars('removelog.php?logid='.urlencode($log_id), ENT_COMPAT, 'UTF-8'));
         tpl_set_var('message', $login_required);
         tpl_set_var('message_start', '');
         tpl_set_var('message_end', '');
@@ -69,7 +69,7 @@ 
             $log_record = sql_fetch_array($log_rs);
             mysql_free_result($log_rs);
 
-            require $stylepath . '/removelog.inc.php';
+            require $stylepath.'/removelog.inc.php';
 
             if ($log_record['node'] != $oc_nodeid) {
                 tpl_errorMsg('removelog', $error_wrong_node);
@@ -108,7 +108,7 @@ 
                         $message = isset($_POST['logowner_message']) ? $_POST['logowner_message'] : '';
                         if ($message != '') {
                             //message to logger
-                            $message = $removed_message_title . "\n" . $message . "\n" . $removed_message_end;
+                            $message = $removed_message_title."\n".$message."\n".$removed_message_end;
                         }
 
                         $logtext = html2plaintext(
@@ -166,7 +166,7 @@ 
                         }
 
                         sql("DELETE FROM `pictures` WHERE `id`='&1'", $r['id']);
-                        $archived = (sqlValue("SELECT `id` FROM `pictures_modified` WHERE `id`=" . $r['id'], 0) > 0);
+                        $archived = (sqlValue("SELECT `id` FROM `pictures_modified` WHERE `id`=".$r['id'], 0) > 0);
                         $fna = mb_split('\\/', $r['url']);
                         $filename = end($fna);
                         $path = $opt['logic']['pictures']['dir'];
@@ -175,18 +175,18 @@ 
                         }
 
                         if ($archived) {
-                            @rename($path . $filename, $path . "deleted/" . $filename);
+                            @rename($path.$filename, $path."deleted/".$filename);
                         } else {
-                            @unlink($path . $filename);
+                            @unlink($path.$filename);
                         }
 
                         $path = $opt['logic']['pictures']['thumb_dir'];
                         if (mb_substr($path, - 1, 1) != '/') {
                             $path .= '/';
                         }
-                        $path .= mb_strtoupper(mb_substr($filename, 0, 1)) . '/' .
-                            mb_strtoupper(mb_substr($filename, 1, 1)) . '/';
-                        @unlink($path . $filename);  // Thumb
+                        $path .= mb_strtoupper(mb_substr($filename, 0, 1)).'/'.
+                            mb_strtoupper(mb_substr($filename, 1, 1)).'/';
+                        @unlink($path.$filename); // Thumb
 
                         /* lib2 code would be ...
                         $rs = sql("SELECT `id` FROM `pictures` WHERE `object_type`=1 AND `object_id`='&1'", $log_id);
@@ -224,11 +224,11 @@ 
                     db_slave_exclude();
 
                     //call eventhandler
-                    require_once $opt['rootpath'] . 'lib/eventhandler.inc.php';
+                    require_once $opt['rootpath'].'lib/eventhandler.inc.php';
                     event_remove_log($log_record['cache_id'], $log_record['log_user_id']);
 
                     //cache anzeigen
-                    tpl_redirect('viewcache.php?cacheid=' . urlencode($log_record['cache_id']));
+                    tpl_redirect('viewcache.php?cacheid='.urlencode($log_record['cache_id']));
                     exit;
                 }
 
@@ -260,17 +260,17 @@ 
                 tpl_set_var('logid', htmlspecialchars($log_id, ENT_COMPAT, 'UTF-8'));
 
                 if ($log_record['oc_team_comment']) {
-                    $teamimg = '<img src="resource2/ocstyle/images/oclogo/oc-team-comment.png" title="' . t('OC team comment') . '" /> ';
+                    $teamimg = '<img src="resource2/ocstyle/images/oclogo/oc-team-comment.png" title="'.t('OC team comment').'" /> ';
                 } else {
                     $teamimg = "";
                 }
-                tpl_set_var('logimage', $teamimg . icon_log_type($log_record['icon_small'], ""));
+                tpl_set_var('logimage', $teamimg.icon_log_type($log_record['icon_small'], ""));
 
                 tpl_set_var(
                     'date',
                     htmlspecialchars(strftime($dateformat, strtotime($log_record['log_date'])), ENT_COMPAT, 'UTF-8')
                 );
-                tpl_set_var('time', substr($log_record['log_date'], 11) == "00:00:00" ? "" : ", " . substr($log_record['log_date'], 11, 5));
+                tpl_set_var('time', substr($log_record['log_date'], 11) == "00:00:00" ? "" : ", ".substr($log_record['log_date'], 11, 5));
                 tpl_set_var('userid', htmlspecialchars($log_record['log_user_id'] + 0, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('username', htmlspecialchars($log_record['log_username'], ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('typetext', htmlspecialchars($sLogTypeText, ENT_COMPAT, 'UTF-8'));

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