Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Closes #138 Fix notification settings when saving

Browse Source
This commit is contained in:
Mike Koch 2015-02-23 22:19:50 -05:00
parent 5c28c07c76
commit 9e116d1172
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
admin/manage_users.php
View File

@ -835,11 +835,25 @@ function hesk_validateUserInfo($pass_required = 1, $redirect_to = './manage_user
/* Any errors */ /* Any errors */
if (strlen($hesk_error_buffer)) if (strlen($hesk_error_buffer))
{ {
$hesk_error_buffer = $hesklang['rfm'].'<br /><br /><ul>'.$hesk_error_buffer.'</ul>'; if ($myuser['isadmin'])
hesk_process_messages($hesk_error_buffer,$redirect_to); {
// Preserve default staff data for the form
global $default_userdata;
$_SESSION['userdata']['features'] = $default_userdata['features'];
$_SESSION['userdata']['categories'] = $default_userdata['categories'];
}
$hesk_error_buffer = $hesklang['rfm'].'<br /><br /><ul>'.$hesk_error_buffer.'</ul>';
hesk_process_messages($hesk_error_buffer,$redirect_to);
} }
return $myuser; // "can_unban_emails" feature also enables "can_ban_emails"
if ( in_array('can_unban_emails', $myuser['features']) && ! in_array('can_ban_emails', $myuser['features']) )
{
$myuser['features'][] = 'can_ban_emails';
}
return $myuser;
} // End hesk_validateUserInfo() } // End hesk_validateUserInfo()

5
inc/profile_functions.inc.php
View File

@ -349,7 +349,9 @@ function hesk_profile_tab($session_array='new',$is_profile_page=true,$action='pr
<?php <?php
if ($action == 'profile_page') if ($action == 'profile_page')
{ ?> { ?>
<input type="submit" class="btn btn-default" value="<?php echo $hesklang['update_profile']; ?>" /> <input type="hidden" name="action" value="update">
<input type="hidden" name="token" value="<?php hesk_token_echo(); ?>">
<input type="submit" class="btn btn-default" value="<?php echo $hesklang['update_profile']; ?>">
<?php <?php
} elseif ($action == 'create_user') } elseif ($action == 'create_user')
{ ?> { ?>
@ -363,6 +365,7 @@ function hesk_profile_tab($session_array='new',$is_profile_page=true,$action='pr
<input type="hidden" name="a" value="save" /> <input type="hidden" name="a" value="save" />
<input type="hidden" name="userid" value="<?php echo intval( hesk_GET('id') ); ?>" /> <input type="hidden" name="userid" value="<?php echo intval( hesk_GET('id') ); ?>" />
<input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" /> <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />
<input type="hidden" name="active" value="<?php echo $_SESSION[$session_array]['active']; ?>">
<input class="btn btn-default" type="submit" value="<?php echo $hesklang['save_changes']; ?>" /> <input class="btn btn-default" type="submit" value="<?php echo $hesklang['save_changes']; ?>" />
<a class="btn btn-danger" href="manage_users.php"><?php echo $hesklang['dich']; ?></a> <a class="btn btn-danger" href="manage_users.php"><?php echo $hesklang['dich']; ?></a>
<?php <?php