[Easybox-mod-developers] SF.net SVN: easybox-mod: [69] trunk

[<ara...@us...>]

Revision: 69
          http://svn.sourceforge.net/easybox-mod/?rev=69&view=rev
Author:   aragornis
Date:     2007-01-23 13:40:46 -0800 (Tue, 23 Jan 2007)

Log Message:
-----------


Modified Paths:
--------------
    trunk/_framework/fonctions_partagees.inc.php
    trunk/module/seances/listesalle.php
    trunk/module/seances/voirsalle.php

Modified: trunk/_framework/fonctions_partagees.inc.php
===================================================================
--- trunk/_framework/fonctions_partagees.inc.php	2007-01-21 19:49:17 UTC (rev 68)
+++ trunk/_framework/fonctions_partagees.inc.php	2007-01-23 21:40:46 UTC (rev 69)
@@ -307,6 +307,15 @@
   sqlite_close($db);
 }
 
+function get_version($module){
+global $USER;
+  $db = sqlite_open($USER.'modules.db', 0666);
+  $res = sqlite_query($db,'SELECT version FROM modules WHERE nom="'.$module.'"');
+	$resu = sqlite_fetch_object($res);
+  sqlite_close($db);
+	return ($resu->version);
+}
+
 function module_exists($nom){
 global $LISTE_MODULES;
   if(count($LISTE_MODULES)<=2){
@@ -378,15 +387,6 @@
 return $MODULES;
 }
 
-function get_version($module){
-global $USER;
-  $db = sqlite_open($USER.'modules.db', 0666);
-  $res = sqlite_query($db,'SELECT version FROM modules WHERE nom="'.$module.'"');
-	$resu = sqlite_fetch_object($res);
-  sqlite_close($db);
-	return ($resu->version);
-}
-
 function get_last_patch($type, $module){
 global $ini, $RACINE_REP;
   $DONE = array();
@@ -481,14 +481,7 @@
 	unlink("temp.zip");
 }
 
-function rmdirr ($dir) {
-	if (is_dir ($dir) && !is_link ($dir)) {
-		return @cleardir ($dir) ? @rmdir($dir) : false;
-	}
-	return @unlink($dir);
-}
-
-function cleardir ($dir) {
+function cleardir ($dir){
 	if (!($dir = dir ($dir))) {
 		return false;
 	}
@@ -502,6 +495,13 @@
 	return true;
 }
 
+function rmdirr($dir){
+	if (is_dir ($dir) && !is_link ($dir)) {
+		return @cleardir ($dir) ? @rmdir($dir) : false;
+	}
+	return @unlink($dir);
+}
+
 function get_id_of_categorie($name){
 global $USER; 
   $db = sqlite_open($USER.'modules.db', 0666);

Modified: trunk/module/seances/listesalle.php
===================================================================
--- trunk/module/seances/listesalle.php	2007-01-21 19:49:17 UTC (rev 68)
+++ trunk/module/seances/listesalle.php	2007-01-23 21:40:46 UTC (rev 69)
@@ -31,7 +31,7 @@
   {
   list ($debu, $fine) = split ('</a> - </h4><h4 style="color: #666666">', $value);
   list ($code, $nom) = split ('" class="link1">', $debu);
-  list ($postal, $ville) = split ('</h4><h4 style="color: #666666">, ', $fine);
+  list ($postal, $ville) = split (', </h4><h4 style="color: #666666">', $fine);
   $CONTENT .= "<a href=voirsalle.php?add=1&salle=$code>$nom - $ville ($postal)</a><br>";
   }
   

Modified: trunk/module/seances/voirsalle.php
===================================================================
--- trunk/module/seances/voirsalle.php	2007-01-21 19:49:17 UTC (rev 68)
+++ trunk/module/seances/voirsalle.php	2007-01-23 21:40:46 UTC (rev 69)
@@ -34,7 +34,7 @@
 preg_match("/$ereg/s", $contenu_html, $valeur);
 $cine = $valeur[1];
 
-$ereg = '<h4 style="color:#777777">(.{1,80})<br \/><\/h4>';
+$ereg = '<h4 style="color:#777777">(.{1,80})<br \/><br \/><\/h4>';
 preg_match("/$ereg/s", $contenu_html, $valeur);
 $cine .= ' - '.$valeur[1];            
    


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.