Completed
Branch master (7d3f82)
by Thomas
09:15
created
htdocs/xml/csv/cache.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,6 +43,6 @@
 block discarded – undo
43 43
         echo ';';
44 44
         echo '"' . mb_ereg_replace('"', '\"', $cache->getWPGC()) . '"';
45 45
         echo ';';
46
-        echo '""';  // obsolete Navicache WP
46
+        echo '""'; // obsolete Navicache WP
47 47
     }
48 48
 }
Please login to merge, or discard this patch.
htdocs/newdesc.php 1 patch
Spacing   +6 added lines, -7 removed lines patch added patch discarded remove patch
@@ -44,11 +44,11 @@  discard block
 block discarded – undo
44 44
 
45 45
                 //get the posted data
46 46
                 $show_all_langs = isset($_POST['show_all_langs']) ? $_POST['show_all_langs'] : 0;
47
-                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : '';  // Ocprop
47
+                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : ''; // Ocprop
48 48
 
49
-                $hints = isset($_POST['hints']) ? $_POST['hints'] : '';  // Ocprop
50
-                $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang;  // Ocprop
51
-                $desc = isset($_POST['desc']) ? $_POST['desc'] : '';  // Ocprop
49
+                $hints = isset($_POST['hints']) ? $_POST['hints'] : ''; // Ocprop
50
+                $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang; // Ocprop
51
+                $desc = isset($_POST['desc']) ? $_POST['desc'] : ''; // Ocprop
52 52
 
53 53
                 // read descMode; if not set, initialize from user profile
54 54
                 if (isset($_POST['descMode'])) {  // Ocprop
@@ -195,8 +195,7 @@  discard block
 block discarded – undo
195 195
                 tpl_set_var('name', htmlspecialchars($cache_record['name'], ENT_COMPAT, 'UTF-8'));
196 196
                 tpl_set_var('cacheid', htmlspecialchars($cache_id, ENT_COMPAT, 'UTF-8'));
197 197
 
198
-                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message :
199
-                    (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
198
+                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message : (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
200 199
 
201 200
                 tpl_set_var('show_all_langs', $show_all_langs);
202 201
                 tpl_set_var('show_all_langs_submit', ($show_all_langs == 0) ? $show_all_langs_submit : '');
@@ -218,7 +217,7 @@  discard block
 block discarded – undo
218 217
                 $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n";
219 218
                 tpl_set_var('htmlheaders', $headers);
220 219
 
221
-                tpl_set_var('reset', $reset);  // obsolete
220
+                tpl_set_var('reset', $reset); // obsolete
222 221
                 tpl_set_var('submit', $submit);
223 222
             } else {
224 223
                 //TODO: not the owner
Please login to merge, or discard this patch.
htdocs/resource2/tinymce/config/log.js.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2
-  if (isset($_REQUEST['lang'])) {
2
+    if (isset($_REQUEST['lang'])) {
3 3
     $lang = $_REQUEST['lang'];
4
-  }
5
-  else {
4
+    }
5
+    else {
6 6
     $lang = 'de';
7
-  }
7
+    }
8 8
 ?>
9 9
 tinyMCE_GZ.init({
10 10
     plugins : 'advhr,contextmenu,emotions,insertdatetime,paste,table',
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 
48 48
 function imageBrowser(field_name, url, type, win)
49 49
 {
50
-  window.open('../../../../imagebrowser.php?logid=<?php echo isset($_REQUEST['logid']) ? ($_REQUEST['logid']+0) : 0; ?>', '', 'width=450,height=550,menubar=no,scrollbars=yes,status=no,location=no,resizable=yes,status=no,dependent');
50
+  window.open('../../../../imagebrowser.php?logid=<?php echo isset($_REQUEST['logid']) ? ($_REQUEST['logid'] + 0) : 0; ?>', '', 'width=450,height=550,menubar=no,scrollbars=yes,status=no,location=no,resizable=yes,status=no,dependent');
51 51
   fileBrowserWin = win;
52 52
   fileBrowserFieldName = field_name;
53 53
 }
Please login to merge, or discard this 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 3 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php
2
-  if (isset($_REQUEST['cacheid'])) {
2
+    if (isset($_REQUEST['cacheid'])) {
3 3
     $cacheID = $_REQUEST['cacheid'];
4
-  }
5
-  else {
4
+    }
5
+    else {
6 6
     $cacheID = 0;
7
-  }
8
-  if (isset($_REQUEST['lang'])) {
7
+    }
8
+    if (isset($_REQUEST['lang'])) {
9 9
     $lang = $_REQUEST['lang'];
10
-  }
11
-  else {
10
+    }
11
+    else {
12 12
     $lang = 'de';
13
-  }
13
+    }
14 14
 ?>
15 15
 tinyMCE_GZ.init({
16 16
     plugins : 'advhr,contextmenu,emotions,insertdatetime,paste,table',
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
 
54 54
 function imageBrowser(field_name, url, type, win)
55 55
 {
56
-  window.open('../../../../imagebrowser.php?cacheid=<?php echo $cacheID+0; ?>', '', 'width=450,height=550,menubar=no,scrollbars=yes,status=no,location=no,resizable=yes,status=no,dependent');
56
+  window.open('../../../../imagebrowser.php?cacheid=<?php echo $cacheID + 0; ?>', '', 'width=450,height=550,menubar=no,scrollbars=yes,status=no,location=no,resizable=yes,status=no,dependent');
57 57
   fileBrowserWin = win;
58 58
   fileBrowserFieldName = field_name;
59 59
 }
Please login to merge, or discard this 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 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-  if (isset($_REQUEST['lang']))
2
+    if (isset($_REQUEST['lang']))
3 3
     $lang = $_REQUEST['lang'];
4
-  else
4
+    else
5 5
     $lang = 'de';
6 6
 ?>
7 7
 
Please login to merge, or discard this 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 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-  if (isset($_REQUEST['lang']))
2
+    if (isset($_REQUEST['lang']))
3 3
     $lang = $_REQUEST['lang'];
4
-  else
4
+    else
5 5
     $lang = 'de';
6 6
 ?>
7 7
 
Please login to merge, or discard this 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/charset.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,11 +28,11 @@  discard block
 block discarded – undo
28 28
     $result = "";
29 29
 
30 30
     while ($pos < strlen($s)) {
31
-        $c1 = ord($s[$pos ++]);
31
+        $c1 = ord($s[$pos++]);
32 32
         if ($c1 < 0xC0) {
33 33
             $result .= chr($c1);
34 34
         } elseif ($pos < strlen($s)) {
35
-            $c2 = ord($s[$pos ++]);
35
+            $c2 = ord($s[$pos++]);
36 36
             if ($c1 < 0xE0) {
37 37
                 $code = 0x40 * ($c1 & 0x1F) + ($c2 & 0x3F);
38 38
                 if ($code < 0x100) {
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
                     $result .= "?";
47 47
                 }
48 48
             } elseif ($pos < strlen($s)) {
49
-                $c3 = ord($s[$pos ++]);
49
+                $c3 = ord($s[$pos++]);
50 50
                 $code = 0x1000 * ($c1 & 0x0F) + 0x40 * ($c2 & 0x3F) + ($c3 & 0x3F);
51 51
                 switch ($code) {
52 52
                     case 0x2026:
Please login to merge, or discard this patch.
htdocs/lib2/OcHTMLPurifier.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
         $config->set('Attr.IDPrefix', 'custom_');
51 51
 
52 52
         // enable 'display' and 'visibility' styles for mystery descriptions
53
-        $config->set('CSS.AllowTricky', true);                // + display, visibility, overflow
54
-        $config->set('CSS.ForbiddenProperties', 'overflow');  // - overflow
53
+        $config->set('CSS.AllowTricky', true); // + display, visibility, overflow
54
+        $config->set('CSS.ForbiddenProperties', 'overflow'); // - overflow
55 55
 
56 56
         // prepare additional definitions
57 57
         $def = $config->getHTMLDefinition(true);
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
         ); //  HTML5 attribs currently not supported by TinyMCE
66 66
         $def->addElement('legend', 'Inline', 'Flow', 'Common');
67 67
         $def->addElement('q', 'Inline', 'Inline', 'Common', ['cite' => 'URI']);
68
-        $def->addElement('strike', 'Inline', 'Inline', 'Common');   // -> wird in CSS umgewandelt
68
+        $def->addElement('strike', 'Inline', 'Inline', 'Common'); // -> wird in CSS umgewandelt
69 69
         $def->addElement(
70 70
             'area',
71 71
             'Inline',
Please login to merge, or discard this patch.