OSDN Git Service

(root) / trpgtools-onweb / cake-frame.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3c56f71)
Session仕様変更対応
authorCake <cake_67@users.sourceforge.jp>
Mon, 29 Nov 2010 05:09:30 +0000 (14:09 +0900)
committerCake <cake_67@users.sourceforge.jp>
Mon, 29 Nov 2010 05:09:30 +0000 (14:09 +0900)
app/controllers/app_controller.php patch | blob | history
app/controllers/users_controller.php patch | blob | history
app/views/layouts/admin_default.ctp patch | blob | history
app/views/layouts/default.ctp patch | blob | history
app/views/layouts/mobile_default.ctp patch | blob | history

diff --git a/app/controllers/app_controller.php b/app/controllers/app_controller.php
index 97a3415..4328d9f 100644 (file)
--- a/app/controllers/app_controller.php
+++ b/app/controllers/app_controller.php
@@ -28,6 +28,7 @@ class AppController extends Controller
        var $site_configs = array();
 
        var $components = array(
+               'Session',
                'AuthPlus',
                'Cakeplus.HtmlEscape',
                'Token',
@@ -43,7 +44,8 @@ class AppController extends Controller
                'Text',
                'Time',
                'Settings',
-               'Media.Medium',
+               'Session',
+               'Media.Media',
                'Media.Upfile',
                'Cache',
                'Token'
diff --git a/app/controllers/users_controller.php b/app/controllers/users_controller.php
index 9224ac1..d503ce3 100644 (file)
--- a/app/controllers/users_controller.php
+++ b/app/controllers/users_controller.php
@@ -177,6 +177,7 @@ class UsersController extends AppController {
                                $this->Session->setFlash(__('Invalid data.', true));
                                $this->redirect(array('action'=>'edit_image'));
                        }
+
                        if (count($user['Attachment']) == 1) {
                                if (!empty($this->data['Attachment'][0])) {
                                        $this->Session->setFlash(__('Invalid data.', true));
diff --git a/app/views/layouts/admin_default.ctp b/app/views/layouts/admin_default.ctp
index 8a14072..017560a 100644 (file)
--- a/app/views/layouts/admin_default.ctp
+++ b/app/views/layouts/admin_default.ctp
@@ -158,8 +158,8 @@ switch ($this->params["controller"]) {
 ?>
 </div>
 
-<?php $session->flash('auth'); ?>
-<?php $session->flash(); ?>
+<?php echo $session->flash('auth'); ?>
+<?php echo $session->flash(); ?>
 
 <?php echo $content_for_layout; ?>
 </div>
@@ -175,6 +175,5 @@ switch ($this->params["controller"]) {
 </div>
 
 </div>
-<?php echo $cakeDebug; ?>
 </body>
 </html>
\ No newline at end of file
diff --git a/app/views/layouts/default.ctp b/app/views/layouts/default.ctp
index 2249a84..8f40579 100644 (file)
--- a/app/views/layouts/default.ctp
+++ b/app/views/layouts/default.ctp
@@ -62,8 +62,8 @@ echo $site_configs['Design.customCss']['value'];
 <div id="container">
 
 <?php if (!isset($site_configs) || !isset($user)): ?>
-<?php $session->flash('auth'); ?>
-<?php $session->flash(); ?>
+<?php echo $session->flash('auth'); ?>
+<?php echo $session->flash(); ?>
 <?php echo $content_for_layout; ?>
 <?php else: ?>
 
@@ -137,8 +137,8 @@ switch ($this->params["controller"]) {
 }
 ?>
 </div>
-<?php $session->flash('auth'); ?>
-<?php $session->flash(); ?>
+<?php echo $session->flash('auth'); ?>
+<?php echo $session->flash(); ?>
 <?php echo $content_for_layout; ?>
 </div>
 <?php endif; ?>
@@ -170,6 +170,5 @@ if (isset($character['System']['copyright'])) {
 </div>
 
 </div>
-<?php echo $cakeDebug; ?>
 </body>
 </html>
\ No newline at end of file
diff --git a/app/views/layouts/mobile_default.ctp b/app/views/layouts/mobile_default.ctp
index f4cfc71..43683b4 100644 (file)
--- a/app/views/layouts/mobile_default.ctp
+++ b/app/views/layouts/mobile_default.ctp
@@ -16,10 +16,10 @@
 </head>
 <body>
 <?php if ($session->flash()): ?>
-<div><?php $session->flash(); ?></div>
+<div><?php echo $session->flash(); ?></div>
 <?php endif; ?>
 <?php if ($session->check('Message.auth')): ?>
-<div><?php $session->flash('auth'); ?></div>
+<div><?php echo $session->flash('auth'); ?></div>
 <?php endif; ?>
 <?php echo $content_for_layout; ?>
 <div id="footer"></div>
TRPGサイト向け会員認証システム
About OSDN
Find Software
Develop Software
Help