Backports

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1165 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/bin/connect.db.inc.php b/bin/connect.db.inc.php
index e6cbe2a..479f9af 100644 (file)
--- a/bin/connect.db.inc.php
+++ b/bin/connect.db.inc.php
@@ -24,6 +24,6 @@ ini_set('include_path','/usr/share/php:'.dirname(__FILE__).'/../include');
 require_once('xorg.inc.php');
 require_once('xorg.misc.inc.php');
 
-require_once dirname(__FILE__).'/../classes/XDB.php';
+require_once dirname(__FILE__).'/../classes/xdb.php';
 
 ?>

diff --git a/bin/search.rebuild_db.php b/bin/search.rebuild_db.php
index 5c77822..ed73b28 100755 (executable)
--- a/bin/search.rebuild_db.php
+++ b/bin/search.rebuild_db.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php4 -q
+#!/usr/bin/php5 -q
 <?php
 /***************************************************************************
  *  Copyright (C) 2003-2006 Polytechnique.org                              *

diff --git a/modules/lists.php b/modules/lists.php
index 2f713c5..caa7844 100644 (file)
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -81,7 +81,7 @@ class ListsModule extends PLModule
 
         function filter_member($list)
         {
-            return $list['ins'];
+            return $list['sub'];
         }
 
         $this->prepare_client($page);

diff --git a/modules/stats.php b/modules/stats.php
index 88be836..b0382e0 100644 (file)
--- a/modules/stats.php
+++ b/modules/stats.php
@@ -273,11 +273,11 @@ EOF2;
         $page->changeTpl('stats/coupure.tpl');
 
         if (!is_null($cp_id)) {
-            $res = XDB::query("SELECT  UNIX_TIMESTAMP(debut) AS debut,
-                                                 TIME_FORMAT(duree,'%kh%i') AS duree,
-                                                 resume, description, services
-                                           FROM  coupures
-                                          WHERE  id = {?}", $cp_id);
+            $res = XDB::query("SELECT  debut,
+                                       TIME_FORMAT(duree,'%kh%i') AS duree,
+                                       resume, description, services
+                                 FROM  coupures
+                                WHERE  id = {?}", $cp_id);
             $cp  = $res->fetchOneAssoc();
         }
 
@@ -286,7 +286,7 @@ EOF2;
             $page->assign_by_ref('cp',$cp);
         } else {
             $beginning_date = date("Ymd", time() - 3600*24*21) . "000000";
-            $sql = "SELECT  id, UNIX_TIMESTAMP(debut) AS debut, resume, services
+            $sql = "SELECT  id, debut, resume, services
                       FROM  coupures where debut > '$beginning_date' order by debut desc";
             $page->assign('coupures', XDB::iterator($sql));
         }