Skip to content

Commit

Permalink
Merge pull request #63 from AdwinTrave/CI3
Browse files Browse the repository at this point in the history 
CI3 update
  • Loading branch information
@donjakobo
donjakobo committed Sep 14, 2013
2 parents 810b828 + 762103c commit b68a313
Show file tree
Hide file tree
Showing 53 changed files with 281 additions and 327 deletions.
2 changes: 0 additions & 2 deletions a3m_database.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@ CREATE TABLE IF NOT EXISTS `a3m_account` (

CREATE TABLE IF NOT EXISTS `a3m_account_details` (
`account_id` bigint(20) unsigned NOT NULL,
`fullname` varchar(160) DEFAULT NULL,
`firstname` varchar(80) DEFAULT NULL,
`lastname` varchar(80) DEFAULT NULL,
`dateofbirth` date DEFAULT NULL,
`gender` char(1) DEFAULT NULL,
`postalcode` varchar(40) DEFAULT NULL,
`country` char(2) DEFAULT NULL,
`language` char(2) DEFAULT NULL,
`timezone` varchar(40) DEFAULT NULL,
Expand Down
60 changes: 33 additions & 27 deletions application/config/foreign_chars.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@
'/д/' => 'd',
'/Ð|Ď|Đ|Δ/' => 'Dj',
'/ð|ď|đ|δ/' => 'dj',
'/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě|Ε|Έ|Ẽ|Ẻ|Ẹ|Ề|Ế|Ễ|Ể|Ệ|Е|Ё|Э/' => 'E',
'/è|é|ê|ë|ē|ĕ|ė|ę|ě|έ|ε|ẽ|ẻ|ẹ|ề|ế|ễ|ể|ệ|е|ё|э/' => 'e',
'/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě|Ε|Έ|Ẽ|Ẻ|Ẹ|Ề|Ế|Ễ|Ể|Ệ|Е|Э/' => 'E',
'/è|é|ê|ë|ē|ĕ|ė|ę|ě|έ|ε|ẽ|ẻ|ẹ|ề|ế|ễ|ể|ệ|е|э/' => 'e',
'/Ф/' => 'F',
'/ф/' => 'f',
'/Ĝ|Ğ|Ġ|Ģ|Γ|Г/' => 'G',
'/ĝ|ğ|ġ|ģ|γ|г/' => 'g',
'/Ĝ|Ğ|Ġ|Ģ|Γ|Г|Ґ/' => 'G',
'/ĝ|ğ|ġ|ģ|γ|г|ґ/' => 'g',
'/Ĥ|Ħ/' => 'H',
'/ĥ|ħ/' => 'h',
'/Ì|Í|Î|Ï|Ĩ|Ī|Ĭ|Ǐ|Į|İ|Η|Ή|Ί|Ι|Ϊ|Ỉ|Ị|И|Й/' => 'I',
'/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı|η|ή|ί|ι|ϊ|ỉ|ị|и|й/' => 'i',
'/Ì|Í|Î|Ï|Ĩ|Ī|Ĭ|Ǐ|Į|İ|Η|Ή|Ί|Ι|Ϊ|Ỉ|Ị|И|Ы/' => 'I',
'/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı|η|ή|ί|ι|ϊ|ỉ|ị|и|ы|ї/' => 'i',
'/Ĵ/' => 'J',
'/ĵ/' => 'j',
'/Ķ|Κ|К/' => 'K',
Expand All @@ -80,18 +80,18 @@
'/ś|ŝ|ş|ș|š|ſ|σ|ς|с/' => 's',
'/Ț|Ţ|Ť|Ŧ|τ|Т/' => 'T',
'/ț|ţ|ť|ŧ|т/' => 't',
'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự|У|Ъ/' => 'U',
'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự|у|ъ/' => 'u',
'/Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ|Ỳ|Ỹ|Ỷ|Ỵ/' => 'Y',
'/ý|ÿ|ŷ|ỳ|ỹ|ỷ|ỵ/' => 'y',
'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự|У/' => 'U',
'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự|у/' => 'u',
'/Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ|Ỳ|Ỹ|Ỷ|Ỵ|Й/' => 'Y',
'/ý|ÿ|ŷ|ỳ|ỹ|ỷ|ỵ|й/' => 'y',
'/В/' => 'V',
'/в/' => 'v',
'/Ŵ/' => 'W',
'/ŵ/' => 'w',
'/Ź|Ż|Ž|Ζ|З/' => 'Z',
'/ź|ż|ž|ζ|з/' => 'z',
'/Æ|Ǽ/' => 'AE',
'/ß/'=> 'ss',
'/ß/' => 'ss',
'/IJ/' => 'IJ',
'/ij/' => 'ij',
'/Œ/' => 'OE',
Expand All @@ -101,22 +101,28 @@
'/β/' => 'v',
'/μ/' => 'm',
'/ψ/' => 'ps',
'/Ж/'=>'Zh',
'/ж/'=>'zh',
'/Х/'=>'Kh',
'/х/'=>'kh',
'/Ц/'=>'Tc',
'/ц/'=>'tc',
'/Ч/'=>'Ch',
'/ч/'=>'ch',
'/Ш/'=>'Sh',
'/ш/'=>'sh',
'/Щ/'=>'Shch',
'/щ/'=>'shch',
'/Ю/'=>'Iu',
'/ю/'=>'iu',
'/Я/'=>'Ia',
'/я/'=>'ia'
'/Ё/' => 'Yo',
'/ё/' => 'yo',
'/Є/' => 'Ye',
'/є/' => 'ye',
'/Ї/' => 'Yi',
'/Ж/' => 'Zh',
'/ж/' => 'zh',
'/Х/' => 'Kh',
'/х/' => 'kh',
'/Ц/' => 'Ts',
'/ц/' => 'ts',
'/Ч/' => 'Ch',
'/ч/' => 'ch',
'/Ш/' => 'Sh',
'/ш/' => 'sh',
'/Щ/' => 'Shch',
'/щ/' => 'shch',
'/Ъ|ъ|Ь|ь/' => '',
'/Ю/' => 'Yu',
'/ю/' => 'yu',
'/Я/' => 'Ya',
'/я/' => 'ya'
);

/* End of file foreign_chars.php */
Expand Down
5 changes: 1 addition & 4 deletions application/controllers/account/Account_linked.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ function __construct()
$this->load->config('account/account');
$this->load->helper(array('language', 'account/ssl', 'url'));
$this->load->library(array('account/authentication', 'account/authorization', 'form_validation'));
$this->load->model('account/account_model');
$this->load->model('account/account_facebook_model');
$this->load->model('account/account_twitter_model');
$this->load->model('account/account_openid_model');
$this->load->model(array('account/account_model', 'account/account_facebook_model', 'account/account_twitter_model', 'account/account_openid_model'));
$this->load->language(array('general', 'account/account_linked', 'account/connect_third_party'));
}

Expand Down
3 changes: 1 addition & 2 deletions application/controllers/account/Account_profile.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ function __construct()
$this->load->config('account/account');
$this->load->helper(array('language', 'account/ssl', 'url', 'photo'));
$this->load->library(array('account/authentication', 'account/authorization', 'form_validation', 'gravatar'));
$this->load->model('account/account_model');
$this->load->model('account/account_details_model');
$this->load->model(array('account/account_model', 'account/account_details_model'));
$this->load->language(array('general', 'account/account_profile'));
}

Expand Down
9 changes: 2 additions & 7 deletions application/controllers/account/Account_settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ function __construct()
$this->load->config('account/account');
$this->load->helper(array('date', 'language', 'account/ssl', 'url'));
$this->load->library(array('account/authentication', 'account/authorization', 'form_validation'));
$this->load->model('account/account_model');
$this->load->model('account/account_details_model');
$this->load->model('account/ref_country_model');
$this->load->model('account/ref_language_model');
$this->load->model('account/ref_zoneinfo_model');
$this->load->model(array('account/account_model', 'account/account_details_model', 'account/ref_country_model', 'account/ref_language_model', 'account/ref_zoneinfo_model'));
$this->load->language(array('general', 'account/account_settings'));
}

Expand Down Expand Up @@ -57,7 +53,7 @@ function index()

// Setup form validation
$this->form_validation->set_error_delimiters('<div class="field_error">', '</div>');
$this->form_validation->set_rules(array(array('field' => 'settings_email', 'label' => 'lang:settings_email', 'rules' => 'trim|required|valid_email|max_length[160]'), array('field' => 'settings_fullname', 'label' => 'lang:settings_fullname', 'rules' => 'trim|max_length[160]'), array('field' => 'settings_firstname', 'label' => 'lang:settings_firstname', 'rules' => 'trim|max_length[80]'), array('field' => 'settings_lastname', 'label' => 'lang:settings_lastname', 'rules' => 'trim|max_length[80]'), array('field' => 'settings_postalcode', 'label' => 'lang:settings_postalcode', 'rules' => 'trim|max_length[40]')));
$this->form_validation->set_rules(array(array('field' => 'settings_email', 'label' => 'lang:settings_email', 'rules' => 'trim|required|valid_email|max_length[160]'), array('field' => 'settings_firstname', 'label' => 'lang:settings_firstname', 'rules' => 'trim|max_length[80]'), array('field' => 'settings_lastname', 'label' => 'lang:settings_lastname', 'rules' => 'trim|max_length[80]')));

// Run form validation
if ($this->form_validation->run())
Expand All @@ -82,7 +78,6 @@ function index()
$this->input->post('settings_dob_day', TRUE) &&
$this->input->post('settings_dob_year', TRUE)) $attributes['dateofbirth'] = mdate('%Y-%m-%d', strtotime($this->input->post('settings_dob_day', TRUE).'-'.$this->input->post('settings_dob_month', TRUE).'-'.$this->input->post('settings_dob_year', TRUE)));

$attributes['fullname'] = $this->input->post('settings_fullname', TRUE) ? $this->input->post('settings_fullname', TRUE) : NULL;
$attributes['firstname'] = $this->input->post('settings_firstname', TRUE) ? $this->input->post('settings_firstname', TRUE) : NULL;
$attributes['lastname'] = $this->input->post('settings_lastname', TRUE) ? $this->input->post('settings_lastname', TRUE) : NULL;
$attributes['gender'] = $this->input->post('settings_gender', TRUE) ? $this->input->post('settings_gender', TRUE) : NULL;
Expand Down
6 changes: 1 addition & 5 deletions application/controllers/account/Connect_create.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ function __construct()
$this->load->config('account/account');
$this->load->helper(array('language', 'account/ssl', 'url'));
$this->load->library(array('account/authentication', 'account/authorization', 'form_validation'));
$this->load->model('account/account_model');
$this->load->model('account/account_details_model');
$this->load->model('account/account_facebook_model');
$this->load->model('account/account_twitter_model');
$this->load->model('account/account_openid_model');
$this->load->model(array('account/account_model', 'account/account_details_model', 'account/account_facebook_model', 'account/account_twitter_model', 'account/account_openid_model'));
$this->load->language(array('general', 'account/connect_third_party'));
}

Expand Down
3 changes: 1 addition & 2 deletions application/controllers/account/Connect_facebook.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ function __construct()
$this->load->config('account/account');
$this->load->helper(array('language', 'account/ssl', 'url'));
$this->load->library(array('account/authentication', 'account/authorization', 'account/facebook_lib'));
$this->load->model('account/account_model');
$this->load->model('account/account_facebook_model');
$this->load->model(array('account/account_model', 'account/account_facebook_model'));
$this->load->language(array('general', 'account/sign_in', 'account/account_linked', 'account/connect_third_party'));
}

Expand Down
3 changes: 1 addition & 2 deletions application/controllers/account/Connect_google.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ function __construct()
$this->load->config('account/account');
$this->load->helper(array('language', 'account/ssl', 'url', 'account/openid'));
$this->load->library(array('account/authentication', 'account/authorization'));
$this->load->model('account/account_model');
$this->load->model('account/account_openid_model');
$this->load->model(array('account/account_model', 'account/account_openid_model'));
$this->load->language(array('general', 'account/sign_in', 'account/account_linked', 'account/connect_third_party'));
}

Expand Down
3 changes: 1 addition & 2 deletions application/controllers/account/Connect_openid.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ function __construct()
$this->load->config('account/account');
$this->load->helper(array('language', 'account/ssl', 'url', 'account/openid'));
$this->load->library(array('account/authentication', 'account/authorization'));
$this->load->model('account/account_model');
$this->load->model('account/account_openid_model');
$this->load->model(array('account/account_model', 'account/account_openid_model'));
$this->load->language(array('general', 'account/sign_in', 'account/account_linked', 'account/connect_third_party'));
}

Expand Down
3 changes: 1 addition & 2 deletions application/controllers/account/Connect_twitter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ function __construct()
$this->load->config('account/account');
$this->load->helper(array('language', 'account/ssl', 'url'));
$this->load->library(array('account/authentication', 'account/authorization', 'account/twitter_lib'));
$this->load->model('account/account_model');
$this->load->model('account/account_twitter_model');
$this->load->model(array('account/account_model', 'account/account_twitter_model'));
$this->load->language(array('general', 'account/sign_in', 'account/account_linked', 'account/connect_third_party'));
}

Expand Down
3 changes: 1 addition & 2 deletions application/controllers/account/Connect_yahoo.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ function __construct()
$this->load->config('account/account');
$this->load->helper(array('language', 'account/ssl', 'url', 'account/openid'));
$this->load->library(array('account/authentication', 'account/authorization'));
$this->load->model('account/account_model');
$this->load->model('account/account_openid_model');
$this->load->model(array('account/account_model', 'account/account_openid_model'));
$this->load->language(array('general', 'account/sign_in', 'account/account_linked', 'account/connect_third_party'));
}

Expand Down
10 changes: 8 additions & 2 deletions application/controllers/account/Sign_in.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function index()
maintain_ssl($this->config->item("ssl_enabled"));

// Redirect signed in users to homepage
if ($this->authentication->is_signed_in()) redirect('');
if ($this->authentication->is_signed_in()) redirect(base_url());

// Set default recaptcha pass
$recaptcha_pass = $this->session->userdata('sign_in_failed_attempts') < $this->config->item('sign_in_recaptcha_offset') ? TRUE : FALSE;
Expand Down Expand Up @@ -65,8 +65,14 @@ function index()
else
{
// Authenticate
if ( ! $this->authentication->sign_in($this->input->post('sign_in_username_email', TRUE), $this->input->post('sign_in_password', TRUE), $this->input->post('sign_in_remember', TRUE)))
if ($this->authentication->sign_in($this->input->post('sign_in_username_email', TRUE), $this->input->post('sign_in_password', TRUE), $this->input->post('sign_in_remember', TRUE)))
{
//change this to redirect to page you want your users to go after logins
redirect(base_url());
}
else
{
//show login error
$data['sign_in_error'] = lang('sign_in_combination_incorrect');
}
}
Expand Down
37 changes: 21 additions & 16 deletions application/controllers/account/Sign_up.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ function __construct()
$this->load->config('account/account');
$this->load->helper(array('language', 'account/ssl', 'url'));
$this->load->library(array('account/authentication', 'account/authorization', 'account/recaptcha', 'form_validation'));
$this->load->model('account/account_details_model');
$this->load->model('account/account_model');
$this->load->model(array('account/account_details_model', 'account/account_model'));
$this->load->language(array('general', 'account/sign_up', 'account/connect_third_party'));
}

Expand All @@ -42,23 +41,13 @@ function index()

// Setup form validation
$this->form_validation->set_error_delimiters('<span class="field_error">', '</span>');
$this->form_validation->set_rules(array(array('field' => 'sign_up_username', 'label' => 'lang:sign_up_username', 'rules' => 'trim|required|alpha_dash|min_length[2]|max_length[24]'), array('field' => 'sign_up_password', 'label' => 'lang:sign_up_password', 'rules' => 'trim|required|min_length[6]'), array('field' => 'sign_up_email', 'label' => 'lang:sign_up_email', 'rules' => 'trim|required|valid_email|max_length[160]')));
$this->form_validation->set_rules(array(array('field' => 'sign_up_username', 'label' => 'lang:sign_up_username', 'rules' => 'trim|required|alpha_dash|min_length[2]|max_length[24]|callback_username_check'), array('field' => 'sign_up_password', 'label' => 'lang:sign_up_password', 'rules' => 'trim|required|min_length[6]'), array('field' => 'sign_up_email', 'label' => 'lang:sign_up_email', 'rules' => 'trim|required|valid_email|max_length[160]|callback_email_check'), array('field' => 'sign_up_password_confirm', 'label' => 'lang:sign_up_password_confirm', 'rules' => 'trim|required|min_length[6]|matches[sign_up_password]')));

// Run form validation
if (($this->form_validation->run() === TRUE) && ($this->config->item("sign_up_enabled")))
{
// Check if user name is taken
if ($this->username_check($this->input->post('sign_up_username')) === TRUE)
{
$data['sign_up_username_error'] = lang('sign_up_username_taken');
}
// Check if email already exist
elseif ($this->email_check($this->input->post('sign_up_email')) === TRUE)
{
$data['sign_up_email_error'] = lang('sign_up_email_exist');
}
// Either already pass recaptcha or just passed recaptcha
elseif ( ! ($this->session->userdata('sign_up_recaptcha_pass') == TRUE || $recaptcha_result === TRUE) && $this->config->item("sign_up_recaptcha_enabled") === TRUE)
if ( ! ($this->session->userdata('sign_up_recaptcha_pass') == TRUE || $recaptcha_result === TRUE) && $this->config->item("sign_up_recaptcha_enabled") === TRUE)
{
$data['sign_up_recaptcha_error'] = $this->input->post('recaptcha_response_field') ? lang('sign_up_recaptcha_incorrect') : lang('sign_up_recaptcha_required');
}
Expand Down Expand Up @@ -99,7 +88,15 @@ function index()
*/
function username_check($username)
{
return $this->account_model->get_by_username($username) ? TRUE : FALSE;
if($this->account_model->get_by_username($username))
{
return TRUE;
}
else
{
$this->form_validation->set_message('sign_up_username', 'lang:sign_up_username_taken');
return FALSE;
}
}

/**
Expand All @@ -111,7 +108,15 @@ function username_check($username)
*/
function email_check($email)
{
return $this->account_model->get_by_email($email) ? TRUE : FALSE;
if($this->account_model->get_by_email($email))
{
return TRUE;
}
else
{
$this->form_validation->set_message('sign_up_email', 'lang:');
return FALSE;
}
}

}
Expand Down
27 changes: 4 additions & 23 deletions application/controllers/admin/Manage_permissions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,7 @@ function __construct()
$this->load->config('account/account');
$this->load->helper(array('date', 'language', 'account/ssl', 'url'));
$this->load->library(array('account/authentication', 'account/authorization', 'form_validation'));
$this->load->model('account/account_model');
$this->load->model('account/account_details_model');
$this->load->model('account/acl_permission_model');
$this->load->model('account/acl_role_model');
$this->load->model('account/rel_account_permission_model');
$this->load->model('account/rel_account_role_model');
$this->load->model('account/rel_role_permission_model');
$this->load->model(array('account/account_model', 'account/account_details_model', 'account/acl_permission_model', 'account/acl_role_model', 'account/rel_account_permission_model', 'account/rel_account_role_model', 'account/rel_role_permission_model'));
$this->load->language(array('general', 'admin/manage_permissions', 'account/account_settings', 'account/account_profile', 'account/sign_up', 'account/account_password'));
}

Expand Down Expand Up @@ -131,7 +125,6 @@ function save($id=null)
$data['role_permissions'] = $this->rel_role_permission_model->get_by_permission_id($id);
$data['action'] = 'update';
$data['is_system'] = ($data['permission']->is_system == 1);
$data['is_disabled'] = isset( $data['permission']->suspendedon );
}

// Setup form validation
Expand Down Expand Up @@ -177,12 +170,11 @@ function save($id=null)
// Check if the permission should be disabled
if( $this->authorization->is_permitted('delete_permissions') )
{
$permission_ban = $this->input->post('manage_permission_ban', TRUE);
if( isset($permission_ban) )
if( $this->input->post('manage_permission_ban', TRUE) )
{
$this->acl_permission_model->update_suspended_datetime($id);
}
else
elseif( $this->input->post('manage_permission_unban', TRUE) )
{
$this->acl_permission_model->remove_suspended_datetime($id);
}
Expand All @@ -202,18 +194,7 @@ function save($id=null)
}
}

if( $is_new )
{
// Redirect to view the newly created role
redirect("admin/manage_permissions/save/{$id}");
}
else
{
// Permission information may have been updated, re-get
$data['permission'] = $this->acl_permission_model->get_by_id($id);
$data['role_permissions'] = $this->rel_role_permission_model->get_by_permission_id($id);
$data['is_disabled'] = isset( $data['permission']->suspendedon );
}
redirect('admin/manage_permissions');
}
}
// Load manage permissions view
Expand Down
Loading

0 comments on commit b68a313

Please sign in to comment.