Merge branch 'stable-3.1' of github.com:AlternC/AlternC into stable-3.1

bureau/admin/mail_undelete.php

@@ -30,7 +30,7 @@ $fields = array (
 getFields($fields);
 
 if ($mail->undelete($mail_id)) {
-  $email = $mail->is_it_my_mail($mail_id)
+  $email = $mail->is_it_my_mail($mail_id);
   $msg->raise("INFO", "mail", _("The email %s has been undeleted"), $email);
 }
 

bureau/admin/nowebmail.php

@@ -25,7 +25,7 @@
 
 require_once("../class/config.php");
 require_once("head.php");
-$msg->raise("INFO", "mail", _("There is currently no webmail configured. If you need one, contact your server administrator");
+$msg->raise("INFO", "mail", _("There is currently no webmail configured. If you need one, contact your server administrator"));
 
 include("index.php"); 
 

bureau/admin/piwik_useradmin.php

@@ -66,7 +66,8 @@ else
 				{
 					$api_data = $piwik->site_set_user_right($site_id, $user_name, $right);
 					if ($api_data === FALSE)
-						$msg->raise("ERROR", "piwik", $api_data->message)
+						$msg->raise("ERROR", "piwik", $api_data->message);
+						$msg->raise("ERROR", "piwik", $api_data->message);
 					else
 						$msg->raise("INFO", "piwik", _('success'));
 				}

bureau/class/m_admin.php

@@ -690,8 +690,8 @@ class m_admin {
             return false;
         }
         if ($db->next_record()) {
-            // TODO: put that string into gettext ! 
-            $mail = <<<EOF
+            // TODO: put that string into gettext !
+            $mail = '
                 A new AlternC account was created on %fqdn by %creator.
 
                 Account details
@@ -703,7 +703,7 @@ class m_admin {
                 can change password: %canpass
                 type: %type
                 notes: %notes
-                EOF;
+                ';
             $mail = strtr($mail, array('%fqdn' => $L_FQDN,
             '%creator' => $db->Record['parentlogin'],
             '%uid' => $db->Record['uid'],

src/mail_add.php

@@ -30,13 +30,13 @@ function usage() {
   global $argv;
   // putting {$argv[0]} or $argv[0] in the heredoc fails
   $wtfphp = $argv[0];
-  $u = <<<EOF
+  $u = '
 Usage: $wtfphp <email> <alias> ...
 
 email: full email adress, including domain, which must exist
 alias: one or many aliases the email should forward to, space separated
 
-EOF;
+';
   error_log($u);
   exit(1);
 }
@@ -81,7 +81,7 @@ if (is_null($password)) {
 $quotas = $default_quotas;
 $r = join(", ", $recipients);
 
-print <<<EOF
+print '
 user: $user
 domain: $domain
 compte: $compte
@@ -89,7 +89,7 @@ password: $password
 quota: $default_quotas
 recipients: $r
 
-EOF;
+';
 
 if ($dryrun) {
   error_log('not creating email because of $dryrun is true');