From bf429f56a7b91d186c15c4278d98af338c89c5f9 Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.Silence@gmail.com>
Date: Mon, 27 Apr 2015 20:34:55 +0300
Subject: [PATCH] dead code elimination
---
.../account/classes/Model/Kohana/Account.php | 57 +++++++++----------
1 file changed, 27 insertions(+), 30 deletions(-)
diff --git a/~dev_rating/modules/account/classes/Model/Kohana/Account.php b/~dev_rating/modules/account/classes/Model/Kohana/Account.php
index 834646215..1405085f0 100644
--- a/~dev_rating/modules/account/classes/Model/Kohana/Account.php
+++ b/~dev_rating/modules/account/classes/Model/Kohana/Account.php
@@ -1,5 +1,5 @@
<?php defined('SYSPATH') or die('No direct script access.');
-
+
class Model_Kohana_Account extends Model
{
public function setHashKey($key)
@@ -9,14 +9,14 @@ class Model_Kohana_Account extends Model
$res = DB::query(Database::SELECT, $sql)->execute();
return $res->get('Key');
}
-
+
public function getHashKey()
{
$sql = "SELECT `GetHashKey`() AS `Key`;";
$key = DB::query(Database::SELECT, $sql)->execute();
return $key->get('Key');
}
-
+
public function checkAuth($login, $password) {
$db = Database::instance();
$login = $db->escape($login);
@@ -25,7 +25,7 @@ class Model_Kohana_Account extends Model
$res = DB::query(Database::SELECT, $sql)->execute();
return $res->get('ID');
}
-
+
public function ChangeTeacherInfo($id, $lastName, $firstName, $secondName, $degreeID, $departamentID)
{
$db = Database::instance();
@@ -36,7 +36,7 @@ class Model_Kohana_Account extends Model
$key = DB::query(Database::SELECT, $sql)->execute();
return $key->get('UserID');
}
-
+
public function createTeacher($lastName, $firstName, $secondName, $degreeID, $departamentID, $activationCode)
{
$db = Database::instance();
@@ -48,7 +48,7 @@ class Model_Kohana_Account extends Model
$key = DB::query(Database::SELECT, $sql)->execute();
return $key->get('UserID');
}
-
+
public function createTeacherByDepName($lastName, $firstName, $secondName, $departamentName, $facultyID, $activationCode)
{
$db = Database::instance();
@@ -61,7 +61,7 @@ class Model_Kohana_Account extends Model
$key = DB::query(Database::SELECT, $sql)->execute();
return $key->get('UserID');
}
-
+
public function createStudent($lastName, $firstName, $secondName, $grade, $groupNum, $facultyID, $activationCode)
{
$db = Database::instance();
@@ -72,8 +72,8 @@ class Model_Kohana_Account extends Model
$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 createStudentEx($lastName, $firstName, $secondName, $gradeNum, $groupNum, $degree, $specialization, $facultyID, $activationCode)
{
$db = Database::instance();
@@ -86,7 +86,7 @@ class Model_Kohana_Account extends Model
$sql = "SELECT `CreateStudentEx`($lastName, $firstName, $secondName, '$gradeNum', '$groupNum', $degree, $specialization, '$facultyID', $activationCode) AS `UserID`;";
$key = DB::query(Database::SELECT, $sql)->execute();
return $key->get('UserID');
- }
+ }
public function createSubject($name, $abbr, $facultyID)
{
@@ -96,30 +96,30 @@ class Model_Kohana_Account extends Model
$sql = "SELECT `CreateSubject`('$facultyID', $name, $abbr) AS `Num`;";
$response = DB::query(Database::SELECT, $sql)->execute();
return $response->get('Num');
- }
-
+ }
+
public function getPersonalInfo($id)
{
$sql = "CALL `GetPersonalInfo`('$id');";
$query = DB::query(Database::SELECT, $sql)->execute();
return $query;
}
-
+
public function GetAccountInfo($id)
{
$sql = "CALL GetAccountInfo('$id');";
$query = DB::query(Database::SELECT, $sql)->execute();
return $query;
}
-
+
public function changeMail($id, $mail)
{
$mail = Database::instance()->escape($mail);
$sql = "SELECT `ChangeMail`('$id', $mail) AS Num;";
$query = DB::query(Database::SELECT, $sql)->execute();
return $query->get('Num');
- }
-
+ }
+
public function changeLogin($id, $login)
{
$login = Database::instance()->escape($login);
@@ -135,7 +135,7 @@ class Model_Kohana_Account extends Model
$query = DB::query(Database::SELECT, $sql)->execute();
return $query->get('Num');
}
-
+
public function getAccNumByLogin($login)
{
$login = Database::instance()->escape($login);
@@ -143,27 +143,24 @@ class Model_Kohana_Account extends Model
$res = DB::query(Database::SELECT, $sql)->execute();
return $res->get('Num');
}
-
+
public function getAccNumByMail($email)
{
$email = Database::instance()->escape($email);
$sql = "SELECT `GetAccCountByMail`($email) AS Num;";
$res = DB::query(Database::SELECT, $sql)->execute();
return $res->get('Num');
- }
-
+ }
+
public function isActivationCodeValid($code)
{
$code = Database::instance()->escape($code);
$sql = "SELECT `GetAccCountByCode`($code) AS Num;";
$res = DB::query(Database::SELECT, $sql)->execute();
-// foreach ($res as $value) {
-// $count = $value['Num'];
-// }
$count = $res[0]['Num'];
return $count == 1;
}
-
+
public function createRecoveryToken($email, $token)
{
$db = Database::instance();
@@ -173,7 +170,7 @@ class Model_Kohana_Account extends Model
$res = DB::query(Database::SELECT, $sql)->execute();
return $res->get('UserName');
}
-
+
public function getRecoveryInfoByEMail($email)
{
$email = Database::instance()->escape($email);
@@ -181,7 +178,7 @@ class Model_Kohana_Account extends Model
$query = DB::query(Database::SELECT, $sql)->execute();
return $query;
}
-
+
public function getRecoveryInfoByToken($token)
{
$token = Database::instance()->escape($token);
@@ -189,7 +186,7 @@ class Model_Kohana_Account extends Model
$query = DB::query(Database::SELECT, $sql)->execute();
return $query;
}
-
+
public function useRecoveryToken($token)
{
$token = Database::instance()->escape($token);
@@ -197,7 +194,7 @@ class Model_Kohana_Account extends Model
$email = DB::query(Database::SELECT, $sql)->execute();
return $email->get('Num');
}
-
+
public function activateAccount($login, $password, $email, $code)
{
$db = Database::instance();
@@ -212,7 +209,7 @@ class Model_Kohana_Account extends Model
}
return $id;
}
-
+
public function GetCurSemesterID()
{
$sql = "SELECT `GetCurSemesterID`() AS `Num`; ";
@@ -222,7 +219,7 @@ class Model_Kohana_Account extends Model
}
return $id;
}
-
+
public function SetSemesterID($semesterID)
{
$sql = "SELECT `SetSemesterID`('$semesterID') AS `Num`; ";
--
GitLab