From baee0f5a2d54687a0cbfb142e2842225b63cfa4d Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Sat, 27 Nov 2010 22:35:00 +0100
Subject: [PATCH] Indicates delivery issues on addresses (Closes #1356).
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 classes/address.php                    | 18 ++++++++++--------
 templates/profile/adresses.address.tpl | 10 ++++++++++
 upgrade/1.0.2/00_address.sql           |  3 +++
 upgrade/1.0.2/connect.db.inc.php       |  1 +
 4 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 upgrade/1.0.2/00_address.sql
 create mode 120000 upgrade/1.0.2/connect.db.inc.php

diff --git a/classes/address.php b/classes/address.php
index c3c0dea..d5f7f87 100644
--- a/classes/address.php
+++ b/classes/address.php
@@ -81,12 +81,13 @@ class Address
     public $pub = 'private';
 
     // Database's fields required for 'home' addresses.
-    public $flags = null; // 'current', 'temporary', 'secondary', 'mail', 'cedex'
+    public $flags = null; // 'current', 'temporary', 'secondary', 'mail', 'cedex', 'deliveryIssue'
     public $comment = null;
     public $current = null;
     public $temporary = null;
     public $secondary = null;
     public $mail = null;
+    public $deliveryIssue = null;
 
     // Remaining fields that do not belong to profile_addresses.
     public $phones = array();
@@ -105,7 +106,7 @@ class Address
         if (!is_null($this->flags)) {
             $this->flags = new PlFlagSet($this->flags);
         } else {
-            static $flags = array('current', 'temporary', 'secondary', 'mail');
+            static $flags = array('current', 'temporary', 'secondary', 'mail', 'deliveryIssue');
 
             $this->flags = new PlFlagSet();
             foreach ($flags as $flag) {
@@ -211,7 +212,7 @@ class Address
             $address['pub'] = $this->pub;
         }
         if ($this->type == self::LINK_PROFILE) {
-            static $flags = array('current', 'temporary', 'secondary', 'mail', 'cedex');
+            static $flags = array('current', 'temporary', 'secondary', 'mail', 'cedex', 'deliveryIssue');
 
             foreach ($flags as $flag) {
                 $address[$flag] = $this->flags->hasFlag($flag);
@@ -231,11 +232,12 @@ class Address
         }
         if ($this->type == self::LINK_PROFILE) {
             static $flags = array(
-                'current'   => 'actuelle',
-                'temporary' => 'temporaire',
-                'secondary' => 'secondaire',
-                'mail'      => 'conctactable par courier',
-                'cedex'     => 'type cédex',
+                'current'       => 'actuelle',
+                'temporary'     => 'temporaire',
+                'secondary'     => 'secondaire',
+                'mail'          => 'conctactable par courier',
+                'deliveryIssue' => 'n\'habite pas à l\'adresse indiquée',
+                'cedex'         => 'type cédex',
             );
 
             $address .= ', commentaire : ' . $this->comment;
diff --git a/templates/profile/adresses.address.tpl b/templates/profile/adresses.address.tpl
index 82ee6d4..207b1e0 100644
--- a/templates/profile/adresses.address.tpl
+++ b/templates/profile/adresses.address.tpl
@@ -96,6 +96,16 @@
             on peut {if $isMe}m'{/if}y envoyer du courrier par la poste
           </label>
         </div>
+        {if !t($isMe)}
+        <div>
+          <label>
+            <input type="checkbox" name="{$prefname}[deliveryIssue]" {if $address.deliveryIssue}checked="checked"{/if} />
+            n'habite pas à l'adresse indiquée
+          </label>
+        </div>
+        {else}
+        <div style="display: none"><input type="hidden" name="deliveryIssue" value="{$address.deliveryIssue}" /></div>
+        {/if}
         <div>
           <label>
             Commentaire&nbsp;:
diff --git a/upgrade/1.0.2/00_address.sql b/upgrade/1.0.2/00_address.sql
new file mode 100644
index 0000000..c5621b8
--- /dev/null
+++ b/upgrade/1.0.2/00_address.sql
@@ -0,0 +1,3 @@
+ALTER TABLE profile_addresses MODIFY COLUMN flags SET('current','temporary','secondary','mail','cedex', 'deliveryIssue') DEFAULT NULL;
+
+-- vim:set syntax=mysql:
diff --git a/upgrade/1.0.2/connect.db.inc.php b/upgrade/1.0.2/connect.db.inc.php
new file mode 120000
index 0000000..442fab7
--- /dev/null
+++ b/upgrade/1.0.2/connect.db.inc.php
@@ -0,0 +1 @@
+../../bin/connect.db.inc.php
\ No newline at end of file
-- 
2.1.4