Minor bug fixing

diff --git a/lib/app.php b/lib/app.php
index ecab723a6ad344a56e9f3b16fe47b63021654f43..3827afb5d15ac859fd25d44c17e25c9955b6f5ac 100644 (file)
--- 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 054ba2415e038f5e1ef49acfea4a98c6da4b7f55..58589db7c8cbf59b89a63c990a3473f1883de574 100644 (file)
--- 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 22de64335fd47fd5eef24fcbf334f673767b9274..85eba13827432c104288a3abd0009af705ba3f4b 100644 (file)
--- 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 7529f2c720adfb66419de26628da453952f6c4a8..9fc4f97e1dcdf5d77800e6b8eb0de7f698b15ed4 100644 (file)
--- 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>