+
-
diff --git a/include/staff/editticket.inc.php b/include/staff/editticket.inc.php
index f1b1a2a..e50134d 100644
--- a/include/staff/editticket.inc.php
+++ b/include/staff/editticket.inc.php
@@ -22,53 +22,53 @@
?>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
diff --git a/include/staff/email.inc.php b/include/staff/email.inc.php
index b7f93d7..a145eef 100644
--- a/include/staff/email.inc.php
+++ b/include/staff/email.inc.php
@@ -22,13 +22,13 @@
$depts= db_query('SELECT dept_id,dept_name FROM '.DEPT_TABLE);
$priorities= db_query('SELECT priority_id,priority_desc FROM '.TICKET_PRIORITY_TABLE);
?>
-
+
-
diff --git a/include/staff/filters.inc.php b/include/staff/filters.inc.php
index e8e9122..a1a0fff 100644
--- a/include/staff/filters.inc.php
+++ b/include/staff/filters.inc.php
@@ -56,27 +56,27 @@
$negorder=$order=='DESC'?'ASC':'DESC'; //Negate the sorting..
$showadd=($errors && $_POST['a']=='add')?true:false;
?>
-
+
-
+
-
:
+
:
- 0): //Show options..
?>
@@ -129,7 +129,7 @@
All
Toggle
None
- page:getPageLinks()?>
+ page:getPageLinks()?>
@@ -139,7 +139,7 @@
onClick='return confirm("Are you sure you wan to REMOVE selected email from ban list?");'>
-
diff --git a/include/staff/footer.inc.php b/include/staff/footer.inc.php
index 2837780..b8f2245 100644
--- a/include/staff/footer.inc.php
+++ b/include/staff/footer.inc.php
@@ -1,14 +1,14 @@
-
+
diff --git a/include/staff/group.inc.php b/include/staff/group.inc.php
index d65f949..c460689 100644
--- a/include/staff/group.inc.php
+++ b/include/staff/group.inc.php
@@ -14,42 +14,42 @@
?>
diff --git a/include/staff/login.tpl.php b/include/staff/login.tpl.php
index 1d065ce..8f3b663 100644
--- a/include/staff/login.tpl.php
+++ b/include/staff/login.tpl.php
@@ -13,12 +13,12 @@
-
+
diff --git a/include/staff/mypref.inc.php b/include/staff/mypref.inc.php
index 8613b52..00fbf54 100644
--- a/include/staff/mypref.inc.php
+++ b/include/staff/mypref.inc.php
@@ -5,23 +5,23 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- canManageTickets() || $thisuser->isManager()){ ?>
-
@@ -229,9 +229,9 @@ class="inline">
-
+
-
?>
Internal Notes ()
+ onClick="toggleLayer('ticketnotes'); return false;">Internal Notes ()
-
- ;text-align:center;">
+
- - posted
- by
+ - posted
+ by
-
+
-
+
-
-
+
-
+
Ticket Thread
-
-
- 0){ ?>
+ 0){ ?>
-
+
-
+
-
- -
+ -
- 0){ ?>
+ 0){ ?>
-
+
-
-
-
+
-
+
-
-
+
+
-
-
+
+
-
+
- canTransferTickets()) {
?>
@@ -511,9 +511,9 @@ class="button" type='button'
-
- _t('LABEL_RE_ASSIGN_TICKET'):$trl->_t('LABEL_ASSIGN_TO_STAFF')?>
+ _t('LABEL_RE_ASSIGN_TICKET'):$trl->_t('LABEL_ASSIGN_TO_STAFF')?>
-
-
+
diff --git a/index.php b/index.php
index 5fab55f..54a6dd0 100644
--- a/index.php
+++ b/index.php
@@ -62,4 +62,4 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
- Problems loading requested admin page. ()
+ Problems loading requested admin page. ()
-
+
-
diff --git a/scp/directory.php b/scp/directory.php
index a02e1ef..d43460c 100644
--- a/scp/directory.php
+++ b/scp/directory.php
@@ -47,33 +47,33 @@
require_once(STAFFINC_DIR.'header.inc.php');
?>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
Staff Members
@@ -83,25 +83,25 @@
Phone
Mobile
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-Problems displaying directory";
endif;
diff --git a/scp/profile.php b/scp/profile.php
index dc81f46..dd643b1 100644
--- a/scp/profile.php
+++ b/scp/profile.php
@@ -164,17 +164,17 @@
require_once(STAFFINC_DIR.'header.inc.php');
?>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
diff --git a/setup/inc/install.inc.php b/setup/inc/install.inc.php
index 595b457..a727a14 100644
--- a/setup/inc/install.inc.php
+++ b/setup/inc/install.inc.php
@@ -57,15 +57,15 @@
osTicket web path and title Url to osTicket installation on your server and the title. HelpDesk URL: HelpDesk URL:
- HelpDesk Title: HelpDesk Title:
System email Default system email (e.g support@yourdomain.com) You can change or add more emails later. Default Email: Default Email: Admin user Min of six characters for the password. You can change or add more users later.
Database MySQL (version 4.4+) is the only database supported at the moment.
-
diff --git a/setup/inc/install.inc.php.orig b/setup/inc/install.inc.php.orig
index 3ac0be2..2879805 100644
--- a/setup/inc/install.inc.php.orig
+++ b/setup/inc/install.inc.php.orig
@@ -21,10 +21,10 @@ if(!isset($info['prefix'])) {
osTicket web path and title Url to osTicket installation on your server and the title. HelpDesk URL: HelpDesk URL:
- HelpDesk Title: HelpDesk Title:
OSTicket Language:
@@ -46,13 +46,13 @@ if(!isset($info['prefix'])) {
}
?>
-
-
+
+
System email Default system email (e.g support@yourdomain.com) You can change or add more emails later. Default Email: Default Email: Admin user Min of six characters for the password. You can change or add more users later.
Database MySQL (version 4.4+) is the only database supported at the moment.
-
diff --git a/setup/inc/shortopentag.inc.php b/setup/inc/shortopentag.inc.php
deleted file mode 100755
index beb368c..0000000
--- a/setup/inc/shortopentag.inc.php
+++ /dev/null
@@ -1,5 +0,0 @@
-osTicket requires short open tags enabled
-Unfortunately osTicket requires that short_open_tag be on. We plan on removing the requirement in the upcoming version(s). Our apologies for the inconvienence.
-Enabling short_open_tag
-Depending on your server permission level - the directive can be set on in php.ini, .htaccess or httpd.conf.
-
diff --git a/setup/inc/upgradedone.inc.php b/setup/inc/upgradedone.inc.php
index d031abb..b112b4b 100755
--- a/setup/inc/upgradedone.inc.php
+++ b/setup/inc/upgradedone.inc.php
@@ -5,7 +5,7 @@
Delete setup directory Disable register globals (optional)
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
diff --git a/setup/upgrade.php b/setup/upgrade.php
index cb30de0..39f1ced 100644
--- a/setup/upgrade.php
+++ b/setup/upgrade.php
@@ -5,7 +5,7 @@
osTicket upgrade script
Peter Rotich
- Copyright (c) 2006-2010 osTicket
+ Copyright (c) 2006-2010 osTicket
http://www.osticket.com
Released under the GNU General Public License WITHOUT ANY WARRANTY.
@@ -33,7 +33,7 @@
//Let's roll.
$errors=array();
$fp=null;
-define('VERSION','1.6 ST'); //Current version number
+define('VERSION','1.6 ST'); //Current version number
define('SCHEMAFILE','./inc/v16rc5.sql'); //osTicket upgrade SQL schema.
define('PREFIX',TABLE_PREFIX);
@@ -48,31 +48,28 @@
}elseif((double)phpversion()<4.3){ //Old PHP installation
$errors['err']='PHP installation seriously out of date';
$inc='php.inc.php';
-}elseif(!ini_get('short_open_tag')) {
- $errors['err']='Short open tag disabled! - osTicket requires it turned on.';
- $inc='shortopentag.inc.php';
}elseif($_POST && !$errors){
- $step=(!strcasecmp($cfg->getVersion(),'1.6 RC5'))?2:1; //gods help us!
- //die("Step #$step");
-
- switch($step):
- case 1: //Upgrading to RC5 from any old version.. RC1-RC4.
- $schema='./inc/v1.6rc5-upgrade.sql';
+ $step=(!strcasecmp($cfg->getVersion(),'1.6 RC5'))?2:1; //gods help us!
+ //die("Step #$step");
+
+ switch($step):
+ case 1: //Upgrading to RC5 from any old version.. RC1-RC4.
+ $schema='./inc/v1.6rc5-upgrade.sql';
$vars=$errors=array();
-
+
$result=db_query('SELECT alert_email,noreply_email,api_whitelist,api_key,default_dept FROM '.CONFIG_TABLE.' WHERE id=1');
if($result && db_num_rows($result)) {
$vars=db_fetch_array($result);
- if(!load_sql_schema($schema,$errors) && !$errors['err'])
+ if(!load_sql_schema($schema,$errors) && !$errors['err'])
$errors['err']='Error parsing SQL schema! Get help from developers';
- }else{
- $errors['err']='Db problems - Get help from developers';
+ }else{
+ $errors['err']='Db problems - Get help from developers';
}
if(!$errors) {
//update version.
- db_query('UPDATE '.CONFIG_TABLE.' SET ostversion='.db_input('1.6 RC5'));
+ db_query('UPDATE '.CONFIG_TABLE.' SET ostversion='.db_input('1.6 RC5'));
//API keys
$ips=array_filter(explode(',',ereg_replace(' ','',$vars['api_whitelist'])));
foreach($ips as $ip) {
@@ -130,68 +127,68 @@
db_query('ALTER TABLE '.PREFIX.'config DROP `noreply_email` ,DROP `alert_email` ,DROP `api_whitelist`');
db_query('TRUNCATE TABLE '.PREFIX.'email_pop3');
db_query('DROP TABLE '.PREFIX.'email_pop3');
- }
- if($errors) break; //break on any errors.
- case 2: //upgrading v1.6 ST (latest release).
- $schema='./inc/v1.6st-upgrade.sql';
- $vars=$errors=array();
-
- if(!load_sql_schema($schema,$errors) && !$errors['err'])
- $errors['err']='Error parsing SQL schema! Get help from developers';
-
- if(!$errors) {
- //update the version to the latest
- $sendnotices=$cfg->autoRespONNewTicket()?1:0;
- db_query('UPDATE '.CONFIG_TABLE.' SET ostversion='.db_input(VERSION).',ticket_notice_active='.db_input($sendnotice));
- //Fix attachment issues.
- require_once(INCLUDE_DIR.'class.ticket.php');
- $sql='SELECT ticket.ticket_id, count(attach_id) as attachments FROM '.TICKET_TABLE.' ticket '.
- 'LEFT JOIN '.TICKET_ATTACHMENT_TABLE.' attach ON ticket.ticket_id=attach.ticket_id '.
- 'GROUP BY ticket.ticket_id';
- //echo $sql;
- $resp = db_query($sql);
- if($resp && db_num_rows($resp)){
- while(list($id,$files)=db_fetch_row($resp)){
- if(!$files) continue;
- $ticket = new Ticket($id);
- $ticket->fixAttachments();
- }
- }
- $sql='SELECT tpl_id,ticket_overlimit_subj,ticket_overlimit_body FROM '.PREFIX.'email_template';
- if(($result=db_query($sql)) && db_num_rows($result)) {
- while($row=db_fetch_array($result)) {
-
- $sql='UPDATE '.PREFIX.'email_template SET updated=NOW() '.
- ',ticket_overlimit_subj='.db_input(str_replace('%ticket','%id',$row['ticket_overlimit_subj'])).
- ',ticket_overlimit_body='.db_input(str_replace('%ticket','%id',$row['ticket_overlimit_body'])).
- ' WHERE tpl_id='.db_input($row['tpl_id']);
- db_query($sql);
- }
- //Update
- $sql='UPDATE '.PREFIX.'email_template SET updated=NOW() '.
- ',ticket_notice_subj = "[#%ticket] %subject"'.
- ',ticket_notice_body = "%name,\r\n\r\nOur customer care team personnel has created a ticket #%ticket on your behalf, with the following message;\r\n\r\n%message\r\n\r\nIf you wish to provide additional comments or information regarding this issue, please don\'t open a new ticket. You can update or view this ticket\'s progress online here: %url/view.php?e=%email&t=%ticket.\r\n\r\n%signature"';
- db_query($sql);
- }
- }
-
- endswitch;
-
- if(!$errors) { //upgrade went smooth!
+ }
+ if($errors) break; //break on any errors.
+ case 2: //upgrading v1.6 ST (latest release).
+ $schema='./inc/v1.6st-upgrade.sql';
+ $vars=$errors=array();
+
+ if(!load_sql_schema($schema,$errors) && !$errors['err'])
+ $errors['err']='Error parsing SQL schema! Get help from developers';
+
+ if(!$errors) {
+ //update the version to the latest
+ $sendnotices=$cfg->autoRespONNewTicket()?1:0;
+ db_query('UPDATE '.CONFIG_TABLE.' SET ostversion='.db_input(VERSION).',ticket_notice_active='.db_input($sendnotice));
+ //Fix attachment issues.
+ require_once(INCLUDE_DIR.'class.ticket.php');
+ $sql='SELECT ticket.ticket_id, count(attach_id) as attachments FROM '.TICKET_TABLE.' ticket '.
+ 'LEFT JOIN '.TICKET_ATTACHMENT_TABLE.' attach ON ticket.ticket_id=attach.ticket_id '.
+ 'GROUP BY ticket.ticket_id';
+ //echo $sql;
+ $resp = db_query($sql);
+ if($resp && db_num_rows($resp)){
+ while(list($id,$files)=db_fetch_row($resp)){
+ if(!$files) continue;
+ $ticket = new Ticket($id);
+ $ticket->fixAttachments();
+ }
+ }
+ $sql='SELECT tpl_id,ticket_overlimit_subj,ticket_overlimit_body FROM '.PREFIX.'email_template';
+ if(($result=db_query($sql)) && db_num_rows($result)) {
+ while($row=db_fetch_array($result)) {
+
+ $sql='UPDATE '.PREFIX.'email_template SET updated=NOW() '.
+ ',ticket_overlimit_subj='.db_input(str_replace('%ticket','%id',$row['ticket_overlimit_subj'])).
+ ',ticket_overlimit_body='.db_input(str_replace('%ticket','%id',$row['ticket_overlimit_body'])).
+ ' WHERE tpl_id='.db_input($row['tpl_id']);
+ db_query($sql);
+ }
+ //Update
+ $sql='UPDATE '.PREFIX.'email_template SET updated=NOW() '.
+ ',ticket_notice_subj = "[#%ticket] %subject"'.
+ ',ticket_notice_body = "%name,\r\n\r\nOur customer care team personnel has created a ticket #%ticket on your behalf, with the following message;\r\n\r\n%message\r\n\r\nIf you wish to provide additional comments or information regarding this issue, please don\'t open a new ticket. You can update or view this ticket\'s progress online here: %url/view.php?e=%email&t=%ticket.\r\n\r\n%signature"';
+ db_query($sql);
+ }
+ }
+
+ endswitch;
+
+ if(!$errors) { //upgrade went smooth!
//Log a message.
$log=sprintf("Congratulations osTicket upgraded to version %s by %s \n\nThank you for choosing osTicket!",VERSION,$thisuser->getName());
$sql='INSERT INTO '.PREFIX.'syslog SET created=NOW(),updated=NOW() '.
- ',title="osTicket upgraded!",log_type="Debug" '.
+ ',title="osTicket upgraded!",log_type="Debug" '.
',log='.db_input($log).
',ip_address='.db_input($_SERVER['REMOTE_ADDR']);
mysql_query($sql);
//Create a ticket
$sql='INSERT INTO '.PREFIX.'ticket SET created=NOW(),ticketID='.db_input(Misc::randNumber(6)).
- ',dept_id='.db_input($deptId?$deptId:$cfg->getDefaultDeptId()).
+ ',dept_id='.db_input($deptId?$deptId:$cfg->getDefaultDeptId()).
",priority_id=2,email='support@osticket.com',name='osTicket Support' ".
- ",subject='osTicket Upgraded!',helptopic='osTicket Support',status='open',source='Web'";
-
+ ",subject='osTicket Upgraded!',helptopic='osTicket Support',status='open',source='Web'";
+
if(db_query($sql) && ($id=db_insert_id())){
$sql='INSERT INTO '.PREFIX.'ticket_message SET created=NOW(), updated=NOW(), source="Web" '.
',ticket_id='.db_input($id).
@@ -202,13 +199,13 @@
//Report the good news.
$inc='upgradedone.inc.php';
$msg='osTicket upgraded to version '.VERSION;
- }else{ //errors....aborting.
+ }else{ //errors....aborting.
$inc='abortedupgrade.inc.php';
$errors['err']=$errors['err']?$errors['err']:'Yikes! upgrade error(s) occured';
$_SESSION['abort']=true;
}
}
-$title=sprintf('osTicket upgrade wizard v %s','1.6 ST (stable)');
+$title=sprintf('osTicket upgrade wizard v %s','1.6 ST (stable)');
?>
@@ -220,23 +217,23 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
