nextcloud / server

lib/private/legacy/template/functions.php

Doc Comments +2 added lines, -1 removed lines

@@ -183,7 +183,7 @@ 
  * make preview_icon available as a simple function
  * Returns the path to the preview of the image.
  * @param string $path path of file
- * @return link to the preview
+ * @return string to the preview
  */
 function preview_icon( $path ) {
 	return \OC::$server->getURLGenerator()->linkToRoute('core.Preview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path]);
@@ -191,6 +191,7 @@ 
 
 /**
  * @param string $path
+ * @param string $token
  */
 function publicPreview_icon ( $path, $token ) {
 	return \OC::$server->getURLGenerator()->linkToRoute('files_sharing.PublicPreview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path, 't' => $token]);

Indentation +81 added lines, -81 removed lines

@@ -34,7 +34,7 @@ 
  * @param string $string the string which will be escaped and printed
  */
 function p($string) {
-	print(\OCP\Util::sanitizeHTML($string));
+    print(\OCP\Util::sanitizeHTML($string));
 }
 
 /**
@@ -43,7 +43,7 @@ 
  * @param string|array $string the string which will be printed as it is
  */
 function print_unescaped($string) {
-	print($string);
+    print($string);
 }
 
 /**
@@ -53,13 +53,13 @@ 
  * if an array is given it will add all scripts
  */
 function script($app, $file = null) {
-	if(is_array($file)) {
-		foreach($file as $f) {
-			OC_Util::addScript($app, $f);
-		}
-	} else {
-		OC_Util::addScript($app, $file);
-	}
+    if(is_array($file)) {
+        foreach($file as $f) {
+            OC_Util::addScript($app, $f);
+        }
+    } else {
+        OC_Util::addScript($app, $file);
+    }
 }
 
 /**
@@ -69,13 +69,13 @@ 
  * if an array is given it will add all scripts
  */
 function vendor_script($app, $file = null) {
-	if(is_array($file)) {
-		foreach($file as $f) {
-			OC_Util::addVendorScript($app, $f);
-		}
-	} else {
-		OC_Util::addVendorScript($app, $file);
-	}
+    if(is_array($file)) {
+        foreach($file as $f) {
+            OC_Util::addVendorScript($app, $f);
+        }
+    } else {
+        OC_Util::addVendorScript($app, $file);
+    }
 }
 
 /**
@@ -85,13 +85,13 @@ 
  * if an array is given it will add all styles
  */
 function style($app, $file = null) {
-	if(is_array($file)) {
-		foreach($file as $f) {
-			OC_Util::addStyle($app, $f);
-		}
-	} else {
-		OC_Util::addStyle($app, $file);
-	}
+    if(is_array($file)) {
+        foreach($file as $f) {
+            OC_Util::addStyle($app, $f);
+        }
+    } else {
+        OC_Util::addStyle($app, $file);
+    }
 }
 
 /**
@@ -101,13 +101,13 @@ 
  * if an array is given it will add all styles
  */
 function vendor_style($app, $file = null) {
-	if(is_array($file)) {
-		foreach($file as $f) {
-			OC_Util::addVendorStyle($app, $f);
-		}
-	} else {
-		OC_Util::addVendorStyle($app, $file);
-	}
+    if(is_array($file)) {
+        foreach($file as $f) {
+            OC_Util::addVendorStyle($app, $f);
+        }
+    } else {
+        OC_Util::addVendorStyle($app, $file);
+    }
 }
 
 /**
@@ -116,7 +116,7 @@ 
  * if an array is given it will add all styles
  */
 function translation($app) {
-	OC_Util::addTranslations($app);
+    OC_Util::addTranslations($app);
 }
 
 /**
@@ -126,15 +126,15 @@ 
  * if an array is given it will add all components
  */
 function component($app, $file) {
-	if(is_array($file)) {
-		foreach($file as $f) {
-			$url = link_to($app, 'component/' . $f . '.html');
-			OC_Util::addHeader('link', array('rel' => 'import', 'href' => $url));
-		}
-	} else {
-		$url = link_to($app, 'component/' . $file . '.html');
-		OC_Util::addHeader('link', array('rel' => 'import', 'href' => $url));
-	}
+    if(is_array($file)) {
+        foreach($file as $f) {
+            $url = link_to($app, 'component/' . $f . '.html');
+            OC_Util::addHeader('link', array('rel' => 'import', 'href' => $url));
+        }
+    } else {
+        $url = link_to($app, 'component/' . $file . '.html');
+        OC_Util::addHeader('link', array('rel' => 'import', 'href' => $url));
+    }
 }
 
 /**
@@ -147,7 +147,7 @@ 
  * For further information have a look at \OCP\IURLGenerator::linkTo
  */
 function link_to( $app, $file, $args = array() ) {
-	return \OC::$server->getURLGenerator()->linkTo($app, $file, $args);
+    return \OC::$server->getURLGenerator()->linkTo($app, $file, $args);
 }
 
 /**
@@ -155,7 +155,7 @@ 
  * @return string url to the online documentation
  */
 function link_to_docs($key) {
-	return \OC::$server->getURLGenerator()->linkToDocs($key);
+    return \OC::$server->getURLGenerator()->linkToDocs($key);
 }
 
 /**
@@ -167,7 +167,7 @@ 
  * For further information have a look at \OCP\IURLGenerator::imagePath
  */
 function image_path( $app, $image ) {
-	return \OC::$server->getURLGenerator()->imagePath( $app, $image );
+    return \OC::$server->getURLGenerator()->imagePath( $app, $image );
 }
 
 /**
@@ -176,7 +176,7 @@ 
  * @return string link to the image
  */
 function mimetype_icon( $mimetype ) {
-	return \OC::$server->getMimeTypeDetector()->mimeTypeIcon( $mimetype );
+    return \OC::$server->getMimeTypeDetector()->mimeTypeIcon( $mimetype );
 }
 
 /**
@@ -186,14 +186,14 @@ 
  * @return link to the preview
  */
 function preview_icon( $path ) {
-	return \OC::$server->getURLGenerator()->linkToRoute('core.Preview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path]);
+    return \OC::$server->getURLGenerator()->linkToRoute('core.Preview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path]);
 }
 
 /**
  * @param string $path
  */
 function publicPreview_icon ( $path, $token ) {
-	return \OC::$server->getURLGenerator()->linkToRoute('files_sharing.PublicPreview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path, 't' => $token]);
+    return \OC::$server->getURLGenerator()->linkToRoute('files_sharing.PublicPreview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path, 't' => $token]);
 }
 
 /**
@@ -204,7 +204,7 @@ 
  * For further information have a look at OC_Helper::humanFileSize
  */
 function human_file_size( $bytes ) {
-	return OC_Helper::humanFileSize( $bytes );
+    return OC_Helper::humanFileSize( $bytes );
 }
 
 /**
@@ -213,9 +213,9 @@ 
  * @return $timestamp without time value
  */
 function strip_time($timestamp){
-	$date = new \DateTime("@{$timestamp}");
-	$date->setTime(0, 0, 0);
-	return intval($date->format('U'));
+    $date = new \DateTime("@{$timestamp}");
+    $date->setTime(0, 0, 0);
+    return intval($date->format('U'));
 }
 
 /**
@@ -227,39 +227,39 @@ 
  * @return string timestamp
  */
 function relative_modified_date($timestamp, $fromTime = null, $dateOnly = false) {
-	/** @var \OC\DateTimeFormatter $formatter */
-	$formatter = \OC::$server->query('DateTimeFormatter');
+    /** @var \OC\DateTimeFormatter $formatter */
+    $formatter = \OC::$server->query('DateTimeFormatter');
 
-	if ($dateOnly){
-		return $formatter->formatDateSpan($timestamp, $fromTime);
-	}
-	return $formatter->formatTimeSpan($timestamp, $fromTime);
+    if ($dateOnly){
+        return $formatter->formatDateSpan($timestamp, $fromTime);
+    }
+    return $formatter->formatTimeSpan($timestamp, $fromTime);
 }
 
 function html_select_options($options, $selected, $params=array()) {
-	if (!is_array($selected)) {
-		$selected=array($selected);
-	}
-	if (isset($params['combine']) && $params['combine']) {
-		$options = array_combine($options, $options);
-	}
-	$value_name = $label_name = false;
-	if (isset($params['value'])) {
-		$value_name = $params['value'];
-	}
-	if (isset($params['label'])) {
-		$label_name = $params['label'];
-	}
-	$html = '';
-	foreach($options as $value => $label) {
-		if ($value_name && is_array($label)) {
-			$value = $label[$value_name];
-		}
-		if ($label_name && is_array($label)) {
-			$label = $label[$label_name];
-		}
-		$select = in_array($value, $selected) ? ' selected="selected"' : '';
-		$html .= '<option value="' . \OCP\Util::sanitizeHTML($value) . '"' . $select . '>' . \OCP\Util::sanitizeHTML($label) . '</option>'."\n";
-	}
-	return $html;
+    if (!is_array($selected)) {
+        $selected=array($selected);
+    }
+    if (isset($params['combine']) && $params['combine']) {
+        $options = array_combine($options, $options);
+    }
+    $value_name = $label_name = false;
+    if (isset($params['value'])) {
+        $value_name = $params['value'];
+    }
+    if (isset($params['label'])) {
+        $label_name = $params['label'];
+    }
+    $html = '';
+    foreach($options as $value => $label) {
+        if ($value_name && is_array($label)) {
+            $value = $label[$value_name];
+        }
+        if ($label_name && is_array($label)) {
+            $label = $label[$label_name];
+        }
+        $select = in_array($value, $selected) ? ' selected="selected"' : '';
+        $html .= '<option value="' . \OCP\Util::sanitizeHTML($value) . '"' . $select . '>' . \OCP\Util::sanitizeHTML($label) . '</option>'."\n";
+    }
+    return $html;
 }

Spacing +27 added lines, -27 removed lines

@@ -53,8 +53,8 @@ 
  * if an array is given it will add all scripts
  */
 function script($app, $file = null) {
-	if(is_array($file)) {
-		foreach($file as $f) {
+	if (is_array($file)) {
+		foreach ($file as $f) {
 			OC_Util::addScript($app, $f);
 		}
 	} else {
@@ -69,8 +69,8 @@ 
  * if an array is given it will add all scripts
  */
 function vendor_script($app, $file = null) {
-	if(is_array($file)) {
-		foreach($file as $f) {
+	if (is_array($file)) {
+		foreach ($file as $f) {
 			OC_Util::addVendorScript($app, $f);
 		}
 	} else {
@@ -85,8 +85,8 @@ 
  * if an array is given it will add all styles
  */
 function style($app, $file = null) {
-	if(is_array($file)) {
-		foreach($file as $f) {
+	if (is_array($file)) {
+		foreach ($file as $f) {
 			OC_Util::addStyle($app, $f);
 		}
 	} else {
@@ -101,8 +101,8 @@ 
  * if an array is given it will add all styles
  */
 function vendor_style($app, $file = null) {
-	if(is_array($file)) {
-		foreach($file as $f) {
+	if (is_array($file)) {
+		foreach ($file as $f) {
 			OC_Util::addVendorStyle($app, $f);
 		}
 	} else {
@@ -126,13 +126,13 @@ 
  * if an array is given it will add all components
  */
 function component($app, $file) {
-	if(is_array($file)) {
-		foreach($file as $f) {
-			$url = link_to($app, 'component/' . $f . '.html');
+	if (is_array($file)) {
+		foreach ($file as $f) {
+			$url = link_to($app, 'component/'.$f.'.html');
 			OC_Util::addHeader('link', array('rel' => 'import', 'href' => $url));
 		}
 	} else {
-		$url = link_to($app, 'component/' . $file . '.html');
+		$url = link_to($app, 'component/'.$file.'.html');
 		OC_Util::addHeader('link', array('rel' => 'import', 'href' => $url));
 	}
 }
@@ -146,7 +146,7 @@ 
  *
  * For further information have a look at \OCP\IURLGenerator::linkTo
  */
-function link_to( $app, $file, $args = array() ) {
+function link_to($app, $file, $args = array()) {
 	return \OC::$server->getURLGenerator()->linkTo($app, $file, $args);
 }
 
@@ -166,8 +166,8 @@ 
  *
  * For further information have a look at \OCP\IURLGenerator::imagePath
  */
-function image_path( $app, $image ) {
-	return \OC::$server->getURLGenerator()->imagePath( $app, $image );
+function image_path($app, $image) {
+	return \OC::$server->getURLGenerator()->imagePath($app, $image);
 }
 
 /**
@@ -175,8 +175,8 @@ 
  * @param string $mimetype mimetype
  * @return string link to the image
  */
-function mimetype_icon( $mimetype ) {
-	return \OC::$server->getMimeTypeDetector()->mimeTypeIcon( $mimetype );
+function mimetype_icon($mimetype) {
+	return \OC::$server->getMimeTypeDetector()->mimeTypeIcon($mimetype);
 }
 
 /**
@@ -185,14 +185,14 @@ 
  * @param string $path path of file
  * @return link to the preview
  */
-function preview_icon( $path ) {
+function preview_icon($path) {
 	return \OC::$server->getURLGenerator()->linkToRoute('core.Preview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path]);
 }
 
 /**
  * @param string $path
  */
-function publicPreview_icon ( $path, $token ) {
+function publicPreview_icon($path, $token) {
 	return \OC::$server->getURLGenerator()->linkToRoute('files_sharing.PublicPreview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path, 't' => $token]);
 }
 
@@ -203,8 +203,8 @@ 
  *
  * For further information have a look at OC_Helper::humanFileSize
  */
-function human_file_size( $bytes ) {
-	return OC_Helper::humanFileSize( $bytes );
+function human_file_size($bytes) {
+	return OC_Helper::humanFileSize($bytes);
 }
 
 /**
@@ -212,7 +212,7 @@ 
  * @param int $timestamp UNIX timestamp to strip
  * @return $timestamp without time value
  */
-function strip_time($timestamp){
+function strip_time($timestamp) {
 	$date = new \DateTime("@{$timestamp}");
 	$date->setTime(0, 0, 0);
 	return intval($date->format('U'));
@@ -230,15 +230,15 @@ 
 	/** @var \OC\DateTimeFormatter $formatter */
 	$formatter = \OC::$server->query('DateTimeFormatter');
 
-	if ($dateOnly){
+	if ($dateOnly) {
 		return $formatter->formatDateSpan($timestamp, $fromTime);
 	}
 	return $formatter->formatTimeSpan($timestamp, $fromTime);
 }
 
-function html_select_options($options, $selected, $params=array()) {
+function html_select_options($options, $selected, $params = array()) {
 	if (!is_array($selected)) {
-		$selected=array($selected);
+		$selected = array($selected);
 	}
 	if (isset($params['combine']) && $params['combine']) {
 		$options = array_combine($options, $options);
@@ -251,7 +251,7 @@ 
 		$label_name = $params['label'];
 	}
 	$html = '';
-	foreach($options as $value => $label) {
+	foreach ($options as $value => $label) {
 		if ($value_name && is_array($label)) {
 			$value = $label[$value_name];
 		}
@@ -259,7 +259,7 @@ 
 			$label = $label[$label_name];
 		}
 		$select = in_array($value, $selected) ? ' selected="selected"' : '';
-		$html .= '<option value="' . \OCP\Util::sanitizeHTML($value) . '"' . $select . '>' . \OCP\Util::sanitizeHTML($label) . '</option>'."\n";
+		$html .= '<option value="'.\OCP\Util::sanitizeHTML($value).'"'.$select.'>'.\OCP\Util::sanitizeHTML($label).'</option>'."\n";
 	}
 	return $html;
 }

lib/private/Memcache/APCu.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 	 * Set a value in the cache if it's not already stored
 	 *
 	 * @param string $key
-	 * @param mixed $value
+	 * @param integer $value
 	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
 	 * @return bool
 	 */

Indentation +125 added lines, -125 removed lines

@@ -30,140 +30,140 @@
 use OCP\IMemcache;
 
 class APCu extends Cache implements IMemcache {
-	use CASTrait {
-		cas as casEmulated;
-	}
+    use CASTrait {
+        cas as casEmulated;
+    }
 
-	use CADTrait;
+    use CADTrait;
 
-	public function get($key) {
-		$result = apcu_fetch($this->getPrefix() . $key, $success);
-		if (!$success) {
-			return null;
-		}
-		return $result;
-	}
+    public function get($key) {
+        $result = apcu_fetch($this->getPrefix() . $key, $success);
+        if (!$success) {
+            return null;
+        }
+        return $result;
+    }
 
-	public function set($key, $value, $ttl = 0) {
-		return apcu_store($this->getPrefix() . $key, $value, $ttl);
-	}
+    public function set($key, $value, $ttl = 0) {
+        return apcu_store($this->getPrefix() . $key, $value, $ttl);
+    }
 
-	public function hasKey($key) {
-		return apcu_exists($this->getPrefix() . $key);
-	}
+    public function hasKey($key) {
+        return apcu_exists($this->getPrefix() . $key);
+    }
 
-	public function remove($key) {
-		return apcu_delete($this->getPrefix() . $key);
-	}
+    public function remove($key) {
+        return apcu_delete($this->getPrefix() . $key);
+    }
 
-	public function clear($prefix = '') {
-		$ns = $this->getPrefix() . $prefix;
-		$ns = preg_quote($ns, '/');
-		if(class_exists('\APCIterator')) {
-			$iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
-		} else {
-			$iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
-		}
-		return apcu_delete($iter);
-	}
+    public function clear($prefix = '') {
+        $ns = $this->getPrefix() . $prefix;
+        $ns = preg_quote($ns, '/');
+        if(class_exists('\APCIterator')) {
+            $iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
+        } else {
+            $iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
+        }
+        return apcu_delete($iter);
+    }
 
-	/**
-	 * Set a value in the cache if it's not already stored
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
-	 * @return bool
-	 */
-	public function add($key, $value, $ttl = 0) {
-		return apcu_add($this->getPrefix() . $key, $value, $ttl);
-	}
+    /**
+     * Set a value in the cache if it's not already stored
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+     * @return bool
+     */
+    public function add($key, $value, $ttl = 0) {
+        return apcu_add($this->getPrefix() . $key, $value, $ttl);
+    }
 
-	/**
-	 * Increase a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function inc($key, $step = 1) {
-		$this->add($key, 0);
-		/**
-		 * TODO - hack around a PHP 7 specific issue in APCu
-		 *
-		 * on PHP 7 the apcu_inc method on a non-existing object will increment
-		 * "0" and result in "1" as value - therefore we check for existence
-		 * first
-		 *
-		 * on PHP 5.6 this is not the case
-		 *
-		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
-		 * for details
-		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_inc($this->getPrefix() . $key, $step)
-			: false;
-	}
+    /**
+     * Increase a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function inc($key, $step = 1) {
+        $this->add($key, 0);
+        /**
+         * TODO - hack around a PHP 7 specific issue in APCu
+         *
+         * on PHP 7 the apcu_inc method on a non-existing object will increment
+         * "0" and result in "1" as value - therefore we check for existence
+         * first
+         *
+         * on PHP 5.6 this is not the case
+         *
+         * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
+         * for details
+         */
+        return apcu_exists($this->getPrefix() . $key)
+            ? apcu_inc($this->getPrefix() . $key, $step)
+            : false;
+    }
 
-	/**
-	 * Decrease a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function dec($key, $step = 1) {
-		/**
-		 * TODO - hack around a PHP 7 specific issue in APCu
-		 *
-		 * on PHP 7 the apcu_dec method on a non-existing object will decrement
-		 * "0" and result in "-1" as value - therefore we check for existence
-		 * first
-		 *
-		 * on PHP 5.6 this is not the case
-		 *
-		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
-		 * for details
-		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_dec($this->getPrefix() . $key, $step)
-			: false;
-	}
+    /**
+     * Decrease a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function dec($key, $step = 1) {
+        /**
+         * TODO - hack around a PHP 7 specific issue in APCu
+         *
+         * on PHP 7 the apcu_dec method on a non-existing object will decrement
+         * "0" and result in "-1" as value - therefore we check for existence
+         * first
+         *
+         * on PHP 5.6 this is not the case
+         *
+         * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
+         * for details
+         */
+        return apcu_exists($this->getPrefix() . $key)
+            ? apcu_dec($this->getPrefix() . $key, $step)
+            : false;
+    }
 
-	/**
-	 * Compare and set
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @param mixed $new
-	 * @return bool
-	 */
-	public function cas($key, $old, $new) {
-		// apc only does cas for ints
-		if (is_int($old) and is_int($new)) {
-			return apcu_cas($this->getPrefix() . $key, $old, $new);
-		} else {
-			return $this->casEmulated($key, $old, $new);
-		}
-	}
+    /**
+     * Compare and set
+     *
+     * @param string $key
+     * @param mixed $old
+     * @param mixed $new
+     * @return bool
+     */
+    public function cas($key, $old, $new) {
+        // apc only does cas for ints
+        if (is_int($old) and is_int($new)) {
+            return apcu_cas($this->getPrefix() . $key, $old, $new);
+        } else {
+            return $this->casEmulated($key, $old, $new);
+        }
+    }
 
-	/**
-	 * @return bool
-	 */
-	static public function isAvailable() {
-		if (!extension_loaded('apcu')) {
-			return false;
-		} elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) {
-			return false;
-		} elseif (!\OC::$server->getIniWrapper()->getBool('apc.enable_cli') && \OC::$CLI) {
-			return false;
-		} elseif (
-				version_compare(phpversion('apc'), '4.0.6') === -1 &&
-				version_compare(phpversion('apcu'), '5.1.0') === -1
-		) {
-			return false;
-		} else {
-			return true;
-		}
-	}
+    /**
+     * @return bool
+     */
+    static public function isAvailable() {
+        if (!extension_loaded('apcu')) {
+            return false;
+        } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) {
+            return false;
+        } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enable_cli') && \OC::$CLI) {
+            return false;
+        } elseif (
+                version_compare(phpversion('apc'), '4.0.6') === -1 &&
+                version_compare(phpversion('apcu'), '5.1.0') === -1
+        ) {
+            return false;
+        } else {
+            return true;
+        }
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -37,7 +37,7 @@ 
 	use CADTrait;
 
 	public function get($key) {
-		$result = apcu_fetch($this->getPrefix() . $key, $success);
+		$result = apcu_fetch($this->getPrefix().$key, $success);
 		if (!$success) {
 			return null;
 		}
@@ -45,24 +45,24 @@ 
 	}
 
 	public function set($key, $value, $ttl = 0) {
-		return apcu_store($this->getPrefix() . $key, $value, $ttl);
+		return apcu_store($this->getPrefix().$key, $value, $ttl);
 	}
 
 	public function hasKey($key) {
-		return apcu_exists($this->getPrefix() . $key);
+		return apcu_exists($this->getPrefix().$key);
 	}
 
 	public function remove($key) {
-		return apcu_delete($this->getPrefix() . $key);
+		return apcu_delete($this->getPrefix().$key);
 	}
 
 	public function clear($prefix = '') {
-		$ns = $this->getPrefix() . $prefix;
+		$ns = $this->getPrefix().$prefix;
 		$ns = preg_quote($ns, '/');
-		if(class_exists('\APCIterator')) {
-			$iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
+		if (class_exists('\APCIterator')) {
+			$iter = new \APCIterator('user', '/^'.$ns.'/', APC_ITER_KEY);
 		} else {
-			$iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
+			$iter = new \APCUIterator('/^'.$ns.'/', APC_ITER_KEY);
 		}
 		return apcu_delete($iter);
 	}
@@ -76,7 +76,7 @@ 
 	 * @return bool
 	 */
 	public function add($key, $value, $ttl = 0) {
-		return apcu_add($this->getPrefix() . $key, $value, $ttl);
+		return apcu_add($this->getPrefix().$key, $value, $ttl);
 	}
 
 	/**
@@ -100,8 +100,8 @@ 
 		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
 		 * for details
 		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_inc($this->getPrefix() . $key, $step)
+		return apcu_exists($this->getPrefix().$key)
+			? apcu_inc($this->getPrefix().$key, $step)
 			: false;
 	}
 
@@ -125,8 +125,8 @@ 
 		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
 		 * for details
 		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_dec($this->getPrefix() . $key, $step)
+		return apcu_exists($this->getPrefix().$key)
+			? apcu_dec($this->getPrefix().$key, $step)
 			: false;
 	}
 
@@ -141,7 +141,7 @@ 
 	public function cas($key, $old, $new) {
 		// apc only does cas for ints
 		if (is_int($old) and is_int($new)) {
-			return apcu_cas($this->getPrefix() . $key, $old, $new);
+			return apcu_cas($this->getPrefix().$key, $old, $new);
 		} else {
 			return $this->casEmulated($key, $old, $new);
 		}

lib/private/Memcache/ArrayCache.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 	 * Set a value in the cache if it's not already stored
 	 *
 	 * @param string $key
-	 * @param mixed $value
+	 * @param integer $value
 	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
 	 * @return bool
 	 */

Indentation +117 added lines, -117 removed lines

@@ -27,133 +27,133 @@
 use OCP\IMemcache;
 
 class ArrayCache extends Cache implements IMemcache {
-	/** @var array Array with the cached data */
-	protected $cachedData = array();
+    /** @var array Array with the cached data */
+    protected $cachedData = array();
 
-	use CADTrait;
+    use CADTrait;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function get($key) {
-		if ($this->hasKey($key)) {
-			return $this->cachedData[$key];
-		}
-		return null;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function get($key) {
+        if ($this->hasKey($key)) {
+            return $this->cachedData[$key];
+        }
+        return null;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function set($key, $value, $ttl = 0) {
-		$this->cachedData[$key] = $value;
-		return true;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function set($key, $value, $ttl = 0) {
+        $this->cachedData[$key] = $value;
+        return true;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function hasKey($key) {
-		return isset($this->cachedData[$key]);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function hasKey($key) {
+        return isset($this->cachedData[$key]);
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function remove($key) {
-		unset($this->cachedData[$key]);
-		return true;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function remove($key) {
+        unset($this->cachedData[$key]);
+        return true;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function clear($prefix = '') {
-		if ($prefix === '') {
-			$this->cachedData = [];
-			return true;
-		}
+    /**
+     * {@inheritDoc}
+     */
+    public function clear($prefix = '') {
+        if ($prefix === '') {
+            $this->cachedData = [];
+            return true;
+        }
 
-		foreach ($this->cachedData as $key => $value) {
-			if (strpos($key, $prefix) === 0) {
-				$this->remove($key);
-			}
-		}
-		return true;
-	}
+        foreach ($this->cachedData as $key => $value) {
+            if (strpos($key, $prefix) === 0) {
+                $this->remove($key);
+            }
+        }
+        return true;
+    }
 
-	/**
-	 * Set a value in the cache if it's not already stored
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
-	 * @return bool
-	 */
-	public function add($key, $value, $ttl = 0) {
-		// since this cache is not shared race conditions aren't an issue
-		if ($this->hasKey($key)) {
-			return false;
-		} else {
-			return $this->set($key, $value, $ttl);
-		}
-	}
+    /**
+     * Set a value in the cache if it's not already stored
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+     * @return bool
+     */
+    public function add($key, $value, $ttl = 0) {
+        // since this cache is not shared race conditions aren't an issue
+        if ($this->hasKey($key)) {
+            return false;
+        } else {
+            return $this->set($key, $value, $ttl);
+        }
+    }
 
-	/**
-	 * Increase a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function inc($key, $step = 1) {
-		$oldValue = $this->get($key);
-		if (is_int($oldValue)) {
-			$this->set($key, $oldValue + $step);
-			return $oldValue + $step;
-		} else {
-			$success = $this->add($key, $step);
-			return ($success) ? $step : false;
-		}
-	}
+    /**
+     * Increase a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function inc($key, $step = 1) {
+        $oldValue = $this->get($key);
+        if (is_int($oldValue)) {
+            $this->set($key, $oldValue + $step);
+            return $oldValue + $step;
+        } else {
+            $success = $this->add($key, $step);
+            return ($success) ? $step : false;
+        }
+    }
 
-	/**
-	 * Decrease a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function dec($key, $step = 1) {
-		$oldValue = $this->get($key);
-		if (is_int($oldValue)) {
-			$this->set($key, $oldValue - $step);
-			return $oldValue - $step;
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Decrease a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function dec($key, $step = 1) {
+        $oldValue = $this->get($key);
+        if (is_int($oldValue)) {
+            $this->set($key, $oldValue - $step);
+            return $oldValue - $step;
+        } else {
+            return false;
+        }
+    }
 
-	/**
-	 * Compare and set
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @param mixed $new
-	 * @return bool
-	 */
-	public function cas($key, $old, $new) {
-		if ($this->get($key) === $old) {
-			return $this->set($key, $new);
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Compare and set
+     *
+     * @param string $key
+     * @param mixed $old
+     * @param mixed $new
+     * @return bool
+     */
+    public function cas($key, $old, $new) {
+        if ($this->get($key) === $old) {
+            return $this->set($key, $new);
+        } else {
+            return false;
+        }
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	static public function isAvailable() {
-		return true;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    static public function isAvailable() {
+        return true;
+    }
 }

apps/files_external/lib/Lib/Storage/SMB.php

Doc Comments +3 added lines

@@ -498,6 +498,9 @@
 		});
 	}
 
+	/**
+	 * @param string $path
+	 */
 	public function notify($path) {
 		$path = '/' . ltrim($path, '/');
 		$shareNotifyHandler = $this->share->notify($this->buildPath($path));

Indentation +450 added lines, -450 removed lines

@@ -53,454 +53,454 @@
 use OCP\Files\StorageNotAvailableException;
 
 class SMB extends Common implements INotifyStorage {
-	/**
-	 * @var \Icewind\SMB\Server
-	 */
-	protected $server;
-
-	/**
-	 * @var \Icewind\SMB\Share
-	 */
-	protected $share;
-
-	/**
-	 * @var string
-	 */
-	protected $root;
-
-	/**
-	 * @var \Icewind\SMB\FileInfo[]
-	 */
-	protected $statCache;
-
-	public function __construct($params) {
-		if (isset($params['host']) && isset($params['user']) && isset($params['password']) && isset($params['share'])) {
-			if (Server::NativeAvailable()) {
-				$this->server = new NativeServer($params['host'], $params['user'], $params['password']);
-			} else {
-				$this->server = new Server($params['host'], $params['user'], $params['password']);
-			}
-			$this->share = $this->server->getShare(trim($params['share'], '/'));
-
-			$this->root = isset($params['root']) ? $params['root'] : '/';
-			if (!$this->root || $this->root[0] != '/') {
-				$this->root = '/' . $this->root;
-			}
-			if (substr($this->root, -1, 1) != '/') {
-				$this->root .= '/';
-			}
-		} else {
-			throw new \Exception('Invalid configuration');
-		}
-		$this->statCache = new CappedMemoryCache();
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getId() {
-		// FIXME: double slash to keep compatible with the old storage ids,
-		// failure to do so will lead to creation of a new storage id and
-		// loss of shares from the storage
-		return 'smb::' . $this->server->getUser() . '@' . $this->server->getHost() . '//' . $this->share->getName() . '/' . $this->root;
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	protected function buildPath($path) {
-		return Filesystem::normalizePath($this->root . '/' . $path, true, false, true);
-	}
-
-	protected function relativePath($fullPath) {
-		if ($fullPath === $this->root) {
-			return '';
-		} else if (substr($fullPath, 0, strlen($this->root)) === $this->root) {
-			return substr($fullPath, strlen($this->root));
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return \Icewind\SMB\IFileInfo
-	 * @throws StorageNotAvailableException
-	 */
-	protected function getFileInfo($path) {
-		try {
-			$path = $this->buildPath($path);
-			if (!isset($this->statCache[$path])) {
-				$this->statCache[$path] = $this->share->stat($path);
-			}
-			return $this->statCache[$path];
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return \Icewind\SMB\IFileInfo[]
-	 * @throws StorageNotAvailableException
-	 */
-	protected function getFolderContents($path) {
-		try {
-			$path = $this->buildPath($path);
-			$files = $this->share->dir($path);
-			foreach ($files as $file) {
-				$this->statCache[$path . '/' . $file->getName()] = $file;
-			}
-			return array_filter($files, function (IFileInfo $file) {
-				return !$file->isHidden();
-			});
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * @param \Icewind\SMB\IFileInfo $info
-	 * @return array
-	 */
-	protected function formatInfo($info) {
-		return array(
-			'size' => $info->getSize(),
-			'mtime' => $info->getMTime()
-		);
-	}
-
-	/**
-	 * @param string $path
-	 * @return array
-	 */
-	public function stat($path) {
-		$result = $this->formatInfo($this->getFileInfo($path));
-		if ($this->remoteIsShare() && $this->isRootDir($path)) {
-			$result['mtime'] = $this->shareMTime();
-		}
-		return $result;
-	}
-
-	/**
-	 * get the best guess for the modification time of the share
-	 *
-	 * @return int
-	 */
-	private function shareMTime() {
-		$highestMTime = 0;
-		$files = $this->share->dir($this->root);
-		foreach ($files as $fileInfo) {
-			if ($fileInfo->getMTime() > $highestMTime) {
-				$highestMTime = $fileInfo->getMTime();
-			}
-		}
-		return $highestMTime;
-	}
-
-	/**
-	 * Check if the path is our root dir (not the smb one)
-	 *
-	 * @param string $path the path
-	 * @return bool
-	 */
-	private function isRootDir($path) {
-		return $path === '' || $path === '/' || $path === '.';
-	}
-
-	/**
-	 * Check if our root points to a smb share
-	 *
-	 * @return bool true if our root points to a share false otherwise
-	 */
-	private function remoteIsShare() {
-		return $this->share->getName() && (!$this->root || $this->root === '/');
-	}
-
-	/**
-	 * @param string $path
-	 * @return bool
-	 */
-	public function unlink($path) {
-		try {
-			if ($this->is_dir($path)) {
-				return $this->rmdir($path);
-			} else {
-				$path = $this->buildPath($path);
-				unset($this->statCache[$path]);
-				$this->share->del($path);
-				return true;
-			}
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * @param string $path1 the old name
-	 * @param string $path2 the new name
-	 * @return bool
-	 */
-	public function rename($path1, $path2) {
-		try {
-			$this->remove($path2);
-			$path1 = $this->buildPath($path1);
-			$path2 = $this->buildPath($path2);
-			return $this->share->rename($path1, $path2);
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * check if a file or folder has been updated since $time
-	 *
-	 * @param string $path
-	 * @param int $time
-	 * @return bool
-	 */
-	public function hasUpdated($path, $time) {
-		if (!$path and $this->root == '/') {
-			// mtime doesn't work for shares, but giving the nature of the backend,
-			// doing a full update is still just fast enough
-			return true;
-		} else {
-			$actualTime = $this->filemtime($path);
-			return $actualTime > $time;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $mode
-	 * @return resource|false
-	 */
-	public function fopen($path, $mode) {
-		$fullPath = $this->buildPath($path);
-		try {
-			switch ($mode) {
-				case 'r':
-				case 'rb':
-					if (!$this->file_exists($path)) {
-						return false;
-					}
-					return $this->share->read($fullPath);
-				case 'w':
-				case 'wb':
-					$source = $this->share->write($fullPath);
-					return CallBackWrapper::wrap($source, null, null, function () use ($fullPath) {
-						unset($this->statCache[$fullPath]);
-					});
-				case 'a':
-				case 'ab':
-				case 'r+':
-				case 'w+':
-				case 'wb+':
-				case 'a+':
-				case 'x':
-				case 'x+':
-				case 'c':
-				case 'c+':
-					//emulate these
-					if (strrpos($path, '.') !== false) {
-						$ext = substr($path, strrpos($path, '.'));
-					} else {
-						$ext = '';
-					}
-					if ($this->file_exists($path)) {
-						if (!$this->isUpdatable($path)) {
-							return false;
-						}
-						$tmpFile = $this->getCachedFile($path);
-					} else {
-						if (!$this->isCreatable(dirname($path))) {
-							return false;
-						}
-						$tmpFile = \OCP\Files::tmpFile($ext);
-					}
-					$source = fopen($tmpFile, $mode);
-					$share = $this->share;
-					return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath, $share) {
-						unset($this->statCache[$fullPath]);
-						$share->put($tmpFile, $fullPath);
-						unlink($tmpFile);
-					});
-			}
-			return false;
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	public function rmdir($path) {
-		try {
-			$this->statCache = array();
-			$content = $this->share->dir($this->buildPath($path));
-			foreach ($content as $file) {
-				if ($file->isDirectory()) {
-					$this->rmdir($path . '/' . $file->getName());
-				} else {
-					$this->share->del($file->getPath());
-				}
-			}
-			$this->share->rmdir($this->buildPath($path));
-			return true;
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	public function touch($path, $time = null) {
-		try {
-			if (!$this->file_exists($path)) {
-				$fh = $this->share->write($this->buildPath($path));
-				fclose($fh);
-				return true;
-			}
-			return false;
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	public function opendir($path) {
-		try {
-			$files = $this->getFolderContents($path);
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-		$names = array_map(function ($info) {
-			/** @var \Icewind\SMB\IFileInfo $info */
-			return $info->getName();
-		}, $files);
-		return IteratorDirectory::wrap($names);
-	}
-
-	public function filetype($path) {
-		try {
-			return $this->getFileInfo($path)->isDirectory() ? 'dir' : 'file';
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	public function mkdir($path) {
-		$path = $this->buildPath($path);
-		try {
-			$this->share->mkdir($path);
-			return true;
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		} catch (Exception $e) {
-			return false;
-		}
-	}
-
-	public function file_exists($path) {
-		try {
-			$this->getFileInfo($path);
-			return true;
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	public function isReadable($path) {
-		try {
-			$info = $this->getFileInfo($path);
-			return !$info->isHidden();
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	public function isUpdatable($path) {
-		try {
-			$info = $this->getFileInfo($path);
-			// following windows behaviour for read-only folders: they can be written into
-			// (https://support.microsoft.com/en-us/kb/326549 - "cause" section)
-			return !$info->isHidden() && (!$info->isReadOnly() || $this->is_dir($path));
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	public function isDeletable($path) {
-		try {
-			$info = $this->getFileInfo($path);
-			return !$info->isHidden() && !$info->isReadOnly();
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * check if smbclient is installed
-	 */
-	public static function checkDependencies() {
-		return (
-			(bool)\OC_Helper::findBinaryPath('smbclient')
-			|| Server::NativeAvailable()
-		) ? true : ['smbclient'];
-	}
-
-	/**
-	 * Test a storage for availability
-	 *
-	 * @return bool
-	 */
-	public function test() {
-		try {
-			return parent::test();
-		} catch (Exception $e) {
-			return false;
-		}
-	}
-
-	public function listen($path, callable $callback) {
-		$this->notify($path)->listen(function (IChange $change) use ($callback) {
-			if ($change instanceof IRenameChange) {
-				return $callback($change->getType(), $change->getPath(), $change->getTargetPath());
-			} else {
-				return $callback($change->getType(), $change->getPath());
-			}
-		});
-	}
-
-	public function notify($path) {
-		$path = '/' . ltrim($path, '/');
-		$shareNotifyHandler = $this->share->notify($this->buildPath($path));
-		return new SMBNotifyHandler($shareNotifyHandler, $this->root);
-	}
+    /**
+     * @var \Icewind\SMB\Server
+     */
+    protected $server;
+
+    /**
+     * @var \Icewind\SMB\Share
+     */
+    protected $share;
+
+    /**
+     * @var string
+     */
+    protected $root;
+
+    /**
+     * @var \Icewind\SMB\FileInfo[]
+     */
+    protected $statCache;
+
+    public function __construct($params) {
+        if (isset($params['host']) && isset($params['user']) && isset($params['password']) && isset($params['share'])) {
+            if (Server::NativeAvailable()) {
+                $this->server = new NativeServer($params['host'], $params['user'], $params['password']);
+            } else {
+                $this->server = new Server($params['host'], $params['user'], $params['password']);
+            }
+            $this->share = $this->server->getShare(trim($params['share'], '/'));
+
+            $this->root = isset($params['root']) ? $params['root'] : '/';
+            if (!$this->root || $this->root[0] != '/') {
+                $this->root = '/' . $this->root;
+            }
+            if (substr($this->root, -1, 1) != '/') {
+                $this->root .= '/';
+            }
+        } else {
+            throw new \Exception('Invalid configuration');
+        }
+        $this->statCache = new CappedMemoryCache();
+    }
+
+    /**
+     * @return string
+     */
+    public function getId() {
+        // FIXME: double slash to keep compatible with the old storage ids,
+        // failure to do so will lead to creation of a new storage id and
+        // loss of shares from the storage
+        return 'smb::' . $this->server->getUser() . '@' . $this->server->getHost() . '//' . $this->share->getName() . '/' . $this->root;
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    protected function buildPath($path) {
+        return Filesystem::normalizePath($this->root . '/' . $path, true, false, true);
+    }
+
+    protected function relativePath($fullPath) {
+        if ($fullPath === $this->root) {
+            return '';
+        } else if (substr($fullPath, 0, strlen($this->root)) === $this->root) {
+            return substr($fullPath, strlen($this->root));
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return \Icewind\SMB\IFileInfo
+     * @throws StorageNotAvailableException
+     */
+    protected function getFileInfo($path) {
+        try {
+            $path = $this->buildPath($path);
+            if (!isset($this->statCache[$path])) {
+                $this->statCache[$path] = $this->share->stat($path);
+            }
+            return $this->statCache[$path];
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return \Icewind\SMB\IFileInfo[]
+     * @throws StorageNotAvailableException
+     */
+    protected function getFolderContents($path) {
+        try {
+            $path = $this->buildPath($path);
+            $files = $this->share->dir($path);
+            foreach ($files as $file) {
+                $this->statCache[$path . '/' . $file->getName()] = $file;
+            }
+            return array_filter($files, function (IFileInfo $file) {
+                return !$file->isHidden();
+            });
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * @param \Icewind\SMB\IFileInfo $info
+     * @return array
+     */
+    protected function formatInfo($info) {
+        return array(
+            'size' => $info->getSize(),
+            'mtime' => $info->getMTime()
+        );
+    }
+
+    /**
+     * @param string $path
+     * @return array
+     */
+    public function stat($path) {
+        $result = $this->formatInfo($this->getFileInfo($path));
+        if ($this->remoteIsShare() && $this->isRootDir($path)) {
+            $result['mtime'] = $this->shareMTime();
+        }
+        return $result;
+    }
+
+    /**
+     * get the best guess for the modification time of the share
+     *
+     * @return int
+     */
+    private function shareMTime() {
+        $highestMTime = 0;
+        $files = $this->share->dir($this->root);
+        foreach ($files as $fileInfo) {
+            if ($fileInfo->getMTime() > $highestMTime) {
+                $highestMTime = $fileInfo->getMTime();
+            }
+        }
+        return $highestMTime;
+    }
+
+    /**
+     * Check if the path is our root dir (not the smb one)
+     *
+     * @param string $path the path
+     * @return bool
+     */
+    private function isRootDir($path) {
+        return $path === '' || $path === '/' || $path === '.';
+    }
+
+    /**
+     * Check if our root points to a smb share
+     *
+     * @return bool true if our root points to a share false otherwise
+     */
+    private function remoteIsShare() {
+        return $this->share->getName() && (!$this->root || $this->root === '/');
+    }
+
+    /**
+     * @param string $path
+     * @return bool
+     */
+    public function unlink($path) {
+        try {
+            if ($this->is_dir($path)) {
+                return $this->rmdir($path);
+            } else {
+                $path = $this->buildPath($path);
+                unset($this->statCache[$path]);
+                $this->share->del($path);
+                return true;
+            }
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * @param string $path1 the old name
+     * @param string $path2 the new name
+     * @return bool
+     */
+    public function rename($path1, $path2) {
+        try {
+            $this->remove($path2);
+            $path1 = $this->buildPath($path1);
+            $path2 = $this->buildPath($path2);
+            return $this->share->rename($path1, $path2);
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * check if a file or folder has been updated since $time
+     *
+     * @param string $path
+     * @param int $time
+     * @return bool
+     */
+    public function hasUpdated($path, $time) {
+        if (!$path and $this->root == '/') {
+            // mtime doesn't work for shares, but giving the nature of the backend,
+            // doing a full update is still just fast enough
+            return true;
+        } else {
+            $actualTime = $this->filemtime($path);
+            return $actualTime > $time;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @param string $mode
+     * @return resource|false
+     */
+    public function fopen($path, $mode) {
+        $fullPath = $this->buildPath($path);
+        try {
+            switch ($mode) {
+                case 'r':
+                case 'rb':
+                    if (!$this->file_exists($path)) {
+                        return false;
+                    }
+                    return $this->share->read($fullPath);
+                case 'w':
+                case 'wb':
+                    $source = $this->share->write($fullPath);
+                    return CallBackWrapper::wrap($source, null, null, function () use ($fullPath) {
+                        unset($this->statCache[$fullPath]);
+                    });
+                case 'a':
+                case 'ab':
+                case 'r+':
+                case 'w+':
+                case 'wb+':
+                case 'a+':
+                case 'x':
+                case 'x+':
+                case 'c':
+                case 'c+':
+                    //emulate these
+                    if (strrpos($path, '.') !== false) {
+                        $ext = substr($path, strrpos($path, '.'));
+                    } else {
+                        $ext = '';
+                    }
+                    if ($this->file_exists($path)) {
+                        if (!$this->isUpdatable($path)) {
+                            return false;
+                        }
+                        $tmpFile = $this->getCachedFile($path);
+                    } else {
+                        if (!$this->isCreatable(dirname($path))) {
+                            return false;
+                        }
+                        $tmpFile = \OCP\Files::tmpFile($ext);
+                    }
+                    $source = fopen($tmpFile, $mode);
+                    $share = $this->share;
+                    return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath, $share) {
+                        unset($this->statCache[$fullPath]);
+                        $share->put($tmpFile, $fullPath);
+                        unlink($tmpFile);
+                    });
+            }
+            return false;
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    public function rmdir($path) {
+        try {
+            $this->statCache = array();
+            $content = $this->share->dir($this->buildPath($path));
+            foreach ($content as $file) {
+                if ($file->isDirectory()) {
+                    $this->rmdir($path . '/' . $file->getName());
+                } else {
+                    $this->share->del($file->getPath());
+                }
+            }
+            $this->share->rmdir($this->buildPath($path));
+            return true;
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    public function touch($path, $time = null) {
+        try {
+            if (!$this->file_exists($path)) {
+                $fh = $this->share->write($this->buildPath($path));
+                fclose($fh);
+                return true;
+            }
+            return false;
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    public function opendir($path) {
+        try {
+            $files = $this->getFolderContents($path);
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        }
+        $names = array_map(function ($info) {
+            /** @var \Icewind\SMB\IFileInfo $info */
+            return $info->getName();
+        }, $files);
+        return IteratorDirectory::wrap($names);
+    }
+
+    public function filetype($path) {
+        try {
+            return $this->getFileInfo($path)->isDirectory() ? 'dir' : 'file';
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        }
+    }
+
+    public function mkdir($path) {
+        $path = $this->buildPath($path);
+        try {
+            $this->share->mkdir($path);
+            return true;
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
+    public function file_exists($path) {
+        try {
+            $this->getFileInfo($path);
+            return true;
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    public function isReadable($path) {
+        try {
+            $info = $this->getFileInfo($path);
+            return !$info->isHidden();
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        }
+    }
+
+    public function isUpdatable($path) {
+        try {
+            $info = $this->getFileInfo($path);
+            // following windows behaviour for read-only folders: they can be written into
+            // (https://support.microsoft.com/en-us/kb/326549 - "cause" section)
+            return !$info->isHidden() && (!$info->isReadOnly() || $this->is_dir($path));
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        }
+    }
+
+    public function isDeletable($path) {
+        try {
+            $info = $this->getFileInfo($path);
+            return !$info->isHidden() && !$info->isReadOnly();
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * check if smbclient is installed
+     */
+    public static function checkDependencies() {
+        return (
+            (bool)\OC_Helper::findBinaryPath('smbclient')
+            || Server::NativeAvailable()
+        ) ? true : ['smbclient'];
+    }
+
+    /**
+     * Test a storage for availability
+     *
+     * @return bool
+     */
+    public function test() {
+        try {
+            return parent::test();
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
+    public function listen($path, callable $callback) {
+        $this->notify($path)->listen(function (IChange $change) use ($callback) {
+            if ($change instanceof IRenameChange) {
+                return $callback($change->getType(), $change->getPath(), $change->getTargetPath());
+            } else {
+                return $callback($change->getType(), $change->getPath());
+            }
+        });
+    }
+
+    public function notify($path) {
+        $path = '/' . ltrim($path, '/');
+        $shareNotifyHandler = $this->share->notify($this->buildPath($path));
+        return new SMBNotifyHandler($shareNotifyHandler, $this->root);
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -84,7 +84,7 @@ 
 
 			$this->root = isset($params['root']) ? $params['root'] : '/';
 			if (!$this->root || $this->root[0] != '/') {
-				$this->root = '/' . $this->root;
+				$this->root = '/'.$this->root;
 			}
 			if (substr($this->root, -1, 1) != '/') {
 				$this->root .= '/';
@@ -102,7 +102,7 @@ 
 		// FIXME: double slash to keep compatible with the old storage ids,
 		// failure to do so will lead to creation of a new storage id and
 		// loss of shares from the storage
-		return 'smb::' . $this->server->getUser() . '@' . $this->server->getHost() . '//' . $this->share->getName() . '/' . $this->root;
+		return 'smb::'.$this->server->getUser().'@'.$this->server->getHost().'//'.$this->share->getName().'/'.$this->root;
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 * @return string
 	 */
 	protected function buildPath($path) {
-		return Filesystem::normalizePath($this->root . '/' . $path, true, false, true);
+		return Filesystem::normalizePath($this->root.'/'.$path, true, false, true);
 	}
 
 	protected function relativePath($fullPath) {
@@ -150,9 +150,9 @@ 
 			$path = $this->buildPath($path);
 			$files = $this->share->dir($path);
 			foreach ($files as $file) {
-				$this->statCache[$path . '/' . $file->getName()] = $file;
+				$this->statCache[$path.'/'.$file->getName()] = $file;
 			}
-			return array_filter($files, function (IFileInfo $file) {
+			return array_filter($files, function(IFileInfo $file) {
 				return !$file->isHidden();
 			});
 		} catch (ConnectException $e) {
@@ -297,7 +297,7 @@ 
 				case 'w':
 				case 'wb':
 					$source = $this->share->write($fullPath);
-					return CallBackWrapper::wrap($source, null, null, function () use ($fullPath) {
+					return CallBackWrapper::wrap($source, null, null, function() use ($fullPath) {
 						unset($this->statCache[$fullPath]);
 					});
 				case 'a':
@@ -329,7 +329,7 @@ 
 					}
 					$source = fopen($tmpFile, $mode);
 					$share = $this->share;
-					return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath, $share) {
+					return CallbackWrapper::wrap($source, null, null, function() use ($tmpFile, $fullPath, $share) {
 						unset($this->statCache[$fullPath]);
 						$share->put($tmpFile, $fullPath);
 						unlink($tmpFile);
@@ -351,7 +351,7 @@ 
 			$content = $this->share->dir($this->buildPath($path));
 			foreach ($content as $file) {
 				if ($file->isDirectory()) {
-					$this->rmdir($path . '/' . $file->getName());
+					$this->rmdir($path.'/'.$file->getName());
 				} else {
 					$this->share->del($file->getPath());
 				}
@@ -388,7 +388,7 @@ 
 		} catch (ForbiddenException $e) {
 			return false;
 		}
-		$names = array_map(function ($info) {
+		$names = array_map(function($info) {
 			/** @var \Icewind\SMB\IFileInfo $info */
 			return $info->getName();
 		}, $files);
@@ -470,7 +470,7 @@ 
 	 */
 	public static function checkDependencies() {
 		return (
-			(bool)\OC_Helper::findBinaryPath('smbclient')
+			(bool) \OC_Helper::findBinaryPath('smbclient')
 			|| Server::NativeAvailable()
 		) ? true : ['smbclient'];
 	}
@@ -489,7 +489,7 @@ 
 	}
 
 	public function listen($path, callable $callback) {
-		$this->notify($path)->listen(function (IChange $change) use ($callback) {
+		$this->notify($path)->listen(function(IChange $change) use ($callback) {
 			if ($change instanceof IRenameChange) {
 				return $callback($change->getType(), $change->getPath(), $change->getTargetPath());
 			} else {
@@ -499,7 +499,7 @@ 
 	}
 
 	public function notify($path) {
-		$path = '/' . ltrim($path, '/');
+		$path = '/'.ltrim($path, '/');
 		$shareNotifyHandler = $this->share->notify($this->buildPath($path));
 		return new SMBNotifyHandler($shareNotifyHandler, $this->root);
 	}

apps/user_ldap/lib/Controller/RenewPasswordController.php

Unused Use Statements -1 removed lines

@@ -23,7 +23,6 @@
 namespace OCA\User_LDAP\Controller;
 
 use OC\HintException;
-use OC_Util;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\TemplateResponse;

Indentation +129 added lines, -129 removed lines

@@ -37,144 +37,144 @@
 use OCP\IUserManager;
 
 class RenewPasswordController extends Controller {
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var ISession */
-	private $session;
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IConfig */
+    private $config;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var ISession */
+    private $session;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 */
-	function __construct($appName, IRequest $request, IUserManager $userManager, 
-		IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
-		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-		$this->config = $config;
-		$this->l10n = $l10n;
-		$this->session = $session;
-		$this->urlGenerator = $urlGenerator;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     */
+    function __construct($appName, IRequest $request, IUserManager $userManager, 
+        IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
+        parent::__construct($appName, $request);
+        $this->userManager = $userManager;
+        $this->config = $config;
+        $this->l10n = $l10n;
+        $this->session = $session;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @return RedirectResponse
-	 */
-	public function cancel() {
-		return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @return RedirectResponse
+     */
+    public function cancel() {
+        return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @param string $user
-	 *
-	 * @return TemplateResponse|RedirectResponse
-	 */
-	public function showRenewPasswordForm($user) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-		}
-		$parameters = [];
-		$renewPasswordMessages = $this->session->get('renewPasswordMessages');
-		$errors = [];
-		$messages = [];
-		if (is_array($renewPasswordMessages)) {
-			list($errors, $messages) = $renewPasswordMessages;
-		}
-		$this->session->remove('renewPasswordMessages');
-		foreach ($errors as $value) {
-			$parameters[$value] = true;
-		}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @param string $user
+     *
+     * @return TemplateResponse|RedirectResponse
+     */
+    public function showRenewPasswordForm($user) {
+        if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+        }
+        $parameters = [];
+        $renewPasswordMessages = $this->session->get('renewPasswordMessages');
+        $errors = [];
+        $messages = [];
+        if (is_array($renewPasswordMessages)) {
+            list($errors, $messages) = $renewPasswordMessages;
+        }
+        $this->session->remove('renewPasswordMessages');
+        foreach ($errors as $value) {
+            $parameters[$value] = true;
+        }
 
-		$parameters['messages'] = $messages;
-		$parameters['user'] = $user;
+        $parameters['messages'] = $messages;
+        $parameters['user'] = $user;
 
-		$parameters['canResetPassword'] = true;
-		$parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
-		if (!$parameters['resetPasswordLink']) {
-			$userObj = $this->userManager->get($user);
-			if ($userObj instanceof IUser) {
-				$parameters['canResetPassword'] = $userObj->canChangePassword();
-			}
-		}
-		$parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm');
+        $parameters['canResetPassword'] = true;
+        $parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
+        if (!$parameters['resetPasswordLink']) {
+            $userObj = $this->userManager->get($user);
+            if ($userObj instanceof IUser) {
+                $parameters['canResetPassword'] = $userObj->canChangePassword();
+            }
+        }
+        $parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm');
 
-		return new TemplateResponse(
-			$this->appName, 'renewpassword', $parameters, 'guest'
-		);
-	}
+        return new TemplateResponse(
+            $this->appName, 'renewpassword', $parameters, 'guest'
+        );
+    }
 
-	/**
-	 * @PublicPage
-	 * @UseSession
-	 *
-	 * @param string $user
-	 * @param string $oldPassword
-	 * @param string $newPassword
-	 *
-	 * @return RedirectResponse
-	 */
-	public function tryRenewPassword($user, $oldPassword, $newPassword) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-		}
-		$args = !is_null($user) ? ['user' => $user] : [];
-		$loginResult = $this->userManager->checkPassword($user, $oldPassword);
-		if ($loginResult === false) {
-			$this->session->set('renewPasswordMessages', [
-				['invalidpassword'], []
-			]);
-			return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
-		}
+    /**
+     * @PublicPage
+     * @UseSession
+     *
+     * @param string $user
+     * @param string $oldPassword
+     * @param string $newPassword
+     *
+     * @return RedirectResponse
+     */
+    public function tryRenewPassword($user, $oldPassword, $newPassword) {
+        if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+        }
+        $args = !is_null($user) ? ['user' => $user] : [];
+        $loginResult = $this->userManager->checkPassword($user, $oldPassword);
+        if ($loginResult === false) {
+            $this->session->set('renewPasswordMessages', [
+                ['invalidpassword'], []
+            ]);
+            return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
+        }
 		
-		try {
-			if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) {
-				$this->session->set('loginMessages', [
-					[], [$this->l10n->t("Please login with the new password")]
-				]);
-				$this->session->remove('needPasswordRenewal');
-				return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
-			} else {
-				$this->session->set('renewPasswordMessages', [
-					['internalexception'], []
-				]);
-			}
-		} catch (HintException $e) {
-			$this->session->set('renewPasswordMessages', [
-				[], [$e->getHint()]
-			]);
-		}
+        try {
+            if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) {
+                $this->session->set('loginMessages', [
+                    [], [$this->l10n->t("Please login with the new password")]
+                ]);
+                $this->session->remove('needPasswordRenewal');
+                return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
+            } else {
+                $this->session->set('renewPasswordMessages', [
+                    ['internalexception'], []
+                ]);
+            }
+        } catch (HintException $e) {
+            $this->session->set('renewPasswordMessages', [
+                [], [$e->getHint()]
+            ]);
+        }
 
-		return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
-	}
+        return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @return RedirectResponse
-	 */
-	public function showLoginFormInvalidPassword($user) {
-		$args = !is_null($user) ? ['user' => $user] : [];
-		$this->session->set('loginMessages', [
-			['invalidpassword'], []
-		]);
-		return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @return RedirectResponse
+     */
+    public function showLoginFormInvalidPassword($user) {
+        $args = !is_null($user) ? ['user' => $user] : [];
+        $this->session->set('loginMessages', [
+            ['invalidpassword'], []
+        ]);
+        return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 	 * @return TemplateResponse|RedirectResponse
 	 */
 	public function showRenewPasswordForm($user) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+		if ($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
 			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
 		}
 		$parameters = [];
@@ -129,7 +129,7 @@ 
 	 * @return RedirectResponse
 	 */
 	public function tryRenewPassword($user, $oldPassword, $newPassword) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+		if ($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
 			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
 		}
 		$args = !is_null($user) ? ['user' => $user] : [];

apps/dav/lib/Files/FileSearchBackend.php

Doc Comments +4 added lines

@@ -104,6 +104,10 @@
 		}
 	}
 
+	/**
+	 * @param string $href
+	 * @param string $path
+	 */
 	public function getPropertyDefinitionsForScope($href, $path) {
 		// all valid scopes support the same schema
 

Spacing +8 added lines, -8 removed lines

@@ -155,7 +155,7 @@ 
 		/** @var Folder $folder $results */
 		$results = $folder->search($query);
 
-		return array_map(function (Node $node) {
+		return array_map(function(Node $node) {
 			if ($node instanceof Folder) {
 				return new SearchResult(new \OCA\DAV\Connector\Sabre\Directory($this->view, $node, $this->tree, $this->shareManager), $this->getHrefForNode($node));
 			} else {
@@ -169,8 +169,8 @@ 
 	 * @return string
 	 */
 	private function getHrefForNode(Node $node) {
-		$base = '/files/' . $this->user->getUID();
-		return $base . $this->view->getRelativePath($node->getPath());
+		$base = '/files/'.$this->user->getUID();
+		return $base.$this->view->getRelativePath($node->getPath());
 	}
 
 	/**
@@ -210,19 +210,19 @@ 
 			case Operator::OPERATION_LESS_THAN:
 			case Operator::OPERATION_IS_LIKE:
 				if (count($operator->arguments) !== 2) {
-					throw new \InvalidArgumentException('Invalid number of arguments for ' . $trimmedType . ' operation');
+					throw new \InvalidArgumentException('Invalid number of arguments for '.$trimmedType.' operation');
 				}
 				if (!is_string($operator->arguments[0])) {
-					throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property');
+					throw new \InvalidArgumentException('Invalid argument 1 for '.$trimmedType.' operation, expected property');
 				}
 				if (!($operator->arguments[1] instanceof Literal)) {
-					throw new \InvalidArgumentException('Invalid argument 2 for ' . $trimmedType . ' operation, expected literal');
+					throw new \InvalidArgumentException('Invalid argument 2 for '.$trimmedType.' operation, expected literal');
 				}
 				return new SearchComparison($trimmedType, $this->mapPropertyNameToColumn($operator->arguments[0]), $this->castValue($operator->arguments[0], $operator->arguments[1]->value));
 			case Operator::OPERATION_IS_COLLECTION:
 				return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE);
 			default:
-				throw new \InvalidArgumentException('Unsupported operation ' . $trimmedType . ' (' . $operator->type . ')');
+				throw new \InvalidArgumentException('Unsupported operation '.$trimmedType.' ('.$operator->type.')');
 		}
 	}
 
@@ -247,7 +247,7 @@ 
 			case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME:
 				return 'fileid';
 			default:
-				throw new \InvalidArgumentException('Unsupported property for search or order: ' . $propertyName);
+				throw new \InvalidArgumentException('Unsupported property for search or order: '.$propertyName);
 		}
 	}
 

Indentation +207 added lines, -207 removed lines

@@ -49,231 +49,231 @@
 use SearchDAV\XML\Order;
 
 class FileSearchBackend implements ISearchBackend {
-	/** @var Tree */
-	private $tree;
+    /** @var Tree */
+    private $tree;
 
-	/** @var IUser */
-	private $user;
+    /** @var IUser */
+    private $user;
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var IManager */
-	private $shareManager;
+    /** @var IManager */
+    private $shareManager;
 
-	/** @var View */
-	private $view;
+    /** @var View */
+    private $view;
 
-	/**
-	 * FileSearchBackend constructor.
-	 *
-	 * @param Tree $tree
-	 * @param IUser $user
-	 * @param IRootFolder $rootFolder
-	 * @param IManager $shareManager
-	 * @param View $view
-	 * @internal param IRootFolder $rootFolder
-	 */
-	public function __construct(Tree $tree, IUser $user, IRootFolder $rootFolder, IManager $shareManager, View $view) {
-		$this->tree = $tree;
-		$this->user = $user;
-		$this->rootFolder = $rootFolder;
-		$this->shareManager = $shareManager;
-		$this->view = $view;
-	}
+    /**
+     * FileSearchBackend constructor.
+     *
+     * @param Tree $tree
+     * @param IUser $user
+     * @param IRootFolder $rootFolder
+     * @param IManager $shareManager
+     * @param View $view
+     * @internal param IRootFolder $rootFolder
+     */
+    public function __construct(Tree $tree, IUser $user, IRootFolder $rootFolder, IManager $shareManager, View $view) {
+        $this->tree = $tree;
+        $this->user = $user;
+        $this->rootFolder = $rootFolder;
+        $this->shareManager = $shareManager;
+        $this->view = $view;
+    }
 
-	/**
-	 * Search endpoint will be remote.php/dav
-	 *
-	 * @return string
-	 */
-	public function getArbiterPath() {
-		return '';
-	}
+    /**
+     * Search endpoint will be remote.php/dav
+     *
+     * @return string
+     */
+    public function getArbiterPath() {
+        return '';
+    }
 
-	public function isValidScope($href, $depth, $path) {
-		// only allow scopes inside the dav server
-		if (is_null($path)) {
-			return false;
-		}
+    public function isValidScope($href, $depth, $path) {
+        // only allow scopes inside the dav server
+        if (is_null($path)) {
+            return false;
+        }
 
-		try {
-			$node = $this->tree->getNodeForPath($path);
-			return $node instanceof Directory;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
+        try {
+            $node = $this->tree->getNodeForPath($path);
+            return $node instanceof Directory;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
 
-	public function getPropertyDefinitionsForScope($href, $path) {
-		// all valid scopes support the same schema
+    public function getPropertyDefinitionsForScope($href, $path) {
+        // all valid scopes support the same schema
 
-		//todo dynamically load all propfind properties that are supported
-		return [
-			// queryable properties
-			new SearchPropertyDefinition('{DAV:}displayname', true, false, true),
-			new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true),
-			new SearchPropertyDefinition('{DAV:}getlastmodified', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
-			new SearchPropertyDefinition(FilesPlugin::SIZE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
-			new SearchPropertyDefinition(TagsPlugin::FAVORITE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_BOOLEAN),
-			new SearchPropertyDefinition(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, true, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+        //todo dynamically load all propfind properties that are supported
+        return [
+            // queryable properties
+            new SearchPropertyDefinition('{DAV:}displayname', true, false, true),
+            new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true),
+            new SearchPropertyDefinition('{DAV:}getlastmodified', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
+            new SearchPropertyDefinition(FilesPlugin::SIZE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+            new SearchPropertyDefinition(TagsPlugin::FAVORITE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_BOOLEAN),
+            new SearchPropertyDefinition(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, true, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
 
-			// select only properties
-			new SearchPropertyDefinition('{DAV:}resourcetype', false, true, false),
-			new SearchPropertyDefinition('{DAV:}getcontentlength', false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::CHECKSUMS_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::PERMISSIONS_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::GETETAG_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, false, true, false, SearchPropertyDefinition::DATATYPE_BOOLEAN),
-			new SearchPropertyDefinition(FilesPlugin::FILEID_PROPERTYNAME, false, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
-		];
-	}
+            // select only properties
+            new SearchPropertyDefinition('{DAV:}resourcetype', false, true, false),
+            new SearchPropertyDefinition('{DAV:}getcontentlength', false, true, false),
+            new SearchPropertyDefinition(FilesPlugin::CHECKSUMS_PROPERTYNAME, false, true, false),
+            new SearchPropertyDefinition(FilesPlugin::PERMISSIONS_PROPERTYNAME, false, true, false),
+            new SearchPropertyDefinition(FilesPlugin::GETETAG_PROPERTYNAME, false, true, false),
+            new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, false, true, false),
+            new SearchPropertyDefinition(FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME, false, true, false),
+            new SearchPropertyDefinition(FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME, false, true, false),
+            new SearchPropertyDefinition(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, false, true, false, SearchPropertyDefinition::DATATYPE_BOOLEAN),
+            new SearchPropertyDefinition(FilesPlugin::FILEID_PROPERTYNAME, false, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+        ];
+    }
 
-	/**
-	 * @param BasicSearch $search
-	 * @return SearchResult[]
-	 */
-	public function search(BasicSearch $search) {
-		if (count($search->from) !== 1) {
-			throw new \InvalidArgumentException('Searching more than one folder is not supported');
-		}
-		$query = $this->transformQuery($search);
-		$scope = $search->from[0];
-		if ($scope->path === null) {
-			throw new \InvalidArgumentException('Using uri\'s as scope is not supported, please use a path relative to the search arbiter instead');
-		}
-		$node = $this->tree->getNodeForPath($scope->path);
-		if (!$node instanceof Directory) {
-			throw new \InvalidArgumentException('Search is only supported on directories');
-		}
+    /**
+     * @param BasicSearch $search
+     * @return SearchResult[]
+     */
+    public function search(BasicSearch $search) {
+        if (count($search->from) !== 1) {
+            throw new \InvalidArgumentException('Searching more than one folder is not supported');
+        }
+        $query = $this->transformQuery($search);
+        $scope = $search->from[0];
+        if ($scope->path === null) {
+            throw new \InvalidArgumentException('Using uri\'s as scope is not supported, please use a path relative to the search arbiter instead');
+        }
+        $node = $this->tree->getNodeForPath($scope->path);
+        if (!$node instanceof Directory) {
+            throw new \InvalidArgumentException('Search is only supported on directories');
+        }
 
-		$fileInfo = $node->getFileInfo();
-		$folder = $this->rootFolder->get($fileInfo->getPath());
-		/** @var Folder $folder $results */
-		$results = $folder->search($query);
+        $fileInfo = $node->getFileInfo();
+        $folder = $this->rootFolder->get($fileInfo->getPath());
+        /** @var Folder $folder $results */
+        $results = $folder->search($query);
 
-		return array_map(function (Node $node) {
-			if ($node instanceof Folder) {
-				return new SearchResult(new \OCA\DAV\Connector\Sabre\Directory($this->view, $node, $this->tree, $this->shareManager), $this->getHrefForNode($node));
-			} else {
-				return new SearchResult(new \OCA\DAV\Connector\Sabre\File($this->view, $node, $this->shareManager), $this->getHrefForNode($node));
-			}
-		}, $results);
-	}
+        return array_map(function (Node $node) {
+            if ($node instanceof Folder) {
+                return new SearchResult(new \OCA\DAV\Connector\Sabre\Directory($this->view, $node, $this->tree, $this->shareManager), $this->getHrefForNode($node));
+            } else {
+                return new SearchResult(new \OCA\DAV\Connector\Sabre\File($this->view, $node, $this->shareManager), $this->getHrefForNode($node));
+            }
+        }, $results);
+    }
 
-	/**
-	 * @param Node $node
-	 * @return string
-	 */
-	private function getHrefForNode(Node $node) {
-		$base = '/files/' . $this->user->getUID();
-		return $base . $this->view->getRelativePath($node->getPath());
-	}
+    /**
+     * @param Node $node
+     * @return string
+     */
+    private function getHrefForNode(Node $node) {
+        $base = '/files/' . $this->user->getUID();
+        return $base . $this->view->getRelativePath($node->getPath());
+    }
 
-	/**
-	 * @param BasicSearch $query
-	 * @return ISearchQuery
-	 */
-	private function transformQuery(BasicSearch $query) {
-		// TODO offset, limit
-		$orders = array_map([$this, 'mapSearchOrder'], $query->orderBy);
-		return new SearchQuery($this->transformSearchOperation($query->where), 0, 0, $orders, $this->user);
-	}
+    /**
+     * @param BasicSearch $query
+     * @return ISearchQuery
+     */
+    private function transformQuery(BasicSearch $query) {
+        // TODO offset, limit
+        $orders = array_map([$this, 'mapSearchOrder'], $query->orderBy);
+        return new SearchQuery($this->transformSearchOperation($query->where), 0, 0, $orders, $this->user);
+    }
 
-	/**
-	 * @param Order $order
-	 * @return ISearchOrder
-	 */
-	private function mapSearchOrder(Order $order) {
-		return new SearchOrder($order->order === Order::ASC ? ISearchOrder::DIRECTION_ASCENDING : ISearchOrder::DIRECTION_DESCENDING, $this->mapPropertyNameToColumn($order->property));
-	}
+    /**
+     * @param Order $order
+     * @return ISearchOrder
+     */
+    private function mapSearchOrder(Order $order) {
+        return new SearchOrder($order->order === Order::ASC ? ISearchOrder::DIRECTION_ASCENDING : ISearchOrder::DIRECTION_DESCENDING, $this->mapPropertyNameToColumn($order->property));
+    }
 
-	/**
-	 * @param Operator $operator
-	 * @return ISearchOperator
-	 */
-	private function transformSearchOperation(Operator $operator) {
-		list(, $trimmedType) = explode('}', $operator->type);
-		switch ($operator->type) {
-			case Operator::OPERATION_AND:
-			case Operator::OPERATION_OR:
-			case Operator::OPERATION_NOT:
-				$arguments = array_map([$this, 'transformSearchOperation'], $operator->arguments);
-				return new SearchBinaryOperator($trimmedType, $arguments);
-			case Operator::OPERATION_EQUAL:
-			case Operator::OPERATION_GREATER_OR_EQUAL_THAN:
-			case Operator::OPERATION_GREATER_THAN:
-			case Operator::OPERATION_LESS_OR_EQUAL_THAN:
-			case Operator::OPERATION_LESS_THAN:
-			case Operator::OPERATION_IS_LIKE:
-				if (count($operator->arguments) !== 2) {
-					throw new \InvalidArgumentException('Invalid number of arguments for ' . $trimmedType . ' operation');
-				}
-				if (!is_string($operator->arguments[0])) {
-					throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property');
-				}
-				if (!($operator->arguments[1] instanceof Literal)) {
-					throw new \InvalidArgumentException('Invalid argument 2 for ' . $trimmedType . ' operation, expected literal');
-				}
-				return new SearchComparison($trimmedType, $this->mapPropertyNameToColumn($operator->arguments[0]), $this->castValue($operator->arguments[0], $operator->arguments[1]->value));
-			case Operator::OPERATION_IS_COLLECTION:
-				return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE);
-			default:
-				throw new \InvalidArgumentException('Unsupported operation ' . $trimmedType . ' (' . $operator->type . ')');
-		}
-	}
+    /**
+     * @param Operator $operator
+     * @return ISearchOperator
+     */
+    private function transformSearchOperation(Operator $operator) {
+        list(, $trimmedType) = explode('}', $operator->type);
+        switch ($operator->type) {
+            case Operator::OPERATION_AND:
+            case Operator::OPERATION_OR:
+            case Operator::OPERATION_NOT:
+                $arguments = array_map([$this, 'transformSearchOperation'], $operator->arguments);
+                return new SearchBinaryOperator($trimmedType, $arguments);
+            case Operator::OPERATION_EQUAL:
+            case Operator::OPERATION_GREATER_OR_EQUAL_THAN:
+            case Operator::OPERATION_GREATER_THAN:
+            case Operator::OPERATION_LESS_OR_EQUAL_THAN:
+            case Operator::OPERATION_LESS_THAN:
+            case Operator::OPERATION_IS_LIKE:
+                if (count($operator->arguments) !== 2) {
+                    throw new \InvalidArgumentException('Invalid number of arguments for ' . $trimmedType . ' operation');
+                }
+                if (!is_string($operator->arguments[0])) {
+                    throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property');
+                }
+                if (!($operator->arguments[1] instanceof Literal)) {
+                    throw new \InvalidArgumentException('Invalid argument 2 for ' . $trimmedType . ' operation, expected literal');
+                }
+                return new SearchComparison($trimmedType, $this->mapPropertyNameToColumn($operator->arguments[0]), $this->castValue($operator->arguments[0], $operator->arguments[1]->value));
+            case Operator::OPERATION_IS_COLLECTION:
+                return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE);
+            default:
+                throw new \InvalidArgumentException('Unsupported operation ' . $trimmedType . ' (' . $operator->type . ')');
+        }
+    }
 
-	/**
-	 * @param string $propertyName
-	 * @return string
-	 */
-	private function mapPropertyNameToColumn($propertyName) {
-		switch ($propertyName) {
-			case '{DAV:}displayname':
-				return 'name';
-			case '{DAV:}getcontenttype':
-				return 'mimetype';
-			case '{DAV:}getlastmodified':
-				return 'mtime';
-			case FilesPlugin::SIZE_PROPERTYNAME:
-				return 'size';
-			case TagsPlugin::FAVORITE_PROPERTYNAME:
-				return 'favorite';
-			case TagsPlugin::TAGS_PROPERTYNAME:
-				return 'tagname';
-			case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME:
-				return 'fileid';
-			default:
-				throw new \InvalidArgumentException('Unsupported property for search or order: ' . $propertyName);
-		}
-	}
+    /**
+     * @param string $propertyName
+     * @return string
+     */
+    private function mapPropertyNameToColumn($propertyName) {
+        switch ($propertyName) {
+            case '{DAV:}displayname':
+                return 'name';
+            case '{DAV:}getcontenttype':
+                return 'mimetype';
+            case '{DAV:}getlastmodified':
+                return 'mtime';
+            case FilesPlugin::SIZE_PROPERTYNAME:
+                return 'size';
+            case TagsPlugin::FAVORITE_PROPERTYNAME:
+                return 'favorite';
+            case TagsPlugin::TAGS_PROPERTYNAME:
+                return 'tagname';
+            case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME:
+                return 'fileid';
+            default:
+                throw new \InvalidArgumentException('Unsupported property for search or order: ' . $propertyName);
+        }
+    }
 
-	private function castValue($propertyName, $value) {
-		$allProps = $this->getPropertyDefinitionsForScope('', '');
-		foreach ($allProps as $prop) {
-			if ($prop->name === $propertyName) {
-				$dataType = $prop->dataType;
-				switch ($dataType) {
-					case SearchPropertyDefinition::DATATYPE_BOOLEAN:
-						return $value === 'yes';
-					case SearchPropertyDefinition::DATATYPE_DECIMAL:
-					case SearchPropertyDefinition::DATATYPE_INTEGER:
-					case SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER:
-						return 0 + $value;
-					case SearchPropertyDefinition::DATATYPE_DATETIME:
-						if (is_numeric($value)) {
-							return 0 + $value;
-						}
-						$date = \DateTime::createFromFormat(\DateTime::ATOM, $value);
-						return ($date instanceof \DateTime) ? $date->getTimestamp() : 0;
-					default:
-						return $value;
-				}
-			}
-		}
-		return $value;
-	}
+    private function castValue($propertyName, $value) {
+        $allProps = $this->getPropertyDefinitionsForScope('', '');
+        foreach ($allProps as $prop) {
+            if ($prop->name === $propertyName) {
+                $dataType = $prop->dataType;
+                switch ($dataType) {
+                    case SearchPropertyDefinition::DATATYPE_BOOLEAN:
+                        return $value === 'yes';
+                    case SearchPropertyDefinition::DATATYPE_DECIMAL:
+                    case SearchPropertyDefinition::DATATYPE_INTEGER:
+                    case SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER:
+                        return 0 + $value;
+                    case SearchPropertyDefinition::DATATYPE_DATETIME:
+                        if (is_numeric($value)) {
+                            return 0 + $value;
+                        }
+                        $date = \DateTime::createFromFormat(\DateTime::ATOM, $value);
+                        return ($date instanceof \DateTime) ? $date->getTimestamp() : 0;
+                    default:
+                        return $value;
+                }
+            }
+        }
+        return $value;
+    }
 }

lib/public/AppFramework/Http/StreamResponse.php

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	private $filePath;
 
 	/**
-	 * @param string|resource $filePath the path to the file or a file handle which should be streamed
+	 * @param string $filePath the path to the file or a file handle which should be streamed
 	 * @since 8.1.0
 	 */
 	public function __construct ($filePath) {

Indentation +25 added lines, -25 removed lines

@@ -33,33 +33,33 @@
  * @since 8.1.0
  */
 class StreamResponse extends Response implements ICallbackResponse {
-	/** @var string */
-	private $filePath;
+    /** @var string */
+    private $filePath;
 
-	/**
-	 * @param string|resource $filePath the path to the file or a file handle which should be streamed
-	 * @since 8.1.0
-	 */
-	public function __construct ($filePath) {
-		$this->filePath = $filePath;
-	}
+    /**
+     * @param string|resource $filePath the path to the file or a file handle which should be streamed
+     * @since 8.1.0
+     */
+    public function __construct ($filePath) {
+        $this->filePath = $filePath;
+    }
 
 
-	/**
-	 * Streams the file using readfile
-	 *
-	 * @param IOutput $output a small wrapper that handles output
-	 * @since 8.1.0
-	 */
-	public function callback (IOutput $output) {
-		// handle caching
-		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
-			if (!(is_resource($this->filePath) || file_exists($this->filePath))) {
-				$output->setHttpResponseCode(Http::STATUS_NOT_FOUND);
-			} elseif ($output->setReadfile($this->filePath) === false) {
-				$output->setHttpResponseCode(Http::STATUS_BAD_REQUEST);
-			}
-		}
-	}
+    /**
+     * Streams the file using readfile
+     *
+     * @param IOutput $output a small wrapper that handles output
+     * @since 8.1.0
+     */
+    public function callback (IOutput $output) {
+        // handle caching
+        if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
+            if (!(is_resource($this->filePath) || file_exists($this->filePath))) {
+                $output->setHttpResponseCode(Http::STATUS_NOT_FOUND);
+            } elseif ($output->setReadfile($this->filePath) === false) {
+                $output->setHttpResponseCode(Http::STATUS_BAD_REQUEST);
+            }
+        }
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 	 * @param string|resource $filePath the path to the file or a file handle which should be streamed
 	 * @since 8.1.0
 	 */
-	public function __construct ($filePath) {
+	public function __construct($filePath) {
 		$this->filePath = $filePath;
 	}
 
@@ -51,7 +51,7 @@ 
 	 * @param IOutput $output a small wrapper that handles output
 	 * @since 8.1.0
 	 */
-	public function callback (IOutput $output) {
+	public function callback(IOutput $output) {
 		// handle caching
 		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
 			if (!(is_resource($this->filePath) || file_exists($this->filePath))) {

apps/dav/lib/Connector/Sabre/DavAclPlugin.php

Doc Comments +3 added lines

@@ -47,6 +47,9 @@
 		$this->allowUnauthenticatedAccess = false;
 	}
 
+	/**
+	 * @param string $privileges
+	 */
 	function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
 		$access = parent::checkPrivileges($uri, $privileges, $recursion, false);
 		if($access === false && $throwExceptions) {

Indentation +41 added lines, -41 removed lines

@@ -43,50 +43,50 @@
  * @package OCA\DAV\Connector\Sabre
  */
 class DavAclPlugin extends \Sabre\DAVACL\Plugin {
-	public function __construct() {
-		$this->hideNodesFromListings = true;
-		$this->allowUnauthenticatedAccess = false;
-	}
+    public function __construct() {
+        $this->hideNodesFromListings = true;
+        $this->allowUnauthenticatedAccess = false;
+    }
 
-	function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
-		$access = parent::checkPrivileges($uri, $privileges, $recursion, false);
-		if($access === false && $throwExceptions) {
-			/** @var INode $node */
-			$node = $this->server->tree->getNodeForPath($uri);
+    function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
+        $access = parent::checkPrivileges($uri, $privileges, $recursion, false);
+        if($access === false && $throwExceptions) {
+            /** @var INode $node */
+            $node = $this->server->tree->getNodeForPath($uri);
 
-			switch(get_class($node)) {
-				case 'OCA\DAV\CardDAV\AddressBook':
-					$type = 'Addressbook';
-					break;
-				default:
-					$type = 'Node';
-					break;
-			}
-			throw new NotFound(
-				sprintf(
-					"%s with name '%s' could not be found",
-					$type,
-					$node->getName()
-				)
-			);
-		}
+            switch(get_class($node)) {
+                case 'OCA\DAV\CardDAV\AddressBook':
+                    $type = 'Addressbook';
+                    break;
+                default:
+                    $type = 'Node';
+                    break;
+            }
+            throw new NotFound(
+                sprintf(
+                    "%s with name '%s' could not be found",
+                    $type,
+                    $node->getName()
+                )
+            );
+        }
 
-		return $access;
-	}
+        return $access;
+    }
 
-	public function propFind(PropFind $propFind, INode $node) {
-		// If the node is neither readable nor writable then fail unless its of
-		// the standard user-principal
-		if(!($node instanceof User)) {
-			$path = $propFind->getPath();
-			$readPermissions = $this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, false);
-			$writePermissions = $this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, false);
-			if ($readPermissions === false && $writePermissions === false) {
-				$this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, true);
-				$this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, true);
-			}
-		}
+    public function propFind(PropFind $propFind, INode $node) {
+        // If the node is neither readable nor writable then fail unless its of
+        // the standard user-principal
+        if(!($node instanceof User)) {
+            $path = $propFind->getPath();
+            $readPermissions = $this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, false);
+            $writePermissions = $this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, false);
+            if ($readPermissions === false && $writePermissions === false) {
+                $this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, true);
+                $this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, true);
+            }
+        }
 
-		return parent::propFind($propFind, $node);
-	}
+        return parent::propFind($propFind, $node);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -50,11 +50,11 @@ 
 
 	function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
 		$access = parent::checkPrivileges($uri, $privileges, $recursion, false);
-		if($access === false && $throwExceptions) {
+		if ($access === false && $throwExceptions) {
 			/** @var INode $node */
 			$node = $this->server->tree->getNodeForPath($uri);
 
-			switch(get_class($node)) {
+			switch (get_class($node)) {
 				case 'OCA\DAV\CardDAV\AddressBook':
 					$type = 'Addressbook';
 					break;
@@ -77,7 +77,7 @@ 
 	public function propFind(PropFind $propFind, INode $node) {
 		// If the node is neither readable nor writable then fail unless its of
 		// the standard user-principal
-		if(!($node instanceof User)) {
+		if (!($node instanceof User)) {
 			$path = $propFind->getPath();
 			$readPermissions = $this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, false);
 			$writePermissions = $this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, false);

lib/private/Files/Storage/Storage.php

Doc Comments +3 added lines

@@ -100,6 +100,7 @@ 
 	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
 	 * @param \OCP\Lock\ILockingProvider $provider
 	 * @throws \OCP\Lock\LockedException
+	 * @return void
 	 */
 	public function acquireLock($path, $type, ILockingProvider $provider);
 
@@ -108,6 +109,7 @@ 
 	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
 	 * @param \OCP\Lock\ILockingProvider $provider
 	 * @throws \OCP\Lock\LockedException
+	 * @return void
 	 */
 	public function releaseLock($path, $type, ILockingProvider $provider);
 
@@ -116,6 +118,7 @@ 
 	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
 	 * @param \OCP\Lock\ILockingProvider $provider
 	 * @throws \OCP\Lock\LockedException
+	 * @return void
 	 */
 	public function changeLock($path, $type, ILockingProvider $provider);
 }

Indentation +75 added lines, -75 removed lines

@@ -32,90 +32,90 @@
  */
 interface Storage extends \OCP\Files\Storage {
 
-	/**
-	 * get a cache instance for the storage
-	 *
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
-	 * @return \OC\Files\Cache\Cache
-	 */
-	public function getCache($path = '', $storage = null);
+    /**
+     * get a cache instance for the storage
+     *
+     * @param string $path
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
+     * @return \OC\Files\Cache\Cache
+     */
+    public function getCache($path = '', $storage = null);
 
-	/**
-	 * get a scanner instance for the storage
-	 *
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the scanner
-	 * @return \OC\Files\Cache\Scanner
-	 */
-	public function getScanner($path = '', $storage = null);
+    /**
+     * get a scanner instance for the storage
+     *
+     * @param string $path
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the scanner
+     * @return \OC\Files\Cache\Scanner
+     */
+    public function getScanner($path = '', $storage = null);
 
 
-	/**
-	 * get the user id of the owner of a file or folder
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getOwner($path);
+    /**
+     * get the user id of the owner of a file or folder
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getOwner($path);
 
-	/**
-	 * get a watcher instance for the cache
-	 *
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
-	 * @return \OC\Files\Cache\Watcher
-	 */
-	public function getWatcher($path = '', $storage = null);
+    /**
+     * get a watcher instance for the cache
+     *
+     * @param string $path
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
+     * @return \OC\Files\Cache\Watcher
+     */
+    public function getWatcher($path = '', $storage = null);
 
-	/**
-	 * get a propagator instance for the cache
-	 *
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
-	 * @return \OC\Files\Cache\Propagator
-	 */
-	public function getPropagator($storage = null);
+    /**
+     * get a propagator instance for the cache
+     *
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
+     * @return \OC\Files\Cache\Propagator
+     */
+    public function getPropagator($storage = null);
 
-	/**
-	 * get a updater instance for the cache
-	 *
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
-	 * @return \OC\Files\Cache\Updater
-	 */
-	public function getUpdater($storage = null);
+    /**
+     * get a updater instance for the cache
+     *
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
+     * @return \OC\Files\Cache\Updater
+     */
+    public function getUpdater($storage = null);
 
-	/**
-	 * @return \OC\Files\Cache\Storage
-	 */
-	public function getStorageCache();
+    /**
+     * @return \OC\Files\Cache\Storage
+     */
+    public function getStorageCache();
 
-	/**
-	 * @param string $path
-	 * @return array
-	 */
-	public function getMetaData($path);
+    /**
+     * @param string $path
+     * @return array
+     */
+    public function getMetaData($path);
 
-	/**
-	 * @param string $path The path of the file to acquire the lock for
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @param \OCP\Lock\ILockingProvider $provider
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function acquireLock($path, $type, ILockingProvider $provider);
+    /**
+     * @param string $path The path of the file to acquire the lock for
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @param \OCP\Lock\ILockingProvider $provider
+     * @throws \OCP\Lock\LockedException
+     */
+    public function acquireLock($path, $type, ILockingProvider $provider);
 
-	/**
-	 * @param string $path The path of the file to release the lock for
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @param \OCP\Lock\ILockingProvider $provider
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function releaseLock($path, $type, ILockingProvider $provider);
+    /**
+     * @param string $path The path of the file to release the lock for
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @param \OCP\Lock\ILockingProvider $provider
+     * @throws \OCP\Lock\LockedException
+     */
+    public function releaseLock($path, $type, ILockingProvider $provider);
 
-	/**
-	 * @param string $path The path of the file to change the lock for
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @param \OCP\Lock\ILockingProvider $provider
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function changeLock($path, $type, ILockingProvider $provider);
+    /**
+     * @param string $path The path of the file to change the lock for
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @param \OCP\Lock\ILockingProvider $provider
+     * @throws \OCP\Lock\LockedException
+     */
+    public function changeLock($path, $type, ILockingProvider $provider);
 }