From 572137fccde149b6eb6ede7369a7460fcb19bee5 Mon Sep 17 00:00:00 2001
From: Axel ROGER <axel.roger2@gmail.com>
Date: Tue, 6 Nov 2012 16:46:15 +0000
Subject: [PATCH] Fixes #1357

---
 awstats/bureau/admin/aws_add.php     | 14 +++-----------
 awstats/bureau/admin/aws_doadd.php   |  3 +--
 awstats/bureau/admin/aws_useradd.php | 22 ++++++++++++++--------
 awstats/bureau/admin/aws_users.php   |  1 +
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/awstats/bureau/admin/aws_add.php b/awstats/bureau/admin/aws_add.php
index a4bb81d0..273d09f2 100644
--- a/awstats/bureau/admin/aws_add.php
+++ b/awstats/bureau/admin/aws_add.php
@@ -38,6 +38,9 @@ include_once("head.php");
 <h3><?php if (!$id) { __("New Statistics"); } else { __("Edit Statistics"); } ?></h3>
 <hr id="topbar"/>
 <br />
+<?php __("Awstats will analyze every logs availables for this domain (since its creation).");?>
+<br/>
+<br/>
 <?php
 	if (isset($error) && $error) {
 		echo "<p class=\"error\">$error</p></body></html>";
@@ -87,17 +90,6 @@ foreach($r as $v) {
 }
 
 ?></td></tr>
-<tr><th><?php __("View public"); ?></th><td>
-<select class="inl" name="public" id="public">
-<?php 
-// Public ? 
-$pub=$aws->get_view_public($id);
-if($pub == 0) {
-  echo "<option selected=\"selected\" value=\"0\">"._("Yes")."</option><option value=\"1\">"._("No")."</option>";
-} else {
-  echo "<option selected=\"selected\" value=\"1\">"._("No")."</option><option value=\"0\">"._("Yes")."</option>";
-}
-?>
 </select>
 </td></tr>
 <tr class="trbtn"><td colspan="2">
diff --git a/awstats/bureau/admin/aws_doadd.php b/awstats/bureau/admin/aws_doadd.php
index 90d86399..e3a4777f 100644
--- a/awstats/bureau/admin/aws_doadd.php
+++ b/awstats/bureau/admin/aws_doadd.php
@@ -28,12 +28,11 @@ $fields = array (
         "hostname"              => array ("post", "string", ""),
         "awsusers"              => array ("post", "array", ""),
         "hostaliases"           => array ("post", "array", ""),
-        "public"                => array ("post", "integer", "")
 );
 getFields($fields);
 
 if ($aws->check_host_available($hostname)) {
-    $r=$aws->add_stats($hostname,$awsusers,$hostaliases,$public);
+    $r=$aws->add_stats($hostname,$awsusers,$hostaliases,1);
     if (!$r) {
         $error=$err->errstr();
         include("aws_add.php");
diff --git a/awstats/bureau/admin/aws_useradd.php b/awstats/bureau/admin/aws_useradd.php
index 5ad0c385..497f1bff 100644
--- a/awstats/bureau/admin/aws_useradd.php
+++ b/awstats/bureau/admin/aws_useradd.php
@@ -25,17 +25,23 @@
 require_once("../class/config.php");
 
 $fields = array (
-	"prefixe" => array ("request", "string", ""),
-	"login"   => array ("request", "string", ""),
-	"pass"    => array ("request", "string", ""),
+	"prefixe"  => array ("request", "string", ""),
+	"login"    => array ("request", "string", ""),
+	"pass"     => array ("request", "string", ""),
+	"passconf" => array ("request", "string", "")
 );
 getFields($fields);
 
-$r=$aws->add_login($prefixe.(($login)?"_":"").$login,$pass);
-if (!$r) {
-	$error=$err->errstr();
-} else {
-	$error=_("The Awstat account has been successfully created");
+if ($pass != $passconf) {
+        $error = _("Passwords do not match");
+}else{
+	$r=$aws->add_login($prefixe.(($login)?"_":"").$login,$pass);
+
+	if (!$r) {
+		$error=$err->errstr();
+	} else {
+		$error=_("The Awstat account has been successfully created");
+	}
 }
 
 include("aws_users.php");
diff --git a/awstats/bureau/admin/aws_users.php b/awstats/bureau/admin/aws_users.php
index 9c0a9ef5..2684145e 100644
--- a/awstats/bureau/admin/aws_users.php
+++ b/awstats/bureau/admin/aws_users.php
@@ -48,6 +48,7 @@ if (!$r=$aws->list_login()) {
 	<select class="inl" name="prefixe"><?php $aws->select_prefix_list($prefixe); ?></select>&nbsp;<b>_</b>&nbsp;<input type="text" class="int" name="login" id="login" value="" size="20" maxlength="64" />
 </td></tr>
 <tr><th><label for="pass"><?php __("Password"); ?></label></th><td><input type="password" class="int" name="pass" id="pass" value="" size="20" maxlength="64" /></td></tr>
+<tr><th><label for="passconf"><?php __("Confirm password"); ?></label></th><td><input type="password" class="int" name="passconf" id="passconf" value="" size="20" maxlength="64" /></td></tr>
 <tr class="trbtn"><td colspan="2">
   <input type="submit" class="inb" name="submit" value="<?php __("Create this new awstat account"); ?>" />
   <input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='aws_list.php'"/>