Skip to content
Snippets Groups Projects
Commit 5fa57edc authored by Peter Rotich's avatar Peter Rotich
Browse files

Initialize search backend on install/upgrade.

Make table prefix consistent
parent 7abd533f
No related branches found
No related tags found
No related merge requests found
...@@ -382,7 +382,7 @@ class MysqlSearchBackend extends SearchBackend { ...@@ -382,7 +382,7 @@ class MysqlSearchBackend extends SearchBackend {
} }
static function createSearchTable() { static function createSearchTable() {
$sql = 'CREATE TABLE '.TABLE_PREFIX.'_search ( $sql = 'CREATE TABLE IF NOT EXISTS '.TABLE_PREFIX.'_search (
`object_type` varchar(8) not null, `object_type` varchar(8) not null,
`object_id` int(11) unsigned not null, `object_id` int(11) unsigned not null,
`title` text collate utf8_general_ci, `title` text collate utf8_general_ci,
...@@ -406,7 +406,8 @@ class MysqlSearchBackend extends SearchBackend { ...@@ -406,7 +406,8 @@ class MysqlSearchBackend extends SearchBackend {
return true; return true;
// Create the search table automatically // Create the search table automatically
$class::createSearchTable(); $class::__init();
}; };
// THREADS ---------------------------------- // THREADS ----------------------------------
...@@ -558,5 +559,14 @@ class MysqlSearchBackend extends SearchBackend { ...@@ -558,5 +559,14 @@ class MysqlSearchBackend extends SearchBackend {
return true; return true;
} }
static function __init() {
self::createSearchTable();
}
} }
Signal::connect('system.install',
array('MysqlSearchBackend', '__init'));
MysqlSearchBackend::register(); MysqlSearchBackend::register();
...@@ -30,6 +30,9 @@ class SequenceLoader extends MigrationTask { ...@@ -30,6 +30,9 @@ class SequenceLoader extends MigrationTask {
foreach ($statuses as $s) { foreach ($statuses as $s) {
TicketStatus::__create($s); TicketStatus::__create($s);
} }
// Initialize MYSQL search backend
MysqlSearchBackend::__init();
} }
} }
......
...@@ -115,8 +115,8 @@ class Installer extends SetupWizard { ...@@ -115,8 +115,8 @@ class Installer extends SetupWizard {
/*************** We're ready to install ************************/ /*************** We're ready to install ************************/
define('ADMIN_EMAIL',$vars['admin_email']); //Needed to report SQL errors during install. define('ADMIN_EMAIL',$vars['admin_email']); //Needed to report SQL errors during install.
define('PREFIX',$vars['prefix']); //Table prefix define('TABLE_PREFIX',$vars['prefix']); //Table prefix
Bootstrap::defineTables(PREFIX); Bootstrap::defineTables(TABLE_PREFIX);
Bootstrap::loadCode(); Bootstrap::loadCode();
$debug = true; // Change it to false to squelch SQL errors. $debug = true; // Change it to false to squelch SQL errors.
...@@ -157,23 +157,25 @@ class Installer extends SetupWizard { ...@@ -157,23 +157,25 @@ class Installer extends SetupWizard {
$i18n = new Internationalization($vars['lang_id']); $i18n = new Internationalization($vars['lang_id']);
$i18n->loadDefaultData(); $i18n->loadDefaultData();
$sql='SELECT `id` FROM '.PREFIX.'sla ORDER BY `id` LIMIT 1'; Signal::send('system.install', $this);
$sql='SELECT `id` FROM '.TABLE_PREFIX.'sla ORDER BY `id` LIMIT 1';
$sla_id_1 = db_result(db_query($sql, false)); $sla_id_1 = db_result(db_query($sql, false));
$sql='SELECT `dept_id` FROM '.PREFIX.'department ORDER BY `dept_id` LIMIT 1'; $sql='SELECT `dept_id` FROM '.TABLE_PREFIX.'department ORDER BY `dept_id` LIMIT 1';
$dept_id_1 = db_result(db_query($sql, false)); $dept_id_1 = db_result(db_query($sql, false));
$sql='SELECT `tpl_id` FROM '.PREFIX.'email_template_group ORDER BY `tpl_id` LIMIT 1'; $sql='SELECT `tpl_id` FROM '.TABLE_PREFIX.'email_template_group ORDER BY `tpl_id` LIMIT 1';
$template_id_1 = db_result(db_query($sql, false)); $template_id_1 = db_result(db_query($sql, false));
$sql='SELECT `group_id` FROM '.PREFIX.'groups ORDER BY `group_id` LIMIT 1'; $sql='SELECT `group_id` FROM '.TABLE_PREFIX.'groups ORDER BY `group_id` LIMIT 1';
$group_id_1 = db_result(db_query($sql, false)); $group_id_1 = db_result(db_query($sql, false));
$sql='SELECT `value` FROM '.PREFIX.'config WHERE namespace=\'core\' and `key`=\'default_timezone_id\' LIMIT 1'; $sql='SELECT `value` FROM '.TABLE_PREFIX.'config WHERE namespace=\'core\' and `key`=\'default_timezone_id\' LIMIT 1';
$default_timezone = db_result(db_query($sql, false)); $default_timezone = db_result(db_query($sql, false));
//Create admin user. //Create admin user.
$sql='INSERT INTO '.PREFIX.'staff SET created=NOW() ' $sql='INSERT INTO '.TABLE_PREFIX.'staff SET created=NOW() '
.", isactive=1, isadmin=1, group_id='$group_id_1', dept_id='$dept_id_1'" .", isactive=1, isadmin=1, group_id='$group_id_1', dept_id='$dept_id_1'"
.", timezone_id='$default_timezone', max_page_size=25" .", timezone_id='$default_timezone', max_page_size=25"
.', email='.db_input($vars['admin_email']) .', email='.db_input($vars['admin_email'])
...@@ -189,14 +191,14 @@ class Installer extends SetupWizard { ...@@ -189,14 +191,14 @@ class Installer extends SetupWizard {
//Create default emails! //Create default emails!
$email = $vars['email']; $email = $vars['email'];
list(,$domain)=explode('@',$vars['email']); list(,$domain)=explode('@',$vars['email']);
$sql='INSERT INTO '.PREFIX.'email (`name`,`email`,`created`,`updated`) VALUES ' $sql='INSERT INTO '.TABLE_PREFIX.'email (`name`,`email`,`created`,`updated`) VALUES '
." ('Support','$email',NOW(),NOW())" ." ('Support','$email',NOW(),NOW())"
.",('osTicket Alerts','alerts@$domain',NOW(),NOW())" .",('osTicket Alerts','alerts@$domain',NOW(),NOW())"
.",('','noreply@$domain',NOW(),NOW())"; .",('','noreply@$domain',NOW(),NOW())";
$support_email_id = db_query($sql, false) ? db_insert_id() : 0; $support_email_id = db_query($sql, false) ? db_insert_id() : 0;
$sql='SELECT `email_id` FROM '.PREFIX."email WHERE `email`='alerts@$domain' LIMIT 1"; $sql='SELECT `email_id` FROM '.TABLE_PREFIX."email WHERE `email`='alerts@$domain' LIMIT 1";
$alert_email_id = db_result(db_query($sql, false)); $alert_email_id = db_result(db_query($sql, false));
//Create config settings---default settings! //Create config settings---default settings!
...@@ -248,7 +250,7 @@ class Installer extends SetupWizard { ...@@ -248,7 +250,7 @@ class Installer extends SetupWizard {
/************* Make the system happy ***********************/ /************* Make the system happy ***********************/
$sql='UPDATE '.PREFIX."email SET dept_id=$dept_id_1"; $sql='UPDATE '.TABLE_PREFIX."email SET dept_id=$dept_id_1";
db_query($sql, false); db_query($sql, false);
global $cfg; global $cfg;
...@@ -271,7 +273,7 @@ class Installer extends SetupWizard { ...@@ -271,7 +273,7 @@ class Installer extends SetupWizard {
//Log a message. //Log a message.
$msg=__("Congratulations osTicket basic installation completed!\n\nThank you for choosing osTicket!"); $msg=__("Congratulations osTicket basic installation completed!\n\nThank you for choosing osTicket!");
$sql='INSERT INTO '.PREFIX.'syslog SET created=NOW(), updated=NOW(), log_type="Debug" ' $sql='INSERT INTO '.TABLE_PREFIX.'syslog SET created=NOW(), updated=NOW(), log_type="Debug" '
.', title="osTicket installed!"' .', title="osTicket installed!"'
.', log='.db_input($msg) .', log='.db_input($msg)
.', ip_address='.db_input($_SERVER['REMOTE_ADDR']); .', ip_address='.db_input($_SERVER['REMOTE_ADDR']);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment