Browse Source

Merge remote-tracking branch 'origin/3.5' into develop

Laurent Destailleur 11 years ago
parent
commit
8d8e016115
25 changed files with 51 additions and 470 deletions
  1. 12 0
      ChangeLog
  2. 6 0
      dev/dolibarr_changes.txt
  3. 10 3
      htdocs/comm/index.php
  4. 10 3
      htdocs/comm/propal/index.php
  5. 7 1
      htdocs/core/lib/admin.lib.php
  6. 3 3
      htdocs/core/modules/modAgenda.class.php
  7. 0 44
      htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.asp
  8. 0 31
      htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.aspx
  9. 0 19
      htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.cf
  10. 0 49
      htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.jsp
  11. 0 43
      htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.php
  12. 0 102
      htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl
  13. 0 25
      htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py
  14. 0 61
      htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.rb
  15. 0 36
      htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree_huck.lasso
  16. 0 48
      htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree_sabourdin.lasso
  17. 2 0
      htdocs/langs/en_US/main.lang
  18. 1 0
      htdocs/langs/fr_FR/main.lang
  19. 0 1
      htdocs/projet/class/task.class.php
  20. BIN
      htdocs/theme/amarok/img/favicon.ico
  21. BIN
      htdocs/theme/auguria/img/favicon.ico
  22. BIN
      htdocs/theme/bureau2crea/img/favicon.ico
  23. BIN
      htdocs/theme/cameleo/img/favicon.ico
  24. 0 1
      htdocs/theme/cameleo/style.css.php
  25. BIN
      htdocs/theme/eldy/img/favicon.ico

+ 12 - 0
ChangeLog

@@ -172,6 +172,18 @@ parameter. All methods addline in this case were modified to remove this paramet
 ***** ChangeLog for 3.4.3 compared to 3.4.2 *****
 Fix: Bad get of localtaxes into contracts add lines
 
+***** ChangeLog for 3.4.3 compared to 3.4.2 *****
+Fix: Warning into bank conciliation feature.
+Fix: Bad get of localtaxes into contracts add lines.
+Fix: Add a limit into list to avoid browser to hang when database is too large.
+Fix: [ bug #1212 ] 'jqueryFileTree.php' directory traversal vulnerability
+
+***** ChangeLog for 3.4.3 compared to 3.4.2 *****
+Fix: Warning into bank conciliation feature.
+Fix: Bad get of localtaxes into contracts add lines.
+Fix: Add a limit into list to avoid browser to hang when database is too large.
+Fix: [ bug #1212 ] 'jqueryFileTree.php' directory traversal vulnerability
+
 ***** ChangeLog for 3.4.2 compared to 3.4.1 *****
 Fix: field's problem into company's page (RIB).
 Fix: Document cerfa doesn't contained firstname & lastname from donator.

+ 6 - 0
dev/dolibarr_changes.txt

@@ -54,3 +54,9 @@ window.location.href=pRef
 JCROP:
 ------
 * Remove analytics tag into file index.html
+
+
+JQUERYFILETREE:
+---------------
+* Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
+

+ 10 - 3
htdocs/comm/index.php

@@ -453,8 +453,10 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 			$var=true;
 
 			print '<table class="noborder" width="100%">';
-			print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").'</td></tr>';
-			while ($i < $num)
+			print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1">('.$num.')</td></tr>';
+
+			$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?1000:$conf->global->MAIN_MAXLIST_OVERLOAD));
+			while ($i < $nbofloop)
 			{
 				$obj = $db->fetch_object($result);
 				$var=!$var;
@@ -491,7 +493,12 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 				$i++;
 				$total += $obj->total_ttc;
 			}
-			if ($total>0) {
+			if ($num > $nbofloop)
+			{
+				print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
+			}
+			else if ($total>0)
+			{
 				print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
 			}
 			print "</table><br>";

+ 10 - 3
htdocs/comm/propal/index.php

@@ -313,8 +313,10 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 			$var=true;
 
 			print '<table class="noborder" width="100%">';
-			print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal.php?viewstatut=1">('.$num.')</a></td></tr>';
-			while ($i < $num)
+			print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1">('.$num.')</a></td></tr>';
+
+			$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?1000:$conf->global->MAIN_MAXLIST_OVERLOAD));
+			while ($i < $nbofloop)
 			{
 				$obj = $db->fetch_object($result);
 				$var=!$var;
@@ -356,7 +358,12 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 				$i++;
 				$total += $obj->total_ttc;
 			}
-			if ($total>0) {
+			if ($num > $nbofloop)
+			{
+				print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
+			}
+			else if ($total>0)
+			{
 				print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
 			}
 			print "</table><br>";

+ 7 - 1
htdocs/core/lib/admin.lib.php

@@ -557,7 +557,13 @@ function listOfSessions()
     global $conf;
 
     $arrayofSessions = array();
-    $sessPath = ini_get("session.save_path").'/';
+    // session.save_path can be returned empty so we set a default location and work from there
+    $sessPath = '/tmp';
+    $iniPath = ini_get("session.save_path");
+    if ($iniPath) {
+        $sessPath = $iniPath;
+    }
+    $sessPath .= '/'; // We need the trailing slash
     dol_syslog('admin.lib:listOfSessions sessPath='.$sessPath);
 
     $dh = @opendir(dol_osencode($sessPath));

+ 3 - 3
htdocs/core/modules/modAgenda.class.php

@@ -23,15 +23,15 @@
 
 /**
  *		\defgroup   agenda     Module agenda
- *      \brief      Module pour gerer l'agenda et actions
+ *      \brief      Module to manage agenda and events
  *      \file       htdocs/core/modules/modAgenda.class.php
  *      \ingroup    agenda
- *      \brief      Fichier de description et activation du module agenda
+ *      \brief      File of class to describe and enable/disable module Agenda
  */
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 /**
- *	Classe de description et activation du module Adherent
+ *	Class to describe and enable/disable module Agenda
  */
 class modAgenda extends DolibarrModules
 {

+ 0 - 44
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.asp

@@ -1,44 +0,0 @@
-<%
-'
-' jQuery File Tree ASP (VBS) Connector
-' Copyright 2008 Chazzuka
-' programmer@chazzuka.com
-' http://www.chazzuka.com/
-'
-' retrive base directory
-dim BaseFileDir:BaseFileDir=Request.Form("dir")
-' if blank give default value
-if len(BaseFileDir)=0 then BaseFileDir="/userfiles/"
-
-dim ObjFSO,BaseFile,Html
-' resolve the absolute path
-BaseFile = Server.MapPath(BaseFileDir)&"\"
-' create FSO
-Set ObjFSO = Server.CreateObject("Scripting.FileSystemObject")
-' if given folder is exists
-if ObjFSO.FolderExists(BaseFile) then
-       dim ObjFolder,ObjSubFolder,ObjFile,i__Name,i__Ext
-       Html = Html +  "<ul class=""jqueryFileTree"" style=""display: none;"">"&VBCRLF
-       Set ObjFolder = ObjFSO.GetFolder(BaseFile)
-       ' LOOP THROUGH SUBFOLDER
-       For Each ObjSubFolder In ObjFolder.SubFolders
-               i__Name=ObjSubFolder.name
-               Html = Html + "<li class=""directory collapsed"">"&_
-                                         "<a href=""#"" rel="""+(BaseFileDir+i__Name+"/")+""">"&_
-                                         (i__Name)+"</a></li>"&VBCRLF
-       Next
-       'LOOP THROUGH FILES
-       For Each ObjFile In ObjFolder.Files
-               ' name
-               i__Name=ObjFile.name
-               ' extension
-               i__Ext = LCase(Mid(i__Name, InStrRev(i__Name, ".", -1, 1) + 1))
-               Html = Html + "<li class=""file ext_"&i__Ext&""">"&_
-                                         "<a href=""#"" rel="""+(BaseFileDir+i__Name)+""">"&_
-                                         (i__name)+"</a></li>"&VBCRLF
-       Next
-       Html = Html +  "</ul>"&VBCRLF
-end if
-
-Response.Write Html
-%>

+ 0 - 31
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.aspx

@@ -1,31 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" %>
-
-<%
-	//
-	// jQuery File Tree ASP Connector
-	//
-	// Version 1.0
-	//
-	// Copyright (c)2008 Andrew Sweeny
-	// asweeny@fit.edu
-	// 24 March 2008
-	//
-	string dir;
-	if(Request.Form["dir"] == null || Request.Form["dir"].Length <= 0)
-		dir = "/";
-	else
-		dir = Server.UrlDecode(Request.Form["dir"]);
-	System.IO.DirectoryInfo di = new System.IO.DirectoryInfo(dir);
-	Response.Write("<ul class=\"jqueryFileTree\" style=\"display: none;\">\n");
-	foreach (System.IO.DirectoryInfo di_child in di.GetDirectories())
-		Response.Write("\t<li class=\"directory collapsed\"><a href=\"#\" rel=\"" + dir + di_child.Name + "/\">" + di_child.Name + "</a></li>\n");
-	foreach (System.IO.FileInfo fi in di.GetFiles())
-	{
-		string ext = ""; 
-		if(fi.Extension.Length > 1)
-			ext = fi.Extension.Substring(1).ToLower();
-			
-		Response.Write("\t<li class=\"file ext_" + ext + "\"><a href=\"#\" rel=\"" + dir + fi.Name + "\">" + fi.Name + "</a></li>\n");		
-	}
-	Response.Write("</ul>");
- %>

+ 0 - 19
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.cf

@@ -1,19 +0,0 @@
-<!---
-
-jQuery File Tree
-ColdFusion connector script
-By Tjarko Rikkerink (http://carlosgallupa.com/)
-
---->
-<cfparam name="form.dir" default="/somedir" />
-<cfdirectory action="LIST" directory="#expandpath('#URLDecode(form.dir)#')#" name="qDir" sort="type, name" type="all" listinfo="all" recurse="no">
-
-<ul class="jqueryFileTree" style="display: none;">
-       <cfoutput query="qDir">
-               <cfif type eq "dir">
-                   <li class="directory collapsed"><a href="##" rel="#URLDecode(form.dir)##name#/">#name#</a></li>
-               <cfelseif type eq "file">
-               <li class="file ext_#listLast(name,'.')#"><a href="##" rel="#URLDecode(form.dir)##name#">#name# (#round(size/1024)#KB)</a></li>
-               </cfif>
-       </cfoutput>
-</ul>

+ 0 - 49
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.jsp

@@ -1,49 +0,0 @@
-<%@ page
-	import="java.io.File,java.io.FilenameFilter,java.util.Arrays"%>
-<%
-/**
-  * jQuery File Tree JSP Connector
-  * Version 1.0
-  * Copyright 2008 Joshua Gould
-  * 21 April 2008
-*/	
-    String dir = request.getParameter("dir");
-    if (dir == null) {
-    	return;
-    }
-	
-	if (dir.charAt(dir.length()-1) == '\\') {
-    	dir = dir.substring(0, dir.length()-1) + "/";
-	} else if (dir.charAt(dir.length()-1) != '/') {
-	    dir += "/";
-	}
-	
-	dir = java.net.URLDecoder.decode(dir, "UTF-8");	
-	
-    if (new File(dir).exists()) {
-		String[] files = new File(dir).list(new FilenameFilter() {
-		    public boolean accept(File dir, String name) {
-				return name.charAt(0) != '.';
-		    }
-		});
-		Arrays.sort(files, String.CASE_INSENSITIVE_ORDER);
-		out.print("<ul class=\"jqueryFileTree\" style=\"display: none;\">");
-		// All dirs
-		for (String file : files) {
-		    if (new File(dir, file).isDirectory()) {
-				out.print("<li class=\"directory collapsed\"><a href=\"#\" rel=\"" + dir + file + "/\">"
-					+ file + "</a></li>");
-		    }
-		}
-		// All files
-		for (String file : files) {
-		    if (!new File(dir, file).isDirectory()) {
-				int dotIndex = file.lastIndexOf('.');
-				String ext = dotIndex > 0 ? file.substring(dotIndex + 1) : "";
-				out.print("<li class=\"file ext_" + ext + "\"><a href=\"#\" rel=\"" + dir + file + "\">"
-					+ file + "</a></li>");
-		    	}
-		}
-		out.print("</ul>");
-    }
-%>

+ 0 - 43
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.php

@@ -1,43 +0,0 @@
-<?php
-//
-// jQuery File Tree PHP Connector
-//
-// Version 1.01
-//
-// Cory S.N. LaViska
-// A Beautiful Site (http://abeautifulsite.net/)
-// 24 March 2008
-//
-// History:
-//
-// 1.01 - updated to work with foreign characters in directory/file names (12 April 2008)
-// 1.00 - released (24 March 2008)
-//
-// Output a list of files for jQuery File Tree
-//
-
-$_POST['dir'] = urldecode($_POST['dir']);
-
-if( file_exists($root . $_POST['dir']) ) {
-	$files = scandir($root . $_POST['dir']);
-	natcasesort($files);
-	if( count($files) > 2 ) { /* The 2 accounts for . and .. */
-		echo "<ul class=\"jqueryFileTree\" style=\"display: none;\">";
-		// All dirs
-		foreach( $files as $file ) {
-			if( file_exists($root . $_POST['dir'] . $file) && $file != '.' && $file != '..' && is_dir($root . $_POST['dir'] . $file) ) {
-				echo "<li class=\"directory collapsed\"><a href=\"#\" rel=\"" . htmlentities($_POST['dir'] . $file) . "/\">" . htmlentities($file) . "</a></li>";
-			}
-		}
-		// All files
-		foreach( $files as $file ) {
-			if( file_exists($root . $_POST['dir'] . $file) && $file != '.' && $file != '..' && !is_dir($root . $_POST['dir'] . $file) ) {
-				$ext = preg_replace('/^.*\./', '', $file);
-				echo "<li class=\"file ext_$ext\"><a href=\"#\" rel=\"" . htmlentities($_POST['dir'] . $file) . "\">" . htmlentities($file) . "</a></li>";
-			}
-		}
-		echo "</ul>";	
-	}
-}
-
-?>

+ 0 - 102
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl

@@ -1,102 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use HTML::Entities ();
-
-#-----------------------------------------------------------
-#  jQuery File Tree Perl Connector
-#
-#  Version 1.0
-#
-#  Oleg Burlaca
-#  http://www.burlaca.com/2009/02/jquery-file-tree-connector/
-#  12 February 2009
-#-----------------------------------------------------------
-
-# for security reasons,  specify a root folder 
-# to prevent the whole filesystem to be shown
-# for ex: the root folder of your webbrowser
- 
-my $root = "/var/www/html/";
-
-#----------------------------------------------------------
-
-my $params = &getCGIParams();
-print "Content-type: text/html\n\n";
-
-my $dir = $params->{dir};
-my $fullDir = $root . $dir;
-
-exit if ! -e $fullDir;
-
-opendir(BIN, $fullDir) or die "Can't open $dir: $!";
-my (@folders, @files);
-my $total = 0;
-while( defined (my $file = readdir BIN) ) {
-    next if $file eq '.' or $file eq '..';
-    $total++;
-    if (-d "$fullDir/$file") {
-	push (@folders, $file);
-    } else {
-	push (@files, $file);
-    }
-}
-closedir(BIN);
-
-return if $total == 0;
-print "<ul class=\"jqueryFileTree\" style=\"display: none;\">";
-
-# print Folders
-foreach my $file (sort @folders) {
-    next if ! -e  $fullDir . $file;
-    
-    print '<li class="directory collapsed"><a href="#" rel="' . 
-          &HTML::Entities::encode($dir . $file) . '/">' . 
-          &HTML::Entities::encode($file) . '</a></li>';
-}
-
-# print Files
-foreach my $file (sort @files) {
-    next if ! -e  $fullDir . $file;
-
-    $file =~ /\.(.+)$/;
-    my $ext = $1;
-    print '<li class="file ext_' . $ext . '"><a href="#" rel="' . 
-    &HTML::Entities::encode($dir . $file) . '/">' .
-    &HTML::Entities::encode($file) . '</a></li>';
-}
-
-print "</ul>\n";
-
-
-
-
-#--------------------------------------------------------------------------------------------------
-sub getCGIParams {
-    my $line;
-    
-    if ($ENV{'REQUEST_METHOD'} eq "POST") {
-        read(STDIN, $line, $ENV{'CONTENT_LENGTH'});
-    } else {
-        $line = $ENV{'QUERY_STRING'};
-    }
-
-    my (@pairs) = split(/&/, $line);
-    my ($name, $value, %F);
-        
-    foreach (@pairs) {
-        ($name, $value) = split(/=/);
-        $value =~ tr/+/ /;
-        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
-        
-        if (! exists $F{$name}) {
-            $F{$name} = $value;
-        } elsif (exists $F{$name} and ref($F{$name}) ne 'ARRAY') {
-            my $prev_value = $F{$name};
-            delete $F{$name};
-            $F{$name} = [ $prev_value, $value ];
-	} else { push @{ $F{$name} }, $value }
-    }
-    return \%F;
-}
-#--------------------------------------------------------------------------------------------------                                                                                        
-                                                                    

+ 0 - 25
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py

@@ -1,25 +0,0 @@
-#
-# jQuery File Tree
-# Python/Django connector script
-# By Martin Skou
-#
-import os
-import urllib
-
-def dirlist(request):
-   r=['<ul class="jqueryFileTree" style="display: none;">']
-   try:
-       r=['<ul class="jqueryFileTree" style="display: none;">']
-       d=urllib.unquote(request.POST.get('dir','c:\\temp'))
-       for f in os.listdir(d):
-           ff=os.path.join(d,f)
-           if os.path.isdir(ff):
-               r.append('<li class="directory collapsed"><a href="#" rel="%s/">%s</a></li>' % (ff,f))
-           else:
-               e=os.path.splitext(f)[1][1:] # get .ext and remove dot
-               r.append('<li class="file ext_%s"><a href="#" rel="%s">%s</a></li>' % (e,ff,f))
-       r.append('</ul>')
-   except Exception,e:
-       r.append('Could not load directory: %s' % str(e))
-   r.append('</ul>')
-   return HttpResponse(''.join(r))

+ 0 - 61
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.rb

@@ -1,61 +0,0 @@
-#
-# jQuery File Tree Ruby Connector
-#
-# Version 1.01
-#
-# Erik Lax
-# http://datahack.se
-# 13 July 2008
-#
-# History
-#
-# 1.01 Initial Release
-#
-# Output a list of files for jQuery File Tree
-#
-
-#<settings>
-#root = "/absolute/path/"
-# or
-root = File.expand_path(".")
-#</settings>
-
-#<code>
-require "cgi"
-cgi = CGI.new
-cgi.header("type" => "text/html")
-dir = cgi.params["dir"].to_s
-
-puts "<ul class=\"jqueryFileTree\" style=\"display: none;\">"
-begin
-	path = root + "/" + dir 
-
-	# chdir() to user requested dir (root + "/" + dir) 
-	Dir.chdir(File.expand_path(path).untaint);
-	
-	# check that our base path still begins with root path
-	if Dir.pwd[0,root.length] == root then
-
-		#loop through all directories
-		Dir.glob("*") {
-			|x|
-			if not File.directory?(x.untaint) then next end 
-			puts "<li class=\"directory collapsed\"><a href=\"#\" rel=\"#{dir}#{x}/\">#{x}</a></li>";
-		}
-
-		#loop through all files
-		Dir.glob("*") {
-			|x|
-			if not File.file?(x.untaint) then next end 
-			ext = File.extname(x)[1..-1]
-			puts "<li class=\"file ext_#{ext}\"><a href=\"#\" rel=\"#{dir}#{x}\">#{x}</a></li>"
-		}
-	else
-		#only happens when someone tries to go outside your root directory...
-		puts "You are way out of your league"
-	end 
-rescue 
-	puts "Internal Error"
-end
-puts "</ul>"
-#</code>

+ 0 - 36
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree_huck.lasso

@@ -1,36 +0,0 @@
-[
-	//
-	// jQuery File Tree Lasso Connector
-	//
-	// Version 1.00
-	//
-	// Jason Huck
-	// http://devblog.jasonhuck.com/
-	// 1 May 2008
-	//
-	// History:
-	//
-	// 1.00 - released (1 May 2008)
-	//
-	// Output a list of files for jQuery File Tree
-	//
-
-	!action_param('dir') ? abort;
-	var('dir') = action_param('dir');
-	var('files') = file_listdirectory($dir);
-
-	'<ul class="jqueryFileTree" style="display: none;">';
-
-	iterate($files, local('file'));
-		#file->beginswith('.') ? loop_continue;
-	
-		if(#file->endswith('/'));
-			'<li class="directory collapsed"><a href="#" rel="' + $dir + #file + '">' + #file + '</a></li>';
-		else;
-			local('ext') = #file->split('.')->last;			
-			'<li class="file ext_' + #ext + '"><a href="#" rel="' + $dir + #file + '">' + #file + '</a></li>';
-		/if;
-	/iterate;
-	
-	'</ul>';
-]

+ 0 - 48
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree_sabourdin.lasso

@@ -1,48 +0,0 @@
-<?LassoScript
-//
-// jQuery File Tree LASSO Connector
-//
-// Version 1.00
-//
-// Marc Sabourdin
-// CysNET (http://www.marcsabourdin.com/)
-// 23 May 2008
-//
-// History:
-//
-// 1.00 - released (23 May 2008)
-//
-// Output a list of files for jQuery File Tree
-//
-Encode_set:-EncodeNone;
-
-Variable:'root' = 'path_to_desired_and_Lasso_allowed_root';
-Variable:'_POST.dir' = (action_param:'dir');
-Variable:'files';
-
-
-if:( file_exists: ($root + $_POST.dir) )&&( File_IsDirectory:($root + $_POST.dir) );
-	$files = (File_ListDirectory:($root + $_POST.dir));
-	$files->(Sort);
-	if:( $files->(Size) > 0 );
-		output:'<ul class="jqueryFileTree" style="display: none;">';
-		// All dirs
-		Iterate:($files),(Local:'file');
-			if:( file_exists:($root + $_POST.dir + #file) )&&( #file != '.' )&&( #file != '..' )&&( File_IsDirectory:($root + $_POST.dir + #file) );
-				output:'<li class="directory collapsed"><a href="#" rel="' + (String_replace:($_POST.dir + #file),-Find=' ',-Replace='__') + '">' + (Encode_HTML:(#file)) + '</a></li>';
-			/if;
-		/Iterate;
-		// All files
-		Local:'ext';
-		Iterate:($files),(Local:'file');
-			if:( file_exists:($root + $_POST.dir + #file) )&&( #file != '.' )&&( #file != '..' )&&( (File_IsDirectory:($root + $_POST.dir + #file))==false );
-				#ext = (#file)->(Split:'.')->Last;
-				output:'<li class="file ext_' + (#ext) + '"><a href="' + ($_POST.dir + #file) + '">' + (Encode_HTML:(#file)) + '</a></li>';
-			/if;
-		/Iterate;
-		output:'</ul>';	
-	/if;
-/if;
-
-/Encode_set;
-?>

+ 2 - 0
htdocs/langs/en_US/main.lang

@@ -666,6 +666,8 @@ SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (ot
 OriginFileName=Original filename
 SetDemandReason=Set source
 ViewPrivateNote=View notes
+XMoreLines=%s line(s) hidden
+
 # Week day
 Monday=Monday
 Tuesday=Tuesday

+ 1 - 0
htdocs/langs/fr_FR/main.lang

@@ -666,6 +666,7 @@ SaveUploadedFileWithMask=Sauver le fichier sur le serveur sous le nom "<strong>%
 OriginFileName=nom du fichier source
 SetDemandReason=Définir l'origine
 ViewPrivateNote=Voir notes
+XMoreLines=%s ligne(s) non affichée(s)
 
 # Week day
 Monday=Lundi

+ 0 - 1
htdocs/projet/class/task.class.php

@@ -27,7 +27,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  * 	Class to manage tasks
- *	Initialy built by build_class_from_table on 2008-09-10 12:41
  */
 class Task extends CommonObject
 {

BIN
htdocs/theme/amarok/img/favicon.ico


BIN
htdocs/theme/auguria/img/favicon.ico


BIN
htdocs/theme/bureau2crea/img/favicon.ico


BIN
htdocs/theme/cameleo/img/favicon.ico


+ 0 - 1
htdocs/theme/cameleo/style.css.php

@@ -971,7 +971,6 @@ td.photo {
 /* ============================================================================== */
 
 .toolbar {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$conf->theme.'/img/tmenu2.png',1); ?>) !important;
     background-repeat: repeat-x !important;
     border: 1px solid #BBB !important;
 }

BIN
htdocs/theme/eldy/img/favicon.ico