Skip to content
Permalink
Browse files

Removed fuel_url from fuel_lang file to prevent errors with settings

  • Loading branch information
daylightstudio committed Feb 10, 2016
1 parent b2b4421 commit 39f76eac5b244faf2c66f37ac4fb5ce7003e17f9
@@ -25,7 +25,7 @@ function _remap($module, $segs = NULL)
// Only super admins can execute builds for now
if ($validate AND !$this->fuel->auth->is_super_admin())
{
show_error(lang('error_no_access'));
show_error(lang('error_no_access', fuel_url()));
}
// call before build hook
@@ -22,7 +22,7 @@ function __construct($validate = TRUE)
if (empty($this->module))
{
show_error(lang('cannot_determine_module'));
show_error(lang('cannot_determine_module', fuel_url()));
}
$params = array();
@@ -794,7 +794,7 @@ function create($field = NULL, $redirect = TRUE)
// check permissions
if ( ! $this->fuel->auth->has_permission($this->module_obj->permission, 'create'))
{
show_error(lang('error_no_permissions'));
show_error(lang('error_no_permissions', fuel_url()));
}
$inline = $this->fuel->admin->is_inline();
@@ -1000,7 +1000,7 @@ function edit($id = NULL, $field = NULL, $redirect = TRUE)
// check permissions
if ( ! $this->fuel->auth->has_permission($this->module_obj->permission, 'edit') AND ! $this->fuel->auth->has_permission($this->module_obj->permission, 'create'))
{
show_error(lang('error_no_permissions'));
show_error(lang('error_no_permissions', fuel_url()));
}
$inline = $this->fuel->admin->is_inline();
@@ -1607,7 +1607,7 @@ function delete($id = NULL)
if ( ! $this->fuel->auth->has_permission($this->permission, 'delete'))
{
show_error(lang('error_no_permissions'));
show_error(lang('error_no_permissions', fuel_url()));
}
$inline = $this->fuel->admin->is_inline();
@@ -1749,7 +1749,7 @@ function restore()
{
if ( ! $this->fuel->auth->has_permission($this->permission, 'edit'))
{
show_error(lang('error_no_permissions'));
show_error(lang('error_no_permissions', fuel_url()));
}
if ( ! empty($_POST['fuel_restore_version']) AND ! empty($_POST['fuel_restore_ref_id']))
@@ -1785,7 +1785,7 @@ function replace($id = NULL)
if ( ! $this->fuel->auth->has_permission($this->permission, 'edit') OR ! $this->fuel->auth->has_permission($this->permission, 'delete'))
{
show_error(lang('error_no_permissions'));
show_error(lang('error_no_permissions', fuel_url()));
}
$success = FALSE;
@@ -2011,7 +2011,7 @@ function export()
if ( ! $this->fuel->auth->has_permission($this->permission, 'export'))
{
show_error(lang('error_no_permissions'));
show_error(lang('error_no_permissions', fuel_url()));
}
if ( ! empty($_POST))
@@ -32,7 +32,7 @@ public function create($field = NULL, $redirect = TRUE)
// check permissions
if ( ! $this->fuel->auth->has_permission($this->module_obj->permission, 'create'))
{
show_error(lang('error_no_permissions'));
show_error(lang('error_no_permissions', fuel_url()));
}
if (isset($_POST['id'])) // check for dupes
@@ -136,7 +136,7 @@ public function edit($id = NULL, $field = NULL, $redirect = TRUE)
// check permissions
if ( ! $this->fuel->auth->has_permission($this->module_obj->permission, 'edit') AND !$this->fuel->auth->has_permission($this->module_obj->permission, 'create'))
{
show_error(lang('error_no_permissions'));
show_error(lang('error_no_permissions', fuel_url()));
}
if ($this->input->post('id'))
@@ -17,7 +17,7 @@
| Error Messages
|--------------------------------------------------------------------------
*/
$lang['error_no_access'] = 'You do not have access to this page. <a href="'.fuel_url().'">Try logging in again</a>.';
$lang['error_no_access'] = 'You do not have access to this page. <a href="%1s">Try logging in again</a>.';
$lang['error_missing_module'] = "You are missing the module %1s.";
$lang['error_invalid_login'] = 'Invalid login.';
$lang['error_max_attempts'] = 'Sorry, but your login information was incorrect and you are temporarily locked out. Please try again in %s seconds.';
@@ -36,7 +36,7 @@
$lang['error_invalid_folder'] = 'Invalid folder %1s';
$lang['error_file_already_exists'] = 'File %1s already exists.';
$lang['error_zip'] = 'There was an error creating the zipped file.';
$lang['error_no_permissions'] = 'You do not have permissions to complete this action. <a href="'.fuel_url().'">Try logging in again</a>.';
$lang['error_no_permissions'] = 'You do not have permissions to complete this action. <a href="%1s">Try logging in again</a>.';
$lang['error_no_lib_permissions'] = 'You do not have permission to execute methods on the %1s class.';
$lang['error_page_layout_variable_conflict'] = 'There is an error with this layout because it either doesn\'t exist or contains one or more of the following reserved words: %1s';
$lang['error_no_curl_lib'] = 'You must have the curl php extension to use these tools.';
@@ -329,7 +329,7 @@ public function validate_user($permission, $type = 'edit', $show_error = TRUE)
{
if ($show_error)
{
show_error(lang('error_no_access'));
show_error(lang('error_no_access', fuel_url()));
}
else
{
@@ -102,7 +102,7 @@ protected function _validate_user($permission, $type = '', $show_error = TRUE)
{
if ($show_error)
{
show_error(lang('error_no_access'));
show_error(lang('error_no_access', fuel_url()));
}
else
{
@@ -1470,7 +1470,7 @@ protected function _editable_by_user()
$rec = $this->find_one_array($this->_tables['fuel_users'].'.id = '.$this->limit_to_user_field);
if (!empty($rec) AND ($rec[$this->limit_to_user_field] != $this->fuel->auth->user_data('id')))
{
$this->add_error(lang('error_no_permissions'));
$this->add_error(lang('error_no_permissions', fuel_url()));
return FALSE;
}
}

0 comments on commit 39f76ea

Please sign in to comment.
You can’t perform that action at this time.