OpencachingDeutschland / oc-server3

htdocs/newcachesrest.php

Spacing +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
 $tpl->caching = true;
 $tpl->cache_lifetime = 3600;
 
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
 
 if (!$tpl->is_cached()) {
     $newCaches = array();

htdocs/picture.php

Spacing +3 added lines, -3 removed lines

@@ -75,11 +75,11 @@
     if (isset($_REQUEST['ok'])) { // Ocprop
         $bError = false;
 
-        $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1');  // Ocprop
-        $picture->setDisplay((isset($_REQUEST['notdisplay']) && $_REQUEST['notdisplay'] == '1') == false);  // Ocprop
+        $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1'); // Ocprop
+        $picture->setDisplay((isset($_REQUEST['notdisplay']) && $_REQUEST['notdisplay'] == '1') == false); // Ocprop
         $picture->setMapPreview(isset($_REQUEST['mappreview']) && $_REQUEST['mappreview'] == '1');
 
-        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : '';  // Ocprop
+        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : ''; // Ocprop
         if ($title == '' || ($picture->getObjectType() == OBJECT_CACHELOG && trim($title) == '')) {
             $tpl->assign('errortitle', true);
             $bError = true;

htdocs/query.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
     if ($submit == true) {
         $options = sql_value("SELECT `options` FROM `queries` WHERE `id`='&1'", false, $queryid);
         if (!$options) {
-            $tpl->error(ERROR_UNKNOWN);   // query does not exist
+            $tpl->error(ERROR_UNKNOWN); // query does not exist
         } elseif ($sortby || $sortorder || $creationdate) {
             $oa = unserialize($options);
             if ($sortby) {

local/mailing/mailing.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 foreach ($sendto as $receiver) {
     $receiver = trim($receiver);
-    echo ++ $n . "/$total: $receiver";
+    echo ++$n . "/$total: $receiver";
     mail(
         $receiver,
         $subject,

local/devel/find_bad_encodings.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 function test_encoding($path)
 {
-    static $ur_exclude = [  // no unicode reminder needed
+    static $ur_exclude = [// no unicode reminder needed
         'lang/de/ocstyle/search1/search.result.caches',
         'lib2/b2evo-captcha',
         'lib2/HTMLPurifier',

Doc Comments +3 added lines

@@ -39,6 +39,9 @@
 }
 
 
+/**
+ * @param string $path
+ */
 function testforbom($path)
 {
     $filestart = file_get_contents($path, false, null, 0, 2);

local/devel/style-cleanup.php

Spacing +6 added lines, -6 removed lines

@@ -108,19 +108,19 @@ 
                         && !preg_match("/^ *(\\*|\/\/|#) *\n$/", $line)) {
 
                         $old_line = $line;
-                        $line = rtrim($line);   # trims " \t\n\r\0\x0B"
+                        $line = rtrim($line); # trims " \t\n\r\0\x0B"
                         $line = $this->expandTabs($line);
                         $line .= "\n";
 
                         if ($line != $old_line) {
                             $file_modified = true;
-                            ++ $this->lines_modified;
+                            ++$this->lines_modified;
                         }
                     }
                     if (preg_match('/\<\?\s/', $line)) {   # relies on \n at EOL
                         self::warn('short open tag in line ' . $n . ' of ' . $display_filepath);
                     }
-                    ++ $n;
+                    ++$n;
                 }
 
                 # remove PHP close tags and empty lines from end of file
@@ -131,17 +131,17 @@ 
                     if ($trimmed_line == '?>' || $trimmed_line == '') {
                         unset($lines[$l]);
                         $file_modified = true;
-                        ++ $this->lines_modified;
+                        ++$this->lines_modified;
                     } else {
                         break;
                     }
-                    -- $l;
+                    --$l;
                 }
 
                 if ($file_modified) {
                     echo 'cleaned ' . substr($filepath, 2) . "\n";
                     file_put_contents($filepath, implode('', $lines));
-                    ++ $this->files_modified;
+                    ++$this->files_modified;
                 }
             }
 

local/maintenance/init_user_languages.php

Spacing +2 added lines, -2 removed lines

@@ -31,9 +31,9 @@
                 $lang
             );
         }
-        ++ $set;
+        ++$set;
     }
-    if (++ $processed % 1000 == 0) {
+    if (++$processed % 1000 == 0) {
         echo "$set of $processed " . ($write ? '' : 'would be ') . "set\n";
     }
 }

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

@@ -52,7 +52,7 @@ 
             $er->resendActivationCodes();
             break;
         default:
-            die('invalid option: '. $option . "\n");
+            die('invalid option: ' . $option . "\n");
     }
 }
 
@@ -297,7 +297,7 @@ 
         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');

local/stat/coordstat.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
     $year = substr($cache['date_created'], 0, 4);
     if ($year >= 2005 && $year <= date("Y") && ($lat != 0 || $long != 0)) {
         $years[$year] = true;
-        $liste[$lat][$long]["caches"][$year] ++;
+        $liste[$lat][$long]["caches"][$year]++;
     }
 }
 mysql_free_result($rs);
@@ -50,7 +50,7 @@ 
         $year = substr($cache["date"], 0, 4);
         if ($year >= 2005 && $year <= date("Y") && ($lat != 0 || $long != 0)) {
             $years[$year] = true;
-            $liste[$lat][$long]["logs"][$year] ++;
+            $liste[$lat][$long]["logs"][$year]++;
         }
     }
     mysql_free_result($rs);
@@ -67,7 +67,7 @@ 
 while ($cache = sql_fetch_assoc($rs)) {
     $lat = floor($cache["latitude"] / $grid);
     $long = floor($cache["longitude"] / $grid);
-    $liste[$lat][$long]["caches"]["all"] ++;
+    $liste[$lat][$long]["caches"]["all"]++;
     $liste[$lat][$long]["logs"]["all"] += $cache["logs"];
 }
 mysql_free_result($rs);