OpencachingDeutschland / oc-server3

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/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/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/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 {

htdocs/lib/settings-dev.inc.php

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 
 //relative path to the root directory
 if (!isset($rootpath)) {
-    $rootpath = dirname(__FILE__) . '/../';
+    $rootpath = dirname(__FILE__).'/../';
 }
 
 //default used language
@@ -36,7 +36,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 config2/settings-dist.inc.php
 $oc_nodeid = 4;
@@ -74,10 +74,10 @@ 
     $maildomain = 'local.opencaching.de';
 }
 if (!isset($emailaddr)) {
-    $emailaddr = 'root@' . $maildomain;
+    $emailaddr = 'root@'.$maildomain;
 }
 if (!isset($opt['mail']['contact'])) {
-    $opt['mail']['contact'] = 'contact@' . $maildomain;
+    $opt['mail']['contact'] = 'contact@'.$maildomain;
 }
 
 // news settings
@@ -106,7 +106,7 @@ 
 
 // safemode_zip-binary
 $safemode_zip = '/var/www/bin/phpzip.php';
-$zip_basedir = $dev_basepath . ($dev_codepath == '*' ? '' : $dev_codepath . 'htdocs/') . 'download/zip/';
+$zip_basedir = $dev_basepath.($dev_codepath == '*' ? '' : $dev_codepath.'htdocs/').'download/zip/';
 $zip_wwwdir = 'download/zip/';
 
 $googlemap_key = "<key>";
@@ -117,17 +117,17 @@ 
 /* maximum number of failed logins per hour before that IP address is blocked
  * (used to prevent brute-force-attacks)
  */
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
 $opt['page']['headoverlay'] = 'oc_head_alpha3';
 
 // data license
-$opt['logic']['license']['disclaimer'] = true;   // also in lib2/settings-dist.inc.php
-$opt['logic']['license']['terms'] = $absolute_server_URI . 'articles.php?page=impressum#datalicense';
+$opt['logic']['license']['disclaimer'] = true; // also in lib2/settings-dist.inc.php
+$opt['logic']['license']['terms'] = $absolute_server_URI.'articles.php?page=impressum#datalicense';
 
 $opt['logic']['admin']['listingadmin_notification'] = 'root';
 
 // 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 (!)