Completed
Branch master (7d3f82)
by Thomas
09:15
created
htdocs/resource2/tinymce/config/log.js.php 1 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.
htdocs/resource2/tinymce/config/desc.js.php 1 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.
htdocs/translate.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
690 690
         $writer->writeAttribute('id', $r['id']);
691 691
 
692 692
         $writer->writeElement('code', $r['text']);
693
-        for ($n = 0; $n < count($lang); $n ++) {
693
+        for ($n = 0; $n < count($lang); $n++) {
694 694
             $writer->writeElement(
695 695
                 $lang[$n],
696 696
                 sql_value(
@@ -818,7 +818,7 @@  discard block
 block discarded – undo
818 818
 
819 819
     $nCount = isset($_REQUEST['count']) ? $_REQUEST['count'] + 0 : 0;
820 820
 
821
-    for ($nIndex = 1; $nIndex <= $nCount; $nIndex ++) {
821
+    for ($nIndex = 1; $nIndex <= $nCount; $nIndex++) {
822 822
         if (isset($_REQUEST['useitem' . $nIndex]) && ($_REQUEST['useitem' . $nIndex] == '1')) {
823 823
             $sCode = base64_decode($_REQUEST['code' . $nIndex]);
824 824
             $transId = sql_value("SELECT `id` FROM `sys_trans` WHERE `text`='&1'", 0, $sCode);
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.
htdocs/lib2/cookie.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
 
52 52
             if ($opt['session']['check_referer']) {
53 53
                 if (isset($_SERVER['REFERER'])) {
54
-                    if (strtolower(substr('http' + strstr($_SERVER['REFERER'], '://'), 0, strlen($opt['page']['absolute_http_url']))) != strtolower($opt['page']['absolute_http_url'])) {
54
+                    if (strtolower(substr('http' +strstr($_SERVER['REFERER'], '://'), 0, strlen($opt['page']['absolute_http_url']))) != strtolower($opt['page']['absolute_http_url'])) {
55 55
                         $this->createNewSession();
56 56
                     }
57 57
                 }
Please login to merge, or discard this patch.
htdocs/lib2/mail.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
  *  Unicode Reminder メモ
6 6
  ***************************************************************************/
7 7
 
8
-require_once __DIR__. '/../vendor/autoload.php';
8
+require_once __DIR__ . '/../vendor/autoload.php';
9 9
 
10 10
 class mail extends Smarty
11 11
 {
Please login to merge, or discard this patch.
htdocs/lib2/rowEditor.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 {
10 10
     public $sTable;
11 11
     public $sAutoIncrementField = null;
12
-    public $pk;     // (idx:name; type, default, nullable, value, insertfunction)
12
+    public $pk; // (idx:name; type, default, nullable, value, insertfunction)
13 13
     public $fields; // (idx:name; type, default, nullable, value, changed, insertfunction)
14 14
 
15 15
     // status var
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
             if ($i == $index) {
255 255
                 return $k;
256 256
             }
257
-            $i ++;
257
+            $i++;
258 258
         }
259 259
     }
260 260
 
Please login to merge, or discard this patch.
htdocs/lib2/logic/logpics.class.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,12 +17,12 @@
 block discarded – undo
17 17
     const FOR_STARTPAGE_GALLERY = 1;
18 18
     const FOR_NEWPICS_GALLERY = 2;
19 19
     const FOR_USER_STAT = 3;
20
-    const FOR_USER_GALLERY = 4;   // params: userid
20
+    const FOR_USER_GALLERY = 4; // params: userid
21 21
     const FOR_MYHOME_GALLERY = 5;
22
-    const FOR_CACHE_STAT = 6;     // params: cacheid
23
-    const FOR_CACHE_GALLERY = 7;  // params: cacheid
22
+    const FOR_CACHE_STAT = 6; // params: cacheid
23
+    const FOR_CACHE_GALLERY = 7; // params: cacheid
24 24
 
25
-    const MAX_PICTURES_PER_GALLERY_PAGE = 48;   // must be multiple of 6
25
+    const MAX_PICTURES_PER_GALLERY_PAGE = 48; // must be multiple of 6
26 26
 
27 27
 
28 28
     public static function get($purpose, $userid = 0, $cacheid = 0)
Please login to merge, or discard this patch.