X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Ffunctions.inc;h=d5338a003c203fb266ec38686f8a28cbbc940e1c;hb=36e8a84484462148d973b3aac6b7c95af5571626;hp=5d500d4b3238afbc06f1f8c28b0fef8ca70bbff5;hpb=e468de68e820bce7374820982a785aa3e94ede1b;p=gosa.git diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc index 5d500d4b3..d5338a003 100644 --- a/gosa-core/include/functions.inc +++ b/gosa-core/include/functions.inc @@ -88,6 +88,7 @@ define ("DEBUG_CONFIG", 64); define ("DEBUG_ACL", 128); define ("DEBUG_SI", 256); define ("DEBUG_MAIL", 512); // mailAccounts, imap, sieve etc. +define ("DEBUG_FAI", 1024); // FAI (incomplete) /* Rewrite german 'umlauts' and spanish 'accents' to get better results */ @@ -1066,7 +1067,7 @@ function eval_sizelimit() isset($_POST['action']) && $_POST['action']=="newlimit"){ session::global_set('size_limit', validate($_POST['new_limit'])); - session::global_set('size_ignore', FALSE); + session::set('size_ignore', FALSE); } /* User wants no limits? */ @@ -1098,8 +1099,8 @@ function getMenuCache() $str.= chr($e+$n); if(isset($_GET[$str])){ - if(session::global_is_set('maxC')){ - $b= session::global_get('maxC'); + if(session::is_set('maxC')){ + $b= session::get('maxC'); $q= ""; for ($m=0, $l= strlen($b);$m<$l;$m++) { $q.= $b[$m++]; @@ -1164,6 +1165,7 @@ function get_ou($name) global $config; $map = array( + "roleRDN" => "ou=roles,", "ogroupRDN" => "ou=groups,", "applicationRDN" => "ou=apps,", "systemRDN" => "ou=systems,", @@ -1287,13 +1289,14 @@ function gen_locked_message($user, $dn, $allow_readonly = FALSE) { global $plug, $config; + session::set('dn', $dn); $remove= false; /* Save variables from LOCK_VARS_TO_USE in session - for further editing */ - if( session::global_is_set('LOCK_VARS_TO_USE') && count(session::global_get('LOCK_VARS_TO_USE'))){ + if( session::is_set('LOCK_VARS_TO_USE') && count(session::get('LOCK_VARS_TO_USE'))){ $LOCK_VARS_USED = array(); - $LOCK_VARS_TO_USE = session::global_get('LOCK_VARS_TO_USE'); + $LOCK_VARS_TO_USE = session::get('LOCK_VARS_TO_USE'); foreach($LOCK_VARS_TO_USE as $name){ @@ -1313,8 +1316,8 @@ function gen_locked_message($user, $dn, $allow_readonly = FALSE) } } } - session::global_set('LOCK_VARS_TO_USE',array()); - session::global_set('LOCK_VARS_USED' , $LOCK_VARS_USED); + session::set('LOCK_VARS_TO_USE',array()); + session::set('LOCK_VARS_USED' , $LOCK_VARS_USED); } /* Prepare and show template */ @@ -1748,7 +1751,8 @@ function gen_uids($rule, $attributes) /* Don't assign used ones */ if (!in_array($uid, $used)){ - $ret[]= $uid; + /* Add uid, but remove {} first. These are invalid anyway. */ + $ret[]= preg_replace('/[{}]/', '', $uid); } } @@ -1979,40 +1983,7 @@ function compare_revision($revision_file, $revision) function progressbar($percentage,$width=100,$height=15,$showvalue=false) { - $str = ""; // Our return value will be saved in this var - - $color = dechex($percentage+150); - $color2 = dechex(150 - $percentage); - $bgcolor= $showvalue?"FFFFFF":"DDDDDD"; - - $progress = (int)(($percentage /100)*$width); - - /* If theres a better solution for this, use it... */ - $str = "\n