Completed
Pull Request — master (#592)
by
unknown
14:06
created
htdocs/class/file/folder.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -102,18 +102,18 @@  discard block
 block discarded – undo
102 102
     public function __construct($path = '', $create = true, $mode = false)
103 103
     {
104 104
         if (empty($path)) {
105
-            $path = \XoopsBaseConfig::get('var-path') . '/caches/xoops_cache';
105
+            $path = \XoopsBaseConfig::get('var-path').'/caches/xoops_cache';
106 106
         }
107 107
         if ($mode) {
108 108
             $this->mode = intval($mode, 8);
109 109
         }
110
-        if (! XoopsLoad::fileExists($path) && $create == true) {
110
+        if (!XoopsLoad::fileExists($path) && $create == true) {
111 111
             $this->create($path, $this->mode);
112 112
         }
113
-        if (! $this->isAbsolute($path)) {
113
+        if (!$this->isAbsolute($path)) {
114 114
             $path1 = $this->realpath($path);
115
-            if (false===$path1)
116
-                throw new InvalidArgumentException($path . ' not found');
115
+            if (false === $path1)
116
+                throw new InvalidArgumentException($path.' not found');
117 117
             $path = $path1;
118 118
         }
119 119
         $this->cd($path);
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
      */
276 276
     public static function isWindowsPath($path)
277 277
     {
278
-        if (preg_match('/^[A-Z]:/i', $path) || false !== strpos($path,'\\')) {
278
+        if (preg_match('/^[A-Z]:/i', $path) || false !== strpos($path, '\\')) {
279 279
             return true;
280 280
         }
281 281
         return false;
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
      */
293 293
     public static function isAbsolute($path)
294 294
     {
295
-        $path = str_replace('\\','/',$path);
295
+        $path = str_replace('\\', '/', $path);
296 296
         $match = preg_match('/^(\/|[A-Z]:\/|\/\/)/', $path);
297 297
         return ($match == 1);
298 298
     }
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
         if (self::isSlashTerm($path)) {
346 346
             return $path;
347 347
         }
348
-        return $path . self::correctSlashFor($path);
348
+        return $path.self::correctSlashFor($path);
349 349
     }
350 350
 
351 351
     /**
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
      */
361 361
     public static function addPathElement($path, $element)
362 362
     {
363
-        return self::slashTerm($path) . $element;
363
+        return self::slashTerm($path).$element;
364 364
     }
365 365
 
366 366
     /**
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
     {
376 376
         $xoops_root_path = \XoopsBaseConfig::get('root-path');
377 377
         $dir = substr($this->slashTerm($xoops_root_path), 0, -1);
378
-        $newdir = $dir . ($path{0}==='/'?'':'/') . $path;
378
+        $newdir = $dir.($path{0} === '/' ? '' : '/').$path;
379 379
         return $this->inPath($newdir);
380 380
     }
381 381
 
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
503 503
                 }
504 504
                 $found = false;
505 505
                 if (($hidden === true) || ($hidden === false && $item{0} !== '.')) {
506
-                    $found = $path . '/' . $item;
506
+                    $found = $path.'/'.$item;
507 507
                 }
508 508
                 if ($found !== false) {
509 509
                     if (is_dir($found)) {
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -112,8 +112,9 @@
 block discarded – undo
112 112
         }
113 113
         if (! $this->isAbsolute($path)) {
114 114
             $path1 = $this->realpath($path);
115
-            if (false===$path1)
116
-                throw new InvalidArgumentException($path . ' not found');
115
+            if (false===$path1) {
116
+                            throw new InvalidArgumentException($path . ' not found');
117
+            }
117 118
             $path = $path1;
118 119
         }
119 120
         $this->cd($path);
Please login to merge, or discard this patch.
htdocs/class/zipdownloader.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@
 block discarded – undo
130 130
      */
131 131
     public function download($name, $gzip = true)
132 132
     {
133
-        $this->_header($name . $this->ext);
133
+        $this->_header($name.$this->ext);
134 134
         $result = $this->archiver->file();
135 135
         if ($result !== false) {
136 136
             echo $result;
Please login to merge, or discard this patch.
htdocs/class/downloader.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
      * @param boolean|string $newfilename
75 75
      * @return void
76 76
      */
77
-     abstract function addFile($filepath, $newfilename = null);
77
+        abstract function addFile($filepath, $newfilename = null);
78 78
 
79 79
     /**
80 80
      * @abstract
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -55,14 +55,14 @@
 block discarded – undo
55 55
         if (function_exists('mb_http_output')) {
56 56
             mb_http_output('pass');
57 57
         }
58
-        header('Content-Type: ' . $this->mimetype);
58
+        header('Content-Type: '.$this->mimetype);
59 59
         if (preg_match("/MSIE ([0-9]\.[0-9]{1,2})/", $_SERVER['HTTP_USER_AGENT'])) {
60
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
60
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
61 61
             header('Expires: 0');
62 62
             header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
63 63
             header('Pragma: public');
64 64
         } else {
65
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
65
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
66 66
             header('Expires: 0');
67 67
             header('Pragma: no-cache');
68 68
         }
Please login to merge, or discard this patch.
htdocs/class/xoopseditor/xoopseditor.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
         // TODO: switch to property_exists() as of PHP 5.1.0
85 85
         $vars = get_class_vars(__CLASS__);
86 86
         foreach ($configs as $key => $val) {
87
-            $method = "set" . ucfirst($key);
87
+            $method = "set".ucfirst($key);
88 88
             if (method_exists($this, $method)) {
89 89
                 $this->$method($val);
90 90
             } else {
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
      */
155 155
     private function __construct()
156 156
     {
157
-        $this->root_path = \XoopsBaseConfig::get('root-path') . '/class/xoopseditor';
157
+        $this->root_path = \XoopsBaseConfig::get('root-path').'/class/xoopseditor';
158 158
     }
159 159
 
160 160
     /**
@@ -205,17 +205,17 @@  discard block
 block discarded – undo
205 205
     {
206 206
         $list = array();
207 207
         $order = array();
208
-        $fileList = XoopsLists::getDirListAsArray($this->root_path . '/');
208
+        $fileList = XoopsLists::getDirListAsArray($this->root_path.'/');
209 209
 
210 210
         foreach ($fileList as $item) {
211
-            if (XoopsLoad::fileExists($file = $this->root_path . '/' . $item . '/language/' . XoopsLocale::getLegacyLanguage() . '.php')) {
211
+            if (XoopsLoad::fileExists($file = $this->root_path.'/'.$item.'/language/'.XoopsLocale::getLegacyLanguage().'.php')) {
212 212
                 include_once $file;
213 213
             } else {
214
-                if (XoopsLoad::fileExists($file = $this->root_path . '/' . $item . '/language/english.php')) {
214
+                if (XoopsLoad::fileExists($file = $this->root_path.'/'.$item.'/language/english.php')) {
215 215
                     include_once $file;
216 216
                 }
217 217
             }
218
-            if (XoopsLoad::fileExists($file = $this->root_path . '/' . $item . '/editor_registry.php')) {
218
+            if (XoopsLoad::fileExists($file = $this->root_path.'/'.$item.'/editor_registry.php')) {
219 219
                 include $file;
220 220
                 if (empty($config['order'])) {
221 221
                     continue;
@@ -277,15 +277,15 @@  discard block
 block discarded – undo
277 277
         if (empty($name) || !array_key_exists($name, $this->getList())) {
278 278
             return $editor;
279 279
         }
280
-        $editor_path = $this->root_path . '/' . $name;
281
-        if (XoopsLoad::fileExists($file = $editor_path . '/language/' . XoopsLocale::getLegacyLanguage() . '.php')) {
280
+        $editor_path = $this->root_path.'/'.$name;
281
+        if (XoopsLoad::fileExists($file = $editor_path.'/language/'.XoopsLocale::getLegacyLanguage().'.php')) {
282 282
             include_once $file;
283 283
         } else {
284
-            if (XoopsLoad::fileExists($file = $editor_path . '/language/english.php')) {
284
+            if (XoopsLoad::fileExists($file = $editor_path.'/language/english.php')) {
285 285
                 include_once $file;
286 286
             }
287 287
         }
288
-        if (XoopsLoad::fileExists($file = $editor_path . '/editor_registry.php')) {
288
+        if (XoopsLoad::fileExists($file = $editor_path.'/editor_registry.php')) {
289 289
             include $file;
290 290
         } else {
291 291
             return $editor;
Please login to merge, or discard this patch.
htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
     public function __construct($options = array())
40 40
     {
41 41
         parent::__construct($options);
42
-        $this->rootPath = '/class/xoopseditor/' . basename(__DIR__);
42
+        $this->rootPath = '/class/xoopseditor/'.basename(__DIR__);
43 43
         $hiddenText = isset($this->configs['hiddenText']) ? $this->configs['hiddenText'] : $this->_hiddenText;
44 44
         $this->renderer = new Xoops\Form\DhtmlTextArea('', $this->getName(), $this->getValue(), $this->getRows(), $this->getCols(), $hiddenText, $this->configs);
45 45
     }
Please login to merge, or discard this patch.
htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 
24 24
 return $config = array(
25 25
     'class' => 'FormDhtmlTextArea',
26
-    'file' => \XoopsBaseConfig::get('root-path') . '/class/xoopseditor/dhtmltextarea/dhtmltextarea.php',
26
+    'file' => \XoopsBaseConfig::get('root-path').'/class/xoopseditor/dhtmltextarea/dhtmltextarea.php',
27 27
     'title' => _XOOPS_EDITOR_DHTMLTEXTAREA,
28 28
     'order' => 2,
29 29
     'nohtml' => 1
Please login to merge, or discard this patch.
htdocs/class/xoopseditor/dhtmltextarea/language/english.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,4 +12,4 @@
 block discarded – undo
12 12
 /**
13 13
  * Assocated with editor_registry.php
14 14
  */
15
-define('_XOOPS_EDITOR_DHTMLTEXTAREA','DHTML Form with xCode');
15
+define('_XOOPS_EDITOR_DHTMLTEXTAREA', 'DHTML Form with xCode');
Please login to merge, or discard this patch.
htdocs/class/xoopseditor/xoopseditor.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,9 +27,9 @@
 block discarded – undo
27 27
      */
28 28
     function xoopseditor_get_rootpath()
29 29
     {
30
-        return \XoopsBaseConfig::get('root-path') . '/class/xoopseditor';
30
+        return \XoopsBaseConfig::get('root-path').'/class/xoopseditor';
31 31
     }
32 32
 }
33 33
 
34
-$mainfile = dirname(dirname(__DIR__)) . '/mainfile.php';
34
+$mainfile = dirname(dirname(__DIR__)).'/mainfile.php';
35 35
 require $mainfile;
Please login to merge, or discard this patch.
htdocs/class/xoopseditor/tinymce4/formtinymce.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
     public function getFonts()
108 108
     {
109 109
         if (empty($this->config["fonts"]) && defined("_XOOPS_EDITOR_TINYMCE4_FONTS")) {
110
-             $this->config["fonts"] = constant("_XOOPS_EDITOR_TINYMCE4_FONTS");
110
+                $this->config["fonts"] = constant("_XOOPS_EDITOR_TINYMCE4_FONTS");
111 111
         }
112 112
 
113 113
         return @$this->config["fonts"];
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
      */
134 134
     public function isActive()
135 135
     {
136
-		$xoops_root_path = \XoopsBaseConfig::get('root-path');
136
+        $xoops_root_path = \XoopsBaseConfig::get('root-path');
137 137
         return is_readable($xoops_root_path . $this->rootPath . "/tinymce.php");
138 138
     }
139 139
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         $this->configs["area_height"] = isset($this->configs["height"]) ? $this->configs["height"] : $this->height;
54 54
         $this->configs["fonts"] = $this->getFonts();
55 55
 
56
-        require_once __DIR__ . "/tinymce.php";
56
+        require_once __DIR__."/tinymce.php";
57 57
         $this->editor = new TinyMCE($this->configs);
58 58
     }
59 59
 
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
             $eltmsg = empty($eltcaption) ? sprintf(XoopsLocale::F_ENTER, $eltname) : sprintf(XoopsLocale::F_ENTER, $eltcaption);
74 74
             $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
75 75
             $ret = "\n";
76
-            $ret.= "if ( tinyMCE.get('{$eltname}').getContent() == \"\" || tinyMCE.get('{$eltname}').getContent() == null) ";
77
-            $ret.= "{ window.alert(\"{$eltmsg}\"); tinyMCE.get('{$eltname}').focus(); return false; }";
76
+            $ret .= "if ( tinyMCE.get('{$eltname}').getContent() == \"\" || tinyMCE.get('{$eltname}').getContent() == null) ";
77
+            $ret .= "{ window.alert(\"{$eltmsg}\"); tinyMCE.get('{$eltname}').focus(); return false; }";
78 78
 
79 79
             return $ret;
80 80
         }
@@ -134,6 +134,6 @@  discard block
 block discarded – undo
134 134
     public function isActive()
135 135
     {
136 136
 		$xoops_root_path = \XoopsBaseConfig::get('root-path');
137
-        return is_readable($xoops_root_path . $this->rootPath . "/tinymce.php");
137
+        return is_readable($xoops_root_path.$this->rootPath."/tinymce.php");
138 138
     }
139 139
 }
Please login to merge, or discard this patch.