nextcloud / server

apps/files_sharing/lib/ShareBackend/File.php

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 	 */
 	public function generateTarget($filePath, $shareWith, $exclude = null) {
 		$shareFolder = \OCA\Files_Sharing\Helper::getShareFolder();
-		$target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath));
+		$target = \OC\Files\Filesystem::normalizePath($shareFolder.'/'.basename($filePath));
 
 		// for group shares we return the target right away
 		if ($shareWith === false) {
@@ -104,13 +104,13 @@ 
 		}
 
 		\OC\Files\Filesystem::initMountPoints($shareWith);
-		$view = new \OC\Files\View('/' . $shareWith . '/files');
+		$view = new \OC\Files\View('/'.$shareWith.'/files');
 
 		if (!$view->is_dir($shareFolder)) {
 			$dir = '';
 			$subdirs = explode('/', $shareFolder);
 			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
+				$dir = $dir.'/'.$subdir;
 				if (!$view->is_dir($dir)) {
 					$view->mkdir($dir);
 				}
@@ -237,7 +237,7 @@ 
 		if ($share['item_type'] === 'folder' && $target !== '') {
 			// note: in case of ext storage mount points the path might be empty
 			// which would cause a leading slash to appear
-			$share['path'] = ltrim($share['path'] . '/' . $target, '/');
+			$share['path'] = ltrim($share['path'].'/'.$target, '/');
 		}
 		return self::resolveReshares($share);
 	}

Indentation +204 added lines, -204 removed lines

@@ -37,208 +37,208 @@
 
 class File implements \OCP\Share_Backend_File_Dependent {
 
-	const FORMAT_SHARED_STORAGE = 0;
-	const FORMAT_GET_FOLDER_CONTENTS = 1;
-	const FORMAT_FILE_APP_ROOT = 2;
-	const FORMAT_OPENDIR = 3;
-	const FORMAT_GET_ALL = 4;
-	const FORMAT_PERMISSIONS = 5;
-	const FORMAT_TARGET_NAMES = 6;
-
-	private $path;
-
-	/** @var FederatedShareProvider */
-	private $federatedShareProvider;
-
-	public function __construct(FederatedShareProvider $federatedShareProvider = null) {
-		if ($federatedShareProvider) {
-			$this->federatedShareProvider = $federatedShareProvider;
-		} else {
-			$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
-			$this->federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
-		}
-	}
-
-	public function isValidSource($itemSource, $uidOwner) {
-		try {
-			$path = \OC\Files\Filesystem::getPath($itemSource);
-			// FIXME: attributes should not be set here,
-			// keeping this pattern for now to avoid unexpected
-			// regressions
-			$this->path = \OC\Files\Filesystem::normalizePath(basename($path));
-			return true;
-		} catch (\OCP\Files\NotFoundException $e) {
-			return false;
-		}
-	}
-
-	public function getFilePath($itemSource, $uidOwner) {
-		if (isset($this->path)) {
-			$path = $this->path;
-			$this->path = null;
-			return $path;
-		} else {
-			try {
-				$path = \OC\Files\Filesystem::getPath($itemSource);
-				return $path;
-			} catch (\OCP\Files\NotFoundException $e) {
-				return false;
-			}
-		}
-	}
-
-	/**
-	 * create unique target
-	 * @param string $filePath
-	 * @param string $shareWith
-	 * @param array $exclude (optional)
-	 * @return string
-	 */
-	public function generateTarget($filePath, $shareWith, $exclude = null) {
-		$shareFolder = \OCA\Files_Sharing\Helper::getShareFolder();
-		$target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath));
-
-		// for group shares we return the target right away
-		if ($shareWith === false) {
-			return $target;
-		}
-
-		\OC\Files\Filesystem::initMountPoints($shareWith);
-		$view = new \OC\Files\View('/' . $shareWith . '/files');
-
-		if (!$view->is_dir($shareFolder)) {
-			$dir = '';
-			$subdirs = explode('/', $shareFolder);
-			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
-				if (!$view->is_dir($dir)) {
-					$view->mkdir($dir);
-				}
-			}
-		}
-
-		$excludeList = (is_array($exclude)) ? $exclude : array();
-
-		return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view);
-	}
-
-	public function formatItems($items, $format, $parameters = null) {
-		if ($format === self::FORMAT_SHARED_STORAGE) {
-			// Only 1 item should come through for this format call
-			$item = array_shift($items);
-			return array(
-				'parent' => $item['parent'],
-				'path' => $item['path'],
-				'storage' => $item['storage'],
-				'permissions' => $item['permissions'],
-				'uid_owner' => $item['uid_owner'],
-			);
-		} else if ($format === self::FORMAT_GET_FOLDER_CONTENTS) {
-			$files = array();
-			foreach ($items as $item) {
-				$file = array();
-				$file['fileid'] = $item['file_source'];
-				$file['storage'] = $item['storage'];
-				$file['path'] = $item['file_target'];
-				$file['parent'] = $item['file_parent'];
-				$file['name'] = basename($item['file_target']);
-				$file['mimetype'] = $item['mimetype'];
-				$file['mimepart'] = $item['mimepart'];
-				$file['mtime'] = $item['mtime'];
-				$file['encrypted'] = $item['encrypted'];
-				$file['etag'] = $item['etag'];
-				$file['uid_owner'] = $item['uid_owner'];
-				$file['displayname_owner'] = $item['displayname_owner'];
-
-				$storage = \OC\Files\Filesystem::getStorage('/');
-				$cache = $storage->getCache();
-				$file['size'] = $item['size'];
-				$files[] = $file;
-			}
-			return $files;
-		} else if ($format === self::FORMAT_OPENDIR) {
-			$files = array();
-			foreach ($items as $item) {
-				$files[] = basename($item['file_target']);
-			}
-			return $files;
-		} else if ($format === self::FORMAT_GET_ALL) {
-			$ids = array();
-			foreach ($items as $item) {
-				$ids[] = $item['file_source'];
-			}
-			return $ids;
-		} else if ($format === self::FORMAT_PERMISSIONS) {
-			$filePermissions = array();
-			foreach ($items as $item) {
-				$filePermissions[$item['file_source']] = $item['permissions'];
-			}
-			return $filePermissions;
-		} else if ($format === self::FORMAT_TARGET_NAMES) {
-			$targets = array();
-			foreach ($items as $item) {
-				$targets[] = $item['file_target'];
-			}
-			return $targets;
-		}
-		return array();
-	}
-
-	/**
-	 * check if server2server share is enabled
-	 *
-	 * @param int $shareType
-	 * @return boolean
-	 */
-	public function isShareTypeAllowed($shareType) {
-		if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
-			return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
-		}
-
-		return true;
-	}
-
-	/**
-	 * resolve reshares to return the correct source item
-	 * @param array $source
-	 * @return array source item
-	 */
-	protected static function resolveReshares($source) {
-		if (isset($source['parent'])) {
-			$parent = $source['parent'];
-			while (isset($parent)) {
-				$query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
-				$item = $query->execute(array($parent))->fetchRow();
-				if (isset($item['parent'])) {
-					$parent = $item['parent'];
-				} else {
-					$fileOwner = $item['uid_owner'];
-					break;
-				}
-			}
-		} else {
-			$fileOwner = $source['uid_owner'];
-		}
-		if (isset($fileOwner)) {
-			$source['fileOwner'] = $fileOwner;
-		} else {
-			\OCP\Util::writeLog('files_sharing', "No owner found for reshare", \OCP\Util::ERROR);
-		}
-
-		return $source;
-	}
-
-	/**
-	 * @param string $target
-	 * @param array $share
-	 * @return array|false source item
-	 */
-	public static function getSource($target, $share) {
-		if ($share['item_type'] === 'folder' && $target !== '') {
-			// note: in case of ext storage mount points the path might be empty
-			// which would cause a leading slash to appear
-			$share['path'] = ltrim($share['path'] . '/' . $target, '/');
-		}
-		return self::resolveReshares($share);
-	}
+    const FORMAT_SHARED_STORAGE = 0;
+    const FORMAT_GET_FOLDER_CONTENTS = 1;
+    const FORMAT_FILE_APP_ROOT = 2;
+    const FORMAT_OPENDIR = 3;
+    const FORMAT_GET_ALL = 4;
+    const FORMAT_PERMISSIONS = 5;
+    const FORMAT_TARGET_NAMES = 6;
+
+    private $path;
+
+    /** @var FederatedShareProvider */
+    private $federatedShareProvider;
+
+    public function __construct(FederatedShareProvider $federatedShareProvider = null) {
+        if ($federatedShareProvider) {
+            $this->federatedShareProvider = $federatedShareProvider;
+        } else {
+            $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
+            $this->federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
+        }
+    }
+
+    public function isValidSource($itemSource, $uidOwner) {
+        try {
+            $path = \OC\Files\Filesystem::getPath($itemSource);
+            // FIXME: attributes should not be set here,
+            // keeping this pattern for now to avoid unexpected
+            // regressions
+            $this->path = \OC\Files\Filesystem::normalizePath(basename($path));
+            return true;
+        } catch (\OCP\Files\NotFoundException $e) {
+            return false;
+        }
+    }
+
+    public function getFilePath($itemSource, $uidOwner) {
+        if (isset($this->path)) {
+            $path = $this->path;
+            $this->path = null;
+            return $path;
+        } else {
+            try {
+                $path = \OC\Files\Filesystem::getPath($itemSource);
+                return $path;
+            } catch (\OCP\Files\NotFoundException $e) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * create unique target
+     * @param string $filePath
+     * @param string $shareWith
+     * @param array $exclude (optional)
+     * @return string
+     */
+    public function generateTarget($filePath, $shareWith, $exclude = null) {
+        $shareFolder = \OCA\Files_Sharing\Helper::getShareFolder();
+        $target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath));
+
+        // for group shares we return the target right away
+        if ($shareWith === false) {
+            return $target;
+        }
+
+        \OC\Files\Filesystem::initMountPoints($shareWith);
+        $view = new \OC\Files\View('/' . $shareWith . '/files');
+
+        if (!$view->is_dir($shareFolder)) {
+            $dir = '';
+            $subdirs = explode('/', $shareFolder);
+            foreach ($subdirs as $subdir) {
+                $dir = $dir . '/' . $subdir;
+                if (!$view->is_dir($dir)) {
+                    $view->mkdir($dir);
+                }
+            }
+        }
+
+        $excludeList = (is_array($exclude)) ? $exclude : array();
+
+        return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view);
+    }
+
+    public function formatItems($items, $format, $parameters = null) {
+        if ($format === self::FORMAT_SHARED_STORAGE) {
+            // Only 1 item should come through for this format call
+            $item = array_shift($items);
+            return array(
+                'parent' => $item['parent'],
+                'path' => $item['path'],
+                'storage' => $item['storage'],
+                'permissions' => $item['permissions'],
+                'uid_owner' => $item['uid_owner'],
+            );
+        } else if ($format === self::FORMAT_GET_FOLDER_CONTENTS) {
+            $files = array();
+            foreach ($items as $item) {
+                $file = array();
+                $file['fileid'] = $item['file_source'];
+                $file['storage'] = $item['storage'];
+                $file['path'] = $item['file_target'];
+                $file['parent'] = $item['file_parent'];
+                $file['name'] = basename($item['file_target']);
+                $file['mimetype'] = $item['mimetype'];
+                $file['mimepart'] = $item['mimepart'];
+                $file['mtime'] = $item['mtime'];
+                $file['encrypted'] = $item['encrypted'];
+                $file['etag'] = $item['etag'];
+                $file['uid_owner'] = $item['uid_owner'];
+                $file['displayname_owner'] = $item['displayname_owner'];
+
+                $storage = \OC\Files\Filesystem::getStorage('/');
+                $cache = $storage->getCache();
+                $file['size'] = $item['size'];
+                $files[] = $file;
+            }
+            return $files;
+        } else if ($format === self::FORMAT_OPENDIR) {
+            $files = array();
+            foreach ($items as $item) {
+                $files[] = basename($item['file_target']);
+            }
+            return $files;
+        } else if ($format === self::FORMAT_GET_ALL) {
+            $ids = array();
+            foreach ($items as $item) {
+                $ids[] = $item['file_source'];
+            }
+            return $ids;
+        } else if ($format === self::FORMAT_PERMISSIONS) {
+            $filePermissions = array();
+            foreach ($items as $item) {
+                $filePermissions[$item['file_source']] = $item['permissions'];
+            }
+            return $filePermissions;
+        } else if ($format === self::FORMAT_TARGET_NAMES) {
+            $targets = array();
+            foreach ($items as $item) {
+                $targets[] = $item['file_target'];
+            }
+            return $targets;
+        }
+        return array();
+    }
+
+    /**
+     * check if server2server share is enabled
+     *
+     * @param int $shareType
+     * @return boolean
+     */
+    public function isShareTypeAllowed($shareType) {
+        if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
+            return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
+        }
+
+        return true;
+    }
+
+    /**
+     * resolve reshares to return the correct source item
+     * @param array $source
+     * @return array source item
+     */
+    protected static function resolveReshares($source) {
+        if (isset($source['parent'])) {
+            $parent = $source['parent'];
+            while (isset($parent)) {
+                $query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+                $item = $query->execute(array($parent))->fetchRow();
+                if (isset($item['parent'])) {
+                    $parent = $item['parent'];
+                } else {
+                    $fileOwner = $item['uid_owner'];
+                    break;
+                }
+            }
+        } else {
+            $fileOwner = $source['uid_owner'];
+        }
+        if (isset($fileOwner)) {
+            $source['fileOwner'] = $fileOwner;
+        } else {
+            \OCP\Util::writeLog('files_sharing', "No owner found for reshare", \OCP\Util::ERROR);
+        }
+
+        return $source;
+    }
+
+    /**
+     * @param string $target
+     * @param array $share
+     * @return array|false source item
+     */
+    public static function getSource($target, $share) {
+        if ($share['item_type'] === 'folder' && $target !== '') {
+            // note: in case of ext storage mount points the path might be empty
+            // which would cause a leading slash to appear
+            $share['path'] = ltrim($share['path'] . '/' . $target, '/');
+        }
+        return self::resolveReshares($share);
+    }
 }

apps/files_sharing/public.php

Indentation +4 added lines, -4 removed lines

@@ -28,9 +28,9 @@
 $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
 
 if($token !== '') {
-	OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token)));
+    OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token)));
 } else {
-	header('HTTP/1.0 404 Not Found');
-	$tmpl = new OCP\Template('', '404', 'guest');
-	print_unescaped($tmpl->fetchPage());
+    header('HTTP/1.0 404 Not Found');
+    $tmpl = new OCP\Template('', '404', 'guest');
+    print_unescaped($tmpl->fetchPage());
 }

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 $token = isset($_GET['t']) ? $_GET['t'] : '';
 $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
 
-if($token !== '') {
+if ($token !== '') {
 	OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token)));
 } else {
 	header('HTTP/1.0 404 Not Found');

apps/provisioning_api/lib/Controller/AppConfigController.php

Indentation +123 added lines, -123 removed lines

@@ -31,127 +31,127 @@
 
 class AppConfigController extends OCSController {
 
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IAppConfig */
-	protected $appConfig;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IAppConfig $appConfig
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IConfig $config,
-								IAppConfig $appConfig) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-		$this->appConfig = $appConfig;
-	}
-
-	/**
-	 * @return DataResponse
-	 */
-	public function getApps() {
-		return new DataResponse([
-			'data' => $this->appConfig->getApps(),
-		]);
-	}
-
-	/**
-	 * @param string $app
-	 * @return DataResponse
-	 */
-	public function getKeys($app) {
-		try {
-			$this->verifyAppId($app);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-		return new DataResponse([
-			'data' => $this->config->getAppKeys($app),
-		]);
-	}
-
-	/**
-	 * @param string $app
-	 * @param string $key
-	 * @param string $defaultValue
-	 * @return DataResponse
-	 */
-	public function getValue($app, $key, $defaultValue = '') {
-		try {
-			$this->verifyAppId($app);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-		return new DataResponse([
-			'data' => $this->config->getAppValue($app, $key, $defaultValue),
-		]);
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @param string $app
-	 * @param string $key
-	 * @param string $value
-	 * @return DataResponse
-	 */
-	public function setValue($app, $key, $value) {
-		try {
-			$this->verifyAppId($app);
-			$this->verifyConfigKey($app, $key);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-
-		$this->config->setAppValue($app, $key, $value);
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @param string $app
-	 * @param string $key
-	 * @return DataResponse
-	 */
-	public function deleteKey($app, $key) {
-		try {
-			$this->verifyAppId($app);
-			$this->verifyConfigKey($app, $key);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-
-		$this->config->deleteAppValue($app, $key);
-		return new DataResponse();
-	}
-
-	/**
-	 * @param string $app
-	 * @throws \InvalidArgumentException
-	 */
-	protected function verifyAppId($app) {
-		if (\OC_App::cleanAppId($app) !== $app) {
-			throw new \InvalidArgumentException('Invalid app id given');
-		}
-	}
-
-	/**
-	 * @param string $app
-	 * @param string $key
-	 * @throws \InvalidArgumentException
-	 */
-	protected function verifyConfigKey($app, $key) {
-		if (in_array($key, ['installed_version', 'enabled', 'types'])) {
-			throw new \InvalidArgumentException('The given key can not be set');
-		}
-
-		if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
-			throw new \InvalidArgumentException('The given key can not be set');
-		}
-	}
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IAppConfig */
+    protected $appConfig;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IAppConfig $appConfig
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IAppConfig $appConfig) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+        $this->appConfig = $appConfig;
+    }
+
+    /**
+     * @return DataResponse
+     */
+    public function getApps() {
+        return new DataResponse([
+            'data' => $this->appConfig->getApps(),
+        ]);
+    }
+
+    /**
+     * @param string $app
+     * @return DataResponse
+     */
+    public function getKeys($app) {
+        try {
+            $this->verifyAppId($app);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+        return new DataResponse([
+            'data' => $this->config->getAppKeys($app),
+        ]);
+    }
+
+    /**
+     * @param string $app
+     * @param string $key
+     * @param string $defaultValue
+     * @return DataResponse
+     */
+    public function getValue($app, $key, $defaultValue = '') {
+        try {
+            $this->verifyAppId($app);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+        return new DataResponse([
+            'data' => $this->config->getAppValue($app, $key, $defaultValue),
+        ]);
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @param string $key
+     * @param string $value
+     * @return DataResponse
+     */
+    public function setValue($app, $key, $value) {
+        try {
+            $this->verifyAppId($app);
+            $this->verifyConfigKey($app, $key);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+
+        $this->config->setAppValue($app, $key, $value);
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @param string $key
+     * @return DataResponse
+     */
+    public function deleteKey($app, $key) {
+        try {
+            $this->verifyAppId($app);
+            $this->verifyConfigKey($app, $key);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+
+        $this->config->deleteAppValue($app, $key);
+        return new DataResponse();
+    }
+
+    /**
+     * @param string $app
+     * @throws \InvalidArgumentException
+     */
+    protected function verifyAppId($app) {
+        if (\OC_App::cleanAppId($app) !== $app) {
+            throw new \InvalidArgumentException('Invalid app id given');
+        }
+    }
+
+    /**
+     * @param string $app
+     * @param string $key
+     * @throws \InvalidArgumentException
+     */
+    protected function verifyConfigKey($app, $key) {
+        if (in_array($key, ['installed_version', 'enabled', 'types'])) {
+            throw new \InvalidArgumentException('The given key can not be set');
+        }
+
+        if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
+            throw new \InvalidArgumentException('The given key can not be set');
+        }
+    }
 }

apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php

Indentation +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@
 use OCP\AppFramework\Http;
 
 class NotSubAdminException extends \Exception {
-	public function __construct() {
-		parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
-	}
+    public function __construct() {
+        parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
+    }
 }
\ No newline at end of file

apps/updatenotification/lib/Controller/AdminController.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
 		$currentChannel = \OCP\Util::getChannel();
 
 		// Remove the currently used channel from the channels list
-		if(($key = array_search($currentChannel, $channels)) !== false) {
+		if (($key = array_search($currentChannel, $channels)) !== false) {
 			unset($channels[$key]);
 		}
 		$updateState = $this->updateChecker->getUpdateState();

Indentation +139 added lines, -139 removed lines

@@ -37,143 +37,143 @@
 use OCP\Settings\ISettings;
 
 class AdminController extends Controller implements ISettings {
-	/** @var IJobList */
-	private $jobList;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var IConfig */
-	private $config;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var UpdateChecker */
-	private $updateChecker;
-	/** @var IL10N */
-	private $l10n;
-	/** @var IDateTimeFormatter */
-	private $dateTimeFormatter;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IJobList $jobList
-	 * @param ISecureRandom $secureRandom
-	 * @param IConfig $config
-	 * @param ITimeFactory $timeFactory
-	 * @param IL10N $l10n
-	 * @param UpdateChecker $updateChecker
-	 * @param IDateTimeFormatter $dateTimeFormatter
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IJobList $jobList,
-								ISecureRandom $secureRandom,
-								IConfig $config,
-								ITimeFactory $timeFactory,
-								IL10N $l10n,
-								UpdateChecker $updateChecker,
-								IDateTimeFormatter $dateTimeFormatter) {
-		parent::__construct($appName, $request);
-		$this->jobList = $jobList;
-		$this->secureRandom = $secureRandom;
-		$this->config = $config;
-		$this->timeFactory = $timeFactory;
-		$this->l10n = $l10n;
-		$this->updateChecker = $updateChecker;
-		$this->dateTimeFormatter = $dateTimeFormatter;
-	}
-
-	/**
-	 * @return TemplateResponse
-	 */
-	public function displayPanel() {
-		$lastUpdateCheckTimestamp = $this->config->getAppValue('core', 'lastupdatedat');
-		$lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
-
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-		$currentChannel = \OCP\Util::getChannel();
-
-		// Remove the currently used channel from the channels list
-		if(($key = array_search($currentChannel, $channels)) !== false) {
-			unset($channels[$key]);
-		}
-		$updateState = $this->updateChecker->getUpdateState();
-
-		$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
-
-		$defaultUpdateServerURL = 'https://updates.nextcloud.com/server/';
-		$updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
-
-		$params = [
-			'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
-			'isUpdateChecked' => $lastUpdateCheckTimestamp > 0,
-			'lastChecked' => $lastUpdateCheck,
-			'currentChannel' => $currentChannel,
-			'channels' => $channels,
-			'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'],
-			'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'],
-			'updaterEnabled' => (empty($updateState['updaterEnabled'])) ? false : $updateState['updaterEnabled'],
-			'isDefaultUpdateServerURL' => $updateServerURL === $defaultUpdateServerURL,
-			'updateServerURL' => $updateServerURL,
-			'notify_groups' => implode('|', $notifyGroups),
-		];
-
-		return new TemplateResponse($this->appName, 'admin', $params, '');
-	}
-
-	/**
-	 * @UseSession
-	 *
-	 * @param string $channel
-	 * @return DataResponse
-	 */
-	public function setChannel($channel) {
-		\OCP\Util::setChannel($channel);
-		$this->config->setAppValue('core', 'lastupdatedat', 0);
-		return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]);
-	}
-
-	/**
-	 * @return DataResponse
-	 */
-	public function createCredentials() {
-		// Create a new job and store the creation date
-		$this->jobList->add('OCA\UpdateNotification\ResetTokenBackgroundJob');
-		$this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime());
-
-		// Create a new token
-		$newToken = $this->secureRandom->generate(64);
-		$this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT));
-
-		return new DataResponse($newToken);
-	}
-
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 */
-	public function getForm() {
-		return $this->displayPanel();
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'server';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 1;
-	}
+    /** @var IJobList */
+    private $jobList;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var IConfig */
+    private $config;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var UpdateChecker */
+    private $updateChecker;
+    /** @var IL10N */
+    private $l10n;
+    /** @var IDateTimeFormatter */
+    private $dateTimeFormatter;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IJobList $jobList
+     * @param ISecureRandom $secureRandom
+     * @param IConfig $config
+     * @param ITimeFactory $timeFactory
+     * @param IL10N $l10n
+     * @param UpdateChecker $updateChecker
+     * @param IDateTimeFormatter $dateTimeFormatter
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IJobList $jobList,
+                                ISecureRandom $secureRandom,
+                                IConfig $config,
+                                ITimeFactory $timeFactory,
+                                IL10N $l10n,
+                                UpdateChecker $updateChecker,
+                                IDateTimeFormatter $dateTimeFormatter) {
+        parent::__construct($appName, $request);
+        $this->jobList = $jobList;
+        $this->secureRandom = $secureRandom;
+        $this->config = $config;
+        $this->timeFactory = $timeFactory;
+        $this->l10n = $l10n;
+        $this->updateChecker = $updateChecker;
+        $this->dateTimeFormatter = $dateTimeFormatter;
+    }
+
+    /**
+     * @return TemplateResponse
+     */
+    public function displayPanel() {
+        $lastUpdateCheckTimestamp = $this->config->getAppValue('core', 'lastupdatedat');
+        $lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
+
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+        $currentChannel = \OCP\Util::getChannel();
+
+        // Remove the currently used channel from the channels list
+        if(($key = array_search($currentChannel, $channels)) !== false) {
+            unset($channels[$key]);
+        }
+        $updateState = $this->updateChecker->getUpdateState();
+
+        $notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
+
+        $defaultUpdateServerURL = 'https://updates.nextcloud.com/server/';
+        $updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
+
+        $params = [
+            'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
+            'isUpdateChecked' => $lastUpdateCheckTimestamp > 0,
+            'lastChecked' => $lastUpdateCheck,
+            'currentChannel' => $currentChannel,
+            'channels' => $channels,
+            'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'],
+            'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'],
+            'updaterEnabled' => (empty($updateState['updaterEnabled'])) ? false : $updateState['updaterEnabled'],
+            'isDefaultUpdateServerURL' => $updateServerURL === $defaultUpdateServerURL,
+            'updateServerURL' => $updateServerURL,
+            'notify_groups' => implode('|', $notifyGroups),
+        ];
+
+        return new TemplateResponse($this->appName, 'admin', $params, '');
+    }
+
+    /**
+     * @UseSession
+     *
+     * @param string $channel
+     * @return DataResponse
+     */
+    public function setChannel($channel) {
+        \OCP\Util::setChannel($channel);
+        $this->config->setAppValue('core', 'lastupdatedat', 0);
+        return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]);
+    }
+
+    /**
+     * @return DataResponse
+     */
+    public function createCredentials() {
+        // Create a new job and store the creation date
+        $this->jobList->add('OCA\UpdateNotification\ResetTokenBackgroundJob');
+        $this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime());
+
+        // Create a new token
+        $newToken = $this->secureRandom->generate(64);
+        $this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT));
+
+        return new DataResponse($newToken);
+    }
+
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     */
+    public function getForm() {
+        return $this->displayPanel();
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'server';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 1;
+    }
 }

apps/updatenotification/lib/UpdateChecker.php

Indentation +38 added lines, -38 removed lines

@@ -26,48 +26,48 @@
 use OC\Updater\VersionCheck;
 
 class UpdateChecker {
-	/** @var VersionCheck */
-	private $updater;
+    /** @var VersionCheck */
+    private $updater;
 
-	/**
-	 * @param VersionCheck $updater
-	 */
-	public function __construct(VersionCheck $updater) {
-		$this->updater = $updater;
-	}
+    /**
+     * @param VersionCheck $updater
+     */
+    public function __construct(VersionCheck $updater) {
+        $this->updater = $updater;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getUpdateState() {
-		$data = $this->updater->check();
-		$result = [];
+    /**
+     * @return array
+     */
+    public function getUpdateState() {
+        $data = $this->updater->check();
+        $result = [];
 
-		if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
-			$result['updateAvailable'] = true;
-			$result['updateVersion'] = $data['versionstring'];
-			$result['updaterEnabled'] = $data['autoupdater'] === '1';
-			if(substr($data['web'], 0, 8) === 'https://') {
-				$result['updateLink'] = $data['web'];
-			}
-			if(substr($data['url'], 0, 8) === 'https://') {
-				$result['downloadLink'] = $data['url'];
-			}
+        if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
+            $result['updateAvailable'] = true;
+            $result['updateVersion'] = $data['versionstring'];
+            $result['updaterEnabled'] = $data['autoupdater'] === '1';
+            if(substr($data['web'], 0, 8) === 'https://') {
+                $result['updateLink'] = $data['web'];
+            }
+            if(substr($data['url'], 0, 8) === 'https://') {
+                $result['downloadLink'] = $data['url'];
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		return [];
-	}
+        return [];
+    }
 
-	/**
-	 * @param array $data
-	 */
-	public function getJavaScript(array $data) {
-		$data['array']['oc_updateState'] =  json_encode([
-			'updateAvailable' => true,
-			'updateVersion' => $this->getUpdateState()['updateVersion'],
-			'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '',
-		]);
-	}
+    /**
+     * @param array $data
+     */
+    public function getJavaScript(array $data) {
+        $data['array']['oc_updateState'] =  json_encode([
+            'updateAvailable' => true,
+            'updateVersion' => $this->getUpdateState()['updateVersion'],
+            'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '',
+        ]);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -43,14 +43,14 @@ 
 		$data = $this->updater->check();
 		$result = [];
 
-		if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
+		if (isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
 			$result['updateAvailable'] = true;
 			$result['updateVersion'] = $data['versionstring'];
 			$result['updaterEnabled'] = $data['autoupdater'] === '1';
-			if(substr($data['web'], 0, 8) === 'https://') {
+			if (substr($data['web'], 0, 8) === 'https://') {
 				$result['updateLink'] = $data['web'];
 			}
-			if(substr($data['url'], 0, 8) === 'https://') {
+			if (substr($data['url'], 0, 8) === 'https://') {
 				$result['downloadLink'] = $data['url'];
 			}
 
@@ -64,7 +64,7 @@ 
 	 * @param array $data
 	 */
 	public function getJavaScript(array $data) {
-		$data['array']['oc_updateState'] =  json_encode([
+		$data['array']['oc_updateState'] = json_encode([
 			'updateAvailable' => true,
 			'updateVersion' => $this->getUpdateState()['updateVersion'],
 			'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '',

apps/updatenotification/lib/AppInfo/Application.php

Indentation +21 added lines, -21 removed lines

@@ -30,27 +30,27 @@
 use OCP\AppFramework\IAppContainer;
 
 class Application extends App {
-	public function __construct (array $urlParams = array()) {
-		parent::__construct('updatenotification', $urlParams);
-		$container = $this->getContainer();
+    public function __construct (array $urlParams = array()) {
+        parent::__construct('updatenotification', $urlParams);
+        $container = $this->getContainer();
 
-		$container->registerService('AdminController', function(IAppContainer $c) {
-			$updater = new \OC\Updater\VersionCheck(
-				\OC::$server->getHTTPClientService(),
-				\OC::$server->getConfig()
-			);
-			return new AdminController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$c->getServer()->getJobList(),
-				$c->getServer()->getSecureRandom(),
-				$c->getServer()->getConfig(),
-				new TimeFactory(),
-				$c->getServer()->getL10N($c->query('AppName')),
-				new UpdateChecker($updater),
-				$c->getServer()->getDateTimeFormatter()
-			);
-		});
-	}
+        $container->registerService('AdminController', function(IAppContainer $c) {
+            $updater = new \OC\Updater\VersionCheck(
+                \OC::$server->getHTTPClientService(),
+                \OC::$server->getConfig()
+            );
+            return new AdminController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $c->getServer()->getJobList(),
+                $c->getServer()->getSecureRandom(),
+                $c->getServer()->getConfig(),
+                new TimeFactory(),
+                $c->getServer()->getL10N($c->query('AppName')),
+                new UpdateChecker($updater),
+                $c->getServer()->getDateTimeFormatter()
+            );
+        });
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 use OCP\AppFramework\IAppContainer;
 
 class Application extends App {
-	public function __construct (array $urlParams = array()) {
+	public function __construct(array $urlParams = array()) {
 		parent::__construct('updatenotification', $urlParams);
 		$container = $this->getContainer();
 

apps/updatenotification/lib/ResetTokenBackgroundJob.php

Indentation +35 added lines, -35 removed lines

@@ -34,44 +34,44 @@
  * @package OCA\UpdateNotification
  */
 class ResetTokenBackgroundJob extends TimedJob {
-	/** @var IConfig */
-	private $config;
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var IConfig */
+    private $config;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	/**
-	 * @param IConfig|null $config
-	 * @param ITimeFactory|null $timeFactory
-	 */
-	public function __construct(IConfig $config = null,
-								ITimeFactory $timeFactory = null) {
-		// Run all 10 minutes
-		$this->setInterval(60 * 10);
+    /**
+     * @param IConfig|null $config
+     * @param ITimeFactory|null $timeFactory
+     */
+    public function __construct(IConfig $config = null,
+                                ITimeFactory $timeFactory = null) {
+        // Run all 10 minutes
+        $this->setInterval(60 * 10);
 
-		if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) {
-			$this->config = $config;
-			$this->timeFactory = $timeFactory;
-		} else {
-			$this->fixDIForJobs();
-		}
-	}
+        if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) {
+            $this->config = $config;
+            $this->timeFactory = $timeFactory;
+        } else {
+            $this->fixDIForJobs();
+        }
+    }
 
-	/**
-	 * DI for jobs
-	 */
-	private function fixDIForJobs() {
-		$this->config = \OC::$server->getConfig();
-		$this->timeFactory = new TimeFactory();
-	}
+    /**
+     * DI for jobs
+     */
+    private function fixDIForJobs() {
+        $this->config = \OC::$server->getConfig();
+        $this->timeFactory = new TimeFactory();
+    }
 
-	/**
-	 * @param $argument
-	 */
-	protected function run($argument) {
-		// Delete old tokens after 2 days
-		if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
-			$this->config->deleteSystemValue('updater.secret');
-		}
-	}
+    /**
+     * @param $argument
+     */
+    protected function run($argument) {
+        // Delete old tokens after 2 days
+        if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
+            $this->config->deleteSystemValue('updater.secret');
+        }
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	 */
 	protected function run($argument) {
 		// Delete old tokens after 2 days
-		if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
+		if ($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
 			$this->config->deleteSystemValue('updater.secret');
 		}
 	}

apps/updatenotification/appinfo/routes.php

Indentation +2 added lines, -2 removed lines

@@ -25,6 +25,6 @@
 
 $application = new Application();
 $application->registerRoutes($this, ['routes' => [
-	['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
-	['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
+    ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
+    ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
 ]]);