OpencachingDeutschland / oc-server3

htdocs/lib/cookie.class.php

Spacing +4 added lines, -4 removed lines

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

htdocs/lib/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 (!)

htdocs/lib/settings-sample-vagrant.inc.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 // database names
 $dbname = 'opencaching';
-$tmpdbname = 'octmp';   // empty db with CREATE and DROP privileges
+$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges
 
 // common developer system settings
 require 'settings-dev.inc.php';

htdocs/lib/logic.inc.php

Spacing +6 added lines, -6 removed lines

@@ -15,8 +15,8 @@ 
     return sqlValue(
         "SELECT IFNULL(`stt`.`text`, `cache_type`.`en`)
          FROM `cache_type`
-         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_type`.`trans_id` AND `stt`.`lang`='" . sql_escape($language) . "'
-         WHERE `cache_type`.`id`='" . sql_escape($cachetype) . "'",
+         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_type`.`trans_id` AND `stt`.`lang`='" . sql_escape($language)."'
+         WHERE `cache_type`.`id`='" . sql_escape($cachetype)."'",
         ''
     );
 }
@@ -26,8 +26,8 @@ 
     return sqlValue(
         "SELECT IFNULL(`stt`.`text`, `cache_size`.`en`)
          FROM `cache_size`
-         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_size`.`trans_id` AND `stt`.`lang`='" . sql_escape($language) . "'
-         WHERE `cache_size`.`id`='" . sql_escape($cachesize) . "'",
+         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_size`.`trans_id` AND `stt`.`lang`='" . sql_escape($language)."'
+         WHERE `cache_size`.`id`='" . sql_escape($cachesize)."'",
         ''
     );
 }
@@ -37,8 +37,8 @@ 
     return sqlValue(
         "SELECT IFNULL(`stt`.`text`, `log_types`.`en`)
          FROM `log_types`
-         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`log_types`.`trans_id` AND `stt`.`lang`='" . sql_escape($language) . "'
-         WHERE `log_types`.`id`='" . sql_escape($logtype) . "'",
+         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`log_types`.`trans_id` AND `stt`.`lang`='" . sql_escape($language)."'
+         WHERE `log_types`.`id`='" . sql_escape($logtype)."'",
         ''
     );
 }