diff --git a/include/staff/newticket.inc.php b/include/staff/newticket.inc.php
deleted file mode 100644
index 42afb7c3e07ac579516750ac60b9826a19d0eb4e..0000000000000000000000000000000000000000
--- a/include/staff/newticket.inc.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-if(!defined('OSTSCPINC') || !is_object($thisstaff) || !$thisstaff->isStaff()) die('Access Denied');
-$info=($_POST && $errors)?Format::input($_POST):array(); //on error...use the post data
-?>
-<div width="100%">
- <?php if($errors['err']) { ?>
- <p align="center" id="errormessage"><?php echo $errors['err']; ?></p>
- <?php }elseif($msg) { ?>
- <p align="center" class="infomessage"><?php echo $msg; ?></p>
- <?php }elseif($warn) { ?>
- <p class="warnmessage"><?php echo $warn; ?></p>
- <?php } ?>
-</div>
-<table width="80%" border="0" cellspacing=1 cellpadding=2>
- <form action="tickets.php" method="post" enctype="multipart/form-data">
- <input type='hidden' name='a' value='open'>
- <tr><td align="left" colspan=2>Please fill in the form below to open a new ticket.</td></tr>
- <tr>
- <td align="left" nowrap width="20%"><b>Email Address:</b></td>
- <td>
- <input type="text" id="email" name="email" size="25" value="<?php echo $info['email']; ?>">
- <font class="error"><b>*</b> <?php echo $errors['email']; ?></font>
- <?php if($cfg->notifyONNewStaffTicket()) { ?>
-
- <input type="checkbox" name="alertuser" <?php echo (!$errors || $info['alertuser'])? 'checked': ''; ?>>Send alert to user.
- <?php } ?>
- </td>
- </tr>
- <tr>
- <td align="left" ><b>Full Name:</b></td>
- <td>
- <input type="text" id="name" name="name" size="25" value="<?php echo $info['name']; ?>">
- <font class="error"><b>*</b> <?php echo $errors['name']; ?></font>
- </td>
- </tr>
- <tr>
- <td align="left">Telephone:</td>
- <td><input type="text" name="phone" size="25" value="<?php echo $info['phone']; ?>">
- Ext <input type="text" name="phone_ext" size="6" value="<?php echo $info['phone_ext']; ?>">
- <font class="error"> <?php echo $errors['phone']; ?></font></td>
- </tr>
- <tr height=2px><td align="left" colspan=2 > </td</tr>
- <tr>
- <td align="left"><b>Ticket Source:</b></td>
- <td>
- <select name="source">
- <option value="" selected >Select Source</option>
- <option value="Phone" <?php echo ($info['source']=='Phone')?'selected':''; ?>>Phone</option>
- <option value="Email" <?php echo ($info['source']=='Email')?'selected':''; ?>>Email</option>
- <option value="Other" <?php echo ($info['source']=='Other')?'selected':''; ?>>Other</option>
- </select>
- <font class="error"><b>*</b> <?php echo $errors['source']; ?></font>
- </td>
- </tr>
- <tr>
- <td align="left"><b>Department:</b></td>
- <td>
- <select name="deptId">
- <option value="" selected >Select Department</option>
- <?php
- $services= db_query('SELECT dept_id,dept_name FROM '.DEPT_TABLE.' ORDER BY dept_name');
- while (list($deptId,$dept) = db_fetch_row($services)){
- $selected = ($info['deptId']==$deptId)?'selected':''; ?>
- <option value="<?php echo $deptId; ?>"<?php echo $selected; ?>><?php echo $dept; ?></option>
- <?php
- } ?>
- </select>
- <font class="error"><b>*</b> <?php echo $errors['deptId']; ?></font>
- </td>
- </tr>
- <tr>
- <td align="left"><b>Subject:</b></td>
- <td>
- <input type="text" name="subject" size="35" value="<?php echo $info['subject']; ?>">
- <font class="error">* <?php echo $errors['subject']; ?></font>
- </td>
- </tr>
- <tr>
- <td align="left" valign="top"><b>Issue Summary:</b></td>
- <td>
- <i>Visible to client/customer.</i><font class="error"><b>* <?php echo $errors['issue']; ?></b></font><br/>
- <?php
- $sql='SELECT canned_id,title FROM '.CANNED_TABLE.' WHERE isenabled=1';
-
- if(($res=db_query($sql)) && db_num_rows($res)) {
- ?>
- Premade:
- <select id="canned" name="canned"
- onChange="getCannedResponse(this.options[this.selectedIndex].value,this.form,'issue');this.selectedIndex='0';" >
- <option value="0" selected="selected">Select a premade reply/issue</option>
- <?php while(list($cannedId,$title)=db_fetch_row($res)) { ?>
- <option value="<?php echo $cannedId; ?>" ><?php echo Format::htmlchars($title); ?></option>
- <?php } ?>
- </select> <label><input type='checkbox' value='1' name=append checked="true" />Append</label>
- <?php } ?>
- <textarea name="issue" cols="55" rows="8" wrap="soft"><?php echo $info['issue']; ?></textarea></td>
- </tr>
- <?php if($cfg->canUploadFiles()) {
- ?>
- <tr>
- <td>Attachment:</td>
- <td>
- <input type="file" name="attachment"><font class="error"> <?php echo $errors['attachment']; ?></font>
- </td>
- </tr>
- <?php } ?>
- <tr>
- <td align="left" valign="top">Internal Note:</td>
- <td>
- <i>Optional Internal note(s).</i><font class="error"><b> <?php echo $errors['note']; ?></b></font><br/>
- <textarea name="note" cols="55" rows="5" wrap="soft"><?php echo $info['note']; ?></textarea></td>
- </tr>
-
- <tr>
- <td align="left" valign="top">Due Date:</td>
- <td>
- <i>Time is based on your time zone (GM <?php echo $thisstaff->getTZoffset(); ?>)</i> <font class="error"> <?php echo $errors['time']; ?></font><br>
- <input id="duedate" name="duedate" value="<?php echo Format::htmlchars($info['duedate']); ?>"
- onclick="event.cancelBubble=true;calendar(this);" autocomplete=OFF>
- <a href="#" onclick="event.cancelBubble=true;calendar(getObj('duedate')); return false;"><img src='images/cal.png'border=0 alt=""></a>
-
- <?php
- $min=$hr=null;
- if($info['time'])
- list($hr,$min)=explode(':',$info['time']);
- echo Misc::timeDropdown($hr,$min,'time');
- ?>
- <font class="error"> <?php echo $errors['duedate']; ?></font>
- </td>
- </tr>
- <?php
- $sql='SELECT priority_id,priority_desc FROM '.TICKET_PRIORITY_TABLE.' ORDER BY priority_urgency DESC';
- if(($priorities=db_query($sql)) && db_num_rows($priorities)){ ?>
- <tr>
- <td align="left">Priority:</td>
- <td>
- <select name="pri">
- <?php
- $info['pri']=$info['pri']?$info['pri']:$cfg->getDefaultPriorityId();
- while($row=db_fetch_array($priorities)){ ?>
- <option value="<?php echo $row['priority_id']; ?>" <?php echo $info['pri']==$row['priority_id']?'selected':''; ?> ><?php echo $row['priority_desc']; ?></option>
- <?php } ?>
- </select>
- </td>
- </tr>
- <?php } ?>
- <?php
- $services= db_query('SELECT topic_id,topic FROM '.TOPIC_TABLE.' WHERE isactive=1 ORDER BY topic');
- if($services && db_num_rows($services)){ ?>
- <tr>
- <td align="left" valign="top">Help Topic:</td>
- <td>
- <select name="topicId">
- <option value="" selected >Select One</option>
- <?php
- while (list($topicId,$topic) = db_fetch_row($services)){
- $selected = ($info['topicId']==$topicId)?'selected':''; ?>
- <option value="<?php echo $topicId; ?>"<?php echo $selected; ?>><?php echo $topic; ?></option>
- <?php
- } ?>
- </select>
- <font class="error"> <?php echo $errors['topicId']; ?></font>
- </td>
- </tr>
- <?php
- } ?>
- <tr>
- <td>Assign To:</td>
- <td>
- <select id="staffId" name="staffId">
- <option value="0" selected="selected">-Assign To Staff-</option>
- <?php
- //TODO: make sure the user's group is also active....DO a join.
- $sql=' SELECT staff_id,CONCAT_WS(", ",lastname,firstname) as name FROM '.STAFF_TABLE.' WHERE isactive=1 AND onvacation=0 ';
- $depts= db_query($sql.' ORDER BY lastname,firstname ');
- while (list($staffId,$staffName) = db_fetch_row($depts)){
- $selected = ($info['staffId']==$staffId)?'selected':''; ?>
- <option value="<?php echo $staffId; ?>"<?php echo $selected; ?>><?php echo $staffName; ?></option>
- <?php
- } ?>
- </select><font class='error'> <?php echo $errors['staffId']; ?></font>
-
- <input type="checkbox" name="alertstaff" <?php echo (!$errors || $info['alertstaff'])? 'checked': ''; ?>>Send alert to assigned staff.
- </td>
- </tr>
- <tr>
- <td>Signature:</td>
- <td> <?php
- $appendStaffSig=$thisstaff->appendMySignature();
- $info['signature']=!$info['signature']?'none':$info['signature']; //change 'none' to 'mine' to default to staff signature.
- ?>
- <div style="margin-top: 2px;">
- <label><input type="radio" name="signature" value="none" checked > None</label>
- <?php if($appendStaffSig) { ?>
- <label> <input type="radio" name="signature" value="mine" <?php echo $info['signature']=='mine'?'checked':''; ?> > My signature</label>
- <?php } ?>
- <label><input type="radio" name="signature" value="dept" <?php echo $info['signature']=='dept'?'checked':''; ?> > Dept Signature (if any)</label>
- </div>
- </td>
- </tr>
- <tr height=2px><td align="left" colspan=2 > </td</tr>
- <tr>
- <td></td>
- <td>
- <input class="button" type="submit" name="submit_x" value="Submit Ticket">
- <input class="button" type="reset" value="Reset">
- <input class="button" type="button" name="cancel" value="Cancel" onClick='window.location.href="tickets.php"'>
- </td>
- </tr>
- </form>
-</table>
-<script type="text/javascript">
-
- var options = {
- script:"ajax.php?api=tickets&f=searchbyemail&limit=10&",
- varname:"input",
- json: true,
- shownoresults:false,
- maxresults:10,
- callback: function (obj) { document.getElementById('email').value = obj.id; document.getElementById('name').value = obj.info; return false;}
- };
- var autosug = new bsn.AutoSuggest('email', options);
-</script>
-
diff --git a/scp/ajax.php b/scp/ajax.php
index 2b08168adda9664f710f8b4abaa47cb4c0b78801..2398ca68f0f1b5be0bad37f3be2955051b037f76 100644
--- a/scp/ajax.php
+++ b/scp/ajax.php
@@ -46,15 +46,13 @@ $dispatcher = patterns('',
url_get('^ui', 'scp_ui')
)),
url_get('^/users$', array('ajax.users.php:UsersAjaxAPI', 'search')),
- url('^/tickets', patterns('ajax.tickets.php:TicketsAjaxAPI',
- url_get('^/lookup', 'lookup'),
- url_get('^$', 'search')
- )),
- url('^/ticket/', patterns('ajax.tickets.php:TicketsAjaxAPI',
+ url('^/tickets/', patterns('ajax.tickets.php:TicketsAjaxAPI',
url_get('^(?P<tid>\d+)/preview', 'previewTicket'),
url_get('^(?P<tid>\d+)/lock', 'acquireLock'),
url_post('^(?P<tid>\d+)/lock/(?P<id>\d+)/renew', 'renewLock'),
- url_post('^(?P<tid>\d+)/lock/(?P<id>\d+)/release', 'releaseLock')
+ url_post('^(?P<tid>\d+)/lock/(?P<id>\d+)/release', 'releaseLock'),
+ url_get('^lookup', 'lookup'),
+ url_get('^search', 'search')
))
);
diff --git a/scp/js/scp.js b/scp/js/scp.js
index 56f776ed6ff4ef0a6a20a54ef3837d957a487949..071c63ff82cb339fdfc8517136672910efeb41f3 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -286,7 +286,7 @@ $(document).ready(function(){
var elem = $('#advanced-search');
$('#result-count').html('');
$.ajax({
- url: "ajax.php/tickets",
+ url: "ajax.php/tickets/search",
data: fObj.serialize(),
dataType: 'json',
beforeSend: function ( xhr ) {
diff --git a/scp/js/ticket.js b/scp/js/ticket.js
index 902298ce43f64240a819282967a45f984ce2a424..f981bae070194dd478454edb5f308c341ce015cd 100644
--- a/scp/js/ticket.js
+++ b/scp/js/ticket.js
@@ -153,7 +153,7 @@ var autoLock = {
} else {
$.ajax({
type: "GET",
- url: 'ajax.php/ticket/'+autoLock.tid+'/lock',
+ url: 'ajax.php/tickets/'+autoLock.tid+'/lock',
dataType: 'json',
cache: false,
success: function(lock){
@@ -176,7 +176,7 @@ var autoLock = {
if(!autoLock.lastcheckTime || (now-autoLock.lastcheckTime)>=(autoLock.renewFreq*1000)){
$.ajax({
type: 'POST',
- url: 'ajax.php/ticket/'+autoLock.tid+'/lock/'+autoLock.lockId+'/renew',
+ url: 'ajax.php/tickets/'+autoLock.tid+'/lock/'+autoLock.lockId+'/renew',
dataType: 'json',
cache: false,
success: function(lock){
@@ -193,7 +193,7 @@ var autoLock = {
$.ajax({
type: 'POST',
- url: 'ajax.php/ticket/'+autoLock.tid+'/lock/'+autoLock.lockId+'/release',
+ url: 'ajax.php/tickets/'+autoLock.tid+'/lock/'+autoLock.lockId+'/release',
data: 'delete',
cache: false,
success: function(){
diff --git a/scp/js/tips.js b/scp/js/tips.js
index ec0f1875d55f31e5b8e9afcf283d7700183ea6e8..c560b8d913e635047e98e7a8198262a9db2809fc 100644
--- a/scp/js/tips.js
+++ b/scp/js/tips.js
@@ -80,7 +80,7 @@ jQuery(function($) {
var elem = $(this);
var vars = elem.attr('href').split('=');
- var url = 'ajax.php/ticket/'+vars[1]+'/preview';
+ var url = 'ajax.php/tickets/'+vars[1]+'/preview';
var id='t'+vars[1];
var xoffset = 80;