#294 Uploader with cropping - rotate

inc/classes/BxDolSessionQuery.php

@@ -57,7 +57,8 @@ class BxDolSessionQuery extends BxDolDb
     {
         $sSql = $this->prepare("DELETE FROM `" . $this->sTable . "` WHERE `date` < (UNIX_TIMESTAMP() - ?)", BX_DOL_SESSION_LIFETIME);
         $iRet = (int)$this->query($sSql);
-        $this->query("OPTIMIZE TABLE `" . $this->sTable . "`");
+        if ($iRet)
+            $this->query("OPTIMIZE TABLE `" . $this->sTable . "`");
         return $iRet;
     }
 }

inc/js/classes/BxDolUploader.js

@@ -346,7 +346,11 @@ function BxDolUploaderCrop (sUploaderObject, sStorageObject, sUniqId, options) {
         var aExt = ['jpg', 'jpeg', 'png', 'gif'];
 
         var eCroppie = $("#" + this._sFormContainerId + " .bx-croppie-container").croppie(oOptions);
-      
+
+		$("#" + this._sFormContainerId + ' .bx-crop-rotate').on('click', function(ev) {
+			eCroppie.croppie('rotate', parseInt($(this).data('deg')));
+		});
+        
         $("#" + this._sFormContainerId + " input[name=f]").on("change", function() {
             var input = this;            
 
@@ -369,7 +373,7 @@ function BxDolUploaderCrop (sUploaderObject, sStorageObject, sUniqId, options) {
                         url: e.target.result
                     });
                     $("#" + $this._sFormContainerId + " .bx-croppie-container").addClass('ready');
-                    $("#" + $this._sFormContainerId + " .bx-crop-upload").removeClass('bx-btn-disabled');
+                    $("#" + $this._sFormContainerId + " .bx-crop-action").removeClass('bx-btn-disabled');
                     $("#" + $this._sFormContainerId + " .bx-croppie-container").data('bx-filename', input.files[0].name.replace(/(\.[A-Za-z0-9]+)$/, '.png'));
                 }
                 reader.readAsDataURL(input.files[0]);

modules/boonex/english/data/langs/system/en.xml

@@ -2218,6 +2218,8 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_uploader_confirm_close_popup"><![CDATA[Oh no! Are you sure? This may discard uploading files, seriously.]]></string>
     <string name="_sys_uploader_confirm_leaving_page"><![CDATA[Upload is in progress! Stay cool and don't close this page, or it will cut off half-way.]]></string>
     <string name="_sys_uploader_crop_button_name"><![CDATA[Crop Image]]></string>
+    <string name="_sys_uploader_crop_rotate_left"><![CDATA[Rotate Left]]></string>
+	<string name="_sys_uploader_crop_rotate_right"><![CDATA[Rotate Right]]></string>
 	<string name="_sys_uploader_crop_submit_button"><![CDATA[Upload]]></string>    
     <string name="_sys_uploader_crop_title"><![CDATA[Crop Image]]></string>
     <string name="_sys_uploader_crop_err_upload"><![CDATA[Error Uploading.]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -2218,6 +2218,8 @@
 	<string name="_sys_uploader_confirm_close_popup"><![CDATA[О нет! Вы уверены? Это может прервать загрузку файлов.]]></string>
     <string name="_sys_uploader_confirm_leaving_page"><![CDATA[Загрузка в процессе! Не закрывайте эту страницу, или загрузка будет прервана на полпути.]]></string>
     <string name="_sys_uploader_crop_button_name"><![CDATA[Обрезка картинки]]></string>
+    <string name="_sys_uploader_crop_rotate_left"><![CDATA[Повернуть налево]]></string>
+	<string name="_sys_uploader_crop_rotate_right"><![CDATA[Повернуть направо]]></string>
 	<string name="_sys_uploader_crop_submit_button"><![CDATA[Загрузить]]></string>    
     <string name="_sys_uploader_crop_title"><![CDATA[Обрезка Картинки]]></string>
     <string name="_sys_uploader_crop_err_upload"><![CDATA[Ошибка загрузки.]]></string>

template/uploader_form_crop.html

@@ -2,31 +2,19 @@
 
     <input name="f" type="file" />
 
+    <div class="bx-uploader-loading"></div>
     <div class="bx-def-padding-sec-bottom bx-croppie-msg"></div>
     <div class="bx-def-padding-sec-bottom" id="__errors_container_id__"></div>
 
     <div class="bx-croppie-container bx-def-margin-topbottom"></div>
 
     <div class="bx-def-padding-top bx-clearfix">
-        <button class="bx-crop-upload bx-btn bx-btn-primary bx-btn-disabled bx-def-margin-sec-right">Upload</button>
-        <div class="bx-btn" onclick="__uploader_instance_name__.onClickCancel()"><bx_text:_sys_uploader_close /></div>
+        <button class="bx-crop-action bx-btn bx-btn-disabled bx-def-margin-sec-right bx-def-margin-sec-top bx-crop-upload bx-btn-primary"><bx_text:_sys_uploader_crop_submit_button /></button>
+        <button class="bx-crop-action bx-btn bx-btn-disabled bx-def-margin-sec-right bx-def-margin-sec-top bx-crop-rotate" data-deg="-90"><bx_text:_sys_uploader_crop_rotate_left /></button>
+        <button class="bx-crop-action bx-btn bx-btn-disabled bx-def-margin-sec-right bx-def-margin-sec-top bx-crop-rotate" data-deg="90"><bx_text:_sys_uploader_crop_rotate_right /></button>
+        <div class="bx-btn bx-def-margin-sec-top" onclick="__uploader_instance_name__.onClickCancel()"><bx_text:_sys_uploader_close /></div>
     </div>
-    
 
-<!--
-    <form enctype="multipart/form-data" method="POST" target="__iframe_id__" action="<bx_url_root />storage_uploader.php" onsubmit="__uploader_instance_name__.onBeforeUpload(this);">
-
-        <div class="bx-uploader-loading">
-        </div>
-
-        <div class="bx-uploader-files-list">
-
-        </div>
-
-    </form>
-
-    <iframe name="__iframe_id__" id="__iframe_id__" style="width:0px; height:0px; border:0px; float:left;"></iframe>
--->
 </div>
 
 <script>
@@ -42,14 +30,15 @@ setTimeout(function () {
             a: "upload"
         },
         viewport: {
-            width: 300,
-            height: 300,
+            width: 240,
+            height: 240,
             // type: 'circle'
         },
         boundary: {
-            width: 340,
-            height: 340
-        }
+            width: 280,
+            height: 280
+        },
+        enableOrientation: true
     });
-}, 10);
+}, 100);
 </script>