Merge branch 'platal-0.9.16'

diff --git a/configs/mails.conf b/configs/mails.conf
index 061588e..da58acc 100644 (file)
--- a/configs/mails.conf
+++ b/configs/mails.conf
@@ -50,3 +50,4 @@ from="Carnet Polytechnicien <support_carnet@polytechnique.org>"
 
 [googleapps]
 from="Polytechnique.org" <support@polytechnique.org>
+cc=validation+googleapps@polytechnique.org

diff --git a/templates/googleapps/create.mail.tpl b/templates/googleapps/create.mail.tpl
index fac8a07..9c73203 100644 (file)
--- a/templates/googleapps/create.mail.tpl
+++ b/templates/googleapps/create.mail.tpl
@@ -24,7 +24,7 @@
 {if $mail_part eq 'head'}
 {from full=#from#}
 {to addr=$email}
-{cc full=#from#}
+{cc full=#cc#}
 {subject text="[Polytechnique.org] Création de ton compte Google Apps"}
 {elseif $mail_part eq 'wiki'}
 {if $sexe}Chère{else}Cher{/if} {$prenom},

diff --git a/templates/googleapps/unsuspend.mail.tpl b/templates/googleapps/unsuspend.mail.tpl
index 5e43939..f5cfa0d 100644 (file)
--- a/templates/googleapps/unsuspend.mail.tpl
+++ b/templates/googleapps/unsuspend.mail.tpl
@@ -24,7 +24,7 @@
 {if $mail_part eq 'head'}
 {from full=#from#}
 {to addr=$email}
-{cc full=#from#}
+{cc full=#cc#}
 {subject text="[Polytechnique.org] Réactivation de ton compte Google Apps"}
 {elseif $mail_part eq 'wiki'}
 {if $sexe}Chère{else}Cher{/if} {$prenom},

diff --git a/upgrade/0.9.16/06_google_apps.sql b/upgrade/0.9.16/06_google_apps.sql
index 1ad53f3..5947f34 100644 (file)
--- a/upgrade/0.9.16/06_google_apps.sql
+++ b/upgrade/0.9.16/06_google_apps.sql
@@ -54,8 +54,8 @@ CREATE TABLE IF NOT EXISTS `gapps_accounts` (
 CREATE TABLE IF NOT EXISTS `gapps_queue` (
   -- Queue identification fields.
   q_id INT NOT NULL AUTO_INCREMENT,
-  q_owner_id SMALLINT DEFAULT NULL,
-  q_recipient_id SMALLINT DEFAULT NULL,
+  q_owner_id SMALLINT UNSIGNED DEFAULT NULL,
+  q_recipient_id SMALLINT UNSIGNED DEFAULT NULL,
 
   -- Queue management information.
   p_entry_date DATETIME NOT NULL,