maj syntaxe accolades, maj jQuery, correction layout contact

[mtweb] / web / app / data / modules / sql / mw_data_users.php

diff --git a/web/app/data/modules/sql/mw_data_users.php b/web/app/data/modules/sql/mw_data_users.php
index b144ad6..cfa4fd9 100644 (file)
--- a/web/app/data/modules/sql/mw_data_users.php
+++ b/web/app/data/modules/sql/mw_data_users.php
@@ -1,7 +1,6 @@
 <?php
 
-  class mw_data_users extends mw_data
-  {
+  class mw_data_users extends mw_data{
 
     var $users;
     var $_user;
@@ -12,8 +11,8 @@
     #                                                                                    users
     #
 
-    function users($start = 0, $alpha = null, $status = null)
-    { $sgbd = $this->sgbd();
+    function users($start = 0, $alpha = null, $status = null){
+      $sgbd = $this->sgbd();
       $env = $this->env();
       $users = array("list" => array(), "total" => 0);
       $SELECT = "SELECT *";
@@ -27,8 +26,8 @@
       if(!isset($rst)) return false;
       if($v_rst = $sgbd->fetch_assoc($rst)) $users["total"] = $v_rst["n"];
       $sgbd->free_result($rst);
-      if($users["total"] > 0)
-      { $sql = "SELECT * FROM(".$SELECT.$FROM.$WHERE.$LIMIT.") res";
+      if($users["total"] > 0){
+        $sql = "SELECT * FROM(".$SELECT.$FROM.$WHERE.$LIMIT.") res";
         $rst = $sgbd->query($sql);
         if(!isset($rst)) return false;
         while($v_rst = $sgbd->fetch_assoc($rst)) $users["list"][$v_rst["id"]] = $v_rst;
@@ -37,8 +36,8 @@
       return $users;
     }
 
-    function user_by_id($id)
-    { $sgbd = $this->sgbd();
+    function user_by_id($id){
+      $sgbd = $this->sgbd();
       $user = array();
       $sql = "SELECT * from #--users WHERE id=".$this->eq($id);
       $rst = $sgbd->query($sql);
@@ -48,8 +47,8 @@
       return $user;
     }
 
-    function user($login)
-    { $sgbd = $this->sgbd();
+    function user($login){
+      $sgbd = $this->sgbd();
       $user = array();
       $sql = "SELECT * from #--users WHERE login=".$this->eq($login);
       $rst = $sgbd->query($sql);
@@ -59,8 +58,8 @@
       return $user;
     }
 
-    function user_exists($login)
-    { $sgbd = $this->sgbd();
+    function user_exists($login){
+      $sgbd = $this->sgbd();
       $EXISTS = 0;
       $sql = "SELECT count(*) as n from #--users WHERE login=".$this->eq($login);
       $rst = $sgbd->query($sql);
@@ -70,8 +69,8 @@
       return $EXISTS;
     }
 
-    function add_user($login, $password, $email, $status)
-    { $sgbd = $this->sgbd();
+    function add_user($login, $password, $email, $status){
+      $sgbd = $this->sgbd();
       $sql =
        "INSERT INTO #--users(login, password, email, status) VALUES"
       ."( ".$this->eq($login)
@@ -82,8 +81,8 @@
       return $sgbd->query($sql);
     }
 
-    function set_user($id, $login, $password, $email, $status)
-    { $sgbd = $this->sgbd();
+    function set_user($id, $login, $password, $email, $status){
+      $sgbd = $this->sgbd();
       $sql =
        "UPDATE #--users SET"
       ."  login=".$this->eq($login)
@@ -94,8 +93,8 @@
       return $sgbd->query($sql);
     }
 
-    function del_user($login)
-    { $sgbd = $this->sgbd();
+    function del_user($login){
+      $sgbd = $this->sgbd();
       $sql = "DELETE FROM #--users WHERE login=".$this->eq($login);
       return $sgbd->query($sql);
     }
@@ -104,13 +103,13 @@
     #                                                                                   status
     #
 
-    function status()
-    { if(!isset($this->user_status)) return false;
+    function status(){
+      if(!isset($this->user_status)) return false;
       return $this->user_status;
     }
 
-    function init_user_status($status = array())
-    { $sgbd = $this->sgbd();
+    function init_user_status($status = array()){
+      $sgbd = $this->sgbd();
       $this->user_status = array();
       $sql = "SELECT * FROM #--user_status";
       $rst = $sgbd->query($sql);
@@ -120,8 +119,8 @@
       return $this->user_status;
     }
 
-    function init_action_status($status = array())
-    { if(!isset($this->user_status)) return false;
+    function init_action_status($status = array()){
+      if(!isset($this->user_status)) return false;
       $sgbd = $this->sgbd();
       $this->action_status = array();
       $sql = "SELECT * FROM #--action_status";
@@ -132,14 +131,14 @@
       return $this->action_status;
     }
 
-    function get_user_status()
-    { $user = $this->get_session_user();
+    function get_user_status(){
+      $user = $this->get_session_user();
       if($user && isset($user["status"])) return $user["status"];
       return 0;
     }
 
-    function get_action_status($mod, $controller = "index", $action = "index", $set_status = array())
-    { $sgbd = $this->sgbd();
+    function get_action_status($mod, $controller = "index", $action = "index", $set_status = array()){
+      $sgbd = $this->sgbd();
       $status = array();
       $sql =
        "SELECT action, id_status"
@@ -149,16 +148,16 @@
       ." OR action=".$this->eq($mod."/".$controller."/".$action);
       $rst = $sgbd->query($sql);
       if(!isset($rst)) return false;
-      while($v_rst = $sgbd->fetch_assoc($rst))
-      { if(!isset($status[$v_rst["action"]])) $status[$v_rst["action"]] = array();
+      while($v_rst = $sgbd->fetch_assoc($rst)){
+        if(!isset($status[$v_rst["action"]])) $status[$v_rst["action"]] = array();
         $status[$v_rst["action"]][$v_rst["id_status"]] = true;
       }
       $sgbd->free_result($rst);
       return $status;
     }
 
-    function creation_default_status()
-    { $sgbd = $this->sgbd();
+    function creation_default_status(){
+      $sgbd = $this->sgbd();
       $default_status = 0;
       $sql = "SELECT id FROM #--user_status WHERE creation_default=1 LIMIT 0,1";
       $rst = $sgbd->query($sql);
@@ -172,31 +171,31 @@
     #                                                                             log in / out
     #
 
-    function login($login, $password)
-    { if(($user = $this->user($login)) !== false)
-      { if($this->password_ok($user, $password))
-        { if(!$this->set_session($user)) $user = false;
+    function login($login, $password){
+      if(($user = $this->user($login)) !== false){
+        if($this->password_ok($user, $password)){
+          if(!$this->set_session($user)) $user = false;
         }
-        else
-        { $this->clear_session();
+        else{
+          $this->clear_session();
           $user = array();
         }
       }
       return $user;
     }
 
-    function logout()
-    { return $this->clear_session();
+    function logout(){
+      return $this->clear_session();
     }
 
-    function user_ok($user)
-    { return
+    function user_ok($user){
+      return
       strcmp(md5($user["password"].$_SESSION["id"]), $_SESSION["pass"]) == 0
       && $_SESSION["ip"] == $_SERVER["REMOTE_ADDR"];
     }
 
-    function password_ok($user, $password)
-    { return
+    function password_ok($user, $password){
+      return
       strcmp(md5($user["password"].$_SESSION["id"]), $password) == 0
       && $_SESSION["ip"] == $_SERVER["REMOTE_ADDR"];
     }
@@ -205,19 +204,19 @@
     #                                                                                  session
     #
 
-    function load_session()
-    { session_start();
+    function load_session(){
+      session_start();
       if(!isset($_SESSION["id"])) $this->clear_session();
-      if
-      ( $user =
-        ( isset($_COOKIE["user"]) || isset($_SESSION["user"]) ?
+      if(
+        $user = (
+          isset($_COOKIE["user"]) || isset($_SESSION["user"]) ?
             $this->user(isset($_COOKIE["user"]) ? $_COOKIE["user"] : $_SESSION["user"])
           : array()
         )
-      )
-      { if(isset($_COOKIE["user"])) $this->set_session($user);
-        if(!$this->user_ok($user))
-        { $this->clear_session();
+      ){
+        if(isset($_COOKIE["user"])) $this->set_session($user);
+        if(!$this->user_ok($user)){
+          $this->clear_session();
           $user = array();
         }
       }
@@ -225,15 +224,15 @@
       return $user;
     }
 
-    function set_session($user)
-    { $_SESSION["user"] = $user["login"];
+    function set_session($user){
+      $_SESSION["user"] = $user["login"];
       $_SESSION["pass"] = md5($user["password"].$_SESSION["id"]);
       $env = $this->env();
       return setcookie("user", $user["login"], time() + (60 * 60 * 24 * 7), $env->path("web"));
     }
 
-    function clear_session()
-    { unset($_SESSION["user"]);
+    function clear_session(){
+      unset($_SESSION["user"]);
       unset($_SESSION["pass"]);
       $_SESSION["ip"] = $_SERVER["REMOTE_ADDR"];
       $_SESSION["id"] = md5(rand());
@@ -241,14 +240,16 @@
       return setcookie("user", "", 0, $env->path("web"));
     }
 
-    function get_session_user() { return $this->_user; }
+    function get_session_user(){
+      return $this->_user;
+    }
 
     # ----------------------------------------------------------------------------------------
     #                                                                                  uploads
     #
 
-    function check_user_uploads_dir($user = null)
-    { $env = $this->env();
+    function check_user_uploads_dir($user = null){
+      $env = $this->env();
       $user_dir = $env->path("content")."uploads/".(isset($user) ? $user : $this->_user["id"]);
       if(!file_exists($user_dir)) @mkdir($user_dir);
       return file_exists($user_dir);