diff --git a/inside/ActionParser.php b/inside/ActionParser.php index 4efae0b..0496ba8 100644 --- a/inside/ActionParser.php +++ b/inside/ActionParser.php @@ -1279,6 +1279,7 @@ public function _logIn() { public function _registerBugReport() { $bug = new BugReport(NULL, $_REQUEST); $bug->store(); + mail("kak-edb@studentersamfundet.no", '[Inside] New bug report', var_export($_REQUEST, true)); } public function _updateBugReportStatus() { diff --git a/inside/Page.php b/inside/Page.php index d7cf09c..64df12e 100644 --- a/inside/Page.php +++ b/inside/Page.php @@ -700,7 +700,7 @@ class Page { } // Migration LDAP (nikolark) $uid = getCurrentUser(); - if( !is_migrated($uid) && !membership_expired($uid) ) { + if( !is_migrated($uid) ) { ?>
diff --git a/inside/migration/inside_functions.php b/inside/migration/inside_functions.php index 2ebc16f..2e51124 100644 --- a/inside/migration/inside_functions.php +++ b/inside/migration/inside_functions.php @@ -6,8 +6,8 @@ setlocale(LC_TIME, $locale); //Extras require_once("../functions.php"); require_once("../language.php"); -//PEAR-class -require_once("DB.php"); +set_include_path(get_include_path() . PATH_SEPARATOR . "../../includes"); +require_once("DB.php"); // PEAR require_once("../User.php"); function update_user($username, $password) { diff --git a/js/functions.js b/js/functions.js index 9a5b818..4e9a154 100644 --- a/js/functions.js +++ b/js/functions.js @@ -226,7 +226,7 @@ function validateAllFieldsNotEmpty(id){ } function checkUsername(username){ - makeUsernameRequest("ajax.php?action=checkUsername&username=" + username); + makeUsernameRequest("../inside/ajax.php?action=checkUsername&username=" + username); } function checkZip(zipCode){ @@ -235,19 +235,19 @@ function checkZip(zipCode){ return true; }else { var z = zipCode.value; - makeZipRequest("ajax.php?action=checkZip&zip=" + z); + makeZipRequest("../inside/ajax.php?action=checkZip&zip=" + z); } } function addCategory(type){ var title = document.getElementById("title").value; var text = document.getElementById("text").value; - var url = "ajax.php?action=register-" + type + "category&title=" + title + "&text=" + text; + var url = "../inside/ajax.php?action=register-" + type + "category&title=" + title + "&text=" + text; makeCatRequest(url); } function deleteObject(type, id){ - var url = "ajax.php?action=delete-" + type + "&" + type + "id=" + id; + var url = "../inside/ajax.php?action=delete-" + type + "&" + type + "id=" + id; makeCatRequest(url); } @@ -355,4 +355,4 @@ StringBuffer.prototype.append = function(str){ StringBuffer.prototype.toString = function(){ return this.__strings__.join(""); -}; \ No newline at end of file +}; diff --git a/js/migration/byebye_inside.js b/js/migration/byebye_inside.js index 4810d9d..349ebea 100644 --- a/js/migration/byebye_inside.js +++ b/js/migration/byebye_inside.js @@ -5,7 +5,7 @@ function init_validation() { required: true, rangelength: [3, 12], lettersonly: true, - remote: "./migration/username_available.php", + remote: "/inside/migration/username_available.php", }, password: { required: true, @@ -32,7 +32,7 @@ function init_validation() { var form_password_check = $("#id_password_check").val(); var form_uid = $("#id_uid").val(); $.ajax({ - url: "./migration/submit_user.php", + url: "/inside/migration/submit_user.php", type: 'POST', data: { username: form_username, @@ -77,7 +77,7 @@ $( document ).ready( function() { buttons: { "Ok": function() { /* 2. Load in the user and pass form. */ - $(this).load('./migration/form.php', function() { + $(this).load('/inside/migration/form.php', function() { init_validation(); $(this).dialog('option',{ buttons: {