Changeset 1047

Timestamp:

09/09/04 00:01:32 (4 years ago)

Author:

anonymous

Message:

- correction du password 32 -> 38 caract�res (MD5 arrgg !)
- correction du conf template : allow only authenticated web users
- misc corrections web

Files:

• trunk/alternc-awstats.conf (added)
• trunk/awstats.sql (modified) (1 diff)
• trunk/awstats.template.conf (modified) (1 diff)
• trunk/bureau/admin/aws_pass.php (modified) (1 diff)
• trunk/bureau/admin/aws_users.php (modified) (1 diff)
• trunk/bureau/class/m_aws.php (modified) (12 diffs)
• trunk/debian/dirs (modified) (2 diffs)
• trunk/debian/postinst (modified) (2 diffs)
• trunk/debian/postrm (modified) (1 diff)
• trunk/debian/rules (modified) (1 diff)

trunk/awstats.sql

@@ -12 +12 @@
-  `uid` int(10) unsigned NOT NULL,
-  `login` varchar(128) NOT NULL,
-2
+8
-  PRIMARY KEY (`login`),
-  INDEX (`uid`)

trunk/awstats.template.conf

@@ -170 +170 @@
-# Default: 0
-#
-0
+1
-
-# This parameter give the list of all authorized authenticated users to view

trunk/bureau/admin/aws_pass.php

@@ -60 +60 @@
-<tr><th>
-<?php __("Username"); ?></th><td>
-
+ <input type="hidden" name="login" value="<?php echo $login; ?>" />
-</td></tr>
-<tr><th><label for="pass"><?php __("New Password"); ?></label></th><td><input type="text" class="int" name="pass" id="pass" value="<?php echo $pass; ?>" size="20" maxlength="64" /></td></tr>

trunk/bureau/admin/aws_users.php

@@ -48 +48 @@
-        <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="<?php echo $login; ?>" size="20" maxlength="64" />
-</td></tr>
-<?php echo $pass; ?>
+
-<tr><td colspan="2"><input type="submit" class="inb" name="submit" value="<?php __("Create this new awstat account."); ?>" /></td></tr>
-</table>

trunk/bureau/class/m_aws.php

@@ -42 +42 @@
-   */
-  var $CONFDIR="/etc/awstats";
-
+
-  var $CACHEDIR="/var/cache/awstats";
-
@@ -228 +228 @@
-      }
-      $this->_createconf($c["hostname"]);
+      $this->_createhtpasswd();
-      return true;
-    } else return false;
@@ -280 +281 @@
-      }
-      $this->_createconf($hostname);
+      $this->_createhtpasswd();
-      mkdir($CACHEDIR."/".$hostname,0777);
-      return true;
@@ -341 +343 @@
-    }
-    $db->query("DELETE FROM aws_users WHERE uid='$cuid' AND login='$login';");
+    $this->_createhtpasswd();
-    return true;
-  }
@@ -357 +360 @@
-      return false;
-    }
-_md5cr
+crypt
-    $db->query("INSERT INTO aws_users (uid,login,pass) VALUES ('$cuid','$login','$pass');");
+    $this->_createhtpasswd();
-    return true;
-  }
@@ -377 +381 @@
-    $pass=_md5cr($pass);
-    $db->query("UPDATE aws_users SET pass='$pass' WHERE login='$login';");
+    $this->_createhtpasswd();
-    return true;
-  }
@@ -404 +409 @@
-    }
-    $db->query("INSERT INTO aws_access (uid,id,login) VALUES ('$cuid','$id','$login');");
-
+
+
+
+
-    return true;
-  }
@@ -418 +426 @@
-    }
-    $db->query("DELETE FROM aws_access WHERE id='$id';");
-
+
+
+
+
-    return true;
-  }
@@ -445 +456 @@
-    }
-    $db->query("DELETE FROM aws_access WHERE id='$id' AND login='$login';");
-
+
+
+
+
-    return true;
-  }
@@ -462 +476 @@
-      $this->_delconf($i);
-    }
+    $this->_createhtpasswd();
-    $db->query("DELETE FROM aws_access WHERE uid='$cuid'");
-    $db->query("DELETE FROM aws_users WHERE uid='$cuid';");
@@ -490 +505 @@
-      $this->_delconf($i[0]);
-    }
+    $this->_createhtpasswd();
-    return true;
-  }
@@ -574 +590 @@
-  }
-
+  function _createhtpasswd() {
+    global $db;
+    $f=fopen($this->HTAFILE,"wb");
+    if ($f) {
+      $db->query("SELECT login,pass FROM aws_users;");
+      while ($db->next_record()) {
+        fputs($f,$db->f("login").":".$db->f("pass")."\n");
+      }
+      fclose($f);
+    }
+  }
+
-} /* CLASSE m_aws */
-

trunk/debian/dirs

@@ +1 @@
+etc/apache
-etc/alternc
-var/cache/awstats
@@ -10 +11 @@
-usr/share/doc/alternc-awstats
-usr/share/lintian/overrides
-
+other/
-etc/awstats

trunk/debian/postinst

@@ -13 +13 @@
-        sed -e "s/\*\*\*ALTERNC_ALIASES\*\*\*/&\\
-            # ***AWSTATS*** \\
-Alias \/awstats-icons\/ \/usr\/share\/awstats\/icons\/ 
+Include \"\/etc\/apache\/alternc-awstats.conf\"/
-        mv -f $1.alternc_awstats $1
-    fi
@@ -42 +42 @@
-    echo "Configuring apache"
-    configure /etc/apache/httpd.conf
+    configure /usr/share/alternc/1.0/install/etc/apache-ssl/httpd.conf
-    echo "Configuring apache-ssl"
-    configure /etc/apache-ssl/httpd.conf
+    configure /usr/share/alternc/1.0/install/etc/apache/httpd.conf
-    /usr/share/alternc/install/dopo.sh || true
-    /etc/init.d/apache reload || true
+    ln /usr/lib/cgi-bin/awstats.pl /var/alternc/cgi-bin/ -sf 
-
-    # that's not very nice, but we need it
-    chown www-data /etc/awstats
+    touch /etc/alternc/awstats.htpasswd
+    chown 33 /etc/alternc/awstats.htpasswd
+    chmod 777 /etc/alternc/awstats.htpasswd
-
-    # Finally, add this module to the AlternC's menu : 

trunk/debian/postrm

@@ -10 +10 @@
-        # 1. on déplace le fichier
-        rm -f $1.alternc_awstats
-     
+
-        mv -f $1.alternc_awstats $1 
-    fi

trunk/debian/rules

@@ -57 +57 @@
-        find debian/alternc-awstats/ -depth -name CVS -type d -exec rm -rf {} \;
-
-
+
+
-        install -m 0755 -g www-data -o www-data alternc-awstats debian/alternc-awstats/usr/lib/alternc/
-        install -m 0755 -g www-data -o www-data awstats.cache.php debian/alternc-awstats/usr/lib/alternc/