From 29bb075aaf57f08cd7bc94564d05ea046e86152b Mon Sep 17 00:00:00 2001 From: Oreolek Date: Sat, 15 Oct 2011 14:33:30 +0700 Subject: [PATCH] Now has favicon (just a placeholder, really) and informs about database reset. --- application/classes/controller/install.php | 1 + application/classes/controller/login.php | 2 +- application/views/header.php | 1 + application/views/install.php | 2 ++ favicon.ico | Bin 0 -> 894 bytes 5 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 favicon.ico diff --git a/application/classes/controller/install.php b/application/classes/controller/install.php index 40d1b25..1fc92b0 100644 --- a/application/classes/controller/install.php +++ b/application/classes/controller/install.php @@ -20,6 +20,7 @@ class Controller_Install extends Controller_Template { $admin_role = new Model_Role(array('name' =>'admin')); $user->add('roles',$admin_role); $user->add('roles',$login_role); + $this->template->message="Установка успешно завершена." } } } diff --git a/application/classes/controller/login.php b/application/classes/controller/login.php index 569f40a..9ee9ad7 100644 --- a/application/classes/controller/login.php +++ b/application/classes/controller/login.php @@ -6,7 +6,7 @@ class Controller_Login extends Controller_Template { if(Auth::instance()->logged_in()) return $this->request->redirect(''); if ($_POST){ $user = ORM::factory('user'); - $status = Auth::instance()->login($_POST['login'], $_POST['password']); + $status = Auth::instance()->login($this->request->post('login'), $this->request->post('password')); if ($status) return $this->request->redirect(''); else $this->template->error = "Неверный логин или пароль."; } diff --git a/application/views/header.php b/application/views/header.php index e70807c..cfd4c85 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -3,6 +3,7 @@ <?php echo $title ?> +' rel='shortcut icon' type='image/x-icon'/> diff --git a/application/views/install.php b/application/views/install.php index 5154605..b2404a9 100644 --- a/application/views/install.php +++ b/application/views/install.php @@ -1,5 +1,7 @@ post('title','Установка движка')->post('styles','main.css')->execute() ?>

Установка движка

+
+

Внимание! При продолжении база данных будет переписана.

Предполагается, что база данных MySQL находится по адресу localhost и использует кодировку UTF-8. Вы можете поменять настройки в файле config/database.php.

diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1e5cf9f8239248049fc9fe8ef936b45049f38bc2 GIT binary patch literal 894 zcmbu6Q3`-C3_~McU|-^=pB~NoUqIsuS*>m=>sV=C(>f3scv1rMjBNxa04pyM7T%NB zV($)Z?%q@ua3@7O7k93HnZxWyX`i53g$)Mj;k{)fa1VX!k-r-BLONv*MUWcN