bugeja fixattu

Redande · May 3, 2015 · ccc3045 · ccc3045
1 parent 2b750d0
commit ccc3045
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 19 deletions.
diff --git a/app/controllers/hello_world_controller.php b/app/controllers/hello_world_controller.php
@@ -12,14 +12,6 @@ public static function sandbox(){
         'name' => 'a'
         ));
       $errors = $validatortest->errors();
-
-      Kint::dump($errors);
-
-      // $NP = Hahmo::find(1);
-      // $hahmot = Hahmo::all();
-
-      // Kint::dump($hahmot);
-      // Kint::dump($NP);
     }
 
     public static function hahmolista(){

diff --git a/app/controllers/user_controller.php b/app/controllers/user_controller.php
@@ -9,10 +9,8 @@ public static function handle_login(){
 
     $user = User::authenticate($params['username'], $params['password']);
 
-    Kint::dump($user);
-
     if(!$user){
-      View::make('user/login.html', array('error' => 'Incorrect username or password!', 'username' => $params['username']));
+      View::make('user/login.html', array('message' => 'Incorrect username or password!', 'username' => $params['username']));
     }else{
       $_SESSION['user'] = $user->id;
 
@@ -33,7 +31,7 @@ public static function handle_signup(){
     ));
 
     $user->save();
-    Redirect::to('/', array('message' => 'Welcome ' . $user->username . '!'));
+    Redirect::to('/', array('message' => 'Welcome ' . $user->username . '! Note that you have to log in before you can use any features.'));
   }
 
   public static function logout(){

diff --git a/app/models/role.php b/app/models/role.php
@@ -83,8 +83,15 @@ public function update(){
 	}
 
 	public function destroy(){
+		self::deleteHeroes();
+
 		$query = DB::connection()->prepare('DELETE FROM Role WHERE id = :id');
 
 		$query->execute(array('id' => $this->id));
 	}
+
+	public function deleteHeroes(){
+		$query = DB::connection()->prepare('DELETE FROM JoinTable WHERE role = :role');
+		$query->execute(array('role' => $this->id));
+	}
 }
diff --git a/app/models/user.php b/app/models/user.php
@@ -11,7 +11,7 @@ public static function authenticate($username, $password){
 		$query = DB::connection()->prepare('SELECT * FROM Account WHERE username = :username AND password = :password LIMIT 1', array('username' => $username, 'password' => $password));
 		$query->execute(array('username' => $username, 'password' => $password));
 		$row = $query->fetch();
-		Kint::dump($row);
+
 		if($row){
 			$user = new User(array(
 				'id' => $row['id'],

diff --git a/app/views/hero/heroview.html b/app/views/hero/heroview.html
@@ -2,6 +2,14 @@
 {% block content %}
 
 {% import "macros/forms.html" as forms %}
+
+
+{% if message %}
+  <div class="alert alert-success">
+  {{message}}
+  </div>
+{% endif %}
+
   <header>
     <h1>{{hero.name}}</h1>
   </header>

diff --git a/app/views/hero/list.html b/app/views/hero/list.html
@@ -1,6 +1,12 @@
 {% extends "base.html" %}
 {% block content %}
 
+{% if message %}
+  <div class="alert alert-success">
+  {{message}}
+  </div>
+{% endif %}
+
 <h1>Heroes</h1>
 
 	<ol>

diff --git a/app/views/plans/frontpage.html b/app/views/plans/frontpage.html
@@ -1,9 +1,11 @@
 {% extends "base.html" %}
 {% block content %}
 
-<div class="alert alert-success">
+{% if message %}
+  <div class="alert alert-success">
   {{message}}
-</div>
+  </div>
+{% endif %}
 
   <header>
     <h1>Dota2 Database</h1>

diff --git a/app/views/role/list.html b/app/views/role/list.html
@@ -1,6 +1,12 @@
 {% extends "base.html" %}
 {% block content %}
 
+{% if message %}
+  <div class="alert alert-success">
+  {{message}}
+  </div>
+{% endif %}
+
 <h1>Roles</h1>
 
 	<ol>

diff --git a/app/views/role/roleview.html b/app/views/role/roleview.html
@@ -3,6 +3,13 @@
 
 {% import "macros/forms.html" as forms %}
 
+{% if message %}
+  <div class="alert alert-success">
+  {{message}}
+  </div>
+{% endif %}
+
+
   <header>
     <h1>{{role.name}}</h1>
   </header>

diff --git a/app/views/user/login.html b/app/views/user/login.html
@@ -1,9 +1,11 @@
 {% extends "base.html" %}
 {% block content %}
 
-<div class="alert alert-success">
-  {{error}}
-</div>
+{% if message %}
+  <div class="alert alert-success">
+  {{message}}
+  </div>
+{% endif %}
 
   <h1>Log in</h1>
 

diff --git a/lib/base_controller.php b/lib/base_controller.php
@@ -15,7 +15,7 @@ public static function get_user_logged_in(){
 
     public static function check_logged_in(){
       if(!isset($_SESSION['user'])){
-      Redirect::to('/login', array('error' => 'You have to log in to use that feature!'));
+      Redirect::to('/login', array('message' => 'You have to log in to use that feature!'));
     }
     }