![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/include/functions.inc b/include/functions.inc
index 35fd58163cbc42fac488374770530963d0db500b..11a949f9c2ee0d092092ed738e7697c92efcf9c7 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
{
global $BASE_DIR;
+ /* Try to use users primary language */
+ $ui= get_userinfo();
+ if ($ui != NULL){
+ if ($ui->language != ""){
+ return ($ui->language);
+ }
+ }
+
/* Get list of languages */
if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])){
$lang= preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_LANGUAGE']);
/* Check for existing entries in lock area */
$ldap= $config->get_ldap_link();
$ldap->cd ($config->current['CONFIG']);
- $ldap->search("(&(objectClass=gosaLockEntry)(gosaUser=$user)(gosaObject=$object))",
+ $ldap->search("(&(objectClass=gosaLockEntry)(gosaUser=$user)(gosaObject=".base64encode($object)."))",
array("gosaUser"));
if (!preg_match("/Success/i", $ldap->error)){
print_red (sprintf(_("Can't set locking information in LDAP database. Please check the 'config' entry in gosa.conf! LDAP server says '%s'."), $ldap->get_error()));
$ldap->cd("cn=$name,".$config->current['CONFIG']);
$attrs["objectClass"] = "gosaLockEntry";
$attrs["gosaUser"] = $user;
- $attrs["gosaObject"] = $object;
+ $attrs["gosaObject"] = base64_encode($object);
$attrs["cn"] = "$name";
$ldap->add($attrs);
if (!preg_match("/Success/i", $ldap->error)){
/* Check for existance and remove the entry */
$ldap= $config->get_ldap_link();
$ldap->cd ($config->current['CONFIG']);
- $ldap->search ("(&(objectClass=gosaLockEntry)(gosaObject=$object))", array("gosaObject"));
+ $ldap->search ("(&(objectClass=gosaLockEntry)(gosaObject=".base64_encode($object)."))", array("gosaObject"));
$attrs= $ldap->fetch();
if ($ldap->getDN() != "" && preg_match("/Success/i", $ldap->error)){
$ldap->rmdir ($ldap->getDN());
$user= "";
$ldap= $config->get_ldap_link();
$ldap->cd ($config->current['CONFIG']);
- $ldap->search("(&(objectClass=gosaLockEntry)(gosaObject=$object))", array("gosaUser"));
+ $ldap->search("(&(objectClass=gosaLockEntry)(gosaObject=".base64_encode($object)."))", array("gosaUser"));
if (!preg_match("/Success/i", $ldap->error)){
print_red (_("Can't get locking information in LDAP database. Please check the 'config' entry in gosa.conf!"));
return("");
@@ -501,7 +509,7 @@ function get_list2($subtreeACL, $filter, $subsearch= TRUE, $base="", $attrs= arr
/* Crawl through reslut entries and perform the migration to the
result array */
while($attrs = $ldap->fetch()) {
- $dn= preg_replace("/[ ]*,[ ]*/", ",", $ldap->getDN());
+ $dn= clean_dn($ldap->getDN());
foreach ($subtreeACL as $key => $value){
if (preg_match("/$key/", $dn)){
$attrs["dn"]= convert_department_dn($dn);
@@ -546,7 +554,7 @@ function get_list($subtreeACL, $filter, $subsearch= TRUE, $base="", $attrs= arra
result array */
$result= array();
while($attrs = $ldap->fetch()) {
- $dn= preg_replace("/[ ]*,[ ]*/", ",", $ldap->getDN());
+ $dn= clean_dn($ldap->getDN());
foreach ($subtreeACL as $key => $value){
if (preg_match("/$key/", $dn)){
$attrs["dn"]= $dn;
/* Successively remove leading parts of the dn's until
it doesn't contain commas anymore */
- while (preg_match('/,/', $tmp)){
- $tmp= ltrim(strstr($tmp, ","), ",");
+ $tmp_dn= preg_replace('/\\\\,/', '<GOSA#REPLACED#KOMMA>', $tmp);
+ while (preg_match('/,/', $tmp_dn)){
+ $tmp_dn= ltrim(strstr($tmp_dn, ","), ",");
+ $tmp= preg_replace('/\<GOSA#REPLACED#KOMMA\>/', '\\,', $tmp);
/* Check for acl that may apply */
foreach ($sacl as $key => $value){
all allowed submodules specified in the ACL */
$tmp= split(",", $acl);
foreach ($tmp as $mod){
- if (preg_match("/$module#/", $mod)){
+ if (preg_match("/^$module#/", $mod)){
$final= strstr($mod, "#")."#";
continue;
}
/* Build a sub-directory style list of the tree level
specified in $dn */
- foreach (split (",", $dn) as $val){
+ foreach (dn_split ($dn) as $val){
/* We're only interested in organizational units... */
if (preg_match ("/ou=/", $val)){
- $dep= preg_replace("/ou=([^,]+)/", "\\1", $val)."/$dep";
+ $dep= substr($val,3)."/$dep";
}
/* ... and location objects */
if (preg_match ("/l=/", $val)){
- $dep= preg_replace("/l=([^,]+)/", "\\1", $val)."/$dep";
+ $dep= substr($val,2)."/$dep";
}
}
if(isset($deps[$dn])){
$dn= $deps[$dn];
- $tmp = split (",", $dn);
+ $tmp = dn_split ($dn);
$dep = preg_replace("/^.*=/","",$tmp[0]);
}else{
- $tmp = split (",", $dn);
+ $tmp = dn_split ($dn);
$dep= preg_replace("%^.*/([^/]+)$%", "\\1", $tmp[0]);
}
if (isset($_SESSION['DEBUGLEVEL'])){
$_SESSION['errors'].= "<div align=\"left\" style=\"border-width:5px;".
"border-style:solid;border-color:red; background-color:black;".
- "margin-bottom:10px; padding:8px;\"><table summary=''><tr><td><img alt=\"\" src=\"".
+ "margin-bottom:10px; padding:8px;\"><table style='width:100%' summary=''><tr><td><img alt=\"\" src=\"".
get_template_path('images/warning.png')."\"></td>".
- "<td width=\"100%\" align=\"center\"><font color=\"#FFFFFF\">".
+ "<td width=\"100%\" style=\"text-align:center\"><font color=\"#FFFFFF\">".
"<b style='font-size:16px;'>$string</b></font></td><td>".
"<img alt=\"\"src=\"".get_template_path('images/warning.png').
"\"></td></tr></table></div>\n";
function print_header($image, $headline, $info= "")
{
$display= "<div class=\"plugtop\">\n";
- $display.= " <img src=\"$image\" align=\"middle\" alt=\"*\"> $headline\n";
+ $display.= " <p class=\"center\" style=\"margin:0px 0px 0px 5px;padding:0px;font-size:24px;\"><img class=\"center\" src=\"$image\" align=\"middle\" alt=\"*\"> $headline</p>\n";
$display.= "</div>\n";
if ($info != ""){
if($post_var){
$output.= "<div style='border:1px solid #E0E0E0; background-color:#FFFFFF;'>
- <table width='100%'><tr><td style='width:20%'></td><td style='align:center;'>";
+ <table summary='' width='100%'><tr><td style='width:25%'></td><td style='text-align:center;'>";
}else{
$output.= "<div style='border:1px solid #E0E0E0; background-color:#FFFFFF;'>";
}
if ($start > 0 ) {
$output.=" <a href= \"main.php?plug=".validate($_GET['plug'])."&start=".
(($start-$range))."\">".
- "<img alt=\"\" src=\"images/back.png\" border=0 align=\"middle\"></a>";
+ "<img class=\"center\" alt=\"\" src=\"images/back.png\" border=0 align=\"middle\"></a>";
}
/* Draw pages */
for ($i= $begin; $i < $end; $i++) {
if ($ppage == $i){
- $output.= "<a style=\"background-color:#D0D0D0;\" href=\"main.php?plug=".
+ $output.= "<a style=\"vertical-align:middle;background-color:#D0D0D0;\" href=\"main.php?plug=".
validate($_GET['plug'])."&start=".
($i*$range)."\"> ".($i+1)." </a>";
} else {
- $output.= "<a href=\"main.php?plug=".validate($_GET['plug']).
+ $output.= "<a style=\"vertical-align:middle;\" href=\"main.php?plug=".validate($_GET['plug']).
"&start=".($i*$range)."\"> ".($i+1)." </a>";
}
}
if($start < ($dcnt-$range)) {
$output.=" <a href= \"main.php?plug=".validate($_GET['plug'])."&start=".
(($start+($range)))."\">".
- "<img alt=\"\" src=\"images/forward.png\" border=0 align=\"middle\"></a>";
+ "<img class=\"center\" alt=\"\" src=\"images/forward.png\" border=\"0\" align=\"middle\"></a>";
}
- if($post_var){
- $output.= "</td><td style='width:20%;text-align:right'> "._("Entries per page")." <select name='".$post_var."' onChange='javascript:document.mainform.submit()'>";
+ if(($post_var)&&($numpages)){
+ $output.= "</td><td style='width:25%;text-align:right;vertical-align:middle;'> "._("Entries per page")." <select style='vertical-align:middle;' name='".$post_var."' onChange='javascript:document.mainform.submit()'>";
foreach(array(20,50,100,200,"all") as $num){
if($num == "all"){
$var = 10000;
$var = $num;
}
if($var == $range){
- $output.="\n<option selected value='".$var."'>".$num."</option>";
+ $output.="\n<option selected='selected' value='".$var."'>".$num."</option>";
}else{
$output.="\n<option value='".$var."'>".$num."</option>";
}
$apply= ''.
'<table summary="" width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;"><tr><td width="100%" align="right">'.
- '<input type="submit" name="apply" value="'._("Apply").'"></td></tr></table>';
+ '<input type="submit" name="apply" value="'._("Apply filter").'"></td></tr></table>';
return ($apply);
}
}
+function dn_split($dn)
+{
+ $ret= array();
+ $tmp_dn= preg_replace('/\\\\,/', '##', $dn);
+ if (!preg_match('/,/', $tmp_dn)){
+ $ret[]= $dn;
+ return $ret;
+ }
+
+ while (1){
+
+ # Get next position of comma, exit if there
+ # are none left
+ $pos= strpos($tmp_dn, ',');
+ if ($pos === false){
+ break;
+ }
+
+ # Assign element
+ $ret[]= substr($dn, 0, $pos);
+ $tmp_dn= substr($tmp_dn, $pos + 1);
+ $dn= substr($dn, $pos + 1);
+ }
+
+ return ($ret);
+}
+
+
+function clean_dn($dn)
+{
+ $tmp_dn= preg_replace('/\\\\,/', '<GOSA#REPLACED#KOMMA>', $dn);
+ $tmp_dn= preg_replace('/[ ]*,[ ]*/', ",", $tmp_dn);
+ $tmp_dn= preg_replace('/\<GOSA#REPLACED#KOMMA\>/', '\\,', $tmp_dn);
+ return ($tmp_dn);
+}
+
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>