From f1015c88faf8ce418c5e0f983756d71403044210 Mon Sep 17 00:00:00 2001 From: Jakob Sack Date: Fri, 15 Apr 2011 23:09:05 +0200 Subject: [PATCH 1/4] Minor bug fixing --- lib/app.php | 2 +- lib/base.php | 8 ++++---- templates/layout.admin.php | 2 +- templates/layout.user.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/app.php b/lib/app.php index ecab723a6a..3827afb5d1 100644 --- a/lib/app.php +++ b/lib/app.php @@ -281,7 +281,7 @@ class OC_APP{ } /** - * @brief Installs an application + * @brief Update an application * @param $data array with all information * @returns integer * diff --git a/lib/base.php b/lib/base.php index 054ba2415e..58589db7c8 100644 --- a/lib/base.php +++ b/lib/base.php @@ -159,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", 0x755, true ); + mkdir( "$CONFIG_BACKUPDIRECTORY/$user/$root", 0755, true ); } $backupStorage=OC_FILESYSTEM::createStorage('local',array('datadir'=>$CONFIG_BACKUPDIRECTORY)); $backup=new OC_FILEOBSERVER_BACKUP(array('storage'=>$backupStorage)); @@ -169,7 +169,7 @@ class OC_UTIL { $CONFIG_DATADIRECTORY = "$CONFIG_DATADIRECTORY_ROOT/$user/$root"; if( !is_dir( $CONFIG_DATADIRECTORY )){ - mkdir( $CONFIG_DATADIRECTORY, 0x755, true ); + mkdir( $CONFIG_DATADIRECTORY, 0755, true ); } //set up the other storages according to the system settings @@ -304,7 +304,7 @@ class OC_HOOK{ * * TODO: write example */ - public function connect( $signalclass, $signalname, $slotclass, $slotname ){ + static public function connect( $signalclass, $signalname, $slotclass, $slotname ){ // Cerate the data structure if( !array_key_exists( $signalclass, self::$registered )){ self::$registered[$signalclass] = array(); @@ -333,7 +333,7 @@ class OC_HOOK{ * * TODO: write example */ - public function emit( $signalclass, $signalname, $params = array()){ + static public function emit( $signalclass, $signalname, $params = array()){ // Return false if there are no slots if( !array_key_exists( $signalclass, self::$registered )){ return false; diff --git a/templates/layout.admin.php b/templates/layout.admin.php index 22de64335f..85eba13827 100644 --- a/templates/layout.admin.php +++ b/templates/layout.admin.php @@ -22,7 +22,7 @@ " title="" id="owncloud">" alt="ownCloud" />
- Username +