edb/inside
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.neuf.no/inside

Browse Source
This commit is contained in:
root@amen committed 2013-03-20 21:02:21 +01:00
2 parents 61d9a56d68 cd34ff227f
commit 64cee58142
2 files changed
+7 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

inside/ActionParser.php
+3 -1
View File
@@ -1279,7 +1279,9 @@ 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));
$user_url = "https://inside.studentersamfundet.no/index.php?page=display-user&userid=".$_REQUEST['user_id'];
$message = "Bruker:".$user_url."\n Type feil: ".$_REQUEST['title']."\nMelding fra bruker: " .$_REQUEST['comment'];
mail("medlemskap@studentersamfundet.no, kak-edb@studentersamfundet.no", '[Inside] Ny melding om noe muffins fra bruker', $message);
}
public function _updateBugReportStatus() {
js/ajax.js
+4 -4
View File
@@ -5,7 +5,7 @@ function requestConcertInfo(callerid, target, programid) {
var gigNo = parseInt(match[0]);
var oXmlHttp = zXmlHttp.createRequest();
oXmlHttp.open("get", "getconcertinfo.php?gigid=" + iId + "&store=" + gigNo + "&programid=" + programid, true);
oXmlHttp.open("get", "inside/getconcertinfo.php?gigid=" + iId + "&store=" + gigNo + "&programid=" + programid, true);
oXmlHttp.onreadystatechange = function() {
if (oXmlHttp.readyState == 4){
if (oXmlHttp.status == 200) {
@@ -23,7 +23,7 @@ function grantCardNumber(userid) {
form.style.display = "none";
var oXmlHttp = zXmlHttp.createRequest();
var sURL = "grantcardno.php?userid=" + userid;
var sURL = "inside/grantcardno.php?userid=" + userid;
oXmlHttp.open("get", sURL, true);
oXmlHttp.onreadystatechange = function() {
if (oXmlHttp.readyState == 4){
@@ -151,7 +151,7 @@ function setOrderDeliveryStatus(orderid) {
var value = input.value;
var oXmlHttp = zXmlHttp.createRequest();
var sURL = "setorderdelivery.php?orderid=" + orderid + "&newstatusid=" + value;
var sURL = "inside/setorderdelivery.php?orderid=" + orderid + "&newstatusid=" + value;
oXmlHttp.open("get", sURL, true);
oXmlHttp.onreadystatechange = function() {
if (oXmlHttp.readyState == 4) {
@@ -180,7 +180,7 @@ function setWeekText(sText, iId, sType) {
var oXmlHttp = zXmlHttp.createRequest();
sText = escape(sText);
var sURL = "setweekprogramtext.php?wid=" + iId + "&text=" + sText + "&type=" + sType;
var sURL = "inside/setweekprogramtext.php?wid=" + iId + "&text=" + sText + "&type=" + sType;
oXmlHttp.open("get", sURL, true);
oXmlHttp.onreadystatechange = function() {
if (oXmlHttp.readyState == 4){