diff options
| author | Jakob Sack <kde@jakobsack.de> | 2011-04-15 23:09:05 +0200 |
|---|---|---|
| committer | Jakob Sack <kde@jakobsack.de> | 2011-04-15 23:09:05 +0200 |
| commit | f1015c88faf8ce418c5e0f983756d71403044210 (patch) | |
| tree | af754080ff423569a5cc4d78cd5a6e487f7b338b | |
| parent | 3d89b2caa41bc99f48b8377c87e9c653f467631d (diff) | |
| download | nextcloud-server-f1015c88faf8ce418c5e0f983756d71403044210.tar.gz nextcloud-server-f1015c88faf8ce418c5e0f983756d71403044210.zip | |
Minor bug fixing
| -rw-r--r-- | lib/app.php | 2 | ||||
| -rw-r--r-- | lib/base.php | 8 | ||||
| -rw-r--r-- | templates/layout.admin.php | 2 | ||||
| -rw-r--r-- | templates/layout.user.php | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/app.php b/lib/app.php index ecab723a6ad..3827afb5d15 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 054ba2415e0..58589db7c8c 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 22de64335fd..85eba138274 100644 --- a/templates/layout.admin.php +++ b/templates/layout.admin.php @@ -22,7 +22,7 @@ <a href="<?php echo link_to("", "index.php"); ?>" title="" id="owncloud"><img src="<?php echo image_path("", "owncloud-logo-small-white.png"); ?>" alt="ownCloud" /></a> <div id="user"> - <a id="user_menu_link" href="" title="">Username</a> + <a id="user_menu_link" href="" title=""><? echo $_SESSION["user_id"] ?></a> <ul id="user_menu"> <?php foreach($_["personalmenu"] as $entry): ?> <li><a href="<?php echo $entry["href"]; ?>" title=""><?php echo $entry["name"]; ?></a></li> diff --git a/templates/layout.user.php b/templates/layout.user.php index 7529f2c720a..9fc4f97e1dc 100644 --- a/templates/layout.user.php +++ b/templates/layout.user.php @@ -22,7 +22,7 @@ <a href="<?php echo link_to("", "index.php"); ?>" title="" id="owncloud"><img src="<?php echo image_path("", "owncloud-logo-small-white.png"); ?>" alt="ownCloud" /></a> <div id="user"> - <a id="user_menu_link" href="" title="">Username</a> + <a id="user_menu_link" href="" title=""><? echo $_SESSION["user_id"] ?></a> <ul id="user_menu"> <?php foreach($_["personalmenu"] as $entry): ?> <li><a href="<?php echo $entry["href"]; ?>" title=""><?php echo $entry["name"]; ?></a></li> |