diff --git a/include/class.setup.php b/include/class.setup.php index dfb348c8919ac8be8fa58df0d5d0bf29cd19db8f..4b73c257e4922dffc3ee4c8d60035f9c20d55473 100644 --- a/include/class.setup.php +++ b/include/class.setup.php @@ -30,7 +30,7 @@ Class SetupWizard { function SetupWizard(){ $this->errors=array(); - $this->version_verbose = ('osTicket v'. strtoupper(THIS_VERSION)); + $this->version_verbose = ('osTicket '. strtoupper(THIS_VERSION)); } diff --git a/include/staff/settings-system.inc.php b/include/staff/settings-system.inc.php index 8915c8b4f87048d60cfba3a4d0fe3e2ca697dc62..8dd170e4161a97601b589017b4430ba8a15303ae 100644 --- a/include/staff/settings-system.inc.php +++ b/include/staff/settings-system.inc.php @@ -3,7 +3,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config) $gmtime = Misc::gmtime(); ?> -<h2>System Settings and Preferences - <span>osTicket (v<?php echo $cfg->getVersion(); ?>)</span></h2> +<h2>System Settings and Preferences - <span>osTicket (<?php echo $cfg->getVersion(); ?>)</span></h2> <form action="settings.php?t=system" method="post" id="save"> <?php csrf_token(); ?> <input type="hidden" name="t" value="system" > diff --git a/setup/install.php b/setup/install.php index 497d37817faf22754c6af26468a56873190ca702..2bca44418e655637620993439f34ca1e0a0329f7 100644 --- a/setup/install.php +++ b/setup/install.php @@ -25,7 +25,7 @@ define('OSTICKET_CONFIGFILE','../include/ost-config.php'); //XXX: Make sure the $installer = new Installer(OSTICKET_CONFIGFILE); //Installer instance. $wizard=array(); $wizard['title']='osTicket Installer'; -$wizard['tagline']='Installing osTicket v'.$installer->getVersionVerbose(); +$wizard['tagline']='Installing osTicket '.$installer->getVersionVerbose(); $wizard['logo']='logo.png'; $wizard['menu']=array('Installation Guide'=>'http://osticket.com/wiki/Installation', 'Get Professional Help'=>'http://osticket.com/support'); @@ -85,17 +85,17 @@ switch(strtolower($_SESSION['ost_installer']['s'])) { case 'install': if(!$installer->config_exists()) { $inc='file-missing.inc.php'; - } elseif(!($cFile=file_get_contents($installer->getConfigFile())) + } elseif(!($cFile=file_get_contents($installer->getConfigFile())) || preg_match("/define\('OSTINSTALLED',TRUE\)\;/i",$cFile)) { //osTicket already installed or empty config file? $inc='file-unclean.inc.php'; } elseif(!$installer->config_writable()) { //writable config file?? clearstatcache(); $inc='file-perm.inc.php'; } else { //Everything checked out show install form. - $inc='install.inc.php'; + $inc='install.inc.php'; } break; - case 'subscribe': //TODO: Prep for v1.7 RC1 + case 'subscribe': //TODO: Prep for v1.7 RC1 $inc='subscribe.inc.php'; break; case 'done': @@ -105,10 +105,10 @@ switch(strtolower($_SESSION['ost_installer']['s'])) { break; default: //Fail IF any of the old config files exists. - if(file_exists(INCLUDE_DIR.'settings.php') + if(file_exists(INCLUDE_DIR.'settings.php') || file_exists(ROOT_DIR.'ostconfig.php') - || (file_exists(OSTICKET_CONFIGFILE) - && preg_match("/define\('OSTINSTALLED',TRUE\)\;/i", + || (file_exists(OSTICKET_CONFIGFILE) + && preg_match("/define\('OSTINSTALLED',TRUE\)\;/i", file_get_contents(OSTICKET_CONFIGFILE))) ) $inc='file-unclean.inc.php';