Fixed W3c errors.

Fixed reload in FAI template - caused calls on non object.

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

diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc
index a239bfc134ab50b8e26fa646fbdf5a645b2c93dc..aefb8b8f365c2966ed39e0ed0ffe15059cde63fd 100644 (file)
--- a/include/class_MultiSelectWindow.inc
+++ b/include/class_MultiSelectWindow.inc
@@ -599,7 +599,7 @@ class MultiSelectWindow{
       }
       if($ok){
         if($layer_menu){
-          $str = "..|<img class='center' src='images/restore.png'>&nbsp;"._("Restore")."|RestoreDeletedSnapShot|\n";
+          $str = "..|<img class='center' src='images/restore.png' alt='"._("Restore")."'>&nbsp;"._("Restore")."|RestoreDeletedSnapShot|\n";
         }else{
           $str = "<input class='center' type='image' align='middle' src='images/restore.png'
             title='"._("Restore snapshopts of already deleted objects")."' 

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index bb4863c3e30f7ff4c1102434a4b2d13a1c1013d1..f2d01c51bd79a09346dc5c0193146dad032ae7da 100644 (file)
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -1406,7 +1406,7 @@ class plugin
 
     /* Create a new snapshot requested, check
        the given attributes and create the snapshot*/
-    if(isset($_POST['CreateSnapshot'])){
+    if(isset($_POST['CreateSnapshot']) && is_object($this->snapDialog)){
       $this->snapDialog->save_object();
       $msgs = $this->snapDialog->check();
       if(count($msgs)){

diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc
index 68c1ec045b0672c0cc92a03d07763b47cfe8f372..42923af354aeab28433c649ec6498574c18a5d02 100644 (file)
--- a/plugins/admin/fai/class_faiTemplate.inc
+++ b/plugins/admin/fai/class_faiTemplate.inc
@@ -210,7 +210,7 @@ class faiTemplate extends plugin
     }
 
     /* Save Dialog */
-    if(isset($_POST['SaveSubObject'])){
+    if(isset($_POST['SaveSubObject']) && is_object($this->dialog)){
       $this->dialog->save_object();
       $msgs = $this->dialog->check();
       if(count($msgs)>0){
@@ -302,7 +302,7 @@ class faiTemplate extends plugin
       if(($this->SubObjects[$key]['status'] == "new") || ($this->SubObjects[$key]['dn'] == "new") || !preg_match("/r/",$s_acl)){
         $down = "";
       }else{
-        $down = "<a href='getFAIscript.php?is_template&id=".base64_encode($dn)."'>
+        $down = "<a href='getFAIscript.php?is_template&amp;id=".base64_encode($dn)."'>
           <img src='images/save.png' alt='"._("Download")."' title='"._("Download")."' border=0>
           </a>";
       }
@@ -311,7 +311,7 @@ class faiTemplate extends plugin
       $s_acl = $this->ui->get_permissions($dn,"fai/faiTemplateEntry","cn")  ;
       if(preg_match("/r/",$s_acl)){
 
-        $edit_link = "<a href='?plug=".$_GET['plug']."&act=edit&id=".$key."'>".$tmp[$key]."</a>";
+        $edit_link = "<a href='?plug=".$_GET['plug']."&amp;act=edit&amp;id=".$key."'>".$tmp[$key]."</a>";
         $divlist->AddEntry(array( array("string"=> $edit_link), 
               array("string"=>$down , "attach" => "style='width:20px;'"),
               array("string"=>str_replace("%s",base64_encode($key),$act),

diff --git a/plugins/admin/fai/faiTemplate.tpl b/plugins/admin/fai/faiTemplate.tpl
index cefe94e2844e6bb3ccde8d1c9edbc42dd3d54f91..627c5ddd57413ae2785f2c258920fabf39f43fb3 100644 (file)
--- a/plugins/admin/fai/faiTemplate.tpl
+++ b/plugins/admin/fai/faiTemplate.tpl
@@ -23,7 +23,7 @@
                                                </td>
                                                <td>
 {render acl=$descriptionACL}
-                                                       <input value="{$description}" size="45" maxlength="80" {$description} name="description" id="description">
+                                                       <input value="{$description}" size="45" maxlength="80" name="description" id="description">
 {/render}
                                                </td>
                                        </tr>
@@ -31,9 +31,7 @@
                </td>
                <td style="width:50%">
                                <h2><img class="center" alt="" src="images/fai_template.png" align="middle" title="{t}Objects{/t}">&nbsp;
-                                       <LABEL for="SubObject">
-                                               {t}List of template files{/t}
-                                       </LABEL>
+                                       {t}List of template files{/t}
                                </h2>
                        {$Entry_divlist}
 {if $sub_object_is_addable}

diff --git a/plugins/admin/mimetypes/class_mimetypeManagement.inc b/plugins/admin/mimetypes/class_mimetypeManagement.inc
index 61cde98e1566e174ffb02631f3d6fdfb2b267416..5cd9c15b330af24bdc34ada6466e1f3ca9135176 100755 (executable)
--- a/plugins/admin/mimetypes/class_mimetypeManagement.inc
+++ b/plugins/admin/mimetypes/class_mimetypeManagement.inc
@@ -559,6 +559,7 @@ class mimetypeManagement extends plugin
 
       /* Cleanup object queue */
       $this->CopyPasteHandler->cleanup_queue();
+      $this->start_pasting_copied_objects = FALSE;
       $dn = $this->mimetypes[$s_entry]['dn'];
       $this->CopyPasteHandler->add_to_queue($dn,$s_action,"mimetabs","MIMETABS","mimetypes");
     }