diff options
| author | Jakob Sack <kde@jakobsack.de> | 2011-03-03 21:55:32 +0100 |
|---|---|---|
| committer | Jakob Sack <kde@jakobsack.de> | 2011-03-03 21:55:32 +0100 |
| commit | ae5dc3efdffef75c48e5ef7cac6b40cd5720442b (patch) | |
| tree | 53a0ecc40c827ae255e6f7c95a37c9a52b6d4ab8 /lib/base.php | |
| parent | 94b405b64fdd1427873e49888fb0527640a10eb6 (diff) | |
| download | nextcloud-server-ae5dc3efdffef75c48e5ef7cac6b40cd5720442b.tar.gz nextcloud-server-ae5dc3efdffef75c48e5ef7cac6b40cd5720442b.zip | |
New classes for owncloud: OC_APP for applications, OC_PREFERENCES for user preferences
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/lib/base.php b/lib/base.php index e379a4ba618..c7f0fea6820 100644 --- a/lib/base.php +++ b/lib/base.php @@ -77,6 +77,7 @@ if(isset($CONFIG_HTTPFORCESSL) and $CONFIG_HTTPFORCESSL){ } // load core libs +oc_require_once('app.php'); oc_require_once('files.php'); oc_require_once('filesystem.php'); oc_require_once('filestorage.php'); @@ -90,7 +91,7 @@ oc_require_once('remotestorage.php'); oc_require_once('plugin.php'); oc_require_once('helper.php'); -OC_PLUGIN::loadPlugins(); +OC_PLUGIN::loadPlugins( "" ); if(!isset($CONFIG_BACKEND)){ $CONFIG_BACKEND='database'; @@ -111,17 +112,7 @@ OC_UTIL::addStyle( "jquery-ui-1.8.10.custom" ); OC_UTIL::addStyle( "styles" ); // Require all appinfo.php -$dir = opendir( $SERVERROOT ); -while( false !== ( $filename = readdir( $dir ))){ - if( substr( $filename, 0, 1 ) != '.' ){ - if( file_exists( "$SERVERROOT/$filename/appinfo.php" )){ - oc_require( "$filename/appinfo.php" ); - } - } -} -closedir( $dir ); - - +OC_APP::init(); // check if the server is correctly configured for ownCloud OC_UTIL::checkserver(); @@ -134,7 +125,6 @@ class OC_UTIL { public static $scripts=array(); public static $styles=array(); public static $adminpages = array(); - public static $applications = array(); public static $navigation = array(); public static $personalmenu = array(); private static $fsSetup=false; @@ -169,7 +159,7 @@ class OC_UTIL { if($CONFIG_ENABLEBACKUP){ // This creates the Directorys recursively if(!is_dir( "$CONFIG_BACKUPDIRECTORY/$user/$root" )){ - mkdir( "$CONFIG_BACKUPDIRECTORY/$user/$root", 0x777, true ); + mkdir( "$CONFIG_BACKUPDIRECTORY/$user/$root", 0x755, true ); } $backupStorage=OC_FILESYSTEM::createStorage('local',array('datadir'=>$CONFIG_BACKUPDIRECTORY)); $backup=new OC_FILEOBSERVER_BACKUP(array('storage'=>$backupStorage)); @@ -179,7 +169,7 @@ class OC_UTIL { $CONFIG_DATADIRECTORY = "$CONFIG_DATADIRECTORY_ROOT/$user/$root"; if( !is_dir( $CONFIG_DATADIRECTORY )){ - mkdir( $CONFIG_DATADIRECTORY, 0x777, true ); + mkdir( $CONFIG_DATADIRECTORY, 0x755, true ); } //set up the other storages according to the system settings @@ -254,15 +244,6 @@ class OC_UTIL { } /** - * add application - * - * @param array $entry - */ - public static function addApplication( $entry){ - OC_UTIL::$applications[] = $entry; - } - - /** * add an entry to the personal menu * * @param array $entry |