summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/model/User_model.php2
-rw-r--r--includes/sys_form.php10
-rw-r--r--includes/sys_menu.php4
3 files changed, 8 insertions, 8 deletions
diff --git a/includes/model/User_model.php b/includes/model/User_model.php
index 5a31e7b8..7ea3ca3e 100644
--- a/includes/model/User_model.php
+++ b/includes/model/User_model.php
@@ -33,7 +33,7 @@ function User_tshirt_score($user) {
WHERE `User`.`UID` = ?
AND `Shifts`.`end` < ?
GROUP BY `User`.`UID`
- ',[
+ ', [
$user['UID'],
time()
]);
diff --git a/includes/sys_form.php b/includes/sys_form.php
index 797ba52e..c974c1d1 100644
--- a/includes/sys_form.php
+++ b/includes/sys_form.php
@@ -154,17 +154,17 @@ function form_multi_checkboxes($names, $label, $items, $selected, $disabled = []
* @param string $label
* @param string $selected
* @param string $value
- * @param string $id
+ * @param string $html_id
* @return string
*/
-function form_checkbox($name, $label, $selected, $value = 'checked', $id = null)
+function form_checkbox($name, $label, $selected, $value = 'checked', $html_id = null)
{
- if (is_null($id)) {
- $id = $name;
+ if (is_null($html_id)) {
+ $html_id = $name;
}
return '<div class="checkbox"><label>'
- . '<input type="checkbox" id="' . $id . '" name="' . $name . '" value="' . htmlspecialchars($value) . '" '
+ . '<input type="checkbox" id="' . $html_id . '" name="' . $name . '" value="' . htmlspecialchars($value) . '" '
. ($selected ? ' checked="checked"' : '') . ' /> '
. $label
. '</label></div>';
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index 85ef1287..fae94de5 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -89,8 +89,8 @@ function header_toolbar()
if (in_array('user_myshifts', $privileges)) {
$toolbar_items[] = toolbar_item_link(
page_link_to('users', ['action' => 'view']),
- ' icon-icon_angel',
- $user['Nick'],
+ '',
+ '<span class="icon-icon_angel"></span> ' . $user['Nick'],
$page == 'users'
);
}