# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1334565371 -10800
# Node ID a31436ba260a9380ae73cbe1bb694497c945498a
# Parent  c0e95425065730c51cce107896db84dcccad54a1# Parent  79bd3f57e8c59fa90dc0538028754c0ca613a252
branch merge

diff -r c0e954250657 -r a31436ba260a mirror/files/usr/bin/chkfilelist
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mirror/files/usr/bin/chkfilelist	Mon Apr 16 11:36:11 2012 +0300
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+find /var/www/slitaz/mirror/ -type d | while read dir; do 
+    [ "$(ls -altr $dir | sed '$!d; s/.*\(....\)$/\1/')" == "list" ] && continue
+    echo -n "" > $dir/.folderlist
+    chown www.www $dir/.folderlist
+    echo -n "" > $dir/.filelist
+    chown www.www $dir/.filelist
+done
diff -r c0e954250657 -r a31436ba260a mirror/floppies/mkindex.sh
--- a/mirror/floppies/mkindex.sh	Mon Apr 16 11:34:57 2012 +0300
+++ b/mirror/floppies/mkindex.sh	Mon Apr 16 11:36:11 2012 +0300
@@ -26,8 +26,8 @@
 	<meta name="description" content="slitaz$LORAM boot floppies $VERSION" />
 	<meta name="robots" content="index, nofollow" />
 	<meta name="author" content="SliTaz Contributors" />
-	<link rel="shortcut icon" href="/static/favicon.ico" />
-	<link rel="stylesheet" type="text/css" href="/static/slitaz.css" />
+	<link rel="shortcut icon" href="static/favicon.ico" />
+	<link rel="stylesheet" type="text/css" href="static/slitaz.css" />
 	<link rel="stylesheet" type="text/css" href="menu.css" />
 	<style type="text/css">
 table {
@@ -53,7 +53,7 @@
 	    <ul id="menu">
 	      <li>
 		<a href="http://www.slitaz.org/">
-		<img src="/static/home.png" alt="[ home ]" /></a>
+		<img src="static/home.png" alt="[ home ]" /></a>
 	      </li>
 	      <li>
 		<a href="floppy-grub4dos" title="Boot tools">Generic boot floppy</a>
@@ -222,7 +222,7 @@
 <!-- Bottom and logo's -->
 <div id="bottom">
 <p>
-<a href="http://validator.w3.org/check?uri=referer"><img src="/static/xhtml10.png" alt="Valid XHTML 1.0" title="Code validé XHTML 1.0" style="width: 80px; height: 15px;" /></a>
+<a href="http://validator.w3.org/check?uri=referer"><img src="static/xhtml10.png" alt="Valid XHTML 1.0" title="Code validé XHTML 1.0" style="width: 80px; height: 15px;" /></a>
 </p>
 </div>
 
diff -r c0e954250657 -r a31436ba260a mirror/root/dir-generator.php
--- a/mirror/root/dir-generator.php	Mon Apr 16 11:34:57 2012 +0300
+++ b/mirror/root/dir-generator.php	Mon Apr 16 11:36:11 2012 +0300
@@ -292,36 +292,42 @@
 {
 	exec("[ -f '".$path."' ]", $tmp, $ret);
 	return $ret == 0;
+//return is_file($path);
 }
 
 function my_filesize($path)	// 2G+ file support
 {
 	return rtrim(shell_exec("stat -Lc %s '".$path."'"));
+//return filesize($path);
 }
 
 function my_filemtime($path)	// 2G+ file support
 {
 	return rtrim(shell_exec("stat -Lc %Y '".$path."'"));
+//return filemtime($path);
 }
 
 function my_filemtimeasc($path)	// 2G+ file support
 {
-	return rtrim(shell_exec("date -r '".$path."' '+%Y-%b-%d %H:%M:%S'"));
+	return rtrim(shell_exec("LC_ALL=C date -r '".$path."' '+%Y-%b-%d %H:%M:%S'"));
+//return date('Y-M-d H:m:s', filemtime($path));
 }
 
+if (filesize($path.".folderlist") > 0 && filesize($path.".filelist") > 0) {
+	$folderlist = unserialize(file_get_contents($path.".folderlist"));
+	$filelist = unserialize(file_get_contents($path.".filelist"));
+}
+else {
+
 // Get all of the folders and files. 
 $folderlist = array();
 $filelist = array();
 if($handle = @opendir($path)) {
 	while(($item = readdir($handle)) !== false) {
 		if ($item == "index.php") continue;
+		if ($item == ".folderlist") continue;
+		if ($item == ".filelist") continue;
 		if ($item == "dir-generator.php") continue;
-		if (isset($_GET['f'])) {
-			$filter = $_GET['f'];
-			if (substr($filter,0,1) != '/')
-				$filter = '/'.$filter.'/i';
-			if (!preg_match($filter,$item)) continue;
-		}
 		if(is_dir($path.'/'.$item) and $item != '.' and $item != '..') {
 			$folderlist[] = array(
 				'name' => $item, 
@@ -347,8 +353,22 @@
 		}
 	}
 	closedir($handle);
+	file_put_contents($path.".folderlist",serialize($folderlist),LOCK_EX);
+	file_put_contents($path.".filelist",serialize($filelist),LOCK_EX);
+}
 }
 
+if (isset($_GET['f'])) {
+	$filter = $_GET['f'];
+	if (substr($filter,0,1) != '/')
+		$filter = '/'.$filter.'/i';
+	foreach ($filelist as $key => $value)
+		if (!preg_match($filter,$value['name']))
+			unset($filelist[$key]);
+	foreach ($folderlist as $key => $value)
+		if (!preg_match($filter,$value['name']))
+			unset($folderlist[$key]);
+}
 
 if(!isset($_GET['s'])) {
 	$_GET['s'] = 'name';
diff -r c0e954250657 -r a31436ba260a roadmap/releases/5.0/burn-box.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/roadmap/releases/5.0/burn-box.conf	Mon Apr 16 11:36:11 2012 +0300
@@ -0,0 +1,11 @@
+# SliTaz task
+
+TASK="Code a new Burn Box using Vala or Yad"
+STATUS="TODO"
+PRIORITY="2"
+PEOPLE="pankso"
+WIKI=""
+BUGS=""
+
+DESC="In 5.0 will not have gtkdialog anymore. So we must port all
+boxes to Yad, Vala or TazPanel. For burn-box we should use GTK not CGI."
diff -r c0e954250657 -r a31436ba260a tank/tank
--- a/tank/tank	Mon Apr 16 11:34:57 2012 +0300
+++ b/tank/tank	Mon Apr 16 11:36:11 2012 +0300
@@ -95,6 +95,9 @@
 		done && echo "" ;;
 	adduser)
 		echo ""
+		if [ -d /home/$user ]; then
+			echo -e "User $user already exists...\n" && exit 1
+		fi
 		if [ -n "$2" ]; then
 			user=$2
 		else
@@ -110,9 +113,6 @@
 		else
 			echo -n "Password: " && read pass
 		fi
-		if [ -d /home/$user ]; then
-			echo -e "User $user already exists...\n" && exit 1
-		fi
 		echo "Adding user: $user"
 		adduser -D -g "$gecos" $user -G users
 		echo $user:$pass | chpasswd --md5