diff -Naur raduser-2.11-downloaded/admin/functions.php raduser/admin/functions.php --- raduser-2.11-downloaded/admin/functions.php 2005-01-29 16:53:40.573204864 +0600 +++ raduser/admin/functions.php 2005-01-29 15:52:58.291386000 +0600 @@ -57,9 +57,17 @@ */ function show_user_list() { - $query = "SELECT * FROM users limit $this->strt,$this->lim"; + global $db_type; + if($db_type == 'mysql') + { + $query = "SELECT * FROM users LIMIT $this->strt,$this->lim"; + } + else + { + $query = "SELECT * FROM users LIMIT $this->strt OFFSET $this->lim"; + } $result = db_query($query); - echo mysql_error(); + db_error_log(); $count = db_num_rows($result); diff -Naur raduser-2.11-downloaded/admin/newuser.php raduser/admin/newuser.php --- raduser-2.11-downloaded/admin/newuser.php 2005-01-29 16:54:17.971519456 +0600 +++ raduser/admin/newuser.php 2005-01-29 15:52:58.291386000 +0600 @@ -75,20 +75,20 @@ db_query($query,$con); - - if(mysql_errno() == 0) + $err = db_error_log() + if($err == '') { - $userid = mysql_insert_id(); + $userid = db_insert_id('users_userid_seq'); $email = sanitize_variable($_REQUEST['email']); $query = "INSERT INTO userProfile(userEmail, userId) VALUES('$email', $userid)"; db_query($query); + $err = db_error_log(); - - if(mysql_errno() == 0) + if($err == '') { err_message('Account created.'); require("signup.txt"); @@ -102,7 +102,6 @@ } else { - echo mysql_error(); err_message('The username you chose is already in use'); require("signup.txt"); } diff -Naur raduser-2.11-downloaded/admin/profile.php raduser/admin/profile.php --- raduser-2.11-downloaded/admin/profile.php 2004-12-10 12:45:27.000000000 +0600 +++ raduser/admin/profile.php 2005-01-29 15:52:58.291386000 +0600 @@ -61,7 +61,7 @@ } else { - if(change_password($userId,$password) != 0) + if(change_password($userId,$password) != '') { err_message('Sorry the password could not be changed'); } @@ -74,7 +74,7 @@ else if($action=='chgnews') { $news = sanitize_variable($_REQUEST['news']); - if(change_newsletter($userId,$news) != 0) + if(change_newsletter($userId,$news) != '') { err_message('Sorry could not update your newsletter subscription'); } @@ -105,7 +105,7 @@ $profile->homeTel = sanitize_variable($_REQUEST['hometel']); $profile->web = sanitize_variable($_REQUEST['web']); - if(change_profile($profile) != 0) + if(change_profile($profile) != '') { err_message('Sorry could not update your profile'); } diff -Naur raduser-2.11-downloaded/admin/useradmin.php raduser/admin/useradmin.php --- raduser-2.11-downloaded/admin/useradmin.php 2005-01-29 16:52:05.135713568 +0600 +++ raduser/admin/useradmin.php 2005-01-29 15:52:58.291386000 +0600 @@ -49,7 +49,7 @@ $query = "DELETE FROM users where userId in ($ids)"; db_query($query); - error_log(mysql_error()); + db_error_log(); $query = "DELETE FROM userProfile where userId in ($ids)"; db_query($query); diff -Naur raduser-2.11-downloaded/inc/config.php raduser/inc/config.php --- raduser-2.11-downloaded/inc/config.php 2005-01-29 16:52:55.429067816 +0600 +++ raduser/inc/config.php 2005-01-29 15:52:58.291386000 +0600 @@ -59,7 +59,8 @@ /** * the url to the home page of your website. */ -$site_url = "http://radinks.net/"; +$site_url = "http://{$_SERVER['SERVER_NAME']}/"; +error_log($site_url); /** * The following email address will be used in the from field for diff -Naur raduser-2.11-downloaded/members/common.php raduser/members/common.php --- raduser-2.11-downloaded/members/common.php 2005-01-29 16:54:17.973519152 +0600 +++ raduser/members/common.php 2005-01-29 15:52:58.291386000 +0600 @@ -58,12 +58,12 @@ if($db_type == 'mysql') { - $res = mysql_query($query); + $res = @mysql_query($query); } else { - $res = pg_query($query); + $res = @pg_query($query); if(pg_last_error() != '') { error_log(pg_last_error()); @@ -114,7 +114,44 @@ return pg_fetch_assoc($res); } } + +function db_error_log() +{ + global $db_type; + + if($db_type == 'mysql' && mysql_errno() != 0) + { + $errMessage = mysql_error(); + error_log($errMessage); + return $errMessage; + } + else + { + $errMessage = pg_last_error(); + error_log($errMessage); + return $errMessage; + } +} + +function db_insert_id($sequence) +{ + global $db_type; + if($db_type == 'mysql') + { + return mysql_insert_id(); + } + else + { + $result = pg_query("SELECT currval('$sequence')"); + if($result) + { + $row = pg_fetch_row($result); + return $row[0]; + } + } +} + /** * shows a formatted error message */ @@ -163,7 +200,7 @@ $result = db_query($query,$con); - if(mysql_errno() != 0) + if(db_error_log() != '') { /* * it could be that you are already logged in @@ -240,14 +277,12 @@ $query = "UPDATE loggedUsers set lastAccess=now() where userId = $row[0]"; db_query($query); - echo mysql_error(); + db_error_log(); } - error_log('is_logged : return - ' . $row[0]); return $row[0]; } else { - error_log('is_logged : return - 0'); return 0; } } @@ -343,7 +378,7 @@ $result = db_query($query); - if(mysql_errno() == 0) + if(db_error_log == 0) { if($result) { @@ -429,7 +464,6 @@ */ function change_profile($profile) { - global $con; $query = sprintf("UPDATE userProfile SET userFirstName='%s', userLastName='%s', userAddr1 = '%s', userAddr2 = '%s', userEmail = '%s', userTel = '%s', userFax = '%s', @@ -445,9 +479,8 @@ $profile->state,$profile->city,$profile->id); $result = db_query($query); - - - return mysql_errno(); + + return db_error_log(); } /** @@ -465,7 +498,7 @@ $query = "UPDATE userProfile set userNewsLetter=$val where userId=$userId"; db_query($query); - return mysql_errno(); + return db_error_log(); } /** @@ -486,7 +519,7 @@ } $result = db_query($query); - return mysql_errno(); + return db_error_log(); } /** @@ -498,6 +531,7 @@ $pass = sanitize_variable($_REQUEST['password']); $pass1 = sanitize_variable($_REQUEST['password1']); $user = sanitize_variable($_REQUEST['username']); + return (isset($pass) && $pass != '' && isset($pass1) && $pass1 != '' && isset($user) && $user != ''); @@ -561,8 +595,8 @@ userName = '$user' and userPassword = md5('$password') and userStatus > 0"; } $result = db_query($query); - error_log(mysql_error()); - + db_error_log(); + if($result && db_num_rows($result) ==1) { @@ -674,11 +708,10 @@ db_query($insert_stmt); - $err = mysql_error(); + $err = db_error_log(); - if ($err != 0) + if ($err != '') { - error_log( mysql_error()); db_query($update_stmt); } } diff -Naur raduser-2.11-downloaded/members/login.php raduser/members/login.php --- raduser-2.11-downloaded/members/login.php 2004-12-10 12:45:27.000000000 +0600 +++ raduser/members/login.php 2005-01-29 15:52:58.291386000 +0600 @@ -59,7 +59,7 @@ } else { - //echo mysql_error(); + require_once("../inc/header.php"); create_header(); diff -Naur raduser-2.11-downloaded/members/logout.php raduser/members/logout.php --- raduser-2.11-downloaded/members/logout.php 2005-01-29 16:52:05.141712656 +0600 +++ raduser/members/logout.php 2005-01-29 15:52:58.291386000 +0600 @@ -34,7 +34,7 @@ $sid = session_id(); $query = "DELETE from loggedUsers where sessionId = '$sid'"; db_query($query); - echo mysql_error(); + db_error_log(); } if(is_logged()) diff -Naur raduser-2.11-downloaded/members/profile.php raduser/members/profile.php --- raduser-2.11-downloaded/members/profile.php 2004-12-10 12:45:27.000000000 +0600 +++ raduser/members/profile.php 2005-01-29 15:52:58.291386000 +0600 @@ -43,7 +43,7 @@ } else { - if(change_password($userId,$password) != 0) + if(change_password($userId,$password) != '') { err_message('Sorry the password could not be changed'); @@ -57,7 +57,7 @@ else if($_REQUEST['submit'] =='update') { $news = sanitize_variable($_REQUEST['news']); - if(change_newsletter($userId,$news) != 0) + if(change_newsletter($userId,$news) != '') { err_message('Sorry could not update your newsletter subscription'); } @@ -80,7 +80,7 @@ $profile->web = sanitize_variable($_REQUEST['web']); $profile->fax = sanitize_variable($_REQUEST['fax']); - if(change_profile($profile) != 0) + if(change_profile($profile) != '') { err_message('Sorry could not update your profile'); } diff -Naur raduser-2.11-downloaded/members/reminder.php raduser/members/reminder.php --- raduser-2.11-downloaded/members/reminder.php 2005-01-29 16:52:55.431067512 +0600 +++ raduser/members/reminder.php 2005-01-29 15:52:58.291386000 +0600 @@ -38,7 +38,7 @@ $query = "update users set userPassword = md5('$newPass') where username='$userName'"; } $result = db_query($query); - return mysql_errno(); + return db_error_log(); } function gen_password() @@ -82,7 +82,7 @@ { $pwd = gen_password(); - if(reset_password($pwd,$username) != 0) + if(reset_password($pwd,$username) != '') { err_message('Your password could not be reset'); } diff -Naur raduser-2.11-downloaded/members/signup.php raduser/members/signup.php --- raduser-2.11-downloaded/members/signup.php 2005-01-29 16:54:17.974519000 +0600 +++ raduser/members/signup.php 2005-01-29 15:52:58.291386000 +0600 @@ -90,15 +90,16 @@ } - db_query($query,$con); + db_query($query); - if(mysql_errno() == 0) - { + if(db_error_log() == '') + { + error_log('set profile'); $uniqueId = md5(uniqid($username)); $email = sanitize_variable($_REQUEST['email']); $firstname = sanitize_variable($_REQUEST['firstname']); $lastname = sanitize_variable($_REQUEST['lastname']); - $userid = mysql_insert_id(); + $userid = db_insert_id('users_userid_seq'); $ip = sanitize_variable($_SERVER['REMOTE_ADDR']); /* * create the profile @@ -107,12 +108,12 @@ userProfile(userId,userFirstName,userLastName, userEmail,userValidationKey,userIP,userSignUp) VALUES($userid,'$firstname','$lastname','$email', - '$uniqueId','$ip',now()"; + '$uniqueId','$ip',now())"; db_query($query,$con); - //echo mysql_error(); - - if(mysql_errno() == 0) + $err = db_error_log(); + + if($err != '') { require("thanks.txt"); $f = join("",file("welcome-email.txt")); @@ -135,14 +136,12 @@ } else { - //echo mysql_error(); err_message('The username you chose is already in use'); require("signup.txt"); } } else { - //echo mysql_error(); err_message('The username you chose is already in use'); require("signup.txt"); } diff -Naur raduser-2.11-downloaded/members/validate.php raduser/members/validate.php --- raduser-2.11-downloaded/members/validate.php 2005-01-29 16:53:40.575204560 +0600 +++ raduser/members/validate.php 2005-01-29 15:52:58.291386000 +0600 @@ -64,7 +64,7 @@ $query = "update userProfile set userValidated=1 where userId = $userId"; $result = db_query($query,$con); - return (mysql_errno() == 0); + return (db_error_log() != ''); } /** @@ -75,7 +75,7 @@ { $query = "update users set userStatus=1 where userId = $userId"; $result = db_query($query,$con); - return (mysql_errno() == 0); + return (db_error_log() != ''); } if(!isset($_REQUEST['key']))