extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

removing egw-pear

Browse Source
This commit is contained in:
Ralf Becker 2014-12-11 10:48:16 +00:00
parent 82a42f2644
commit 8497d0cfd5
8 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpgwapi/inc/functions.inc.php
View File

@ -32,12 +32,6 @@ if (!function_exists('version_compare') || version_compare(PHP_VERSION,$egw_min_
{
die("eGroupWare requires PHP $egw_min_php_version or greater.<br />Please contact your System Administrator to upgrade PHP!");
}
// check if eGW's pear repository is installed and prefer it over the other ones
if (is_dir(EGW_SERVER_ROOT.'/egw-pear'))
{
set_include_path(EGW_SERVER_ROOT.'/egw-pear'.PATH_SEPARATOR.get_include_path());
//echo "<p align=right>include_path='".get_include_path()."'</p>\n";
}
if (!defined('EGW_API_INC')) define('EGW_API_INC',PHPGW_API_INC); // this is to support the header upgrade

2
phpgwapi/inc/horde/lib/core.php
View File

@ -30,7 +30,7 @@ if (!defined('HORDE_BASE')) {
@define('HORDE_BASE', EGW_BASE . '/phpgwapi/inc/horde/');
}
$save_include_path = set_include_path(HORDE_BASE . PATH_SEPARATOR . EGW_BASE . '/egw-pear/' . PATH_SEPARATOR . get_include_path());
$save_include_path = set_include_path(HORDE_BASE . PATH_SEPARATOR . get_include_path());
/* PEAR base class. */
include_once 'PEAR.php';

6
phpgwapi/setup/setup.inc.php
View File

@ -59,12 +59,6 @@ $setup_info['phpgwapi']['hooks']['addgroup'] = 'phpgwapi.vfs_home_hooks.addGrou
$setup_info['phpgwapi']['hooks']['deletegroup'] = 'phpgwapi.vfs_home_hooks.deleteGroup';
$setup_info['phpgwapi']['hooks']['editgroup'] = 'phpgwapi.vfs_home_hooks.editGroup';
// egw-pear dependency for modified HTTP_WebDAV_Server
$setup_info['phpgwapi']['depends'][] = array(
'appname' => 'egw-pear',
'versions' => Array('1.9','14.1')
);
/* CalDAV/CardDAV/GroupDAV app */
$setup_info['groupdav']['name'] = 'groupdav';
$setup_info['groupdav']['version'] = '14.1';

2
setup/applications.php
View File

@ -442,7 +442,7 @@ else
$setup_tpl->set_var('resolution','');
$status = lang('OK') . ' - ' . $value['status'];
}
elseif($key != 'egw-pear')
else
{
if ($value['tables'][0] != '')
{

8
setup/check_install.php
View File

@ -376,14 +376,8 @@ function pear_check($package,$args)
$pear_packages = $channel_packages[(string)$channel];
$version_available = false;
// check if egw-pear is availible and packages is included
if ($package && is_dir('../egw-pear') && file_exists('../egw-pear/'.str_replace('_','/',$package).'.php'))
{
$available = $found = true;
$version_available = '999.egw-pear';
}
// packages found in the pear registry --> use that info
elseif ($pear_packages)
if ($pear_packages)
{
$pear_available = $found = true;
// check if package is installed

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

@ -548,8 +548,6 @@ class setup_cmd_ldap extends setup_cmd
{
if (!isset($emailadmin_src))
{
// add egw-pear to include_path, as setup does NOT do it (only includes common_functions.inc.php from API)
set_include_path(EGW_SERVER_ROOT.'/egw-pear'.PATH_SEPARATOR.get_include_path());
include_once(EGW_INCLUDE_ROOT.'/emailadmin/inc/class.'.$ldap_class.'.inc.php');
if ($to_ldap)
{

7
setup/inc/functions.inc.php
View File

@ -52,13 +52,6 @@ if(!defined('EGW_SERVER_ROOT') && !defined('EGW_INCLUDE_ROOT'))
require_once(EGW_INCLUDE_ROOT . '/phpgwapi/inc/common_functions.inc.php');
// check if eGW's pear repository is installed and prefer it over the regular one
if (is_dir(EGW_SERVER_ROOT.'/egw-pear'))
{
set_include_path(EGW_SERVER_ROOT.'/egw-pear'.PATH_SEPARATOR.get_include_path());
//echo "<p align=right>include_path='".get_include_path()."'</p>\n";
}
define('SEP',filesystem_separator());
/**

2
setup/index.php
View File

@ -528,7 +528,7 @@ switch($GLOBALS['egw_info']['setup']['stage']['db'])
}
}
// warn if essential apps are not installed
foreach(array('phpgwapi','etemplate','egw-pear','home','admin','preferences') as $app)
foreach(array('phpgwapi','etemplate','home','admin','preferences','emailadmin') as $app)
{
if (!isset($setup_info[$app]) || empty($setup_info[$app]['currentver']))
{