Fix a couple of minor coding errors

diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php
index 3221e276c5f0d56e18cdbc9d680f858111ad56f5..f4a361609368da1cf7c55458460e07ea372edffd 100644 (file)
--- a/admin/appinfo/app.php
+++ b/admin/appinfo/app.php
@@ -3,10 +3,10 @@
 OC_APP::register( array( "order" => 1, "id" => "admin", "name" => "Administration" ));
 if( OC_USER::ingroup( $_SESSION['username'], 'admin' ))
 {
-       OC_UTIL::addNavigationEntry( array( "id" => "admin_index", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "index.php" ), "icon" => OC_HELPER::imagePath( "admin", "navicon.png" ), "name" => "Administration" ));
+       OC_APP::addNavigationEntry( array( "id" => "admin_index", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "index.php" ), "icon" => OC_HELPER::imagePath( "admin", "navicon.png" ), "name" => "Administration" ));
 }
-OC_UTIL::addAdminPage( array( "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" => "System settings" ));
-OC_UTIL::addAdminPage( array( "order" => 2, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users" ));
-OC_UTIL::addAdminPage( array( "order" => 3, "href" => OC_HELPER::linkTo( "admin", "plugins.php" ), "name" => "Plugins" ));
+OC_APP::addAdminPage( array( "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" => "System settings" ));
+OC_APP::addAdminPage( array( "order" => 2, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users" ));
+OC_APP::addAdminPage( array( "order" => 3, "href" => OC_HELPER::linkTo( "admin", "plugins.php" ), "name" => "Plugins" ));
 
 ?>

diff --git a/admin/index.php b/admin/index.php
index cfcb70d056b6a7498cb9276b7f34a6cf4a8c68db..5d8ac1405117600b07d710be6c3bc368f5abf484 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -30,7 +30,7 @@ if( !OC_USER::isLoggedIn() || !OC_USER::ingroup( $_SESSION['username'], 'admin'
 
 $adminpages = array();
 
-foreach( OC_UTIL::$adminpages as $i ){
+foreach( OC_APP::getAdminPages() as $i ){
        // Do some more work here soon
        $adminpages[] = $i;
 }

diff --git a/admin/system.php b/admin/system.php
index cfcb70d056b6a7498cb9276b7f34a6cf4a8c68db..5d8ac1405117600b07d710be6c3bc368f5abf484 100644 (file)
--- a/admin/system.php
+++ b/admin/system.php
@@ -30,7 +30,7 @@ if( !OC_USER::isLoggedIn() || !OC_USER::ingroup( $_SESSION['username'], 'admin'
 
 $adminpages = array();
 
-foreach( OC_UTIL::$adminpages as $i ){
+foreach( OC_APP::getAdminPages() as $i ){
        // Do some more work here soon
        $adminpages[] = $i;
 }

diff --git a/files/appinfo/app.php b/files/appinfo/app.php
index 8b1a806b7bed80a8b7645a67e58a0f94797290de..a3532e805d2ef5cabf00de3def640307b1015b75 100644 (file)
--- a/files/appinfo/app.php
+++ b/files/appinfo/app.php
@@ -2,7 +2,7 @@
 
 OC_APP::register( array( "order" => 2, "id" => "files", "name" => "Files" ));
 
-OC_UTIL::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_HELPER::linkTo( "files", "index.php" ), "icon" => OC_HELPER::imagePath( "files", "navicon.png" ), "name" => "Files" ));
-OC_UTIL::addAdminPage( array( "order" => 1, "href" => OC_HELPER::linkTo( "files", "admin.php" ), "name" => "Files" ));
+OC_APP::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_HELPER::linkTo( "files", "index.php" ), "icon" => OC_HELPER::imagePath( "files", "navicon.png" ), "name" => "Files" ));
+OC_APP::addAdminPage( array( "order" => 1, "href" => OC_HELPER::linkTo( "files", "admin.php" ), "name" => "Files" ));
 
 ?>

diff --git a/lib/app.php b/lib/app.php
index 203bf7b684c86af6989db471f910246cb4532486..ecab723a6ad344a56e9f3b16fe47b63021654f43 100644 (file)
--- a/lib/app.php
+++ b/lib/app.php
@@ -45,8 +45,8 @@ class OC_APP{
                global $SERVERROOT;
 
                // Did we allready load everything?
-               if( $self::init ){
-                       return true
+               if( self::$init ){
+                       return true;
                }
 
                // Get all appinfo
@@ -60,7 +60,7 @@ class OC_APP{
                }
                closedir( $dir );
 
-               $self::init = true;
+               self::$init = true;
 
                // return
                return true;

diff --git a/lib/base.php b/lib/base.php
index 01a53656789fa4c37d5926a29efa7442ddec465f..75914d61688016f6592cc426798c97ca8c86be9b 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -104,7 +104,7 @@ if( !$RUNTIME_NOSETUPFS ){
 }
 
 // Add the stuff we need always
-OC_UTIL::addPersonalMenuEntry( array( "order" => 1000, "href" => OC_HELPER::linkTo( "", "index.php?logout=1" ), "name" => "Logout" ));
+OC_APP::addPersonalMenuEntry( array( "order" => 1000, "href" => OC_HELPER::linkTo( "", "index.php?logout=1" ), "name" => "Logout" ));
 OC_UTIL::addScript( "jquery-1.5.min" );
 OC_UTIL::addScript( "jquery-ui-1.8.10.custom.min" );
 OC_UTIL::addScript( "js" );

diff --git a/lib/template.php b/lib/template.php
index 6184e4f59a27c47a0cf741fbf6f8657816747f34..12a32c1f052768c1edd585ed841a569d008abedc 100644 (file)
--- a/lib/template.php
+++ b/lib/template.php
@@ -99,8 +99,8 @@ class OC_TEMPLATE{
                        $template = "$SERVERROOT/$app/templates/";
                }
 
-               // Templates have the ending .tmpl
-               $template .= "$name.html";
+               // Templates have the ending .php
+               $template .= "$name.php";
 
                // Set the private data
                $this->renderas = $renderas;
@@ -206,7 +206,7 @@ class OC_TEMPLATE{
 
                        // Add navigation entry and personal menu
                        $page->assign( "navigation", OC_APP::getNavigation());
-                       $page->assign( "personalmenu", OC_UTIL::getPersonalMenu());
+                       $page->assign( "personalmenu", OC_APP::getPersonalMenu());
 
                        // Add css files and js files
                        $page->assign( "content", $data );

diff --git a/log/appinfo/app.php b/log/appinfo/app.php
index e639982a89ca8c5d18faf4bbf7057d1e767c8e1e..d3e848e960615ea2c9a49a943ed1df1afc61ccde 100644 (file)
--- a/log/appinfo/app.php
+++ b/log/appinfo/app.php
@@ -1,6 +1,6 @@
 <?php
 
 OC_APP::register( array( "order" => 1, "id" => "log", "name" => "Log" ));
-OC_UTIL::addPersonalMenuEntry( array( "order" => 2, "href" => OC_HELPER::linkTo( "log", "index.php" ), "name" => "Log" ));
+OC_APP::addPersonalMenuEntry( array( "order" => 2, "href" => OC_HELPER::linkTo( "log", "index.php" ), "name" => "Log" ));
 
 ?>

diff --git a/settings/appinfo/app.php b/settings/appinfo/app.php
index c43d47f0dd6d590d539c2ad59b3a50f33c416cdb..a781389303685788c17ff5c2b5e88905df8c6896 100644 (file)
--- a/settings/appinfo/app.php
+++ b/settings/appinfo/app.php
@@ -1,6 +1,6 @@
 <?php
 
 OC_APP::register( array( "id" => "settings", "name" => "Settings" ));
-OC_UTIL::addPersonalMenuEntry( array( "order" => 1, "href" => OC_HELPER::linkTo( "settings", "index.php" ), "name" => "Settings" ));
+OC_APP::addPersonalMenuEntry( array( "order" => 1, "href" => OC_HELPER::linkTo( "settings", "index.php" ), "name" => "Settings" ));
 
 ?>