From be007d27a6818165db7217fc67d73bf130f58c86 Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Mon, 9 Jan 2006 13:59:58 +0000 Subject: [PATCH] merges git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@199 839d8a87-29fc-0310-9880-83ba4fa771e5 --- htdocs.net/groupe/edit.php | 2 +- htdocs.net/groupe/evenements.php | 4 +++- htdocs.net/groupe/evt-modif.php | 2 +- htdocs/admin/utilisateurs.php | 4 ++-- install.d/wiki/wiki.d/Site.EditQuickReference | 13 +++++++++++++ 5 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 install.d/wiki/wiki.d/Site.EditQuickReference diff --git a/htdocs.net/groupe/edit.php b/htdocs.net/groupe/edit.php index 140def7..dced958 100644 --- a/htdocs.net/groupe/edit.php +++ b/htdocs.net/groupe/edit.php @@ -5,7 +5,7 @@ if (Post::has('submit')) { if (has_perms()) { - if (strstr(Post::get('mail_domain'), '.') === false) { + if (Post::get('mail_domain') != "" && (strstr(Post::get('mail_domain'), '.') === false)) { $page->trig_run("le domaine doit être un FQDN (aucune modif effectuée) !!!"); } $globals->xdb->execute( diff --git a/htdocs.net/groupe/evenements.php b/htdocs.net/groupe/evenements.php index cbf1ad3..edaf1f2 100644 --- a/htdocs.net/groupe/evenements.php +++ b/htdocs.net/groupe/evenements.php @@ -109,7 +109,9 @@ $page->assign('logged', logged()); $page->assign('admin', may_update()); $evenements = $globals->xdb->iterator( -"SELECT e.eid, e.intitule, e.descriptif, +"SELECT e.eid, + IF(e.intitule = '', ' ', e.intitule) AS intitule, + IF(e.descriptif = '', ' ', e.descriptif) AS descriptif, e.debut, e.fin, LEFT(10,e.debut) AS debut_day, LEFT(10,e.fin) AS fin_day, diff --git a/htdocs.net/groupe/evt-modif.php b/htdocs.net/groupe/evt-modif.php index 1b1ba55..e56501f 100644 --- a/htdocs.net/groupe/evt-modif.php +++ b/htdocs.net/groupe/evt-modif.php @@ -204,7 +204,7 @@ if (Env::has('sup') && $eid) { } if (!$get_form) - redirect("Location: evenements.php"); + redirect("evenements.php"); // get a list of all the payment for this asso $res = $globals->xdb->iterator diff --git a/htdocs/admin/utilisateurs.php b/htdocs/admin/utilisateurs.php index 5fc1bfb..31bb2e7 100644 --- a/htdocs/admin/utilisateurs.php +++ b/htdocs/admin/utilisateurs.php @@ -133,7 +133,7 @@ if ($login) { $mailer = new HermesMailer(); $mailer->setFrom("webmaster@polytechnique.org"); $mailer->addTo("web@polytechnique.org"); - $mailer->setSubject("INTERVENTION ADMIN (".Session::get('forlife').")"); + $mailer->setSubject("INTERVENTION de ".Session::get('forlife')); $mailer->setTxtBody(preg_replace("/[ \t]+/", ' ', $query)); $mailer->send(); @@ -158,7 +158,7 @@ if ($login) { $mailer = new HermesMailer(); $mailer->setFrom("webmaster@polytechnique.org"); $mailer->addTo("web@polytechnique.org"); - $mailer->setSubject("INTERVENTION ADMIN (".Session::get('forlife').")"); + $mailer->setSubject("INTERVENTION de ".Session::get('forlife')); $mailer->setTxtBody("\nUtilisateur $login effacé"); $mailer->send(); break; diff --git a/install.d/wiki/wiki.d/Site.EditQuickReference b/install.d/wiki/wiki.d/Site.EditQuickReference new file mode 100644 index 0000000..55580e6 --- /dev/null +++ b/install.d/wiki/wiki.d/Site.EditQuickReference @@ -0,0 +1,13 @@ +version=pmwiki-2.0.13 ordered=1 urlencoded=1 +agent=Mozilla/5.0 (Windows; U; Windows NT 5.1; fr; rv:1.8) Gecko/20051111 Firefox/1.5 +author=pascal.corpet.2001|Pascal CORPET +host=69.109.116.180 +name=Site.EditQuickReference +rev=29 +targets=PmWiki.BasicEditing,PmWiki.TextFormattingRules,PmWiki.DocumentationIndex,PmWiki.SimpleTables,PmWiki.AdvancedTables +text=(:table class='quickref' width='100%25' cellspacing='0' cellpadding='0' style='font-size:12px; font-family:Arial; padding:2px; border:1px solid #cccccc;' bgcolor=#f9f9f9 :)%0a(:cellnr:)%0a%25target=_blank%25 [[PmWiki/Basic Editing]] - [[PmWiki/Text Formatting Rules]] - [[PmWiki/Documentation Index]]%0a(:cell align=right:)%0a%25target=_blank%25 '''Tables:''' [[PmWiki/Simple(Tables)]] - [[PmWiki/Advanced(Tables)]]%0a(:cellnr:)%0a-%3c'''Paragraphs:''' for a new paragraph, use a blank line;\%0a'''[=->=]''' to indent text, '''[=-%3c=]''' hanging text %0a(:cell align=right:)%0a'''Line break:''' '''[=\=]''' or '''[=[[%3c%3c]]=]'''%0a(:cellnr colspan='2':)%0a-%3c'''Lists:''' '''*''' for bullet lists, '''#''' for numbered lists, ''':'''term''':'''definition for definition lists%0a-%3c'''Emphasis:''' [=''italics'', '''bold''', '''''bold italics''''', @@typewriter@@ (monospaced)=]%0a-%3c'''References:''' [=[[another page]], [[http://www.example.com]], [[another page | link text]], [[#anchor]]=]%0a-%3c'''Groups:''' [=[[Group/Page]] displays Page, [[Group.Page]] displays Group.Page, [[Group(.Page)]] displays Group=]%0a(:cellnr:)%0a-%3c'''Separators:''' '''!!''', '''!!!''' for headings, '''[=----=]''' for horizontal line%0a-%3c'''Other markups:''' [=[+bigger+], [-smaller-], '^superscript^', '_subscript_'=]%0a(:cell align=right:)%0a'''Prevent formatting:''' [=[=...=]=]\%0a'''Preformatted block:''' [=[@...@]=]%0a(:tableend:) +time=1135564217 +author:1135564217=pascal.corpet.2001|Pascal CORPET +csum:1135564217=take out markers that looks like smarty's +diff:1135564217:1124072814:=7c7%0a%3c -%3c'''Paragraphs:''' for a new paragraph, use a blank line;\%0a---%0a> -%3c'''Paragraphs:''' for a new paragraph, use a blank line;\\%0a10c10%0a%3c '''Line break:''' '''[=\=]''' or '''[=[[%3c%3c]]=]'''%0a---%0a> '''Line break:''' '''[=\\=]''' or '''[=[[%3c%3c]]=]'''%0a18c18%0a%3c -%3c'''Other markups:''' [=[+bigger+], [-smaller-], '^superscript^', '_subscript_'=]%0a---%0a> -%3c'''Other markups:''' [=[+bigger+], [-smaller-], '^superscript^', '_subscript_', {+inserted+}, {-deleted-}=]%0a20c20%0a%3c '''Prevent formatting:''' [=[=...=]=]\%0a---%0a> '''Prevent formatting:''' [=[=...=]=]\\%0a +host:1135564217=69.109.116.180 -- 2.1.4