Skip to content
Snippets Groups Projects
Commit bf429f56 authored by PavelBegunkov's avatar PavelBegunkov
Browse files

dead code elimination

parent 63475147
Branches
No related merge requests found
<?php defined('SYSPATH') or die('No direct script access.'); <?php defined('SYSPATH') or die('No direct script access.');
class Model_Kohana_Account extends Model class Model_Kohana_Account extends Model
{ {
public function setHashKey($key) public function setHashKey($key)
...@@ -9,14 +9,14 @@ class Model_Kohana_Account extends Model ...@@ -9,14 +9,14 @@ class Model_Kohana_Account extends Model
$res = DB::query(Database::SELECT, $sql)->execute(); $res = DB::query(Database::SELECT, $sql)->execute();
return $res->get('Key'); return $res->get('Key');
} }
public function getHashKey() public function getHashKey()
{ {
$sql = "SELECT `GetHashKey`() AS `Key`;"; $sql = "SELECT `GetHashKey`() AS `Key`;";
$key = DB::query(Database::SELECT, $sql)->execute(); $key = DB::query(Database::SELECT, $sql)->execute();
return $key->get('Key'); return $key->get('Key');
} }
public function checkAuth($login, $password) { public function checkAuth($login, $password) {
$db = Database::instance(); $db = Database::instance();
$login = $db->escape($login); $login = $db->escape($login);
...@@ -25,7 +25,7 @@ class Model_Kohana_Account extends Model ...@@ -25,7 +25,7 @@ class Model_Kohana_Account extends Model
$res = DB::query(Database::SELECT, $sql)->execute(); $res = DB::query(Database::SELECT, $sql)->execute();
return $res->get('ID'); return $res->get('ID');
} }
public function ChangeTeacherInfo($id, $lastName, $firstName, $secondName, $degreeID, $departamentID) public function ChangeTeacherInfo($id, $lastName, $firstName, $secondName, $degreeID, $departamentID)
{ {
$db = Database::instance(); $db = Database::instance();
...@@ -36,7 +36,7 @@ class Model_Kohana_Account extends Model ...@@ -36,7 +36,7 @@ class Model_Kohana_Account extends Model
$key = DB::query(Database::SELECT, $sql)->execute(); $key = DB::query(Database::SELECT, $sql)->execute();
return $key->get('UserID'); return $key->get('UserID');
} }
public function createTeacher($lastName, $firstName, $secondName, $degreeID, $departamentID, $activationCode) public function createTeacher($lastName, $firstName, $secondName, $degreeID, $departamentID, $activationCode)
{ {
$db = Database::instance(); $db = Database::instance();
...@@ -48,7 +48,7 @@ class Model_Kohana_Account extends Model ...@@ -48,7 +48,7 @@ class Model_Kohana_Account extends Model
$key = DB::query(Database::SELECT, $sql)->execute(); $key = DB::query(Database::SELECT, $sql)->execute();
return $key->get('UserID'); return $key->get('UserID');
} }
public function createTeacherByDepName($lastName, $firstName, $secondName, $departamentName, $facultyID, $activationCode) public function createTeacherByDepName($lastName, $firstName, $secondName, $departamentName, $facultyID, $activationCode)
{ {
$db = Database::instance(); $db = Database::instance();
...@@ -61,7 +61,7 @@ class Model_Kohana_Account extends Model ...@@ -61,7 +61,7 @@ class Model_Kohana_Account extends Model
$key = DB::query(Database::SELECT, $sql)->execute(); $key = DB::query(Database::SELECT, $sql)->execute();
return $key->get('UserID'); return $key->get('UserID');
} }
public function createStudent($lastName, $firstName, $secondName, $grade, $groupNum, $facultyID, $activationCode) public function createStudent($lastName, $firstName, $secondName, $grade, $groupNum, $facultyID, $activationCode)
{ {
$db = Database::instance(); $db = Database::instance();
...@@ -72,8 +72,8 @@ class Model_Kohana_Account extends Model ...@@ -72,8 +72,8 @@ class Model_Kohana_Account extends Model
$sql = "SELECT `CreateStudent`($lastName, $firstName, $secondName, '$grade', '$groupNum', '$facultyID', $activationCode) AS `UserID`;"; $sql = "SELECT `CreateStudent`($lastName, $firstName, $secondName, '$grade', '$groupNum', '$facultyID', $activationCode) AS `UserID`;";
$key = DB::query(Database::SELECT, $sql)->execute(); $key = DB::query(Database::SELECT, $sql)->execute();
return $key->get('UserID'); return $key->get('UserID');
} }
public function createStudentEx($lastName, $firstName, $secondName, $gradeNum, $groupNum, $degree, $specialization, $facultyID, $activationCode) public function createStudentEx($lastName, $firstName, $secondName, $gradeNum, $groupNum, $degree, $specialization, $facultyID, $activationCode)
{ {
$db = Database::instance(); $db = Database::instance();
...@@ -86,7 +86,7 @@ class Model_Kohana_Account extends Model ...@@ -86,7 +86,7 @@ class Model_Kohana_Account extends Model
$sql = "SELECT `CreateStudentEx`($lastName, $firstName, $secondName, '$gradeNum', '$groupNum', $degree, $specialization, '$facultyID', $activationCode) AS `UserID`;"; $sql = "SELECT `CreateStudentEx`($lastName, $firstName, $secondName, '$gradeNum', '$groupNum', $degree, $specialization, '$facultyID', $activationCode) AS `UserID`;";
$key = DB::query(Database::SELECT, $sql)->execute(); $key = DB::query(Database::SELECT, $sql)->execute();
return $key->get('UserID'); return $key->get('UserID');
} }
public function createSubject($name, $abbr, $facultyID) public function createSubject($name, $abbr, $facultyID)
{ {
...@@ -96,30 +96,30 @@ class Model_Kohana_Account extends Model ...@@ -96,30 +96,30 @@ class Model_Kohana_Account extends Model
$sql = "SELECT `CreateSubject`('$facultyID', $name, $abbr) AS `Num`;"; $sql = "SELECT `CreateSubject`('$facultyID', $name, $abbr) AS `Num`;";
$response = DB::query(Database::SELECT, $sql)->execute(); $response = DB::query(Database::SELECT, $sql)->execute();
return $response->get('Num'); return $response->get('Num');
} }
public function getPersonalInfo($id) public function getPersonalInfo($id)
{ {
$sql = "CALL `GetPersonalInfo`('$id');"; $sql = "CALL `GetPersonalInfo`('$id');";
$query = DB::query(Database::SELECT, $sql)->execute(); $query = DB::query(Database::SELECT, $sql)->execute();
return $query; return $query;
} }
public function GetAccountInfo($id) public function GetAccountInfo($id)
{ {
$sql = "CALL GetAccountInfo('$id');"; $sql = "CALL GetAccountInfo('$id');";
$query = DB::query(Database::SELECT, $sql)->execute(); $query = DB::query(Database::SELECT, $sql)->execute();
return $query; return $query;
} }
public function changeMail($id, $mail) public function changeMail($id, $mail)
{ {
$mail = Database::instance()->escape($mail); $mail = Database::instance()->escape($mail);
$sql = "SELECT `ChangeMail`('$id', $mail) AS Num;"; $sql = "SELECT `ChangeMail`('$id', $mail) AS Num;";
$query = DB::query(Database::SELECT, $sql)->execute(); $query = DB::query(Database::SELECT, $sql)->execute();
return $query->get('Num'); return $query->get('Num');
} }
public function changeLogin($id, $login) public function changeLogin($id, $login)
{ {
$login = Database::instance()->escape($login); $login = Database::instance()->escape($login);
...@@ -135,7 +135,7 @@ class Model_Kohana_Account extends Model ...@@ -135,7 +135,7 @@ class Model_Kohana_Account extends Model
$query = DB::query(Database::SELECT, $sql)->execute(); $query = DB::query(Database::SELECT, $sql)->execute();
return $query->get('Num'); return $query->get('Num');
} }
public function getAccNumByLogin($login) public function getAccNumByLogin($login)
{ {
$login = Database::instance()->escape($login); $login = Database::instance()->escape($login);
...@@ -143,27 +143,24 @@ class Model_Kohana_Account extends Model ...@@ -143,27 +143,24 @@ class Model_Kohana_Account extends Model
$res = DB::query(Database::SELECT, $sql)->execute(); $res = DB::query(Database::SELECT, $sql)->execute();
return $res->get('Num'); return $res->get('Num');
} }
public function getAccNumByMail($email) public function getAccNumByMail($email)
{ {
$email = Database::instance()->escape($email); $email = Database::instance()->escape($email);
$sql = "SELECT `GetAccCountByMail`($email) AS Num;"; $sql = "SELECT `GetAccCountByMail`($email) AS Num;";
$res = DB::query(Database::SELECT, $sql)->execute(); $res = DB::query(Database::SELECT, $sql)->execute();
return $res->get('Num'); return $res->get('Num');
} }
public function isActivationCodeValid($code) public function isActivationCodeValid($code)
{ {
$code = Database::instance()->escape($code); $code = Database::instance()->escape($code);
$sql = "SELECT `GetAccCountByCode`($code) AS Num;"; $sql = "SELECT `GetAccCountByCode`($code) AS Num;";
$res = DB::query(Database::SELECT, $sql)->execute(); $res = DB::query(Database::SELECT, $sql)->execute();
// foreach ($res as $value) {
// $count = $value['Num'];
// }
$count = $res[0]['Num']; $count = $res[0]['Num'];
return $count == 1; return $count == 1;
} }
public function createRecoveryToken($email, $token) public function createRecoveryToken($email, $token)
{ {
$db = Database::instance(); $db = Database::instance();
...@@ -173,7 +170,7 @@ class Model_Kohana_Account extends Model ...@@ -173,7 +170,7 @@ class Model_Kohana_Account extends Model
$res = DB::query(Database::SELECT, $sql)->execute(); $res = DB::query(Database::SELECT, $sql)->execute();
return $res->get('UserName'); return $res->get('UserName');
} }
public function getRecoveryInfoByEMail($email) public function getRecoveryInfoByEMail($email)
{ {
$email = Database::instance()->escape($email); $email = Database::instance()->escape($email);
...@@ -181,7 +178,7 @@ class Model_Kohana_Account extends Model ...@@ -181,7 +178,7 @@ class Model_Kohana_Account extends Model
$query = DB::query(Database::SELECT, $sql)->execute(); $query = DB::query(Database::SELECT, $sql)->execute();
return $query; return $query;
} }
public function getRecoveryInfoByToken($token) public function getRecoveryInfoByToken($token)
{ {
$token = Database::instance()->escape($token); $token = Database::instance()->escape($token);
...@@ -189,7 +186,7 @@ class Model_Kohana_Account extends Model ...@@ -189,7 +186,7 @@ class Model_Kohana_Account extends Model
$query = DB::query(Database::SELECT, $sql)->execute(); $query = DB::query(Database::SELECT, $sql)->execute();
return $query; return $query;
} }
public function useRecoveryToken($token) public function useRecoveryToken($token)
{ {
$token = Database::instance()->escape($token); $token = Database::instance()->escape($token);
...@@ -197,7 +194,7 @@ class Model_Kohana_Account extends Model ...@@ -197,7 +194,7 @@ class Model_Kohana_Account extends Model
$email = DB::query(Database::SELECT, $sql)->execute(); $email = DB::query(Database::SELECT, $sql)->execute();
return $email->get('Num'); return $email->get('Num');
} }
public function activateAccount($login, $password, $email, $code) public function activateAccount($login, $password, $email, $code)
{ {
$db = Database::instance(); $db = Database::instance();
...@@ -212,7 +209,7 @@ class Model_Kohana_Account extends Model ...@@ -212,7 +209,7 @@ class Model_Kohana_Account extends Model
} }
return $id; return $id;
} }
public function GetCurSemesterID() public function GetCurSemesterID()
{ {
$sql = "SELECT `GetCurSemesterID`() AS `Num`; "; $sql = "SELECT `GetCurSemesterID`() AS `Num`; ";
...@@ -222,7 +219,7 @@ class Model_Kohana_Account extends Model ...@@ -222,7 +219,7 @@ class Model_Kohana_Account extends Model
} }
return $id; return $id;
} }
public function SetSemesterID($semesterID) public function SetSemesterID($semesterID)
{ {
$sql = "SELECT `SetSemesterID`('$semesterID') AS `Num`; "; $sql = "SELECT `SetSemesterID`('$semesterID') AS `Num`; ";
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment