Mercurial > hg > batmud > misc

changeset 283:e02d4613d93f misc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 09 Mar 2015 05:18:21 +0200
parents b72e0788d63e
children 3555578e7d2c
files prices.php
diffstat 1 files changed, 88 insertions(+), 59 deletions(-) [+]
line wrap: on
line diff
--- a/prices.php	Mon Mar 09 04:50:37 2015 +0200
+++ b/prices.php	Mon Mar 09 05:18:21 2015 +0200
@@ -190,8 +190,8 @@
 free to inquire about other ammunition types (bullets, etc.).
 ",
 
-  "base" => 300, // base price per arrow
-  "discount" => true,
+  "base" => 300, // base price per arrow, the values below are added on top of this
+  "discount" => true, // enable discounts for this section
 
   "i_fields" => 2,
   "i_price" => 2,
@@ -346,13 +346,18 @@
 
 //============================================================================
 
-if (1) {
-  echo "<?xml version=\"1.0\" encoding=\"".$pageCharset."\"?>\n".
+if (1)
+{
+  echo
+  "<?xml version=\"1.0\" encoding=\"".$pageCharset."\"?>\n".
   "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n".
 //  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n".
   "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">\n";
-} else {
-  echo "<!DOCTYPE HTML>\n".
+}
+else
+{
+  echo
+  "<!DOCTYPE HTML>\n".
   "<html>\n";
 }
 ?>
@@ -360,9 +365,12 @@
  <meta http-equiv="Content-Type" content="text/html; charset=<? echo $pageCharset; ?>" />
  <title><? echo $pageTitle; ?></title>
 <?
-if (isset($pageCSS)) {
+if (isset($pageCSS))
+{
  echo "<link rel=\"stylesheet\" title=\"Default\" href=\"".$pageCSS."\" type=\"text/css\" />\n";
-} else {
+}
+else
+{
 ?>
  <style type="text/css">
  <!--
@@ -394,8 +402,8 @@
 //============================================================================
 // Data input mode
 //============================================================================
-if (!isset($_REQUEST["ok"])) {
-
+if (!isset($_REQUEST["ok"]))
+{
 echo "<h1>".$pageTitle."</h1>\n";
 
 if (isset($global_desc))
@@ -404,12 +412,14 @@
 echo "\n<form action=\"".$pageIndex."\" method=\"post\" autocomplete=\"off\">\n".
 "<p><input type=\"hidden\" name=\"ok\" value=\"ok\" /></p>\n";
 
-if ($sections["services1"] || $sections["services2"]) {
-
+if ($sections["services1"] || $sections["services2"])
+{
   printSectionHeader($services);
 
-  if ($sections["services1"]) {
-    foreach ($services1_prices as $key => $item) {
+  if ($sections["services1"])
+  {
+    foreach ($services1_prices as $key => $item)
+    {
       $s = isset($item["extra"]) ? $item["extra"] : "";
       echo
       " <tr>\n".
@@ -423,26 +433,25 @@
       "<td>-</td><td class=\"hide\"></td></tr>\n".
       " <tr><td>".$item["tresh"]."+ ".$item["subj"]."s</td><td>";
 
-      if (isset($item["base"])) {
+      if (isset($item["base"]))
         echo convPrice($item["base"])." initial fee + ".convPrice($item["price2"])." / ".$item["subj"].$s;
-      } else {
+      else
         echo convPrice($item["price2"])." / ".$item["subj"].$s;
-      }
 
       echo "</td><td>".getField($key)."</td>";
 
-      if (isset($item["extra"])) {
+      if (isset($item["extra"]))
         echo "<td>+ ".getField($key."_extra")."</td>";
-      } else {
+      else
         echo "<td class=\"hide\"></td>";
-      }
-  
+
       echo "</tr>\n";
     }
   } // services1 enabled
 
 
-  if ($sections["services2"]) {
+  if ($sections["services2"])
+  {
     echo
     " <tr>\n".
     "  <th>Service</th>\n".
@@ -451,18 +460,18 @@
     "  <th class=\"hide\"></th>\n".
     " </tr>\n";
     
-    foreach ($services2_prices as $key => $item) {
+    foreach ($services2_prices as $key => $item)
+    {
       echo 
       " <tr><td>".$item["name"]."</td>".
       "<td>".convPrice($item["price"])." / ".$item["subj"]."</td>".
       "<td>".getField($key)."</td>";
 
-      if (isset($item["extra"])) {
+      if (isset($item["extra"]))
         echo "<td>+ ".getField($key."_extra")."</td>";
-      } else {
+      else
         echo "<td></td>\n";
-      }
-  
+
       echo "</tr>\n";
     }
   } // services2 enabled
@@ -472,26 +481,28 @@
 } // services1 || services2 enabled
 
 
-if ($sections["reagents"]) {
+if ($sections["reagents"])
+{
   $sec = $reagents;
 
   $showSupply = FALSE;
-  if (file_exists($sec["datafile"])) {
-    $data = @file_get_contents($sec["datafile"]);
-    if ($data !== FALSE) {	
-      $supply = array();
-      $lines = explode("\n", strtolower($data));
-      foreach ($lines as $line) {
-        $tmp = explode("|", $line);
-        if (count($tmp) >= 2)
-          $supply[$tmp[1]] = $tmp[0];
-      }
-      $showSupply = TRUE;
+  if (file_exists($sec["datafile"]) &&
+    ($data = @file_get_contents($sec["datafile"])) !== FALSE)
+  {
+    $supply = array();
+    $lines = explode("\n", strtolower($data));
+    foreach ($lines as $line)
+    {
+      $tmp = explode("|", $line);
+      if (count($tmp) >= 2)
+        $supply[$tmp[1]] = $tmp[0];
     }
+    $showSupply = TRUE;
   }
 
   printSectionHeader($sec);
-  foreach ($sec["prices"] as $fkey => $flist) {
+  foreach ($sec["prices"] as $fkey => $flist)
+  {
     echo "<tr><th colspan=\"".($showSupply ? 6 : 5)."\">".$fkey."</th></tr>\n".
     " <tr>\n".
     "  <th>Type</th>\n".
@@ -503,11 +514,14 @@
     " </tr>";
   
     $row = 1;
-    foreach ($flist as $key => $item) {
+    foreach ($flist as $key => $item)
+    {
       $s = ($row % 2 == 1) ? "a" : "b";
-      echo " <tr class=\"".$s."\"><td class=\"".$item[0]."\">".$item[0].
-      "</td><td>".$item[1]."</td><td>".$item[2]."</td><td>".$item[3]."</td>".
-      "<td>".getField($key)."</td>";
+      echo
+        " <tr class=\"".$s."\"><td class=\"".$item[0]."\">".$item[0].
+        "</td><td>".$item[1]."</td><td>".$item[2]."</td><td>".$item[3]."</td>".
+        "<td>".getField($key)."</td>";
+
       $spell = strtolower($item[1]);
       if ($showSupply && isset($supply[$spell]))
         echo "<td>".$supply[$spell]."</td>";
@@ -532,7 +546,8 @@
   $name = $sec["name"];
   $base = isset($sec["base"]) ? $sec["base"] : 0;
   $row = 1;
-  foreach ($sec["prices"] as $key => $item) {
+  foreach ($sec["prices"] as $key => $item)
+  {
     $s = ($row % 2 == 1) ? "a" : "b";
 
     echo " <tr class=\"".$s."\">";
@@ -557,7 +572,9 @@
 
 echo "</form>\n";
 
-} else {
+}
+else
+{
 
 //============================================================================
 // Billing result mode
@@ -610,9 +627,11 @@
 
 getDiscount("services", $factor, $str);
 
-if ($sections["services1"]) {
+if ($sections["services1"])
+{
   foreach ($services1_prices as $key => $item)
-  if (getVal($key, $val)) {
+  if (getVal($key, $val))
+  {
     addVal($key, $val);
 
     if ($val >= $item["tresh"]) {
@@ -630,16 +649,19 @@
     addLine($item["name"].$s.$str, $val, $total * $factor);
 
     // Extra does not get discount
-    if (isset($item["extra"]) && getVal($key."_extra", $tmp)) {
+    if (isset($item["extra"]) && getVal($key."_extra", $tmp))
+    {
       addVal($key."_extra", $tmp);
       addLine("|".$item["extra"], $val, $tmp);
     }
   }
 }
 
-if ($sections["services2"]) {
+if ($sections["services2"])
+{
   foreach ($services2_prices as $key => $item)
-  if (getVal($key, $val)) {
+  if (getVal($key, $val))
+  {
     addVal($key, $val);
 
     $total = $val * $item["price"];
@@ -647,11 +669,12 @@
     addLine($item["name"].$str, $val, $total * $factor);
 
     // Extra does not get discount
-    if (isset($item["extra"]) && getVal($key."_extra", $tmp)) {
+    if (isset($item["extra"]) && getVal($key."_extra", $tmp))
+    {
       addVal($key."_extra", $tmp);
       addLine("|".$item["extra"], $val, $tmp);
     }
-}
+  }
 }
 
 if ($subTotal > 0)
@@ -661,14 +684,17 @@
 //============================================================================
 // Reagents
 //============================================================================
-if ($sections["reagents"]) {
+if ($sections["reagents"])
+{
   $sec = $reagents;
   getDiscount($sec["name"], $factor, $s);
   $numReagents = 0;
   $subTotal = 0;
   foreach ($sec["prices"] as $fkey => $flist)
-  foreach ($flist as $key => $item) {
-    if (getVal($key, $val) && $val > 0) {
+  foreach ($flist as $key => $item)
+  {
+    if (getVal($key, $val) && $val > 0)
+    {
       addVal($key, $val);
       addLine($item[2]." (".$item[1].")".$s, $val, $val * $item[3] * $factor);
       $numReagents += $val;
@@ -687,7 +713,8 @@
 
   if ($sec["discount"])
     getDiscount($name, $factor, $str);
-  else {
+  else
+  {
     $str = "";
     $factor = 1;
   }
@@ -695,8 +722,10 @@
   $base = isset($sec["base"]) ? $sec["base"] : 0;
   $numItems = 0;
   $subTotal = 0;
-  foreach ($sec["prices"] as $key => $item) {
-    if (getVal($name."_".$key, $val) && $val > 0) {
+  foreach ($sec["prices"] as $key => $item)
+  {
+    if (getVal($name."_".$key, $val) && $val > 0)
+    {
       addVal($name."_".$key, $val);
 
       $add = isset($sec["i_price"]) ? $item[$sec["i_price"]] : 0;