Changeset 127 for Dev/branches

Timestamp:

10/14/11 17:54:42 (14 years ago)

Author:

fpvanagthoven

Message:

Login works good. Mainmenu looks visually the same now.

Location:

Dev/branches/cakephp/app

Files:

• app_controller.php (modified) (1 diff)
• controllers/pages_controller.php (modified) (2 diffs)
• controllers/users_controller.php (modified) (1 diff)
• models/question.php (added)
• mysql.sql (modified) (1 diff)
• tmp/logs/debug.log (modified) (1 diff)
• tmp/logs/error.log (modified) (1 diff)
• views/elements/application_menu.ctp (added)
• views/elements/menu.ctp (added)
• views/elements/question_menu.ctp (added)
• views/elements/session_menu.ctp (added)
• views/elements/survey_menu.ctp (added)
• views/pages/mainmenu.ctp (modified) (1 diff)

Dev/branches/cakephp/app/app_controller.php

@@ -50 +50 @@
         $this->Auth->loginError = "This message shows up when the wrong credentials are used";
         $this->Auth->authError = "Please log in first.";
-//        $this->Auth->loginRedirec
         $this->Auth->logoutRedirect = array('controller' => 'pages', 'action' => 'home');
     }

Dev/branches/cakephp/app/controllers/pages_controller.php

@@ -84 +84 @@
             $title_for_layout = Inflector::humanize($path[$count - 1]);
         }
+        
+        if ($page == 'home')
+        {
+            $this->home();
+        }
+        
         $this->set(compact('page', 'subpage', 'title_for_layout'));
         $this->render(implode('/', $path));
@@ -89 +95 @@
 
     function home() {
-        
+        if($this->Auth->user())
+        {
+            $this->redirect(array('action' => 'display', 'mainmenu'));
+        }
     }
 

Dev/branches/cakephp/app/controllers/users_controller.php

@@ -66 +66 @@
                 $this->User->create();
                 $this->User->save($this->data);
+                $this->redirect(array('action' => 'login'));
             } else {
                 $this->Session->setFlash('Could not register. Try again.');

Dev/branches/cakephp/app/mysql.sql

@@ +1 @@
+DROP TABLE IF EXISTS users;
+
 CREATE TABLE users (
     id integer auto_increment,

Dev/branches/cakephp/app/tmp/logs/debug.log

@@ -15 +15 @@
 2011-10-14 14:24:59 Debug: Notice (8): Undefined offset: 1 in [C:\wamp\www\researchtool\branches\cakephp\cake\libs\view\view.php, line 854]
 2011-10-14 14:24:59 Debug: Notice (8): Undefined offset: 0 in [C:\wamp\www\researchtool\branches\cakephp\cake\libs\view\view.php, line 859]
+2011-10-14 15:26:26 Debug: Notice (8): Undefined variable: applications in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\application_menu.ctp, line 17]
+2011-10-14 15:30:35 Debug: Notice (8): Undefined variable: surveys in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 22]

Dev/branches/cakephp/app/tmp/logs/error.log

@@ -1 +1 @@
 2011-10-14 14:24:59 Warning: Warning (2): strpos() expects parameter 1 to be string, array given in [C:\wamp\www\researchtool\branches\cakephp\cake\libs\view\view.php, line 851]
 2011-10-14 14:24:59 Warning: Warning (2): strpos() expects parameter 1 to be string, array given in [C:\wamp\www\researchtool\branches\cakephp\cake\libs\view\view.php, line 853]
+2011-10-14 15:26:26 Warning: Warning (2): Missing argument 1 for ApplicationMenu::__construct(), called in C:\wamp\www\researchtool\branches\cakephp\app\views\elements\application_menu.ctp on line 63 and defined in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\application_menu.ctp, line 10]
+2011-10-14 15:30:35 Warning: Warning (2): Missing argument 1 for SurveyMenu::__construct(), called in C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp on line 72 and defined in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 14]
+2011-10-14 15:30:35 Warning: Warning (2): Invalid argument supplied for foreach() in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 62]
+2011-10-14 15:30:43 Warning: Warning (2): Invalid argument supplied for foreach() in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 62]
+2011-10-14 15:32:33 Warning: Warning (2): Invalid argument supplied for foreach() in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 62]
+2011-10-14 15:32:52 Warning: Warning (2): Invalid argument supplied for foreach() in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 62]
+2011-10-14 15:39:24 Warning: Warning (2): Invalid argument supplied for foreach() in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 62]
+2011-10-14 15:39:26 Warning: Warning (2): Invalid argument supplied for foreach() in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 62]
+2011-10-14 15:39:26 Warning: Warning (2): Invalid argument supplied for foreach() in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 62]
+2011-10-14 15:39:27 Warning: Warning (2): Invalid argument supplied for foreach() in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 62]
+2011-10-14 15:41:42 Warning: Warning (2): Invalid argument supplied for foreach() in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 62]
+2011-10-14 15:42:35 Warning: Warning (2): Invalid argument supplied for foreach() in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 62]
+2011-10-14 15:42:37 Warning: Warning (2): Invalid argument supplied for foreach() in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 62]
+2011-10-14 15:42:37 Warning: Warning (2): Invalid argument supplied for foreach() in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 62]
+2011-10-14 15:42:38 Warning: Warning (2): Invalid argument supplied for foreach() in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 62]
+2011-10-14 15:47:04 Warning: Warning (2): Invalid argument supplied for foreach() in [C:\wamp\www\researchtool\branches\cakephp\app\views\elements\survey_menu.ctp, line 62]

Dev/branches/cakephp/app/views/pages/mainmenu.ctp

@@ -1 @@
-<div class="menu">mainmenuuu</div>
+<?php
+echo $this->Session->flash('auth');
+echo $this->Session->flash();
+
+echo $this->element('menu');
+echo $this->element('session_menu');
+echo $this->element('application_menu');
+echo $this->element('survey_menu');
+echo $this->element('question_menu');
+?>