#180 ImageMagick binaries aren't used anymore

install/classes/BxDolInstallSiteConfig.php

@@ -65,22 +65,6 @@ class BxDolInstallSiteConfig
                 'def_exp' => array('defPath', ''),
                 'check' => array('checkLength', 1),
             ),
-            'convert_path' => array(
-                'name' => _t('_sys_inst_conf_field_path_to_binary', 'convert'),
-                'ex' => '/usr/local/bin/convert',
-                'desc' => _t('_sys_inst_conf_desc_path_to_binary', 'convert'),
-                'def' => '/usr/local/bin/convert',
-                'def_exp' => array('defImageMagickBin', 'convert'),
-                'check' => array('checkLength', 7),
-            ),
-            'composite_path' => array(
-                'name' => _t('_sys_inst_conf_field_path_to_binary', 'composite'),
-                'ex' => '/usr/local/bin/composite',
-                'desc' => _t('_sys_inst_conf_desc_path_to_binary', 'composite'),
-                'def' => '/usr/local/bin/composite',
-                'def_exp' => array('defImageMagickBin', 'composite'),
-                'check' => array('checkLength', 7),
-            ),
 
             'section_site_paths_close' => array(
                 'func' => 'rowSectionClose',
@@ -620,22 +604,6 @@ EOF;
         return preg_replace("/install\/(index\.php$)/", '', $s);
     }
 
-    protected function defImageMagickBin ($sBin)
-    {
-        $a = array(
-            '/usr/X11R6/bin/',
-            '/usr/local/bin/',
-            '/usr/bin/',
-            '/usr/local/X11R6/bin/',
-            '/usr/bin/X11/',
-            '/opt/local/bin/',
-        );
-        foreach ($a as $sPath)
-            if (file_exists($sPath . $sBin))
-                return $sPath . $sBin;
-        return '';
-    }
-
     protected function getSelectValues($sType)
     {
         $a = array();

install/patterns/header.inc.php

@@ -14,8 +14,6 @@ define('BX_DATABASE_PASS', '%DB_PASSWORD%'); ///< db password
 define('BX_DATABASE_NAME', '%DB_NAME%'); ///< db name
 
 define('BX_SYSTEM_FFMPEG', '%FFMPEG_PATH%'); ///< path to ffmpeg binary
-define('BX_SYSTEM_CONVERT', '%CONVERT_PATH%'); ///< path to ImageMagick convert binary
-define('BX_SYSTEM_COMPOSITE', '%COMPOSITE_PATH%'); ///< path to ImageMagick composite binary
 define('BX_DOL_SECRET', '%SECRET%'); ///< secret word
 
 define('BX_DB_FULL_VISUAL_PROCESSING', true); ///< upon db error - show error message