holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix old "phpgwapi" version used instead of new "api"

Browse Source
This commit is contained in:
Ralf Becker 2016-05-25 21:36:41 +02:00
parent 8c821ab8cb
commit 2e6d1e2638
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
setup/inc/class.setup_cmd.inc.php
View File

@ -240,35 +240,35 @@ abstract class setup_cmd extends admin_cmd
$versions =& $GLOBALS['egw_info']['server']['versions']; $versions =& $GLOBALS['egw_info']['server']['versions'];
if (!$versions['phpgwapi']) if (!$versions['api'])
{ {
if (!include(EGW_INCLUDE_ROOT.'/phpgwapi/setup/setup.inc.php')) if (!include(EGW_INCLUDE_ROOT.'/api/setup/setup.inc.php'))
{ {
throw new Api\Exception\WrongUserinput(lang("eGroupWare sources in '%1' are not complete, file '%2' missing !!!",realpath('..'),'phpgwapi/setup/setup.inc.php'),99); // should not happen ;-) throw new Api\Exception\WrongUserinput(lang("EGroupware sources in '%1' are not complete, file '%2' missing !!!",realpath('..'),'api/setup/setup.inc.php'),99); // should not happen ;-)
} }
$versions['phpgwapi'] = $setup_info['phpgwapi']['version']; $versions['api'] = $setup_info['api']['version'];
unset($setup_info); unset($setup_info);
} }
if ($header_checks) if ($header_checks)
{ {
$messages[] = self::_echo_message($verbose,lang('eGroupWare API version %1 found.',$versions['phpgwapi'])); $messages[] = self::_echo_message($verbose,lang('EGroupware API version %1 found.',$versions['api']));
} }
$header_stage = self::$egw_setup->detection->check_header(); $header_stage = self::$egw_setup->detection->check_header();
if ($stop && in_array($header_stage,$stop)) return true; if ($stop && in_array($header_stage,$stop)) return true;
switch ($header_stage) switch ($header_stage)
{ {
case 1: throw new Api\Exception\WrongUserinput(lang('eGroupWare configuration file (header.inc.php) does NOT exist.')."\n".lang('Use --create-header to create the configuration file (--usage gives more options).'),1); case 1: throw new Api\Exception\WrongUserinput(lang('EGroupware configuration file (header.inc.php) does NOT exist.')."\n".lang('Use --create-header to create the configuration file (--usage gives more options).'),1);
// case 2: throw new Api\Exception\WrongUserinput(lang('eGroupWare configuration file (header.inc.php) version %1 exists%2',$versions['header'],'.')."\n".lang('No header admin password set! Use --edit-header <password>[,<user>] to set one (--usage gives more options).'),2); // case 2: throw new Api\Exception\WrongUserinput(lang('EGroupware configuration file (header.inc.php) version %1 exists%2',$versions['header'],'.')."\n".lang('No header admin password set! Use --edit-header <password>[,<user>] to set one (--usage gives more options).'),2);
case 3: throw new Api\Exception\WrongUserinput(lang('eGroupWare configuration file (header.inc.php) version %1 exists%2',$versions['header'],'.')."\n".lang('No eGroupWare domains / database instances exist! Use --edit-header --domain to add one (--usage gives more options).'),3); case 3: throw new Api\Exception\WrongUserinput(lang('EGroupware configuration file (header.inc.php) version %1 exists%2',$versions['header'],'.')."\n".lang('No EGroupware domains / database instances exist! Use --edit-header --domain to add one (--usage gives more options).'),3);
case 4: throw new Api\Exception\WrongUserinput(lang('eGroupWare configuration file (header.inc.php) version %1 exists%2',$versions['header'],'.')."\n".lang('It needs upgrading to version %1! Use --update-header <password>[,<user>] to do so (--usage gives more options).',$versions['current_header']),4); case 4: throw new Api\Exception\WrongUserinput(lang('EGroupware configuration file (header.inc.php) version %1 exists%2',$versions['header'],'.')."\n".lang('It needs upgrading to version %1! Use --update-header <password>[,<user>] to do so (--usage gives more options).',$versions['current_header']),4);
} }
if ($header_checks) if ($header_checks)
{ {
$messages[] = self::_echo_message($verbose,lang('eGroupWare configuration file (header.inc.php) version %1 exists%2', $messages[] = self::_echo_message($verbose,lang('EGroupware configuration file (header.inc.php) version %1 exists%2',
$versions['header'],' '.lang('and is up to date'))); $versions['header'],' '.lang('and is up to date')));
} }
unset($header_checks); // no further output of the header checks unset($header_checks); // no further output of the header checks
@ -286,7 +286,7 @@ abstract class setup_cmd extends admin_cmd
if (count($GLOBALS['egw_domain']) > 1) if (count($GLOBALS['egw_domain']) > 1)
{ {
self::_echo_message($verbose); self::_echo_message($verbose);
$messages[] = self::_echo_message($verbose,lang('eGroupWare domain/instance %1(%2):',$domain,$data['db_type'])); $messages[] = self::_echo_message($verbose,lang('EGroupware domain/instance %1(%2):',$domain,$data['db_type']));
} }
$setup_info = self::$egw_setup->detection->get_versions(); $setup_info = self::$egw_setup->detection->get_versions();
// check if there's already a db-connection and close if, otherwise the db-connection of the previous domain will be used // check if there's already a db-connection and close if, otherwise the db-connection of the previous domain will be used
@ -312,9 +312,9 @@ abstract class setup_cmd extends admin_cmd
{ {
case 1: throw new Api\Exception\WrongUserinput(lang('Your Database is not working!')." $db: ".self::$egw_setup->db->Error,11); case 1: throw new Api\Exception\WrongUserinput(lang('Your Database is not working!')." $db: ".self::$egw_setup->db->Error,11);
case 3: throw new Api\Exception\WrongUserinput(lang('Your database is working, but you dont have any applications installed')." ($db). ".lang("Use --install to install eGroupWare."),13); case 3: throw new Api\Exception\WrongUserinput(lang('Your database is working, but you dont have any applications installed')." ($db). ".lang("Use --install to install EGroupware."),13);
case 4: throw new Api\Exception\WrongUserinput(lang('eGroupWare API needs a database (schema) update from version %1 to %2!',$setup_info['phpgwapi']['currentver'],$versions['phpgwapi']).' '.lang('Use --update to do so.'),14); case 4: throw new Api\Exception\WrongUserinput(lang('EGroupware API needs a database (schema) update from version %1 to %2!',$setup_info['phpgwapi']['currentver'],$versions['phpgwapi']).' '.lang('Use --update to do so.'),14);
case 10: // also check apps of updates case 10: // also check apps of updates
self::$apps_to_upgrade = self::$apps_to_install = array(); self::$apps_to_upgrade = self::$apps_to_install = array();
@ -343,12 +343,12 @@ abstract class setup_cmd extends admin_cmd
} }
break; break;
} }
$messages[] = self::_echo_message($verbose,lang("database is version %1 and up to date.",$setup_info['phpgwapi']['currentver'])); $messages[] = self::_echo_message($verbose,lang("database is version %1 and up to date.",$setup_info['api']['currentver']));
self::$egw_setup->detection->check_config(); self::$egw_setup->detection->check_config();
if ($GLOBALS['egw_info']['setup']['config_errors'] && $stop && !in_array(15,$stop)) if ($GLOBALS['egw_info']['setup']['config_errors'] && $stop && !in_array(15,$stop))
{ {
throw new Api\Exception\WrongUserinput(lang('You need to configure eGroupWare:')."\n- ".@implode("\n- ",$GLOBALS['egw_info']['setup']['config_errors']),15); throw new Api\Exception\WrongUserinput(lang('You need to configure EGroupware:')."\n- ".@implode("\n- ",$GLOBALS['egw_info']['setup']['config_errors']),15);
} }
} }
return $messages; return $messages;

2
setup/inc/class.setup_detection.inc.php
View File

@ -314,7 +314,7 @@ class setup_detection
$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Create Database)'; $GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Create Database)';
return 1; return 1;
} }
if(!isset($setup_info['phpgwapi']['currentver'])) if(!isset($setup_info['api']['currentver']))
{ {
$setup_info = $this->get_db_versions($setup_info); $setup_info = $this->get_db_versions($setup_info);
} }