cvs: docweb /include cvs-auth.inc lib_auth.inc.php /sql users.sql

nlopess		Fri Jul 29 14:43:48 2005 EDT

  Modified files:              
    /docweb/include	cvs-auth.inc lib_auth.inc.php 
    /docweb/sql	users.sql 
  Log:
  add a user_info() function for the future /user/xx info and for RFC
  
http://cvs.php.net/diff.php/docweb/include/cvs-auth.inc?r1=1.6&r2=1.7&ty=u
Index: docweb/include/cvs-auth.inc
diff -u docweb/include/cvs-auth.inc:1.6 docweb/include/cvs-auth.inc:1.7
--- docweb/include/cvs-auth.inc:1.6	Thu Jul 28 14:05:10 2005
+++ docweb/include/cvs-auth.inc	Fri Jul 29 14:43:47 2005
@@ -18,7 +18,7 @@
  * |          Jacques Marneweck <[email protected]>                         |
  * +----------------------------------------------------------------------+
  *
- * $Id: cvs-auth.inc,v 1.6 2005/07/28 18:05:10 nlopess Exp $
+ * $Id: cvs-auth.inc,v 1.7 2005/07/29 18:43:47 nlopess Exp $
  */
 
 require_once(dirname(__FILE__) . '/../build-ops.php');
@@ -95,6 +95,7 @@
 }
 
 function verify_password($user, $pass) {
+	global $idx;
 
 	/**
 	 * You cannot auth as our [email protected] pseudo user
@@ -103,10 +104,6 @@
 		return false;
 	}
 
-	if (!$idx = sqlite_open(SQLITE_DIR . 'users.sqlite')) {
-		die ('DB not available');
-	}
-
 	if (auth_vs_local($idx, $user, $pass)) {
 		return true;
 	}
@@ -114,8 +111,6 @@
 	if (auth_vs_cvs($user, $pass)) {
 
 		sqlite_query($idx, "REPLACE INTO auth VALUES ('" . sqlite_escape_string($user) . "', '" . sha1($pass) . "', '" . time() . "')");
-		sqlite_close($idx);
-
 		return true;
 	}
 
http://cvs.php.net/diff.php/docweb/include/lib_auth.inc.php?r1=1.5&r2=1.6&ty=u
Index: docweb/include/lib_auth.inc.php
diff -u docweb/include/lib_auth.inc.php:1.5 docweb/include/lib_auth.inc.php:1.6
--- docweb/include/lib_auth.inc.php:1.5	Fri Jul 29 07:24:46 2005
+++ docweb/include/lib_auth.inc.php	Fri Jul 29 14:43:47 2005
@@ -14,13 +14,18 @@
  * | [email protected] so we can mail you a copy immediately.               |
  * +----------------------------------------------------------------------+
  * | Authors: Jacques Marneweck <[email protected]>                         |
+ * |          Nuno Lopes <[email protected]>                                |
  * +----------------------------------------------------------------------+
  *
- * $Id: lib_auth.inc.php,v 1.5 2005/07/29 11:24:46 vincent Exp $
+ * $Id: lib_auth.inc.php,v 1.6 2005/07/29 18:43:47 nlopess Exp $
  */
 
 require_once 'cvs-auth.inc';
 
+if (!$idx = sqlite_open(SQLITE_DIR . 'users.sqlite')) {
+ 	die ('auth DB not available');
+}
+
 //list of docweb admins that have 'special' rights
 $admins = array(
 	'didou',
@@ -32,8 +37,6 @@
 	'vincent',
 );
 
-$user = $pw = false;
-
 
 /**
  * read the magic cookie and return array(user, pass)
@@ -89,4 +92,20 @@
 	return in_array($user, $GLOBALS['admins']);
 }
 
-/* vim: set noet ts=4 sw=4 ft=php: : */
+
+/**
+ * read user info from the DB
+ */
+function user_info()
+{
+	global $idx;
+
+	list($user) = read_magic_cookie();
+
+	$result = @sqlite_unbuffered_query($idx, "SELECT * FROM users WHERE username='" . sqlite_escape_string($user) . "'");
+	if (!$result) {
+		return false;
+	}
+
+	return sqlite_fetch_array($result, SQLITE_ASSOC);
+}
http://cvs.php.net/diff.php/docweb/sql/users.sql?r1=1.1&r2=1.2&ty=u
Index: docweb/sql/users.sql
diff -u docweb/sql/users.sql:1.1 docweb/sql/users.sql:1.2
--- docweb/sql/users.sql:1.1	Fri Feb 18 13:07:49 2005
+++ docweb/sql/users.sql	Fri Jul 29 14:43:48 2005
@@ -3,3 +3,11 @@
   password TEXT,
   time INT
 );
+
+CREATE TABLE users (
+  username TEXT PRIMARY KEY,
+  name TEXT,
+  country TEXT,
+  site TEXT,
+  whishlist TEXT
+);