Completed
Push — 2.x ( 68308b...d4db0b )
by Naoki
05:34
created
php/elFinderVolumeLocalFileSystem.class.php 1 patch
Doc Comments   +7 added lines, -8 removed lines patch added patch discarded remove patch
@@ -593,7 +593,6 @@  discard block
 block discarded – undo
593 593
 	 * Open file and return file pointer
594 594
 	 *
595 595
 	 * @param  string  $path  file path
596
-	 * @param  bool    $write open file for writing
597 596
 	 * @return resource|false
598 597
 	 * @author Dmitry (dio) Levashov
599 598
 	 **/
@@ -619,7 +618,7 @@  discard block
 block discarded – undo
619 618
 	 *
620 619
 	 * @param  string  $path  parent dir path
621 620
 	 * @param string  $name  new directory name
622
-	 * @return string|bool
621
+	 * @return string|false
623 622
 	 * @author Dmitry (dio) Levashov
624 623
 	 **/
625 624
 	protected function _mkdir($path, $name) {
@@ -639,7 +638,7 @@  discard block
 block discarded – undo
639 638
 	 *
640 639
 	 * @param  string  $path  parent dir path
641 640
 	 * @param string  $name  new file name
642
-	 * @return string|bool
641
+	 * @return string|false
643 642
 	 * @author Dmitry (dio) Levashov
644 643
 	 **/
645 644
 	protected function _mkfile($path, $name) {
@@ -687,9 +686,9 @@  discard block
 block discarded – undo
687 686
 	 * Return new file path or false.
688 687
 	 *
689 688
 	 * @param  string  $source  source file path
690
-	 * @param  string  $target  target dir path
689
+	 * @param  string  $targetDir  target dir path
691 690
 	 * @param  string  $name    file name
692
-	 * @return string|bool
691
+	 * @return string|false
693 692
 	 * @author Dmitry (dio) Levashov
694 693
 	 **/
695 694
 	protected function _move($source, $targetDir, $name) {
@@ -733,7 +732,7 @@  discard block
 block discarded – undo
733 732
 	 * @param  string    $dir  target dir path
734 733
 	 * @param  string    $name file name
735 734
 	 * @param  array     $stat file stat (required by some virtual fs)
736
-	 * @return bool|string
735
+	 * @return false|string
737 736
 	 * @author Dmitry (dio) Levashov
738 737
 	 **/
739 738
 	protected function _save($fp, $dir, $name, $stat) {
@@ -761,7 +760,7 @@  discard block
 block discarded – undo
761 760
 	 * Get file contents
762 761
 	 *
763 762
 	 * @param  string  $path  file path
764
-	 * @return string|false
763
+	 * @return string
765 764
 	 * @author Dmitry (dio) Levashov
766 765
 	 **/
767 766
 	protected function _getContents($path) {
@@ -965,7 +964,7 @@  discard block
 block discarded – undo
965 964
 	 * @param  array   $files  files names list
966 965
 	 * @param  string  $name   archive name
967 966
 	 * @param  array   $arc    archiver options
968
-	 * @return string|bool
967
+	 * @return string|false
969 968
 	 * @author Dmitry (dio) Levashov, 
970 969
 	 * @author Alexey Sukhotin
971 970
 	 **/
Please login to merge, or discard this patch.
php/elFinderVolumeDriver.class.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -200,11 +200,11 @@  discard block
 block discarded – undo
200 200
 		'mimefile'        => '',
201 201
 		// mime type normalize map : Array '[ext]:[detected mime type]' => '[normalized mime]'
202 202
 		'mimeMap'         => array(
203
-		                     'md:application/x-genesis-rom' => 'text/x-markdown',
204
-		                     'md:text/plain'                => 'text/x-markdown',
205
-		                     'markdown:text/plain'          => 'text/x-markdown',
206
-		                     'css:text/x-asm'               => 'text/css'
207
-		                    ),
203
+							 'md:application/x-genesis-rom' => 'text/x-markdown',
204
+							 'md:text/plain'                => 'text/x-markdown',
205
+							 'markdown:text/plain'          => 'text/x-markdown',
206
+							 'css:text/x-asm'               => 'text/css'
207
+							),
208 208
 		// directory for thumbnails
209 209
 		'tmbPath'         => '.tmb',
210 210
 		// mode to create thumbnails dir
@@ -4070,14 +4070,14 @@  discard block
 block discarded – undo
4070 4070
 	// }
4071 4071
 
4072 4072
 	/**
4073
-	* Find position of first occurrence of string in a string with multibyte support
4074
-	*
4075
-	* @param  string  $haystack  The string being checked.
4076
-	* @param  string  $needle    The string to find in haystack.
4077
-	* @param  int     $offset    The search offset. If it is not specified, 0 is used.
4078
-	* @return int|bool
4079
-	* @author Alexey Sukhotin
4080
-	**/
4073
+	 * Find position of first occurrence of string in a string with multibyte support
4074
+	 *
4075
+	 * @param  string  $haystack  The string being checked.
4076
+	 * @param  string  $needle    The string to find in haystack.
4077
+	 * @param  int     $offset    The search offset. If it is not specified, 0 is used.
4078
+	 * @return int|bool
4079
+	 * @author Alexey Sukhotin
4080
+	 **/
4081 4081
 	protected function stripos($haystack , $needle , $offset = 0) {
4082 4082
 		if (function_exists('mb_stripos')) {
4083 4083
 			return mb_stripos($haystack , $needle , $offset);
Please login to merge, or discard this patch.