deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Form button class update, fixes to module_method_token, fixes to json

Browse Source
This commit is contained in:
Deon George 2011-08-31 16:54:44 +10:00
parent c55a8fe4cc
commit 52074d239b
19 changed files with 62 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/classes/controller/admin/module/method.php
View File

@ -123,7 +123,7 @@ class Controller_Admin_Module_Method extends Controller_Admin_Module {
} }
$output .= View::factory('module/admin/method_detail_foot'); $output .= View::factory('module/admin/method_detail_foot');
$output .= '<div>'.Form::submit('submit',_('Update')).'</div>'; $output .= '<div>'.Form::submit('submit',_('Update'),array('class'=>'form_button')).'</div>';
$output .= Form::close(); $output .= Form::close();
Block::add(array( Block::add(array(

10
application/classes/controller/lnapp/login.php
View File

@ -119,6 +119,9 @@ class Controller_lnApp_Login extends Controller_TemplateDefault {
* Enable user password reset * Enable user password reset
*/ */
public function action_reset() { public function action_reset() {
// Minutes to keep our token
$token_expire = 15;
// If user already signed-in // If user already signed-in
if (Auth::instance()->logged_in()!= 0) { if (Auth::instance()->logged_in()!= 0) {
// Redirect to the user account // Redirect to the user account
@ -138,7 +141,7 @@ class Controller_lnApp_Login extends Controller_TemplateDefault {
// Check to see if there is already a token, if so, do nothing. // Check to see if there is already a token, if so, do nothing.
if ($mt->where('account_id','=',$ao->id)->and_where('method_id','=',$mmo->id)->find()) { if ($mt->where('account_id','=',$ao->id)->and_where('method_id','=',$mmo->id)->find()) {
if ($mt->date_expire < time()) { if ($mt->loaded() AND ($mt->date_expire < time())) {
$mt->delete(); $mt->delete();
$mt->clear(); $mt->clear();
} }
@ -147,18 +150,19 @@ class Controller_lnApp_Login extends Controller_TemplateDefault {
if (! $mt->loaded()) { if (! $mt->loaded()) {
$mt->account_id = $ao->id; $mt->account_id = $ao->id;
$mt->method_id = $mmo->id; $mt->method_id = $mmo->id;
$mt->date_expire = time() + 15*3600; $mt->date_expire = time() + $token_expire*60;
$mt->token = md5(sprintf('%s:%s:%s',$mt->account_id,$mt->method_id,$mt->date_expire)); $mt->token = md5(sprintf('%s:%s:%s',$mt->account_id,$mt->method_id,$mt->date_expire));
$mt->save(); $mt->save();
// Send our email with the token // Send our email with the token
$et = Email_Template::instance('account_reset_password'); $et = Email_Template::instance('account_reset_password');
$et->to = array($mt->account->email=>sprintf('%s %s',$mt->account->first_name,$mt->account->last_name)); $et->to = array('account'=>array($mt->account_id));
$et->variables = array( $et->variables = array(
'SITE'=>URL::base(TRUE,TRUE), 'SITE'=>URL::base(TRUE,TRUE),
'SITE_ADMIN'=>Config::sitename(), 'SITE_ADMIN'=>Config::sitename(),
'SITE_NAME'=>Config::sitename(), 'SITE_NAME'=>Config::sitename(),
'TOKEN'=>$mt->token, 'TOKEN'=>$mt->token,
'TOKEN_EXPIRE_MIN'=>$token_expire,
'USER_NAME'=>sprintf('%s %s',$mt->account->first_name,$mt->account->last_name), 'USER_NAME'=>sprintf('%s %s',$mt->account->first_name,$mt->account->last_name),
); );
$et->send(); $et->send();

70
application/classes/controller/tree.php
View File

@ -21,49 +21,51 @@ class Controller_Tree extends Controller_lnApp_Tree {
* *
* @param id * @param id
*/ */
public function action_json($id=null,array $data=array()) { public function action_json($id=NULL,array $data=array()) {
// Get the user details // Get the user details
$id = (is_null($id) && isset($_REQUEST['id'])) ? substr($_REQUEST['id'],2) : $id; $id = (is_null($id) AND isset($_REQUEST['id'])) ? substr($_REQUEST['id'],2) : $id;
$user = Auth::instance()->get_user(); $user = Auth::instance()->get_user();
if (! $id) { if ($user) {
$modules = array(); if (! $id) {
foreach ($user->groups() as $go) $modules = array();
$modules = array_merge($modules,Module_Method::groupmodules($go->id)); foreach ($user->groups() as $go)
$modules = array_merge($modules,Module_Method::groupmodules($go->id));
ksort($modules); ksort($modules);
$data = array(); $data = array();
foreach ($modules as $module => $details) foreach ($modules as $module => $details)
if (! $details['parent_id']) if (! $details['parent_id'])
array_push($data, array_push($data,
array('id'=>$details['id'],'name'=>$module,'state'=>'closed') array('id'=>$details['id'],'name'=>$module,'state'=>'closed')
); );
} else { } else {
$module = preg_replace('/^N_/','',$id); $module = preg_replace('/^N_/','',$id);
$methods = array(); $methods = array();
foreach ($user->groups() as $go) foreach ($user->groups() as $go)
$methods = array_merge($methods,Module_Method::groupmethods($go->id,$module)); $methods = array_merge($methods,Module_Method::groupmethods($go->id,$module));
ksort($methods); ksort($methods);
$data = array(); $data = array();
foreach ($methods as $method => $details) { foreach ($methods as $method => $details) {
if (preg_match('/_/',$method)) { if (preg_match('/_/',$method)) {
list($mode,$action) = explode('_',$method); list($mode,$action) = explode('_',$method);
$url = URL::site(sprintf('/%s/%s/%s',$mode,$details['module'],$action)); $url = URL::site(sprintf('/%s/%s/%s',$mode,$details['module'],$action));
} else { } else {
$url = URL::site(sprintf('/%s/%s',$details['module'],$method)); $url = URL::site(sprintf('/%s/%s',$details['module'],$method));
}
array_push($data,array(
'id'=>sprintf('%s_%s',$module,$details['id']),
'name'=>$method,
'state'=>'none',
'attr_id'=>sprintf('%s_%s',$module,$details['id']),
'attr_href'=>(empty($details['page']) ? $url : $details['page'])
));
} }
array_push($data,array(
'id'=>sprintf('%s_%s',$module,$details['id']),
'name'=>$method,
'state'=>'none',
'attr_id'=>sprintf('%s_%s',$module,$details['id']),
'attr_href'=>(empty($details['page']) ? $url : $details['page'])
));
} }
} }

3
application/media/css/default.css
View File

@ -4,9 +4,6 @@
font-family: Verdana, Arial, Helvetica, sans-serif; font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 12px; font-size: 12px;
color: #000000; color: #000000;
background-color: #E1E1E3;
border-color: #AAAACC;
border-width: 1px;
padding: 1px; padding: 1px;
} }

2
application/views/login.php
View File

@ -9,7 +9,7 @@
<tr><td colspan="2">&nbsp;</td></tr> <tr><td colspan="2">&nbsp;</td></tr>
<!-- @todo Password reset ability should be a config option (or auto detected) --> <!-- @todo Password reset ability should be a config option (or auto detected) -->
<tr><td colspan="2"><?echo HTML::anchor('login/reset',_('Forgot your password?')); ?></td></tr> <tr><td colspan="2"><?echo HTML::anchor('login/reset',_('Forgot your password?')); ?></td></tr>
<tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Authenticate'));?></td></tr> <tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Authenticate'),array('class'=>'form_button'));?></td></tr>
</table> </table>
<?php echo Form::close(); ?> <?php echo Form::close(); ?>
<!-- @todo The following focus() is not ajax/jscript friendly --> <!-- @todo The following focus() is not ajax/jscript friendly -->

2
application/views/login_reset.php
View File

@ -7,7 +7,7 @@
<table class="login"> <table class="login">
<tr><td><b>Email Address</b></td></tr> <tr><td><b>Email Address</b></td></tr>
<tr><td><?php echo Form::input('email',null,array('id'=>'login-uid','size'=>40));?></td></tr> <tr><td><?php echo Form::input('email',null,array('id'=>'login-uid','size'=>40));?></td></tr>
<tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Reset'));?></td></tr> <tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Reset'),array('class'=>'form_button'));?></td></tr>
</table> </table>
<?php echo Form::close(); ?> <?php echo Form::close(); ?>
<!-- @todo The following focus() is not ajax/jscript friendly --> <!-- @todo The following focus() is not ajax/jscript friendly -->

2
application/views/login_reset_sent.php
View File

@ -6,7 +6,7 @@
<table class="login"> <table class="login">
<tr><td><b>Pass code</b></td></tr> <tr><td><b>Pass code</b></td></tr>
<tr><td><?php echo Form::input('token',null,array('id'=>'login-pwd','size'=>40));?></td></tr> <tr><td><?php echo Form::input('token',null,array('id'=>'login-pwd','size'=>40));?></td></tr>
<tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Reset'));?></td></tr> <tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Reset'),array('class'=>'form_button'));?></td></tr>
</table> </table>
<?php echo Form::close(); ?> <?php echo Form::close(); ?>
<!-- @todo The following focus() is not ajax/jscript friendly --> <!-- @todo The following focus() is not ajax/jscript friendly -->

2
application/views/module/admin/method_add.php
View File

@ -17,5 +17,5 @@
<td><?php echo StaticList_YesNo::form('menu_display',0); ?></td> <td><?php echo StaticList_YesNo::form('menu_display',0); ?></td>
</tr> </tr>
</table> </table>
<?php echo Form::submit('submit',_('Add')); ?> <?php echo Form::submit('submit',_('Add'),array('class'=>'form_button')); ?>
<?php echo Form::close(); ?> <?php echo Form::close(); ?>

6
modules/account/classes/auth/osb.php
View File

@ -109,7 +109,6 @@ class Auth_OSB extends Auth_ORM {
// Check and see if we have a token to login and run the method // Check and see if we have a token to login and run the method
} elseif ((! empty($_REQUEST['token']) AND $token = $_REQUEST['token']) OR $token=Session::instance()->get('token')) { } elseif ((! empty($_REQUEST['token']) AND $token = $_REQUEST['token']) OR $token=Session::instance()->get('token')) {
if ($user=$this->_get_token_user($token) AND $user !== FALSE) if ($user=$this->_get_token_user($token) AND $user !== FALSE)
$status = TRUE; $status = TRUE;
@ -149,7 +148,6 @@ class Auth_OSB extends Auth_ORM {
*/ */
private function _get_token_user($token) { private function _get_token_user($token) {
$mmto = ORM::factory('module_method_token',array('token'=>$token)); $mmto = ORM::factory('module_method_token',array('token'=>$token));
$request = Request::current();
$user = FALSE; $user = FALSE;
if ($mmto->loaded()) { if ($mmto->loaded()) {
@ -164,9 +162,9 @@ class Auth_OSB extends Auth_ORM {
} else { } else {
// Check that the token is for this URI // Check that the token is for this URI
$mo = ORM::factory('module',array('name'=>$request->controller)); $mo = ORM::factory('module',array('name'=>Request::current()->controller()));
$mmo = ORM::factory('module_method', $mmo = ORM::factory('module_method',
array('name'=>$request->directory ? sprintf('%s_%s',$request->directory,$request->action) : $request->action)); array('name'=>Request::current()->directory() ? sprintf('%s_%s',Request::current()->directory(),Request::current()->action()) : Request::current()->action()));
// Ignore the token if this is not the right method. // Ignore the token if this is not the right method.
if ($mmo->id == $mmto->method_id) { if ($mmo->id == $mmto->method_id) {

3
modules/account/views/account/password_reset.php
View File

@ -1,4 +1,5 @@
<!-- @todo NEEDS TO BE TRANSLATED --> <!-- @todo NEEDS TO BE TRANSLATED -->
<br/>
<?php echo Form::open(); ?> <?php echo Form::open(); ?>
<table class="box-center"> <table class="box-center">
<tr> <tr>
@ -10,7 +11,7 @@
<td><input type="password" name="password_confirm" value=""/></td> <td><input type="password" name="password_confirm" value=""/></td>
</tr> </tr>
<tr> <tr>
<td colspan="2" style="text-align: center;"><?php echo Form::submit('update','Update'); ?></td> <td colspan="2" style="text-align: center;"><?php echo Form::submit('update','Update',array('class'=>'form_button')); ?></td>
</tr> </tr>
</table> </table>
<?php echo Form::close(); ?> <?php echo Form::close(); ?>

2
modules/account/views/account/user/edit.php
View File

@ -78,7 +78,7 @@
</tr> </tr>
<!-- @todo OTHER STATIC VARS --> <!-- @todo OTHER STATIC VARS -->
<tr> <tr>
<td colspan="2" style="text-align: center;"><?php echo Form::submit('update','Update'); ?></td> <td colspan="2" style="text-align: center;"><?php echo Form::submit('update','Update',array('class'=>'form_button')); ?></td>
</tr> </tr>
</table> </table>
<?php echo Form::close(); ?> <?php echo Form::close(); ?>

2
modules/account/views/register.php
View File

@ -125,7 +125,7 @@
<td><?php echo StaticList_YesNo::form('email_type',true); ?></td> <td><?php echo StaticList_YesNo::form('email_type',true); ?></td>
</tr> </tr>
<tr><td colspan="2">&nbsp;</td></tr> <tr><td colspan="2">&nbsp;</td></tr>
<tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Register'));?></td></tr> <tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Register'),array('class'=>'form_button'));?></td></tr>
</table> </table>
<?php echo Form::close(); ?> <?php echo Form::close(); ?>
<!-- @todo The following focus() is not ajax/jscript friendly --> <!-- @todo The following focus() is not ajax/jscript friendly -->

4
modules/email/classes/controller/admin/email.php
View File

@ -88,7 +88,7 @@ class Controller_Admin_Email extends Controller_TemplateDefault_Admin {
$output .= Form::open(); $output .= Form::open();
$output .= View::factory('email/admin/template/add'); $output .= View::factory('email/admin/template/add');
$output .= View::factory('email/admin/template/translate/add'); $output .= View::factory('email/admin/template/translate/add');
$output .= '<div>'.Form::submit('submit',_('Add')).'</div>'; $output .= '<div>'.Form::submit('submit',_('Add'),array('class'=>'form_button')).'</div>';
$output .= Form::close(); $output .= Form::close();
Editor::add(); Editor::add();
@ -139,7 +139,7 @@ class Controller_Admin_Email extends Controller_TemplateDefault_Admin {
)); ));
} }
$output .= '<div>'.Form::submit('submit',_('Update')).'</div>'; $output .= '<div>'.Form::submit('submit',_('Update'),array('class'=>'form_button')).'</div>';
$output .= Form::close(); $output .= Form::close();
Editor::add(); Editor::add();

2
modules/export/classes/controller/admin/export.php
View File

@ -62,7 +62,7 @@ class Controller_Admin_Export extends Controller_TemplateDefault_Admin {
} }
$output .= '</table>'; $output .= '</table>';
$output .= Form::submit('submit','export'); $output .= Form::submit('submit','export',array('class'=>'form_button'));
$output .= Form::close(); $output .= Form::close();
Style::add(array( Style::add(array(

2
modules/export/views/export/payment/header.php
View File

@ -1,6 +1,6 @@
<tr> <tr>
<td colspan="3"><?php echo Form::select('plugin',$plugins); ?></td> <td colspan="3"><?php echo Form::select('plugin',$plugins); ?></td>
<td colspan="2" style="text-align: right;"><?php echo Form::submit('submit','export'); ?></td> <td colspan="2" style="text-align: right;"><?php echo Form::submit('submit','export',array('class'=>'form_button')); ?></td>
</tr> </tr>
<!-- // @todo To translate --> <!-- // @todo To translate -->
<tr> <tr>

2
modules/product/views/product/view.php
View File

@ -77,7 +77,7 @@ echo Form::open('cart/add');
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="text-align: center;"><?php echo Form::submit('submit','Add to Cart'); ?> | <?php echo Form::submit('submit','Add to Cart & Checkout',array('disabled'=>'disabled')); ?></td> <td style="text-align: center;"><?php echo Form::submit('submit','Add to Cart',array('class'=>'form_button')); ?> | <?php echo Form::submit('submit','Add to Cart & Checkout',array('disabled'=>'disabled'),array('class'=>'form_button')); ?></td>
</tr> </tr>
</table> </table>
</td> </td>

2
modules/service/classes/controller/admin/service.php
View File

@ -380,7 +380,7 @@ GROUP BY DATE_FORMAT(DATE,"%%Y-%%m"),SID
$output .= Form::open(NULL,array('enctype'=>'multipart/form-data')); $output .= Form::open(NULL,array('enctype'=>'multipart/form-data'));
$output .= '<div>'; $output .= '<div>';
$output .= Form::file('csv'); $output .= Form::file('csv');
$output .= Form::submit('submit','upload'); $output .= Form::submit('submit','upload',array('class'=>'form_button'));
$output .= '</div>'; $output .= '</div>';
$output .= Form::close(); $output .= Form::close();

2
modules/service/views/service/admin/update.php
View File

@ -64,5 +64,5 @@
</td> </td>
</tr> </tr>
</table> </table>
<?php echo Form::submit('submit',_('Update')); ?> <?php echo Form::submit('submit',_('Update'),array('class'=>'form_button')); ?>
<?php echo Form::close(); ?> <?php echo Form::close(); ?>

2
modules/service/views/service/user/adsl/view.php
View File

@ -61,7 +61,7 @@
<table> <table>
<tr> <tr>
<td>View Daily Traffic for Month</td> <td>View Daily Traffic for Month</td>
<td><?php echo Form::open(); echo Form::select('month',array_merge(array(''),$so->get_traffic_months()),(isset($_POST['month']) ? $_POST['month'] : '')); echo Form::submit('submit',_('Show')); echo Form::close(); ?></td> <td><?php echo Form::open(); echo Form::select('month',array_merge(array(''),$so->get_traffic_months()),(isset($_POST['month']) ? $_POST['month'] : '')); echo Form::submit('submit',_('Show'),array('class'=>'form_button')); echo Form::close(); ?></td>
</tr> </tr>
</table> </table>
</td> </td>