From da57c6380c4b4b51327b1cb4b38a6231d8bf56d9 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 25 May 2005 12:10:07 +0000 Subject: [PATCH] changes in fucntions inc --> there was & in a link but it must be & to be conform git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@444 594d385d-05f5-0310-b6e9-bd551577e9d8 --- include/functions.inc | 8 ++-- .../addons/addressbook/class_addressbook.inc | 39 +++++++++++++------ .../admin/systems/class_terminalStartup.inc | 1 + plugins/admin/systems/service.tpl | 2 +- plugins/admin/systems/startup.tpl | 8 ++-- 5 files changed, 37 insertions(+), 21 deletions(-) diff --git a/include/functions.inc b/include/functions.inc index 8e85fb445..f75a34256 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -1153,7 +1153,7 @@ function range_selector($dcnt,$start,$range=25) /* Draw decrement */ if ($start > 0 ) { - $output.=" ". "\"\""; } @@ -1162,17 +1162,17 @@ function range_selector($dcnt,$start,$range=25) for ($i= $begin; $i < $end; $i++) { if ($ppage == $i){ $output.= " ".($i+1)." "; } else { $output.= " ".($i+1)." "; + "&start=".($i*$range)."\"> ".($i+1)." "; } } /* Draw increment */ if($start < ($dcnt-$range)) { - $output.=" ". "\"\""; } diff --git a/plugins/addons/addressbook/class_addressbook.inc b/plugins/addons/addressbook/class_addressbook.inc index 6157bd2b6..952e3230d 100644 --- a/plugins/addons/addressbook/class_addressbook.inc +++ b/plugins/addons/addressbook/class_addressbook.inc @@ -349,21 +349,36 @@ class addressbook extends plugin isset($attrs['homePhone'][0]) || isset($attrs['mail'][0])){ - $this->telephone_list[$attrs['sn'][0].$attrs['dn']]= - "".$attrs['sn'][0].", ".$attrs['givenName'][0]."". - "".$attrs['telephoneNumber'][0]."". - "".$attrs['facsimileTelephoneNumber'][0]."". - "".$attrs['mobile'][0]."". - "".$attrs['homePhone'][0]."". - "". - "\"\""; +$this->telephone_list[$attrs['sn'][0].$attrs['dn']]= + +"".$attrs['sn'][0].", ".$attrs['givenName'][0]. + " + + + ".$attrs['telephoneNumber'][0]." + + + + ".$attrs['facsimileTelephoneNumber'][0]." + + + ".$attrs['mobile'][0]." + + + + ".$attrs['homePhone'][0]." + + + + + \"vcf\" + "; if (isset($attrs['mail'])){ $dest= sprintf(_("Send mail to %s"), $attrs['mail'][0]); $this->telephone_list[$attrs['sn'][0].$attrs['dn']].= "\">". - "\"\""; } $this->telephone_list[$attrs['sn'][0].$attrs['dn']].= ""; @@ -432,7 +447,7 @@ class addressbook extends plugin $name == "homePhone" || $name == "telephoneNumber"){ $smarty->assign("info_$name", - "".$info["$name"][0].""); + "".$info["$name"][0].""); } else { $smarty->assign("info_$name", preg_replace("/\n/", "
", $info["$name"][0])); } @@ -476,7 +491,7 @@ class addressbook extends plugin } else { $col= "style=\"background-color: #F5F5F5;\""; } - $output.= "$val"; + $output.= "\n$val\n"; } $smarty->assign("search_result", $output); $smarty->assign("apply", apply_filter()); diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc index 3e2af4bfe..ed905e093 100644 --- a/plugins/admin/systems/class_terminalStartup.inc +++ b/plugins/admin/systems/class_terminalStartup.inc @@ -244,6 +244,7 @@ class termstartup extends plugin /* Add missing arrays */ foreach (array("gotoFilesystem", "gotoAutoFs", "gotoModules") as $val){ if (isset ($this->$val) && count ($this->$val) != 0){ + $this->attrs["$val"]= array_unique($this->$val); } } diff --git a/plugins/admin/systems/service.tpl b/plugins/admin/systems/service.tpl index 6329537d8..e9f76b1e4 100644 --- a/plugins/admin/systems/service.tpl +++ b/plugins/admin/systems/service.tpl @@ -73,7 +73,7 @@ - diff --git a/plugins/admin/systems/startup.tpl b/plugins/admin/systems/startup.tpl index 2dd1eb60a..2d1427fd3 100644 --- a/plugins/admin/systems/startup.tpl +++ b/plugins/admin/systems/startup.tpl @@ -64,13 +64,13 @@

{t}Automount devices (format: complete autofs entry){/t}

- {html_options values=$gotoAutoFs output=$gotoAutoFs}
- -   - + +   +
-- 2.30.2