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

live changes

Browse Source
This commit is contained in:
Mausern Testbruker committed 2011-08-07 23:56:07 +02:00
1 parent edf3ab07ba
commit b89bdfde6c
4 files changed
+66 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

inside/ActionParser.php
+1
View File
@@ -764,6 +764,7 @@ private function logError($username, $error)
}
public function _deleteEvent() {
die('<html><body>Sletting av eventer er midlertidig avskrudd. Ta kontakt med komans@studentersamfundet.no eller edb@studentersamfundet.no for &aring; f&aring; slettet ting.</body></html>');
Event :: delete(scriptParam("eventid"));
}
inside/Page.php
+1 -1
View File
@@ -3344,7 +3344,7 @@ Om dere lager en facebook side til arrangementet, ikke glem &aring; putte inn le
print "<input type=\"hidden\" name=\"action\" value=\"membership-sale\" />";
print "<input type=\"hidden\" name=\"userid\" value=\"" . $user->getId() . "\" />";
if ($user->getCardDelivered()) {
print "<input type=\"hidden\" name=\"subaction2\" value=\"order-new-card\" />";
print "<input type=\"hidden\" name=\"subaction\" value=\"order-new-card\" />";
print "<input type=\"submit\" name=\"order-new-card\" value=\"Bestill nytt kort\" />";
}
print "</form>";
inside/User.php
+40 -35
View File
@@ -575,11 +575,11 @@ class User {
}
public function renewMembership($cardno) {
$expires = $this->getExpiryDate();
if ($expires <= $this->expires) {
if (!$this->hasExpired()) {
notify("Du har allerede gyldig medlemskap for dette året.");
return false;
}
$expires = $this->getExpiryDate();
$this->conn->autoCommit(false);
if ($this->_registerUsedCardno($cardno) == true) {
$sql = "UPDATE din_user SET " . " expires = '$expires' " . "WHERE " . " id = $this->id";
@@ -602,11 +602,11 @@ class User {
}
public function renewMembershipPayex() {
$expires = $this->getExpiryDate();
if ($expires <= $this->expires) {
if (!$this->hasExpired()) {
notify("Du har allerede gyldig medlemskap for dette året.");
return false;
}
$expires = $this->getExpiryDate();
$this->conn->autoCommit(false);
$sql = "UPDATE din_user SET " . " expires = '$expires' " . "WHERE " . " id = $this->id";
$result = $this->conn->query($sql);
@@ -626,11 +626,11 @@ class User {
}
public function renewMembershipEurobate() {
$expires = $this->getExpiryDate();
if ($expires <= $this->expires) {
if (!$this->hasExpired()) {
// har allerede gyldig medlemskap
return false;
}
$expires = $this->getExpiryDate();
$this->conn->autoCommit(false);
$sql = "UPDATE din_user SET " . " expires = '$expires' " . "WHERE " . " id = $this->id";
$result = $this->conn->query($sql);
@@ -685,8 +685,7 @@ class User {
/* Order new membercard if old one is lost */
public function renewMembercardPayex() {
$expires = $this->getExpiryDate();
if ($expires > $this->expires) {
if ($this->hasExpired()) {
notify("Du har ikke gyldig medlemskap for dette året.");
return false;
}
@@ -986,37 +985,43 @@ class User {
* @return boolean
**/
public function setAddressStatus($value) {
// check for valid input value
if (is_numeric($value) && $value >= 0 && $value <=2) {
$sql = "UPDATE din_user SET " .
"valid_address = '$value' " .
"WHERE " .
"id = $this->id";
$result = $this->conn->query($sql);
if (DB :: isError($result) != true) {
$this->validAddress = $value;
switch ($value) {
case 1:
$valuetext = "gyldig"; break;
case 2:
$valuetext = "ukjent"; break;
default:
$valuetext = "ugyldig"; break;
// only update if new status is different from old one
if ($this->validAddress == $value) {
// do nothing, old and new status is the same
return true;
} else {
// check for valid input value
if (is_numeric($value) && $value >= 0 && $value <=2) {
$sql = "UPDATE din_user SET " .
"valid_address = '$value' " .
"WHERE " .
"id = $this->id";
$result = $this->conn->query($sql);
if (DB :: isError($result) != true) {
$this->validAddress = $value;
switch ($value) {
case 1:
$valuetext = "gyldig"; break;
case 2:
$valuetext = "ukjent"; break;
default:
$valuetext = "ugyldig"; break;
}
// store update
$this->_registerUpdate("Adressestatus satt til $valuetext.");
// done
return true;
} else {
notify("Problemer med registreringen av adressestatus");
return false;
}
// store update
$this->_registerUpdate("Adressestatus satt til $valuetext.");
// done
return true;
} else {
notify("Problemer med registreringen av adressestatus");
notify("Ugyldig adressestatusverdi: " . $value);
return false;
}
} else {
notify("Ugyldig adressestatusverdi: " . $value);
return false;
}
return false;
}
inside/functions.php
+24 -1
View File
@@ -634,13 +634,36 @@ function checkPassword($userid, $verificationCode) {
}
function displayCode($code) {
print "<p>" . getCode($code) . "</p>";
print "<p>";
print "Kortnummer: $code<br />";
print "Kode: " . getCode($code) . "<br />";
if (isValidCode($code)) {
print "Koden har ikke vært brukt";
} else {
print "<font color=\"red\">Koden har allerede vært brukt</font>";
}
print "</p>";
}
function getCode($code) {
return substr(crypt(trim($code), 1813), 2, 6);
}
function isValidCode($code) {
$conn = db_connect();
$sql = "SELECT id FROM din_user WHERE cardno=$code";
$result = $conn->query($sql);
if (DB :: isError($result) != true) {
if ($result->numRows() > 0) {
return false;
}
} else {
error($result->toString());
notify("En ukjent feil oppstod. Vennligst kontakt administrator.");
}
return true;
}
function generatePassword() {
$seed = rand(1, 2000);