diff -Naur raduser-2.11-downloaded/admin/functions.php raduser/admin/functions.php --- raduser-2.11-downloaded/admin/functions.php 2005-01-29 16:52:05.125715088 +0600 +++ raduser/admin/functions.php 2005-01-28 15:22:18.187957000 +0600 @@ -62,7 +62,7 @@ echo mysql_error(); - $count = @mysql_num_rows($result); + $count = db_num_rows($result); if($count == 0) { @@ -73,7 +73,7 @@ for($i=0 ; $i < $count ; $i++) { - $row = mysql_fetch_array($result); + $row = db_fetch_array($result); $url ="userdetails.php?userId=$row[0]&name=". urlencode($row[2]); printf(' diff -Naur raduser-2.11-downloaded/members/common.php raduser/members/common.php --- raduser-2.11-downloaded/members/common.php 2005-01-29 16:52:55.430067664 +0600 +++ raduser/members/common.php 2005-01-28 15:22:18.187957000 +0600 @@ -69,6 +69,47 @@ return $res; } +function db_num_rows($res) +{ + global $db_type; + if($db_type == 'mysql') + { + return @mysql_num_rows($res); + } + else + { + return @pg_num_rows($res); + } +} + + +function db_fetch_row($res) +{ + global $db_type; + if($db_type == 'mysql') + { + return mysql_fetch_row($res); + } + else + { + return pg_fetch_rows($res); + } +} + + +function db_fetch_array($res) +{ + global $db_type; + if($db_type == 'mysql') + { + return mysql_fetch_array($res); + } + else + { + return pg_fetch_assoc($res); + } +} + /** * shows a formatted error message */ @@ -93,7 +134,7 @@ if($result) { - $row = mysql_fetch_row($result); + $row = db_fetch_row($result); return $row[0]; } @@ -171,7 +212,7 @@ if($result) { - $row = mysql_fetch_row($result); + $row = db_fetch_row($result); if($row) { @@ -211,7 +252,7 @@ if($result) { - $row = mysql_fetch_row($result); + $row = db_fetch_row($result); if($row && $row[1]>1) { @@ -241,7 +282,7 @@ $result = db_query($query); if($result) { - $row = mysql_fetch_row($result); + $row = db_fetch_row($result); return $row[0]; } return 0; @@ -271,7 +312,7 @@ { if($result) { - $row=mysql_fetch_row($result); + $row=db_fetch_row($result); return $row[0]; } else @@ -300,7 +341,7 @@ $result = db_query($query); if($result) { - $row = mysql_fetch_array($result); + $row = db_fetch_array($result); $profile = new UserProfile; $profile->id = $row['userId']; $profile->firstName = $row['userFirstName']; @@ -328,7 +369,7 @@ */ $query = "SELECT userName FROM users WHERE userId = $userId"; $result = db_query($query); - $row = mysql_fetch_row($result); + $row = db_fetch_row($result); $profile->userName=$row[0]; return $profile; @@ -487,10 +528,10 @@ $result = db_query($query); error_log(mysql_error()); - if($result && mysql_num_rows($result) ==1) + if($result && db_num_rows($result) ==1) { - $row = mysql_fetch_row($result); + $row = db_fetch_row($result); return $row[0]; } @@ -529,7 +570,7 @@ if($sth) { - $row = mysql_fetch_array($sth); + $row = db_fetch_array($sth); return($row['session_data']); } else diff -Naur raduser-2.11-downloaded/members/validate.php raduser/members/validate.php --- raduser-2.11-downloaded/members/validate.php 2005-01-29 16:52:05.143712352 +0600 +++ raduser/members/validate.php 2005-01-28 15:22:18.187957000 +0600 @@ -46,9 +46,9 @@ $query = "select userId from userProfile where userValidationKey = '$key' and userValidated = 0"; $result = db_query($query,$con); - if($result && mysql_num_rows($result) ==1) + if($result && db_num_rows($result) ==1) { - $row = mysql_fetch_row($result); + $row = db_fetch_row($result); return $row[0]; }