diff --git a/web/modules/account/classes/Kohana/Account.php b/web/modules/account/classes/Kohana/Account.php index aab575bcd72773ef64779f5130d29503021f2d03..60509e18bc7a9b93387dde4b39762648295bef88 100644 --- a/web/modules/account/classes/Kohana/Account.php +++ b/web/modules/account/classes/Kohana/Account.php @@ -43,17 +43,17 @@ class Kohana_Account { return UTF8::strtoupper($activationCode); } - public function createTeacher($firstName, $secondName, $lastName, $degreeID, $departamentID) + public function createTeacher($lastName, $firstName, $secondName, $degreeID, $departamentID) { $activationCode = $this->generateActivationCode($firstName, $secondName, $lastName); - $this->_model->createTeacher($firstName, $secondName, $lastName, $degreeID, $departamentID, $activationCode); + $this->_model->createTeacher($lastName, $firstName, $secondName, $degreeID, $departamentID, $activationCode); return $activationCode; } - public function createStudent($firstName, $secondName, $lastName, $grade, $groupNum, $facultyID) + public function createStudent($lastName, $firstName, $secondName, $grade, $groupNum, $facultyID) { $activationCode = $this->generateActivationCode($firstName, $secondName, $lastName); - $this->_model->createStudent($firstName, $secondName, $lastName, $grade, $groupNum, $facultyID, $activationCode); + $this->_model->createStudent($lastName, $firstName, $secondName, $grade, $groupNum, $facultyID, $activationCode); return $activationCode; } diff --git a/web/modules/account/classes/Model/Kohana/Account.php b/web/modules/account/classes/Model/Kohana/Account.php index 28057efa4983fbdf6eb30a4c50e54dfe2a431f3d..206717aacb188b1ec2e54095c0d0d2b8bd65beaa 100644 --- a/web/modules/account/classes/Model/Kohana/Account.php +++ b/web/modules/account/classes/Model/Kohana/Account.php @@ -4,21 +4,35 @@ class Model_Kohana_Account extends Model { public function setHashKey($key) { - $sql = "SELECT SetHashKey('$key') AS `Key`;"; + $sql = "SELECT `SetHashKey`('$key') AS `Key`;"; $key = DB::query(Database::SELECT, $sql)->execute(); return $key->get('Key'); } public function getHashKey() { - $sql = "SELECT GetHashKey() AS `Key`;"; + $sql = "SELECT `GetHashKey`() AS `Key`;"; $key = DB::query(Database::SELECT, $sql)->execute(); return $key->get('Key'); } + public function createTeacher($lastName, $firstName, $secondName, $degreeID, $departamentID, $activationCode) + { + $sql = "SELECT `CreateTeacher`('$lastName', '$firstName', '$secondName', '$degreeID', '$departamentID', '$activationCode') AS `UserID`;"; + $key = DB::query(Database::SELECT, $sql)->execute(); + return $key->get('UserID'); + } + + public function createStudent($lastName, $firstName, $secondName, $grade, $groupNum, $facultyID, $activationCode) + { + $sql = "SELECT `CreateStudent`('$lastName', '$firstName', '$secondName', '$grade', '$groupNum', '$facultyID', '$activationCode') AS `UserID`;"; + $key = DB::query(Database::SELECT, $sql)->execute(); + return $key->get('UserID'); + } + public function getPersonalInfoByID($id) { - $sql = "CALL GetPersonalInfoByID('$id');"; + $sql = "CALL `GetPersonalInfoByID`('$id');"; $query = DB::query(Database::SELECT, $sql)->execute(); return $query; } @@ -32,14 +46,14 @@ class Model_Kohana_Account extends Model public function changeMail($id, $mail) { - $sql = "SELECT ChangeMail('$id', '$mail') AS Num;"; + $sql = "SELECT `ChangeMail`('$id', '$mail') AS Num;"; $query = DB::query(Database::SELECT, $sql)->execute(); return $query; } public function changeLogin($id, $login) { - $sql = "SELECT ChangeLogin('$id', '$login') AS Num;"; + $sql = "SELECT `ChangeLogin`('$id', '$login') AS Num;"; $query = DB::query(Database::SELECT, $sql)->execute(); return $query; } @@ -53,21 +67,21 @@ class Model_Kohana_Account extends Model public function getAccNumByLogin($login) { - $sql = "SELECT GetAccCountByLogin('$login') AS Num;"; + $sql = "SELECT `GetAccCountByLogin`('$login') AS Num;"; $login = DB::query(Database::SELECT, $sql)->execute(); return $login->get('Num'); } public function getAccNumByMail($email) { - $sql = "SELECT GetAccCountByLogin('$email') AS Num;"; + $sql = "SELECT `GetAccCountByLogin`('$email') AS Num;"; $email = DB::query(Database::SELECT, $sql)->execute(); return $email->get('Num'); } public function isActivationCodeValid($code) { - $sql = "SELECT GetAccCountByLogin('$code') AS Num;"; + $sql = "SELECT `GetAccCountByLogin`('$code') AS Num;"; $res = DB::query(Database::SELECT, $sql)->execute(); foreach ($res as $value) { $count = $value['Num'];