Stéphane Jacob [Sun, 28 Feb 2010 23:38:35 +0000 (00:38 +0100)]
Merge remote branch 'origin/master' into account
Florent Bruneau [Sun, 28 Feb 2010 21:36:26 +0000 (22:36 +0100)]
Add UFC_MarketingHash.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 28 Feb 2010 18:25:22 +0000 (19:25 +0100)]
Update core
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 28 Feb 2010 17:12:14 +0000 (18:12 +0100)]
Port email/send
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 28 Feb 2010 16:24:02 +0000 (17:24 +0100)]
Fetch homonymy information in default query.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Stéphane Jacob [Sun, 28 Feb 2010 16:16:06 +0000 (17:16 +0100)]
Updates core.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sun, 28 Feb 2010 02:04:18 +0000 (03:04 +0100)]
Fixes calls to auth_user_* from compliance cron.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sun, 28 Feb 2010 01:50:34 +0000 (02:50 +0100)]
Fixes calls to auth_user_* from ml moderation cron.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sun, 28 Feb 2010 01:44:34 +0000 (02:44 +0100)]
Fixes calls to auth_user_* from emails checking cron.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sun, 28 Feb 2010 01:27:53 +0000 (02:27 +0100)]
Fixes calls to auth_user_* from homonyms cron.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sun, 28 Feb 2010 01:20:36 +0000 (02:20 +0100)]
Fixes calls to auth_user_* from rapports_inscription
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sun, 28 Feb 2010 00:55:44 +0000 (01:55 +0100)]
Fixes calls to auth_user_* from marketPromo.php
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sun, 28 Feb 2010 00:43:17 +0000 (01:43 +0100)]
Fixes calls to auth_user_* from search.rebuild_db.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sat, 27 Feb 2010 23:03:52 +0000 (00:03 +0100)]
Fixes calls to auth_user_* from payment module.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sat, 27 Feb 2010 22:55:05 +0000 (23:55 +0100)]
Fixes calls to auth_user_* from Manageurs' webservice.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sat, 27 Feb 2010 20:45:01 +0000 (21:45 +0100)]
Defines a single signature for emails sent from Polytechnique.org team.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Mon, 22 Feb 2010 12:47:48 +0000 (13:47 +0100)]
Adapts site inscription.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sat, 27 Feb 2010 12:50:32 +0000 (13:50 +0100)]
Moves userComparison to class User.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sat, 27 Feb 2010 12:45:33 +0000 (13:45 +0100)]
Adds function to retrieve the year of the promotion..
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Florent Bruneau [Sun, 28 Feb 2010 16:01:15 +0000 (17:01 +0100)]
Fix symbol clash between $user->watch fetched by default query and
$user->watch() that check informations from the carnet.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 28 Feb 2010 15:26:44 +0000 (16:26 +0100)]
Update core
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 28 Feb 2010 12:52:25 +0000 (13:52 +0100)]
Fix call to checkPassword.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 28 Feb 2010 11:21:25 +0000 (12:21 +0100)]
Don't provide a default value for db parameters (this is useless).
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 28 Feb 2010 11:19:30 +0000 (12:19 +0100)]
Port mysql queries in list.rpc.py to new DB.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 28 Feb 2010 10:58:50 +0000 (11:58 +0100)]
Rename table ml_moderate to email_list_moderate.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Arnaud Borde [Sat, 27 Feb 2010 21:04:28 +0000 (22:04 +0100)]
do not allow user to give a title that takes more than one line on web browsers
Signed-off-by: Arnaud Borde <arnaud.borde@polytechnique.org>
Florent Bruneau [Sat, 27 Feb 2010 20:49:22 +0000 (21:49 +0100)]
Add UFC_SchoolId.
$cond = new UFC_SchoolId($type, $id);
$type is one of UFC_SchoolId::Xorg, AX, School
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sat, 27 Feb 2010 20:54:23 +0000 (21:54 +0100)]
Add UserFilter::getUser(), UserFilter::getProfile() to get a single user/profile.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Fri, 26 Feb 2010 22:04:54 +0000 (23:04 +0100)]
homonyms.user_id -> homonyms.uid
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Fri, 26 Feb 2010 21:58:12 +0000 (22:58 +0100)]
user_id -> uid in newsletter and axletter.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Fri, 26 Feb 2010 21:50:57 +0000 (22:50 +0100)]
announces.user_id -> announces.uid
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Fri, 26 Feb 2010 21:38:43 +0000 (22:38 +0100)]
Fix remaining #x4dat#s.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Fri, 26 Feb 2010 21:37:31 +0000 (22:37 +0100)]
aliases.id => aliases.uid
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Stéphane Jacob [Thu, 25 Feb 2010 23:14:42 +0000 (00:14 +0100)]
Fixes startSessionAs.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Thu, 25 Feb 2010 15:21:13 +0000 (16:21 +0100)]
Typos.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Mon, 22 Feb 2010 23:04:13 +0000 (00:04 +0100)]
Improves getXorgId.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Florent Bruneau [Thu, 25 Feb 2010 20:42:28 +0000 (21:42 +0100)]
Fix naming convention.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Wed, 24 Feb 2010 21:35:08 +0000 (22:35 +0100)]
Fix encoding of import script.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Wed, 24 Feb 2010 21:03:53 +0000 (22:03 +0100)]
Fix invalid reference to profile_education.pid
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Stéphane Jacob [Mon, 22 Feb 2010 12:49:16 +0000 (13:49 +0100)]
Moves make_username to PlUser.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Mon, 22 Feb 2010 12:46:44 +0000 (13:46 +0100)]
OOoops.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sun, 21 Feb 2010 13:35:03 +0000 (14:35 +0100)]
Adapts site inscription.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sat, 20 Feb 2010 20:18:04 +0000 (21:18 +0100)]
Adapts site inscription.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Florent Bruneau [Mon, 22 Feb 2010 10:48:11 +0000 (11:48 +0100)]
Fix manipulation error.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 21 Feb 2010 21:18:52 +0000 (22:18 +0100)]
Fix many uid fields in profile tables created by newdirectory.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 21 Feb 2010 20:12:03 +0000 (21:12 +0100)]
Avoid copy of geoloc_pays during database migration.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 21 Feb 2010 17:10:17 +0000 (18:10 +0100)]
Copy missing tables: all the tables needed by profile/edit are present.
TODO: fix naming of fields.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 21 Feb 2010 14:20:44 +0000 (15:20 +0100)]
Update core.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 21 Feb 2010 12:29:13 +0000 (13:29 +0100)]
Add a small script to copy a table in x5dat manually.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 21 Feb 2010 12:25:42 +0000 (13:25 +0100)]
Kill references to obsolete tables.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 21 Feb 2010 12:16:10 +0000 (13:16 +0100)]
Shouldn't have commited that.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 21 Feb 2010 12:14:24 +0000 (13:14 +0100)]
tmp
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 21 Feb 2010 11:53:14 +0000 (12:53 +0100)]
Fix import scripts.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 21 Feb 2010 09:23:36 +0000 (10:23 +0100)]
Update import scripts: create table using InnoDB engine.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sat, 20 Feb 2010 22:16:41 +0000 (23:16 +0100)]
Update update.sh
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sat, 20 Feb 2010 21:27:13 +0000 (22:27 +0100)]
Try to define an exhaustive list of tables to copy.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sat, 20 Feb 2010 14:24:18 +0000 (15:24 +0100)]
Prepare db migration.
Note:
* migration must not alter the old db, so we should create a new db and a
user with only read privileges on previous db.
* migration procedure will contain at least 4 steps:
1 - copy old tables that will still exist in the new db
2 - create new tables
3 - perform data insertion
4 - remove temporary tables
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Stéphane Jacob [Sat, 20 Feb 2010 17:37:37 +0000 (18:37 +0100)]
Removes unexistant handler.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sat, 20 Feb 2010 00:48:49 +0000 (01:48 +0100)]
Moves getXorgId and getSchoolId to Profile.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Fri, 19 Feb 2010 17:06:34 +0000 (18:06 +0100)]
Moves user_reindex to Profile.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Fri, 19 Feb 2010 08:40:01 +0000 (09:40 +0100)]
Adapts inclusion of promotion and accounts.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Florent Bruneau [Thu, 18 Feb 2010 20:40:52 +0000 (21:40 +0100)]
Fix UserFilter::DN_SORT -> Profile::DN_SORT.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Raphaël Barrois [Thu, 18 Feb 2010 00:36:34 +0000 (01:36 +0100)]
Redefine DirEnum API, factor some code
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Wed, 17 Feb 2010 22:54:31 +0000 (23:54 +0100)]
Fix bug in DirEnum for DE with "suboptions" (degree for a given school, ...)
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Wed, 17 Feb 2010 21:17:55 +0000 (22:17 +0100)]
Add an enumeration for profile_name_enum
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Florent Bruneau [Tue, 16 Feb 2010 21:30:44 +0000 (22:30 +0100)]
Move table photo into profile_photos, rename uid to pid.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Tue, 16 Feb 2010 21:14:01 +0000 (22:14 +0100)]
Makes use of PlIteratorUtils::map() to build contact calendar.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Tue, 16 Feb 2010 20:45:22 +0000 (21:45 +0100)]
User ProfileIterator for contacts (pdf and calendar).
Also fix the code of ProfileIterator: Profile constructor is private, so
use Profile::get() factory with the current row.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Raphaël Barrois [Tue, 16 Feb 2010 13:46:24 +0000 (14:46 +0100)]
Use XDB::formatWildcards() where it is useful.
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Tue, 16 Feb 2010 10:34:25 +0000 (11:34 +0100)]
Add UserIterator, ProfileIterator
Wrappers around the XDB::iterator over the data for building those objects
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Mon, 15 Feb 2010 14:31:53 +0000 (15:31 +0100)]
Switch last uses of VCard to Profile system
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Mon, 15 Feb 2010 14:09:10 +0000 (15:09 +0100)]
Fix autoload of userfilter.php when using ProfileFilter
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Mon, 15 Feb 2010 14:08:03 +0000 (15:08 +0100)]
Use ProfileFilter for vcard building
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Mon, 15 Feb 2010 13:49:40 +0000 (14:49 +0100)]
Add UFC_Ip
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Mon, 15 Feb 2010 12:22:59 +0000 (13:22 +0100)]
Remove the last #groupex# mention
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Mon, 15 Feb 2010 00:18:18 +0000 (01:18 +0100)]
Switch handler_broken to account
No separation between firstname and lastname in generated CSV
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Sun, 14 Feb 2010 23:47:34 +0000 (00:47 +0100)]
Use Profile for vcards
TODO : find a way to link address to jobs in Profile functions
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Sun, 14 Feb 2010 23:43:37 +0000 (00:43 +0100)]
Fetch fixed and fax for profile addresses
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Sun, 14 Feb 2010 23:01:47 +0000 (00:01 +0100)]
Fetch alternate bestalias/forlife for user
Use those only for display !!
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Sun, 14 Feb 2010 16:48:41 +0000 (17:48 +0100)]
Fetch phone info related to an address in Profile
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Sun, 14 Feb 2010 12:08:50 +0000 (13:08 +0100)]
Add name variants and binets in Profile
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Sun, 14 Feb 2010 12:07:22 +0000 (13:07 +0100)]
Fetch groups a user belongs to
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Sat, 13 Feb 2010 23:59:27 +0000 (00:59 +0100)]
Move Name-related code from UserFilter to Profile
* Display names
* Name variants
* Available names
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Florent Bruneau [Sun, 14 Feb 2010 21:20:53 +0000 (22:20 +0100)]
Fix.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 14 Feb 2010 19:48:26 +0000 (20:48 +0100)]
2010.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 14 Feb 2010 19:47:18 +0000 (20:47 +0100)]
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>
Florent Bruneau [Sun, 14 Feb 2010 16:00:14 +0000 (17:00 +0100)]
Add Group::getLogo() and Profile::getPhoto() based on PlImage.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 14 Feb 2010 15:14:00 +0000 (16:14 +0100)]
Fix some errors on X.net.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 14 Feb 2010 14:19:16 +0000 (15:19 +0100)]
(groupex.*|groupesx_*) -> group_*
AFAICT, account branch is now mono-db.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 14 Feb 2010 13:45:10 +0000 (14:45 +0100)]
Move paiement db in x4dat (tables payment*).
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 14 Feb 2010 11:51:03 +0000 (12:51 +0100)]
Move logger base in main data base (tables log_*).
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 14 Feb 2010 11:31:48 +0000 (12:31 +0100)]
Typo.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 14 Feb 2010 10:35:08 +0000 (11:35 +0100)]
Cleaner syntax.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 14 Feb 2010 10:34:35 +0000 (11:34 +0100)]
Makes $limit argument optional.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 14 Feb 2010 10:04:57 +0000 (11:04 +0100)]
Partial port of PDF export of contact list.
Profile class does not provide an API to retrieve the couple (job, job address).
Profile::getAddresses seems to be a bit buggy.
Yet another auth_user_ removed.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Raphaël Barrois [Sun, 14 Feb 2010 00:10:24 +0000 (01:10 +0100)]
Fix error in Profile SQL queries
Error in the name of joined tables
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Fri, 12 Feb 2010 23:20:32 +0000 (00:20 +0100)]
Fix display bug in minifiche for profiles without owner
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Fri, 12 Feb 2010 23:12:26 +0000 (00:12 +0100)]
Fix PHP warnings (return by ref, protected/private)
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Tue, 9 Feb 2010 01:19:41 +0000 (02:19 +0100)]
Actually display results of Mentor search...
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Tue, 9 Feb 2010 01:19:20 +0000 (02:19 +0100)]
Fix UFC_Mentor*
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
projects / platal.git / log