Completed
Branch master (7d3f82)
by Thomas
09:15
created
htdocs/editdesc.php 1 patch
Braces   +14 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,9 +19,12 @@  discard block
 block discarded – undo
19 19
     require $stylepath . '/editdesc.inc.php';
20 20
 
21 21
     // check for old-style parameters
22
-    if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid']))  // Ocprop
22
+    if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid'])) {
23
+        // Ocprop
23 24
     {
24
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
25
+        $cache_id = $_REQUEST['cacheid'];
26
+    }
27
+    // Ocprop
25 28
         $desc_lang = $_REQUEST['desclang'];  // Ocprop
26 29
 
27 30
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
@@ -87,10 +90,13 @@  discard block
 block discarded – undo
87 90
                 $show_all_langs = false;
88 91
 
89 92
                 //save to DB?
90
-                if (isset($_POST['post']))  // Ocprop
93
+                if (isset($_POST['post'])) {
94
+                    // Ocprop
91 95
                 {
92 96
                     //here we read all used information from the form if submitted
93
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
97
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;
98
+                }
99
+                // Ocprop
94 100
 
95 101
                     // fuer alte Versionen von OCProp
96 102
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -147,7 +153,8 @@  discard block
 block discarded – undo
147 153
 
148 154
                     $desc = processEditorInput($oldDescMode, $descMode, $desc);
149 155
 
150
-                    if (isset($_POST['submitform']))  // Ocprop
156
+                    if (isset($_POST['submitform'])) {
157
+                        // Ocprop
151 158
                     {
152 159
                         // prüfen, ob sprache nicht schon vorhanden
153 160
                         $rs = sql(
@@ -160,6 +167,7 @@  discard block
 block discarded – undo
160 167
                             $descid,
161 168
                             $desclang
162 169
                         );
170
+                    }
163 171
                         $r = sql_fetch_array($rs);
164 172
                         if ($r['count'] > 0) {
165 173
                             tpl_errorMsg('editdesc', $error_desc_exists);
@@ -224,8 +232,7 @@  discard block
 block discarded – undo
224 232
 
225 233
                     if ($oldDescMode == 0) {
226 234
                         $desc = processEditorInput($oldDescMode, $descMode, $desc_record['desc']);
227
-                    }
228
-                    else {
235
+                    } else {
229 236
                         $desc = $desc_record['desc'];
230 237
                     }
231 238
                 }
Please login to merge, or discard this patch.
htdocs/newcache.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -569,7 +569,8 @@  discard block
 block discarded – undo
569 569
 
570 570
         tpl_set_var('firstcache_note', mb_ereg_replace('%1', $opt['page']['sitename'], $firstcache_note));
571 571
 
572
-        if (isset($_POST['submitform']))  // Ocprop
572
+        if (isset($_POST['submitform'])) {
573
+            // Ocprop
573 574
         {
574 575
             //check the entered data
575 576
 
@@ -577,6 +578,7 @@  discard block
 block discarded – undo
577 578
             if ($lat_h != '' || $lat_min != '') {
578 579
                 if (!mb_ereg_match('^[0-9]{1,2}$', $lat_h)) {
579 580
                     tpl_set_var('lat_message', $error_lat_not_ok);
581
+        }
580 582
                     $error = true;
581 583
                     $lat_h_not_ok = true;
582 584
                 } else {
Please login to merge, or discard this patch.
htdocs/resource2/tinymce/config/log.js.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
   if (isset($_REQUEST['lang'])) {
3 3
     $lang = $_REQUEST['lang'];
4
-  }
5
-  else {
4
+  } else {
6 5
     $lang = 'de';
7 6
   }
8 7
 ?>
Please login to merge, or discard this patch.
htdocs/resource2/tinymce/config/desc.js.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,14 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
   if (isset($_REQUEST['cacheid'])) {
3 3
     $cacheID = $_REQUEST['cacheid'];
4
-  }
5
-  else {
4
+  } else {
6 5
     $cacheID = 0;
7 6
   }
8 7
   if (isset($_REQUEST['lang'])) {
9 8
     $lang = $_REQUEST['lang'];
10
-  }
11
-  else {
9
+  } else {
12 10
     $lang = 'de';
13 11
   }
14 12
 ?>
Please login to merge, or discard this patch.
htdocs/resource2/tinymce/config/list.js.php 1 patch
Braces   +6 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,9 +1,10 @@
 block discarded – undo
1 1
 <?php
2
-  if (isset($_REQUEST['lang']))
3
-    $lang = $_REQUEST['lang'];
4
-  else
5
-    $lang = 'de';
6
-?>
2
+  if (isset($_REQUEST['lang'])) {
3
+      $lang = $_REQUEST['lang'];
4
+  } else {
5
+      $lang = 'de';
6
+  }
7
+  ?>
7 8
 
8 9
 tinyMCE_GZ.init({
9 10
     plugins : 'advhr,contextmenu,emotions,insertdatetime,paste,table',
Please login to merge, or discard this patch.
htdocs/resource2/tinymce/config/user.js.php 1 patch
Braces   +6 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,9 +1,10 @@
 block discarded – undo
1 1
 <?php
2
-  if (isset($_REQUEST['lang']))
3
-    $lang = $_REQUEST['lang'];
4
-  else
5
-    $lang = 'de';
6
-?>
2
+  if (isset($_REQUEST['lang'])) {
3
+      $lang = $_REQUEST['lang'];
4
+  } else {
5
+      $lang = 'de';
6
+  }
7
+  ?>
7 8
 
8 9
 tinyMCE_GZ.init({
9 10
     plugins : 'advhr,contextmenu,emotions,insertdatetime,paste,table',
Please login to merge, or discard this patch.
htdocs/mailto.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,8 +55,7 @@
 block discarded – undo
55 55
 $text = isset($_REQUEST['text']) ? $_REQUEST['text'] : '';
56 56
 if (isset($_REQUEST['emailaddress'])) {
57 57
     $bEmailaddress = ($_REQUEST['emailaddress'] == 1);
58
-}
59
-else {
58
+} else {
60 59
     $own_user = new user($login->userid);
61 60
     $bEmailaddress = $own_user->getUsermailSendAddress();
62 61
 }
Please login to merge, or discard this patch.
htdocs/lib2/logic/user.class.php 1 patch
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -509,10 +509,11 @@
 block discarded – undo
509 509
 
510 510
     public function getStatNotFound()
511 511
     {
512
-        if ($this->reUserStat->exist())
513
-            return $this->reUserStat->getValue('notfound');
514
-        else
515
-            return 0;
512
+        if ($this->reUserStat->exist()) {
513
+                    return $this->reUserStat->getValue('notfound');
514
+        } else {
515
+                    return 0;
516
+        }
516 517
     }
517 518
 
518 519
     public function getStatNote()
Please login to merge, or discard this patch.
htdocs/lib2/Net/IDNA2.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -2340,7 +2340,9 @@  discard block
 block discarded – undo
2340 2340
         }
2341 2341
 
2342 2342
         // No input, no output, what else did you expect?
2343
-        if (empty($decoded)) return '';
2343
+        if (empty($decoded)) {
2344
+            return '';
2345
+        }
2344 2346
 
2345 2347
         // Anchors for iteration
2346 2348
         $last_begin = 0;
@@ -2438,7 +2440,9 @@  discard block
 block discarded – undo
2438 2440
             $arr = explode('.', $input);
2439 2441
             foreach ($arr as $k => $v) {
2440 2442
                 $conv = $this->_decode($v);
2441
-                if ($conv) $arr[$k] = $conv;
2443
+                if ($conv) {
2444
+                    $arr[$k] = $conv;
2445
+                }
2442 2446
             }
2443 2447
             $return = $email_pref . '@' . join('.', $arr);
2444 2448
         } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
@@ -2452,7 +2456,9 @@  discard block
 block discarded – undo
2452 2456
                 $arr = explode('.', $parsed['host']);
2453 2457
                 foreach ($arr as $k => $v) {
2454 2458
                     $conv = $this->_decode($v);
2455
-                    if ($conv) $arr[$k] = $conv;
2459
+                    if ($conv) {
2460
+                        $arr[$k] = $conv;
2461
+                    }
2456 2462
                 }
2457 2463
                 $parsed['host'] = join('.', $arr);
2458 2464
                 if (isset($parsed['scheme'])) {
@@ -2463,7 +2469,9 @@  discard block
 block discarded – undo
2463 2469
                 $arr = explode('.', $input);
2464 2470
                 foreach ($arr as $k => $v) {
2465 2471
                     $conv = $this->_decode($v);
2466
-                    if ($conv) $arr[$k] = $conv;
2472
+                    if ($conv) {
2473
+                        $arr[$k] = $conv;
2474
+                    }
2467 2475
                 }
2468 2476
                 $return = join('.', $arr);
2469 2477
             }
Please login to merge, or discard this patch.