Skip to content

Fix for MODX 3 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
halftrainedharry wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for MODX 3 #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions core/components/phpthumbon/model/phpthumbon/phpthumbon.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ class phpThumbOn
private $_cfg = array();
/** @var array кеш со */
private $_cacheDir = array();
/** @var bool MODX version */
private $isMODX3;
/** @var array все настройки класса */
public $_config = array();
/** @var null|modSnippet Сниппет для подготовки имени файла превьюхи */
Expand Down Expand Up @@ -75,6 +77,8 @@ public function __construct(modX $modx, array $config = array())
{
$this->modx = &$modx;

$this->isMODX3 = $this->modx->getVersionData()['version'] >= 3;

$corePath = $this->modx->getOption('phpthumbon.core_path', array(), $this->modx->getOption('core_path') . 'components/phpthumbon/');
$assetsPath = $this->modx->getOption('assets_path');
$assetsUrl = $this->modx->getOption('assets_url');
Expand Down Expand Up @@ -152,14 +156,26 @@ public function loadResizer($from, $to)
{
$out = false;
$new = true;
if (!$this->modx->loadClass('modphpthumb', $this->modx->getOption('core_path') . 'model/phpthumb/', true, true)) {
if (!$this->modx->loadClass('modphpthumb', $this->modx->getOption('core_path') . 'model/modx/', true, true)) {

if ($this->isMODX3) {
if (!$this->modx->getService('phpthumb', '\MODX\Revolution\modPhpThumb')) {
$this->modx->log(modX::LOG_LEVEL_ERROR, '[phpthumbon] Could not load phpthumb class');
$this->_flag = false;
}
} else {
if (!$this->modx->loadClass('modphpthumb', $this->modx->getOption('core_path') . 'model/phpthumb/', true, true)) {
if (!$this->modx->loadClass('modphpthumb', $this->modx->getOption('core_path') . 'model/modx/', true, true)) {
$this->modx->log(modX::LOG_LEVEL_ERROR, '[phpthumbon] Could not load phpthumb class');
$this->_flag = false;
}
}
}
if ($this->_flag) {
$this->_phpThumb = new modPhpThumb($this->modx, $this->getConfig());
if ($this->isMODX3) {
$this->_phpThumb = new \MODX\Revolution\modPhpThumb($this->modx, $this->getConfig());
} else {
$this->_phpThumb = new modPhpThumb($this->modx, $this->getConfig());
}
$this->_phpThumb->initialize();
$this->_phpThumb->setSourceFilename($from);
$this->saveOptions();
Expand Down Expand Up @@ -645,11 +661,15 @@ protected function copyFile($from, $to)
*/
public function makeDir($dir)
{
$classPrefix = '';
if ($this->isMODX3) {
$classPrefix = '\\MODX\\Revolution\\File\\';
}
$flag = true;
if (!file_exists($dir)) {
$this->modx->getService('fileHandler', 'modFileHandler');
$dirObj = $this->modx->fileHandler->make($dir, array(), 'modDirectory');
if (!is_object($dirObj) || !($dirObj instanceof modDirectory)) {
$this->modx->getService('fileHandler', $classPrefix . 'modFileHandler');
$dirObj = $this->modx->fileHandler->make($dir, array(), $classPrefix . 'modDirectory');
if (!is_object($dirObj) || !($dirObj instanceof modDirectory || $dirObj instanceof \MODX\Revolution\File\modDirectory)) {
$flag = false;
$this->modx->log(modX::LOG_LEVEL_ERROR, '[phpthumbon] Could not get class modDirectory');
}
Expand Down