Changeset:
666f5a0c7bd3
https://sourceforge.net/p/mrbs/hg-code/ci/666f5a0c7bd3c6da773616d8547433fd4da15068
Author:
John Beranek <[email protected]>
Date:
Thu Jun 01 23:09:28 2017 +0100
Log message:
Merged with default.
diffstat:
web/del.php | 2 +-
web/del_entry.php | 2 +-
web/edit_area_room.php | 6 +++---
web/edit_users.php | 10 ++++++----
web/session/session_http.inc | 2 +-
5 files changed, 12 insertions(+), 10 deletions(-)
diffs (107 lines):
diff -r 9b872faec92c -r 666f5a0c7bd3 web/del.php
--- a/web/del.php Thu Jun 01 23:08:27 2017 +0100
+++ b/web/del.php Thu Jun 01 23:09:28 2017 +0100
@@ -38,7 +38,7 @@
db()->commit();
// Go back to the admin page
- Header("Location: admin.php?area=$area");
+ header("Location: admin.php?area=$area");
}
else
{
diff -r 9b872faec92c -r 666f5a0c7bd3 web/del_entry.php
--- a/web/del_entry.php Thu Jun 01 23:08:27 2017 +0100
+++ b/web/del_entry.php Thu Jun 01 23:09:28 2017 +0100
@@ -105,7 +105,7 @@
}
}
- Header("Location: $returl");
+ header("Location: $returl");
exit();
}
}
diff -r 9b872faec92c -r 666f5a0c7bd3 web/edit_area_room.php
--- a/web/edit_area_room.php Thu Jun 01 23:08:27 2017 +0100
+++ b/web/edit_area_room.php Thu Jun 01 23:09:28 2017 +0100
@@ -624,7 +624,7 @@
{
$area = mrbsGetRoomArea($room);
}
- Header("Location: admin.php?day=$day&month=$month&year=$year&area=$area");
+ header("Location: admin.php?day=$day&month=$month&year=$year&area=$area");
exit();
}
@@ -777,7 +777,7 @@
// Release the mutex and go back to the admin page (for the new area)
db()->mutex_unlock($tbl_area);
- Header("Location:
admin.php?day=$day&month=$month&year=$year&area=$new_area");
+ header("Location:
admin.php?day=$day&month=$month&year=$year&area=$new_area");
exit();
}
@@ -1041,7 +1041,7 @@
db()->command($sql, $sql_params);
// Go back to the admin page
- Header("Location:
admin.php?day=$day&month=$month&year=$year&area=$area");
+ header("Location:
admin.php?day=$day&month=$month&year=$year&area=$area");
exit();
}
}
diff -r 9b872faec92c -r 666f5a0c7bd3 web/edit_users.php
--- a/web/edit_users.php Thu Jun 01 23:08:27 2017 +0100
+++ b/web/edit_users.php Thu Jun 01 23:09:28 2017 +0100
@@ -532,7 +532,9 @@
array(utf8_strtolower($user)));
if (($level < $min_user_editing_level) && ($Id != $my_id ))
{
- Header("Location: edit_users.php");
+ // It shouldn't normally be possible to get here.
+ trigger_error("Attempt made to update a user without sufficient rights.",
E_USER_NOTICE);
+ header("Location: edit_users.php");
exit;
}
@@ -606,7 +608,7 @@
// but someone might have spoofed the input in the edit form
if ($values[$fieldname] > $level)
{
- Header("Location: edit_users.php");
+ header("Location: edit_users.php");
exit;
}
break;
@@ -692,7 +694,7 @@
// form values
if (!$valid_data)
{
- Header("Location: edit_users.php?$q_string");
+ header("Location: edit_users.php?$q_string");
exit;
}
@@ -785,7 +787,7 @@
db()->command($operation, $sql_params);
/* Success. Redirect to the user list, to remove the form args */
- Header("Location: edit_users.php");
+ header("Location: edit_users.php");
}
}
diff -r 9b872faec92c -r 666f5a0c7bd3 web/session/session_http.inc
--- a/web/session/session_http.inc Thu Jun 01 23:08:27 2017 +0100
+++ b/web/session/session_http.inc Thu Jun 01 23:09:28 2017 +0100
@@ -24,7 +24,7 @@
{
global $auth;
header("WWW-Authenticate: Basic realm=\"$auth[realm]\"");
- Header("HTTP/1.0 401 Unauthorized");
+ header("HTTP/1.0 401 Unauthorized");
}
function getAuthPassword()
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
