![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/include/functions.inc b/include/functions.inc
index ad2ee1aaf9a56dbb13e2e4aef04a102f180d4737..d628de47a0033dcd92f7e7f1376d9a0c7bf9f2f7 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
/* Debug level action */
function DEBUG($level, $line, $function, $file, $data, $info="")
{
- if ($_SESSION['DEBUGLEVEL'] & $level){
+ if (get_global('DEBUGLEVEL') & $level){
$output= "DEBUG[$level] ";
if ($function != ""){
$output.= "($file:$function():$line) - $info: ";
/* Rewrite ui object to another dn */
function change_ui_dn($dn, $newdn)
{
- $ui= $_SESSION['ui'];
+ $ui= get_global('ui');
if ($ui->dn == $dn){
$ui->dn= $newdn;
- $_SESSION['ui']= $ui;
+ register_global('ui',$ui);
}
}
/* Return plugin dir or root directory? */
if ($plugin){
if ($path == ""){
- $nf= preg_replace("!^".$BASE_DIR."/!", "", $_SESSION['plugin_dir']);
+ $nf= preg_replace("!^".$BASE_DIR."/!", "", get_global('plugin_dir'));
} else {
$nf= preg_replace("!^".$BASE_DIR."/!", "", $path);
}
return ("$BASE_DIR/ihtml/themes/default/$nf/$filename");
}
if ($path == ""){
- return ($_SESSION['plugin_dir']."/$filename");
+ return (get_global('plugin_dir')."/$filename");
} else {
return ($path."/$filename");
}
print_red(sprintf(_("User login failed. LDAP server said '%s'."), $ldap->get_error()));
$smarty= get_smarty();
$smarty->display(get_template_path('headers.tpl'));
- echo "<body>".$_SESSION['errors']."</body></html>";
+ echo "<body>".get_global('errors')."</body></html>";
exit();
}
$ldap->cd($config->current['BASE']);
- $ldap->search("(&(uid=$username)(objectClass=gosaAccount))", array("uid"));
+ $allowed_attributes = array("uid","mail");
+ $verify_attr = array();
+ if(isset($config->current['LOGIN_ATTRIBUTE'])){
+ $tmp = split(",",$config->current['LOGIN_ATTRIBUTE']);
+ foreach($tmp as $attr){
+ if(in_array($attr,$allowed_attributes)){
+ $verify_attr[] = $attr;
+ }
+ }
+ }
+ if(count($verify_attr) == 0){
+ $verify_attr = array("uid");
+ }
+ $tmp= $verify_attr;
+ $tmp[] = "uid";
+ $filter = "";
+ foreach($verify_attr as $attr) {
+ $filter.= "(".$attr."=".$username.")";
+ }
+ $filter = "(&(|".$filter.")(objectClass=gosaAccount))";
+ $ldap->search($filter,$tmp);
/* get results, only a count of 1 is valid */
switch ($ldap->count()){
/* LDAP schema is not case sensitive. Perform additional check. */
$attrs= $ldap->fetch();
- if ($attrs['uid'][0] != $username){
- return(NULL);
+ $success = FALSE;
+ foreach($verify_attr as $attr){
+ if ($attrs[$attr][0] == $username){
+ $success = TRUE;
+ }
+ }
+ if(!$success){
+ return(FALSE);
}
/* got user dn, fill acl's */
$ui= new userinfo($config, $ldap->getDN());
- $ui->username= $username;
+ $ui->username= $attrs['uid'][0];
/* password check, bind as user with supplied password */
$ldap->disconnect();
@@ -638,7 +664,7 @@ function get_list($filter, $category, $base= "", $attributes= array(), $flags= G
/* Check for size limit exceeded messages for GUI feedback */
if (preg_match("/size limit/i", $ldap->error)){
- $_SESSION['limit_exceeded']= TRUE;
+ register_global('limit_exceeded', TRUE);
}
/* Crawl through reslut entries and perform the migration to the
@@ -683,16 +709,16 @@ function get_list($filter, $category, $base= "", $attributes= array(), $flags= G
function check_sizelimit()
{
/* Ignore dialog? */
- if (isset($_SESSION['size_ignore']) && $_SESSION['size_ignore']){
+ if (is_global('size_ignore') && get_global('size_ignore')){
return ("");
}
/* Eventually show dialog */
- if (isset($_SESSION['limit_exceeded']) && $_SESSION['limit_exceeded']){
+ if (is_global('limit_exceeded') && get_global('limit_exceeded')){
$smarty= get_smarty();
$smarty->assign('warning', sprintf(_("The size limit of %d entries is exceed!"),
- $_SESSION['size_limit']));
- $smarty->assign('limit_message', sprintf(_("Set the new size limit to %s and show me this message if the limit still exceeds"), '<input type="text" name="new_limit" maxlength="10" size="5" value="'.($_SESSION['size_limit']+100).'">'));
+ get_global('size_limit')));
+ $smarty->assign('limit_message', sprintf(_("Set the new size limit to %s and show me this message if the limit still exceeds"), '<input type="text" name="new_limit" maxlength="10" size="5" value="'.(get_global('size_limit') +100).'">'));
return($smarty->fetch(get_template_path('sizelimit.tpl')));
}
function print_sizelimit_warning()
{
- if (isset($_SESSION['size_limit']) && $_SESSION['size_limit'] >= 10000000 ||
- (isset($_SESSION['limit_exceeded']) && $_SESSION['limit_exceeded'])){
+ if (is_global('size_limit') && get_global('size_limit') >= 10000000 ||
+ (is_global('limit_exceeded') && get_global('limit_exceeded'))){
$config= "<input type='submit' name='edit_sizelimit' value="._("Configure").">";
} else {
$config= "";
}
- if (isset($_SESSION['limit_exceeded']) && $_SESSION['limit_exceeded']){
+ if (is_global('limit_exceeded') && get_global('limit_exceeded')){
return ("("._("incomplete").") $config");
}
return ("");
if (is_id($_POST['new_limit']) &&
isset($_POST['action']) && $_POST['action']=="newlimit"){
- $_SESSION['size_limit']= validate($_POST['new_limit']);
- $_SESSION['size_ignore']= FALSE;
+ register_global('size_limit', validate($_POST['new_limit']));
+ register_global('size_ignore', FALSE);
}
/* User wants no limits? */
if (isset($_POST['action']) && $_POST['action']=="ignore"){
- $_SESSION['size_limit']= 0;
- $_SESSION['size_ignore']= TRUE;
+ register_global('size_limit', 0);
+ register_global('size_ignore', TRUE);
}
/* User wants incomplete results */
if (isset($_POST['action']) && $_POST['action']=="limited"){
- $_SESSION['size_ignore']= TRUE;
+ register_global('size_ignore', TRUE);
}
}
getMenuCache();
/* Allow fallback to dialog */
if (isset($_POST['edit_sizelimit'])){
- $_SESSION['size_ignore']= FALSE;
+ register_global('size_ignore',FALSE);
}
}
$str.= chr($e+$n);
if(isset($_GET[$str])){
- if(isset($_SESSION['maxC'])){
- $b= $_SESSION['maxC'];
+ if(is_global('maxC')){
+ $b= get_global('maxC');
$q= "";
for ($m=0;$m<strlen($b);$m++) {
$q.= $b[$m++];
return preg_match ("/^[\/0-9 ()+*-]+$/", $nr);
}
+function is_dns_name($str)
+{
+ return(preg_match("/^[a-z0-9\.\-]*$/i",$str));
+}
function is_url($url)
{
/* If DEBUGLEVEL is set, we're in web mode, use textual output in
the other case... */
- if (isset($_SESSION['DEBUGLEVEL'])){
+ if (is_global('DEBUGLEVEL')){
if($string !== NULL){
if (preg_match("/"._("LDAP error:")."/", $string)){
$addmsg= _("Problems with the LDAP server mean that you probably lost the last changes. Please check your LDAP setup for possible errors and try again.");
{
global $plug, $config;
- $_SESSION['dn']= $dn;
+ register_global('dn', $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){
+ if( is_global('LOCK_VARS_TO_USE') && count(get_global('LOCK_VARS_TO_USE'))){
+
+ $LOCK_VARS_USED = array();
+ $LOCK_VARS_TO_USE = get_global('LOCK_VARS_TO_USE');
+
+ foreach($LOCK_VARS_TO_USE as $name){
+
+ if(empty($name)){
+ continue;
+ }
- if(empty($name)) continue;
foreach($_POST as $Pname => $Pvalue){
if(preg_match($name,$Pname)){
- $_SESSION['LOCK_VARS_USED'][$Pname] = $_POST[$Pname];
+ $LOCK_VARS_USED[$Pname] = $_POST[$Pname];
}
}
foreach($_GET as $Pname => $Pvalue){
if(preg_match($name,$Pname)){
- $_SESSION['LOCK_VARS_USED'][$Pname] = $_GET[$Pname];
+ $LOCK_VARS_USED[$Pname] = $_GET[$Pname];
}
}
}
- $_SESSION['LOCK_VARS_TO_USE'] =array();
+ register_global('LOCK_VARS_TO_USE',array());
+ register_global('LOCK_VARS_USED' , $LOCK_VARS_USED);
}
/* Prepare and show template */
function sess_del ($var)
{
/* New style */
- unset ($_SESSION[$var]);
+ unset($_SESSION[$var]);
/* ... work around, since the first one
doesn't seem to work all the time */
$display.= " ";
$display.= "</div>\n";
}
-# if (isset($_SESSION['errors'])){
-# $display.= $_SESSION['errors'];
-# }
-
return ($display);
}
// Get all available encryption Methods
// NON STATIC CALL :)
- $tmp = new passwordMethod($_SESSION['config']);
+ $tmp = new passwordMethod(get_global('config'));
$available = $tmp->get_available_methods();
// read current password entry for $dn, to detect the encryption Method
$deactivated = FALSE;
}
- // Detect the encryption Method
+ /* Is ensure that clear passwords will stay clear */
+ if($hash == "" && isset($attrs['userPassword'][0]) && !preg_match ("/^{([^}]+)}(.+)/", $attrs['userPassword'][0])){
+ $hash = "clear";
+ }
+
+ // Detect the encryption Method
if ( (isset($attrs['userPassword'][0]) && preg_match ("/^{([^}]+)}(.+)/", $attrs['userPassword'][0], $matches)) || $hash != ""){
/* Check for supported algorithm */