AgelxNash / DocLister

assets/lib/Helpers/FS.php

Spacing +8 added lines, -8 removed lines

@@ -65,12 +65,12 @@ 
      */
     private function _pathinfo($file, $mode)
     {
-        if (!is_scalar($file) && !is_scalar($mode)) {
+        if ( ! is_scalar($file) && ! is_scalar($mode)) {
             $file = $mode = '';
         }
-        $flag = !(empty($file) || empty($mode));
+        $flag = ! (empty($file) || empty($mode));
         $f = MODX_BASE_PATH . $this->relativePath($file);
-        if ($flag && !isset($this->_fileInfo[$f], $this->_fileInfo[$f][$mode])) {
+        if ($flag && ! isset($this->_fileInfo[$f], $this->_fileInfo[$f][$mode])) {
             $this->_fileInfo[$f] = pathinfo($f);
         }
         $out = $flag && isset($this->_fileInfo[$f][$mode]) ? $this->_fileInfo[$f][$mode] : '';
@@ -113,7 +113,7 @@ 
     public function takeFileExt($file, $lower = true)
     {
         $str = $this->_pathinfo($file, 'extension');
-        if($lower){
+        if ($lower) {
             $str = strtolower($str);
         }
         return $str;
@@ -127,7 +127,7 @@ 
     {
         $f = is_scalar($file) ? MODX_BASE_PATH . $this->relativePath($file) : '';
 
-        return (!empty($f) && is_file($f) && is_readable($f));
+        return ( ! empty($f) && is_file($f) && is_readable($f));
     }
 
     /**
@@ -138,7 +138,7 @@ 
     {
         $f = is_scalar($path) ? $this->relativePath($path) : '';
 
-        return (!empty($f) && is_dir(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f));
+        return ( ! empty($f) && is_dir(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f));
     }
 
     /**
@@ -226,7 +226,7 @@ 
      */
     public function makeDir($path, $perm = 0755)
     {
-        if (!$this->checkDir($path)) {
+        if ( ! $this->checkDir($path)) {
             $path = MODX_BASE_PATH . $this->relativePath($path);
             $flag = mkdir($path, $this->toOct($perm), true);
         } else {
@@ -291,7 +291,7 @@ 
             $owner = MODX_BASE_PATH;
         }
         $path = str_replace('\\', '/', $path);
-        if (!(empty($path) || !is_scalar($path)) && !preg_match("/^http(s)?:\/\/\w+/", $path)) {
+        if ( ! (empty($path) || ! is_scalar($path)) && ! preg_match("/^http(s)?:\/\/\w+/", $path)) {
             $path = trim(preg_replace("#^" . preg_quote($owner) . "#", '', $path), DIRECTORY_SEPARATOR);
         } else {
             $path = '';

Braces +70 added lines, -69 removed lines

@@ -4,8 +4,8 @@ 
  * Class FS
  * @package Helpers
  */
-class FS
-{
+class FS

+{

     /**
      * @var FS cached reference to singleton instance
      */
@@ -21,9 +21,9 @@ 
      *
      * @return self
      */
-    public static function getInstance()
-    {
-        if (null === self::$instance) {
+    public static function getInstance()

+    {

+        if (null === self::$instance) {

             self::$instance = new self();
         }
 
@@ -34,8 +34,8 @@ 
      * is not allowed to call from outside: private!
      *
      */
-    private function __construct()
-    {
+    private function __construct()

+    {

     }
 
     /**
@@ -43,8 +43,8 @@ 
      *
      * @return void
      */
-    private function __clone()
-    {
+    private function __clone()

+    {

     }
 
     /**
@@ -52,8 +52,8 @@ 
      *
      * @return void
      */
-    private function __wakeup()
-    {
+    private function __wakeup()

+    {

     }
 
     /**
@@ -63,14 +63,14 @@ 
      * @param string $file ключ
      * @return string информация из pathinfo о обрабатываемом файле input
      */
-    private function _pathinfo($file, $mode)
-    {
-        if (!is_scalar($file) && !is_scalar($mode)) {
+    private function _pathinfo($file, $mode)

+    {

+        if (!is_scalar($file) && !is_scalar($mode)) {

             $file = $mode = '';
         }
         $flag = !(empty($file) || empty($mode));
         $f = MODX_BASE_PATH . $this->relativePath($file);
-        if ($flag && !isset($this->_fileInfo[$f], $this->_fileInfo[$f][$mode])) {
+        if ($flag && !isset($this->_fileInfo[$f], $this->_fileInfo[$f][$mode])) {

             $this->_fileInfo[$f] = pathinfo($f);
         }
         $out = $flag && isset($this->_fileInfo[$f][$mode]) ? $this->_fileInfo[$f][$mode] : '';
@@ -82,8 +82,8 @@ 
      * @param $file
      * @return string
      */
-    public function takeFileDir($file)
-    {
+    public function takeFileDir($file)

+    {

         return $this->_pathinfo($file, 'dirname');
     }
 
@@ -91,8 +91,9 @@ 
      * @param $file
      * @return string
      */
-    public function takeFileBasename($file)
-    { //file name with extension
+    public function takeFileBasename($file)

+    {

+//file name with extension
         return $this->_pathinfo($file, 'basename');
     }
 
@@ -100,8 +101,8 @@ 
      * @param $file
      * @return string
      */
-    public function takeFileName($file)
-    {
+    public function takeFileName($file)

+    {

         return $this->_pathinfo($file, 'filename');
     }
 
@@ -110,10 +111,10 @@ 
      * @param bool $lower 
      * @return string
      */
-    public function takeFileExt($file, $lower = true)
-    {
+    public function takeFileExt($file, $lower = true)

+    {

         $str = $this->_pathinfo($file, 'extension');
-        if($lower){
+        if($lower) {

             $str = strtolower($str);
         }
         return $str;
@@ -123,8 +124,8 @@ 
      * @param $file
      * @return bool
      */
-    public function checkFile($file)
-    {
+    public function checkFile($file)

+    {

         $f = is_scalar($file) ? MODX_BASE_PATH . $this->relativePath($file) : '';
 
         return (!empty($f) && is_file($f) && is_readable($f));
@@ -134,8 +135,8 @@ 
      * @param $path
      * @return bool
      */
-    public function checkDir($path)
-    {
+    public function checkDir($path)

+    {

         $f = is_scalar($path) ? $this->relativePath($path) : '';
 
         return (!empty($f) && is_dir(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f));
@@ -146,13 +147,13 @@ 
      * @param bool $format
      * @return int|string
      */
-    public function fileSize($file, $format = false)
-    {
+    public function fileSize($file, $format = false)

+    {

         $out = 0;
-        if ($this->checkFile($file)) {
+        if ($this->checkFile($file)) {

             $out = filesize(MODX_BASE_PATH . $this->relativePath($file));
         }
-        if ($format) {
+        if ($format) {

             $types = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
             $size = $out > 0 ? floor(log($out, 1024)) : 0;
             $out = number_format($out / pow(1024, $size), 2, '.', ',') . ' ' . $types[$size];
@@ -171,17 +172,17 @@ 
      * @param string $file Имя файла
      * @return null|string MIME тип файла
      */
-    public function takeFileMIME($file)
-    {
+    public function takeFileMIME($file)

+    {

         $out = null;
         $path = $this->relativePath($file);
-        if ($this->checkFile($path)) {
+        if ($this->checkFile($path)) {

             $fname = MODX_BASE_PATH . $path;
-            switch (true) {
+            switch (true) {

                 /** need fileinfo extension */
                 case (extension_loaded('fileinfo') && class_exists('\finfo')):
                     $fi = new \finfo(FILEINFO_MIME_TYPE);
-                    if ($fi) {
+                    if ($fi) {

                         $out = $fi->file($fname);
                     }
                     break;
@@ -193,10 +194,10 @@ 
                      * @see: http://www.php.net/manual/ru/function.finfo-open.php#112617
                      */
                     $fh = fopen($fname, 'rb');
-                    if ($fh) {
+                    if ($fh) {

                         $bytes6 = fread($fh, 6);
                         fclose($fh);
-                        switch (true) {
+                        switch (true) {

                             case ($bytes6 === false):
                                 break;
                             case (substr($bytes6, 0, 3) == "\xff\xd8\xff"):
@@ -224,12 +225,12 @@ 
      * @param int $perm
      * @return bool
      */
-    public function makeDir($path, $perm = 0755)
-    {
-        if (!$this->checkDir($path)) {
+    public function makeDir($path, $perm = 0755)

+    {

+        if (!$this->checkDir($path)) {

             $path = MODX_BASE_PATH . $this->relativePath($path);
             $flag = mkdir($path, $this->toOct($perm), true);
-        } else {
+        } else {

             $flag = true;
         }
 
@@ -243,13 +244,13 @@ 
      * @param string $to получатель
      * @return bool статус копирования
      */
-    public function copyFile($from, $to, $chmod = 0644)
-    {
+    public function copyFile($from, $to, $chmod = 0644)

+    {

         $flag = false;
         $from = MODX_BASE_PATH . $this->relativePath($from);
         $to = MODX_BASE_PATH . $this->relativePath($to);
         $dir = $this->takeFileDir($to);
-        if ($this->checkFile($from) && $this->makeDir($dir) && copy($from, $to)) {
+        if ($this->checkFile($from) && $this->makeDir($dir) && copy($from, $to)) {

             chmod($to, $this->toOct($chmod));
             $flag = true;
         }
@@ -264,13 +265,13 @@ 
      * @param string $to получатель
      * @return bool статус перемещения
      */
-    public function moveFile($from, $to, $chmod = 0644)
-    {
+    public function moveFile($from, $to, $chmod = 0644)

+    {

         $flag = false;
         $from = MODX_BASE_PATH . $this->relativePath($from);
         $to = MODX_BASE_PATH . $this->relativePath($to);
         $dir = $this->takeFileDir($to);
-        if ($this->checkFile($from) && $this->makeDir($dir) && rename($from, $to)) {
+        if ($this->checkFile($from) && $this->makeDir($dir) && rename($from, $to)) {

             chmod($to, $this->toOct($chmod));
             $flag = true;
         }
@@ -285,15 +286,15 @@ 
      * @param string $owner начальный путь который стоит вырезать
      * @return string относительный путь
      */
-    public function relativePath($path, $owner = null)
-    {
-        if (is_null($owner)) {
+    public function relativePath($path, $owner = null)

+    {

+        if (is_null($owner)) {

             $owner = MODX_BASE_PATH;
         }
         $path = str_replace('\\', '/', $path);
-        if (!(empty($path) || !is_scalar($path)) && !preg_match("/^http(s)?:\/\/\w+/", $path)) {
+        if (!(empty($path) || !is_scalar($path)) && !preg_match("/^http(s)?:\/\/\w+/", $path)) {

             $path = trim(preg_replace("#^" . preg_quote($owner) . "#", '', $path), DIRECTORY_SEPARATOR);
-        } else {
+        } else {

             $path = '';
         }
 
@@ -312,8 +313,8 @@ 
      * @param  mixed $chmod строка или число в восьмеричной/десятичной системе счисления
      * @return int        число в восьмеричной системе счисления
      */
-    public function toOct($chmod)
-    {
+    public function toOct($chmod)

+    {

         return is_string($chmod) ? octdec($chmod) : $chmod;
     }
 
@@ -321,15 +322,15 @@ 
      * @param $dirPath
      * @return bool
      */
-    public function rmDir($dirPath)
-    {
+    public function rmDir($dirPath)

+    {

         $flag = false;
         $path = $_path = MODX_BASE_PATH . $this->relativePath($dirPath);
-        if ($this->checkDir($path)) {
+        if ($this->checkDir($path)) {

             $dirIterator = new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS);
             $dirRecursiveIterator = new \RecursiveIteratorIterator($dirIterator,
                 \RecursiveIteratorIterator::CHILD_FIRST);
-            foreach ($dirRecursiveIterator as $path) {
+            foreach ($dirRecursiveIterator as $path) {

                 $path->isDir() ? rmdir($path->getPathname()) : unlink($path->getPathname());
             }
             $flag = rmdir($_path);
@@ -342,10 +343,10 @@ 
      * @param $file
      * @return bool
      */
-    public function unlink($file)
-    {
+    public function unlink($file)

+    {

         $flag = false;
-        if ($this->checkFile($file)) {
+        if ($this->checkFile($file)) {

             $flag = unlink(MODX_BASE_PATH . $this->relativePath($file));
         }
 
@@ -356,10 +357,10 @@ 
      * @param $path
      * @return bool
      */
-    public function delete($path)
-    {
+    public function delete($path)

+    {

         $path = MODX_BASE_PATH . $this->relativePath($path);
-        switch (true) {
+        switch (true) {

             case $this->checkDir($path):
                 $flag = $this->rmDir($path);
                 break;
@@ -378,11 +379,11 @@ 
      * @param bool $full
      * @return string
      */
-    public function getInexistantFilename($file, $full = false)
-    {
+    public function getInexistantFilename($file, $full = false)

+    {

         $i = 1;
         $file = $mainFile = MODX_BASE_PATH . $this->relativePath($file);
-        while ($this->checkFile($file)) {
+        while ($this->checkFile($file)) {

             $i++;
             $out = $this->takeFileDir($file) . '/';
             $out .= $this->takeFileName($mainFile) . "({$i})." . $this->takeFileExt($file);