diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..0a6ab5b --- /dev/null +++ b/.htaccess @@ -0,0 +1,6 @@ + + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule ^(.*)$ index.php/$1 [L] + diff --git a/application/config/routes.php b/application/config/routes.php index e1618a5..bcee306 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -52,4 +52,4 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $route['default_controller'] = 'Users'; $route['404_override'] = ''; $route['translate_uri_dashes'] = FALSE; -$route['home'] = 'index.php/Users/login'; +$route['login'] = 'Users/login'; diff --git a/application/controllers/Users.php b/application/controllers/Users.php index 4970a90..ef9ad1a 100644 --- a/application/controllers/Users.php +++ b/application/controllers/Users.php @@ -1,108 +1,96 @@ load->model('Global_model'); } public function index() { - if (!$this->session->userdata('id_user')) { - if(!empty($this->uri->segment(3))){ - $data['message'] = $this->uri->segment(3); - $this->load->view('login',$data); - }else{ - $data['message'] = null; - $this->load->view('login',$data); - } - + $id_user = $this->session->userdata('id_user'); + if (isset($id_user)) { + $data['membres'] = $this->Global_model->getMembres($id_user); + $data['total'] = $this->Global_model->getTotal($this->session->userdata('agent_member_code')); + $data['message'] = $this->session->flashdata('message'); + $this->load->view('dashboard', $data); } else { - - if(!empty($this->uri->segment(3))){ - $data['message'] = $this->uri->segment(3); - $this->load->view('login',$data); - }else{ - $data['message'] = null; - $this->load->view('login',$data); - } + redirect('login'); } } + public function login() { - $user_login = array( - 'user_validation_code' => $this->input->post('code') - ); - $user = $this->Global_model->login_user($user_login['user_validation_code']); - if($user!=false){ - $countryId = $this->Global_model->getIdCountry($user_login['user_validation_code']); - $checkIfGameActived = $this->Global_model->checkIfGameActived($countryId); - if($checkIfGameActived==true){ - $data['user'] = $user; - $data['pays'] = $this->Global_model->getCountry($user_login['user_validation_code']); - $data['total'] = $this->Global_model->getTotal($user_login['user_validation_code']); - $data['id_user'] = $this->Global_model->getIdUser($user_login['user_validation_code']); - $data['membre'] = $this->Global_model->getMembre($data['id_user']); - $data['message'] = ""; - $this->session->set_userdata('user_validation_code', $user_login['user_validation_code']); - $this->session->set_userdata('user', $user); - $this->session->set_userdata('pays', $data['pays']); - $this->session->set_userdata('total', $data['total']); - $this->session->set_userdata('id_user', $data['id_user']); - $this->load->view('dashbord',$data); - }else{ - $data['message'] = "Le jeu n'est pas activé pour votre pays"; - $this->load->view('login',$data); - } - }else{ - $data['message'] = "Ce code de validation est incorrecte"; + if ($this->input->server('REQUEST_METHOD') === 'GET') { + $data['message'] = $this->session->flashdata('message'); $this->load->view('login',$data); + } elseif ($this->input->server('REQUEST_METHOD') === 'POST') { + $user_login = array( + 'agent_member_code' => $this->input->post('code') + ); + $user = $this->Global_model->login_user($user_login['agent_member_code']); + if ($user != false) { + $countryId = $user->country_id; + $checkIfGameActived = $this->Global_model->checkIfGameActived($countryId); + if ($checkIfGameActived == true) { + $data['user'] = $user; + $data['pays'] = $user->country; + $data['id_user'] = $user->id; + $this->session->set_userdata('agent_member_code', $user_login['agent_member_code']); + $this->session->set_userdata('user', $user->lastname); + $this->session->set_userdata('pays', $data['pays']); + $this->session->set_userdata('id_user', $user->id); + $this->session->set_userdata('id_country', $countryId); + redirect('/'); + } else { + $this->session->set_flashdata('message', "Le jeu n'est pas activé pour votre pays"); + redirect('login'); + } + } else { + $this->session->set_flashdata('message', "Ce code membre est incorrect"); + redirect('login'); + } } } + public function logout() - { - $this->session->sess_destroy(); - $message = 'Vous avez été déconnecté.'; - //$this->load->view('login',$data); - redirect('index.php/'); - } - public function add_member(){ + { + $this->session->sess_destroy(); + $this->session->set_flashdata('message','Vous avez été déconnecté'); + redirect('/'); + } + + public function add_member() + { $validation_code = $this->input->post('code'); - $idNewMember = $this->Global_model->getIdUser($validation_code); - if($idNewMember!=false){ + $newMember = $this->Global_model->getSimpleUser($validation_code); + if ($newMember != false) { + $idNewMember = $newMember->id; $codeExist = $this->Global_model->checkIfIdExist($idNewMember); - $idPaysParrain = $this->Global_model->getIdCountry($this->session->userdata('user_validation_code')); - $idPaysNewMember = $this->Global_model->getIdCountry($validation_code); - if($codeExist==false){ - if($idPaysParrain==$idPaysNewMember){ - $res = $this->Global_model->addMember($this->session->userdata('id_user'),$idNewMember,$idPaysParrain); - if($res==true){ - $this->session->set_userdata('total', $this->Global_model->getTotal($this->session->userdata('user_validation_code'))); - $data['membre'] = $this->Global_model->getMembre($this->session->userdata('id_user')); - $data['message'] = 'Le membre a bien été ajouté'; - $this->load->view('dashbord',$data); - }else{ - $data['message'] = "Une erreur s'est produite"; - $data['membre'] = $this->Global_model->getMembre($this->session->userdata('id_user')); - $this->load->view('dashbord',$data); + $idPaysParrain = $this->session->userdata('id_country'); + $idPaysNewMember = $newMember->country_id; + if ($codeExist == false) { + if ($idPaysParrain == $idPaysNewMember) { + $res = $this->Global_model->addMember($this->session->userdata('id_user'), $idNewMember, $idPaysParrain); + if ($res == true) { + $this->session->set_flashdata('message', 'Le membre a bien été ajouté'); + } else { + $this->session->set_flashdata('message', "Une erreur s'est produite"); } - }else{ - $data['message'] = "Le code de validation appartient à un autre pays."; - $data['membre'] = $this->Global_model->getMembre($this->session->userdata('id_user')); - $this->load->view('dashbord',$data); + } else { + $this->session->set_flashdata('message', "Le code de validation appartient à un autre pays."); } - }else{ - $data['message'] = "Ce code a déjà été ajouté ou appartient à un utilisateur participant au jeu en tant que parrain."; - $data['membre'] = $this->Global_model->getMembre($this->session->userdata('id_user')); - $this->load->view('dashbord',$data); + } else { + $this->session->set_flashdata('message', "Ce code a déjà été ajouté ou appartient à un utilisateur participant au jeu en tant que parrain."); } - }else{ - $data['message'] = "Ce code est incorrecte ou ne correspond à aucun utilisateur."; - $data['membre'] = $this->Global_model->getMembre($this->session->userdata('id_user')); - $this->load->view('dashbord',$data); + } else { + $this->session->set_flashdata('message', "Ce code est incorrect ou ne correspond à aucun utilisateur."); } - + + redirect('/'); } } diff --git a/application/models/Global_model.php b/application/models/Global_model.php index a44a3f9..0788b0c 100644 --- a/application/models/Global_model.php +++ b/application/models/Global_model.php @@ -1,97 +1,99 @@ -db->query("SELECT lastname,phone FROM users WHERE validation_code='".$code."'"); - if($query->num_rows()>0) - { - return $query->row()->lastname; - } - else{ - return false; - } - } - public function getCountry($code){ - $query = $this->db->query("SELECT countries.id,countries.name FROM `users` INNER JOIN `networks` ON `users`.network_id=`networks`.id INNER JOIN countries ON networks.country_id=countries.id WHERE users.validation_code='".$code."'"); - if($query->num_rows()>0) - { - return $query->row()->name; - } - else{ - return false; - } - } - public function getTotal($code){ - $query = $this->db->query("SELECT count(*) AS c - FROM game - INNER JOIN users ON game.id_parrain=users.id - WHERE users.validation_code='".$code."'"); - if($query->num_rows()>0){ - return $query->row()->c; - }else{ - return null; - } - } - public function getMembre($id_parrain){ - $query = $this->db->query("SELECT users.lastname,users.validation_code FROM `game` - INNER JOIN `users` ON `users`.id=`game`.id_joueur - WHERE `game`.id_parrain='".$id_parrain."'"); - if($query->num_rows()>0) - { - return $query; - } - else{ - return false; - } - } - public function getIdUser($code){ - $query = $this->db->query("SELECT id FROM users WHERE validation_code='".$code."'"); - if($query->num_rows()>0) - { - return $query->row()->id; - } - else{ - return false; - } - } - public function addMember($id_parrain, $id_newMember,$id_pays){ - $query = $this->db->query("INSERT INTO game(id_parrain, id_joueur, id_pays) VALUE (".$id_parrain.",".$id_newMember.",".$id_pays.")"); - return $query; - } - public function checkIfIdExist($id){ - $query = $this->db->query("SELECT * FROM game WHERE id_joueur=".$id." OR id_parrain=".$id); - if($query->num_rows()>0) - { - return true; - } - else{ - return false; - } - } - public function getIdCountry($code){ - $query = $this->db->query("SELECT countries.id FROM `users` INNER JOIN `networks` ON `users`.network_id=`networks`.id INNER JOIN countries ON networks.country_id=countries.id WHERE users.validation_code='".$code."'"); - if($query->num_rows()>0) - { - return $query->row()->id; - } - else{ - return false; - } - } - public function checkIfGameActived($id_pays){ - $query = $this->db->query("SELECT * FROM `configGame` WHERE id_pays='".$id_pays."'"); - if($query->num_rows()>0) - { - if($query->row()->etat==1){ - return true; - }elseif($query->row()->etat==0){ - return false; - } - } - else{ - return false; - } - } -} \ No newline at end of file +db->query("SELECT id , lastname, phone , country_id , country FROM agent_plus WHERE code_membre='" . $code . "'"); + if ($query->num_rows() > 0) { + return $query->first_row(); + } else { + return false; + } + } +// public function getCountry($code){ +// $query = $this->db->query("SELECT countries.id,countries.name FROM `users` INNER JOIN `networks` ON `users`.network_id=`networks`.id INNER JOIN countries ON networks.country_id=countries.id WHERE users.validation_code='".$code."'"); +// if($query->num_rows()>0) +// { +// return $query->row()->name; +// } +// else{ +// return false; +// } +// } + public function getTotal($code) + { + $query = $this->db->query("SELECT count(*) AS c + FROM agents_game g + INNER JOIN agent_plus ag ON g.id_parrain= ag.id + WHERE ag.code_membre='" . $code . "'"); + if ($query->num_rows() > 0) { + return $query->row()->c; + } else { + return null; + } + } + + public function getMembres($id_parrain) + { + $query = $this->db->query("SELECT users.lastname,users.validation_code FROM agents_game g + INNER JOIN `users` ON `users`.id= g.id_joueur + WHERE g.id_parrain='" . $id_parrain . "'"); + if ($query->num_rows() > 0) { + return $query; + } else { + return false; + } + } + + public function getSimpleUser($code) + { + $query = $this->db->query("SELECT id , country, country_id FROM users_simple WHERE validation_code='" . $code . "'"); + if ($query->num_rows() > 0) { + return $query->first_row(); + } else { + return false; + } + } + + public function addMember($id_parrain, $id_newMember, $id_pays) + { + $query = $this->db->query("INSERT INTO agents_game(id_parrain, id_joueur, id_pays) VALUE (" . $id_parrain . "," . $id_newMember . "," . $id_pays . ")"); + return $query; + } + + public function checkIfIdExist($id) + { + $query = $this->db->query("SELECT * FROM agents_game WHERE id_joueur=" . $id . " OR id_parrain=" . $id); + if ($query->num_rows() > 0) { + return true; + } else { + return false; + } + } + + public function getIdCountry($code) + { + $query = $this->db->query("SELECT countries.id FROM `users` INNER JOIN `networks` ON `users`.network_id=`networks`.id INNER JOIN countries ON networks.country_id=countries.id WHERE users.validation_code='" . $code . "'"); + if ($query->num_rows() > 0) { + return $query->row()->id; + } else { + return false; + } + } + + public function checkIfGameActived($id_pays) + { + $query = $this->db->query("SELECT * FROM `configGame` WHERE id_pays='" . $id_pays . "'"); + if ($query->num_rows() > 0) { + if ($query->row()->etat == 1) { + return true; + } elseif ($query->row()->etat == 0) { + return false; + } + } else { + return false; + } + } +} diff --git a/application/views/dashbord.php b/application/views/dashboard.php similarity index 68% rename from application/views/dashbord.php rename to application/views/dashboard.php index 84d776c..9de420c 100644 --- a/application/views/dashbord.php +++ b/application/views/dashboard.php @@ -1,106 +1,114 @@ - - - - - iLinkWorld - - - - - - - - - - - - - - -
-
- - -
-
- - - - - \ No newline at end of file + + + + + iLinkWorld + + + + + + + + + + + + + + + + + +
+
+ + +
+
+ + + + + diff --git a/application/views/login.php b/application/views/login.php index 3456233..c825b6c 100644 --- a/application/views/login.php +++ b/application/views/login.php @@ -39,8 +39,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); Se connecter -
- +
+ @@ -52,12 +52,12 @@ defined('BASEPATH') OR exit('No direct script access allowed'); Connexion
- + + + + + +
@@ -68,7 +68,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
- + @@ -102,19 +102,11 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - - - \ No newline at end of file + diff --git a/composer.json b/composer.json index 30630e2..d584283 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "source": "https://github.com/bcit-ci/CodeIgniter" }, "require": { - "php": ">=5.3.7" + "php": ">=5.5" }, "suggest": { "paragonie/random_compat": "Provides better randomness in PHP 5.x" diff --git a/dist/css/main_dash.css b/dist/css/main_dash.css index 128c1bf..bae6f0e 100644 --- a/dist/css/main_dash.css +++ b/dist/css/main_dash.css @@ -1,131 +1,133 @@ -html,body{ - - background: #6787B1; - background: -webkit-linear-gradient(-135deg, #6787B1, #DA7028); - background: -o-linear-gradient(-135deg, #6787B1, #DA7028); - background: -moz-linear-gradient(-135deg, #6787B1, #DA7028); - background: linear-gradient(-135deg, #6787B1, #DA7028); -} -.login-container{ - margin-top: 5%; - margin-bottom: 5%; - -} -.login-form-1{ - padding: 5%; - background: #6787B1; - box-shadow: 0 5px 8px 0 rgba(0, 0, 0, 0.2), 0 9px 26px 0 rgba(0, 0, 0, 0.19); - color: #fff; -} -.login-form-1 h3{ - text-align: center; - color: #333; -} -.login-form-2{ - padding: 5%; - background: #DA7028; - box-shadow: 0 5px 8px 0 rgba(0, 0, 0, 0.2), 0 9px 26px 0 rgba(0, 0, 0, 0.19); -} -.login-form-2 h3{ - text-align: center; - color: #fff; -} -.login-container form{ - padding: 10%; -} -.btnPage2{ - display: inline-block; - border-radius: 1rem; - border: none; - cursor: pointer; - font-weight: 600; - color: #fff; - background-color: #6787B1; - margin-top: 50px; -} -.btnSubmit -{ - width: 50%; - text-align: center; - border-radius: 1rem; - padding: 1.5%; - border: none; - cursor: pointer; -} -.login-form-1 .btnSubmit{ - font-weight: 600; - color: #fff; - background-color: #DA7028; -} -.login-form-2 .btnSubmit{ - font-weight: 600; - color: #0062cc; - background-color: #fff; -} -.login-form-2 .ForgetPwd{ - color: #fff; - font-weight: 600; - text-decoration: none; -} -.login-form-1 .ForgetPwd{ - color: #0062cc; - font-weight: 600; - text-decoration: none; -} -.parent { - display: flex; - flex-direction: column; - justify-content: center; - } -.center{ - -} -.paging-nav { -text-align: right; -padding-top: 2px; -} - -.paging-nav a { -margin: auto 1px; -text-decoration: none; -display: inline-block; -padding: 1px 7px; -background: #91b9e6; -color: white; -border-radius: 3px; -} - -.paging-nav .selected-page { -background: #187ed5; -font-weight: bold; -} - -#add-code{ - color: #fff; -} - -@font-face { - font-family: gotham-thin; - src: url('../fonts/gotham/Gotham-Thin.woff'); - } - -#challenge{ - font-family: gotham-thin; - color: #ffffff; - font-size: 30px; - margin-top: 10px; - text-align: center; - } -#bloc-logo{ - height: 50px; -} - -.trash { color:rgb(209, 91, 71); } -.flag { color:rgb(248, 148, 6); } -.panel-body { padding:0px; } -.panel-footer .pagination { margin: 0; } -.panel .glyphicon,.list-group-item .glyphicon { margin-right:5px; } -.panel-body .radio, .checkbox { display:inline-block;margin:0px; } -.panel-body input[type=checkbox]:checked + label { text-decoration: line-through;color: rgb(128, 144, 160); } -.list-group-item:hover, a.list-group-item:focus {text-decoration: none;background-color: rgb(245, 245, 245);} -.list-group { margin-bottom:0px; } +html,body{ + + background: #6787B1; + background: -webkit-linear-gradient(-135deg, #6787B1, #DA7028); + background: -o-linear-gradient(-135deg, #6787B1, #DA7028); + background: -moz-linear-gradient(-135deg, #6787B1, #DA7028); + background: linear-gradient(-135deg, #6787B1, #DA7028); +} +.login-container{ + margin-top: 5%; + margin-bottom: 5%; + +} +.login-form-1{ + padding: 5%; + background: #6787B1; + box-shadow: 0 5px 8px 0 rgba(0, 0, 0, 0.2), 0 9px 26px 0 rgba(0, 0, 0, 0.19); + color: #fff; +} +.login-form-1 h3{ + text-align: center; + color: #333; +} +.login-form-2{ + padding: 5%; + background: #DA7028; + box-shadow: 0 5px 8px 0 rgba(0, 0, 0, 0.2), 0 9px 26px 0 rgba(0, 0, 0, 0.19); +} +.login-form-2 h3{ + text-align: center; + color: #fff; +} +.login-container form{ + padding: 10%; +} +.btnPage2{ + display: inline-block; + border-radius: 1rem; + border: none; + cursor: pointer; + font-weight: 600; + color: #fff; + background-color: #6787B1; + margin-top: 50px; +} +.btnSubmit +{ + width: 50%; + text-align: center; + border-radius: 1rem; + padding: 1.5%; + border: none; + cursor: pointer; + font-size: 15px; + line-height: 1.5; +} +.login-form-1 .btnSubmit{ + font-weight: 600; + color: #fff; + background-color: #DA7028; +} +.login-form-2 .btnSubmit{ + font-weight: 600; + color: #0062cc; + background-color: #fff; +} +.login-form-2 .ForgetPwd{ + color: #fff; + font-weight: 600; + text-decoration: none; +} +.login-form-1 .ForgetPwd{ + color: #0062cc; + font-weight: 600; + text-decoration: none; +} +.parent { + display: flex; + flex-direction: column; + justify-content: center; + } +.center{ + +} +.paging-nav { +text-align: right; +padding-top: 2px; +} + +.paging-nav a { +margin: auto 1px; +text-decoration: none; +display: inline-block; +padding: 1px 7px; +background: #91b9e6; +color: white; +border-radius: 3px; +} + +.paging-nav .selected-page { +background: #187ed5; +font-weight: bold; +} + +#add-code{ + color: #fff; +} + +@font-face { + font-family: gotham-thin; + src: url('../fonts/gotham/Gotham-Thin.woff'); + } + +#challenge{ + font-family: gotham-thin; + color: #ffffff; + font-size: 30px; + margin-top: 10px; + text-align: center; + } +#bloc-logo{ + height: 50px; +} + +.trash { color:rgb(209, 91, 71); } +.flag { color:rgb(248, 148, 6); } +.panel-body { padding:0px; } +.panel-footer .pagination { margin: 0; } +.panel .glyphicon,.list-group-item .glyphicon { margin-right:5px; } +.panel-body .radio, .checkbox { display:inline-block;margin:0px; } +.panel-body input[type=checkbox]:checked + label { text-decoration: line-through;color: rgb(128, 144, 160); } +.list-group-item:hover, a.list-group-item:focus {text-decoration: none;background-color: rgb(245, 245, 245);} +.list-group { margin-bottom:0px; }