OpencachingDeutschland / oc-server3

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

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'],
     );
 }

htdocs/config2/settings-dist.inc.php

Spacing +21 added lines, -21 removed lines

@@ -8,8 +8,8 @@ 
  *  Do not modify this file - use settings.inc.php!
  ***************************************************************************/
 
-require_once __DIR__. '/locale.inc.php';
-require_once __DIR__. '/settings-dist-common.inc.php';
+require_once __DIR__ . '/locale.inc.php';
+require_once __DIR__ . '/settings-dist-common.inc.php';
 
 /* PHP settings
  *
@@ -108,7 +108,7 @@ 
 // database placeholder
 
 // productive database with opencaching-tables
-$opt['db']['placeholder']['db'] = '';    // selected by default
+$opt['db']['placeholder']['db'] = ''; // selected by default
 
 // empty database for temporary table creation
 $opt['db']['placeholder']['tmpdb'] = '';
@@ -122,14 +122,14 @@ 
 $opt['system']['maillog']['syslog_db_user'] = '';
 $opt['system']['maillog']['syslog_db_password'] = '';
 $opt['system']['maillog']['syslog_db_table'] = '';
-$opt['system']['maillog']['syslog_oc_host'] = '';  // 'host_name' column in syslog DB
-$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%';  // 'program' column in syslog DB
-$opt['system']['maillog']['column']['id'] = 'id';               // 'ID'
-$opt['system']['maillog']['column']['created'] = 'created';     // 'ReceivedAt'
+$opt['system']['maillog']['syslog_oc_host'] = ''; // 'host_name' column in syslog DB
+$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%'; // 'program' column in syslog DB
+$opt['system']['maillog']['column']['id'] = 'id'; // 'ID'
+$opt['system']['maillog']['column']['created'] = 'created'; // 'ReceivedAt'
 $opt['system']['maillog']['column']['host_name'] = 'host_name'; // 'FromHost'
-$opt['system']['maillog']['column']['message'] = 'message';     // 'Message'
-$opt['system']['maillog']['column']['program'] = 'program';     // 'SysLogTag'
-$opt['system']['maillog']['inactivity_warning'] = 30;   // warn after N days without new entries
+$opt['system']['maillog']['column']['message'] = 'message'; // 'Message'
+$opt['system']['maillog']['column']['program'] = 'program'; // 'SysLogTag'
+$opt['system']['maillog']['inactivity_warning'] = 30; // warn after N days without new entries
 
 /* cookie or session
  *
@@ -151,15 +151,15 @@ 
  * 
  * other parameters may be customized
  */
-$opt['session']['mode'] = SAVE_COOKIE;     // don't change - other option "SAVE_SESSION" is not implemented properly
+$opt['session']['mode'] = SAVE_COOKIE; // don't change - other option "SAVE_SESSION" is not implemented properly
 $opt['session']['cookiename'] = 'oc_devel'; // only with SAVE_COOKIE
 $opt['session']['path'] = '/';
-$opt['session']['domain'] = '';    // may be overwritten by $opt['domain'][...]['cookiedomain']
+$opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain']
 
 /* maximum session lifetime
  */
 $opt['session']['expire']['cookie'] = 31536000; // when cookies used (default 1 year)
-$opt['session']['expire']['url'] = 1800;        // when no cookies used (default 30 min since last call), attention to session.js
+$opt['session']['expire']['url'] = 1800; // when no cookies used (default 30 min since last call), attention to session.js
 
 /* If the Referer was sent by the client and the substring was not found,
  * the embedded session id will be marked as invalid.
@@ -185,7 +185,7 @@ 
 /* other template options
  *
  */
-$opt['page']['origin_url'] = 'http://www.opencaching.de/';  // production installation for this OC site
+$opt['page']['origin_url'] = 'http://www.opencaching.de/'; // production installation for this OC site
 $opt['page']['develsystem'] = false;
 $opt['page']['teampic_url'] = 'http://www.opencaching.de/images/team/';
 $opt['page']['teammember_url'] = 'http://www.opencaching.de/';
@@ -219,7 +219,7 @@ 
     'newcaches' => [
         'show' => true,
         'url' => 'http://www.opencaching.de',
-        'urlname' => '',  // optional: show other name than the url-domain
+        'urlname' => '', // optional: show other name than the url-domain
     ],
 ];
 
@@ -378,7 +378,7 @@ 
 
 /* license-related functions
  */
-$opt['logic']['license']['newusers'] = 2;  // see license constants in lib2/logic/const.inc.php
+$opt['logic']['license']['newusers'] = 2; // see license constants in lib2/logic/const.inc.php
 $opt['logic']['license']['admin'] = true;
 $opt['logic']['license']['disclaimer'] = false;
 $opt['logic']['license']['terms'] = 'articles.php?page=impressum#datalicense';
@@ -386,18 +386,18 @@ 
 
 /* optional APIs
  */
-$opt['logic']['api']['email_problems']['key'] = '';   // must be set to enable
-$opt['logic']['api']['user_inactivity']['key'] = '';  // must be set to enable
+$opt['logic']['api']['email_problems']['key'] = ''; // must be set to enable
+$opt['logic']['api']['user_inactivity']['key'] = ''; // must be set to enable
 
 /* cache report info settings
  */
 $opt['logic']['cache_reports']['delaydays'] = 2;
-$opt['logic']['cache_reports']['min_processperday'] = 5;   // set to 0 to disable
-$opt['logic']['cache_reports']['max_processperday'] = 20;  // set to 0 to disable
+$opt['logic']['cache_reports']['min_processperday'] = 5; // set to 0 to disable
+$opt['logic']['cache_reports']['max_processperday'] = 20; // set to 0 to disable
 
 /* cronjob
  */
-$opt['cron']['username'] = 'apache';   // system username for cronjobs
+$opt['cron']['username'] = 'apache'; // system username for cronjobs
 
 /* phpbb news integration (index.php, outdated)
  *

htdocs/lib2/imagebmp.inc.php

Doc Comments +5 added lines, -5 removed lines

@@ -491,7 +491,7 @@ 
 }
 
 /**
- * @param $byte
+ * @param integer $byte
  * @param $start
  * @param $len
  *
@@ -508,8 +508,8 @@ 
 
 $CurrentBit = 0;
 /**
- * @param $f
- * @param $count
+ * @param resource $f
+ * @param integer $count
  *
  * @return number
  */
@@ -564,7 +564,7 @@ 
 }
 
 /**
- * @param $n
+ * @param integer $n
  *
  * @return string
  */
@@ -585,7 +585,7 @@ 
 
 /**
  * @param $d
- * @param $n
+ * @param integer $n
  *
  * @return string
  */

htdocs/src/Oc/SmartyPlugins/prefilter.t.php

Doc Comments +4 added lines, -4 removed lines

@@ -91,10 +91,10 @@ 
  *
  */
 /**
- * @param $block
- * @param $message
+ * @param string $block
+ * @param string $message
  * @param $smarty
- * @param $line
+ * @param integer $line
  *
  * @return string
  */
@@ -268,7 +268,7 @@ 
 
 /**
  * @param $haystack
- * @param $needles
+ * @param string[] $needles
  *
  * @return bool|int
  */

htdocs/lib2/search/ftsearch.inc.php

Spacing +2 added lines, -2 removed lines

@@ -199,7 +199,7 @@ 
     $str = '';
 
     ftsearch_load_ignores();
-    for ($i = count($astr) - 1; $i >= 0; $i --) {
+    for ($i = count($astr) - 1; $i >= 0; $i--) {
         // ignore?
         if (array_search(mb_strtolower($astr[$i]), $ftsearch_ignores) !== false) {
             unset($astr[$i]);
@@ -254,7 +254,7 @@ 
 
     // doppelte chars ersetzen
     $ordZ = ord('z');
-    for ($c = ord('a'); $c <= $ordZ; $c ++) {
+    for ($c = ord('a'); $c <= $ordZ; $c++) {
         $old_str = '';
         while ($old_str !== $str) {
             $old_str = $str;

htdocs/lib2/menu.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -280,7 +280,7 @@ 
     }
 
     /**
-     * @param $menuid
+     * @param integer|null $menuid
      * @param $ids
      * @param $items
      */
@@ -302,7 +302,7 @@ 
     }
 
     /**
-     * @return array
+     * @return integer[]
      */
     public function GetSelectedMenuIds()
     {

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
                         'parent' => MNU_MAP
                     ];
                     $menuitem[MNU_MAP]['subitems'][] = $menu_map;
-                    ++ $menu_map;
+                    ++$menu_map;
                 }
             }
         }
@@ -107,7 +107,7 @@ 
         $rsSubmenu = sqlf("SELECT `id` FROM `sys_menu` WHERE `parent`=0 ORDER BY `parent` ASC, `position` ASC");
         while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
             $aMenu[MNU_ROOT]['subitems'][$nPos] = $rSubmenu['id'];
-            $nPos ++;
+            $nPos++;
         }
         sql_free_result($rsSubmenu);
         fwrite($f, "\n");
@@ -144,7 +144,7 @@ 
             );
             while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
                 $aMenu[$r['id']]['subitems'][$nPos] = $rSubmenu['id'];
-                $nPos ++;
+                $nPos++;
             }
             sql_free_result($rsSubmenu);
         }

htdocs/lib2/rowEditor.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -490,7 +490,7 @@
     }
 
     /**
-     * @return bool
+     * @return boolean|null
      */
     public function getAnyChanged()
     {