Completed
Pull Request — development (#738)
by Kai
04:36
created
htdocs/lib2/edithelper.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
             // mode switch from plain text to HTML editor => convert HTML special chars
37 37
             $text = nl2br(htmlspecialchars($text));
38 38
             // .. and smilies
39
-            $text = ' ' . $text . ' ';   // see Redmine #1103
39
+            $text = ' ' . $text . ' '; // see Redmine #1103
40 40
             $text = str_replace($smiley['text'], $smiley['spaced_image'], $text);
41 41
             if (substr($text, 0, 1) == ' ') {
42 42
                 $text = substr($text, 1);
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
             // convert to HTML for storing to database
60 60
             // also implemented in okapi/services/logs/submit.php
61 61
             $text = nl2br(htmlspecialchars($text, ENT_COMPAT, 'UTF-8'));
62
-            $text = str_replace('  ', '  ', $text);   // can produce new '  ' ('  ' + ' ')
62
+            $text = str_replace('  ', '  ', $text); // can produce new '  ' ('  ' + ' ')
63 63
             $text = str_replace('  ', '  ', $text);
64 64
         } else {
65 65
             // mode switch from HTML editor to plain text, or decode HTML-encoded plain text
Please login to merge, or discard this patch.
htdocs/src/Oc/Translation/CrowdinImport.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
     }
42 42
 
43 43
     /**
44
-     * @param $path
44
+     * @param string $path
45 45
      * @return TranslationStruct[]
46 46
      */
47 47
     private function readCrowdinCsv($path)
Please login to merge, or discard this patch.
htdocs/src/Oc/Postfix/JournalLogs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
                     $cursor[$key] = $value;
72 72
                 }
73 73
 
74
-                $logEntry->id = (int) hexdec($cursor['i']);
74
+                $logEntry->id = (int)hexdec($cursor['i']);
75 75
 
76 76
                 $timeStamp = $entry['__REALTIME_TIMESTAMP'];
77 77
                 $logEntry->created = \DateTimeImmutable::createFromFormat(
Please login to merge, or discard this patch.
htdocs/src/Oc/Postfix/LogEntity.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
     public function toDatabaseArray()
31 31
     {
32 32
         return [
33
-            'id' => (int) $this->id,
33
+            'id' => (int)$this->id,
34 34
             'email' => $this->email,
35 35
             'status' => $this->status,
36 36
             'created' => $this->created,
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
      */
44 44
     public function fromDatabaseArray(array $data)
45 45
     {
46
-        $this->id = (int) $data['id'];
46
+        $this->id = (int)$data['id'];
47 47
         $this->email = $data['email'];
48 48
         $this->status = $data['status'];
49 49
         $this->created = $data['created'];
Please login to merge, or discard this patch.
htdocs/src/Oc/Translation/TranslationStruct.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
 
57 57
     public function fromCsvArray(array $data)
58 58
     {
59
-        $this->identifier = (int) $data['Identifier'];
59
+        $this->identifier = (int)$data['Identifier'];
60 60
         $this->sourceString = $data['SourceString'];
61 61
         $this->comment = $data['Comment'];
62 62
         $this->de = $data['DE'];
Please login to merge, or discard this patch.
htdocs/lib2/logic/cache.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -505,8 +505,8 @@
 block discarded – undo
505 505
         }
506 506
 
507 507
         $coords = [];
508
-        if ($this->getType() != 7 && $this->getType() != 8 &&  // quiz cache
509
-            $this->hasAttribute(61) != true &&                 // safari cache
508
+        if ($this->getType() != 7 && $this->getType() != 8 && // quiz cache
509
+            $this->hasAttribute(61) != true && // safari cache
510 510
             $this->getStatus() != 5                            // unpublished cache
511 511
         ) {
512 512
             $rsCoords = sql(
Please login to merge, or discard this patch.
htdocs/okapi_settings.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
         'OC_COOKIE_NAME'   => $opt['session']['cookiename'] . 'data',
53 53
         'VERSION_FILE'     => __DIR__ . '/okapi/meta.php',
54 54
         'OCDE_HTML_PURIFIER_SETTINGS'
55
-                           => $opt['html_purifier'],
55
+                            => $opt['html_purifier'],
56 56
         'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'],
57 57
     ];
58 58
 }
Please login to merge, or discard this patch.
htdocs/okapi/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$GLOBALS['rootpath'] = __DIR__.'/../';
3
+$GLOBALS['rootpath'] = __DIR__ . '/../';
4 4
 
5 5
 require_once __DIR__ . '/../vendor/autoload.php';
6 6
 
7
-require_once __DIR__ .'/../vendor/opencaching/okapi/okapi/index.php';
7
+require_once __DIR__ . '/../vendor/opencaching/okapi/okapi/index.php';
Please login to merge, or discard this patch.
htdocs/lib2/OcHTMLPurifier.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
         $config->set(
64 64
             'HTML.ForbiddenElements',
65 65
             [
66
-                'basefont',   // workaround for HTMLPurifier bug, which allows this in the <body>
66
+                'basefont', // workaround for HTMLPurifier bug, which allows this in the <body>
67 67
             ]
68 68
         );
69 69
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
         // add attributes
99 99
         $def->addAttribute('a', 'rel', 'CDATA');
100 100
         $def->addAttribute('img', 'usemap', 'CDATA');
101
-        $def->addAttribute('map', 'name', 'CDATA');   // workaround for HTMLPurifer bug
101
+        $def->addAttribute('map', 'name', 'CDATA'); // workaround for HTMLPurifer bug
102 102
 
103 103
         // create parent object with config
104 104
         parent::__construct($config);
Please login to merge, or discard this patch.