From 99a1a08cfbb344539837cf4dad9faa098953201c Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Mon, 21 Nov 2011 11:15:32 +0100
Subject: [PATCH] Drop name particles handling as it has been automated.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 include/name.func.inc.php                  | 12 ++----------
 modules/profile/general.inc.php            | 10 +---------
 templates/profile/general.public_names.tpl |  6 +-----
 upgrade/1.1.5/01_names.sql                 |  3 +++
 4 files changed, 7 insertions(+), 24 deletions(-)
 create mode 100644 upgrade/1.1.5/01_names.sql

diff --git a/include/name.func.inc.php b/include/name.func.inc.php
index 44296c2..3aecf92 100644
--- a/include/name.func.inc.php
+++ b/include/name.func.inc.php
@@ -195,19 +195,11 @@ function update_display_names(Profile $profile, array $public_names, array $priv
 
 function update_public_names($pid, array $public_names)
 {
-    $public_names['particles'] = new PlFlagSet();
-    static $suffixes = array('main', 'marital', 'ordinary');
-    foreach ($suffixes as $suffix) {
-        if (isset($public_names['particle_' . $suffix]) && ($public_names['particle_' . $suffix] == 1 || $public_names['particle_' . $suffix] == 'on')) {
-            $public_names['particles']->addFlag($suffix, 1);
-        }
-    }
-
     XDB::execute('UPDATE  profile_public_names
-                     SET  particles = {?}, lastname_main = {?}, lastname_marital = {?}, lastname_ordinary = {?},
+                     SET  lastname_main = {?}, lastname_marital = {?}, lastname_ordinary = {?},
                           firstname_main = {?}, firstname_ordinary = {?}, pseudonym = {?}
                    WHERE  pid = {?}',
-                 $public_names['particles'], $public_names['lastname_main'], $public_names['lastname_marital'], $public_names['lastname_ordinary'],
+                 $public_names['lastname_main'], $public_names['lastname_marital'], $public_names['lastname_ordinary'],
                  $public_names['firstname_main'], $public_names['firstname_ordinary'], $public_names['pseudonym'], $pid);
 }
 
diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php
index 11bca46..d95416b 100644
--- a/modules/profile/general.inc.php
+++ b/modules/profile/general.inc.php
@@ -70,19 +70,11 @@ class ProfileSettingSearchNames implements ProfileSetting
             $request = NamesReq::getPublicNames($page->pid());
 
             if (!$request) {
-                $value['public_names'] = XDB::fetchOneAssoc('SELECT  particles, lastname_main, lastname_marital, lastname_ordinary,
+                $value['public_names'] = XDB::fetchOneAssoc('SELECT  lastname_main, lastname_marital, lastname_ordinary,
                                                                      firstname_main, firstname_ordinary, pseudonym
                                                                FROM  profile_public_names
                                                               WHERE  pid = {?}',
                                                             $page->pid());
-
-                $flags = new PlFlagSet($value['public_names']['particles']);
-                unset($value['public_names']['particles']);
-                static $suffixes = array('main', 'marital', 'ordinary');
-
-                foreach ($suffixes as $suffix) {
-                    $value['public_names']['particle_' . $suffix] = $flags->hasFlag($suffix);
-                }
             } else {
                 $value['public_names'] = $request;
                 Platal::page()->assign('validation', true);
diff --git a/templates/profile/general.public_names.tpl b/templates/profile/general.public_names.tpl
index 3c21fd8..c97b37f 100644
--- a/templates/profile/general.public_names.tpl
+++ b/templates/profile/general.public_names.tpl
@@ -30,13 +30,9 @@
   </td>
   <td>
     <input type="text" name="search_names[public_names][{$type}]" value="{$names.$type}"
-      title="Coche la case en bout de ligne si ton nom commence par une particule."
       {if t($names.$error)} class="error"{/if} size="25" onkeyup="updateNameDisplay({$isFemale});"/>
   </td>
-  <td>
-    <input type="checkbox"{if t($names.$particle) neq ''} checked="checked"{/if}
-      title="Coche cette case si ton nom commence par une particule." />
-  </td>
+  <td></td>
 </tr>
 {/foreach}
 
diff --git a/upgrade/1.1.5/01_names.sql b/upgrade/1.1.5/01_names.sql
new file mode 100644
index 0000000..6cf541c
--- /dev/null
+++ b/upgrade/1.1.5/01_names.sql
@@ -0,0 +1,3 @@
+ALTER TABLE profile_public_names DROP COLUMN particles;
+
+-- vim:set syntax=mysql:
-- 
2.1.4