From: Florent Bruneau Date: Sun, 14 Feb 2010 19:47:18 +0000 (+0100) Subject: Merge commit 'origin/master' into account X-Git-Tag: xorg/1.0.0~332^2~226 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=fb813fb52d5ab65ca9a5b92b5cb9089523380d79;p=platal.git 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 --- fb813fb52d5ab65ca9a5b92b5cb9089523380d79 diff --cc modules/payment.php index 7b2311a,f6aab57..edee6fe --- a/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/profile.php index e994d3a,aad3ebb..e1c70c0 --- a/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 templates/fusionax/listFusion.tpl index db89cf8,0000000..a46da28 mode 100644,000000..100644 --- a/templates/fusionax/listFusion.tpl +++ 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 *} +{* *} +{**************************************************************************} + + + + + + {if $field1} + + {/if} + {if $field2} + + {/if} + {if $field3} + + {/if} + {if $field4} + + {/if} + {if $fusionAction} + + {/if} + +{if $fusionList} +{iterate from=$fusionList item=c} + + + + {if $field1} + + {/if} + {if $field2} + + {/if} + {if $field3} + + {/if} + {if $field4} + + {/if} + {if $fusionAction} + + {/if} + +{/iterate} +{/if} +
AncienFiches{$namefield1}{$namefield2}{$namefield3}{$namefield4}Action
{$c.display_name} (X {$c.promo}) + {if $c.user_id}{icon name="user_suit" title="Administrer utilisateur"}{/if} + {if $c.id_ancien}{icon name="user_gray" title="fiche AX"}{/if} + {$c.$field1}{$c.$field2}{$c.$field3}{$c.$field4}{$name}
diff --cc templates/profile/general.networking.tpl index f2bcc5a,0000000..6e5ed93 mode 100644,000000..100644 --- a/templates/profile/general.networking.tpl +++ 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 *} +{* *} +{**************************************************************************} + + + +
+ + +   + + + {$nw.name} + {$nw.name} +
+
+ + + {icon name=cross title="Supprimer cet élément"} + +
+ + + +{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}