gunnar: server/php-kolab/Kolab_Webadmin/Webadmin webadmin.class.php, 1.1, 1.2

cvs at kolab.org cvs at kolab.org
Fri Aug 17 20:23:50 CEST 2007


Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Webadmin/Webadmin
In directory doto:/tmp/cvs-serv30164/Kolab_Webadmin/Webadmin

Modified Files:
	webadmin.class.php 
Log Message:
Fix some typos.

Index: webadmin.class.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Webadmin/Webadmin/webadmin.class.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- webadmin.class.php	17 Aug 2007 16:31:44 -0000	1.1
+++ webadmin.class.php	17 Aug 2007 18:23:48 -0000	1.2
@@ -139,7 +139,7 @@
 
         $domain = "messages";
 
-        bindtextdomain($domain, $locale_dir); 
+        bindtextdomain($domain, $config['locale_dir']); 
         bind_textdomain_codeset($domain, "UTF-8");
         textdomain($domain);
 
@@ -161,7 +161,7 @@
         /* 
          * Time to check our authentication status.
          */
-        $authenticated = $this->auth->authenticate();
+        $authenticated = $this->_auth->authenticate();
 
         // The user is not authenticated
         if ($authenticated == 0 || $authenticated == 2) {
@@ -170,8 +170,8 @@
             $this->assign( 'menuitems', array() );
             // Show the login page
             $this->assign( 'maincontent', 'login.tpl' );
-            if ($this->auth->error()) { 
-                $this->assign( 'errors', $this->auth->error() );
+            if ($this->_auth->error()) { 
+                $this->assign( 'errors', $this->_auth->error() );
             }
             if ($authenticated == 0) {
                 $this->assign( 'page_title', _('Error') );
@@ -184,11 +184,11 @@
         }
 
         // User is authenticated
-        $this->assign( 'uid', $this->auth->uid() );
-        $this->assign( 'group', $this->auth->group() );
+        $this->assign( 'uid', $this->_auth->uid() );
+        $this->assign( 'group', $this->_auth->group() );
 
         // Get the menu the user is able to see
-        $this->_menuitems = generate_menu($this->auth, $params['topdir']);
+        $this->_menuitems = generate_menu($this->_auth, $params['topdir']);
 
         // Leave it to the calling class to display stuff
     }
@@ -230,7 +230,7 @@
      *
      * @param string $content The content of the page
      */
-    function render($contenttemplate)
+    function setContent($contenttemplate)
     {
         $this->assign( 'maincontent', $contenttemplate );
     }
@@ -295,7 +295,7 @@
      */
     function isAdmin()
     {
-        return $this->auth->group() == 'admin';
+        return $this->_auth->group() == 'admin';
     }
 };
 





More information about the commits mailing list