Почав робити модуль profile

serhiynovos · Jun 21, 2015 · 0657644 · 0657644
1 parent 0ecc90b
commit 0657644
Show file tree

Hide file tree

Showing 60 changed files with 12,172 additions and 445 deletions.
diff --git a/application/api.php b/application/api.php
@@ -23,8 +23,8 @@ function LoadModel($module, $model)
 
 function LoadView($module, $view, $data = null, $data1 = null)
 {
-    if (is_file('templates/'.TEMPLATE.'/views/'.$module.'/'.$view.'.html'))
-        require_once 'templates/'.TEMPLATE.'/views/'.$module.'/'.$view.'.html';
+    if (is_file('templates/' . TEMPLATE . '/views/' . $module . '/' . $view . '.html'))
+        require_once 'templates/' . TEMPLATE . '/views/' . $module . '/' . $view . '.html';
     elseif
     (is_file('modules/' . $module . '/views/' . $view . '.html'))
         require_once 'modules/' . $module . '/views/' . $view . '.html';

diff --git a/application/core.php b/application/core.php
@@ -8,7 +8,7 @@ class SiteBulder
 
     function __construct()
     {
-       $this->Route();
+        $this->Route();
     }
 
     function __destruct()
@@ -34,7 +34,7 @@ private function Route()
         if (is_file('modules/' . $this->controller . '/index.php')) {
             require_once 'modules/' . $this->controller . '/index.php';
 
-            $this->controller = 'c_'.$this->controller;
+            $this->controller = 'c_' . $this->controller;
 
             if (class_exists($this->controller)) {
                 LoadLanguage($this->url[1]);
@@ -71,7 +71,7 @@ private function Route()
 
     private function _404()
     {
-        require_once 'templates/'.TEMPLATE.'/404.html';
+        require_once 'templates/' . TEMPLATE . '/404.html';
     }
 }
 

diff --git a/languages/en.common.php b/languages/en.common.php
@@ -4,7 +4,9 @@
 define('SIGN_OUT', 'SignOut');
 define('REGISTRATION', 'Registration');
 define('WELCOME', 'Welcome');
-define('MORE','More');
+define('MORE', 'More');
 define('NOT_FOUND', '404 !!!!! Page not found :(');
 define('EVENTS', 'Events');
-define('GRADUATE', 'Graduate');
+define('GRADUATE', 'Graduate');
+define('PROFILE', 'My profile');
+define('MESSAGES', 'My messages');
diff --git a/languages/ua.admin.php b/languages/ua.admin.php
@@ -1,12 +1,12 @@
 <?
-    define('USER_LOGIN', 'Логін');
-    define('USER_PASS', 'Пароль');
-    define('SIGN_IN', 'Вхід');
-    define('SIGN_IN_LOG', 'Лог входів');
-    define('CLEAR_ALL', 'Очистити');
-    define('SEE_ALL', 'Переглянути все');
+define('USER_LOGIN', 'Логін');
+define('USER_PASS', 'Пароль');
+define('SIGN_IN', 'Вхід');
+define('SIGN_IN_LOG', 'Лог входів');
+define('CLEAR_ALL', 'Очистити');
+define('SEE_ALL', 'Переглянути все');
 
-    define('MAIN', 'Головна');
+define('MAIN', 'Головна');
 
 define('PROFILE', 'Мій профіль');
 define('SIGN_OUT', 'Вихід');
diff --git a/languages/ua.blog.php b/languages/ua.blog.php
@@ -1,11 +1,11 @@
 <?php
-define('ALL','Всі');
-define('ARTICLES','Записи');
-define('TITLE','Заголовок');
-define('ALIAS','Аліас (не трогати воно саме заповнюється)');
-define('IMAGE','Зображення');
-define('RUBRICK','Рубрика');
-define('TIME_TO_PUBLICK','Час публікації');
-define('KEYWORDS','Ключові слова');
-define('DESCRIPTION','Коротенький опис');
-define('ADD_BLOG','Новий запис');
+define('ALL', 'Всі');
+define('ARTICLES', 'Записи');
+define('TITLE', 'Заголовок');
+define('ALIAS', 'Аліас (не трогати воно саме заповнюється)');
+define('IMAGE', 'Зображення');
+define('RUBRICK', 'Рубрика');
+define('TIME_TO_PUBLICK', 'Час публікації');
+define('KEYWORDS', 'Ключові слова');
+define('DESCRIPTION', 'Коротенький опис');
+define('ADD_BLOG', 'Новий запис');
diff --git a/languages/ua.common.php b/languages/ua.common.php
@@ -1,5 +1,5 @@
 <?php
-define('MORE','Далі');
+define('MORE', 'Далі');
 define('PERSONAL', 'Персональних кабінет');
 define('SIGN_IN', 'Вхід');
 define('SIGN_OUT', 'Вихід');
@@ -8,3 +8,5 @@
 define('NOT_FOUND', '404 !!!!! Сторінку не знайдено :(');
 define('EVENTS', 'Події');
 define('GRADUATE', 'Наш випускник');
+define('PROFILE', 'Мій профіль');
+define('MESSAGES', 'Мої повідомлення');
diff --git a/modules/account/index.php b/modules/account/index.php
@@ -1,12 +1,16 @@
 <?php
-class c_account extends Controller{
+
+class c_account extends Controller
+{
     private $user;
 
-    function __construct() {
+    function __construct()
+    {
         $this->user = LoadPlugin('User');
     }
 
-    function _index() {
+    function _index()
+    {
         LoadLanguage('admin');
         LoadLanguage('ecommerce');
         global $model;
@@ -62,19 +66,22 @@ function _update()
         header("Location: {$_SERVER[HTTP_REFERER]}");
     }
 
-    function _sign_out() {
+    function _sign_out()
+    {
         $this->template = false;
         $this->user->signOut();
-        setcookie('ecommerce_u_id',$this->user->user->_user_id,time()-5454,'/');
-        header('Location:'.$_SERVER['HTTP_REFERER']);
+        setcookie('ecommerce_u_id', $this->user->user->_user_id, time() - 5454, '/');
+        header('Location:' . $_SERVER['HTTP_REFERER']);
     }
 
-    function _login() {
+    function _login()
+    {
         $this->meta['title'] = SIGN_IN;
         $this->view = 'login';
     }
 
-    function _sign_in() {
+    function _sign_in()
+    {
         $this->template = false;
         $this->user->Auth($_POST['login'], $_POST['password']);
         if ($this->user->isAuth()) {
@@ -84,14 +91,16 @@ function _sign_in() {
         header('Location: /');
     }
 
-    function _registration() {
+    function _registration()
+    {
         $this->meta['title'] = REGISTRATION;
         $this->view = 'registration';
     }
 
-    function _reg() {
+    function _reg()
+    {
         global $model;
-        LoadModel('admin','user');
+        LoadModel('admin', 'user');
         $this->meta['title'] = REGISTRATION;
         $this->view = 'registration';
         $this->data['error'] = array();
@@ -103,14 +112,14 @@ function _reg() {
         $this->data['user']['telephone'] = $_POST['telephone'];
         $this->data['user']['adress'] = $_POST['adress'];
 
-        $login = $model->getRowByParam(new users(),array('login' => $_POST['login']));
+        $login = $model->getRowByParam(new users(), array('login' => $_POST['login']));
         if (!empty($login)) {
-            array_push($this->data['error'],LOGIN_BISY);
+            array_push($this->data['error'], LOGIN_BISY);
         }
 
-        $email = $model->getRowByParam(new user_info(),array('email'=>$_POST['email']));
+        $email = $model->getRowByParam(new user_info(), array('email' => $_POST['email']));
         if (!empty($email)) {
-            array_push($this->data['error'],EMAIL_BISY);
+            array_push($this->data['error'], EMAIL_BISY);
         }
 
         if (count($this->data['error']) == 0) {

diff --git a/modules/account/views/index.html b/modules/account/views/index.html
@@ -1,10 +1,10 @@
-<form class="form-horizontal" id = "profile" method="post" action="/account/update" enctype="multipart/form-data">
+<form class="form-horizontal" id="profile" method="post" action="/account/update" enctype="multipart/form-data">
     <div class="col-md-4">
         <label><?=USER_LOGIN?></label>
         <input type="text" name="login" disabled value="<?=$data['user']->login?>" class="form-control" required=""/>
 
         <label><?=USER_PASS?></label>
-        <input type="text" name="password"  class="form-control" />
+        <input type="text" name="password" class="form-control"/>
 
         <div align="center">
             <img src="/content/avatars/<?=$data['user']->avatar?>" class="image">
@@ -17,10 +17,12 @@
 
     <div class="col-md-6">
         <label><?=FIRST_NAME?></label>
-        <input type="text" name="first_name" value="<?=$data['user_info']->first_name?>" class="form-control" required=""/>
+        <input type="text" name="first_name" value="<?=$data['user_info']->first_name?>" class="form-control"
+               required=""/>
 
         <label><?=LAST_NAME?></label>
-        <input type="text" name="last_name" value="<?=$data['user_info']->last_name?>" class="form-control" required=""/>
+        <input type="text" name="last_name" value="<?=$data['user_info']->last_name?>" class="form-control"
+               required=""/>
 
         <label><?=SUR_NAME?></label>
         <input type="text" name="sur_name" value="<?=$data['user_info']->sur_name?>" class="form-control" required=""/>
@@ -29,7 +31,8 @@
         <input type="email" name="email" value="<?=$data['user_info']->email?>" class="form-control" required=""/>
 
         <label><?=TELEPHONE?></label>
-        <input type="text" name="telephone" value="<?=$data['user_info']->telephone?>" class="form-control" required=""/>
+        <input type="text" name="telephone" value="<?=$data['user_info']->telephone?>" class="form-control"
+               required=""/>
 
         <label><?=ADRESS?></label>
         <input type="text" name="adress" value="<?=$data['user_info']->adress?>" class="form-control" required=""/>

diff --git a/modules/account/views/login.html b/modules/account/views/login.html
@@ -15,7 +15,7 @@
 
         <div class="input-group xs-margin"><span class="input-group-addon"><span
                 class="input-icon input-icon-password"></span><span class="input-text"><?=PASSWORD?> *</span></span>
-            <input required="" class="form-control input-lg"  name="password" type="password"></div>
+            <input required="" class="form-control input-lg" name="password" type="password"></div>
         <span class="help-block text-right"><a href="/account/forgout"><?=FORGOUT?></a></span>
         <span class="help-block text-right"><a href="/account/registration"><?=REGISTRATION?></a></span>
         <button class="btn btn-custom-2"><?=SIGN_IN?></button>

diff --git a/modules/account/views/registration.html b/modules/account/views/registration.html
@@ -2,7 +2,7 @@
 
     <div class="md-margin"></div>
 </header>
-<div class="col-md-12" id = "information">
+<div class="col-md-12" id="information">
     <?
     if (isset($data['error']))
     foreach($data['error'] as $error){?>
@@ -12,64 +12,71 @@
     <?}?>
 </div>
 <form method="post" action="/account/reg">
-<div class="col-md-6">
-    <div class="xs-margin"></div>
+    <div class="col-md-6">
+        <div class="xs-margin"></div>
         <div class="input-group"><span class="input-group-addon"><span
                 class="input-icon input-icon-user"></span><span class="input-text"><?=LOGIN?> *</span></span> <input
-                required="" value="<?=$data['user']['login']?>" class="form-control input-lg" name="login" id = 'login' type="text"></div>
+                required="" value="<?=$data['user']['login']?>" class="form-control input-lg" name="login" id='login'
+                type="text"></div>
         <div class="input-group xs-margin"><span class="input-group-addon"><span
                 class="input-icon input-icon-password"></span><span class="input-text"><?=PASSWORD?> *</span></span>
-            <input required="" class="form-control input-lg" name="password"  type="text"></div>
-    <div class="input-group">
+            <input required="" class="form-control input-lg" name="password" type="text"></div>
+        <div class="input-group">
         <span class="input-group-addon">
             <span class="input-text"><?=EMAIL?> *</span>
         </span>
-        <input required="" value="<?=$data['user']['email']?>" class="form-control input-lg" id="email" name="email" type="email">
+            <input required="" value="<?=$data['user']['email']?>" class="form-control input-lg" id="email" name="email"
+                   type="email">
+        </div>
+        <div class="sm-margin"></div>
     </div>
-    <div class="sm-margin"></div>
-</div>
-<div class="col-md-6">
-    <div class="xs-margin"></div>
-    <div class="input-group">
+    <div class="col-md-6">
+        <div class="xs-margin"></div>
+        <div class="input-group">
         <span class="input-group-addon">
             <span class="input-text"><?=SUR_NAME?> *</span>
         </span>
-        <input required="" class="form-control input-lg" name="sur_name" value="<?=$data['user']['sur_name']?>" type="text">
-    </div>
-    <div class="input-group">
+            <input required="" class="form-control input-lg" name="sur_name" value="<?=$data['user']['sur_name']?>"
+                   type="text">
+        </div>
+        <div class="input-group">
         <span class="input-group-addon">
             <span class="input-text"><?=FIRST_NAME?> *</span>
         </span>
-        <input required="" class="form-control input-lg" value="<?=$data['user']['first_name']?>" name="first_name" type="text">
-    </div>
-    <div class="input-group">
+            <input required="" class="form-control input-lg" value="<?=$data['user']['first_name']?>" name="first_name"
+                   type="text">
+        </div>
+        <div class="input-group">
         <span class="input-group-addon">
             <span class="input-text"><?=LAST_NAME?> *</span>
         </span>
-        <input required="" class="form-control input-lg" value="<?=$data['user']['last_name']?>" name="last_name" type="text">
-    </div>
-    <div class="input-group">
+            <input required="" class="form-control input-lg" value="<?=$data['user']['last_name']?>" name="last_name"
+                   type="text">
+        </div>
+        <div class="input-group">
         <span class="input-group-addon">
             <span class="input-text"><?=TELEPHONE?> *</span>
         </span>
-        <input required="" class="form-control input-lg" name="telephone" value="<?=$data['user']['telephone']?>" type="text">
-    </div>
-    <div class="input-group">
+            <input required="" class="form-control input-lg" name="telephone" value="<?=$data['user']['telephone']?>"
+                   type="text">
+        </div>
+        <div class="input-group">
         <span class="input-group-addon">
             <span class="input-text"><?=ADRESS?> *</span>
         </span>
-        <input required="" class="form-control input-lg" name="adress" value="<?=$data['user']['adress']?>" type="text">
+            <input required="" class="form-control input-lg" name="adress" value="<?=$data['user']['adress']?>"
+                   type="text">
+        </div>
     </div>
-</div>
 
-<div class="col-md-12">
-    <button class="btn btn-custom"><?=REGISTRATION?></button>
-</div>
+    <div class="col-md-12">
+        <button class="btn btn-custom"><?=REGISTRATION?></button>
+    </div>
 </form>
 <script>
     function form_valid() {
-        $.post('/account/valid',{login: $("#login").val(), email: $("#email").val()}, function(d){
-           $("#information").html(d);
+        $.post('/account/valid', {login: $("#login").val(), email: $("#email").val()}, function (d) {
+            $("#information").html(d);
         });
 
     }

diff --git a/modules/admin/controllers/index.php b/modules/admin/controllers/index.php
@@ -6,9 +6,9 @@ function _index()
     {
         $this->meta['title'] = MAIN;
         global $model;
-        LoadModel('admin','sign_in_log');
-        LoadModel('admin','widgets');
-        $this->data['log'] = $model->getAll(new sign_in_log(),'log_id','DESC', 10);
-        $this->data['widgets'] =$model->getAll(new widgets());
+        LoadModel('admin', 'sign_in_log');
+        LoadModel('admin', 'widgets');
+        $this->data['log'] = $model->getAll(new sign_in_log(), 'log_id', 'DESC', 10);
+        $this->data['widgets'] = $model->getAll(new widgets());
     }
 }
diff --git a/modules/admin/controllers/module.php b/modules/admin/controllers/module.php
@@ -17,8 +17,8 @@ function _index()
             $this->controller = 'admin_' . $this->url[3];
 
             if (class_exists($this->controller)) {
-                if (is_file('languages/'.DEFAULT_LANGUAGE.'.'.$this->url[3].'.php'))
-                    require_once 'languages/'.DEFAULT_LANGUAGE.'.'.$this->url[3].'.php';
+                if (is_file('languages/' . DEFAULT_LANGUAGE . '.' . $this->url[3] . '.php'))
+                    require_once 'languages/' . DEFAULT_LANGUAGE . '.' . $this->url[3] . '.php';
 
                 $this->controller = new $this->controller;
                 $this->controller->url = $this->url;