Rename ProfileBlah setting to ProfileSettingBlah

    In order to avoid collision with ProfileFields

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>

diff --git a/modules/profile.php b/modules/profile.php
index 5eb9220..d0f1fbd 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -303,13 +303,13 @@ class ProfileModule extends PLModule
         $wiz->addUserData('profile', $user);
         $wiz->addUserData('owner', $user->owner());
         $this->load('page.inc.php');
-        $wiz->addPage('ProfileGeneral', 'Général', 'general');
-        $wiz->addPage('ProfileAddresses', 'Adresses personnelles', 'adresses');
-        $wiz->addPage('ProfileGroups', 'Groupes X - Binets', 'poly');
-        $wiz->addPage('ProfileDecos', 'Décorations - Medailles', 'deco');
-        $wiz->addPage('ProfileJobs', 'Informations professionnelles', 'emploi');
-        $wiz->addPage('ProfileSkills', 'Compétences diverses', 'skill');
-        $wiz->addPage('ProfileMentor', 'Mentoring', 'mentor');
+        $wiz->addPage('ProfileSettingGeneral', 'Général', 'general');
+        $wiz->addPage('ProfileSettingAddresses', 'Adresses personnelles', 'adresses');
+        $wiz->addPage('ProfileSettingGroups', 'Groupes X - Binets', 'poly');
+        $wiz->addPage('ProfileSettingDecos', 'Décorations - Medailles', 'deco');
+        $wiz->addPage('ProfileSettingJobs', 'Informations professionnelles', 'emploi');
+        $wiz->addPage('ProfileSettingSkills', 'Compétences diverses', 'skill');
+        $wiz->addPage('ProfileSettingMentor', 'Mentoring', 'mentor');
         $wiz->apply($page, 'profile/edit/' . $user->hrid(), $opened_tab, $mode);
 
         if (!$user->birthdate) {

diff --git a/modules/profile/addresses.inc.php b/modules/profile/addresses.inc.php
index 2bc00b2..8a9e2f2 100644 (file)
--- a/modules/profile/addresses.inc.php
+++ b/modules/profile/addresses.inc.php
@@ -19,15 +19,15 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-class ProfileAddress extends ProfileGeocoding
+class ProfileSettingAddress extends ProfileSettingGeocoding
 {
     private $bool;
     private $pub;
 
     public function __construct()
     {
-        $this->bool = new ProfileBool();
-        $this->pub  = new ProfilePub();
+        $this->bool = new ProfileSettingBool();
+        $this->pub  = new ProfileSettingPub();
     }
 
     private function cleanAddress(ProfilePage &$page, $addrid, array &$address)
@@ -35,7 +35,7 @@ class ProfileAddress extends ProfileGeocoding
         if (!isset($address['tel'])) {
             $address['tel'] = array();
         }
-        $profiletel           = new ProfilePhones('address', $addrid);
+        $profiletel           = new ProfileSettingPhones('address', $addrid);
         $address['tel']       = $profiletel->value($page, 'tel',       $address['tel'],       $s);
         $address['current']   = $this->bool->value($page, 'current',   $address['current'],   $s);
         $address['temporary'] = $this->bool->value($page, 'temporary', $address['temporary'], $s);
@@ -123,20 +123,20 @@ class ProfileAddress extends ProfileGeocoding
                      $page->pid());
         foreach ($value as $addrid => &$address) {
             $this->saveAddress($page->pid(), $addrid, $address, 'home');
-            $profiletel = new ProfilePhones('address', $addrid);
+            $profiletel = new ProfileSettingPhones('address', $addrid);
             $profiletel->saveTels($page->pid(), 'tel', $address['tel']);
         }
     }
 }
 
-class ProfileAddresses extends ProfilePage
+class ProfileSettingAddresses extends ProfilePage
 {
     protected $pg_template = 'profile/adresses.tpl';
 
     public function __construct(PlWizard &$wiz)
     {
         parent::__construct($wiz);
-        $this->settings['addresses'] = new ProfileAddress();
+        $this->settings['addresses'] = new ProfileSettingAddress();
         $this->watched['addresses']  = true;
     }
 

diff --git a/modules/profile/decos.inc.php b/modules/profile/decos.inc.php
index 36a27d4..10305bf 100644 (file)
--- a/modules/profile/decos.inc.php
+++ b/modules/profile/decos.inc.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-class ProfileDeco implements ProfileSetting
+class ProfileSettingDeco implements ProfileSetting
 {
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
@@ -84,15 +84,15 @@ class ProfileDeco implements ProfileSetting
     }
 }
 
-class ProfileDecos extends ProfilePage
+class ProfileSettingDecos extends ProfilePage
 {
     protected $pg_template = 'profile/deco.tpl';
 
     public function __construct(PlWizard &$wiz)
     {
         parent::__construct($wiz);
-        $this->settings['medals'] = new ProfileDeco();
-        $this->settings['medals_pub'] = new ProfilePub();
+        $this->settings['medals'] = new ProfileSettingDeco();
+        $this->settings['medals_pub'] = new ProfileSettingPub();
         $this->watched['medals'] = true;
     }
 

diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php
index 488d180..0c20a7e 100644 (file)
--- a/modules/profile/general.inc.php
+++ b/modules/profile/general.inc.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-class ProfileSearchNames implements ProfileSetting
+class ProfileSettingSearchNames implements ProfileSetting
 {
     private $private_name_end;
     private $search_names;
@@ -194,7 +194,7 @@ class ProfileSearchNames implements ProfileSetting
     }
 }
 
-class ProfileEdu implements ProfileSetting
+class ProfileSettingEdu implements ProfileSetting
 {
     public function __construct() {
     }
@@ -232,7 +232,7 @@ class ProfileEdu implements ProfileSetting
                 }
                 $i++;
             }
-            usort($value, array("ProfileEdu", "sortByGradYear"));
+            usort($value, array("ProfileSettingEdu", "sortByGradYear"));
         }
         return $value;
     }
@@ -254,7 +254,7 @@ class ProfileEdu implements ProfileSetting
     }
 }
 
-class ProfileEmailDirectory implements ProfileSetting
+class ProfileSettingEmailDirectory implements ProfileSetting
 {
     public function __construct(){}
     public function save(ProfilePage &$page, $field, $value){}
@@ -279,7 +279,7 @@ class ProfileEmailDirectory implements ProfileSetting
     }
 }
 
-class ProfileNetworking implements ProfileSetting
+class ProfileSettingNetworking implements ProfileSetting
 {
     private $email;
     private $pub;
@@ -288,10 +288,10 @@ class ProfileNetworking implements ProfileSetting
 
     public function __construct()
     {
-        $this->email  = new ProfileEmail();
-        $this->pub    = new ProfilePub();
-        $this->web    = new ProfileWeb();
-        $this->number = new ProfileNumber();
+        $this->email  = new ProfileSettingEmail();
+        $this->pub    = new ProfileSettingPub();
+        $this->web    = new ProfileSettingWeb();
+        $this->number = new ProfileSettingNumber();
     }
 
     public function value(ProfilePage &$page, $field, $value, &$success)
@@ -352,7 +352,7 @@ class ProfileNetworking implements ProfileSetting
     }
 }
 
-class ProfileGeneral extends ProfilePage
+class ProfileSettingGeneral extends ProfilePage
 {
     protected $pg_template = 'profile/general.tpl';
 
@@ -360,11 +360,11 @@ class ProfileGeneral extends ProfilePage
     {
         parent::__construct($wiz);
         $this->settings['search_names']
-                                  = new ProfileSearchNames();
-        $this->settings['birthdate'] = new ProfileDate();
+                                  = new ProfileSettingSearchNames();
+        $this->settings['birthdate'] = new ProfileSettingDate();
         $this->settings['freetext_pub']
                                   = $this->settings['photo_pub']
-                                  = new ProfilePub();
+                                  = new ProfileSettingPub();
         $this->settings['freetext']
                                   = $this->settings['nationality1']
                                   = $this->settings['nationality2']
@@ -373,12 +373,12 @@ class ProfileGeneral extends ProfilePage
                                   = $this->settings['promo']
                                   = null;
         $this->settings['email_directory']
-                                  = new ProfileEmail();
+                                  = new ProfileSettingEmail();
         $this->settings['email_directory_new']
-                                  = new ProfileEmailDirectory();
-        $this->settings['networking'] = new ProfileNetworking();
-        $this->settings['tels']   = new ProfilePhones('user', 0);
-        $this->settings['edus']   = new ProfileEdu();
+                                  = new ProfileSettingEmailDirectory();
+        $this->settings['networking'] = new ProfileSettingNetworking();
+        $this->settings['tels']   = new ProfileSettingPhones('user', 0);
+        $this->settings['edus']   = new ProfileSettingEdu();
         $this->watched= array('freetext' => true, 'tels' => true,
                               'networking' => true, 'edus' => true,
                               'nationality1' => true, 'nationality2' => true,

diff --git a/modules/profile/groups.inc.php b/modules/profile/groups.inc.php
index 461ba13..8aadbdd 100644 (file)
--- a/modules/profile/groups.inc.php
+++ b/modules/profile/groups.inc.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-class ProfileSection implements ProfileSetting
+class ProfileSettingSection implements ProfileSetting
 {
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
@@ -43,7 +43,7 @@ class ProfileSection implements ProfileSetting
     }
 }
 
-class ProfileBinets implements ProfileSetting
+class ProfileSettingBinets implements ProfileSetting
 {
     public function __construct()
     {
@@ -87,15 +87,15 @@ class ProfileBinets implements ProfileSetting
     }
 }
 
-class ProfileGroups extends ProfilePage
+class ProfileSettingGroups extends ProfilePage
 {
     protected $pg_template = 'profile/groups.tpl';
 
     public function __construct(PlWizard &$wiz)
     {
         parent::__construct($wiz);
-        $this->settings['section']  = new ProfileSection();
-        $this->settings['binets']   = new ProfileBinets();
+        $this->settings['section']  = new ProfileSettingSection();
+        $this->settings['binets']   = new ProfileSettingBinets();
         $this->watched['section'] = $this->watched['binets'] = true;
     }
 

diff --git a/modules/profile/jobs.inc.php b/modules/profile/jobs.inc.php
index 5927666..c1d5180 100644 (file)
--- a/modules/profile/jobs.inc.php
+++ b/modules/profile/jobs.inc.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-class ProfileJob extends ProfileGeocoding
+class ProfileSettingJob extends ProfileSettingGeocoding
 {
     private $pub;
     private $email_new;
@@ -30,12 +30,12 @@ class ProfileJob extends ProfileGeocoding
 
     public function __construct()
     {
-        $this->pub    = new ProfilePub();
+        $this->pub    = new ProfileSettingPub();
         $this->email
                       = $this->email_new
-                      = new ProfileEmail();
-        $this->url    = new ProfileWeb();
-        $this->bool   = new ProfileBool();
+                      = new ProfileSettingEmail();
+        $this->url    = new ProfileSettingWeb();
+        $this->bool   = new ProfileSettingBool();
         $this->checks = array('url'      => array('w_url'),
                               'email'    => array('w_email'),
                               'pub'      => array('pub', 'w_email_pub'),
@@ -171,7 +171,7 @@ class ProfileJob extends ProfileGeocoding
         if (!isset($job['w_phone'])) {
             $job['w_phone'] = array();
         }
-        $profiletel = new ProfilePhones('pro', $jobid);
+        $profiletel = new ProfileSettingPhones('pro', $jobid);
         $job['w_phone'] = $profiletel->value($page, 'tel', $job['w_phone'], $s);
 
         unset($job['removed']);
@@ -244,16 +244,16 @@ class ProfileJob extends ProfileGeocoding
                                  $this->pid(), $id, $job['description'], $job['sector'], $job['subSector'],
                                  $job['subSubSector'], $job['w_email'], $job['w_url'], $job['pub'], $job['w_email_pub']);
                 }
-                $address = new ProfileAddress();
+                $address = new ProfileSettingAddress();
                 $address->saveAddress($id, $job['w_address'], 'job');
-                $profiletel = new ProfilePhones('pro', $id);
+                $profiletel = new ProfileSettingPhones('pro', $id);
                 $profiletel->saveTels('tel', $job['w_phone']);
             }
         }
     }
 }
 
-class ProfileJobs extends ProfilePage
+class ProfileSettingJobs extends ProfilePage
 {
     protected $pg_template = 'profile/jobs.tpl';
 
@@ -262,7 +262,7 @@ class ProfileJobs extends ProfilePage
         parent::__construct($wiz);
         $this->settings['cv'] = null;
         $this->settings['corps'] = null;
-        $this->settings['jobs'] = new ProfileJob();
+        $this->settings['jobs'] = new ProfileSettingJob();
         $this->watched = array('cv' => true, 'jobs' => true, 'corps' => true);
     }
 

diff --git a/modules/profile/mentor.inc.php b/modules/profile/mentor.inc.php
index d026ed0..035bb47 100644 (file)
--- a/modules/profile/mentor.inc.php
+++ b/modules/profile/mentor.inc.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-class ProfileSectors implements ProfileSetting
+class ProfileSettingSectors implements ProfileSetting
 {
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
@@ -71,7 +71,7 @@ class ProfileSectors implements ProfileSetting
     }
 }
 
-class ProfileCountry implements ProfileSetting
+class ProfileSettingCountry implements ProfileSetting
 {
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
@@ -110,7 +110,7 @@ class ProfileCountry implements ProfileSetting
 }
 
 
-class ProfileMentor extends ProfilePage
+class ProfileSettingMentor extends ProfilePage
 {
     protected $pg_template = 'profile/mentor.tpl';
 
@@ -118,8 +118,8 @@ class ProfileMentor extends ProfilePage
     {
         parent::__construct($wiz);
         $this->settings['expertise'] = null;
-        $this->settings['sectors'] = new ProfileSectors();
-        $this->settings['countries'] = new ProfileCountry();
+        $this->settings['sectors'] = new ProfileSettingSectors();
+        $this->settings['countries'] = new ProfileSettingCountry();
     }
 
     protected function _fetchData()

diff --git a/modules/profile/page.inc.php b/modules/profile/page.inc.php
index de655ec..8d3fb84 100644 (file)
--- a/modules/profile/page.inc.php
+++ b/modules/profile/page.inc.php
@@ -43,7 +43,7 @@ abstract class ProfileNoSave implements ProfileSetting
     public function save(ProfilePage &$page, $field, $new_value) { }
 }
 
-class ProfileWeb extends ProfileNoSave
+class ProfileSettingWeb extends ProfileNoSave
 {
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
@@ -60,7 +60,7 @@ class ProfileWeb extends ProfileNoSave
     }
 }
 
-class ProfileEmail extends ProfileNoSave
+class ProfileSettingEmail extends ProfileNoSave
 {
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
@@ -76,7 +76,7 @@ class ProfileEmail extends ProfileNoSave
     }
 }
 
-class ProfileNumber extends ProfileNoSave
+class ProfileSettingNumber extends ProfileNoSave
 {
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
@@ -93,7 +93,7 @@ class ProfileNumber extends ProfileNoSave
 }
 
 
-class ProfileTel extends ProfileNoSave
+class ProfileSettingTel extends ProfileNoSave
 {
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
@@ -115,7 +115,7 @@ class ProfileTel extends ProfileNoSave
     }
 }
 
-class ProfilePhones implements ProfileSetting
+class ProfileSettingPhones implements ProfileSetting
 {
     private $tel;
     private $pub;
@@ -124,8 +124,8 @@ class ProfilePhones implements ProfileSetting
 
     public function __construct($type, $link_id)
     {
-        $this->tel = new ProfileTel();
-        $this->pub = new ProfilePub();
+        $this->tel = new ProfileSettingTel();
+        $this->pub = new ProfileSettingPub();
         $this->link_type = $type;
         $this->link_id   = $link_id;
     }
@@ -205,7 +205,7 @@ class ProfilePhones implements ProfileSetting
     }
 }
 
-class ProfilePub extends ProfileNoSave
+class ProfileSettingPub extends ProfileNoSave
 {
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
@@ -222,7 +222,7 @@ class ProfilePub extends ProfileNoSave
     }
 }
 
-class ProfileBool extends ProfileNoSave
+class ProfileSettingBool extends ProfileNoSave
 {
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
@@ -234,7 +234,7 @@ class ProfileBool extends ProfileNoSave
     }
 }
 
-class ProfileDate extends ProfileNoSave
+class ProfileSettingDate extends ProfileNoSave
 {
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
@@ -259,7 +259,7 @@ class ProfileDate extends ProfileNoSave
     }
 }
 
-abstract class ProfileGeocoding implements ProfileSetting
+abstract class ProfileSettingGeocoding implements ProfileSetting
 {
     protected function geocodeAddress(array &$address, &$success)
     {

diff --git a/modules/profile/skills.inc.php b/modules/profile/skills.inc.php
index 23d5d41..3811e22 100644 (file)
--- a/modules/profile/skills.inc.php
+++ b/modules/profile/skills.inc.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-class ProfileSkill implements ProfileSetting
+class ProfileSettingSkill implements ProfileSetting
 {
     private $table;
     private $skill_field;
@@ -78,15 +78,15 @@ class ProfileSkill implements ProfileSetting
     }
 }
 
-class ProfileSkills extends ProfilePage
+class ProfileSettingSkills extends ProfilePage
 {
     protected $pg_template = 'profile/skill.tpl';
 
     public function __construct(PlWizard &$wiz)
     {
         parent::__construct($wiz);
-        $this->settings['competences'] = new ProfileSkill('skill', 'cid', 'text_fr');
-        $this->settings['langues'] = new ProfileSkill('langskill', 'lid', 'langue_fr');
+        $this->settings['competences'] = new ProfileSettingSkill('skill', 'cid', 'text_fr');
+        $this->settings['langues'] = new ProfileSettingSkill('langskill', 'lid', 'langue_fr');
     }
 
     public function _prepare(PlPage &$page, $id)