Хранилища Subversion kbase

Сравнить редакции

Не учитывать пробелы Редакция 19 → Редакция 20

/trunk/libs/auth.php
11,15 → 11,16
*/
 
class Auth {
 
/* Check user and return User_ID (zero if user not exsists)
* @param $login - user login
* $passhash - encrypted user password
* $dblink - link to database
* @access public
* @return UserID (int)
*/
function getUserID($login, $passhash, $dblink) {
$request =& $dblink->query("SELECT user_id FROM members WHERE login='$login' AND passwd='$passhash'");
function getUserID($login, $passhash) {
global $db;
$request =& $db->query("SELECT user_id FROM members WHERE login='$login' AND passwd='$passhash'");
if ($request->numRows()==0) {
return 0;
} else {
30,7 → 31,6
 
/* Get information about user
* @param $UserID - ID user
* $dblink - link to database
* @access public
* @return UserInfo (array)
* UserInfo[UserID] - ID user
38,7 → 38,8
* UserInfo[Status] - user status
* UserInfo[Registered] - date of registered
*/
function getUserInfo($UserID, $dblink) {
function getUserInfo($UserID) {
global $db;
$result = array();
$request =& $dblink->query("SELECT * FROM members WHERE user_id='$UserID'");
if ($request->numRows()!=0) {
67,12 → 68,12
* $passhash - encrypted user password
* $realname - real name of user
* $status - user status
* $dblink - link to database
* @access public
* @return ErrMsg (string)
*/
function registerUser($login, $passhash, $realname, $status, $dblink) {
$request =& $dblink->query("INSERT INTO members SET login='$login', passwd='$passhash', realname='$realname', status='$status', registered=NOW()");
function registerUser($login, $passhash, $realname, $status) {
global $db;
$request =& $db->query("INSERT INTO members SET login='$login', passwd='$passhash', realname='$realname', status='$status', registered=NOW()");
if (PEAR::isError($dblink)) {
die($result = $dblink->getMessage());
} else {
/trunk/libs/core.php
11,16 → 11,19
*/
 
class Core {
 
function __construct() {}
 
/* Get page ID
* @param $URL - page URL
* $dblink - link to database
* @access public
* @return PageID (int)
*/
function getPageID($pageURL, $dblink) {
function getPageID($pageURL) {
global $db;
$URL = parse_url($pageURL);
$pageName = basename($URL["path"], ".html");
$request =& $dblink->query("SELECT page_id FROM pages WHERE page_url='$pageName'");
$request =& $db->query("SELECT page_id FROM pages WHERE page_url='$pageName'");
if ($request->numRows()==0) {
return 0;
} else {
31,7 → 34,6
 
/* Get page
* @param $ID - page ID
* $dblink - link to database
* @access public
* @return PageInfo (array)
* PageInfo[ErrMsg] - Error message
42,9 → 44,10
* PageInfo[OwnerID] - ID page owner
* PageInfo[EditorID] - ID page editor
*/
function getPage($pageID, $dblink) {
function getPage($pageID) {
global $db;
$result = array();
$request =& $dblink->query("SELECT * FROM pages WHERE page_id='$pageID'");
$request =& $db->query("SELECT * FROM pages WHERE page_id='$pageID'");
if ($request->numRows()!=0) {
$request->fetchInto($get);
$result["ErrMsg"]="OK";
63,7 → 66,6
/* Get page revision
* @param $ID - page ID
* $revision - page number of revision
* $dblink - link to database
* @access public
* @return RevisionInfo (array)
* RevisionInfo[ErrMsg] - Error message
73,9 → 75,10
* RevisionInfo[FullText] - Revision story
* RevisionInfo[EditorID] - ID revision editor
*/
function getPageRevision($pageID,$revision,$dblink) {
function getPageRevision($pageID,$revision) {
global $db;
$result = array();
$request =& $dblink->query("SELECT * FROM pages_revision WHERE page_id='$pageID' AND page_revision='$revision'");
$request =& $db->query("SELECT * FROM pages_revision WHERE page_id='$pageID' AND page_revision='$revision'");
if ($request->numRows()!=0) {
$request->fetchInto($get);
$result["ErrMsg"] = "OK";