Completed
Push — development ( a5e224...173dd5 )
by Mirco
02:03
created
htdocs/lang/de/ocstyle/removelog.inc.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@
 block discarded – undo
15 15
         
16 16
  ****************************************************************************/
17 17
 
18
- $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
19
- $removed_message_end = '---';
18
+    $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
19
+    $removed_message_end = '---';
20 20
  
21 21
 
22 22
 function removed_log_subject($lang)
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/removedesc.inc.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
      
16 16
  ****************************************************************************/
17 17
  
18
- $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
18
+    $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
19 19
 
20
- $commit = t('the cache description has been deleted');
21
- $commit_title = t('delete this cache-description');
20
+    $commit = t('the cache description has been deleted');
21
+    $commit_title = t('delete this cache-description');
Please login to merge, or discard this patch.
htdocs/config2/settings-dev.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
 );
81 81
 
82 82
 $opt['page']['develsystem'] = true;
83
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
83
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
84 84
 
85 85
 $opt['mail']['from'] = 'root';
86 86
 $opt['mail']['subject'] = '[local.opencaching.de] ';
Please login to merge, or discard this patch.
htdocs/lib/settings-sample-dev.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 
19 19
 // database names
20 20
 $dbname = 'opencaching';
21
-$tmpdbname = 'octmp';   // empty db with CREATE and DROP privileges
21
+$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges
22 22
 
23 23
 // common developer system settings
24 24
 require 'settings-dev.inc.php';
Please login to merge, or discard this patch.
htdocs/newcachesrest.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,7 @@
 block discarded – undo
14 14
 $tpl->caching = true;
15 15
 $tpl->cache_lifetime = 3600;
16 16
 
17
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
18
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
17
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
19 18
 
20 19
 if (!$tpl->is_cached()) {
21 20
     $newCaches = array();
Please login to merge, or discard this patch.
local/mailing/mailing.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
 
42 42
 foreach ($sendto as $receiver) {
43 43
     $receiver = trim($receiver);
44
-    echo ++ $n . "/$total: $receiver";
44
+    echo ++$n . "/$total: $receiver";
45 45
     mail(
46 46
         $receiver,
47 47
         $subject,
Please login to merge, or discard this patch.
local/maintenance/email_recovery.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
             "SELECT COUNT(*)
102 102
              FROM `" . $table . "`
103 103
              WHERE " . $this->getDateCondition($table, $dateField) .
104
-                       ($andWhere ? ' AND (' . $andWhere . ')' : ''),
104
+                        ($andWhere ? ' AND (' . $andWhere . ')' : ''),
105 105
             0
106 106
         );
107 107
         self::message(1, $objectCount . ' ' . $description);
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -300,7 +300,7 @@
 block discarded – undo
300 300
         while ($r = sql_fetch_assoc($rs)) {
301 301
             $user = new user($r['user_id']);
302 302
             $user->sendRegistrationCode();
303
-            ++ $n;
303
+            ++$n;
304 304
         }
305 305
         sql_free_result($rs);
306 306
         self::message(0, $n . ' users have been re-sent the activation code');
Please login to merge, or discard this patch.
local/ocxml11client/xml2array.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,14 +16,14 @@
 block discarded – undo
16 16
 
17 17
     public function push_pos(&$pos)
18 18
     {
19
-        $this->stack[count($this->stack)] =& $pos;
20
-        $this->stack_ref =& $pos;
19
+        $this->stack[count($this->stack)] = & $pos;
20
+        $this->stack_ref = & $pos;
21 21
     }
22 22
 
23 23
     public function pop_pos()
24 24
     {
25 25
         unset($this->stack[count($this->stack) - 1]);
26
-        $this->stack_ref =& $this->stack[count($this->stack) - 1];
26
+        $this->stack_ref = & $this->stack[count($this->stack) - 1];
27 27
     }
28 28
 
29 29
     public function parse($strInputXML)
Please login to merge, or discard this patch.
local/ocxml11client/index.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
     $nFileNr = 0;
68 68
     $rs = sql('SELECT `id`, `url` FROM `pictures` WHERE `local`=0');
69 69
     while ($r = sql_fetch_array($rs)) {
70
-        $nFileNr ++;
70
+        $nFileNr++;
71 71
         $fileparts = mb_split('/', $r['url']);
72 72
         $filename = $fileparts[count($fileparts) - 1];
73 73
 
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
             exit;
238 238
         }
239 239
 
240
-        for ($i = 1; $i <= $filescount; $i ++) {
240
+        for ($i = 1; $i <= $filescount; $i++) {
241 241
             echo "Download Paket: " . $i . ' von ' . $filescount . "\n";
242 242
 
243 243
             $fileurl = $opt['url_getsession'];
@@ -411,11 +411,11 @@  discard block
 block discarded – undo
411 411
                             if ($sSubElement != '') {
412 412
                                 // vorheriges element zuerst schlißen
413 413
                                 $sSubElement = '';
414
-                                $nRecursionLevel --;
414
+                                $nRecursionLevel--;
415 415
                             }
416 416
 
417 417
                             $sSubElement = mb_strtoupper($xmlReader->name);
418
-                            $nRecursionLevel ++;
418
+                            $nRecursionLevel++;
419 419
 
420 420
                             // attribute auslesen
421 421
                             if ($xmlReader->moveToFirstAttribute()) {
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
                         } else {
433 433
                             if ($xmlReader->nodeType == XMLReader::END_ELEMENT) {
434 434
                                 $sSubElement = '';
435
-                                $nRecursionLevel --;
435
+                                $nRecursionLevel--;
436 436
                             }
437 437
                         }
438 438
                     }
Please login to merge, or discard this patch.