X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Ffunctions.inc;h=a4e7b952b0236107faaf1b1f6dd187285e0eefa5;hb=704fa7ddaac7fbf1168a1c58c3dd394c14755cd1;hp=5571329521d721b0832561629486907ea2a346c0;hpb=0ab213c0302e5f76e57596a01c2f0ef753f0806d;p=gosa.git

diff --git a/include/functions.inc b/include/functions.inc
index 557132952..a4e7b952b 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -36,12 +36,13 @@ $svn_revision = '$Revision$';
 /* Include required files */
 require_once ("class_ldap.inc");
 require_once ("class_config.inc");
-require_once ("class_userinfo.inc");
 require_once ("class_plugin.inc");
+require_once ("class_acl.inc");
+require_once ("class_userinfo.inc");
 require_once ("class_pluglist.inc");
 require_once ("class_tabs.inc");
 require_once ("class_mail-methods.inc");
-require_once("class_password-methods.inc");
+require_once ("class_password-methods.inc");
 require_once ("functions_debug.inc");
 require_once ("functions_dns.inc");
 require_once ("class_MultiSelectWindow.inc");
@@ -367,8 +368,7 @@ function ldap_login_user ($username, $password)
 
 function ldap_expired_account($config, $userdn, $username)
 {
-    $this->config= $config;
-    $ldap= $this->config->get_ldap_link();
+    $ldap= $config->get_ldap_link();
     $ldap->cat($userdn);
     $attrs= $ldap->fetch();
     
@@ -727,9 +727,11 @@ function getMenuCache()
   }
 }
 
+
 function get_permissions ($dn, $subtreeACL)
 {
   global $config;
+echo "get_permissions() - to be removed<br>";
 
   $base= $config->current['BASE'];
   $tmp= "d,".$dn;
@@ -765,6 +767,7 @@ function get_permissions ($dn, $subtreeACL)
 function get_module_permission($acl_array, $module, $dn)
 {
   global $ui;
+echo "get_module_permissions() - to be removed<br>";
 
   $final= "";
   foreach($acl_array as $acl){
@@ -923,6 +926,7 @@ function get_base_from_people($dn)
 
 function chkacl($acl, $name)
 {
+  echo "chkacl - to be removed<br>";
   /* Look for attribute in ACL */
   if (preg_match("/#$name#/", $acl) || $acl == "#all#"){
     return ("");
@@ -1118,6 +1122,7 @@ function gen_locked_message($user, $dn)
   
   $remove= false;
 
+  /* Save variables from LOCK_VARS_TO_USE in session - for further editing */
   if((isset($_SESSION['LOCK_VARS_TO_USE']))&&(count($_SESSION['LOCK_VARS_TO_USE']))){
     $_SESSION['LOCK_VARS_USED']  =array();
     foreach($_SESSION['LOCK_VARS_TO_USE'] as $name){
@@ -1194,7 +1199,7 @@ function get_printer_list($cups_server)
     $ar = false;
     exec("lpstat -p", $ar);
     foreach($ar as $val){
-      list($dummy, $printer, $rest)= split(' ', $val, 3);
+      @list($dummy, $printer, $rest)= split(' ', $val, 3);
       if (preg_match('/^[^@]+$/', $printer)){
         $res[$printer]= "$printer";
       }
@@ -2091,5 +2096,12 @@ function is_department_name_reserved($name,$base)
 }
 
 
+function get_base_dir()
+{
+  global $BASE_DIR;
+
+  return $BASE_DIR;
+}
+
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>