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

diff --git a/include/functions.inc b/include/functions.inc
index 8e85fb445633804d815f8a7dce08ed9e3dd15019..f75a34256b055efb869689092661762ca8f99c72 100644 (file)
--- 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.="  <a href= \"main.php?plug=".validate($_GET['plug'])."&start=".
+    $output.="  <a href= \"main.php?plug=".validate($_GET['plug'])."&amp;start=".
       (($start-$range))."\">".
       "<img alt=\"\" src=\"images/back.png\" border=0 align=\"middle\"></a>";
   }
@@ -1162,17 +1162,17 @@ function range_selector($dcnt,$start,$range=25)
   for ($i= $begin; $i < $end; $i++) {
     if ($ppage == $i){
       $output.= "<a style=\"background-color:#D0D0D0;\" href=\"main.php?plug=".
-        validate($_GET['plug'])."&start=".
+        validate($_GET['plug'])."&amp;start=".
         ($i*$range)."\">&nbsp;".($i+1)."&nbsp;</a>";
     } else {
       $output.= "<a href=\"main.php?plug=".validate($_GET['plug']).
-        "&start=".($i*$range)."\">&nbsp;".($i+1)."&nbsp;</a>";
+        "&amp;start=".($i*$range)."\">&nbsp;".($i+1)."&nbsp;</a>";
     }
   }
 
   /* Draw increment */
   if($start < ($dcnt-$range)) {
-    $output.="  <a href= \"main.php?plug=".validate($_GET['plug'])."&start=".
+    $output.="  <a href= \"main.php?plug=".validate($_GET['plug'])."&amp;start=".
       (($start+($range)))."\">".
       "<img alt=\"\" src=\"images/forward.png\" border=0 align=\"middle\"></a>";
   }

diff --git a/plugins/addons/addressbook/class_addressbook.inc b/plugins/addons/addressbook/class_addressbook.inc
index 6157bd2b66d6147437ca6803360845445da84ede..952e3230d92f256796e3c6d6c9661ab172fc8f83 100644 (file)
--- 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']]=
-                                       "<td class=\"phonelist\" title=\"".$attrs['sn'][0].", ".$attrs['givenName'][0]."\" onClick='location.href=\"main.php?plug=".validate($_GET['plug'])."&amp;start=".validate($_GET['start'])."&amp;show=".base64_encode($attrs['dn'])."\"'><a href=main.php?plug=".validate($_GET['plug'])."&amp;start=".validate($_GET['start'])."&amp;show=".base64_encode($attrs['dn']).">".$attrs['sn'][0].", ".$attrs['givenName'][0]."</a></td>".
-                                       "<td title=\""._("Dial")." ".$attrs['telephoneNumber'][0]."\"><a href=main.php?plug=".validate($_GET['plug'])."&amp;dial=telephoneNumber&amp;start=".validate($_GET['start'])."&amp;target=".base64_encode($attrs['dn']).">".$attrs['telephoneNumber'][0]."</a></td>".
-                                       "<td title=\"".$attrs['facsimileTelephoneNumber'][0]."\">".$attrs['facsimileTelephoneNumber'][0]."</td>".
-                                       "<td title=\""._("Dial")." ".$attrs['mobile'][0]."\"><a href=main.php?plug=".validate($_GET['plug'])."&amp;dial=mobile&amp;start=".validate($_GET['start'])."&amp;target=".base64_encode($attrs['dn']).">".$attrs['mobile'][0]."</a></td>".
-                                       "<td title=\""._("Dial")." ".$attrs['homePhone'][0]."\"><a href=main.php?plug=".validate($_GET['plug'])."&amp;dial=homePhone&amp;start=".validate($_GET['start'])."&amp;target=".base64_encode($attrs['dn']).">".$attrs['homePhone'][0]."</a></td><td>".
-                                       "<a href=\"getvcard.php?dn=".base64_encode($attrs['dn'])."\">".
-                                       "<img alt=\"\" align=\"top\" border=0 src=\"images/save.png\"".
-                                       "alt=\"vcf\" title=\"".sprintf(_("Save contact for %s as vcard"), $attrs['givenName'][0]." ".$attrs['sn'][0])."\"></a>";
+$this->telephone_list[$attrs['sn'][0].$attrs['dn']]=
+
+"<td class=\"phonelist\" title=\"".$attrs['sn'][0].", ".$attrs['givenName'][0]."\" onClick='location.href=\"main.php?plug=".validate($_GET['plug'])."&amp;start=".validate($_GET['start'])."&amp;show=".base64_encode($attrs['dn'])."\"'><a href=\"main.php?plug=".validate($_GET['plug'])."&amp;start=".validate($_GET['start'])."&amp;show=".base64_encode($attrs['dn'])."\">".$attrs['sn'][0].", ".$attrs['givenName'][0].
+       "</a>
+</td>
+<td title=\""._("Dial")." ".$attrs['telephoneNumber'][0]."\">
+       <a href=\"main.php?plug=".validate($_GET['plug'])."&amp;dial=telephoneNumber&amp;start=".validate($_GET['start'])."&amp;target=".base64_encode($attrs['dn'])."\">".$attrs['telephoneNumber'][0]."
+       </a>
+</td>
+<td title=\"".$attrs['facsimileTelephoneNumber'][0]."\">
+       ".$attrs['facsimileTelephoneNumber'][0]."
+</td>
+<td title=\""._("Dial")." ".$attrs['mobile'][0]."\">
+       <a href=\"main.php?plug=".validate($_GET['plug'])."&amp;dial=mobile&amp;start=".validate($_GET['start'])."&amp;target=".base64_encode($attrs['dn'])."\">".$attrs['mobile'][0]."
+       </a>
+</td>
+<td title=\""._("Dial")." ".$attrs['homePhone'][0]."\">
+       <a href=\"main.php?plug=".validate($_GET['plug'])."&amp;dial=homePhone&amp;start=".validate($_GET['start'])."&amp;target=".base64_encode($attrs['dn'])."\">".$attrs['homePhone'][0]."
+       </a>
+</td>
+<td>
+       <a href=\"getvcard.php?dn=".base64_encode($attrs['dn'])."\">
+       <img align=\"top\" border=0 src=\"images/save.png\" alt=\"vcf\" title=\"".sprintf(_("Save contact for %s as vcard"), $attrs['givenName'][0]." ".$attrs['sn'][0])."\">
+       </a>";
 
                                if (isset($attrs['mail'])){
                                        $dest= sprintf(_("Send mail to %s"), $attrs['mail'][0]);
                                        $this->telephone_list[$attrs['sn'][0].$attrs['dn']].=
                                                "<a href=\"mailto:".$attrs['givenName'][0]." ".$attrs['sn'][0]." <".$attrs['mail'][0].">\">".
-                                               "<img alt=\"\" align=\"top\" border=0 src=\"images/mailto.png\"".
+                                               "<img  align=\"top\" border=0 src=\"images/mailto.png\"".
                                                "alt=\"vcf\" title=\"$dest\"></a>";
                                }
                                $this->telephone_list[$attrs['sn'][0].$attrs['dn']].= "</td>";
@@ -432,7 +447,7 @@ class addressbook extends plugin
                                     $name == "homePhone" ||
                                     $name == "telephoneNumber"){
                                         $smarty->assign("info_$name",
-                                                "<a title=\""._("Dial")." ".$info["$name"][0]."\" href=main.php?plug=".validate($_GET['plug'])."&amp;dial=$name&amp;start=".validate($_GET['start'])."&amp;target=".base64_encode($_SESSION['show_info']).">".$info["$name"][0]."</a>");
+                                                "<a title=\""._("Dial")." ".$info["$name"][0]."\" href=\"main.php?plug=".validate($_GET['plug'])."&amp;dial=$name&amp;start=".validate($_GET['start'])."&amp;target=".base64_encode($_SESSION['show_info'])."\">".$info["$name"][0]."</a>");
                                 } else {
                                        $smarty->assign("info_$name", preg_replace("/\n/", "<br>", $info["$name"][0]));
                                 }
@@ -476,7 +491,7 @@ class addressbook extends plugin
                } else {
                        $col= "style=\"background-color: #F5F5F5;\"";
                }
-               $output.= "<tr $col>$val</tr>";
+               $output.= "<tr $col>\n$val</tr>\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 3e2af4bfe464b646e2cc0eb2f542aa0acbb661b0..ed905e093e1d5f109a03b5051ccee131061976d6 100644 (file)
--- 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 6329537d8742ed331d085fb80c6e37ce90162f97..e9f76b1e4d52306edeef71f879be5329846760a2 100644 (file)
--- a/plugins/admin/systems/service.tpl
+++ b/plugins/admin/systems/service.tpl
@@ -73,7 +73,7 @@
    </table>
 
   </td>
- </t
+ </tr>
 </table>
 
 <table style="width:100%;">

diff --git a/plugins/admin/systems/startup.tpl b/plugins/admin/systems/startup.tpl
index 2dd1eb60a958bc1cf3cad43783a30cfd94089a60..2d1427fd3d1c896d0dc215ef49d7ac98f0540c3b 100644 (file)
--- a/plugins/admin/systems/startup.tpl
+++ b/plugins/admin/systems/startup.tpl
@@ -64,13 +64,13 @@
    <h2>
     <img alt="" align="middle" src="images/zip.png"> {t}Automount devices (format: complete autofs entry){/t}
    </h2>
-   <select style="width:100%; height:100px;" name="autofs_list[]" size=15 multiple title="{t}Add additional automount entries{/t}">
+   <select style="width:100%; height:100px;" name="autofs_list[]" size=15 multiple title='{t}Add additional automount entries{/t}'>
     {html_options values=$gotoAutoFs output=$gotoAutoFs}
    </select>
    <br>
-   <input name="autofs" size=30 align=middle maxlength=80 {$gotoAutoFs}>
-   <input type=submit value="{t}Add{/t}" name="add_autofs" {$gotoAutoFs}>&nbsp;
-   <input type=submit value="{t}Delete{/t}" name="delete_autofs" {$gotoAutoFs}>
+   <input name="autofs" size=30 align=middle maxlength=80>
+   <input type=submit value="{t}Add{/t}" name="add_autofs">&nbsp;
+   <input type=submit value="{t}Delete{/t}" name="delete_autofs">
   </td>
  </tr>
 </table>