From e1f2b5c65f0393d05c7a1ab6bb70272a2991562e Mon Sep 17 00:00:00 2001
From: "Pierre Habouzit (MadCoder" <pierre.habouzit@m4x.org>
Date: Wed, 29 Dec 2004 23:07:06 +0000
Subject: [PATCH] closes #137

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-183
---
 ChangeLog                        | 10 ++++++----
 include/xorg.inc.php             |  5 ++++-
 include/xorg/page.inc.php        |  5 +----
 plugins/modifier.date_format.php | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 plugins/modifier.date_format.php

diff --git a/ChangeLog b/ChangeLog
index ff56d69..6e9f43b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,15 +13,17 @@ New :
 		- Brand new PDF of the contact list (using FPDF).					-MC
 		- Even include Photos in the PDF (kludgy !).						-MC
 
-	* Validation :
-		- quite a lot of rewrite, simplifications.							-MC
-		- now possible to add comments without any action.					-MC
-
 	* Skins :
 		- Openweb : update.													-MC
 
+	* Validation :
+		- quite a lot of rewrite, simplifications.							-MC
+
 Bug/Wish :
 
+	* Validations :
+		- #137: now possible to add comments without any action.			-MC
+
 ================================================================================
 VERSION 0.9.3														 27 Dec 2004
 
diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index 4a4d82a..b13acf0 100644
--- a/include/xorg.inc.php
+++ b/include/xorg.inc.php
@@ -25,7 +25,7 @@ function microtime_float()
     return ((float)$usec + (float)$sec); 
 } 
 $TIME_BEGIN = microtime_float();
- 
+
 // {{{ defines
 
 $i=0;
@@ -40,6 +40,9 @@ define("PERMS_ADMIN", "admin");
 define('SKINNED', 0);
 define('NO_SKIN', 1);
 
+setlocale(LC_MESSAGES, 'fr_FR');
+setlocale(LC_TIME, 'fr_FR');
+
 // }}}
 // {{{ globals + session init
 
diff --git a/include/xorg/page.inc.php b/include/xorg/page.inc.php
index 9b52d17..4696b0e 100644
--- a/include/xorg/page.inc.php
+++ b/include/xorg/page.inc.php
@@ -54,12 +54,9 @@ class XorgPage extends DiogenesCorePage
     {
         global $globals;
 
-	setlocale(LC_MESSAGES, 'fr_FR');
-	setlocale(LC_TIME, 'fr_FR');
-
         $this->template_dir  = $globals->spoolroot."/templates/";
         $this->compile_dir   = $globals->spoolroot."/templates_c/";
-        $this->plugins_dir[] = $globals->spoolroot."/plugins/";
+        array_unshift($this->plugins_dir, $globals->spoolroot."/plugins/");
         $this->config_dir    = $globals->spoolroot."/configs/";
 
         $this->compile_check = !empty($globals->debug);
diff --git a/plugins/modifier.date_format.php b/plugins/modifier.date_format.php
new file mode 100644
index 0000000..1f9f06a
--- /dev/null
+++ b/plugins/modifier.date_format.php
@@ -0,0 +1,36 @@
+<?php
+/***************************************************************************
+ *  Copyright (C) 2003-2004 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                *
+ ***************************************************************************/
+
+function smarty_modifier_date_format($string, $format="%d %b %Y", $default_date=null)
+{
+    require_once('Date.php');
+    if($string != '') {
+        $date = new Date($string);
+        return $date->format($format);
+    } elseif (!empty($default_date)) {
+        $date = new Date($default_date);
+        return $date->format($format);
+    } else {
+        return;
+    }
+}
+
+?>
-- 
2.1.4