From 6db9db68bdecc0fbca9225818c4b4dc2f8885120 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 12 Jan 2015 21:00:11 -0500
Subject: [PATCH] #92 Update show_search_form

---
 inc/show_search_form.inc.php | 109 ++++++++++++++++++++++++++++-------
 1 file changed, 88 insertions(+), 21 deletions(-)

diff --git a/inc/show_search_form.inc.php b/inc/show_search_form.inc.php
index 24c61c5d..7d25da58 100644
--- a/inc/show_search_form.inc.php
+++ b/inc/show_search_form.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.5.5 from 5th August 2014
+ *  Version: 2.6.0 beta 1 from 30th December 2014
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
@@ -60,6 +60,11 @@ if ( ! isset($what) )
     $what = 'trackid';
 }
 
+if ( ! isset($owner_input) )
+{
+	$owner_input = 0;
+}
+
 if ( ! isset($date_input) )
 {
     $date_input = '';
@@ -91,6 +96,17 @@ else
     }
 }
 
+/* List of staff */
+if ($can_view_ass_others && ! isset($admins) )
+{
+    $admins = array();
+    $res2 = hesk_dbQuery("SELECT `id`,`name` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."users` ORDER BY `name` ASC");
+    while ($row=hesk_dbFetchAssoc($res2))
+    {
+        $admins[$row['id']]=$row['name'];
+    }
+}
+
 $more = empty($_GET['more']) ? 0 : 1;
 $more2 = empty($_GET['more2']) ? 0 : 1;
 
@@ -214,24 +230,54 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
                             <td class="borderTop alignTop"><b><?php echo $hesklang['sort_by']; ?></b>: &nbsp; </td>
                             <td class="borderTop">
                                 <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                                    <tr>
-                                        <td width="33%"><label><input type="radio" name="sort" value="priority"  <?php if ($sort == 'priority') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['priority']; ?></label></td>
-                                        <td width="33%"><label><input type="radio" name="sort" value="lastchange" <?php if ($sort == 'lastchange') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['last_update']; ?></label></td>
-                                        <td width="34%"><label><input type="radio" name="sort" value="name" <?php if ($sort == 'name') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['name']; ?></label></td>
-                                    </tr>
-                                    <tr>
-                                        <td width="33%"><label><input type="radio" name="sort" value="subject" <?php if ($sort == 'subject') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['subject']; ?></label></td>
-                                        <td width="33%"><label><input type="radio" name="sort" value="status" <?php if ($sort == 'status') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['status']; ?></label></td>
-                                        <td width="34%">&nbsp;</td>
-                                    </tr>
+                                    <?php
+                                    array_unshift($hesk_settings['ticket_list'], 'priority');
+                                    $hesk_settings['possible_ticket_list']['priority'] = $hesklang['priority'];
+
+                                    $column = 1;
+
+                                    foreach ($hesk_settings['ticket_list'] as $key)
+                                    {
+                                        if ($column == 1)
+                                        {
+                                            echo '<tr><td width="34%">';
+                                        }
+                                        else
+                                        {
+                                            echo '<td width="33%">';
+                                        }
+
+                                        echo '<label><input type="radio" name="sort" value="'.$key.'" '.($sort == $key ? 'checked="checked"' : '').' /> '.$hesk_settings['possible_ticket_list'][$key].'</label></td>';
+
+                                        if ($column == 3)
+                                        {
+                                            echo '</tr>';
+                                            $column = 1;
+                                        }
+                                        else
+                                        {
+                                            $column++;
+                                        }
+                                    }
+
+                                    // End table if needed
+                                    if ($column == 3)
+                                    {
+                                        echo '<td width="33%">&nbsp;</td></tr>';
+                                    }
+                                    elseif ($column == 2)
+                                    {
+                                        echo '<td width="33%">&nbsp;</td><td width="33%">&nbsp;</td></tr>';
+                                    }
+                                    ?>
                                 </table>
 
                             </td>
                         </tr>
 
                         <tr>
-                            <td class="borderTop alignTop"><b><?php echo $hesklang['gb']; ?></b>: &nbsp; </td>
-                            <td class="borderTop">
+                            <td class="alignTop"><b><?php echo $hesklang['gb']; ?></b>: &nbsp; </td>
+                            <td>
                                 <table border="0" cellpadding="0" cellspacing="0" width="100%">
                                     <tr>
                                         <td width="33%"><label><input type="radio" name="g" value=""  <?php if ( ! $group) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['dg']; ?></label></td>
@@ -261,8 +307,8 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
                         </tr>
 
                         <tr>
-                            <td class="borderTop alignMiddle"><b><?php echo $hesklang['category']; ?></b>: &nbsp; </td>
-                            <td class="borderTop alignMiddle">
+                            <td class="alignMiddle"><b><?php echo $hesklang['category']; ?></b>: &nbsp; </td>
+                            <td class="alignMiddle">
                                 <div class="col-md-4" style="padding-left: 0px"><select class="form-control" name="category">
                                         <option value="0" ><?php echo $hesklang['any_cat']; ?></option>
                                         <?php echo $category_options; ?>
@@ -271,20 +317,20 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
                         </tr>
 
                         <tr>
-                            <td class="borderTop"><b><?php echo $hesklang['display']; ?></b>: &nbsp; </td>
-                            <td class="borderTop"><div class="col-md-2" style="padding-left: 0px; padding-right:0px"><input type="text" class="form-control" name="limit" value="<?php echo $maxresults; ?>" size="4" /></div><div class="col-md-3" style="line-height: 40px"><?php echo $hesklang['tickets_page']; ?></div></td>
+                            <td><b><?php echo $hesklang['display']; ?></b>: &nbsp; </td>
+                            <td><div class="col-md-2" style="padding-left: 0px; padding-right:0px"><input type="text" class="form-control" name="limit" value="<?php echo $maxresults; ?>" size="4" /></div><div class="col-md-3" style="line-height: 40px"><?php echo $hesklang['tickets_page']; ?></div></td>
                         </tr>
                         <tr>
-                            <td class="borderTop alignMiddle"><b><?php echo $hesklang['order']; ?></b>: &nbsp; </td>
-                            <td class="borderTop alignMiddle">
+                            <td class="alignMiddle"><b><?php echo $hesklang['order']; ?></b>: &nbsp; </td>
+                            <td class="alignMiddle">
                                 <label><input type="radio" name="asc" value="1" <?php if ($asc) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['ascending']; ?></label>
                                 |
                                 <label><input type="radio" name="asc" value="0" <?php if (!$asc) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['descending']; ?></label></td>
                         </tr>
 
                         <tr>
-                            <td class="borderTop alignTop"><b><?php echo $hesklang['opt']; ?></b>: &nbsp; </td>
-                            <td class="borderTop">
+                            <td class="alignTop"><b><?php echo $hesklang['opt']; ?></b>: &nbsp; </td>
+                            <td>
 
                                 <label><input type="checkbox" name="cot" value="1" <?php if ($cot) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['cot']; ?></label><br />
                                 <label><input type="checkbox" name="def" value="1" /> <?php echo $hesklang['def']; ?></label> (<a href="admin_main.php?reset=1&amp;token=<?php echo hesk_token_echo(0); ?>"><?php echo $hesklang['redv']; ?></a>)
@@ -386,6 +432,27 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
                                         </select>
                                     </td>
                                 </tr>
+                                <?php
+                                if ($can_view_ass_others)
+                                {
+                                    ?>
+                                    <tr>
+                                        <td class="alignMiddle"><b><?php echo $hesklang['owner']; ?></b>: &nbsp; </td>
+                                        <td class="alignMiddle">
+                                            <select name="owner">
+                                                <option value="0" ><?php echo $hesklang['anyown']; ?></option>
+                                                <?php
+                                                foreach ($admins as $id => $name)
+                                                {
+                                                    echo '<option value="'.$id.'" '.($owner_input == $id ? 'selected="selected"' : '').'>'.$name.'</option>';
+                                                }
+                                                ?>
+                                            </select>
+                                        </td>
+                                    </tr>
+                                <?php
+                                }
+                                ?>
                                 <tr>
                                     <td class="alignMiddle"><b><?php echo $hesklang['date']; ?></b>: &nbsp; </td>
                                     <td class="alignMiddle">