Merge branch 'master' into hendrik-testing

2017-01-20 12:14:17 +01:00
parent 3152839dae 3752f3cd33
commit c93579913d
37 changed files with 812 additions and 652 deletions
--- a/website/views/adminpanel.php
+++ b/website/views/adminpanel.php
@@ -99,8 +99,15 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
        changeMultipleGroupStatusByID($db, $_POST["checkbox-group"], $_POST["groupbatchactions"]);
    }

+<<<<<<< HEAD
    if (isset($_POST["pageselect"])) {
        $currentpage = $_POST["pageselect"];
+=======
+    if (!empty($_POST["actions"]) && !empty($_POST["userID"])) {
+        changeUserStatusByID($_POST["userID"], $_POST["actions"]);
+    } elseif (!empty($_POST["actions"]) && !empty($_POST["groupID"])) {
+        changeGroupStatusByID($_POST["groupID"], $_POST["actions"]);
+>>>>>>> master
    }

 }