Mercurial > hg > batmud > misc

changeset 237:07e0af0f02e4 misc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor updates.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 24 Feb 2013 19:21:05 +0200
parents fe190f669052
children 47fbc8471110
files prices.php
diffstat 1 files changed, 34 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/prices.php	Fri Feb 22 17:19:04 2013 +0200
+++ b/prices.php	Sun Feb 24 19:21:05 2013 +0200
@@ -277,8 +277,8 @@
 
 function getVal($name, &$val) 
 {
-  if (isset($_POST["num_".$name]) && is_numeric($_POST["num_".$name])) {
-    $val = $_POST["num_".$name];
+  if (isset($_REQUEST["num_".$name]) && is_numeric($_REQUEST["num_".$name])) {
+    $val = $_REQUEST["num_".$name];
     if ($val != 0)
       return TRUE;
   } else
@@ -394,7 +394,7 @@
 //============================================================================
 // Data input mode
 //============================================================================
-if (!isset($_POST["ok"])) {
+if (!isset($_REQUEST["ok"])) {
 
 echo "<h1>".$pageTitle."</h1>\n";
 
@@ -483,7 +483,8 @@
       $lines = explode("\n", strtolower($data));
       foreach ($lines as $line) {
         $tmp = explode("|", $line);
-        $supply[$tmp[1]] = $tmp[0];
+        if (count($tmp) >= 2)
+          $supply[$tmp[1]] = $tmp[0];
       }
       $showSupply = TRUE;
     }
@@ -610,46 +611,46 @@
 getDiscount("services", $factor, $str);
 
 if ($sections["services1"]) {
-foreach ($services1_prices as $key => $item)
-if (getVal($key, $val)) {
-  addVal($key, $val);
+  foreach ($services1_prices as $key => $item)
+  if (getVal($key, $val)) {
+    addVal($key, $val);
 
-  if ($val >= $item["tresh"]) {
-    if (isset($item["base"]))
-      $total = $item["base"] + ($val * $item["price2"]);
-    else
-      $total = $val * $item["price2"];
+    if ($val >= $item["tresh"]) {
+      if (isset($item["base"]))
+        $total = $item["base"] + ($val * $item["price2"]);
+      else
+        $total = $val * $item["price2"];
 
-    $s = " (discount for >= ".$item["tresh"].")";
-  } else {
-    $total = $val * $item["price1"];
-    $s = "";
-  }
+      $s = " (discount for >= ".$item["tresh"].")";
+    } else {
+      $total = $val * $item["price1"];
+      $s = "";
+    }
 
-  addLine($item["name"].$s.$str, $val, $total * $factor);
+    addLine($item["name"].$s.$str, $val, $total * $factor);
 
-  // Extra does not get discount
-  if (isset($item["extra"]) && getVal($key."_extra", $tmp)) {
-    addVal($key."_extra", $tmp);
-    addLine("|".$item["extra"], $val, $tmp);
+    // Extra does not get discount
+    if (isset($item["extra"]) && getVal($key."_extra", $tmp)) {
+      addVal($key."_extra", $tmp);
+      addLine("|".$item["extra"], $val, $tmp);
+    }
   }
 }
-}
 
 if ($sections["services2"]) {
-foreach ($services2_prices as $key => $item)
-if (getVal($key, $val)) {
-  addVal($key, $val);
+  foreach ($services2_prices as $key => $item)
+  if (getVal($key, $val)) {
+    addVal($key, $val);
 
-  $total = $val * $item["price"];
+    $total = $val * $item["price"];
 
-  addLine($item["name"].$str, $val, $total * $factor);
+    addLine($item["name"].$str, $val, $total * $factor);
 
-  // Extra does not get discount
-  if (isset($item["extra"]) && getVal($key."_extra", $tmp)) {
-    addVal($key."_extra", $tmp);
-    addLine("|".$item["extra"], $val, $tmp);
-  }
+    // Extra does not get discount
+    if (isset($item["extra"]) && getVal($key."_extra", $tmp)) {
+      addVal($key."_extra", $tmp);
+      addLine("|".$item["extra"], $val, $tmp);
+    }
 }
 }