diff --git a/setup/inc/class.setup.php b/setup/inc/class.setup.php
index 2660da6a260cc8afd6360f3f6aec4ea5f4131bf7..c4d986c655ad6041591f879f7e4c077ef24ec6b7 100644
--- a/setup/inc/class.setup.php
+++ b/setup/inc/class.setup.php
@@ -253,7 +253,7 @@ class Installer extends SetupWizard {
//Staff's email can't be same as system emails.
- if($vars['admin_email'] && $vars['email'] && !strcasecmp($vars['sysemail'],$vars['email']))
+ if($vars['admin_email'] && $vars['email'] && !strcasecmp($vars['admin_email'],$vars['email']))
$this->errors['admin_email']='Conflicts with system email above';
//Admin's pass confirmation.
if(!$this->errors && strcasecmp($vars['passwd'],$vars['passwd2']))
@@ -303,8 +303,8 @@ class Installer extends SetupWizard {
if(!$this->errors) {
//Create admin user.
$sql='INSERT INTO '.PREFIX.'staff SET created=NOW() '
- .', isactive=1, isadmin=1, group_id=1, dept_id=1, timezone_id=1 '
- .', email='.db_input($_POST['email'])
+ .', isactive=1, isadmin=1, group_id=1, dept_id=1, timezone_id=8 '
+ .', email='.db_input($_POST['admin_email'])
.', firstname='.db_input($vars['fname'])
.', lastname='.db_input($vars['lname'])
.', username='.db_input($vars['username'])
@@ -318,7 +318,7 @@ class Installer extends SetupWizard {
//XXX: rename ostversion helpdesk_* ??
$sql='INSERT INTO '.PREFIX.'config SET updated=NOW(), isonline=0 '
.', default_email_id=1, alert_email_id=2, default_dept_id=1 '
- .', default_sla_id=1, default_timezone_id=1, default_template_id=1 '
+ .', default_sla_id=1, default_timezone_id=8, default_template_id=1 '
.', admin_email='.db_input($vars['admin_email'])
.', schema_signature='.db_input(md5_file($schemaFile))
.', helpdesk_url='.db_input(URL)
@@ -356,7 +356,8 @@ class Installer extends SetupWizard {
@mysql_query($sql);
//Create a ticket to make the system warm and happy.
- $sql='INSERT INTO '.PREFIX.'ticket SET created=NOW(), status="open", source="Web", priority_id=2, dept_id=1 '
+ $sql='INSERT INTO '.PREFIX.'ticket SET created=NOW(), status="open", source="Web" '
+ .' ,priority_id=2, dept_id=1, topic_id=1 '
.' ,ticketID='.db_input(Misc::randNumber(6))
.' ,email="support@osticket.com" '
.' ,name="osTicket Support" '
diff --git a/setup/js/tips.js b/setup/js/tips.js
index f24d82512d6b0bd6258ae8c674bce77bfaed0826..d7214dc6379caabd7b210865bb930bb7f4891a7a 100644
--- a/setup/js/tips.js
+++ b/setup/js/tips.js
@@ -1,60 +1,48 @@
-jQuery(function($) {
- var tips = $('.tip');
- for(i=0;i<tips.length;i++) {
- tips[i].rel = 'tip-' + i;
- }
-
- $('.tip').live('mouseover click', function(e) {
- e.preventDefault();
- var tip_num = this.rel;
-
- if($('.' + tip_num).length == 0) {
-
- var elem = $(this);
- var pos = elem.offset();
-
- var y_pos = pos.top - 12;
- var x_pos = pos.left + elem.width() + 20;
-
- var tip_arrow = $('<img>').attr('src', './images/tip_arrow.png').addClass('tip_arrow');
- var tip_box = $('<div>').addClass('tip_box');
- var tip_content = $('<div>').addClass('tip_content').load('tips.html '+elem.attr('href'), function() {
- tip_content.prepend('<a href="#" class="tip_close">x</a>');
- });
-
- var the_tip = tip_box.append(tip_arrow).append(tip_content);
- the_tip.css({
- "top":y_pos + "px",
- "left":x_pos + "px"
- }).addClass(tip_num);
-
- tip_timer = setTimeout(function() {
- $('.tip_box').remove();
- $('body').append(the_tip.hide().fadeIn());
- }, 500);
-
- $('.' + tip_num + ' .tip_shadow').css({
- "height":$('.' + tip_num).height() + 5
- });
- }
- }).live('mouseout', function() {
- clearTimeout(tip_timer);
- });
- $('body').delegate('.tip_close', 'click', function(e) {
- e.preventDefault();
- $(this).parent().parent().remove();
- }).delegate('.tip_menu .assign', 'click', function(e) {
- e.preventDefault();
- elem = $(this).parent().parent().parent().parent();
- $('.tip_body', elem).slideToggle(function() {
- $('.assign_panel', elem).slideToggle();
- });
- }).delegate('.assign_panel .cancel', 'click', function(e) {
- e.preventDefault();
- elem = $(this).parent().parent().parent();
- $('.assign_panel', elem).slideToggle(function() {
- $('.tip_body', elem).slideToggle();
- });
- });
-
-});
+jQuery(function($) {
+ var tips = $('.tip');
+ for(i=0;i<tips.length;i++) {
+ tips[i].rel = 'tip-' + i;
+ }
+
+ $('.tip').live('mouseover click', function(e) {
+ e.preventDefault();
+ var tip_num = this.rel;
+
+ if($('.' + tip_num).length == 0) {
+
+ var elem = $(this);
+ var pos = elem.offset();
+
+ var y_pos = pos.top - 12;
+ var x_pos = pos.left + elem.width() + 20;
+
+ var tip_arrow = $('<img>').attr('src', './images/tip_arrow.png').addClass('tip_arrow');
+ var tip_box = $('<div>').addClass('tip_box');
+ var tip_content = $('<div>').addClass('tip_content').load('tips.html '+elem.attr('href'), function() {
+ tip_content.prepend('<a href="#" class="tip_close">x</a>');
+ });
+
+ var the_tip = tip_box.append(tip_arrow).append(tip_content);
+ the_tip.css({
+ "top":y_pos + "px",
+ "left":x_pos + "px"
+ }).addClass(tip_num);
+
+ tip_timer = setTimeout(function() {
+ $('.tip_box').remove();
+ $('body').append(the_tip.hide().fadeIn());
+ }, 500);
+
+ $('.' + tip_num + ' .tip_shadow').css({
+ "height":$('.' + tip_num).height() + 5
+ });
+ }
+ }).live('mouseout', function() {
+ clearTimeout(tip_timer);
+ });
+ $('body').delegate('.tip_close', 'click', function(e) {
+ e.preventDefault();
+ $(this).parent().parent().remove();
+ });
+});
+