X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Ffunctions.inc;h=7675ff23e7d502e8c01a834a67a6a615eb9915ef;hb=267e1e39976840e73256c8f0c5eec9a69371900e;hp=81f387e13681ddfe0d314fdfb074b69064d1b192;hpb=6c1811b712207bfae16ed19faecc341b92bd9005;p=gosa.git diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc index 81f387e13..7675ff23e 100644 --- a/gosa-core/include/functions.inc +++ b/gosa-core/include/functions.inc @@ -22,9 +22,8 @@ /* Configuration file location */ define ("CONFIG_DIR", "/etc/gosa"); -define ("CONFIG_FILE", "gosa.conf-trunk"); +define ("CONFIG_FILE", "gosa.conf"); define ("CONFIG_TEMPLATE_DIR", "../contrib/"); -define ("HELP_BASEDIR", "/var/www/doc/"); /* Define get_list flags */ define("GL_NONE", 0); @@ -314,7 +313,7 @@ function ldap_init ($server, $base, $binddn='', $pass='') isset($config->current['TLS']) && $config->current['TLS'] == "true"); /* Sadly we've no proper return values here. Use the error message instead. */ - if (!preg_match("/Success/i", $ldap->error)){ + if (!$ldap->success()){ echo sprintf(_("FATAL: Error when connecting the LDAP. Server said '%s'."), $ldap->get_error()); exit(); } @@ -340,8 +339,8 @@ function process_htaccess ($username, $kerberos= FALSE) /* Look for entry or realm */ $ldap= $config->get_ldap_link(); - if (!preg_match("/Success/i", $ldap->error)){ - msg_dialog::display(_("LDAP error"), sprintf(_('User login failed.').'

'._('LDAP server returned: %s'), "

".$ldap->get_error().""), ERROR_DIALOG); + if (!$ldap->success()){ + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), "", LDAP_AUTH, ERROR_DIALOG)); $smarty= get_smarty(); $smarty->display(get_template_path('headers.tpl')); echo "".session::get('errors').""; @@ -367,8 +366,8 @@ function ldap_login_user_htaccess ($username) /* Look for entry or realm */ $ldap= $config->get_ldap_link(); - if (!preg_match("/Success/i", $ldap->error)){ - msg_dialog::display(_("LDAP error"), sprintf(_('User login failed.').'

'._('LDAP server returned: %s'), "

".$ldap->get_error().""), FATAL_ERROR_DIALOG); + if (!$ldap->success()){ + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), "", LDAP_AUTH, FATAL_ERROR_DIALOG)); $smarty= get_smarty(); $smarty->display(get_template_path('headers.tpl')); echo "".session::get('errors').""; @@ -377,7 +376,7 @@ function ldap_login_user_htaccess ($username) $ldap->search("(&(objectClass=gosaAccount)(uid=$username))", array("uid")); /* Found no uniq match? Strange, because we did above... */ if ($ldap->count() != 1) { - msg_dialog::display(_("LDAP error"), _("Username / UID is not unique inside the LDAP tree. Please contact your Administrator."), FATAL_ERROR_DIALOG); + msg_dialog::display(_("LDAP error"), _("Username / UID is not unique inside the LDAP tree!"), FATAL_ERROR_DIALOG); return (NULL); } $attrs= $ldap->fetch(); @@ -405,8 +404,8 @@ function ldap_login_user ($username, $password) /* look through the entire ldap */ $ldap = $config->get_ldap_link(); - if (!preg_match("/Success/i", $ldap->error)){ - msg_dialog::display(_("LDAP error"), sprintf(_("User login failed.")."

"._('LDAP server returned: %s'), "

".$ldap->get_error().""), FATAL_ERROR_DIALOG); + if (!$ldap->success()){ + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error()), FATAL_ERROR_DIALOG); $smarty= get_smarty(); $smarty->display(get_template_path('headers.tpl')); echo "".session::get('errors').""; @@ -474,7 +473,7 @@ function ldap_login_user ($username, $password) $config->current['RECURSIVE'] == "true", isset($config->current['TLS']) && $config->current['TLS'] == "true"); - if (!preg_match("/Success/i", $ldap->error)){ + if (!$ldap->success()){ return (NULL); } @@ -601,7 +600,7 @@ function add_lock ($object, $user) $ldap->cd ($config->current['CONFIG']); $ldap->search("(&(objectClass=gosaLockEntry)(gosaUser=$user)(gosaObject=".base64_encode($object)."))", array("gosaUser")); - if (!preg_match("/Success/i", $ldap->error)){ + if (!$ldap->success()){ msg_dialog::display(_("Configuration error"), sprintf(_("Cannot create locking information in LDAP tree. Please contact your administrator!")."

"._('LDAP server returned: %s'), "

".$ldap->get_error().""), ERROR_DIALOG); return; } @@ -616,8 +615,8 @@ function add_lock ($object, $user) $attrs["gosaObject"] = base64_encode($object); $attrs["cn"] = "$name"; $ldap->add($attrs); - if (!preg_match("/Success/i", $ldap->error)){ - msg_dialog::display(_("Internal error"), sprintf(_("Adding a lock failed.")."

"._('LDAP server returned: %s'), "

".$ldap->get_error().""), ERROR_DIALOG); + if (!$ldap->success()){ + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), "cn=$name,".$config->current['CONFIG'], 0, ERROR_DIALOG)); return; } } @@ -645,11 +644,11 @@ function del_lock ($object) $ldap->cd ($config->current['CONFIG']); $ldap->search ("(&(objectClass=gosaLockEntry)(gosaObject=".base64_encode($object)."))", array("gosaObject")); $attrs= $ldap->fetch(); - if ($ldap->getDN() != "" && preg_match("/Success/i", $ldap->error)){ + if ($ldap->getDN() != "" && $ldap->success()){ $ldap->rmdir ($ldap->getDN()); - if (!preg_match("/Success/i", $ldap->error)){ - msg_dialog::display(_("LDAP error"), sprintf(_("Removing a lock failed.")."

"._('LDAP server returned: %s'), "

".$ldap->get_error().""), ERROR_DIALOG); + if (!$ldap->success()){ + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $ldap->getDN(), LDAP_DEL, ERROR_DIALOG)); return; } } @@ -687,8 +686,8 @@ function get_lock ($object) $ldap= $config->get_ldap_link(); $ldap->cd ($config->current['CONFIG']); $ldap->search("(&(objectClass=gosaLockEntry)(gosaObject=".base64_encode($object)."))", array("gosaUser")); - if (!preg_match("/Success/i", $ldap->error)){ - msg_dialog::display(_("LDAP error"), sprintf(_("Cannot get locking information from LDAP tree!")."

"._('LDAP server returned: %s'), "

".$ldap->get_error().""), ERROR_DIALOG); + if (!$ldap->success()){ + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), "", LDAP_SEARCH, ERROR_DIALOG)); return(""); } @@ -732,8 +731,8 @@ function get_multiple_locks($objects) $ldap= $config->get_ldap_link(); $ldap->cd ($config->current['CONFIG']); $ldap->search($filter, array("gosaUser","gosaObject")); - if (!preg_match("/Success/i", $ldap->error)){ - msg_dialog::display(_("LDAP error"), sprintf(_("Cannot get locking information from LDAP tree!")."

"._('LDAP server returned: %s'), "

".$ldap->get_error().""), ERROR_DIALOG); + if (!$ldap->success()){ + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), "", LDAP_SEARCH, ERROR_DIALOG)); return(""); } @@ -865,7 +864,7 @@ function get_sub_list($filter, $category,$sub_deps, $base= "", $attributes= arra } /* Check for size limit exceeded messages for GUI feedback */ - if (preg_match("/size limit/i", $ldap->error)){ + if (preg_match("/size limit/i", $ldap->get_error())){ session::set('limit_exceeded', TRUE); $limit_exceeded = TRUE; } @@ -934,7 +933,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)){ + if (preg_match("/size limit/i", $ldap->get_error())){ session::set('limit_exceeded', TRUE); } @@ -1153,8 +1152,8 @@ function get_ou($name) "mimetypeou" => "ou=mime,"); /* Preset ou... */ - if (isset($config->current[$name])){ - $ou= $config->current[$name]; + if (isset($config->current[strtoupper($name)])){ + $ou= $config->current[strtoupper($name)]; } elseif (isset($map[$name])) { $ou = $map[$name]; return($ou); @@ -1166,10 +1165,17 @@ function get_ou($name) if ($ou != ""){ if (!preg_match('/^[^=]+=[^=]+/', $ou)){ - return @LDAP::convert("ou=$ou,"); + $ou = @LDAP::convert("ou=$ou"); } else { - return @LDAP::convert("$ou,"); + $ou = @LDAP::convert("$ou"); } + + if(preg_match("/".normalizePreg($config->current['BASE'])."$/",$ou)){ + return($ou); + }else{ + return("$ou,"); + } + } else { return ""; } @@ -1212,6 +1218,8 @@ function get_base_from_people($dn) function strict_uid_mode() { + global $config; + return !(isset($config->current['STRICT']) && preg_match('/^(no|false)$/i', $config->current['STRICT'])); } @@ -1228,48 +1236,6 @@ function get_uid_regexp() } -function print_red() -{ - trigger_error("Use of obsolete print_red"); - /* Check number of arguments */ - if (func_num_args() < 1){ - return; - } - - /* Get arguments, save string */ - $array = func_get_args(); - $string= $array[0]; - - /* Step through arguments */ - for ($i= 1; $i/', ' ', $string); - $addmsg= _("Please check your input and fix the error. Press 'OK' to close this message box."); - $addmsg = ""; - } - if(empty($addmsg)){ - $addmsg = _("Error"); - } - msg_dialog::display($addmsg, $string,ERROR_DIALOG); - return; - }else{ - return; - } - -} - - function gen_locked_message($user, $dn) { global $plug, $config; @@ -1324,7 +1290,7 @@ function gen_locked_message($user, $dn) } else { $smarty->assign ("action", _("Edit anyway")); } - $smarty->assign ("message", sprintf(_("You're going to edit the LDAP entry/entries '%s'"), "".$msg."", "")); + $smarty->assign ("message", sprintf(_("You're going to edit the LDAP entry/entries %s"), "".$msg."", "")); return ($smarty->fetch (get_template_path('islocked.tpl'))); } @@ -1545,7 +1511,7 @@ function apply_filter() function back_to_main() { $string= '

'; + msgPool::backButton().'">

'; return ($string); } @@ -2207,17 +2173,17 @@ function get_base_from_hook($dn, $attrib) if (preg_match("/^[0-9]+$/", $output[0])){ return ($output[0]); } else { - msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base."), WARNING_DIALOG); + msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base!"), WARNING_DIALOG); return ($config->current['UIDBASE']); } } else { - msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base."), WARNING_DIALOG); + msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base!"), WARNING_DIALOG); return ($config->current['UIDBASE']); } } else { - msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base."), WARNING_DIALOG); + msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base!"), WARNING_DIALOG); return ($config->current['UIDBASE']); } @@ -2236,7 +2202,7 @@ function check_schema($cfg,$rfc2307bis = FALSE) $messages= array(); /* Get objectclasses */ - $ldap = new LDAP($cfg['admin'],$cfg['password'],$cfg['connection'] ,FALSE,$cfg['tls']); + $ldap = new ldapMultiplexer(new LDAP($cfg['admin'],$cfg['password'],$cfg['connection'] ,FALSE,$cfg['tls'])); $objectclasses = $ldap->get_objectclasses(); if(count($objectclasses) == 0){ msg_dialog::display(_("LDAP warning"), _("Cannot get schema information from server. No schema check possible!"), WARNING_DIALOG); @@ -2460,8 +2426,8 @@ function change_password ($dn, $password, $mode=0, $hash= "") // Get all available encryption Methods // NON STATIC CALL :) - $tmp = new passwordMethod(session::get('config')); - $available = $tmp->get_available_methods(); + $methods = new passwordMethod(session::get('config')); + $available = $methods->get_available_methods(); // read current password entry for $dn, to detect the encryption Method $ldap = $config->get_ldap_link(); @@ -2488,11 +2454,12 @@ function change_password ($dn, $password, $mode=0, $hash= "") /* Extract used hash */ if ($hash == ""){ - $hash= strtolower($matches[1]); + $test = passwordMethod::get_method($attrs['userPassword'][0]); + } else { + $test = new $available[$hash]($config); + $test->set_hash($hash); } - $test = new $available[$hash]($config); - } else { // User MD5 by default $hash= "md5"; @@ -2526,7 +2493,7 @@ function change_password ($dn, $password, $mode=0, $hash= "") $attrs= generate_smb_nt_hash($password); } - /* Readd ! if user was deactivated */ + /* Read ! if user was deactivated */ if($deactivated){ $newpass = preg_replace("/(^[^\}]+\})(.*$)/","\\1!\\2",$newpass); } @@ -2538,8 +2505,8 @@ function change_password ($dn, $password, $mode=0, $hash= "") new log("modify","users/passwordMethod",$dn,array_keys($attrs),$ldap->get_error()); - if ($ldap->error != 'Success') { - msg_dialog::display(_("LDAP error"), sprintf(_('Setting the password failed!').'

'._('LDAP server returned: %s'), "

".$ldap->get_error().""), ERROR_DIALOG); + if (!$ldap->success()) { + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, ERROR_DIALOG)); } else { /* Run backend method for change/create */ @@ -2572,8 +2539,12 @@ function generate_smb_nt_hash($password) # Try to use gosa-si? if (isset($config->current['GOSA_SI'])){ - $res= gosaSupportDaemon::send("gosa_gen_smb_hash", "GOSA", array("password" => $password), TRUE); - $hash= $res['XML']['HASH']; + $res= gosaSupportDaemon::send("gosa_gen_smb_hash", "GOSA", array("password" => $password), TRUE); + if (isset($res['XML']['HASH'])){ + $hash= $res['XML']['HASH']; + } else { + $hash= ""; + } } else { $tmp= $config->data['MAIN']['SMBHASH']." ".escapeshellarg($password); @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__, $tmp, "Execute"); @@ -2606,12 +2577,6 @@ function generate_smb_nt_hash($password) } -function crypt_single($string,$enc_type ) -{ - return( passwordMethod::crypt_single_str($string,$enc_type)); -} - - function getEntryCSN($dn) { global $config; @@ -2652,23 +2617,6 @@ function add_objectClass($classes, &$attrs) } -function show_ldap_error($message, $addon= "") -{ - if (!preg_match("/Success/i", $message)){ - if ($addon == ""){ - msg_dialog::display(_("LDAP error:"), $message, ERROR_DIALOG); - } else { - if(!preg_match("/No such object/i",$message)){ - msg_dialog::display(_("LDAP error"), sprintf(_("Plugin '%s':%s"),"".$addon."", "

$message"),ERROR_DIALOG); - } - } - return TRUE; - } else { - return FALSE; - } -} - - /* Removes a given objectClass from the attrs entry */ function remove_objectClass($classes, &$attrs) { @@ -2717,5 +2665,71 @@ function send_binary_content($data,$name,$type = "application/octet-stream") exit(); } + +/*! \brief Encode special string characters so we can use the string in \ + HTML output, without breaking quotes. + @param The String we want to encode. + @return The encoded String + */ +function xmlentities($str) +{ + if(is_string($str)){ + return(htmlentities($str,ENT_QUOTES)); + }elseif(is_array($str)){ + foreach($str as $name => $value){ + $str[$name] = xmlentities($value); + } + } + return($str); +} + + +/*! \brief Updates all accessTo attributes from a given value to a new one. + For example if a host is renamed. + @param String $from The source accessTo name. + @param String $to The destination accessTo name. +*/ +function update_accessTo($from,$to) +{ + global $config; + $ldap = $config->get_ldap_link(); + $ldap->cd($config->current['BASE']); + $ldap->search("(&(objectClass=trustAccount)(accessTo=".$from."))",array("objectClass","accessTo")); + while($attrs = $ldap->fetch()){ + $new_attrs = array(); + $dn = $attrs['dn']; + for($i = 0 ; $i < $attrs['objectClass']['count']; $i++){ + $new_attrs['objectClass'][] = $attrs['objectClass'][$i]; + } + for($i = 0 ; $i < $attrs['accessTo']['count']; $i++){ + if($attrs['accessTo'][$i] == $from){ + if(!empty($to)){ + $new_attrs['accessTo'][] = $to; + } + }else{ + $new_attrs['accessTo'][] = $attrs['accessTo'][$i]; + } + } + $ldap->cd($dn); + $ldap->modify($new_attrs); + if (!$ldap->success()){ + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, "update_accessTo($from,$to)")); + } + new log("modify","update_accessTo($from,$to)",$dn,array_keys($new_attrs),$ldap->get_error()); + } +} + + +function get_random_char () { + $randno = rand (0, 63); + if ($randno < 12) { + return (chr ($randno + 46)); // Digits, '/' and '.' + } else if ($randno < 38) { + return (chr ($randno + 53)); // Uppercase + } else { + return (chr ($randno + 59)); // Lowercase + } + } + // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?>