From 1e77a6539b5df73e362c36c11df1b0e3696c1647 Mon Sep 17 00:00:00 2001 From: "Matteo Nastasi (mop)" Date: Wed, 2 Feb 2011 08:21:54 +0100 Subject: [PATCH] users importer from file to database --- TODO.txt | 7 +- .../{005-anagr.sql => 005-anagr.sql.noinsert} | 0 web/Obj/brisk.phh | 1 - web/Obj/dbase_base.phh | 7 + web/Obj/dbase_file.phh | 85 +++++------ web/Obj/dbase_pgsql.phh | 139 ++++++++++++------ web/admin.php | 73 +++++++++ 7 files changed, 222 insertions(+), 90 deletions(-) rename sql/sql.d/{005-anagr.sql => 005-anagr.sql.noinsert} (100%) create mode 100644 web/admin.php diff --git a/TODO.txt b/TODO.txt index 6ec54cc..82cae4b 100644 --- a/TODO.txt +++ b/TODO.txt @@ -6,8 +6,11 @@ ====== DB: - initial usage DONE - configurabilità file o db - - travasatore file to pg - - sistema di inserimento nuovi utenti + DONE - travasatore file to pg + - travaso punteggi e gestione punteggi + - tab punteggi nel db + + - sistema di inserimento nuovi utenti (riversatore da form di inserimento) - modifica password - ripristino password diff --git a/sql/sql.d/005-anagr.sql b/sql/sql.d/005-anagr.sql.noinsert similarity index 100% rename from sql/sql.d/005-anagr.sql rename to sql/sql.d/005-anagr.sql.noinsert diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 64ed2b3..f9f54f0 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -277,7 +277,6 @@ Copyright 2006-2009 Matteo Nasta
version '.$G_brisk_version.'

Copyright 2006-2009
Matteo Nastasi (aka mop)

'); - $escinp_from = array( "\"" ); $escinp_to = array( """ ); diff --git a/web/Obj/dbase_base.phh b/web/Obj/dbase_base.phh index 2db3934..097e677 100644 --- a/web/Obj/dbase_base.phh +++ b/web/Obj/dbase_base.phh @@ -74,4 +74,11 @@ class LoginDBItem { } +class LoginDBItemOld extends LoginDBItem { + function LoginDBItemOld($login, $pass, $email, $type) + { + parent::LoginDBItem(-1, $login, $pass, $email, $type); + } +} + ?> \ No newline at end of file diff --git a/web/Obj/dbase_file.phh b/web/Obj/dbase_file.phh index 2245efd..2cf1a33 100644 --- a/web/Obj/dbase_file.phh +++ b/web/Obj/dbase_file.phh @@ -123,52 +123,53 @@ class LoginDB { } function &login_verify($login, $pass) - { - GLOBAL $G_false; - - $ret = &$G_false; - - log_main("login_verify: ".$login); + { + GLOBAL $G_false; - /* check the existence of the nick in the LoginDB */ - for ($i = 0 ; $i < $this->item_n ; $i++) { - log_main("login_verify: LOOP"); - if (strcasecmp($this->item[$i]->login, $login) == 0) { - log_main("login[".$i."]: ".$this->item[$i]->login); - - /* if it exists check for a valid challenge */ - if (($a_sem = Challenges::lock_data()) != FALSE) { - - if (($chals = &Challenges::load_data()) != FALSE) { - for ($e = 0 ; $e < $chals->item_n ; $e++) { - - log_main("challenge[".$i."]: ".$chals->item[$e]->login); - if (strcmp($login, $chals->item[$e]->login) == 0) { - log_main("login_verify [".$pass."] with [".md5($chals->item[$e]->token.$this->item[$i]->pass)."]"); - - if (strcmp($pass , md5($chals->item[$e]->token.$this->item[$i]->pass)) == 0) { - log_main("login_verify SUCCESS for ".$login); - - $chals->rem($login); - $ret = &$this->item[$i]; - break; - } + $ret = &$G_false; + + log_main("login_verify: ".$login); + + /* check the existence of the nick in the LoginDB */ + for ($i = 0 ; $i < $this->item_n ; $i++) { + log_main("login_verify: LOOP"); + if (strcasecmp($this->item[$i]->login, $login) == 0) { + log_main("login[".$i."]: ".$this->item[$i]->login); + + /* if it exists check for a valid challenge */ + if (($a_sem = Challenges::lock_data()) != FALSE) { + + if (($chals = &Challenges::load_data()) != FALSE) { + for ($e = 0 ; $e < $chals->item_n ; $e++) { + + log_main("challenge[".$i."]: ".$chals->item[$e]->login); + if (strcmp($login, $chals->item[$e]->login) == 0) { + log_main("login_verify [".$pass."] with [".md5($chals->item[$e]->token.$this->item[$i]->pass)."]"); + + if (strcmp($pass , md5($chals->item[$e]->token.$this->item[$i]->pass)) == 0) { + log_main("login_verify SUCCESS for ".$login); + + $chals->rem($login); + $ret = &$this->item[$i]; + break; } - } // end for ($e = 0 ... - } - - if ($chals->ismod()) { - Challenges::save_data(&$chals); - } - - Challenges::unlock_data($a_sem); + } + } // end for ($e = 0 ... } - break; - } // if (strcasecmp($this->item[$i]->login, ... - } - - return ($ret); + + if ($chals->ismod()) { + Challenges::save_data(&$chals); + } + + Challenges::unlock_data($a_sem); + } + break; + } // if (strcasecmp($this->item[$i]->login, ... } + + return ($ret); + } + } // End class LoginDB ?> \ No newline at end of file diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh index 510987f..ff314b1 100644 --- a/web/Obj/dbase_pgsql.phh +++ b/web/Obj/dbase_pgsql.phh @@ -25,13 +25,12 @@ require_once("Obj/dbase_base.phh"); $escsql_from = array( "\\", "'" ); -$escsql_to = array( "\\\\", "\\'" ); - +$escsql_to = array( "\\\\", "\\'" ); function escsql($s) { GLOBAL $escsql_from, $escsql_to; - + return str_replace($escsql_from, $escsql_to, $s); } @@ -185,8 +184,58 @@ class LoginDB return ($ret->email); } + + function addusers_from_olddb($olddb, &$cont) + { + GLOBAL $G_dbpfx; + + for ($i = 0 ; $i < $olddb->count() ; $i++) { + $user_sql = sprintf("INSERT INTO %susers ( login, pass, email, type) VALUES ('%s', '%s', '%s', %d);", + $G_dbpfx, escsql($olddb->item[$i]->login), escsql($olddb->item[$i]->pass), + escsql($olddb->item[$i]->email), $olddb->item[$i]->type & USER_FLAG_TY_ALL); + + // if ( ! (($user_pg = pg_exec($dbconn,$order_add_sql)) != FALSE && pg_affected_rows($order_pg) == 1) ) { + + if ( ! (($user_pg = pg_query($this->dbconn->db(), $user_sql)) != FALSE && pg_affected_rows($user_pg) == 1) ) { + $cont .= sprintf("ERROR IN LINE: %s\n", eschtml($user_sql)); + + return FALSE; + } + } + return TRUE; + } } // End class LoginDB +class LoginDBOld +{ + var $item; + var $item_n; + + function LoginDBOld($filename) + { + GLOBAL $DOCUMENT_ROOT; + log_main("LoginDBOld create:start"); + + if (file_exists("$DOCUMENT_ROOT/Etc/".$filename)) { + require("$DOCUMENT_ROOT/Etc/".$filename); + } + else { + return (FALSE); + } + $this->item_n = count($this->item); + log_main("LoginDBOld create:end"); + } + + function count() + { + return ($this->item_n); + } + + + +} + + if (0 == 1) { @@ -255,52 +304,52 @@ class LoginDB } function &login_verify($login, $pass) - { - GLOBAL $G_false; - - $ret = &$G_false; - - log_main("login_verify: ".$login); + { + GLOBAL $G_false; - /* check the existence of the nick in the LoginDB */ - for ($i = 0 ; $i < $this->item_n ; $i++) { - log_main("login_verify: LOOP"); - if (strcasecmp($this->item[$i]->login, $login) == 0) { - log_main("login[".$i."]: ".$this->item[$i]->login); - - /* if it exists check for a valid challenge */ - if (($a_sem = Challenges::lock_data()) != FALSE) { - - if (($chals = &Challenges::load_data()) != FALSE) { - for ($e = 0 ; $e < $chals->item_n ; $e++) { - - log_main("challenge[".$i."]: ".$chals->item[$e]->login); - if (strcmp($login, $chals->item[$e]->login) == 0) { - log_main("login_verify [".$pass."] with [".md5($chals->item[$e]->token.$this->item[$i]->pass)."]"); - - if (strcmp($pass , md5($chals->item[$e]->token.$this->item[$i]->pass)) == 0) { - log_main("login_verify SUCCESS for ".$login); - - $chals->rem($login); - $ret = &$this->item[$i]; - break; - } + $ret = &$G_false; + + log_main("login_verify: ".$login); + + /* check the existence of the nick in the LoginDB */ + for ($i = 0 ; $i < $this->item_n ; $i++) { + log_main("login_verify: LOOP"); + if (strcasecmp($this->item[$i]->login, $login) == 0) { + log_main("login[".$i."]: ".$this->item[$i]->login); + + /* if it exists check for a valid challenge */ + if (($a_sem = Challenges::lock_data()) != FALSE) { + + if (($chals = &Challenges::load_data()) != FALSE) { + for ($e = 0 ; $e < $chals->item_n ; $e++) { + + log_main("challenge[".$i."]: ".$chals->item[$e]->login); + if (strcmp($login, $chals->item[$e]->login) == 0) { + log_main("login_verify [".$pass."] with [".md5($chals->item[$e]->token.$this->item[$i]->pass)."]"); + + if (strcmp($pass , md5($chals->item[$e]->token.$this->item[$i]->pass)) == 0) { + log_main("login_verify SUCCESS for ".$login); + + $chals->rem($login); + $ret = &$this->item[$i]; + break; } - } // end for ($e = 0 ... - } - - if ($chals->ismod()) { - Challenges::save_data(&$chals); - } - - Challenges::unlock_data($a_sem); + } + } // end for ($e = 0 ... } - break; - } // if (strcasecmp($this->item[$i]->login, ... - } - - return ($ret); + + if ($chals->ismod()) { + Challenges::save_data(&$chals); + } + + Challenges::unlock_data($a_sem); + } + break; + } // if (strcasecmp($this->item[$i]->login, ... } + + return ($ret); + } } // if (0 == 1) { diff --git a/web/admin.php b/web/admin.php new file mode 100644 index 0000000..a3857ac --- /dev/null +++ b/web/admin.php @@ -0,0 +1,73 @@ +\n"); + break; + } + $cont .= sprintf("FILENAME: %s
\n", $F_filename); + if (($olddb = new LoginDBOld($F_filename)) == FALSE) { + $cont .= sprintf("Loading failed.
\n"); + break; + } + $newdb = new LoginDB(); + if ($newdb->addusers_from_olddb($olddb, $cont) == FALSE) { + $cont .= sprintf("Insert failed.
\n"); + } + $cont .= sprintf("Item number: %d
\n", $olddb->count()); + } while (0); + } +} + +main(); + +?> + + + +Append users from a file
+
+ + + + + + +
Admin Password:
Filename:
+
+ + \ No newline at end of file -- 2.17.1