Merge pull request #4 from owncloud/class-to-lib

Fix warning when enabling the updater
owncloud · May 14, 2014 · 772aa23 · 772aa23
2 parents bb51d36 + 3408540
commit 772aa23
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 44 deletions.
diff --git a/appinfo/app.php b/appinfo/app.php
@@ -12,49 +12,7 @@
 
 namespace OCA\Updater;
 
-class App {
-
-	const APP_ID = 'updater';
-
-	public static $l10n;
-
-	public static function init() {
-		self::$l10n = \OCP\Util::getL10N(self::APP_ID);
-		\OC::$CLASSPATH['OCA\Updater\Backup'] = self::APP_ID . '/lib/backup.php';
-		\OC::$CLASSPATH['OCA\Updater\Downloader'] = self::APP_ID . '/lib/downloader.php';
-		\OC::$CLASSPATH['OCA\Updater\Updater'] = self::APP_ID . '/lib/updater.php';
-		\OC::$CLASSPATH['OCA\Updater\Helper'] = self::APP_ID . '/lib/helper.php';
-		\OC::$CLASSPATH['OCA\Updater\Location'] = self::APP_ID . '/lib/location.php';
-		\OC::$CLASSPATH['OCA\Updater\Location_3rdparty'] = self::APP_ID . '/lib/location/3rdparty.php';
-		\OC::$CLASSPATH['OCA\Updater\Location_Apps'] = self::APP_ID . '/lib/location/apps.php';
-		\OC::$CLASSPATH['OCA\Updater\Location_Core'] = self::APP_ID . '/lib/location/core.php';
-
-		//Allow config page
-		\OCP\App::registerAdmin(self::APP_ID, 'admin');
-	}
+//Startup
+App::init();
 
-	/**
-	 * Get app working directory
-	 * @return string
-	 */
-	public static function getBackupBase() {
-		return \OCP\Config::getSystemValue("datadirectory", \OC::$SERVERROOT . "/data") . '/updater_backup/';
-	}
-
-	public static function getLegacyBackupBase() {
-		return \OC::$SERVERROOT . '/backup/';
-	}
-
-	public static function getTempBase(){
-		return \OC::$SERVERROOT . "/_oc-upgrade/";
-	}
-
-	public static function log($message, $level= \OC_Log::ERROR) {
-		\OCP\Util::writeLog(self::APP_ID, $message, $level);
-	}
-}
 
-//Startup
-if (\OCP\App::isEnabled(App::APP_ID)) {
-	App::init();
-}
diff --git a/lib/app.php b/lib/app.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * ownCloud - Updater plugin
+ *
+ * @author Victor Dubiniuk
+ * @copyright 2014 Victor Dubiniuk victor.dubiniuk@gmail.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ */
+
+namespace OCA\Updater;
+
+class App {
+
+	const APP_ID = 'updater';
+
+	public static $l10n;
+
+	public static function init() {
+		self::$l10n = \OCP\Util::getL10N(self::APP_ID);
+		\OC::$CLASSPATH['OCA\Updater\Backup'] = self::APP_ID . '/lib/backup.php';
+		\OC::$CLASSPATH['OCA\Updater\Downloader'] = self::APP_ID . '/lib/downloader.php';
+		\OC::$CLASSPATH['OCA\Updater\Updater'] = self::APP_ID . '/lib/updater.php';
+		\OC::$CLASSPATH['OCA\Updater\Helper'] = self::APP_ID . '/lib/helper.php';
+		\OC::$CLASSPATH['OCA\Updater\Location'] = self::APP_ID . '/lib/location.php';
+		\OC::$CLASSPATH['OCA\Updater\Location_3rdparty'] = self::APP_ID . '/lib/location/3rdparty.php';
+		\OC::$CLASSPATH['OCA\Updater\Location_Apps'] = self::APP_ID . '/lib/location/apps.php';
+		\OC::$CLASSPATH['OCA\Updater\Location_Core'] = self::APP_ID . '/lib/location/core.php';
+
+		//Allow config page
+		\OCP\App::registerAdmin(self::APP_ID, 'admin');
+	}
+
+	/**
+	 * Get app working directory
+	 * @return string
+	 */
+	public static function getBackupBase() {
+		return \OCP\Config::getSystemValue("datadirectory", \OC::$SERVERROOT . "/data") . '/updater_backup/';
+	}
+
+	public static function getLegacyBackupBase() {
+		return \OC::$SERVERROOT . '/backup/';
+	}
+
+	public static function getTempBase(){
+		return \OC::$SERVERROOT . "/_oc-upgrade/";
+	}
+
+	public static function log($message, $level= \OC_Log::ERROR) {
+		\OCP\Util::writeLog(self::APP_ID, $message, $level);
+	}
+}