Refactored Item display. Todo: auto doc gen debug loop

ajax/D2AjaxFunctions.php

@@ -1,37 +0,0 @@
-<?php
-
-function getIscStrings($iscStat) {
-	$sql = "
-SELECT 
-	(
-		SELECT String
-		FROM itemstatcost as i
-		LEFT JOIN strings AS `s` ON `i`.descstrpos = `s`.`Key`
-		WHERE `Stat` = '$iscStat'
-	) 
-AS string1,
-	(
-		SELECT String
-		FROM itemstatcost as i
-		LEFT JOIN strings AS `s` ON `i`.DescStr2 = `s`.`Key`
-		WHERE `Stat` = '$iscStat'
-	)
-AS string2,
-(
-		SELECT descfunc
-		FROM itemstatcost as i
-		LEFT JOIN strings AS `s` ON `i`.descstrpos = `s`.`Key`
-		WHERE `Stat` = '$iscStat'
-	) 
-AS descfunc,
-(
-		SELECT descval
-		FROM itemstatcost as i
-		LEFT JOIN strings AS `s` ON `i`.descstrpos = `s`.`Key`
-		WHERE `Stat` = '$iscStat'
-	) 
-AS descval				
-";
-
-	return PDO_FetchRow($sql);
-}

ajax/config.php

@@ -44,9 +44,6 @@
 session_start();
 error_reporting(E_ALL ^ E_WARNING); 
 include "../_pdo.php";
-require_once "../src/D2Functions.php";
-require_once "../src/D2ItemDesc.php";
-require_once './D2AjaxFunctions.php';
 
 define('DB_FILE', $_SESSION['modname'] . ".db");
 define('TXT_PATH', $_SESSION['path']);

ajax/uniqueitems.php

@@ -1,7 +1,9 @@
 <?php
 
 include "./config.php";
-$idesc = new D2ItemDesc();
+require_once "../src/D2Functions.php";
+require_once '../src/D2ItemData.php';
+$idata = new D2ItemData();
 /*
 
   Copyright (C) 2021 Hash Borgir
@@ -59,140 +61,7 @@ if (!empty($_GET['view']))
 // first search code in all 3 tables. Grab from where it exists.
 
 if ($cmd == "getUniqueItem") {
-	$sql = "SELECT * FROM `uniqueitems` WHERE `enabled`='1' AND `index`=\"{$_GET['index']}\"";
-	$res = PDO_FetchRow($sql);
-	
-	if (empty($res['invfile'])) {
-
-		// if no invfile, get from other tables
-		// try to get from armor, weapons, misc
-
-		$sql = "SELECT invfile FROM armor WHERE code='{$res['code']}'";
-		$invfile[] = PDO_FetchRow($sql);
-
-		$sql = "SELECT invfile FROM weapons WHERE code='{$res['code']}'";
-		$invfile[] = PDO_FetchRow($sql);
-
-		$sql = "SELECT invfile FROM misc WHERE code='{$res['code']}'";
-		$invfile[] = PDO_FetchRow($sql);
-
-		$invfile = array_filter($invfile);
-
-		foreach ($invfile as $i) {
-			$x[] = $i;
-		}
-
-
-		$invClean = array_filter($x[0]);
-
-		$return = array_merge($res, $invClean);
-	} else {
-		$return = $res;
-	}
-
-	// var_dump($return);
-	// for all props for this unique item, get ISC strings
-
-	$props = array_filter([
-		"Prop1" => array_filter(
-				["prop1" => $return['prop1'], "par1" => $return['par1'], "min1" => $return['min1'], "max1" => $return['max1']]
-		),
-		"Prop2" => array_filter(
-				["prop2" => $return['prop2'], "par1" => $return['par2'], "min1" => $return['min2'], "max1" => $return['max2']]
-		),
-		"Prop3" => array_filter(
-				["prop3" => $return['prop3'], "par1" => $return['par3'], "min1" => $return['min3'], "max1" => $return['max3']]
-		),
-		"Prop4" => array_filter(
-				["prop4" => $return['prop4'], "par1" => $return['par4'], "min1" => $return['min4'], "max1" => $return['max4']]
-		),
-		"Prop5" => array_filter(
-				["prop5" => $return['prop5'], "par1" => $return['par5'], "min1" => $return['min5'], "max1" => $return['max5']]
-		),
-		"Prop6" => array_filter(
-				["prop6" => $return['prop6'], "par1" => $return['par6'], "min1" => $return['min6'], "max1" => $return['max6']]
-		),
-		"Prop7" => array_filter(
-				["prop7" => $return['prop7'], "par1" => $return['par7'], "min1" => $return['min7'], "max1" => $return['max7']]
-		),
-		"Prop8" => array_filter(
-				["prop8" => $return['prop8'], "par1" => $return['par8'], "min1" => $return['min8'], "max1" => $return['max8']]
-		),
-		"Prop9" => array_filter(
-				["prop9" => $return['prop9'], "par1" => $return['par9'], "min1" => $return['min9'], "max1" => $return['max9']]
-		),
-		"Prop10" => array_filter(
-				["prop10" => $return['prop10'], "par1" => $return['par10'], "min1" => $return['min10'], "max1" => $return['max10']]
-		)
-	]);
-
-	// need par, min, max value for each prop
-	// for each prop, get stat
-	$counter = 1;
-	foreach ($props as $key => $val) {
-		// val = Prop1,Prop2 etc.
-		// for each propr, get all 7 stats in ISC
-		$sql = "SELECT stat1,stat2,stat3,stat4,stat5,stat6,stat7 FROM `properties` WHERE `code` = '{$val['prop' . $counter]}'";
-		$props[$key]['stat'] = array_filter(PDO_FetchRow($sql));
-
-		$counter++;
-	}
-
-
-
-	//each stat now goes into getIscStrings
-	foreach ($props as $k => $v) {
-		$props[$k]['desc'] = array_filter(getIscStrings($v['stat']['stat1']));
-	}
-
-	// SELECT * FROM strings WHERE `Key`='ModStr3a' returns always Amazon Skills
-
-	// todo: put values in params, so I can get generated string for that prop
-
-	$counter = 1;
-	foreach ($props as $k => $v) { // for each property Prop1 Prop2
-		$params = [
-			'string1' => $v['desc']['string1'],
-			'string2' => $v['desc']['string2'],
-			'descfunc' => $v['desc']['descfunc'],
-			'descval' => $v['desc']['descval'],
-			"prop" => $return['prop' . $counter],
-			"par" => $return['par' . $counter],
-			"min" => $return['min' . $counter],
-			"max" => $return['max' . $counter]
-		];
-
-		
-		/*
-		 * getDesc should process string1, not file guide copy pasta
-		 * 
-		 */
-		if (!empty($v['desc'])) {
-			$props[$k]['string'][] = $idesc->getDesc($params);
-		}
-		$counter++;
-	}
-	
-	$return['props'] = $props;
-
-	$sqlArmor = "SELECT * FROM armor WHERE code='{$res['code']}'";
-	$sqlMisc = "SELECT * FROM misc WHERE code='{$res['code']}'";
-	$sqlWeapons = "SELECT * FROM weapons WHERE code='{$res['code']}'";
-
-	$baseItemInfo = PDO_FetchRow($sqlArmor);
-	
-	if (empty($baseItemInfo)) {
-		$baseItemInfo = PDO_FetchRow($sqlMisc);
-	}
-	if (empty($baseItemInfo)) {
-		$baseItemInfo = PDO_FetchRow($sqlWeapons);
-	}	
-		
-	$return['baseItemInfo'] = array_filter($baseItemInfo);	
-	
-
-	header('Content-Type: application/json');
-	echo json_encode($return, JSON_INVALID_UTF8_IGNORE|JSON_PRETTY_PRINT);
+	echo $idata->uniqueItems($_GET['index']);
 }
 /*
  *  @cmd = sortBy

config.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
 
 	Copyright (C) 2021 Hash Borgir