index 7ec88be52a422b8b9b0f6de6c030477f7489c826..ef7e038c30b9a64fa145bdd5306112e639047671 100644 (file)
isset($config['sortType'])) {
$this->sortAttribute= $config['sortAttribute'];
$this->sortType= $config['sortType'];
isset($config['sortType'])) {
$this->sortAttribute= $config['sortAttribute'];
$this->sortType= $config['sortType'];
- $sorter= " <img border='0' title='".($this->sortDirection[$index]?_("Up"):_("Down"))."' src='images/lists/sort-".($this->sortDirection[$index]?"up":"down").".png' align='top'>";
+ $sorter= " ".image("images/lists/sort-".($this->sortDirection[$index]?"up":"down").".png", null, null, $this->sortDirection[$index]?_("Up"):_("Down"), "text-top");
}
$sortable= (isset($config['sortAttribute']));
}
$sortable= (isset($config['sortAttribute']));
$height= $this->height;
}
$height= $this->height;
}
- $result.= "<div class='listContainer' id='d_scrollbody' style='border-top:1px solid #B0B0B0;border-right:1px solid #B0B0B0;width:100%;min-height:".($height+25)."px;'>\n";
- $result.= "<table summary='$this->headline' style='width:100%; table-layout:fixed' cellspacing='0' cellpadding='0' id='t_scrolltable'>\n";
+ $result.= "<div class='listContainer' id='d_scrollbody' style='min-height:".($height+25)."px;'>\n";
+ $result.= "<table summary='$this->headline' style='width:100%;table-layout:fixed' cellspacing='0' cellpadding='0' id='t_scrolltable'>\n";
$this->numColumns= count($this->colprops) + ($this->multiSelect?1:0);
// Build list header
$this->numColumns= count($this->colprops) + ($this->multiSelect?1:0);
// Build list header
// No results? Just take an empty colspanned row
if (count($this->entries) + count($this->departments) == 0) {
// No results? Just take an empty colspanned row
if (count($this->entries) + count($this->departments) == 0) {
- $result.= "<tr class='rowxp0'><td class='list1nohighlight' colspan='$this->numColumns' style='height:100%;border-right:0px;width:100%;'> </td></tr>";
+ $result.= "<tr><td class='list1nohighlight' colspan='$this->numColumns' style='height:100%;border-right:0px;width:100%;'> </td></tr>";
}
// Line color alternation
}
// Line color alternation
// Fill with department browser if configured this way
$departmentIterator= new departmentSortIterator($this->departments, $this->sortDirection[$this->sortColumn]);
foreach ($departmentIterator as $row => $entry){
// Fill with department browser if configured this way
$departmentIterator= new departmentSortIterator($this->departments, $this->sortDirection[$this->sortColumn]);
foreach ($departmentIterator as $row => $entry){
- $result.="<tr class='rowxp".($alt&1)."'>";
+ $result.="<tr>";
// Render multi select if needed
if ($this->multiSelect) {
// Render multi select if needed
if ($this->multiSelect) {
// Complete list by sorting entries for _sort$index and appending them to the output
$entryIterator= new listingSortIterator($this->entries, $this->sortDirection[$this->sortColumn], "_sort".$this->sortColumn, $this->sortType);
foreach ($entryIterator as $row => $entry){
// Complete list by sorting entries for _sort$index and appending them to the output
$entryIterator= new listingSortIterator($this->entries, $this->sortDirection[$this->sortColumn], "_sort".$this->sortColumn, $this->sortType);
foreach ($entryIterator as $row => $entry){
- $result.="<tr class='rowxp".($alt&1)."'>\n";
+ $result.="<tr>\n";
$result.= $entry['_rendered'];
$result.="</tr>\n";
$alt++;
$result.= $entry['_rendered'];
$result.="</tr>\n";
$alt++;
foreach ($this->objectTypes as $objectType) {
if (isset($this->objectTypeCount[$objectType['label']])) {
$label= _($objectType['label']);
foreach ($this->objectTypes as $objectType) {
if (isset($this->objectTypeCount[$objectType['label']])) {
$label= _($objectType['label']);
- $result.= "<img class='center' src='".$objectType['image']."' title='$label' alt='$label'> ".$this->objectTypeCount[$objectType['label']]." ";
+ $result.= image($objectType['image'], null, null, $label)." ".$this->objectTypeCount[$objectType['label']]." ";
}
}
}
}
// Override base if we got signals from the navigation elements
$action= "";
foreach ($_POST as $key => $value) {
// Override base if we got signals from the navigation elements
$action= "";
foreach ($_POST as $key => $value) {
- if (preg_match('/^(ROOT|BACK|HOME)_x$/', $key, $match)) {
+ if (preg_match('/^(ROOT|BACK|HOME)(_x)?$/', $key, $match)) {
$action= $match[1];
break;
}
$action= $match[1];
break;
}
$objectType= $this->getObjectType($this->objectTypes, $classes);
if ($objectType) {
$this->objectDnMapping[$dn]= $objectType["objectClass"];
$objectType= $this->getObjectType($this->objectTypes, $classes);
if ($objectType) {
$this->objectDnMapping[$dn]= $objectType["objectClass"];
- $result= "<img class='center' title='".LDAP::fix($dn)."' src='".$objectType["image"]."'>";
+ $result= image($objectType["image"], null, null, LDAP::fix($dn));
if (!isset($this->objectTypeCount[$objectType['label']])) {
$this->objectTypeCount[$objectType['label']]= 0;
}
if (!isset($this->objectTypeCount[$objectType['label']])) {
$this->objectTypeCount[$objectType['label']]= 0;
}
foreach($actions as $action) {
// Skip the entry completely if there's no permission to execute it
if (!$this->hasActionPermission($action, $dn, $classes)) {
foreach($actions as $action) {
// Skip the entry completely if there's no permission to execute it
if (!$this->hasActionPermission($action, $dn, $classes)) {
- $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
continue;
}
continue;
}
if (preg_match('/^(.*)!$/', $fa, $m)){
$fa= $m[1];
if (isset($this->entries[$row][$fa]) && $this->entries[$row][$fa][0] == $fv) {
if (preg_match('/^(.*)!$/', $fa, $m)){
$fa= $m[1];
if (isset($this->entries[$row][$fa]) && $this->entries[$row][$fa][0] == $fv) {
- $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
continue;
}
} else {
if (!isset($this->entries[$row][$fa]) && !$this->entries[$row][$fa][0] == $fv) {
continue;
}
} else {
if (!isset($this->entries[$row][$fa]) && !$this->entries[$row][$fa][0] == $fv) {
- $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
continue;
}
}
continue;
}
}
if (preg_match('/^!(.*)$/', $objectclass, $m)){
$objectclass= $m[1];
if(in_array($objectclass, $classes)) {
if (preg_match('/^!(.*)$/', $objectclass, $m)){
$objectclass= $m[1];
if(in_array($objectclass, $classes)) {
- $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
continue;
}
} elseif (is_string($objectclass)) {
if(!in_array($objectclass, $classes)) {
continue;
}
} elseif (is_string($objectclass)) {
if(!in_array($objectclass, $classes)) {
- $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
continue;
}
} elseif (is_array($objectclass)) {
if(count(array_intersect($objectclass, $classes)) != count($objectclass)){
continue;
}
} elseif (is_array($objectclass)) {
if(count(array_intersect($objectclass, $classes)) != count($objectclass)){
- $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
continue;
}
}
continue;
}
}
if ($action['type'] == "entry") {
$label= $this->processElementFilter($action['label'], $this->entries[$row], $row);
$image= $this->processElementFilter($action['image'], $this->entries[$row], $row);
if ($action['type'] == "entry") {
$label= $this->processElementFilter($action['label'], $this->entries[$row], $row);
$image= $this->processElementFilter($action['image'], $this->entries[$row], $row);
- $result.="<input class='center' type='image' src='$image' title='$label' ".
- "name='listing_".$action['name']."_$row' style='padding:1px'>";
+ $result.= image($image, null, "listing_".$action['name']."_$row", $label);
}
// Handle special types
}
// Handle special types
/* Draw root button */
if($enableRoot){
/* Draw root button */
if($enableRoot){
- $result["ROOT"]= "<input class='center' type='image' src='images/lists/root.png' align='middle' ".
- "title='"._("Go to root department")."' name='ROOT' alt='"._("Root")."'>";
+ $result["ROOT"]= image('images/lists/root.png', null, 'ROOT', _("Root"));
}else{
}else{
- $result["ROOT"]= "<img src='images/lists/root_grey.png' class='center' alt='"._("Root")."'>";
+ $result["ROOT"]= image('images/lists/root-grey.png', null, null, _("Root"));
}
/* Draw back button */
if($enableBack){
}
/* Draw back button */
if($enableBack){
- $result["BACK"]= "<input class='center' type='image' align='middle' src='images/lists/back.png' ".
- "title='"._("Go up one department")."' alt='"._("Up")."' name='BACK'>";
+ $result["BACK"]= image('images/lists/back.png', null, 'BACK', _("Go up one department"));
}else{
}else{
- $result["BACK"]= "<img src='images/lists/back_grey.png' class='center' alt='"._("Up")."'>";
+ $result["BACK"]= image('images/lists/back-grey.png', null, null, _("Go up one department"));
}
/* Draw home button */
}
/* Draw home button */
+ /* Draw home button */
if($enableHome){
if($enableHome){
- $result["HOME"]= "<input class='center' type='image' align='middle' src='images/lists/home.png' ".
- "title='"._("Go to users department")."' alt='"._("Home")."' name='HOME'>";
+ $result["HOME"]= image('images/lists/home.png', null, 'HOME', _("Go to users department"));
}else{
}else{
- $result["HOME"]= "<img src='images/lists/home_grey.png' class='center' alt='"._("Home")."'>";
+ $result["HOME"]= image('images/lists/home-grey.png', null, null, _("Go to users department"));
}
}
+
/* Draw reload button, this button is enabled everytime */
/* Draw reload button, this button is enabled everytime */
- $result["RELOAD"]= "<input class='center' type='image' src='images/lists/reload.png' align='middle' ".
- "title='"._("Reload list")."' name='REFRESH' alt='"._("Submit")."'>";
+ $result["RELOAD"]= image('images/lists/reload.png', null, 'REFRESH', _("Reload list"));
return ($result);
}
return ($result);
}
// Load shortcut
$actions= &$this->xmlData['actionmenu']['action'];
$result= "<input type='hidden' name='act' id='actionmenu' value=''><div style='display:none'><input type='submit' name='exec_act' id='exec_act' value=''></div>".
// Load shortcut
$actions= &$this->xmlData['actionmenu']['action'];
$result= "<input type='hidden' name='act' id='actionmenu' value=''><div style='display:none'><input type='submit' name='exec_act' id='exec_act' value=''></div>".
- "<ul class='level1' id='root'><li><a href='#'>"._("Actions")." <img ".
- "border=0 class='center' src='images/lists/sort-down.png'></a>";
+ "<ul class='level1' id='root'><li><a href='#'>"._("Actions")." ".image("images/lists/sort-down.png")."</a>";
// Build ul/li list
$result.= $this->recurseActions($actions);
// Build ul/li list
$result.= $this->recurseActions($actions);
// Fill image if set
$img= "";
if (isset($action['image'])){
// Fill image if set
$img= "";
if (isset($action['image'])){
- $img= "<img border='0' class='center' src='".$action['image']."'> ";
+ $img= image($action['image'])." ";
}
if ($action['type'] == "separator"){
}
if ($action['type'] == "separator"){
if ($action['type'] == "sub" && isset($action['action'])) {
$level++;
if (isset($action['label'])){
if ($action['type'] == "sub" && isset($action['action'])) {
$level++;
if (isset($action['label'])){
- $result.= "<li$separator><a href='#'>$img"._($action['label'])." <img border='0' src='images/forward-arrow.png'></a>";
+ $result.= "<li$separator><a href='#'>$img"._($action['label'])." ".image('images/forward-arrow.png')."</a>";
}
// Ensure we've an array of actions, this enables sub menus with only one action.
}
// Ensure we've an array of actions, this enables sub menus with only one action.
// Copy entry
if($copy){
// Copy entry
if($copy){
- $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"copy\";document.getElementById(\"exec_act\").click();'><img src='images/lists/copy.png' alt='' border='0' class='center'> "._("Copy")."</a></li>";
+ $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"copy\";document.getElementById(\"exec_act\").click();'>".image('images/lists/copy.png')." "._("Copy")."</a></li>";
$separator= "";
}
// Cut entry
if($cut){
$separator= "";
}
// Cut entry
if($cut){
- $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"cut\";document.getElementById(\"exec_act\").click();'><img src='images/lists/cut.png' alt='' border='0' class='center'> "._("Cut")."</a></li>";
+ $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"cut\";document.getElementById(\"exec_act\").click();'>".image("images/lists/cut.png")." "._("Cut")."</a></li>";
$separator= "";
}
}
$separator= "";
}
}
// Draw entries that allow pasting entries
if($paste){
if($this->copyPasteHandler->entries_queued()){
// Draw entries that allow pasting entries
if($paste){
if($this->copyPasteHandler->entries_queued()){
- $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"paste\";document.getElementById(\"exec_act\").click();'><img src='images/lists/paste.png' alt='' border='0' class='center'> "._("Paste")."</a></li>";
+ $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"paste\";document.getElementById(\"exec_act\").click();'>".image("images/lists/paste.png")." "._("Paste")."</a></li>";
}else{
}else{
- $result.= "<li$separator><a href='#'><img src='images/lists/paste-grey.png' alt='' border='0' class='center'> "._("Paste")."</a></li>";
+ $result.= "<li$separator><a href='#'>".image('images/lists/paste-grey.png')." "._("Paste")."</a></li>";
}
}
}
}
// Render cut entries
if($cut){
if($ui->is_cutable($dn, $category, $class)){
// Render cut entries
if($cut){
if($ui->is_cutable($dn, $category, $class)){
- $result .= "<input class='center' type='image'
- src='images/lists/cut.png' alt='"._("Cut")."' name='listing_cut_$row' title='"._("Cut this entry")."' style='padding:1px'>";
+ $result.= image('images/lists/cut.png', null, "listing_cut_$row", _("Cut this entry"));
}else{
}else{
- $result.="<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
}
}
// Render copy entries
if($copy){
if($ui->is_copyable($dn, $category, $class)){
}
}
// Render copy entries
if($copy){
if($ui->is_copyable($dn, $category, $class)){
- $result.= "<input class='center' type='image'
- src='images/lists/copy.png' alt='"._("Copy")."' name='listing_copy_$row' title='"._("Copy this entry")."' style='padding:1px'>";
+ $result.= image('images/lists/copy.png', null, "listing_copy_$row", _("Copy this entry"));
}else{
}else{
- $result.="<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
}
}
}
}
// Draw icons according to the restore flag
if($restore){
// Draw icons according to the restore flag
if($restore){
- $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"restore\";document.getElementById(\"exec_act\").click();'><img src='images/lists/restore.png' alt='' border='0' class='center'> "._("Restore snapshots")."</a></li>";
+ $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"restore\";document.getElementById(\"exec_act\").click();'>".image('images/lists/restore.png')." "._("Restore snapshots")."</a></li>";
}else{
}else{
- $result.= "<li$separator><a href='#'><img src='images/lists/restore_grey.png' alt='' border='0' class='center'> "._("Restore snapshots")."</a></li>";
+ $result.= "<li$separator><a href='#'>".image('images/lists/restore_grey.png')." "._("Restore snapshots")."</a></li>";
}
}
}
}
$result = "";
// Draw entries
$result = "";
// Draw entries
- $result.= "<li$separator><a href='#'><img border='0' class='center' src='images/lists/export.png'> "._("Export list")." <img border='0' src='images/forward-arrow.png'></a><ul class='level3'>";
+ $result.= "<li$separator><a href='#'>".image('images/lists/export.png')." "._("Export list")." ".image("images/forward-arrow.png")."</a><ul class='level3'>";
// Export CVS as build in exporter
foreach ($this->exporter as $action => $exporter) {
// Export CVS as build in exporter
foreach ($this->exporter as $action => $exporter) {
- $result.= "<li><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"$action\";document.getElementById(\"exec_act\").click();'><img border='0' class='center' src='".$exporter['image']."'> ".$exporter['label']."</a></li>";
+ $result.= "<li><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"$action\";document.getElementById(\"exec_act\").click();'>".image($exporter['image'])." ".$exporter['label']."</a></li>";
}
// Finalize list
}
// Finalize list
// Do we have snapshots for this dn?
if($this->snapshotHandler->hasSnapshots($dn)){
// Do we have snapshots for this dn?
if($this->snapshotHandler->hasSnapshots($dn)){
- $result.= "<input class='center' type='image' src='images/lists/restore.png' ".
- "alt='"._("Restore snapshot")."' name='listing_restore_$row' title='".
- _("Restore snapshot")."' style='padding:1px'>";
+ $result.= image('images/lists/restore.png', null, "listing_restore_$row", _("Restore snapshot"));
} else {
} else {
- $result.= "<img src='images/lists/restore_grey.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/lists/restore_grey.png');
}
}
// Draw snapshot button
if($ui->allow_snapshot_create($dn, $category)){
}
}
// Draw snapshot button
if($ui->allow_snapshot_create($dn, $category)){
- $result.= "<input class='center' type='image' src='images/snapshot.png' ".
- "alt='"._("Create snapshot")."' name='listing_snapshot_$row' title='".
- _("Create a new snapshot from this object")."' style='padding:1px'>";
+ $result.= image('images/snapshot.png', null, "listing_snapshot_$row", _("Create a new snapshot from this object"));
}else{
}else{
- $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
}
}
}
}