Changeset 22436 for events/phpframework

Show
Ignore:
Timestamp:
10/31/08 18:18:33 (5 years ago)
Author:
gen
Message:
 
Location:
events/phpframework/akelos/trunk
Files:
6 added
4 removed
11 modified

Legend:

Unmodified
Added
Removed
  • events/phpframework/akelos/trunk/app/application_controller.php

    r21458 r22436  
    1818    public $app_helpers = 'all'; 
    1919 
     20    protected function getMyUser() 
     21    { 
     22        Ak::import('Sentinel'); 
     23        $Sentinel = new Sentinel(); 
     24        $Sentinel->init($this); 
     25        return $Sentinel->getUserFromSession(); 
     26    } 
     27 
     28    protected function isLoggedIn() 
     29    { 
     30        Ak::import('Sentinel'); 
     31        $Sentinel = new Sentinel(); 
     32        return $Sentinel->hasUserOnSession(); 
     33    } 
    2034} 
    2135 
  • events/phpframework/akelos/trunk/app/controllers/admin/dashboard_controller.php

    r21455 r22436  
    55    function index() 
    66    { 
     7    } 
     8 
     9    function home() 
     10    { 
    711        $this->renderAction('blank_slate'); 
     12        $this->index(); 
     13        $this->renderAction('index'); 
    814    } 
    915 
     
    1319        $this->flash_now['error'] = $this->t('You don\'t have enough privileges to perform selected action.'); 
    1420    } 
    15      
    16     function blank_slate() 
    17     { 
    18     } 
    1921} 
    2022 
  • events/phpframework/akelos/trunk/app/locales/user/en.php

    r22374 r22436  
    5555$dictionary['Privacy'] = 'Privacy'; 
    5656 
     57// 2008-10-31 8:15:28 
     58 
     59 
     60$dictionary['Image'] = 'Image'; 
     61$dictionary['Is private'] = 'Is private'; 
     62 
    5763 
    5864?> 
  • events/phpframework/akelos/trunk/app/locales/user/ja.php

    r22374 r22436  
    5555$dictionary['Privacy'] = 'Privacy'; 
    5656 
     57// 2008-10-31 8:15:28 
     58 
     59 
     60$dictionary['Image'] = 'Image'; 
     61$dictionary['Is private'] = 'Is private'; 
     62 
    5763 
    5864?> 
  • events/phpframework/akelos/trunk/app/locales/users/en.php

    r21394 r22436  
    120120$dictionary['11 minutes ago'] = '11 minutes ago'; 
    121121 
     122// 2008-10-31 8:46:09 
     123 
     124 
     125$dictionary['31 minutes ago'] = '31 minutes ago'; 
     126 
    122127 
    123128?> 
  • events/phpframework/akelos/trunk/app/locales/users/ja.php

    r21394 r22436  
    120120$dictionary['11 minutes ago'] = '11 minutes ago'; 
    121121 
     122// 2008-10-31 8:46:09 
     123 
     124 
     125$dictionary['31 minutes ago'] = '31 minutes ago'; 
     126 
    122127 
    123128?> 
  • events/phpframework/akelos/trunk/config/admin.yml

    r22374 r22436  
    1717      action: logout 
    1818    authentication_url: 
    19       controller: user 
     19      controller: dashboard 
    2020      action: home 
     21      module: admin 
  • events/phpframework/akelos/trunk/config/locales/en.php

    r22366 r22436  
    313313$dictionary['Please add --force to the argument list in order to overwrite existing files.'] = 'Please add --force to the argument list in order to overwrite existing files.'; 
    314314 
     315// 2008-10-31 8:33:07 
     316 
     317 
     318$dictionary['Current user has not been set yet.'] = 'Current user has not been set yet.'; 
     319 
    315320 
    316321?> 
  • events/phpframework/akelos/trunk/config/locales/ja.php

    r22366 r22436  
    311311$dictionary['Please add --force to the argument list in order to overwrite existing files.'] = 'Please add --force to the argument list in order to overwrite existing files.'; 
    312312 
     313// 2008-10-31 8:33:07 
     314 
     315 
     316$dictionary['Current user has not been set yet.'] = 'Current user has not been set yet.'; 
     317 
    313318 
    314319?> 
  • events/phpframework/akelos/trunk/config/routes.php

    r22366 r22436  
    77$Map->connect('/signup', array('controller' => 'account', 'action' => 'sign_up')); 
    88 
    9 $Map->connect('/home',   array('controller' => 'user', 'action' => 'home')); 
    10 $Map->connect('/:user',  array('controller' => 'user', 'action' => 'show')); 
    11  
     9$Map->connect('/home',   array('controller' => 'dashboard', 'action' => 'home', 'module' => 'admin')); 
    1210$Map->connect('/admin/:controller/:action/:id', array('controller' => 'dashboard', 'action' => 'index', 'module' => 'admin'));  
    1311$Map->connect('/:controller/:action/:id'); 
     12$Map->connect('/:user',  array('controller' => 'dashboard', 'action' => 'index')); 
  • events/phpframework/akelos/trunk/tmp/sess_b1e5b90ba9d50ad656bd6ebfff190da1

    r22365 r22436  
    1 lang|s:2:"ja";__flash|b:0;__flash_options|b:0;__current_user_id|N;__CurrentUserType|N;__OriginalRequest|s:3672:"O:9:"AkRequest":17:{s:8:"_request";a:9:{s:2:"ak";s:6:"admin/";s:8:"ak_login";a:2:{s:5:"login";s:4:"hoge";s:8:"password";s:8:"hogehoge";}s:9:"AK_56ed1d";s:32:"b1e5b90ba9d50ad656bd6ebfff190da1";s:6:"format";s:4:"html";s:4:"lang";s:2:"ja";s:10:"controller";s:9:"dashboard";s:6:"action";s:5:"index";s:6:"module";s:5:"admin";s:2:"id";s:0:"";}s:11:"_init_check";b:1;s:38:"__internationalization_support_enabled";b:1;s:6:"action";s:5:"index";s:10:"controller";s:9:"dashboard";s:4:"view";N;s:3:"env";a:41:{s:15:"REDIRECT_STATUS";s:3:"200";s:9:"HTTP_HOST";s:9:"localhost";s:15:"HTTP_USER_AGENT";s:87:"Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.0.3) Gecko/2008092417 Firefox/3.0.3";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:23:"ja,en-us;q=0.7,en;q=0.3";s:20:"HTTP_ACCEPT_ENCODING";s:12:"gzip,deflate";s:19:"HTTP_ACCEPT_CHARSET";s:29:"Shift_JIS,utf-8;q=0.7,*;q=0.7";s:15:"HTTP_KEEP_ALIVE";s:3:"300";s:15:"HTTP_CONNECTION";s:10:"keep-alive";s:12:"HTTP_REFERER";s:31:"http://localhost/phwittr/login/";s:11:"HTTP_COOKIE";s:42:"AK_56ed1d=b1e5b90ba9d50ad656bd6ebfff190da1";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:2:"56";s:4:"PATH";s:67:"C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\ruby\bin";s:10:"SystemRoot";s:10:"C:\WINDOWS";s:7:"COMSPEC";s:27:"C:\WINDOWS\system32\cmd.exe";s:7:"PATHEXT";s:48:".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH";s:6:"WINDIR";s:10:"C:\WINDOWS";s:16:"SERVER_SIGNATURE";s:133:"<address>Apache/2.2.8 (Win32) DAV/2 mod_ssl/2.2.8 OpenSSL/0.9.8g mod_autoindex_color PHP/5.2.5 Server at localhost Port 80</address> 
    2 ";s:15:"SERVER_SOFTWARE";s:85:"Apache/2.2.8 (Win32) DAV/2 mod_ssl/2.2.8 OpenSSL/0.9.8g mod_autoindex_color PHP/5.2.5";s:11:"SERVER_NAME";s:9:"localhost";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:9:"127.0.0.1";s:13:"DOCUMENT_ROOT";s:19:"C:/xampplite/htdocs";s:12:"SERVER_ADMIN";s:15:"admin@localhost";s:15:"SCRIPT_FILENAME";s:37:"C:/xampplite/htdocs/phwittr/index.php";s:11:"REMOTE_PORT";s:4:"1990";s:21:"REDIRECT_QUERY_STRING";s:9:"ak=admin/";s:12:"REDIRECT_URL";s:15:"/phwittr/admin/";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.1";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:9:"ak=admin/";s:11:"REQUEST_URI";s:15:"/phwittr/admin/";s:11:"SCRIPT_NAME";s:18:"/phwittr/index.php";s:8:"PHP_SELF";s:18:"/phwittr/index.php";s:12:"REQUEST_TIME";i:1225342236;s:4:"argv";a:1:{i:0;s:9:"ak=admin/";}s:4:"argc";i:1;}s:10:"mime_types";a:13:{s:9:"text/html";s:4:"html";s:21:"application/xhtml+xml";s:4:"html";s:15:"application/xml";s:3:"xml";s:8:"text/xml";s:3:"xml";s:15:"text/javascript";s:2:"js";s:22:"application/javascript";s:2:"js";s:24:"application/x-javascript";s:2:"js";s:16:"application/json";s:4:"json";s:11:"text/x-json";s:4:"json";s:19:"application/rss+xml";s:3:"rss";s:20:"application/atom+xml";s:4:"atom";s:3:"*/*";s:4:"html";s:7:"default";s:4:"html";}s:7:"_format";s:4:"html";s:2:"ak";s:6:"admin/";s:8:"ak_login";a:2:{s:5:"login";s:4:"hoge";s:8:"password";s:8:"hogehoge";}s:9:"AK_56ed1d";s:32:"b1e5b90ba9d50ad656bd6ebfff190da1";s:14:"__singleton_id";s:32:"ad09076acc975321d7c5e4ad9536d406";s:4:"lang";s:2:"ja";s:6:"module";s:5:"admin";s:2:"id";s:0:"";s:10:"parameters";a:9:{s:10:"controller";s:9:"dashboard";s:6:"action";s:5:"index";s:2:"ak";s:6:"admin/";s:8:"ak_login";a:2:{s:5:"login";s:4:"hoge";s:8:"password";s:8:"hogehoge";}s:9:"AK_56ed1d";s:32:"b1e5b90ba9d50ad656bd6ebfff190da1";s:6:"format";s:4:"html";s:4:"lang";s:2:"ja";s:6:"module";s:5:"admin";s:2:"id";s:0:"";}}"; 
     1lang|s:2:"ja";__flash|b:0;__flash_options|b:0;__current_user_id|s:1:"1";__CurrentUserType|s:4:"User";__OriginalRequest|s:3399:"O:9:"AkRequest":16:{s:8:"_request";a:8:{s:2:"ak";s:12:"admin/users/";s:9:"AK_56ed1d";s:32:"b1e5b90ba9d50ad656bd6ebfff190da1";s:6:"format";s:4:"html";s:4:"lang";s:2:"ja";s:10:"controller";s:5:"users";s:6:"action";s:5:"index";s:6:"module";s:5:"admin";s:2:"id";s:0:"";}s:11:"_init_check";b:1;s:38:"__internationalization_support_enabled";b:1;s:6:"action";s:5:"index";s:10:"controller";s:5:"users";s:4:"view";N;s:3:"env";a:39:{s:15:"REDIRECT_STATUS";s:3:"200";s:9:"HTTP_HOST";s:9:"localhost";s:15:"HTTP_USER_AGENT";s:87:"Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.0.3) Gecko/2008092417 Firefox/3.0.3";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:23:"ja,en-us;q=0.7,en;q=0.3";s:20:"HTTP_ACCEPT_ENCODING";s:12:"gzip,deflate";s:19:"HTTP_ACCEPT_CHARSET";s:29:"Shift_JIS,utf-8;q=0.7,*;q=0.7";s:15:"HTTP_KEEP_ALIVE";s:3:"300";s:15:"HTTP_CONNECTION";s:10:"keep-alive";s:12:"HTTP_REFERER";s:31:"http://localhost/phwittr/admin/";s:11:"HTTP_COOKIE";s:42:"AK_56ed1d=b1e5b90ba9d50ad656bd6ebfff190da1";s:18:"HTTP_CACHE_CONTROL";s:9:"max-age=0";s:4:"PATH";s:67:"C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\ruby\bin";s:10:"SystemRoot";s:10:"C:\WINDOWS";s:7:"COMSPEC";s:27:"C:\WINDOWS\system32\cmd.exe";s:7:"PATHEXT";s:48:".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH";s:6:"WINDIR";s:10:"C:\WINDOWS";s:16:"SERVER_SIGNATURE";s:133:"<address>Apache/2.2.8 (Win32) DAV/2 mod_ssl/2.2.8 OpenSSL/0.9.8g mod_autoindex_color PHP/5.2.5 Server at localhost Port 80</address> 
     2";s:15:"SERVER_SOFTWARE";s:85:"Apache/2.2.8 (Win32) DAV/2 mod_ssl/2.2.8 OpenSSL/0.9.8g mod_autoindex_color PHP/5.2.5";s:11:"SERVER_NAME";s:9:"localhost";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:9:"127.0.0.1";s:13:"DOCUMENT_ROOT";s:19:"C:/xampplite/htdocs";s:12:"SERVER_ADMIN";s:15:"admin@localhost";s:15:"SCRIPT_FILENAME";s:37:"C:/xampplite/htdocs/phwittr/index.php";s:11:"REMOTE_PORT";s:4:"1242";s:21:"REDIRECT_QUERY_STRING";s:15:"ak=admin/users/";s:12:"REDIRECT_URL";s:21:"/phwittr/admin/users/";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.1";s:14:"REQUEST_METHOD";s:3:"GET";s:12:"QUERY_STRING";s:15:"ak=admin/users/";s:11:"REQUEST_URI";s:21:"/phwittr/admin/users/";s:11:"SCRIPT_NAME";s:18:"/phwittr/index.php";s:8:"PHP_SELF";s:18:"/phwittr/index.php";s:12:"REQUEST_TIME";i:1225408525;s:4:"argv";a:1:{i:0;s:15:"ak=admin/users/";}s:4:"argc";i:1;}s:10:"mime_types";a:13:{s:9:"text/html";s:4:"html";s:21:"application/xhtml+xml";s:4:"html";s:15:"application/xml";s:3:"xml";s:8:"text/xml";s:3:"xml";s:15:"text/javascript";s:2:"js";s:22:"application/javascript";s:2:"js";s:24:"application/x-javascript";s:2:"js";s:16:"application/json";s:4:"json";s:11:"text/x-json";s:4:"json";s:19:"application/rss+xml";s:3:"rss";s:20:"application/atom+xml";s:4:"atom";s:3:"*/*";s:4:"html";s:7:"default";s:4:"html";}s:7:"_format";s:4:"html";s:2:"ak";s:12:"admin/users/";s:9:"AK_56ed1d";s:32:"b1e5b90ba9d50ad656bd6ebfff190da1";s:14:"__singleton_id";s:32:"b7218767fddd599bf538ebe4d17e10b5";s:4:"lang";s:2:"ja";s:6:"module";s:5:"admin";s:2:"id";s:0:"";s:10:"parameters";a:8:{s:10:"controller";s:5:"users";s:6:"action";s:5:"index";s:2:"ak";s:12:"admin/users/";s:9:"AK_56ed1d";s:32:"b1e5b90ba9d50ad656bd6ebfff190da1";s:6:"format";s:4:"html";s:4:"lang";s:2:"ja";s:6:"module";s:5:"admin";s:2:"id";s:0:"";}}";