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

Merged with live changes

Browse Source
This commit is contained in:
oyvinbak committed 2011-08-23 12:44:08 +02:00
2 parents 95a62fe4ba 7ada424f2b
commit 30f6da18e7
2 files changed
+15 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

inside/User.php
+6 -4
View File
@@ -946,10 +946,10 @@ class User {
public function getExpiryDate($year = null) {
if($year)
{
return $year . '-07-01';
return $year . '-08-01';
}
if (date("m-d") > "07-01" )
if (date("m-d") > "08-01" )
{
return date("Y", strtotime("+1 year")) . '-08-01';
}
@@ -1245,7 +1245,7 @@ class User {
if ($this->expires == NULL) {
print "livsvarig";
} else {
print (date("Y", strtotime($this->expires)));
print $this->expires;
}
}
print " </td>\n";
@@ -1257,6 +1257,7 @@ class User {
print "<input type=\"hidden\" name=\"action\" value=\"update-user-expiry\" />\n";
print "<select name=\"newExpiryDate_" . $this->id . "\" id=\"newExpiryDate_" . $this->id . "\">\n";
print "<option value=\"0000-00-00\">" . "ugyldig utløpsår" . "</option>\n";
print "<option value=\"2011\" >" . "I år, gammelt medlemskap" . "</option>\n";
print "<option value=\"" . getStickerPeriod("now") . "\">" . "inneværende år (" . getStickerPeriod("now") . ")" . "</option>\n";
print "<option value=\"" . getStickerPeriod("+1 year") . "\">" . "neste år (" . getStickerPeriod("+1 year") . ")" . "</option>\n";
print "<option value=\"" . getStickerPeriod("+3 year") . "\">" . "tre år (" . getStickerPeriod("+3 year") . ")" . "</option>\n";
@@ -1279,7 +1280,8 @@ class User {
print "<div>";
print "<input type=\"hidden\" name=\"action\" value=\"update-user-last-sticker\" />";
print "<select name=\"newStickerDate_" . $this->id . "\" id=\"newStickerDate_" . $this->id . "\">";
print "<option value=\"" . getStickerPeriod("now") . "\">" . "inneværende år (" . getStickerPeriod("now") . ")" . "</option>\n";
print "<option value=\"2011\">" . "I år, gammelt medlemskap" . "</option>\n";
print "<option selected=\"selected\" value=\"" . getStickerPeriod("now") . "\">" . "inneværende år (" . getStickerPeriod("now") . ")" . "</option>\n";
print "<option value=\"" . getStickerPeriod("+1 year") . "\">" . "neste år (" . getStickerPeriod("+1 year") . ")" . "</option>\n";
print "<option value=\"" . getStickerPeriod("+3 year") . "\">" . "tre år (" . getStickerPeriod("+3 year") . ")" . "</option>\n";
print "<option value=\"" . getStickerPeriod("+5 year") . "\">" . "fem år (" . getStickerPeriod("+5 year") . ")" . "</option>\n";
inside/functions.php
+9
View File
@@ -626,6 +626,15 @@ function checkAuth($actionName = NULL) {
}
function checkPassword($userid, $verificationCode) {
$sperret = array('37403'=>"Betaling via kort ble ikke belastet, vennligst kontakt billettluka på Chateau Neuf eller medlemskap@studentersamfundet.no\n\n",
'100505'=>"SMS ble feilbelastet, hadde medlemskap\n\n");
if(@$sperret[$userid])
{
$msg = "Denne koden er sperret: {$sperret[$userid]}<br /><br />";
notify($msg);
return false;
}
if (trim($verificationCode) == substr(crypt(trim($userid), 1813), 2, 6)) {
return true;
}