Update of /cvsroot/phpsqliteadmin/phpsqliteadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13694 Modified Files: check_login.php dbaction.php include.php login.php mainframe.php set_session.php todo.txt Removed Files: phpsla.sqlite Log Message: removed phpsla.sqlite from / Index: login.php =================================================================== RCS file: /cvsroot/phpsqliteadmin/phpsqliteadmin/login.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- login.php 23 May 2004 13:33:16 -0000 1.3 +++ login.php 14 Nov 2004 15:08:31 -0000 1.4 @@ -3,7 +3,7 @@ include_once("login.class.php"); $obj =& new login($_POST['user'], $_POST['pass']); -$obj->SPSQLite("phpsla.sqlite"); +$obj->SPSQLite("db/phpsla.sqlite"); if ((isset($_GET['logoff'])) && ($_GET['logoff'] == '1')) { $obj->logOff(); @@ -45,8 +45,9 @@ if ($obj->isEmpty()) { echo "</td></tr>"; - echo "<tr><td>Realname:</td><td><input type=\"text\" name=\"realname\"></td></tr>\n"; - echo "<tr><td>Email:</td><td><input type=\"text\" name=\"email\">\n"; +// echo "<tr><th>Password (confirm):</td><td><input type=\"password\" name=\"realname\" size=\"24\" maxlength=\"24\"></td></tr>\n"; + echo "<tr><th>Realname:</td><td><input type=\"text\" name=\"realname\" size=\"24\" maxlength=\"24\"></td></tr>\n"; + echo "<tr><th>Email:</td><td><input type=\"text\" name=\"email\" size=\"24\" maxlength=\"24\">\n"; echo "<input type=\"hidden\" name=\"empty\">\n"; } else { echo "<input type=\"hidden\" name=\"notempty\">\n"; Index: todo.txt =================================================================== RCS file: /cvsroot/phpsqliteadmin/phpsqliteadmin/todo.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- todo.txt 23 May 2004 13:32:32 -0000 1.5 +++ todo.txt 14 Nov 2004 15:08:31 -0000 1.6 @@ -26,3 +26,20 @@ - add multi-language support - add ui to manager user accounts + + + + +THERE IS A BUG: + +when you change the path to the file in an alias, the cookie gets not updated, and you still point to the +old database file!!! +Changing to another alias and coming back helps. + + +Notes about Steves branch: +------------------------------------------------------------------------------------------------ + +dbaction.php: this should go away: +$object = $_GET['object']; +$action = $_GET['action']; Index: check_login.php =================================================================== RCS file: /cvsroot/phpsqliteadmin/phpsqliteadmin/check_login.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- check_login.php 27 Jun 2004 21:34:36 -0000 1.2 +++ check_login.php 14 Nov 2004 15:08:31 -0000 1.3 @@ -3,7 +3,7 @@ require_once("login.class.php"); $obj =& new login($_SESSION['user'], $_SESSION['pass']); -$obj->SPSQLite("phpsla.sqlite"); +$obj->SPSQLite("db/phpsla.sqlite"); if (!$obj->isLogged()) { header("Location: login.php"); --- phpsla.sqlite DELETED --- Index: dbaction.php =================================================================== RCS file: /cvsroot/phpsqliteadmin/phpsqliteadmin/dbaction.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- dbaction.php 27 Jun 2004 21:34:36 -0000 1.3 +++ dbaction.php 14 Nov 2004 15:08:31 -0000 1.4 @@ -68,7 +68,7 @@ if ($action == 'drop') { // system db may not be dropped - if ($current_db == 'phpsla.sqlite') { + if ($current_db == 'db/phpsla.sqlite') { header("Location: index.php"); exit; } @@ -84,7 +84,7 @@ $sysdbh->query("delete from databases where user = {$alias->user} and alias = '{$alias->alias}'"); unset($userdbh); unlink($current_db); - $_SESSION['phpSQLiteAdmin_currentdb'] = "phpsla.sqlite"; + $_SESSION['phpSQLiteAdmin_currentdb'] = 'db/phpsla.sqlite'; header("Location: index.php"); exit; } Index: set_session.php =================================================================== RCS file: /cvsroot/phpsqliteadmin/phpsqliteadmin/set_session.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- set_session.php 11 May 2004 18:23:19 -0000 1.1.1.1 +++ set_session.php 14 Nov 2004 15:08:31 -0000 1.2 @@ -5,7 +5,7 @@ if (isset($_POST['sessionname'])) { $_SESSION['phpSQLiteAdmin_currentdb'] = $_POST['sessionvalue']; } else { - $_SESSION['phpSQLiteAdmin_currentdb'] = "phpsla.slqite"; + $_SESSION['phpSQLiteAdmin_currentdb'] = "db/phpsla.slqite"; } header("Location: index.php"); Index: include.php =================================================================== RCS file: /cvsroot/phpsqliteadmin/phpsqliteadmin/include.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- include.php 27 Jun 2004 21:34:36 -0000 1.2 +++ include.php 14 Nov 2004 15:08:31 -0000 1.3 @@ -7,7 +7,7 @@ if($_SESSION['phpSQLiteAdmin_currentdb'] == '') { - $_SESSION['phpSQLiteAdmin_currentdb'] = 'phpsla.sqlite'; + $_SESSION['phpSQLiteAdmin_currentdb'] = 'db/phpsla.sqlite'; } elseif(isset($_POST['sessionname'])) { $_SESSION['phpSQLiteAdmin_currentdb'] = $_POST['sessionvalue']; } @@ -26,8 +26,8 @@ // connect to the system database -if (!is_writable('phpsla.sqlite')) die("<br />System database 'phpsla.sqlite' is not writeable by webserver account."); -$sysdbh =& new SPSQLite('phpsla.sqlite'); +if (!is_writable('db/phpsla.sqlite')) die("<br />System database 'phpsla.sqlite' is not writeable by webserver account."); +$sysdbh =& new SPSQLite('db/phpsla.sqlite'); $current_db = $_SESSION['phpSQLiteAdmin_currentdb']; $current_user = 1; Index: mainframe.php =================================================================== RCS file: /cvsroot/phpsqliteadmin/phpsqliteadmin/mainframe.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mainframe.php 27 Jun 2004 21:34:36 -0000 1.2 +++ mainframe.php 14 Nov 2004 15:08:31 -0000 1.3 @@ -109,7 +109,7 @@ <li><a href="dbaction.php?action=vacuum" target="_top" onclick="return confirm_vacuum_db();">Vacuum Database</a></li> EOT; -if ($current_db != 'phpsla.sqlite') print "<li><a href=\"dbaction.php?action=drop\" target=\"_top\" onclick=\"return confirm_drop_db();\">Drop Database</a></li>\n"; +if ($current_db != 'db/phpsla.sqlite') print "<li><a href=\"dbaction.php?action=drop\" target=\"_top\" onclick=\"return confirm_drop_db();\">Drop Database</a></li>\n"; print "</ul>\n"; |