Merge commit 'origin/master' into account

Conflicts:

	core
	include/applis.func.inc.php
	include/geoloc.inc.php
	include/secure_hash.inc.php
	include/synchro_ax.inc.php
	modules/geoloc.php
	modules/profile.php
	modules/xnetlists.php
	plugins/function.geoloc_country.php
	plugins/function.geoloc_region.php
	plugins/insert.getName.php
	templates/events/rss.tpl
	templates/include/minifiche.tpl
	templates/include/plview.geoloc.tpl
	templates/profile/general.edu.tpl
	templates/profile/jobs.sub_sector.tpl
	templates/profile/nomusage.tpl
	templates/xnetgrp/announce-rss.tpl
	templates/xnetgrp/annuaire-csv.tpl
	templates/xnetlists/sync.tpl
	upgrade/0.9.14/connect.db.inc.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --cc bin/cron/checkdb.php
Simple merge

diff --cc bin/cron/clean.php
Simple merge

diff --cc bin/cron/compliance.php
Simple merge

diff --cc bin/cron/notifs.birthday.php
Simple merge

diff --cc bin/search.rebuild_db.php
Simple merge

diff --cc classes/platalglobals.php.in
Simple merge

diff --cc classes/platallogger.php
Simple merge

diff --cc classes/user.php
Simple merge

diff --cc classes/xnetpage.php
Simple merge

diff --cc classes/xnetsession.php
Simple merge

diff --cc classes/xorgsession.php
Simple merge

diff --cc htdocs/css/base.css
Simple merge

diff --cc htdocs/css/default.css
Simple merge

diff --cc htdocs/css/keynote.css
Simple merge

diff --cc htdocs/css/openweb.css
Simple merge

diff --cc htdocs/javascript/profile.js
Simple merge

diff --cc htdocs/listes_redirect.php
Simple merge

diff --cc htdocs/webredirect.php
Simple merge

diff --cc htdocs/xnet.php
Simple merge

diff --cc htdocs/xorg.php
Simple merge

diff --cc include/banana/forum.inc.php
Simple merge

diff --cc include/banana/hooks.inc.php
Simple merge

diff --cc include/banana/ml.inc.php
Simple merge

diff --cc include/common.inc.php
Simple merge

diff --cc include/emails.inc.php
Simple merge

diff --cc include/googleapps.inc.php
Simple merge

diff --cc include/marketing.inc.php
Simple merge

diff --cc include/massmailer.inc.php
Simple merge

diff --cc include/notifs.inc.php
Simple merge

diff --cc include/profil.func.inc.php
Simple merge

diff --cc include/reminder/profile_update.inc.php
Simple merge

diff --cc include/reminder/promotion_ml.inc.php
Simple merge

diff --cc include/user.func.inc.php
Simple merge

diff --cc include/userset.inc.php
Simple merge

diff --cc include/validations.inc.php
Simple merge

diff --cc include/validations/aliases.inc.php
Simple merge

diff --cc include/validations/homonymes.inc.php
Simple merge

diff --cc include/validations/listes.inc.php
Simple merge

diff --cc include/validations/marketing.inc.php
Simple merge

diff --cc include/validations/names.inc.php
Simple merge

diff --cc include/validations/orange.inc.php
Simple merge

diff --cc include/validations/paiements.inc.php
Simple merge

diff --cc include/vcard.inc.php
Simple merge

diff --cc modules/admin.php
Simple merge

diff --cc modules/admin/homonyms.inc.php
Simple merge

diff --cc modules/auth.php
Simple merge

diff --cc modules/auth/auth.inc.php
Simple merge

diff --cc modules/axletter.php
Simple merge

diff --cc modules/axletter/axletter.inc.php
Simple merge

diff --cc modules/carnet.php
Simple merge

diff --cc modules/carnet/contacts.pdf.inc.php
Simple merge

diff --cc modules/carnet/feed.inc.php
Simple merge

diff --cc modules/email.php
Simple merge

diff --cc modules/events.php
Simple merge

diff --cc modules/events/feed.inc.php
Simple merge

diff --cc modules/forums.php
Simple merge

diff --cc modules/gadgets.php
Simple merge

diff --cc modules/googleapps.php
Simple merge

diff --cc modules/lists.php
Simple merge

diff --cc modules/lists/lists.inc.php
Simple merge

diff --cc modules/marketing.php
Simple merge

diff --cc modules/newsletter.php
Simple merge

diff --cc modules/payment.php
index 7b2311a,f6aab57..edee6fe
--- 1/modules/payment.php
--- 2/modules/payment.php
+++ b/modules/payment.php
@@@ -219,10 -223,10 +219,10 @@@ class PaymentModule extends PLModul
  
          // We check if it is an Xnet payment and then update the related ML.
          $res = XDB::query('SELECT  eid
 -                             FROM  #groupex#.evenements
 +                             FROM  group_events
                              WHERE  paiement_id = {?}', $ref);
          if ($eid = $res->fetchOneCell()) {
-             $this->load('xnetevents.inc.php');
+             require_once dirname(__FILE__) . '/xnetevents/xnetevents.inc.php';
              $evt = get_event_detail($eid);
              subscribe_lists_event(0, $uid, $evt, $montant, true);
          }
@@@ -313,10 -324,10 +313,10 @@@
  
          // We check if it is an Xnet payment and then update the related ML.
          $res = XDB::query('SELECT  eid
 -                             FROM  #groupex#.evenements
 +                             FROM  group_events
                              WHERE  paiement_id = {?}', $ref);
          if ($eid = $res->fetchOneCell()) {
-             $this->load('xnetevents.inc.php');
+             require_once dirname(__FILE__) . '/xnetevents/xnetevents.inc.php';
              $evt = get_event_detail($eid);
              subscribe_lists_event(0, $uid, $evt, $montant, true);
          }

diff --cc modules/payment/money.inc.php
Simple merge

diff --cc modules/payment/money/cyberpaiement.inc.php
Simple merge

diff --cc modules/payment/money/paypal.inc.php
Simple merge

diff --cc modules/platal.php
Simple merge

diff --cc modules/profile.php
index e994d3a,aad3ebb..e1c70c0
--- 1/modules/profile.php
--- 2/modules/profile.php
+++ b/modules/profile.php
@@@ -340,13 -331,11 +341,13 @@@ class ProfileModule extends PLModul
  
          // Build the page
          $page->addJsLink('ajax.js');
-         $page->addJsLink('education.js');
-         $page->addJsLink('grades.js');
 -        $page->addJsLink('applis.js', false /* dynamic content */);
 -        $page->addJsLink('grades.js', false /* dynamic content */);
++        $page->addJsLink('education.js'); /* dynamic content */
++        $page->addJsLink('grades.js');    /* dynamic content */
          $page->addJsLink('profile.js');
          $page->addJsLink('jquery.autocomplete.js');
 -        $wiz = new PlWizard('Profil', PlPage::getCoreTpl('plwizard.tpl'), true, true);
 +        $wiz = new PlWizard('Profil', PlPage::getCoreTpl('plwizard.tpl'), true, true, false);
 +        $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');

diff --cc modules/profile/addresses.inc.php
Simple merge

diff --cc modules/profile/decos.inc.php
Simple merge

diff --cc modules/profile/general.inc.php
Simple merge

diff --cc modules/profile/groups.inc.php
Simple merge

diff --cc modules/profile/jobs.inc.php
Simple merge

diff --cc modules/profile/mentor.inc.php
Simple merge

diff --cc modules/profile/page.inc.php
Simple merge

diff --cc modules/profile/skills.inc.php
Simple merge

diff --cc modules/register.php
Simple merge

diff --cc modules/register/register.inc.php
Simple merge

diff --cc modules/search.php
Simple merge

diff --cc modules/search/classes.inc.php
Simple merge

diff --cc modules/search/search.inc.php
Simple merge

diff --cc modules/stats.php
Simple merge

diff --cc modules/survey/survey.inc.php
Simple merge

diff --cc modules/xnet.php
Simple merge

diff --cc modules/xnetevents.php
Simple merge

diff --cc modules/xnetevents/xnetevents.inc.php
Simple merge

diff --cc modules/xnetgrp.php
Simple merge

diff --cc modules/xnetgrp/feed.inc.php
Simple merge

diff --cc modules/xnetgrp/mail.inc.php
Simple merge

diff --cc modules/xnetlists.php
Simple merge

diff --cc plugins/function.display_address.php
Simple merge

diff --cc plugins/function.profile.php
Simple merge

diff --cc plugins/function.select_nat.php
Simple merge

diff --cc templates/admin/accounts.tpl
Simple merge

diff --cc templates/admin/dead_but_active.tpl
Simple merge

diff --cc templates/admin/deces_promo.tpl
Simple merge

diff --cc templates/admin/homonymes.tpl
Simple merge

diff --cc templates/admin/index.tpl
Simple merge

diff --cc templates/admin/user.tpl
Simple merge

diff --cc templates/admin/wiki.tpl
Simple merge

diff --cc templates/axletter/admin.tpl
Simple merge

diff --cc templates/axletter/edit.tpl
Simple merge

diff --cc templates/axletter/letter.mail.tpl
Simple merge

diff --cc templates/carnet/index.tpl
Simple merge

diff --cc templates/carnet/mescontacts.tpl
Simple merge

diff --cc templates/carnet/notifs.tpl
Simple merge

diff --cc templates/carnet/panel.tpl
Simple merge

diff --cc templates/carnet/rss.tpl
Simple merge

diff --cc templates/core/password_prompt.tpl
Simple merge

diff --cc templates/emails/alias.tpl
Simple merge

diff --cc templates/emails/broken.tpl
Simple merge

diff --cc templates/emails/redirect.tpl
Simple merge

diff --cc templates/emails/send.tpl
Simple merge

diff --cc templates/events/admin.tpl
Simple merge

diff --cc templates/events/index.tpl
Simple merge

diff --cc templates/fusionax/listFusion.tpl
index db89cf8,0000000..a46da28
mode 100644,000000..100644
--- 1/templates/fusionax/listFusion.tpl
--- /dev/null
+++ b/templates/fusionax/listFusion.tpl
@@@ -1,69 -1,0 +1,69 @@@
- {*  Copyright (C) 2003-2009 Polytechnique.org                             *}
 +{**************************************************************************}
 +{*                                                                        *}
++{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 +{*  http://opensource.polytechnique.org/                                  *}
 +{*                                                                        *}
 +{*  This program is free software; you can redistribute it and/or modify  *}
 +{*  it under the terms of the GNU General Public License as published by  *}
 +{*  the Free Software Foundation; either version 2 of the License, or     *}
 +{*  (at your option) any later version.                                   *}
 +{*                                                                        *}
 +{*  This program is distributed in the hope that it will be useful,       *}
 +{*  but WITHOUT ANY WARRANTY; without even the implied warranty of        *}
 +{*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *}
 +{*  GNU General Public License for more details.                          *}
 +{*                                                                        *}
 +{*  You should have received a copy of the GNU General Public License     *}
 +{*  along with this program; if not, write to the Free Software           *}
 +{*  Foundation, Inc.,                                                     *}
 +{*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 +{*                                                                        *}
 +{**************************************************************************}
 +
 +<table class="bicol">
 +    <tr>
 +        <th>Ancien</th>
 +        <th>Fiches</th>
 +        {if $field1}
 +        <th>{$namefield1}</th>
 +        {/if}
 +        {if $field2}
 +        <th>{$namefield2}</th>
 +        {/if}
 +        {if $field3}
 +        <th>{$namefield3}</th>
 +        {/if}
 +        {if $field4}
 +        <th>{$namefield4}</th>
 +        {/if}
 +        {if $fusionAction}
 +        <th>Action</th>
 +        {/if}
 +    </tr>
 +{if $fusionList}
 +{iterate from=$fusionList item=c}
 +    <tr class="{cycle values="pair,impair"}">
 +        <td>{$c.display_name} (X {$c.promo})</td>
 +        <td style="text-align:center">
 +            {if $c.user_id}<a href="admin/user/{$c.user_id}" class="popup2">{icon name="user_suit" title="Administrer utilisateur"}</a>{/if}
 +            {if $c.id_ancien}<a href="http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&amp;anc_id={$c.id_ancien}" class="popup2">{icon name="user_gray" title="fiche AX"}</a>{/if}
 +        </td>
 +        {if $field1}
 +        <td>{$c.$field1}</td>
 +        {/if}
 +        {if $field2}
 +        <td>{$c.$field2}</td>
 +        {/if}
 +        {if $field3}
 +        <td>{$c.$field3}</td>
 +        {/if}
 +        {if $field4}
 +        <td>{$c.$field4}</td>
 +        {/if}
 +        {if $fusionAction}
 +        <td><a class="fusion-action" href="{$fusionAction}/{$c.user_id}/{$c.id_ancien}">{$name}</a></td>
 +        {/if}
 +    </tr>
 +{/iterate}
 +{/if}
 +</table>

diff --cc templates/gadgets/ig-events.tpl
Simple merge

diff --cc templates/gadgets/ig-minifiche.tpl
Simple merge

diff --cc templates/geoloc/form.address.tpl
Simple merge

diff --cc templates/include/emploi.tpl
Simple merge

diff --cc templates/include/field.promo.tpl
Simple merge

diff --cc templates/include/form.valid.orange.tpl
Simple merge

diff --cc templates/include/minifiche.tpl
Simple merge

diff --cc templates/include/plview.minifiche.tpl
Simple merge

diff --cc templates/include/plview.referent.tpl
Simple merge

diff --cc templates/include/plview.trombi.tpl
Simple merge

diff --cc templates/include/trombi.tpl
Simple merge

diff --cc templates/marketing/private.tpl
Simple merge

diff --cc templates/marketing/promo.tpl
Simple merge

diff --cc templates/marketing/relance.tpl
Simple merge

diff --cc templates/marketing/this_week.tpl
Simple merge

diff --cc templates/marketing/volontaire.tpl
Simple merge

diff --cc templates/newsletter/edit.tpl
Simple merge

diff --cc templates/newsletter/nl.mail.tpl
Simple merge

diff --cc templates/payment/index.tpl
Simple merge

diff --cc templates/payment/xnet.tpl
Simple merge

diff --cc templates/platal/changeLog.tpl
Simple merge

diff --cc templates/platal/filrss.tpl
Simple merge

diff --cc templates/platal/motdepasse.success.tpl
Simple merge

diff --cc templates/platal/preferences.tpl
Simple merge

diff --cc templates/platal/webredirect.tpl
Simple merge

diff --cc templates/profile/adresses.address.tpl
Simple merge

diff --cc templates/profile/adresses.tpl
Simple merge

diff --cc templates/profile/education.js.tpl
Simple merge

diff --cc templates/profile/fiche_referent.tpl
Simple merge

diff --cc templates/profile/general.buildnames.tpl
Simple merge

diff --cc templates/profile/general.networking.tpl
index f2bcc5a,0000000..6e5ed93
mode 100644,000000..100644
--- 1/templates/profile/general.networking.tpl
--- /dev/null
+++ b/templates/profile/general.networking.tpl
@@@ -1,48 -1,0 +1,48 @@@
- {*  Copyright (C) 2003-2009 Polytechnique.org                             *}
 +{**************************************************************************}
 +{*                                                                        *}
++{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 +{*  http://opensource.polytechnique.org/                                  *}
 +{*                                                                        *}
 +{*  This program is free software; you can redistribute it and/or modify  *}
 +{*  it under the terms of the GNU General Public License as published by  *}
 +{*  the Free Software Foundation; either version 2 of the License, or     *}
 +{*  (at your option) any later version.                                   *}
 +{*                                                                        *}
 +{*  This program is distributed in the hope that it will be useful,       *}
 +{*  but WITHOUT ANY WARRANTY; without even the implied warranty of        *}
 +{*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *}
 +{*  GNU General Public License for more details.                          *}
 +{*                                                                        *}
 +{*  You should have received a copy of the GNU General Public License     *}
 +{*  along with this program; if not, write to the Free Software           *}
 +{*  Foundation, Inc.,                                                     *}
 +{*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 +{*                                                                        *}
 +{**************************************************************************}
 +
 +<tr id="networking_{$i}">
 +  <td colspan="2">
 +    <div style="float: left; width: 200px;">
 +      <span class="flags">
 +        <label><input type="checkbox"
 +          {if $nw.pub neq 'private'} checked="checked"{/if}
 +          name="networking[{$i}][pub]"/>
 +        {icon name="flag_green" title="site public"}</label>
 +      </span>&nbsp;
 +      <input type="hidden" name="networking[{$i}][type]" value="{$nw.type}"/>
 +      <input type="hidden" name="networking[{$i}][name]" value="{$nw.name}"/>
 +      <img src="profile/networking/{$nw.type}" alt="{$nw.name}" title="{$nw.name}" />
 +      <span style="">{$nw.name}</span>
 +    </div>
 +    <div style="float: left">
 +      <input type="text" name="networking[{$i}][address]" value="{$nw.address}"
 +        {if $nw.error} class="error" {/if}
 +        size="30"/>
 +      <a href="javascript:removeNetworking({$i})">
 +        {icon name=cross title="Supprimer cet élément"}
 +      </a>
 +    </div>
 +  </td>
 +</tr>
 +
 +{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}

diff --cc templates/profile/general.tpl
Simple merge

diff --cc templates/profile/grades.js.tpl
Simple merge

diff --cc templates/profile/groupesx.tpl
Simple merge

diff --cc templates/profile/groups.tpl
Simple merge

diff --cc templates/profile/jobs.job.tpl
Simple merge

diff --cc templates/profile/jobs.sector.tpl
Simple merge

diff --cc templates/profile/jobs.tpl
Simple merge

diff --cc templates/profile/mentor.tpl
Simple merge

diff --cc templates/profile/name_info.tpl
Simple merge

diff --cc templates/profile/orange.tpl
Simple merge

diff --cc templates/profile/phone.tpl
Simple merge

diff --cc templates/profile/profile.tpl
Simple merge

diff --cc templates/profile/referent.tpl
Simple merge

diff --cc templates/profile/skill.skill.tpl
Simple merge

diff --cc templates/profile/skill.tpl
Simple merge

diff --cc templates/search/adv.form.tpl
Simple merge

diff --cc templates/search/adv.grade.form.tpl
Simple merge

diff --cc templates/skin/common.bandeau.tpl
Simple merge

diff --cc templates/skin/common.menu.tpl
Simple merge

diff --cc templates/survey/index.tpl
Simple merge

diff --cc templates/survey/show_root.tpl
Simple merge

diff --cc templates/xnet/skin.tpl
Simple merge

diff --cc templates/xnetevents/admin.tpl
Simple merge

diff --cc templates/xnetevents/calendar.tpl
Simple merge

diff --cc templates/xnetevents/csv.tpl
Simple merge

diff --cc templates/xnetevents/edit.tpl
Simple merge

diff --cc templates/xnetevents/index.tpl
Simple merge

diff --cc templates/xnetevents/subscribe.tpl
Simple merge

diff --cc templates/xnetgrp/announce-admin.tpl
Simple merge

diff --cc templates/xnetgrp/announce-edit.tpl
Simple merge

diff --cc templates/xnetgrp/annuaire-csv.tpl
Simple merge

diff --cc templates/xnetgrp/annuaire.tpl
Simple merge

diff --cc templates/xnetgrp/asso.tpl
Simple merge

diff --cc templates/xnetgrp/edit.tpl
Simple merge

diff --cc templates/xnetgrp/form.announce.tpl
Simple merge

diff --cc templates/xnetgrp/forum.tpl
Simple merge

diff --cc templates/xnetgrp/inscrire.tpl
Simple merge

diff --cc templates/xnetgrp/mail.tpl
Simple merge

diff --cc templates/xnetgrp/membres-add.tpl
Simple merge

diff --cc templates/xnetgrp/membres-del.tpl
Simple merge

diff --cc templates/xnetgrp/membres-edit.tpl
Simple merge

diff --cc templates/xnetgrp/membres-new-search.tpl
Simple merge

diff --cc templates/xnetgrp/subscribe-valid.tpl
Simple merge

diff --cc templates/xnetgrp/unsubscription-notif.mail.tpl
Simple merge

diff --cc templates/xnetlists/alias-admin.tpl
Simple merge

diff --cc templates/xnetlists/alias-create.tpl
Simple merge

diff --cc templates/xnetlists/create.tpl
Simple merge

diff --cc templates/xnetlists/index.tpl
Simple merge

diff --cc templates/xnetlists/sync.tpl
Simple merge