thooge/ipreg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed language detection code, added some small features

Browse Source
This commit is contained in:
Thomas Hooge
2023-03-12 12:38:43 +01:00
parent aabd37bd1a
commit 4266a211e0
15 changed files with 168 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
asset.php
View File

@@ -106,32 +106,39 @@ if ($action == ACT_DEFAULT):
// ========== VARIANT: default behavior =======================================
// create letter links
$sql = "SELECT DISTINCT SUBSTRING(UPPER(asset_name),1,1) AS asset_letter
$sql = "SELECT DISTINCT SUBSTRING(UPPER(asset_name),1,1) AS bst
FROM asset
ORDER BY asset_letter";
ORDER BY bst";
$sth = $dbh->query($sql);
$alphabet = $sth->fetchAll();
$alphabet[] = ['bst' => '*'];
$smarty->assign("alphabet", $alphabet);
// total asset count
$sth = $dbh->query("SELECT COUNT(*) FROM asset");
$smarty->assign("assetcount", $sth->fetchColumn());
$assetcount = $sth->fetchColumn();
$smarty->assign("assetcount", $sassetcount);
// assets for current letter
if (isset($_GET['asset_letter'])) {
$asset_letter = sanitize($_GET['asset_letter']);
if (isset($_GET['bst'])) {
$bst = sanitize($_GET['bst']);
} else {
$asset_letter = $alphabet[0]['asset_letter'];
$bst = $alphabet[0]['bst'];
}
$sql = "SELECT a.asset_id, IF(LENGTH(a.asset_name)>0, a.asset_name, '...') AS asset_name,
a.asset_info, c.assetclass_id, c.assetclass_name
FROM asset AS a LEFT OUTER JOIN assetclass AS c USING (assetclass_id)
WHERE SUBSTRING(a.asset_name,1,1)=?
ORDER BY a.asset_name";
FROM asset AS a LEFT OUTER JOIN assetclass AS c USING (assetclass_id)";
if ($bst != '*') {
$sql .= " WHERE SUBSTRING(a.asset_name,1,1)=?";
$p = array($bst);
} else {
$p = array();
}
$sql .= " ORDER BY a.asset_name";
$sth = $dbh->prepare($sql);
$sth->execute([$asset_letter]);
$sth->execute($p);
$smarty->assign("assets", $sth->fetchAll());
$smarty->display("asset.tpl");