Skip to content

Commit

Permalink
Standalone fixes
Browse files Browse the repository at this point in the history 
VVS weapon, shop name fixed, new sorting
  • Loading branch information
@sanasol
sanasol committed Sep 1, 2013
1 parent dfd621f commit ceeb30b
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 22 deletions.
77 changes: 62 additions & 15 deletions merchant_db/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

if(empty($_POST['order']))
{
$order = 'price';
$order = 'nameid';
}
else
{
$order_cols = array("amount"=>"amount", "price"=>"price");
$order_cols = array("amount"=>"amount", "price"=>"price", "name"=>"name");
$order = $order_cols[$_POST['order']];
}
if(empty($_POST['order2']))
Expand Down Expand Up @@ -138,6 +138,30 @@
echo "<tr><td colspan=\"12\">{$search_info}</td></tr>";
}
?>
<tr><td colspan="12">
<form action="" method="post" class="form-inline">
<div class="form-group">
<label class="sr-only" for="sort">Sorting:</label>
<select name="order" class="form-control" >
<option value="price">By price</option>
<option value="amount">By amount</option>
<option value="name" selected="selected">By shop</option>
</select>
</div>
<div class="form-group">
<select name="order2" class="form-control" >
<option value="DESC" selected="selected">Descending</option>
<option value="ASC">Ascending</option>
</select>
</div>
<div class="form-group">
<?php
echo $pages->display_items_per_page();
?>
</div>
<input type="submit" name="Submit" value="Sort" class="btn btn-primary"/>
</form>
</td></tr>
<tr>
<td colspan="12">
<?php
Expand All @@ -146,7 +170,7 @@
</td>
</tr>
<tr>
<td>Shop</td>
<td style="width: 200px !important;">Shop</td>
<td>Merchant</td>
<td>Position</td>
<td></td>
Expand All @@ -161,14 +185,20 @@
</tr>
</thead>
<tfoot>
<tr><td colspan="12">Items found: <?php echo $totalrows; ?></td></tr>
<td colspan="12">
<?php
echo $pages->display_pages();
?>
</td>
<tr><td colspan="12">Items shown: <?php echo $totalrows; ?> of <?=$count[0]->cnt?></td></tr>
<tr><td colspan="12">
<form action="" method="post" class="form-inline">
<div class="form-group">
<label class="sr-only" for="sort">Sorting:</label>
<select name="order" class="form-control" >
<option value="price" selected="selected">By price</option>
<option value="price">By price</option>
<option value="amount">By amount</option>
<option value="name" selected="selected">By shop</option>
</select>
</div>
<div class="form-group">
Expand All @@ -195,19 +225,36 @@
$nick = "";
if($row->card0 == 254) { $char_sign = $db->select("`char`","char_id='{$row->card2}'", "", "name"); $nick_just = $char_sign[0]->name; $nick = "<span style='color: blue;'>{$nick_just}'s</span> "; }

$row->price = number_format($row->price);
$row->amount = number_format($row->amount);

$row->name2 = $row->name;
$row->name = mb_substr($row->name,0, 10, "UTF-8")."...";

$vvs = "";
if ($row->card0 == 255 && intval($row->card1/1280) > 0)
{
for ($i = 0; $i < intval($row->card1/1280); $i++)
{
$vvs .= "Very ";
}
$vvs .= "Strong ";
$vvs = "<span style='color: blue;'>{$vvs}</span> ";
}

$item = get_item_name($row->nameid);
echo "<tr>
<td>{$row->name}</td>
<td title=\"{$row->name2}\">{$row->name}</td>
<td>{$row->merchant_name}</td>
<td><p class='mapinfo' data-map='{$row->last_map}' data-x='{$row->last_x}' data-y='{$row->last_y}'>{$row->last_map} {$row->last_x},{$row->last_y}</p></td>
<td><span class='mapinfo' data-map='{$row->last_map}' data-x='{$row->last_x}' data-y='{$row->last_y}'>{$row->last_map} {$row->last_x},{$row->last_y}</span></td>
<td><img height='20' src='items_small/{$row->nameid}.png' title='{$item}' /></td>
<td>{$nick}{$item}</td>
<td>{$nick}{$vvs}{$item}</td>
<td>{$row->amount}</td>
<td>{$row->price}z</td>
<td>{$refine[$row->refine]}</td>
<td>".get_item_name($row->card0)."</td>
<td>".get_item_name($row->card1)."</td>
<td>".get_item_name(($row->card2 > 255 && $row->card0 != 254) ? $row->card2:0)."</td>
<td>".get_item_name(($row->card1 > 255 && $row->card0 > 255) ? $row->card1:0)."</td>
<td>".get_item_name(($row->card2 > 255 && $row->card0 > 255) ? $row->card2:0)."</td>
<td>".get_item_name($row->card3)."</td>
</tr>";
}
Expand All @@ -216,8 +263,8 @@
{
echo "<tr><td colspan=\"12\">Nothing was found</td></tr>";
}
?>
</tbody>
</table>
</div>
</body>
?>
</tbody>
</table>
</div>
</body>
36 changes: 29 additions & 7 deletions merchant_db_yommy/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

if(empty($_POST['order']))
{
$order = 'price';
$order = 'nameid';
}
else
{
$order_cols = array("amount"=>"amount", "price"=>"price");
$order_cols = array("amount"=>"amount", "price"=>"price", "name"=>"shop");
$order = $order_cols[$_POST['order']];
}
if(empty($_POST['order2']))
Expand Down Expand Up @@ -146,7 +146,7 @@
</td>
</tr>
<tr>
<td>Shop</td>
<td style="width: 200px !important;">Shop</td>
<td>Merchant</td>
<td>Position</td>
<td></td>
Expand All @@ -161,14 +161,20 @@
</tr>
</thead>
<tfoot>
<tr><td colspan="12">Items found: <?php echo $totalrows; ?></td></tr>
<td colspan="12">
<?php
echo $pages->display_pages();
?>
</td>
<tr><td colspan="12">Items shown: <?php echo $totalrows; ?> of <?=$count[0]->cnt?></td></tr>
<tr><td colspan="12">
<form action="" method="post" class="form-inline">
<div class="form-group">
<label class="sr-only" for="sort">Sorting:</label>
<select name="order" class="form-control" >
<option value="price" selected="selected">By price</option>
<option value="price">By price</option>
<option value="amount">By amount</option>
<option value="name" selected="selected">By shop</option>
</select>
</div>
<div class="form-group">
Expand All @@ -195,15 +201,31 @@
$nick = "";
if($row->card0 == 254) { $char_sign = $db->select("`char`","char_id='{$row->card2}'", "", "name"); $nick_just = $char_sign[0]->name; $nick = "<span style='color: blue;'>{$nick_just}'s</span> "; }

$row->price = number_format($row->price);
$row->amount = number_format($row->amount);

$row->shop2 = $row->shop;
$row->shop = mb_substr($row->shop,0, 10, "UTF-8")."...";

$vvs = "";
if ($row->card0 == 255 && intval($row->card1/1280) > 0)
{
for ($i = 0; $i < intval($row->card1/1280); $i++)
{
$vvs .= "Very ";
}
$vvs .= "Strong ";
$vvs = "<span style='color: blue;'>{$vvs}</span> ";
}


$item = get_item_name($row->nameid);
echo "<tr>
<td>{$row->shop}</td>
<td title=\"{$row->shop2}\">{$row->shop}</td>
<td>{$row->owner}</td>
<td><p class='mapinfo' data-map='{$row->map}' data-x='{$row->x}' data-y='{$row->y}'>{$row->map} {$row->x},{$row->y}</p></td>
<td><img height='20' src='items_small/{$row->nameid}.png' title='{$item}' /></td>
<td>{$nick}{$item}</td>
<td>{$nick}{$vvs}{$item}</td>
<td>{$row->amount}</td>
<td>{$row->price}z</td>
<td>{$refine[$row->refine]}</td>
Expand Down

0 comments on commit ceeb30b

Please sign in to comment.