Project

General

Profile

GX-Bug #59324 » refs_#59324__made_auto_updater_activities_are_optional.patch

Mirko Janssen, 10/01/2018 09:48 AM

View differences:

src/gambio_updater/classes/GambioUpdateControl.inc.php (date 1538379793000)
1 1
<?php
2 2
/* --------------------------------------------------------------
3
   GambioUpdateControl.inc.php 2018-08-14
3
   GambioUpdateControl.inc.php 2018-10-01
4 4
   Gambio GmbH
5 5
   http://www.gambio.de
6 6
   Copyright (c) 2018 Gambio GmbH
......
15 15
require_once(DIR_FS_CATALOG . 'gambio_updater/classes/SFTPManager.inc.php');
16 16
require_once(DIR_FS_CATALOG . 'system/core/caching/CacheControl.inc.php');
17 17
require_once(DIR_FS_CATALOG . 'system/classes/security/SecurityCheck.inc.php');
18
require_once(DIR_FS_CATALOG . 'gambio_updater/classes/AutoUpdateChecker.inc.php');
18
if(file_exists(DIR_FS_CATALOG . 'gambio_updater/classes/AutoUpdateChecker.inc.php'))
19
{
20
	require_once(DIR_FS_CATALOG . 'gambio_updater/classes/AutoUpdateChecker.inc.php');
21
}
19 22

  
20 23
class GambioUpdateControl
21 24
{
......
1699 1702

  
1700 1703
    public function isUpdateAvailable()
1701 1704
    {
1705
	    if(!class_exists('AutoUpdateChecker'))
1706
	    {
1707
		    return false;
1708
	    }
1709
	    
1702 1710
	    $db = new DatabaseModel($this->db_host, $this->db_user, $this->db_password, $this->db_name);
1703 1711
	    $autoUpdateChecker = new AutoUpdateChecker($db);
1704 1712
	    
src/gambio_updater/index.php (date 1538379793000)
1 1
<?php
2 2
/* --------------------------------------------------------------
3
   index.php 2018-07-27
3
   index.php 2018-10-01
4 4
   Gambio GmbH
5 5
   http://www.gambio.de
6 6
   Copyright (c) 2018 Gambio GmbH
......
11 11

  
12 12
require_once('includes/application.inc.php');
13 13
require_once(DIR_FS_CATALOG . 'system/classes/security/SecurityCheck.inc.php');
14
require_once(__DIR__ . '/classes/AutoUpdatePermissionChecker.inc.php');
14
if(file_exists(DIR_FS_CATALOG . 'gambio_updater/classes/AutoUpdatePermissionChecker.inc.php'))
15
{
16
	require_once DIR_FS_CATALOG . 'gambio_updater/classes/AutoUpdatePermissionChecker.inc.php';
17
}
15 18

  
16 19
$expectedHtaccessVersion = SecurityCheck::getExpectedHtaccessVersion();
17 20
$customerHtaccessVersion = SecurityCheck::getHtaccessVersion();
......
548 551
                                $coo_cache_control = new CacheControl();
549 552
                                $coo_cache_control->clear_data_cache();
550 553
	
551
	                            $permissionCheckFiles       = array();
552
	                            $permissionCheckDirectories = array();
553
	                            AutoUpdatePermissionChecker::correctFilePermissions($permissionCheckFiles,
554
	                                                                                $permissionCheckDirectories);
554
	                            if(class_exists('AutoUpdatePermissionChecker'))
555
	                            {
556
		                            $permissionCheckFiles       = array();
557
		                            $permissionCheckDirectories = array();
558
		                            AutoUpdatePermissionChecker::correctFilePermissions($permissionCheckFiles,
559
		                                                                                $permissionCheckDirectories);
560
	                            }
555 561
                                
556 562
                                $current_shop_version = $coo_update_control->get_current_shop_version();
557 563
                        
src/gambio_updater/updates/v3.10.0.1/dependent.inc.php (date 1538379793000)
1 1
<?php
2 2
/* --------------------------------------------------------------
3
   dependent.inc.php 2018-06-27
3
   dependent.inc.php 2018-10-01
4 4
   Gambio GmbH
5 5
   http://www.gambio.de
6 6
   Copyright (c) 2018 Gambio GmbH
......
9 9
   --------------------------------------------------------------
10 10
*/
11 11

  
12
require_once DIR_FS_CATALOG . 'gambio_updater/classes/AutoUpdatePermissionChecker.inc.php';
13

  
14
$permissionCheckFiles       = array();
15
$permissionCheckDirectories = array();
16
AutoUpdatePermissionChecker::correctFilePermissions($permissionCheckFiles, $permissionCheckDirectories);
12
if(file_exists(DIR_FS_CATALOG . 'gambio_updater/classes/AutoUpdatePermissionChecker.inc.php'))
13
{
14
	require_once DIR_FS_CATALOG . 'gambio_updater/classes/AutoUpdatePermissionChecker.inc.php';
15
	
16
	$permissionCheckFiles       = array();
17
	$permissionCheckDirectories = array();
18
	AutoUpdatePermissionChecker::correctFilePermissions($permissionCheckFiles, $permissionCheckDirectories);
19
}
    (1-1/1)
    Add picture from clipboard (Maximum size: 5 MB)