o2system / filesystem

src/Handlers/Ftp.php

Spacing +8 added lines, -8 removed lines

@@ -72,10 +72,10 @@ 
         $this->setConfig($config);

 

         // Prep the port

-        $this->config[ 'port' ] = empty($this->config[ 'port' ]) ? 21 : (int)$this->config[ 'port' ];

+        $this->config['port'] = empty($this->config['port']) ? 21 : (int)$this->config['port'];

 

         // Prep the hostname

-        $this->config[ 'hostname' ] = preg_replace('|.+?://|', '', $this->config[ 'hostname' ]);

+        $this->config['hostname'] = preg_replace('|.+?://|', '', $this->config['hostname']);

 

         language()

             ->addFilePath(str_replace('Handlers', '', __DIR__) . DIRECTORY_SEPARATOR)

@@ -94,7 +94,7 @@ 
      */

     public function connect()

     {

-        if (false === ($this->handle = @ftp_connect($this->config[ 'hostname' ], $this->config[ 'port' ]))) {

+        if (false === ($this->handle = @ftp_connect($this->config['hostname'], $this->config['port']))) {

             if ($this->debugMode === true) {

                 throw new RuntimeException('FTP_E_UNABLE_TO_CONNECT');

             }

@@ -104,7 +104,7 @@ 
             return false;

         }

 

-        if (false !== (@ftp_login($this->handle, $this->config[ 'username' ], $this->config[ 'password' ]))) {

+        if (false !== (@ftp_login($this->handle, $this->config['username'], $this->config['password']))) {

             if ($this->debugMode === true) {

                 throw new RuntimeException('FTP_E_UNABLE_TO_LOGIN');

             }

@@ -359,8 +359,8 @@ 
             for ($i = 0, $c = count($list); $i < $c; $i++) {

                 // If we can't delete the item it's probaly a directory,

                 // so we'll recursively call delete_dir()

-                if ( ! preg_match('#/\.\.?$#', $list[ $i ]) && ! @ftp_delete($this->handle, $list[ $i ])) {

-                    $this->deleteDir($list[ $i ]);

+                if ( ! preg_match('#/\.\.?$#', $list[$i]) && ! @ftp_delete($this->handle, $list[$i])) {

+                    $this->deleteDir($list[$i]);

                 }

             }

         }

@@ -433,9 +433,9 @@ 
 

             // Recursively read the local directory

             while (false !== ($file = readdir($fp))) {

-                if (is_dir($localPath . $file) && $file[ 0 ] !== '.') {

+                if (is_dir($localPath . $file) && $file[0] !== '.') {

                     $this->mirror($localPath . $file . '/', $remotePath . $file . '/');

-                } elseif ($file[ 0 ] !== '.') {

+                } elseif ($file[0] !== '.') {

                     // Get the file extension so we can se the upload type

                     $ext = $this->getExtension($file);

                     $mode = $this->getTransferMode($ext);

src/Handlers/Downloader.php

Spacing +13 added lines, -13 removed lines

@@ -191,7 +191,7 @@ 
             }
 
             $this->filesize = strlen($this->filedata);
-            $this->filemime = mime_content_type($this->fileinfo[ 'filename' ]);
+            $this->filemime = mime_content_type($this->fileinfo['filename']);
             $this->lastModified = time();
 
         } else {
@@ -201,9 +201,9 @@ 
         }
 
         // Range
-        if (isset($_SERVER[ 'HTTP_RANGE' ]) || isset($HTTP_SERVER_VARS[ 'HTTP_RANGE' ])) {
+        if (isset($_SERVER['HTTP_RANGE']) || isset($HTTP_SERVER_VARS['HTTP_RANGE'])) {
             $this->partialRequest = true;
-            $http_range = isset($_SERVER[ 'HTTP_RANGE' ]) ? $_SERVER[ 'HTTP_RANGE' ] : $HTTP_SERVER_VARS[ 'HTTP_RANGE' ];
+            $http_range = isset($_SERVER['HTTP_RANGE']) ? $_SERVER['HTTP_RANGE'] : $HTTP_SERVER_VARS['HTTP_RANGE'];
             if (stripos($http_range, 'bytes') === false) {
                 output()
                     ->withStatus(416, 'Requested Range Not Satisfiable')
@@ -212,8 +212,8 @@ 
 
             $range = substr($http_range, strlen('bytes='));
             $range = explode('-', $range, 3);
-            $this->seekStart = ($range[ 0 ] > 0 && $range[ 0 ] < $this->filesize - 1) ? $range[ 0 ] : 0;
-            $this->seekEnd = ($range[ 1 ] > 0 && $range[ 1 ] < $this->filesize && $range[ 1 ] > $this->seekStart) ? $range[ 1 ] : $this->filesize - 1;
+            $this->seekStart = ($range[0] > 0 && $range[0] < $this->filesize - 1) ? $range[0] : 0;
+            $this->seekEnd = ($range[1] > 0 && $range[1] < $this->filesize && $range[1] > $this->seekStart) ? $range[1] : $this->filesize - 1;
             $this->seekFileSize = $this->seekEnd - $this->seekStart + 1;
         } else {
             $this->partialRequest = false;
@@ -247,7 +247,7 @@ 
      */
     public function download($filename = null)
     {
-        $filename = isset($filename) ? $filename : $this->fileinfo[ 'basename' ];
+        $filename = isset($filename) ? $filename : $this->fileinfo['basename'];
 
         if ($this->partialRequest) {
             if ($this->resumeable) {
@@ -278,7 +278,7 @@ 
         // Work On Download Speed Limit
         if ($this->speedLimit) {
             // how many buffers ticks per second
-            $bufferTicks = 10;    //10
+            $bufferTicks = 10; //10
             // how long one buffering tick takes by micro second
             $bufferMicroTime = 150; // 100
             // Calculate sleep micro time after each tick
@@ -309,17 +309,17 @@ 
                 if ($downloadFileBytes > $this->bufferSize) {
                     // send buffer size
                     echo fread($this->filedata, $this->bufferSize); // this also will seek to after last read byte
-                    $downloaded += $this->bufferSize;    // updated downloaded
-                    $downloadFileBytes -= $this->bufferSize;    // update remaining bytes
+                    $downloaded += $this->bufferSize; // updated downloaded
+                    $downloadFileBytes -= $this->bufferSize; // update remaining bytes
                 } else {
                     // send required size
                     // this will happens when we reaches the end of the file normally we wll download remaining bytes
-                    echo fread($this->filedata, $downloadFileBytes);    // this also will seek to last reat
+                    echo fread($this->filedata, $downloadFileBytes); // this also will seek to last reat
 
-                    $downloaded += $downloadFileBytes;    // Add to downloaded
+                    $downloaded += $downloadFileBytes; // Add to downloaded
 
 
-                    $downloadFileBytes = 0;    // Here last bytes have been written
+                    $downloadFileBytes = 0; // Here last bytes have been written
                 }
                 // send to buffer
                 flush();
@@ -382,7 +382,7 @@ 
      */
     public function resumeable($status = true)
     {
-        $this->partialRequest = $this->resumeable = ( bool )$status;
+        $this->partialRequest = $this->resumeable = (bool)$status;
 
         return $this;
     }