From aab2ffddfc8597dfce114b18c737b791e949b6ea Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Mon, 9 Aug 2010 01:56:05 +0200 Subject: [PATCH] Removes trailing spaces. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- Makefile | 2 +- bin/marketPromo.php | 4 ++-- classes/profile.php | 2 +- classes/userfilter.php | 6 +++--- htdocs/javascript/do_challenge_response_logged.js | 2 +- htdocs/javascript/jquery.autocomplete.js | 6 +++--- include/banana/moderate.inc.php | 2 +- include/geocoding.inc.php | 2 +- include/ufbuilder.inc.php | 2 +- include/webservices/ax/client.inc | 12 ++++++------ modules/admin.php | 4 ++-- modules/email.php | 2 +- modules/fusionax.php | 2 +- modules/fusionax/Adresses.sql | 2 +- modules/fusionax/formation.pl | 2 +- modules/fusionax/import-ax.sh | 2 +- modules/lists/platal.mrc | 12 ++++++------ modules/payment.php | 10 +++++----- modules/payment/money/bplccyberplus.inc.php | 6 +++--- modules/platal.php | 2 +- modules/profile/jobs.inc.php | 2 +- modules/xnet.php | 2 +- templates/admin/wiki.tpl | 4 ++-- templates/axletter/letter.mail.tpl | 4 ++-- templates/axletter/unsubscribe.tpl | 2 +- templates/core/password_prompt.tpl | 2 +- templates/emails/broken.tpl | 2 +- templates/emails/send.tpl | 10 +++++----- templates/forums/admin.tpl | 2 +- templates/fusionax/ids.tpl | 2 +- templates/fusionax/import.tpl | 2 +- templates/fusionax/index.tpl | 2 +- templates/include/field.promo.tpl | 4 ++-- templates/include/form.valid.edit-paiements.tpl | 2 +- templates/include/trombi.tpl | 2 +- templates/lists/index.tpl | 2 +- templates/lists/liste.inc.tpl | 2 +- templates/lists/moderate.tpl | 6 +++--- templates/lists/moderate_mail.tpl | 2 +- templates/marketing/broken.tpl | 2 +- templates/platal/acces_smtp.tpl | 6 +++--- templates/platal/index.tpl | 2 +- templates/profile/education.js.tpl | 2 +- templates/profile/groupesx.tpl | 6 +++--- templates/profile/referent.tpl | 6 +++--- templates/register/step2.tpl | 2 +- templates/register/step3.tpl | 6 +++--- templates/search/adv.form.tpl | 7 +++++-- templates/search/adv.links.tpl | 4 ++-- templates/search/quick.tpl | 2 +- templates/skin/common.bandeau.tpl | 2 +- templates/stats/coupure.tpl | 2 +- templates/survey/edit_question.tpl | 12 ++++++------ templates/survey/edit_root.tpl | 8 ++++---- templates/survey/show_root.tpl | 10 +++++----- templates/xnet/groupes.tpl | 2 +- templates/xnetevents/edit.tpl | 2 +- templates/xnetevents/index.tpl | 2 +- templates/xnetevents/subscribe.tpl | 4 ++-- templates/xnetgrp/annuaire.tpl | 8 ++++---- templates/xnetgrp/asso.tpl | 2 +- templates/xnetgrp/form.announce.tpl | 2 +- templates/xnetgrp/mail.tpl | 2 +- templates/xnetgrp/membres-del.tpl | 2 +- templates/xnetgrp/membres-edit.tpl | 2 +- templates/xnetgrp/subscribe-valid.tpl | 2 +- templates/xnetlists/alias-admin.tpl | 2 +- templates/xnetlists/index.tpl | 2 +- upgrade/0.9.11/07_emails.sql | 4 ++-- upgrade/0.9.11/08_skins.sql | 2 +- upgrade/0.9.14/04_newsletter.sql | 2 +- upgrade/0.9.3/10_aliases.sql | 2 +- upgrade/0.9.4/80_medals.sql | 1 - upgrade/0.9.5/30_entreprises.sql | 4 ++-- upgrade/0.9.6/20_watch_cat.sql | 2 +- upgrade/0.9.7/00_xnet.sql | 2 +- upgrade/0.9.8/00_admin.sql | 2 +- 77 files changed, 138 insertions(+), 136 deletions(-) diff --git a/Makefile b/Makefile index bb8ae77..55603ee 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ core: ## conf ## -conf: spool/templates_c spool/mails_c classes/platalglobals.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp +conf: spool/templates_c spool/mails_c classes/platalglobals.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp spool/templates_c spool/mails_c spool/uploads spool/conf spool/tmp spool/run: mkdir -p $@ diff --git a/bin/marketPromo.php b/bin/marketPromo.php index c385c1d..66f758d 100755 --- a/bin/marketPromo.php +++ b/bin/marketPromo.php @@ -6,8 +6,8 @@ require_once 'connect.db.inc.php'; require_once 'marketing.inc.php'; $opts = getopt('f:l:m:'); -if (($opts['f'] && $opts['f'] == '-') || empty($opts['f'])) { - $file = 'php://stdin'; +if (($opts['f'] && $opts['f'] == '-') || empty($opts['f'])) { + $file = 'php://stdin'; } else { $file = $opts['f']; } diff --git a/classes/profile.php b/classes/profile.php index b4e5463..10d625b 100644 --- a/classes/profile.php +++ b/classes/profile.php @@ -1068,7 +1068,7 @@ class Profile /** The school identifier consists of 6 digits. The first 3 represent the * promotion entry year. The last 3 indicate the student's rank. - * + * * Our identifier consists of 8 digits and both half have the same role. * This enables us to deal with bigger promotions and with a wider range * of promotions. diff --git a/classes/userfilter.php b/classes/userfilter.php index 98ef33c..becf26b 100644 --- a/classes/userfilter.php +++ b/classes/userfilter.php @@ -1584,7 +1584,7 @@ class UFO_Hrpid extends UserFilterOrder * when referring to the joined table. * * For example, if data from profile_job must be available to filter results, - * the UFC object will call $uf-addJobFilter(), which will set the 'with_pj' var and + * the UFC object will call $uf-addJobFilter(), which will set the 'with_pj' var and * return 'pj', the short name to use when referring to profile_job; when building * the query, calling the jobJoins function will return an array containing a single * row: @@ -2302,7 +2302,7 @@ class UserFilter extends PlFilter if (!is_array($key)) { $key = array($key); } - $joins['e' . $sub] = PlSqlJoin::left('emails', '$ME.uid = $UID AND $ME.flags != \'filter\' + $joins['e' . $sub] = PlSqlJoin::left('emails', '$ME.uid = $UID AND $ME.flags != \'filter\' AND $ME.email IN {?}', $key); } } @@ -2317,7 +2317,7 @@ class UserFilter extends PlFilter if (!is_array($key)) { $key = array($key); } - $joins['al' . $sub] = PlSqlJoin::left('aliases', '$ME.uid = $UID AND $ME.type IN (\'alias\', \'a_vie\') + $joins['al' . $sub] = PlSqlJoin::left('aliases', '$ME.uid = $UID AND $ME.type IN (\'alias\', \'a_vie\') AND $ME.alias IN {?}', $key); } } diff --git a/htdocs/javascript/do_challenge_response_logged.js b/htdocs/javascript/do_challenge_response_logged.js index 8a28ca6..061d5c8 100644 --- a/htdocs/javascript/do_challenge_response_logged.js +++ b/htdocs/javascript/do_challenge_response_logged.js @@ -20,7 +20,7 @@ function doChallengeResponse() { var new_pass = hash_encrypt(document.forms.login.password.value); - + str = document.forms.loginsub.username.value + ":" + hash_encrypt(document.forms.login.password.value) + ":" + document.forms.loginsub.challenge.value; diff --git a/htdocs/javascript/jquery.autocomplete.js b/htdocs/javascript/jquery.autocomplete.js index 6cf3cb0..4e211a1 100644 --- a/htdocs/javascript/jquery.autocomplete.js +++ b/htdocs/javascript/jquery.autocomplete.js @@ -359,7 +359,7 @@ function() { $(this).removeClass("ac_over"); } - ).click(function(e) { + ).click(function(e) { e.preventDefault(); e.stopPropagation(); selectItem(this) @@ -394,7 +394,7 @@ }; function makeUrl(q) { - var sep = options.url.indexOf('?') == -1 ? '?' : '&'; + var sep = options.url.indexOf('?') == -1 ? '?' : '&'; var url = options.url + sep + "q=" + encodeURI(q); for (var i in options.extraParams) { url += "&" + i + "=" + encodeURI(options.extraParams[i]); @@ -546,7 +546,7 @@ autoFill: false, width: 0 }, $.fn.autocomplete.defaults, options); - + options.width = parseInt(options.width, 10); return this.each(function() { diff --git a/include/banana/moderate.inc.php b/include/banana/moderate.inc.php index 48cc59a..307183e 100644 --- a/include/banana/moderate.inc.php +++ b/include/banana/moderate.inc.php @@ -57,7 +57,7 @@ class ModerationBanana extends Banana function __construct(User &$user, $params = null) { - ini_set('memory_limit', '128M'); + ini_set('memory_limit', '128M'); global $globals; ModerationBanana::$client = $params['client']; diff --git a/include/geocoding.inc.php b/include/geocoding.inc.php index 3e193e6..620ae56 100644 --- a/include/geocoding.inc.php +++ b/include/geocoding.inc.php @@ -343,7 +343,7 @@ class GMapsGeocoder extends Geocoder { $address['text'] = str_replace("\n", "\r\n", $address['text']); $address['postalText'] = str_replace("\n", "\r\n", $address['postalText']); } - + // Returns the address formated for postal use. // The main rules are (cf AFNOR XPZ 10-011): // -everything in upper case; diff --git a/include/ufbuilder.inc.php b/include/ufbuilder.inc.php index 59a8aec..a075334 100644 --- a/include/ufbuilder.inc.php +++ b/include/ufbuilder.inc.php @@ -450,7 +450,7 @@ abstract class UFBF_Mixed extends UFB_Field } $this->val = array($index); } else { - $indexes = DirEnum::getIDs($this->direnum, $ufb->t($this->envfield), + $indexes = DirEnum::getIDs($this->direnum, $ufb->t($this->envfield), $ufb->b('exact') ? XDB::WILDCARD_EXACT : XDB::WILDCARD_CONTAINS); if (count($indexes) == 0) { return false; diff --git a/include/webservices/ax/client.inc b/include/webservices/ax/client.inc index 69dd47d..ebc9163 100755 --- a/include/webservices/ax/client.inc +++ b/include/webservices/ax/client.inc @@ -10,7 +10,7 @@ function ax_load_object(&$obj, $from) } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker: -class Ancien +class Ancien { public $NOM_PATR; public $PART_NOM; @@ -34,7 +34,7 @@ class Ancien public $NUM_FORMATION = 0; public $Erreur; - public function __construct($aa) + public function __construct($aa) { if ($aa<>'') { ax_load_object($this, $aa); @@ -210,7 +210,7 @@ class Adresse public $TEL; public $FAX; - public function __construct($aa) + public function __construct($aa) { ax_load_object($this, $aa); } @@ -240,17 +240,17 @@ class Activite } } -class Formation +class Formation { public $LIBELLE; - public function __construct($aa) + public function __construct($aa) { ax_load_object($this, $aa); } } -function xml_get_children($vals, &$i) +function xml_get_children($vals, &$i) { $children = array(); if (isset($vals[$i]['value'])) $children[] = $vals[$i]['value']; diff --git a/modules/admin.php b/modules/admin.php index 92a6493..caa412a 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -486,7 +486,7 @@ class AdminModule extends PLModule unset($oldValues[$k]); } XDB::execute('UPDATE accounts - SET ' . implode(', ', $set) . ' + SET ' . implode(', ', $set) . ' WHERE uid = ' . XDB::format('{?}', $user->id())); $page->trigSuccess('Données du compte mise à jour avec succès'); $user = User::getWithUID($user->id()); @@ -1131,7 +1131,7 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } - function handler_account_types(&$page, $action = 'list', $id = null) + function handler_account_types(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Types de comptes'); $page->assign('title', 'Gestion des types de comptes'); diff --git a/modules/email.php b/modules/email.php index 81fb7ba..794ec39 100644 --- a/modules/email.php +++ b/modules/email.php @@ -194,7 +194,7 @@ class EmailModule extends PLModule if ($user->hasProfile()) { XDB::execute("UPDATE profiles SET alias_pub = {?} - WHERE pid = {?}", + WHERE pid = {?}", $value, $user->profile()->id()); } $visibility = ($value == 'public'); diff --git a/modules/fusionax.php b/modules/fusionax.php index 237336c..ac22a02 100644 --- a/modules/fusionax.php +++ b/modules/fusionax.php @@ -196,7 +196,7 @@ class FusionAxModule extends PLModule return XDB::affectedRows() / 2; } - /* Cherche les les anciens présents dans Xorg avec un matricule_ax ne correspondant à rien dans la base de l'AX + /* Cherche les les anciens présents dans Xorg avec un matricule_ax ne correspondant à rien dans la base de l'AX * (mises à part les promo 1921 et 1923 qui ne figurent pas dans les données de l'AX)*/ private static function find_wrong_in_xorg($limit = 10) { diff --git a/modules/fusionax/Adresses.sql b/modules/fusionax/Adresses.sql index 23af228..172e071 100644 --- a/modules/fusionax/Adresses.sql +++ b/modules/fusionax/Adresses.sql @@ -39,7 +39,7 @@ SET `Date_maj` = CONCAT(SUBSTRING(@StringDate_maj,7),'-',SUBSTRING(@StringDate_maj,4,2),'-',SUBSTRING(@StringDate_maj,1,2)); LOAD DATA LOCAL INFILE 'Activites.txt' INTO TABLE `fusionax_adresses` FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\r\n' -(provenance, id_ancien, @Code_etab, @Raison_sociale, @Libelle_fonctio, @Annuaire, +(provenance, id_ancien, @Code_etab, @Raison_sociale, @Libelle_fonctio, @Annuaire, Ligne1, Ligne2, Ligne3, code_postal, ville, zip_cedex, etat_distr, pays, tel, fax, @StringDate_maj) SET `Type_adr` = 'E', diff --git a/modules/fusionax/formation.pl b/modules/fusionax/formation.pl index 0c61e53..14b72dc 100755 --- a/modules/fusionax/formation.pl +++ b/modules/fusionax/formation.pl @@ -265,7 +265,7 @@ while () s/\tès /\t/g; s/\tof /\t/g; s/( )+(\t)/\t/g; - + # On remet dans l'ordre lorsque le diplôme se situe après l'université s/Manag\.Vanderblit/Vanderbilt University\tManagement/; diff --git a/modules/fusionax/import-ax.sh b/modules/fusionax/import-ax.sh index fb3a6db..999c16f 100755 --- a/modules/fusionax/import-ax.sh +++ b/modules/fusionax/import-ax.sh @@ -5,7 +5,7 @@ #unrar e -inul export_4D.txt.rar cp /home/x2004jacob/export*utf8.TXT . -# séparation en fichiers de tables +# séparation en fichiers de tables cat export_total* | grep ^AD > Adresses.txt cat export_total* | grep ^AN > Anciens.txt cat export_total* | grep ^FO > Formations.txt diff --git a/modules/lists/platal.mrc b/modules/lists/platal.mrc index a887369..ae73a19 100644 --- a/modules/lists/platal.mrc +++ b/modules/lists/platal.mrc @@ -1,5 +1,5 @@ - + %d-%m-%y @@ -198,7 +198,7 @@ MY-SUBJNA - + - + - +
@@ -209,7 +209,7 @@ MY-SUBJNA @@ -227,7 +227,7 @@ subject:strong
@@ -259,7 +259,7 @@ subject:strong - + @@ -437,7 +437,7 @@ date - + diff --git a/modules/payment.php b/modules/payment.php index 737d9c2..1578a96 100644 --- a/modules/payment.php +++ b/modules/payment.php @@ -264,7 +264,7 @@ class PaymentModule extends PLModule function handler_cyber2_return(&$page, $uid = null) { global $globals, $platal; - + /* on vérifie la signature */ $vads_params = array(); foreach($_REQUEST as $key => $value) @@ -275,7 +275,7 @@ class PaymentModule extends PLModule //if($signature != Env::v('signature')) { // cb_erreur("signature invalide"); //} - + /* on extrait les informations sur l'utilisateur */ $user = User::get(Env::v('vads_cust_id')); if (!$user) { @@ -294,7 +294,7 @@ class PaymentModule extends PLModule if (!list($conf_mail, $conf_title, $conf_text) = $res->fetchOneRow()) { cb_erreur("référence de commande inconnue"); } - + /* on extrait le montant */ if (Env::v('vads_currency') != "978") { cb_erreur("monnaie autre que l'euro"); @@ -305,13 +305,13 @@ class PaymentModule extends PLModule if (Env::v('vads_result') != "00") { cb_erreur("erreur lors du paiement : ?? (".Env::v('vads_result').")"); } - + /* on fait l'insertion en base de donnees */ XDB::execute("INSERT INTO payment_transactions (id, uid, ref, fullref, amount, pkey, comment) VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})", Env::v('vads_trans_date'), $user->id(), $ref, Env::v('vads_order_id'), $montant, "", Env::v('vads_order_info')); echo "Paiement stored.\n"; - + // We check if it is an Xnet payment and then update the related ML. $res = XDB::query('SELECT eid FROM group_events diff --git a/modules/payment/money/bplccyberplus.inc.php b/modules/payment/money/bplccyberplus.inc.php index 9ad8a34..96fe3c0 100644 --- a/modules/payment/money/bplccyberplus.inc.php +++ b/modules/payment/money/bplccyberplus.inc.php @@ -65,10 +65,10 @@ class BPLCCyberPlus $prefix = ($pay->flags->hasflag('unique')) ? str_pad("",15,"0") : rand_url_id(); $fullref = substr("$prefix-{$pay->id}",-12); // FIXME : check for duplicates $ts = time(); - $trans_date = date("YmdHis", $ts); + $trans_date = date("YmdHis", $ts); $trans_id = date("His", $ts); // FIXME : check for duplicates - // contenu du formulaire + // contenu du formulaire $this->urlform = "https://systempay.cyberpluspaiement.com/vads-payment/"; $this->infos['commercant'] = Array( 'vads_site_id' => $globals->money->cyperplus_account, @@ -91,7 +91,7 @@ class BPLCCyberPlus 'vads_ctx_mode' => $globals->money->cyperplus_prod, 'vads_page_action' => 'PAYMENT', 'vads_action_mode' => 'INTERACTIVE'); - + // calcul de la clé d'acceptation en entrée $all_params = array_merge($this->infos['commercant'],$this->infos['client'],$this->infos['commande'],$this->infos['divers']); ksort($all_params); diff --git a/modules/platal.php b/modules/platal.php index 1bc0a94..9d8c205 100644 --- a/modules/platal.php +++ b/modules/platal.php @@ -449,7 +449,7 @@ Adresse de secours : " . Post::v('email') : "")); } } - function handler_review(&$page, $action = null, $mode = null) + function handler_review(&$page, $action = null, $mode = null) { // Include X-XRDS-Location response-header for Yadis discovery global $globals; diff --git a/modules/profile/jobs.inc.php b/modules/profile/jobs.inc.php index 507ffc0..ddb628f 100644 --- a/modules/profile/jobs.inc.php +++ b/modules/profile/jobs.inc.php @@ -459,7 +459,7 @@ class ProfileSettingJobs extends ProfilePage ); } } - + $job['w_email_new'] = ''; if (!isset($job['hq_phone'])) { $job['hq_phone'] = ''; diff --git a/modules/xnet.php b/modules/xnet.php index 136382c..dbaa8a3 100644 --- a/modules/xnet.php +++ b/modules/xnet.php @@ -187,7 +187,7 @@ class XnetModule extends PLModule $page->assign('cat', $cat); $page->assign('dom', $dom); - $res = XDB::query("SELECT id,nom + $res = XDB::query("SELECT id,nom FROM group_dom WHERE FIND_IN_SET({?}, cat) ORDER BY nom", $cat); diff --git a/templates/admin/wiki.tpl b/templates/admin/wiki.tpl index dd8047d..5e11294 100644 --- a/templates/admin/wiki.tpl +++ b/templates/admin/wiki.tpl @@ -51,10 +51,10 @@ function toggle_folder() { me = this; if ($(this).attr("class") == "wiki_category") - me = $("../img.wiki_root", me)[0]; + me = $("../img.wiki_root", me)[0]; var cat=$.trim($(me).parent().text().replace(/(.*)\([0-9]+\)/, "$1")); if ($(me).attr('src') == "images/k1.gif") { - deplie(me, cat); + deplie(me, cat); } replie(me, cat); setTimeout("toggle = 0;", 10); diff --git a/templates/axletter/letter.mail.tpl b/templates/axletter/letter.mail.tpl index fc4d816..0aa9ac7 100644 --- a/templates/axletter/letter.mail.tpl +++ b/templates/axletter/letter.mail.tpl @@ -58,8 +58,8 @@ ne plus recevoir : <https://www.polytechnique.org/ax/out{if $hash}/{$hash}{/i {if $is_mail} - - + + Lettre d'information de l'AX