# HG changeset patch # User Matti Hamalainen # Date 1522316606 -10800 # Node ID 5305bd5a44aabe3ca5d06a3c197979b3c3cdb8e8 # Parent a75c66e7b9e53e5f862053ebc9f1dfbb60ead368 Sync. diff -r a75c66e7b9e5 -r 5305bd5a44aa index.php --- a/index.php Fri Mar 01 04:13:24 2013 +0200 +++ b/index.php Thu Mar 29 12:43:26 2018 +0300 @@ -2,8 +2,7 @@ $pageTitle = "Pupunen BatMUD Container Command Creator ALPHA"; $pageIndex = "index.php"; -require "mcommon.inc.php"; -require "merrors.inc.php"; +require "mgeneric.inc.php"; require "itemfixes.inc.php"; @@ -61,7 +60,7 @@ } } else { // Perform regexp replacment - $res = preg_replace("/".$pat."/", $rep, $input, -1, &$changed); + $res = preg_replace("/".$pat."/", $rep, $input, -1, $changed); if ($changed > 0) return $res; } @@ -81,20 +80,50 @@ cmPrintPageHeader($pageTitle, " "); @@ -171,7 +200,7 @@ $ignored[$str] = "Unparsed stack of many"; } else { $n = $fixNumbers[$m[1]]; - $res = performItemFixups($m[2], $fixStackTable, &$changed); + $res = performItemFixups($m[2], $fixStackTable, $changed); if ($changed > 0) addItems($n, $res.$m[3]); else @@ -179,7 +208,7 @@ } } else { // Other item name fixups - addItems(1, performItemFixups($str, $fixItemTable, &$changed)); + addItems(1, performItemFixups($str, $fixItemTable, $changed)); } } @@ -219,7 +248,7 @@ } else $formMode = 3; } else - errorMsg("No item data provided."); + stError("No item data provided."); } // formMode == 1 @@ -233,7 +262,7 @@ $formMode = 3; } if ($data === FALSE) { - errorMsg("Could not unserialize data, internal error."); + stError("Could not unserialize data, internal error."); } } @@ -983,7 +1012,8 @@ 0) { +if ($errorSet) +{ echo "

An error occured

\n