Updated dn display to not break at spaces

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3506 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/applications/class_divListApplication.inc b/plugins/admin/applications/class_divListApplication.inc
index 4f4b3c79b73a324e9277a4a44159d1fe16ea4388..e5bddf2ceaf4d5f9740b1f3f3d3ff4ee28664c28 100755 (executable)
--- a/plugins/admin/applications/class_divListApplication.inc
+++ b/plugins/admin/applications/class_divListApplication.inc
@@ -150,7 +150,7 @@ class divListApplication extends MultiSelectWindow
      ********************/
 
     foreach($list as $key => $val){
-      $title = "title='dn: ".@LDAP::fix($val['dn'])."'";
+      $title = "title='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'";
 
       if(!isset($val['description'][0])){
         $desc = "";

diff --git a/plugins/admin/fai/class_divListFai.inc b/plugins/admin/fai/class_divListFai.inc
index 3acbb296ceb4094128fa824105325db20e0c02b2..2262fd8ae8c6e33b09d0d494ba4b74318261bb7e 100644 (file)
--- a/plugins/admin/fai/class_divListFai.inc
+++ b/plugins/admin/fai/class_divListFai.inc
@@ -220,7 +220,7 @@ _("Submit")."'> ".
        }
 
        $field1 = array("string" => $img , "attach" => "style='text-align:center;width:20px;'");
-       $field2 = array("string" => preg_replace(array("/%KEY%/","/%NAME%/","/%TITLE%/"),array($key,$value['cn'].$desc,$value['dn']),$edi) , "attach" => "style=''");
+       $field2 = array("string" => preg_replace(array("/%KEY%/","/%NAME%/","/%TITLE%/"),array($key,$value['cn'].$desc,preg_replace('/ /', ' ', @LDAP::fix($value['dn']))),$edi) , "attach" => "style=''");
        $field3 = array("string" => $info, "attach" => "style='width:200px;'");
        $field4 = array("string" => preg_replace("/%KEY%/",$key,$acti) , "attach" => "style='width:60px;border-right:0px;text-align:right;'");
        $this->AddElement(array($field1,$field2,$field3,$field4));

diff --git a/plugins/admin/groups/class_divListGroup.inc b/plugins/admin/groups/class_divListGroup.inc
index d0ac190d7726b37daa62cc5bf439e3d833c12b27..f8139ab5870acaf79d020f998003092cc33ca9ea 100644 (file)
--- a/plugins/admin/groups/class_divListGroup.inc
+++ b/plugins/admin/groups/class_divListGroup.inc
@@ -169,7 +169,7 @@ class divListGroup extends MultiSelectWindow
         if(in_array("gotoEnvironment",      $val['objectClass']))   $enviro= $envimg;
       }
 
-      $title = "title='dn: ".@LDAP::fix($val['dn'])."'";
+      $title = "title='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'";
 
       if(!isset($val['description'][0])){
         $desc = "";

diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc
index ecdfff5f9753b80865750003d04c532f0358899c..9fc480e268aee51c26fa330939e373af705cf2f3 100755 (executable)
--- a/plugins/admin/ogroups/class_divListOGroup.inc
+++ b/plugins/admin/ogroups/class_divListOGroup.inc
@@ -154,7 +154,7 @@ class divListOGroup extends MultiSelectWindow
       }else{
         $mail = $empty;
       }
-      $title = "title='dn: ".@LDAP::fix($val['dn'])."'";
+      $title = "title='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'";
       if(!isset($val['description'][0])){
         $desc = "";
       }else{

diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc
index 27c6456d9b231ecb37be7b21af29faea5b96da35..d36f76051690f5e02f96a237db96267a150519a9 100644 (file)
--- a/plugins/admin/systems/class_divListSystem.inc
+++ b/plugins/admin/systems/class_divListSystem.inc
@@ -177,7 +177,7 @@ class divListSystem extends MultiSelectWindow
 
       $img    = $this->parent->convert_list($val);
       $field1 = array("string" => sprintf($img['img'],$val['dn']), "attach" => "style='text-align:center;width:20px;'");
-      $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='".@LDAP::fix($val['dn'])."'");
+      $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'");
       $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
       $this->AddElement( array($field1,$field2,$field3));
     }

diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc
index e5164a0ccd4879e7a01a72abb92adcee0ce6fc5a..7b2b9cceb6bdedd0ab4fb10a256383842a3ccb43 100644 (file)
--- a/plugins/admin/users/class_divListUsers.inc
+++ b/plugins/admin/users/class_divListUsers.inc
@@ -278,7 +278,7 @@ class divListUsers extends MultiSelectWindow
 
       /* Create each field */
       $field1 = array("string" => sprintf($tpl,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
-      $field2 = array("string" => sprintf($editlink,$key,$display).$ip_port, "attach" => "style='' title='dn: ".@LDAP::fix($val['dn'])."'");
+      $field2 = array("string" => sprintf($editlink,$key,$display).$ip_port, "attach" => "style='' title='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'");
       $field3 = array("string" => $UseImg, "attach" => "style='width:152px;'");
       $field4 = array("string" => $s_img_create_from_template.preg_replace("/%KEY%/", "$key", $action),
                       "attach" => "style='width:102px;border-right:0px;    text-align:right;'");

diff --git a/plugins/gofax/blocklists/class_divListBlocklists.inc b/plugins/gofax/blocklists/class_divListBlocklists.inc
index a98b20c01ab39ba74a962da452f622707b5413db..42e884dc2c09859739c7876ac747748ab6518470 100755 (executable)
--- a/plugins/gofax/blocklists/class_divListBlocklists.inc
+++ b/plugins/gofax/blocklists/class_divListBlocklists.inc
@@ -113,7 +113,7 @@ class divListBlocklist extends MultiSelectWindow
       // Generate Array to Add
       $display= "[".$val["cn"][0]."]";
       $field1 = array("string" => sprintf($blockimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
-      $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='dn: ".@LDAP::fix($val['dn'])."'");
+      $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'");
       $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
       $this->AddElement( array($field1,$field2,$field3));
     }

diff --git a/plugins/gofon/macro/class_divListMacros.inc b/plugins/gofon/macro/class_divListMacros.inc
index b88aaed36fd3f9e7e13060888ab461f1db5e4426..b86f1dce02cc114df87d6410b06c5de1df007228 100755 (executable)
--- a/plugins/gofon/macro/class_divListMacros.inc
+++ b/plugins/gofon/macro/class_divListMacros.inc
@@ -120,7 +120,7 @@ class divListMacro extends MultiSelectWindow
       }
 
       $field1 = array("string" => sprintf($macroimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
-      $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='dn: ".@LDAP::fix($val['dn'])."'");
+      $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'");
       $field3 = array("string" => $pic1, "attach" => "style='width:50px;'");
       $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action), "attach" => "style='width:60px;border-right:0px;text-align:right;'");