diff --git a/backend/components/Helper.php b/backend/components/Helper.php new file mode 100644 index 0000000..d28afa5 --- /dev/null +++ b/backend/components/Helper.php @@ -0,0 +1,43 @@ + 'a', 'б' => 'b', 'в' => 'v', + 'г' => 'g', 'д' => 'd', 'е' => 'e', + 'ё' => 'e', 'ж' => 'zh', 'з' => 'z', + 'и' => 'i', 'й' => 'y', 'к' => 'k', + 'л' => 'l', 'м' => 'm', 'н' => 'n', + 'о' => 'o', 'п' => 'p', 'р' => 'r', + 'с' => 's', 'т' => 't', 'у' => 'u', + 'ф' => 'f', 'х' => 'h', 'ц' => 'c', + 'ч' => 'ch', 'ш' => 'sh', 'щ' => 'sch', + 'ь' => '\'', 'ы' => 'y', 'ъ' => '\'', + 'э' => 'e', 'ю' => 'yu', 'я' => 'ya', + + 'А' => 'A', 'Б' => 'B', 'В' => 'V', + 'Г' => 'G', 'Д' => 'D', 'Е' => 'E', + 'Ё' => 'E', 'Ж' => 'Zh', 'З' => 'Z', + 'И' => 'I', 'Й' => 'Y', 'К' => 'K', + 'Л' => 'L', 'М' => 'M', 'Н' => 'N', + 'О' => 'O', 'П' => 'P', 'Р' => 'R', + 'С' => 'S', 'Т' => 'T', 'У' => 'U', + 'Ф' => 'F', 'Х' => 'H', 'Ц' => 'C', + 'Ч' => 'Ch', 'Ш' => 'Sh', 'Щ' => 'Sch', + 'Ь' => '\'', 'Ы' => 'Y', 'Ъ' => '\'', + 'Э' => 'E', 'Ю' => 'Yu', 'Я' => 'Ya', + ); + return strtr($str, $converter); + } +} \ No newline at end of file diff --git a/backend/controllers/ImageController.php b/backend/controllers/ImageController.php index 5ac7d03..76a29c8 100644 --- a/backend/controllers/ImageController.php +++ b/backend/controllers/ImageController.php @@ -5,6 +5,7 @@ namespace backend\controllers; use backend\components\croppers\CropContext; use backend\components\croppers\CropFactory; +use backend\components\Helper; use Yii; use yii\helpers\FileHelper; use yii\helpers\StringHelper; @@ -31,12 +32,13 @@ class ImageController extends Controller $cropContext = new CropContext($cropFactory->getCrop($crop_id)); foreach($model->imageFiles as $file) { - $path = dirname(dirname(__DIR__)) . '/uploads/' . $file->baseName . '.' . $file->extension; + $baseName = Helper::transliterate($file->baseName); + $path = dirname(dirname(__DIR__)) . '/uploads/' . $baseName . '.' . $file->extension; $image = Yii::$app->imagine->open($path); $image = $cropContext->cropImage($image, $path); $box = $image->getSize()->heighten($minHeight); $image->resize($box) - ->save(dirname(dirname(__DIR__)) . '/uploads/' . $file->baseName . '-resized' . '.' . $file->extension); + ->save(dirname(dirname(__DIR__)) . '/uploads/' . $baseName . '-resized' . '.' . $file->extension); } } return $this->render('index', ['model' => $model, 'ukrSeeds' => $ukrSeeds]); diff --git a/backend/models/UploadForm.php b/backend/models/UploadForm.php index 4c2fd42..10f5105 100644 --- a/backend/models/UploadForm.php +++ b/backend/models/UploadForm.php @@ -1,6 +1,7 @@ validate()) { foreach($this->imageFiles as $file) { - $path = dirname(dirname(__DIR__)) . '/uploads/' . $file->baseName . '.' . $file->extension; + $path = dirname(dirname(__DIR__)) . '/uploads/' . Helper::transliterate($file->baseName) . '.' . $file->extension; $file->saveAs($path); } return true; -- libgit2 0.21.4