OpencachingDeutschland / oc-server3

htdocs/util2/cron/modules/slave_cleanup.class.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         }
         sql_free_result($rs);
 
-        $this->cleanup_slave(- 1);
+        $this->cleanup_slave(-1);
     }
 
     public function cleanup_slave($slaveId)

htdocs/config2/locale.inc.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,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';

htdocs/lib/consts-common.inc.php

Spacing +2 added lines, -2 removed lines

@@ -7,10 +7,10 @@
  *  common constant definitions of lib1 and lib2
  ***************************************************************************/
 
-define('GUI_HTML', 0);   // also defined in lib/consts.inc.php
+define('GUI_HTML', 0); // also defined in lib/consts.inc.php
 define('GUI_TEXT', 1);
 
-define('HTTPS_DISABLED', 0);   // also defined in lib/consts.inc.php
+define('HTTPS_DISABLED', 0); // also defined in lib/consts.inc.php
 define('HTTPS_ENABLED', 1);
 define('HTTPS_ENFORCED', 2);
 

htdocs/lib/settings-sample-dev.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/doc/sql/stored-proc/maintain.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 #!/usr/bin/php -q
 <?php
- /***************************************************************************
+    /***************************************************************************
  *  For license information see doc/license.txt
  *
  *  Unicode Reminder メモ

Spacing +8 added lines, -8 removed lines

@@ -8,8 +8,8 @@ 
  *  Load current stored procs and triggers into database.
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../../';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../../';
+require $opt['rootpath'].'lib2/cli.inc.php';
 
 if ($opt['db']['maintenance_user'] == '') {
     die("ERROR: \$opt['db']['maintenance_user'] is not set in config2/settings.inc.php\n");
@@ -18,10 +18,10 @@ 
 // retrieve DB password
 if ($opt['db']['maintenance_password'] == '') {
     if (in_array('--flush', $argv)) {
-        echo "\nenter DB " . $opt['db']['maintenance_user'] . " password:\n";
+        echo "\nenter DB ".$opt['db']['maintenance_user']." password:\n";
         flush();
     } else {
-        echo 'enter DB ' . $opt['db']['maintenance_user'] . ' password: ';
+        echo 'enter DB '.$opt['db']['maintenance_user'].' password: ';
     }
 
     $fh = fopen('php://stdin', 'r');
@@ -44,13 +44,13 @@ 
 // include the requested maintain version file
 $dbsv = in_array('--dbsv', $argv);
 if ($dbsv) {
-    $versionfile = 'maintain-' . $argv[$dbsv + 1] . '.inc.php';
-    if (!file_exists(__DIR__ . '/' . $versionfile)) {
-        die($versionfile . " not found\n");
+    $versionfile = 'maintain-'.$argv[$dbsv + 1].'.inc.php';
+    if (!file_exists(__DIR__.'/'.$versionfile)) {
+        die($versionfile." not found\n");
     } else {
         require $versionfile;
     }
-    @unlink($opt['rootpath'] . 'cache2/dbsv-running');
+    @unlink($opt['rootpath'].'cache2/dbsv-running');
 } else {
     require 'maintain-current.inc.php';
 }

htdocs/coordinates.php

Braces +2 added lines, -1 removed lines

@@ -88,8 +88,9 @@
     $tpl->assign('coordW3W2', $coord->getW3W($w3w_langs[1]));
     $lang2_name = sql_value("SELECT `name` FROM `languages` WHERE `short`='&1'", '', $w3w_langs[1]);
     $tpl->assign('W3Wlang2', $translate->t($lang2_name, '', '', 0));
-} else
+} else {
     $tpl->assign('coordW3W2', false);
+}
 
 // wp gesetzt?
 $wp = isset($_REQUEST['wp']) ? $_REQUEST['wp'] : '';

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'event_attendance';
 $tpl->popup = true;

local/maintenance/email_recovery.php

Indentation +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
             "SELECT COUNT(*)
              FROM `" . $table . "`
              WHERE " . $this->getDateCondition($table, $dateField) .
-                       ($andWhere ? ' AND (' . $andWhere . ')' : ''),
+                        ($andWhere ? ' AND (' . $andWhere . ')' : ''),
             0
         );
         self::message(1, $objectCount . ' ' . $description);

Spacing +37 added lines, -37 removed lines

@@ -16,25 +16,25 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require $opt['rootpath'].'lib2/cli.inc.php';
 
 if ($argc < 3 || $argc > 4) {
     die(
-        "usage:    php email_recovery.php \"from-datetime\" \"to-datetime\" [option]\n" .
-        "\n" .
-        "          Datetimes must be in YYYY-MM-DD HH:MM:SS format and are inclusive.\n" .
-        "\n" .
-        "options:  <none>          show information about all lost information\n" .
-        "          watchlist       resend log notifications\n" .
-        "          newcaches       resend new caches notifications\n" .
+        "usage:    php email_recovery.php \"from-datetime\" \"to-datetime\" [option]\n".
+        "\n".
+        "          Datetimes must be in YYYY-MM-DD HH:MM:SS format and are inclusive.\n".
+        "\n".
+        "options:  <none>          show information about all lost information\n".
+        "          watchlist       resend log notifications\n".
+        "          newcaches       resend new caches notifications\n".
         "          registrations   resend activation codes\n"
     );
 }
 
 $er = new EmailRecovery($argv[1], $argv[2], $errormsg);
 if ($errormsg != '') {
-    die($errormsg . "\n");
+    die($errormsg."\n");
 }
 
 if ($argc < 4) {
@@ -52,7 +52,7 @@ 
             $er->resendActivationCodes();
             break;
         default:
-            die('invalid option: '. $option . "\n");
+            die('invalid option: '.$option."\n");
     }
 }
 
@@ -65,9 +65,9 @@ 
     public function __construct($fromDT, $toDT, &$errormsg)
     {
         if (!self::verifyDateTime($fromDT)) {
-            $errormsg = 'invalid from-datetime (must be SQL format): "' . $fromDT . '"';
+            $errormsg = 'invalid from-datetime (must be SQL format): "'.$fromDT.'"';
         } elseif (!self::verifyDateTime($toDT)) {
-            $errormsg = 'invalid from-datetime (must be SQL format): "' . $toDT . '"';
+            $errormsg = 'invalid from-datetime (must be SQL format): "'.$toDT.'"';
         } else {
             $this->fromDateTime = $fromDT;
             $this->toDateTime = $toDT;
@@ -85,26 +85,26 @@ 
 
     private static function message($level, $text)
     {
-        echo str_repeat(' ', 2 * $level) . $text . "\n";
+        echo str_repeat(' ', 2 * $level).$text."\n";
     }
 
     private function getDateCondition($table, $field)
     {
         return
-            "`" . $table . "`.`" . $field . "` >= '" . sql_escape($this->fromDateTime) . "'" .
-            " AND `" . $table . "`.`" . $field . "` <= '" . sql_escape($this->toDateTime) . "'";
+            "`".$table."`.`".$field."` >= '".sql_escape($this->fromDateTime)."'".
+            " AND `".$table."`.`".$field."` <= '".sql_escape($this->toDateTime)."'";
     }
 
     private function showObjectCount($table, $dateField, $description, $andWhere = '')
     {
         $objectCount = sql_value(
             "SELECT COUNT(*)
-             FROM `" . $table . "`
-             WHERE " . $this->getDateCondition($table, $dateField) .
-                       ($andWhere ? ' AND (' . $andWhere . ')' : ''),
+             FROM `" . $table."`
+             WHERE " . $this->getDateCondition($table, $dateField).
+                       ($andWhere ? ' AND ('.$andWhere.')' : ''),
             0
         );
-        self::message(1, $objectCount . ' ' . $description);
+        self::message(1, $objectCount.' '.$description);
     }
 
 
@@ -153,16 +153,16 @@ 
              JOIN `user` `user1` ON `user1`.`user_id` = `cache_logs_archived`.`user_id`
              JOIN `user` `user2` ON `user2`.`user_id` = `cache_logs_archived`.`deleted_by`
              JOIN `caches` ON `caches`.`cache_id` = `cache_logs_archived`.`cache_id`
-             WHERE " . $this->getDateCondition('cache_logs_archived', 'deletion_date') . "
+             WHERE " . $this->getDateCondition('cache_logs_archived', 'deletion_date')."
              ORDER BY `cache_logs_archived`.`deletion_date` DESC"
         );
         while ($r = sql_fetch_assoc($rs)) {
             self::message(
                 2,
                 $r['wp_oc']
-                . ' logged:' . $r['logdate']
-                . ' logger:' . $r['logger_name']
-                . ' deleter:' . $r['deleter_name']
+                . ' logged:'.$r['logdate']
+                . ' logger:'.$r['logger_name']
+                . ' deleter:'.$r['deleter_name']
             );
         }
         sql_free_result($rs);
@@ -175,12 +175,12 @@ 
                 `username`
              FROM `user`
              WHERE " .
-                $this->getDateCondition('user', 'date_created') . "
+                $this->getDateCondition('user', 'date_created')."
                 AND last_login IS NULL AND `activation_code` <> ''
              ORDER BY `date_created` DESC"
         );
         while ($r = sql_fetch_assoc($rs)) {
-            self::message(2, $r['registration_date'] . ' ' . $r['username']);
+            self::message(2, $r['registration_date'].' '.$r['username']);
         }
         sql_free_result($rs);
 
@@ -192,11 +192,11 @@ 
                 `user`.`username` `sender_name`
              FROM `email_user`
              JOIN `user` ON `user`.`user_id` = `email_user`.`from_user_id`
-             WHERE " . $this->getDateCondition('email_user', 'date_created') . "
+             WHERE " . $this->getDateCondition('email_user', 'date_created')."
              ORDER BY `email_user`.`date_created` DESC"
         );
         while ($r = sql_fetch_assoc($rs)) {
-            self::message(2, $r['emaildate'] . ' from:' . $r['sender_name']);
+            self::message(2, $r['emaildate'].' from:'.$r['sender_name']);
         }
         sql_free_result($rs);
     }
@@ -232,7 +232,7 @@ 
                 JOIN `cache_status` ON `cache_status`.`id` = `caches`.`status`
                 JOIN `cache_watches` ON `cache_watches`.`cache_id` = `caches`.`cache_id`
                 WHERE
-                    " . $this->getDateCondition('cache_logs', 'date_created') . "
+                    " . $this->getDateCondition('cache_logs', 'date_created')."
                     AND `cache_status`.`allow_user_view` = 1"
         );
         $watcher_notifications = sql_affected_rows();
@@ -247,13 +247,13 @@ 
                 JOIN `cache_list_items` ON `cache_list_items`.`cache_id` = `cache_logs`.`cache_id`
                 JOIN `cache_list_watches` ON `cache_list_watches`.`cache_list_id` = `cache_list_items`.`cache_list_id`
                 WHERE
-                    " . $this->getDateCondition('cache_logs', 'date_created') . "
+                    " . $this->getDateCondition('cache_logs', 'date_created')."
                     AND `cache_status`.`allow_user_view` = 1"
         );
         $watcher_notifications += sql_affected_rows();
 
-        self::message(0, $owner_notifications . ' owners will be notified');
-        self::message(0, $watcher_notifications . ' watchers will be notified');
+        self::message(0, $owner_notifications.' owners will be notified');
+        self::message(0, $watcher_notifications.' watchers will be notified');
     }
 
     public function resendCacheNotifications()
@@ -265,7 +265,7 @@ 
              FROM `caches`
              JOIN `cache_status` ON `cache_status`.`id` = `caches`.`status`
              WHERE
-                " . $this->getDateCondition('caches', 'date_created') . "
+                " . $this->getDateCondition('caches', 'date_created')."
                 AND `cache_status`.`allow_user_view` = 1"
         );
         while ($r = sql_fetch_assoc($rs)) {
@@ -280,7 +280,7 @@ 
 
         $new_notifications =
             sql_value("SELECT COUNT(*) FROM `notify_waiting`", 0) - $notifies_wating;
-        self::message(0, $new_notifications . ' new cache notifications will be sent');
+        self::message(0, $new_notifications.' new cache notifications will be sent');
     }
     
     public function resendActivationCodes()
@@ -289,7 +289,7 @@ 
             "SELECT `user_id`
              FROM `user`
              WHERE
-                " . $this->getDateCondition('user', 'date_created') . "
+                " . $this->getDateCondition('user', 'date_created')."
                 AND last_login IS NULL
                 AND `activation_code` <> ''"
         );
@@ -297,10 +297,10 @@ 
         while ($r = sql_fetch_assoc($rs)) {
             $user = new user($r['user_id']);
             $user->sendRegistrationCode();
-            ++ $n;
+            ++$n;
         }
         sql_free_result($rs);
-        self::message(0, $n . ' users have been re-sent the activation code');
+        self::message(0, $n.' users have been re-sent the activation code');
     }
     
 }

htdocs/lib2/logic/getNew.class.php

Doc Comments +6 added lines, -3 removed lines

@@ -19,6 +19,9 @@ 
         return $this->userCountry;
     }
 
+    /**
+     * @param string $userCountry
+     */
     public function set_userCountry($userCountry)
     {
         $this->userCountry = $userCountry;
@@ -98,7 +101,7 @@ 
      *
      * @param array $args numeric array containing the parameter for "sql_slave"
      *
-     * @return object mysql result used by smarty assign_rs
+     * @return resource mysql result used by smarty assign_rs
      */
     private function cacheRs($args = null)
     {
@@ -150,7 +153,7 @@ 
      *
      * @param array $args numeric array containing the parameter for "sql_slave"
      *
-     * @return object mysql result used by smarty assign_rs
+     * @return resource mysql result used by smarty assign_rs
      */
     private function eventRs($args = null)
     {
@@ -221,7 +224,7 @@ 
      *
      * @param array $args numeric array containing the parameter for "sql_slave"
      *
-     * @return object mysql result used by smarty assign_rs
+     * @return resource mysql result used by smarty assign_rs
      */
     private function ratingRs($args = null)
     {

Spacing +4 added lines, -4 removed lines

@@ -51,11 +51,11 @@ 
     public function rsForSmarty($type, $args = null)
     {
         // check type
-        if (method_exists($this, strtolower($type) . 'Rs')) {
+        if (method_exists($this, strtolower($type).'Rs')) {
             return call_user_func(
                 [
                     $this,
-                    $type . 'Rs'
+                    $type.'Rs'
                 ],
                 $args
             );
@@ -78,11 +78,11 @@ 
     public function feedForSmarty($type, $items = null, $url = null, $timeout = null, $includetext = null)
     {
         // check type
-        if (method_exists($this, strtolower($type) . 'Feed')) {
+        if (method_exists($this, strtolower($type).'Feed')) {
             return call_user_func(
                 [
                     $this,
-                    $type . 'Feed'
+                    $type.'Feed'
                 ],
                 $items,
                 $url,

htdocs/lib2/search/search.txt.inc.php

Doc Comments +3 added lines

@@ -203,6 +203,9 @@
     return $str;
 }
 
+/**
+ * @param string $str
+ */
 function lf2crlf($str)
 {
     return str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $str));

Spacing +4 added lines, -4 removed lines

@@ -116,10 +116,10 @@ 
 
         if ($r['html'] == 0) {
             $thisline = mb_ereg_replace('{htmlwarn}', '', $thisline);
-            $thisline = mb_ereg_replace('{desc}', decodeEntities(strip_tags($r['desc'])) . $license, $thisline);
+            $thisline = mb_ereg_replace('{desc}', decodeEntities(strip_tags($r['desc'])).$license, $thisline);
         } else {
             $thisline = mb_ereg_replace('{htmlwarn}', " ($converted_from_html)", $thisline);
-            $thisline = mb_ereg_replace('{desc}', html2txt($r['desc']) . $license, $thisline);
+            $thisline = mb_ereg_replace('{desc}', html2txt($r['desc']).$license, $thisline);
         }
 
         $thisline = mb_ereg_replace('{type}', $r['type'], $thisline);
@@ -197,7 +197,7 @@ 
                 $thislog = mb_ereg_replace('{text}', html2txt($rLog['text']), $thislog);
             }
 
-            $logentries .= $thislog . "\n";
+            $logentries .= $thislog."\n";
         }
         $thisline = mb_ereg_replace('{logs}', $logentries, $thisline);
 
@@ -205,7 +205,7 @@ 
         if (!$bUseZip) {
             echo $thisline;
         } else {
-            $phpzip->add_data($r['waypoint'] . '.txt', $thisline);
+            $phpzip->add_data($r['waypoint'].'.txt', $thisline);
         }
     }
     mysql_free_result($rs);