OpencachingDeutschland / oc-server3

htdocs/newdesc.php

Spacing +7 added lines, -8 removed lines

@@ -44,11 +44,11 @@ 
 
                 //get the posted data
                 $show_all_langs = isset($_POST['show_all_langs']) ? $_POST['show_all_langs'] : 0;
-                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : '';  // Ocprop
+                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : ''; // Ocprop
 
-                $hints = isset($_POST['hints']) ? $_POST['hints'] : '';  // Ocprop
-                $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang;  // Ocprop
-                $desc = isset($_POST['desc']) ? $_POST['desc'] : '';  // Ocprop
+                $hints = isset($_POST['hints']) ? $_POST['hints'] : ''; // Ocprop
+                $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang; // Ocprop
+                $desc = isset($_POST['desc']) ? $_POST['desc'] : ''; // Ocprop
 
                 // read descMode; if not set, initialize from user profile
                 if (isset($_POST['descMode'])) {  // Ocprop
@@ -149,7 +149,7 @@ 
                          WHERE `languages_list_default`.`lang`='" . sql_escape($locale) . "'
                          AND ISNULL(`cache_desc`.`cache_id`)",
                         0
-                    ) == 0 ) {
+                    ) == 0) {
                         $show_all_langs = 1;
                     }
                 }
@@ -199,8 +199,7 @@ 
                 tpl_set_var('name', htmlspecialchars($cache_record['name'], ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cacheid', htmlspecialchars($cache_id, ENT_COMPAT, 'UTF-8'));
 
-                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message :
-                    (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
+                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message : (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
 
                 tpl_set_var('show_all_langs', $show_all_langs);
                 tpl_set_var('show_all_langs_submit', ($show_all_langs == 0) ? $show_all_langs_submit : '');
@@ -222,7 +221,7 @@ 
                 $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n";
                 tpl_set_var('htmlheaders', $headers);
 
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
             } else {
                 //TODO: not the owner

htdocs/addtolist.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 }
 $newlist_public = isset($_REQUEST['newlist_public']);
 $newlist_watch = isset($_REQUEST['newlist_watch']);
-$default_list = isset($_REQUEST['listid']) ? (int) $_REQUEST['listid'] : cachelist::getMyLastAddedToListId();
+$default_list = isset($_REQUEST['listid']) ? (int)$_REQUEST['listid'] : cachelist::getMyLastAddedToListId();
 
 if (isset($_REQUEST['save']) && isset($_REQUEST['listid'])) {
     $listid = $_REQUEST['listid'] + 0;

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/lib/clicompatbase.inc.php

Spacing +8 added lines, -8 removed lines

@@ -239,10 +239,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)) {
@@ -253,7 +253,7 @@ 
                 while (mb_ereg_match('^[0-9]{1}', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = mb_substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -285,13 +285,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 = '';
@@ -300,7 +300,7 @@ 
                 while (mb_ereg_match('^[a-zA-Z0-9]{1}', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = mb_substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -329,12 +329,12 @@ 
         $escapesCount = 0;
         while ((($nextarg - $escapesCount - 1) > 0) &&
                (mb_substr($filtered_sql, $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 --;
+            $nextarg--;
         }
 
         $nextarg = mb_strpos($filtered_sql, '\&', $nextarg + 2);

Doc Comments +31 added lines

@@ -64,6 +64,12 @@ 
 // prepare EMail-From
 $emailheaders = 'From: "' . $emailaddr . '" <' . $emailaddr . '>';
 
+/**
+ * @param string $module
+ * @param integer $eventid
+ * @param integer $objectid2
+ * @param string $logtext
+ */
 function logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
 {
     sql(
@@ -104,6 +110,9 @@ 
     sql_error();
 }
 
+/**
+ * @param string $sql
+ */
 function sqlValue($sql, $default)
 {
     $rs = sql($sql);
@@ -132,11 +141,21 @@ 
     }
 }
 
+/**
+ * @param string $name
+ * @param string $default
+ *
+ * @return string
+ */
 function getSysConfig($name, $default)
 {
     return sqlValue('SELECT `value` FROM `sysconfig` WHERE `name`=\'' . sql_escape($name) . '\'', $default);
 }
 
+/**
+ * @param string $name
+ * @param string $value
+ */
 function setSysConfig($name, $value)
 {
     if (sqlValue('SELECT COUNT(*) FROM sysconfig WHERE name=\'' . sql_escape($name) . '\'', 0) == 1) {
@@ -448,6 +467,9 @@ 
     die('sql_error');
 }
 
+/**
+ * @param string $warnmessage
+ */
 function sql_warn($warnmessage)
 {
     global $sql_errormail;
@@ -470,6 +492,9 @@ 
 /*
     Ersatz für die in Mysql eingebauten Funktionen
 */
+/**
+ * @param resource $rs
+ */
 function sql_fetch_array($rs)
 {
     return mysql_fetch_array($rs);
@@ -485,6 +510,9 @@ 
     return mysql_fetch_row($rs);
 }
 
+/**
+ * @param resource $rs
+ */
 function sql_fetch_column($rs)
 {
     $col = [];
@@ -694,6 +722,9 @@ 
     ];
 }
 
+/**
+ * @param string $filename
+ */
 function fetch_email_template($filename, $language, $domain)
 {
     global $opt, $rootpath;

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 +26 added lines, -26 removed lines

@@ -346,7 +346,7 @@ 
 }
 
 /**
- * @param $sql
+ * @param string $sql
  *
  * @return resource
  */
@@ -364,7 +364,7 @@ 
 }
 
 /**
- * @param $sql
+ * @param string $sql
  *
  * @return resource
  */
@@ -382,7 +382,7 @@ 
 }
 
 /**
- * @param $sql
+ * @param string $sql
  *
  * @return resource
  */
@@ -400,8 +400,8 @@ 
 }
 
 /**
- * @param $sql
- * @param $default
+ * @param string $sql
+ * @param integer $default
  *
  * @return mixed
  */
@@ -419,8 +419,8 @@ 
 }
 
 /**
- * @param $sql
- * @param $default
+ * @param string $sql
+ * @param integer $default
  *
  * @return mixed
  */
@@ -440,7 +440,7 @@ 
 /**
  * @param $value
  *
- * @return mixed|string
+ * @return string
  */
 function sql_escape($value)
 {
@@ -465,7 +465,7 @@ 
 /**
  * @param $value
  *
- * @return mixed|string
+ * @return string
  */
 function sql_escape_backtick($value)
 {
@@ -522,7 +522,7 @@ 
 }
 
 /**
- * @param $bQuerySlave
+ * @param boolean $bQuerySlave
  * @param $sql
  * @param $default
  *
@@ -571,7 +571,7 @@ 
     (includes database charset conversion)
 */
 /**
- * @param $rs
+ * @param resource $rs
  *
  * @return array
  */
@@ -611,7 +611,7 @@ 
 }
 
 /**
- * @param $rs
+ * @param resource $rs
  *
  * @return array
  */
@@ -648,7 +648,7 @@ 
 }
 
 /**
- * @param $rs
+ * @param resource $rs
  *
  * @return array
  */
@@ -719,7 +719,7 @@ 
 }
 
 /**
- * @param $rs
+ * @param resource $rs
  *
  * @return int
  */
@@ -729,7 +729,7 @@ 
 }
 
 /**
- * @param $table
+ * @param string $table
  */
 function sql_temp_table($table)
 {
@@ -761,7 +761,7 @@ 
 }
 
 /**
- * @param $table
+ * @param string $table
  */
 function sql_temp_table_slave($table)
 {
@@ -784,7 +784,7 @@ 
 }
 
 /**
- * @param $table
+ * @param string $table
  */
 function sql_drop_temp_table($table)
 {
@@ -827,7 +827,7 @@ 
 }
 
 /**
- * @param $table
+ * @param string $table
  */
 function sql_drop_temp_table_slave($table)
 {
@@ -1227,7 +1227,7 @@ 
 }
 
 /**
- * @param $warnmessage
+ * @param string $warnmessage
  */
 function sql_warn($warnmessage)
 {
@@ -1258,7 +1258,7 @@ 
 
 /**
  * @param $f
- * @param $rs
+ * @param resource $rs
  * @param $table
  * @param bool $truncate
  */
@@ -1293,7 +1293,7 @@ 
 }
 
 /**
- * @param $f
+ * @param resource $f
  * @param $table
  */
 function sql_export_table($f, $table)
@@ -1318,8 +1318,8 @@ 
 }
 
 /**
- * @param $filename
- * @param $tables
+ * @param string $filename
+ * @param string[] $tables
  */
 function sql_export_tables_to_file($filename, $tables)
 {
@@ -1353,7 +1353,7 @@ 
 }
 
 /**
- * @param $f
+ * @param resource $f
  * @param $table
  */
 function sql_export_structure($f, $table)
@@ -1372,7 +1372,7 @@ 
 }
 
 /**
- * @param $filename
+ * @param string $filename
  * @param $table
  */
 function sql_export_structure_to_file($filename, $table)
@@ -1472,7 +1472,7 @@ 
 
 // test if a function or procedure exists
 /**
- * @param $type
+ * @param string $type
  * @param $name
  *
  * @return bool