OpencachingDeutschland / oc-server3

htdocs/lib2/OcSmarty.class.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 
     public $compile_id = null;
 
-    public $cache_id = null;    // This is a smarty caching ID, not a caches.cache_id.
+    public $cache_id = null; // This is a smarty caching ID, not a caches.cache_id.
 
     public $title = '';
 

htdocs/lib2/login.class.php

Spacing +6 added lines, -6 removed lines

@@ -20,13 +20,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_TOOMUCHLOGINS', 2);      // too many logins in short time
-define('LOGIN_USERNOTACTIVE', 3);      // the useraccount locked
+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);

htdocs/lib2/logic/const.inc.php

Spacing +18 added lines, -18 removed lines

@@ -16,12 +16,12 @@ 
 define('RE_TYPE_FLOAT', 5);
 define('RE_TYPE_DOUBLE', 6);
 
-define('RE_INSERT_NOTHING', 0);       //
-define('RE_INSERT_OVERWRITE', 1);     // ignore given values and use function
-define('RE_INSERT_IGNORE', 2);        // dont use this column on insert
+define('RE_INSERT_NOTHING', 0); //
+define('RE_INSERT_OVERWRITE', 1); // ignore given values and use function
+define('RE_INSERT_IGNORE', 2); // dont use this column on insert
 define('RE_INSERT_AUTOINCREMENT', 4); // column is an auto increment column
-define('RE_INSERT_AUTOUUID', 8);      // if empty, UUID is generated by before insert trigger (not supported for primary key fields)
-define('RE_INSERT_NOW', 16);          // NOW()
+define('RE_INSERT_AUTOUUID', 8); // if empty, UUID is generated by before insert trigger (not supported for primary key fields)
+define('RE_INSERT_NOW', 16); // NOW()
 
 define('EUROPEAN_LETTERS', 'A-Za-zÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ');
 // ASCII + ISO-8859-1 0xC0..0xFF
@@ -31,13 +31,13 @@ 
 define('REGEX_FIRST_NAME', REGEX_LAST_NAME);
 define('REGEX_STATPIC_TEXT', '^[' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*\$+~#!§%;,-?:\[\]{}¹²³\'\"`\|µ°\%]{0,30}$');
 
-define('ADMIN_TRANSLATE', 1);     // edit translation
-define('ADMIN_MAINTAINANCE', 2);  // check table etc.
-define('ADMIN_USER', 4);          // drop users, caches etc.
-define('ADMIN_NEWS', 8);          // obsolete / reserved
-define('ADMIN_RESTORE', 16);      // restore vandalized listings
-define('ADMIN_ROOT', 128 | 127);  // root + all previous rights
-define('ADMIN_LISTING', 1024);    // can edit any cache listings
+define('ADMIN_TRANSLATE', 1); // edit translation
+define('ADMIN_MAINTAINANCE', 2); // check table etc.
+define('ADMIN_USER', 4); // drop users, caches etc.
+define('ADMIN_NEWS', 8); // obsolete / reserved
+define('ADMIN_RESTORE', 16); // restore vandalized listings
+define('ADMIN_ROOT', 128 | 127); // root + all previous rights
+define('ADMIN_LISTING', 1024); // can edit any cache listings
 
 define('ATTRIB_SELECTED', 1);
 define('ATTRIB_UNSELECTED', 2);
@@ -68,7 +68,7 @@ 
 define('USR_OPT_GMZOOM', 1);
 define('USR_OPT_SHOWSTATS', 5);
 define('USR_OPT_MAP_MENU', 6);
-define('USR_OPT_MAP_OVERVIEW', 7);   // obsolete, no longer supported since Google Maps 3.22
+define('USR_OPT_MAP_OVERVIEW', 7); // obsolete, no longer supported since Google Maps 3.22
 define('USR_OPT_MAP_MAXCACHES', 8);
 define('USR_OPT_MAP_ICONSET', 9);
 define('USR_OPT_MAP_PREVIEW', 10);
@@ -79,11 +79,11 @@ 
 // ID 15 was temporarily used and is reserved, see commit dda7ef0. Continue with 16.
 
 // user.data_license values
-define('OLD_DATA_LICSENSE', 0);                       // before deadline
-define('NEW_DATA_LICENSE_ACTIVELY_DECLINED', 1);      // declined license
-define('NEW_DATA_LICENSE_ACTIVELY_ACCEPTED', 2);      // accepted new license on registration
-define('NEW_DATA_LICENSE_PASSIVELY_ACCEPTED', 3);     // did not decline license until deadline
-define('NEW_DATA_LICENSE_PASSIVELY_DECLINED', 4);     // could not accept/decline because disabled
+define('OLD_DATA_LICSENSE', 0); // before deadline
+define('NEW_DATA_LICENSE_ACTIVELY_DECLINED', 1); // declined license
+define('NEW_DATA_LICENSE_ACTIVELY_ACCEPTED', 2); // accepted new license on registration
+define('NEW_DATA_LICENSE_PASSIVELY_ACCEPTED', 3); // did not decline license until deadline
+define('NEW_DATA_LICENSE_PASSIVELY_DECLINED', 4); // could not accept/decline because disabled
 
 //picture upload/resize parameters
 define('PICTURE_QUALITY', 85);

htdocs/config2/locale.inc.php

Spacing +6 added lines, -6 removed lines

@@ -17,9 +17,9 @@ 
  *                 $opt['locale']
  ***************************************************************************/
 
-define('OC_LOCALE_ACTIVE', 2);    // enable language and show language button in header line
-define('OC_LOCALE_HIDDEN', 1);    // enable language but hide language button in header line
-define('OC_LOCALE_DISABLED', 0);  // disable language
+define('OC_LOCALE_ACTIVE', 2); // enable language and show language button in header line
+define('OC_LOCALE_HIDDEN', 1); // enable language but hide language button in header line
+define('OC_LOCALE_DISABLED', 0); // disable language
 
 $opt['template']['locales']['DE']['status'] = OC_LOCALE_ACTIVE;
 $opt['template']['locales']['DE']['flag'] = 'images/flag/DE.png';
@@ -131,7 +131,7 @@ 
 $opt['locale']['DE']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="resource2/ocstyle/images/media/cc-by-nc-nd-small.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Die <a href="articles.php?page=impressum#datalicense">Inhalte</a> von {site} stehen unter der Creative-Commons-Lizenz <a rel="license" href="%1">BY-NC-ND 3.0 DE</a>.</div>';
 $opt['locale']['DE']['helpwiki'] = 'http://wiki.opencaching.de/index.php/';
 $opt['locale']['DE']['mostly_translated'] = true;
-$opt['locale']['DE']['what3words'] = true;  // "beta"
+$opt['locale']['DE']['what3words'] = true; // "beta"
 
 $opt['locale']['IT']['format']['dateshort'] = '%d/%m/%y';
 $opt['locale']['IT']['format']['dm'] = '%d/%m';
@@ -233,7 +233,7 @@ 
 $opt['locale']['SV']['page']['subtitle1'] = 'Geocaching med Opencaching';
 $opt['locale']['SV']['page']['subtitle2'] = '';
 $opt['locale']['SV']['mostly_translated'] = false;
-$opt['locale']['SV']['what3words'] = true;  // "beta"
+$opt['locale']['SV']['what3words'] = true; // "beta"
 
 $opt['locale']['NO']['format']['dateshort'] = '%d.%m.%y';
 $opt['locale']['NO']['format']['dm'] = '%d.%m.';
@@ -283,7 +283,7 @@ 
 $opt['locale']['RU']['country'] = 'RU';
 $opt['locale']['RU']['primary_lang_of'] = ['RU'];
 $opt['locale']['RU']['mostly_translated'] = false;
-$opt['locale']['RU']['what3words'] = true;   // "beta"
+$opt['locale']['RU']['what3words'] = true; // "beta"
 
 $opt['locale']['DA']['format']['dateshort'] = '%d.%m.%y';
 $opt['locale']['DA']['format']['dm'] = '%d.%m.';

htdocs/lib/settings-dist.inc.php

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,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']
 
 // include all locale settings
 require_once $rootpath . 'config2/locale.inc.php';

htdocs/src/AppBundle/Command/CodeSnifferCommand.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         }
 
         $process = new Process($cmd, $this->rootPath, null, null, 9600);
-        $process->run(function ($type, $buffer) {
+        $process->run(function($type, $buffer) {
             echo $buffer;
         });
 

htdocs/src/AppBundle/Form/UploadFieldNotesType.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
                 ]
             );
 
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
             $data = $event->getData();
             $form = $event->getForm();
 

htdocs/lib2/db.inc.php

Spacing +8 added lines, -8 removed lines

@@ -181,7 +181,7 @@ 
         // & escaped?
         $escapesCount = 0;
         while ((($nextarg - $escapesCount - 1) > 0) && (substr($sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
-            $escapesCount ++;
+            $escapesCount++;
         }
         if (($escapesCount % 2) === 1) {
             $nextarg++;
@@ -195,7 +195,7 @@ 
                 while (preg_match('/^[0-9]{1}/', $nextchar) === 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -221,13 +221,13 @@ 
                         // strip apostroph and insert NULL
                         $filtered_sql = substr($filtered_sql, 0, strlen($filtered_sql) - 1);
                         $filtered_sql .= 'NULL';
-                        $sqlpos ++;
+                        $sqlpos++;
                     } else {
                         $filtered_sql .= 'NULL';
                     }
                 }
 
-                $sqlpos ++;
+                $sqlpos++;
             } else {
                 $arglength = 0;
                 $arg = '';
@@ -237,7 +237,7 @@ 
                 while (preg_match('/^[a-zA-Z0-9_]{1}/', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -284,12 +284,12 @@ 
         $escapesCount = 0;
         while ((($nextarg - $escapesCount - 1) > 0)
             && (substr($filtered_sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
-            $escapesCount ++;
+            $escapesCount++;
         }
         if (($escapesCount % 2) == 0) {
             // strip escapes of &
             $filtered_sql = substr($filtered_sql, 0, $nextarg) . '&' . substr($filtered_sql, $nextarg + 2);
-            $nextarg --;
+            $nextarg--;
         }
 
         $nextarg = strpos($filtered_sql, '\&', $nextarg + 2);
@@ -826,7 +826,7 @@ 
         AND `online`= 1
         AND (TIMESTAMP(NOW())-TIMESTAMP(`last_check`)+`time_diff`<'&1')
         ORDER BY `w` DESC LIMIT 1",
-        - 1,
+        -1,
         $nMaxTimeDiff
     );
 

Doc Comments +24 added lines, -24 removed lines

@@ -347,7 +347,7 @@ 
 }
 
 /**
- * @param $sql
+ * @param string $sql
  *
  * @return resource
  */
@@ -365,7 +365,7 @@ 
 }
 
 /**
- * @param $sql
+ * @param string $sql
  *
  * @return resource
  */
@@ -383,7 +383,7 @@ 
 }
 
 /**
- * @param $sql
+ * @param string $sql
  *
  * @return resource
  */
@@ -401,8 +401,8 @@ 
 }
 
 /**
- * @param $sql
- * @param $default
+ * @param string $sql
+ * @param integer $default
  *
  * @return mixed
  */
@@ -420,8 +420,8 @@ 
 }
 
 /**
- * @param $sql
- * @param $default
+ * @param string $sql
+ * @param integer $default
  *
  * @return mixed
  */
@@ -441,7 +441,7 @@ 
 /**
  * @param $value
  *
- * @return mixed|string
+ * @return string
  */
 function sql_escape($value)
 {
@@ -466,7 +466,7 @@ 
 /**
  * @param $value
  *
- * @return mixed|string
+ * @return string
  */
 function sql_escape_backtick($value)
 {
@@ -523,7 +523,7 @@ 
 }
 
 /**
- * @param $bQuerySlave
+ * @param boolean $bQuerySlave
  * @param $sql
  * @param $default
  *
@@ -612,7 +612,7 @@ 
 }
 
 /**
- * @param $rs
+ * @param resource $rs
  *
  * @return array
  */
@@ -629,7 +629,7 @@ 
 
 // returns false if no more matching rows exist
 /**
- * @param $rs
+ * @param resource $rs
  *
  * @return array
  */
@@ -720,7 +720,7 @@ 
 }
 
 /**
- * @param $rs
+ * @param resource $rs
  *
  * @return int
  */
@@ -730,7 +730,7 @@ 
 }
 
 /**
- * @param $table
+ * @param string $table
  */
 function sql_temp_table($table)
 {
@@ -762,7 +762,7 @@ 
 }
 
 /**
- * @param $table
+ * @param string $table
  */
 function sql_temp_table_slave($table)
 {
@@ -785,7 +785,7 @@ 
 }
 
 /**
- * @param $table
+ * @param string $table
  */
 function sql_drop_temp_table($table)
 {
@@ -828,7 +828,7 @@ 
 }
 
 /**
- * @param $table
+ * @param string $table
  */
 function sql_drop_temp_table_slave($table)
 {
@@ -1259,7 +1259,7 @@ 
 
 /**
  * @param $f
- * @param $rs
+ * @param resource $rs
  * @param $table
  * @param bool $truncate
  */
@@ -1294,7 +1294,7 @@ 
 }
 
 /**
- * @param $f
+ * @param resource $f
  * @param $table
  */
 function sql_export_table($f, $table)
@@ -1319,8 +1319,8 @@ 
 }
 
 /**
- * @param $filename
- * @param $tables
+ * @param string $filename
+ * @param string[] $tables
  */
 function sql_export_tables_to_file($filename, $tables)
 {
@@ -1354,7 +1354,7 @@ 
 }
 
 /**
- * @param $f
+ * @param resource $f
  * @param $table
  */
 function sql_export_structure($f, $table)
@@ -1373,7 +1373,7 @@ 
 }
 
 /**
- * @param $filename
+ * @param string $filename
  * @param $table
  */
 function sql_export_structure_to_file($filename, $table)
@@ -1473,7 +1473,7 @@ 
 
 // test if a function or procedure exists
 /**
- * @param $type
+ * @param string $type
  * @param $name
  *
  * @return bool

htdocs/okapi_settings.php

Indentation +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
         'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'],
         'DEBUG'            => ($opt['debug'] & DEBUG_DEVELOPER != 0),
         'DEBUG_PREVENT_SEMAPHORES'
-                           => !$opt['php']['semaphores'], # not available on old developer system
+                            => !$opt['php']['semaphores'], # not available on old developer system
         'DB_SERVER'        => $opt['db']['servername'],
         'DB_NAME'          => $opt['db']['placeholder']['db'],
         'DB_USERNAME'      => $opt['db']['username'],
@@ -54,7 +54,7 @@ 
         'OC_NODE_ID'       => $opt['logic']['node']['id'],
         'OC_COOKIE_NAME'   => $opt['session']['cookiename'] . 'data',
         'OCDE_HTML_PURIFIER_SETTINGS'
-                           => $opt['html_purifier'],
+                            => $opt['html_purifier'],
         'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'],
     );
 }