Merge branch '1.0.18-fixes'

argonaut/addons/argonaut/deploy-list.xml

@@ -95,7 +95,7 @@
       <type>entry</type>
       <image>geticon.php?context=actions&amp;icon=process-stop&amp;size=16</image>
       <label>Abort</label>
-     </action>
+    </action>
 
     <action>
       <type>separator</type>

mail/personal/mail/class_mail-methods.inc

@@ -427,7 +427,7 @@ class mailMethod
               This function is mainly used to read and write folder permissions.
       @return String A valid folder id
    */
-  public function create_folder_id($folder, $type = "")
+  public function create_folder_id($folder)
   {
     if (!empty($folder)) {
       $folder = trim(preg_replace("/^INBOX[\.\/]*/i", "", $folder));

supann/admin/supannStructures/class_etablissement.inc

@@ -176,11 +176,11 @@ class etablissement extends simplePlugin
         }
       }
       $root_mode  = 'add';
-    } else if (($root_code !== FALSE) && ($root_code == $this->supannEtablissement) && $this->set_root) {
+    } elseif (($root_code !== FALSE) && ($root_code == $this->supannEtablissement) && $this->set_root) {
       /* We are the root etablissement, we need to update it */
       $root_attrs = $this->attrs;
       $root_mode  = 'modify';
-    } else if (($root_code !== FALSE) && ($root_code == $this->supannEtablissement) && !$this->set_root) {
+    } elseif (($root_code !== FALSE) && ($root_code == $this->supannEtablissement) && !$this->set_root) {
       /* We are the root etablissement, we want to delete it */
       $root_mode = 'delete';
     }