From dcda72c7732a80daddea1e5cb2915c259d8cf865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A0=D1=83=D0=B4?=
=?UTF-8?q?=D0=B5=D0=BD=D0=B5=D1=86?= <andrey.rudenets@gmail.com>
Date: Fri, 22 Aug 2014 19:20:16 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?=
=?UTF-8?q?=D0=B5=20=D0=BE=D0=B4=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=81=D1=82?=
=?UTF-8?q?=D1=83=D0=B4=D0=B5=D0=BD=D1=82=D0=B0/=D0=BE=D0=B4=D0=BD=D0=BE?=
=?UTF-8?q?=D0=B3=D0=BE=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE=D0=B4=D0=B0=D0=B2?=
=?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../account/classes/Kohana/Account.php | 8 ++---
.../account/classes/Model/Kohana/Account.php | 30 ++++++++++++++-----
2 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/web/modules/account/classes/Kohana/Account.php b/web/modules/account/classes/Kohana/Account.php
index aab575bcd..60509e18b 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 28057efa4..206717aac 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'];
--
GitLab