Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-26 09:19:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix house links

Browse Source
This commit is contained in:
slawkens 2025-02-15 12:15:35 +01:00
parent 4c5cc8b573
commit 887b5068ad
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
system/functions.php
View File

@ -129,16 +129,14 @@ function getMonsterLink($name, $generate = true): string
function getHouseLink($name, $generate = true): string function getHouseLink($name, $generate = true): string
{ {
if(is_numeric($name)) if(is_numeric($name)) {
{
$house = House::find(intval($name), ['name']); $house = House::find(intval($name), ['name']);
if ($house) { if ($house) {
$name = $house->name; $name = $house->name;
} }
} }
$url = BASE_URL . (setting('core.friendly_urls') ? '' : 'index.php/') . 'houses?name=' . urlencode($name);
$url = BASE_URL . (setting('core.friendly_urls') ? '' : 'index.php/') . 'houses/' . urlencode($name);
if(!$generate) return $url; if(!$generate) return $url;
return generateLink($url, $name); return generateLink($url, $name);

8
system/pages/houses.php
View File

@ -30,11 +30,11 @@ $state = '';
$order = ''; $order = '';
$type = ''; $type = '';
if(isset($_GET['page']) && $_GET['page'] == 'view' && isset($_REQUEST['house'])) if(isset($_REQUEST['name']))
{ {
$beds = array("", "one", "two", "three", "fourth", "fifth"); $beds = array("", "one", "two", "three", "fourth", "fifth");
$houseName = $_REQUEST['house']; $houseName = urldecode($_REQUEST['name']);
$houseId = (Validator::number($_REQUEST['house']) ? $_REQUEST['house'] : -1); $houseId = (Validator::number($_REQUEST['name']) ? $_REQUEST['name'] : -1);
$selectHouse = $db->query('SELECT * FROM ' . $db->tableName('houses') . ' WHERE ' . $db->fieldName('name') . ' LIKE ' . $db->quote($houseName) . ' OR `id` = ' . $db->quote($houseId)); $selectHouse = $db->query('SELECT * FROM ' . $db->tableName('houses') . ' WHERE ' . $db->fieldName('name') . ' LIKE ' . $db->quote($houseName) . ' OR `id` = ' . $db->quote($houseId));
$house = array(); $house = array();
@ -187,7 +187,7 @@ if(isset($_POST['town']) && isset($_POST['state']) && isset($_POST['order']) &&
$houseRent = 'Free'; $houseRent = 'Free';
} }
$houses[] = array('owner' => $owner, 'name' => $house['name'], 'size' => ($hasTilesColumn ? $house['tiles'] : $house['size']), 'rent' => $house['rent'], 'rentedBy' => $houseRent); $houses[] = array('owner' => $owner, 'name' => $house['name'], 'size' => ($hasTilesColumn ? $house['tiles'] : $house['size']), 'rent' => $house['rent'], 'rentedBy' => $houseRent, 'link' => getHouseLink($house['name'], false));
} }
$housesSearch = true; $housesSearch = true;

5
system/templates/houses.html.twig
View File

@ -56,10 +56,9 @@ the search criteria and start a new search.
</td> </td>
<td> <td>
<form action="{{ getLink('houses/view') }}" method="post"> <a href="{{ house.link }}">
<input type="hidden" name="house" value="{{ house.name }}">
{{ include('buttons.view.html.twig') }} {{ include('buttons.view.html.twig') }}
</form> </a>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}