Unneccesery merge

inside/ActionParser.php

@@ -1301,7 +1301,7 @@ private function logError($username, $error)
       if ($subaction == "sticker-sale") {
         $user->_registerUpdate("Oblat solgt i billettbod");
         $user->updateExpiry(scriptParam("new-sticker-date"));
-        $user->updateLastSticker(scriptParam("new-sticker-date"));
+        $user->updateLastSticker(getStickerPeriod(scriptParam("new-sticker-date")));
       } elseif ($subaction == "give-sticker") {
         $user->_registerUpdate("Gyldig medlemskap, oblat gitt ut i billettluka");
         $user->updateLastSticker(scriptParam("new-sticker-date"));

inside/Page.php

@@ -3456,25 +3456,26 @@ Om dere lager en facebook side til arrangementet, ikke glem å putte inn le
               print "lever ut kort";
             } else {
               print "<input type=\"hidden\" name=\"subaction\" value=\"sticker-sale\" />";
-              print "<select name=\"new-sticker-date\">\n";
-              print "<option value=\"" . date("Y") . "\">" . "i år (" . getStickerPeriod('today') . ")" . "</option>\n";
-              print "<option value=\"" . date("Y", strtotime("+1 year")) . "\">" . "neste år (" . getStickerPeriod("+1 year") . ")" . "</option>\n";
-              print "<option value=\"" . date("Y", strtotime("+3 year")) . "\">" . "tre år (" . getStickerPeriod("+3 year") . ")" . "</option>\n";
-              print "<option value=\"" . date("Y", strtotime("+5 year")) . "\">" . "fem år (" . getStickerPeriod("+5 year") . ")" . "</option>\n";
+              print "<select name=\"new-expiry-date\">\n";
+              print "<option value=\"" . getExpiryDate("now") . "\">" . "i år (" . getStickerPeriod(getExpiryDate('now')) . ")" . "</option>\n";
+              print "<option value=\"" . getExpiryDate("+1 year") . "\">" . "neste år (" . getStickerPeriod(getExpiryDate("+1 year")) . ")" . "</option>\n";
+              print "<option value=\"" . getExpiryDate("+3 year") . "\">" . "tre år (" . getStickerPeriod(getExpiryDate("+3 year")) . ")" . "</option>\n";
+              print "<option value=\"" . getExpiryDate("+5 year") . "\">" . "fem år (" . getStickerPeriod(getExpiryDate("+5 year")) . ")" . "</option>\n";
               print "</select>\n";
               print "<input type=\"submit\" value=\"Selg oblat\" />";
             }
           } else {
+          
             if (!$user->getCardProduced()) {
               print "produser kort";
             } elseif (!$user->getCardDelivered()) {
               print "<input type=\"hidden\" name=\"subaction\" value=\"give-card\" />";
-              print "<input type=\"hidden\" name=\"new-sticker-date\" value=\"" . getStickerPeriod($user->expiry) . "\" />";
-              print "<input type=\"submit\" name=\"give-card\" value=\"Lever ut kort (" . getStickerPeriod($user->expiry) . ")\" />";
+              print "<input type=\"hidden\" name=\"new-sticker-date\" value=\"" . getStickerPeriod($user->expires) . "\" />";
+              print "<input type=\"submit\" name=\"give-card\" value=\"Lever ut kort (" . getStickerPeriod($user->expires) . ")\" />";
             } elseif (!$user->hasCardSticker()) {
               print "<input type=\"hidden\" name=\"subaction\" value=\"give-sticker\" />";
-              print "<input type=\"hidden\" name=\"new-sticker-date\" value=\"" . getStickerPeriod($user->expiry) . "\" />";
-              print "<input type=\"submit\" name=\"give-sticker\" value=\"Gi oblat (" . getStickerPeriod($user->expiry) . ")\" />";
+              print "<input type=\"hidden\" name=\"new-sticker-date\" value=\"" . getStickerPeriod($user->expires) . "\" />";
+              print "<input type=\"submit\" name=\"give-sticker\" value=\"Gi oblat (" . getStickerPeriod($user->expires) . ")\" />";
             } else {
               print "-";
             }

inside/User.php

@@ -56,6 +56,7 @@ class User {
                 $this->id = -1;
                 return false;
             } else {
+                /* Validate user supplied data. */
                 if (strlen(stripcslashes($data['username'])) < 3 || strlen(stripcslashes($data['username'])) > 12 ) {
                     notify("Brukernavnet må være mellom 3 og 12 tegn.");
                     $this->id = -1;
@@ -72,6 +73,12 @@ class User {
                     $this->id = -1;
                     return false;
                 }
+                /* No double nor single quotes */
+                if(preg_match('/[\\\"\']+/', $data['password1'])) {
+                    notify("Passordet kan ikke inneholde enkel- eller dobbelfnutt eller bakslask.");
+                    $this->id = -1;
+                    return false;
+                }
                 if ($data['password1'] != $data['password2']) {
                     notify("Passordene var ikke like.");
                     $this->id = -1;

inside/migration/js/byebye_inside.js

@@ -10,10 +10,14 @@ function init_validation() {
             password: {
                 required: true,
                 minlength: 8,
+                noquotes: true,
+                noescapes: true,
             },
             password_check: {
                 required: true,
                 minlength: 8,
+                noquotes: true,
+                noescapes: true,
                 equalTo: "#id_password",
             },
         },

inside/migration/js/custom_validators.js

@@ -1,3 +1,9 @@
 jQuery.validator.addMethod("lettersonly", function(value, element) {
 	return this.optional(element) || /^[a-z]+$/.test(value);
 }, "Please enter only letters (english alphabet)."); 
+jQuery.validator.addMethod("noquotes", function(value, element) {
+	return this.optional(element) || ! /['"]+/.test(value);
+}, "No single or double quotes, please."); 
+jQuery.validator.addMethod("noescapes", function(value, element) {
+	return this.optional(element) || ! /[\\]+/.test(value);
+}, "No backslashes, please.");