# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1345041127 -7200
# Node ID 87d4ccc604d7146470c2acef6d26c24c71b7db20
# Parent  efd18dbda79663e7086c9069662e2c154e0a7e78
usbkey.slitaz.org update

diff -r efd18dbda796 -r 87d4ccc604d7 usbkey/head.php
--- a/usbkey/head.php	Fri Aug 10 08:47:21 2012 +0000
+++ b/usbkey/head.php	Wed Aug 15 16:32:07 2012 +0200
@@ -17,7 +17,7 @@
 #bottom {
 	text-align: center;
 }
-.cfrm { // capcha
+#capcha {
 	display: none;
 }
 	</style>
diff -r efd18dbda796 -r 87d4ccc604d7 usbkey/helper.sh
--- a/usbkey/helper.sh	Fri Aug 10 08:47:21 2012 +0000
+++ b/usbkey/helper.sh	Wed Aug 15 16:32:07 2012 +0200
@@ -15,7 +15,8 @@
 	print last " : " n
 }'
 	else
-		ls $dir/?/* 2> /dev/null | wc -l
+		sed '/"count";s:1:/!d;s/.*"count";s:1:"\([0-9]*\)";.*/\1/' $dir/?/* | \
+			awk 'BEGIN { n=0 }{ n+=$0 } END { print n }'
 	fi
 	exit	
 fi
@@ -36,13 +37,13 @@
 From: usbkey-preorder@$DOMAIN
 Reply-To: no-reply@$DOMAIN
 To: $SENDTO
-Date: $(date '+%a, %d %b %Y %H:%M:%S %z')
+Date: $(LC_ALL=C date '+%a, %d %b %Y %H:%M:%S %z')
 Subject: $SUBJECT
 
 Hello $SURNAME,
 
 A $KEYSIZE SliTaz USB key will be reserved for you.
-Would you mind confirming the pre-ordering with the following link
+Would you mind confirm the pre-ordering with the following link
 http://usbkey.slitaz.org/?confirm=$HASH
 
 Or cancel the registration with the following link
diff -r efd18dbda796 -r 87d4ccc604d7 usbkey/main.php
--- a/usbkey/main.php	Fri Aug 10 08:47:21 2012 +0000
+++ b/usbkey/main.php	Wed Aug 15 16:32:07 2012 +0200
@@ -8,7 +8,8 @@
 	<!-- Information/image -->
 	<div id="block_info">
 		<?php echo $characteristics ?>
-		<h4><?php system("../helper.sh --stats confirmed"); echo $stats ?></h4>
+		<h4><?php system("../helper.sh --stats confirmed"); echo $stats.", ";
+		          system("../helper.sh --stats pending"); echo $pending."."  ?></h4>
 	</div>
 </div>
 		
@@ -39,7 +40,7 @@
 <!--
 function valid(f)
 {
-	if (f.email.value.indexOf("@",0) < 0) {
+	if (f.email.value == "" || f.email.value.indexOf("@",0) < 0) {
 		alert("<?php echo $enter_email ?>")
 		f.email.focus()
 		return
@@ -77,6 +78,14 @@
 </script>
 <form method="post" action="../preorder.php">
 <input type="hidden" name="lang" value="<?php echo $lang ?>" />
+<input type="hidden" name="ip" value="<?php 
+if (isset($_SERVER["HTTP_X_FORWARDED_FOR"])) 
+     echo $_SERVER["HTTP_X_FORWARDED_FOR"];
+else echo $_SERVER["REMOTE_ADDR"];
+?>" />
+<div id="capcha">
+<input name="host" type="text" value="" />
+</div>
 <table width="100%">
 <tbody>
 	<tr>
diff -r efd18dbda796 -r 87d4ccc604d7 usbkey/preorder.php
--- a/usbkey/preorder.php	Fri Aug 10 08:47:21 2012 +0000
+++ b/usbkey/preorder.php	Wed Aug 15 16:32:07 2012 +0200
@@ -2,6 +2,7 @@
 include("./head.php");
 
 echo '<div id="content">';
+if (!isset($_POST['host']) || $_POST['host'] == "") { // capcha
 $data = serialize($_POST);
 $hash = md5($data);
 @mkdir("pending/".substr($hash,0,1),0777,TRUE);
@@ -13,6 +14,7 @@
 	  $_POST['email']."' '".$_POST['surname']."' '".$_POST['size'].
 	  "' ".$hash);
 echo "Thanks ".$_POST['surname'].".<br>\nAn email has been send to ".$_POST['email'].".";
+}
 echo '</div>';
 include("./tail.php");
 ?>
diff -r efd18dbda796 -r 87d4ccc604d7 usbkey/resend.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbkey/resend.php	Wed Aug 15 16:32:07 2012 +0200
@@ -0,0 +1,12 @@
+<?php
+$i = 1;
+for ($i = 1; isset($argv[$i]); $i++) {
+	$hash = basename($argv[$i]);
+	$data = file_get_contents($argv[$i]);
+	$_POST = unserialize($data);
+
+system(dirname($_SERVER["SCRIPT_FILENAME"])."/helper.sh '".
+	  $_POST['email']."' '".$_POST['surname']."' '".$_POST['size'].
+	  "' ".$hash);
+}
+?>