From: Jakobus Schürz <jakobus.schuerz@schuerz.at>
Date: Tue, 14 Mar 2023 15:35:18 +0000 (+0100)
Subject: fix getting bytes from shorthand in php
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=39f7660a1dd4684df0f3601deee4ef30392143d1;p=friendica.git

fix getting bytes from shorthand in php
---

diff --git a/mod/photos.php b/mod/photos.php
index 97c0fb22e6..d7d806bfc2 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1141,9 +1141,7 @@ function photos_content(App $a)
 						'$qcomment' => $qcomment,
 						'$rand_num' => Crypto::randomDigits(12),
 						// Dropzone
-                                                //'$max_imagesize'       => Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
-                                                // Strings::getBytresFromShorthand not working, so just workaround in template and serve the bare value
-						'$max_imagesize'       => DI::config()->get('system', 'maximagesize'),
+						'$max_imagesize' => floor(Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000),
 					]);
 				}
 			}
@@ -1200,9 +1198,7 @@ function photos_content(App $a)
 						'$qcomment' => $qcomment,
 						'$rand_num' => Crypto::randomDigits(12),
 						// Dropzone
-                                                //'$max_imagesize'       => Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
-                                                // Strings::getBytresFromShorthand not working, so just workaround in template and serve the bare value
-						'$max_imagesize'       => DI::config()->get('system', 'maximagesize'),
+						'$max_imagesize' => floor(Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000),
 					]);
 				}
 
@@ -1278,9 +1274,7 @@ function photos_content(App $a)
 							'$qcomment' => $qcomment,
 							'$rand_num' => Crypto::randomDigits(12),
 							// Dropzone
-                                                        //'$max_imagesize'       => Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
-                                                        // Strings::getBytresFromShorthand not working, so just workaround in template and serve the bare value
-							'$max_imagesize'       => DI::config()->get('system', 'maximagesize'),
+							'$max_imagesize' => floor(Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000),
 						]);
 					}
 				}
diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 8460f94232..b0fd60ae3c 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -411,9 +411,7 @@ class Conversation
 			'$always_open_compose' => $this->pConfig->get($this->session->getLocalUserId(), 'frio', 'always_open_compose', false),
 
 			// Dropzone
-                        //'$max_imagesize'       => Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
-                        // Strings::getBytresFromShorthand not working, so just workaround in template and serve the bare value
-			'$max_imagesize'       => DI::config()->get('system', 'maximagesize'),
+			'$max_imagesize' => floor(\Friendica\Util\Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000),
 
 		]);
 
diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index 30e2aa9d6b..d1744b9d72 100644
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -242,7 +242,7 @@ class Compose extends BaseModule
 			]),
 
 			// Dropzone
-			'$max_imagesize'    => DI::config()->get('system', 'maximagesize')
+			'$max_imagesize' => floor(Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000),
 		]);
 	}
 }
diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php
index 3e47889b21..e28d54c9b2 100644
--- a/src/Module/Post/Edit.php
+++ b/src/Module/Post/Edit.php
@@ -184,13 +184,10 @@ class Edit extends BaseModule
 			'$shortpermset' => $this->t('Permissions'),
 
 			'$compose_link_title' => $this->t('Open Compose page'),
+
 			// Dropzone
-			//'$max_imagesize'       => \Friendica\\Util\\Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
-			//'$max_imagesize'       => Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
-                        // both not working, so just workaround in template and serve the bare value
-			'$max_imagesize'       => DI::config()->get('system', 'maximagesize'),
+			'$max_imagesize'       => floor(Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000),
 		]);
-
 		return $output;
 	}
 
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 9e569c6a16..5fa9dfcf6f 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -1070,9 +1070,7 @@ class Post
 				'$indent'      => $indent,
 				'$rand_num'    => Crypto::randomDigits(12),
 				// Dropzone
-                                //'$max_imagesize'       => Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
-                                // Strings::getBytresFromShorthand not working, so just workaround in template and serve the bare value
-				'$max_imagesize' => DI::config()->get('system', 'maximagesize'),
+				'$max_imagesize' => floor(\Friendica\Util\Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000),
 			]);
 		}
 
diff --git a/view/templates/item/compose.tpl b/view/templates/item/compose.tpl
index 581e8d29fd..88a19ac978 100644
--- a/view/templates/item/compose.tpl
+++ b/view/templates/item/compose.tpl
@@ -96,29 +96,27 @@
 	</div>
 </div>
 <script>
-	// getMByte() is from view/theme/frio/js/dropzone-frio.js
-	// to workaround dysfunctional php Strings:getBytesFromShorthand
 	Dropzone.autoDiscover = false;
 	var dropzoneCompose = new Dropzone( '#dropzone-{{$id}}',  { 
-		paramName: "userfile", // The name that will be used to transfer the file
-		maxFilesize: getMBytes('{{$max_imagesize}}'), // MB
-		url: "/media/photo/upload?response=url&album=",
+		paramName: 'userfile', // The name that will be used to transfer the file
+		maxFilesize: {{$max_imagesize}}, // MB
+		url: '/media/photo/upload?response=url&album=',
 		accept: function(file, done) {
 			done();
 		},
 		init: function() {
-			this.on("success", function(file, serverResponse) {
+			this.on('success', function(file, serverResponse) {
 				var target = $('#comment-edit-text-{{$id}}')
 				var resp = $(serverResponse).find('div#content').text()
 				if (target.setRangeText) {
 					//if setRangeText function is supported by current browser
-					target.setRangeText(" " + $.trim(resp) + " ")
+					target.setRangeText(' ' + $.trim(resp) + ' ')
 				} else {
 					target.focus()
 					document.execCommand('insertText', false /*no UI*/, $.trim(resp));
 				}
 			});
-			this.on("complete", function(file) {
+			this.on('complete', function(file) {
 				// Remove just uploaded file from dropzone, makes interface more clear.
 				// Image can be seen in posting-preview
 				// We need preview to get optical feedback about upload-progress.
diff --git a/view/theme/frio/js/modal.js b/view/theme/frio/js/modal.js
index a20862e751..705f472c43 100644
--- a/view/theme/frio/js/modal.js
+++ b/view/theme/frio/js/modal.js
@@ -294,25 +294,25 @@ function editpost(url) {
 			// To make dropzone fileupload work on editing a comment, we need to
 			// attach a new dropzone to modal
 			dropzoneJotEdit = new Dropzone( '#jot-text-wrap', {
-				paramName: "userfile", // The name that will be used to transfer the file
-				maxFilesize: getMBytes('{{$max_imagesize}}'), // MB
-				url: "/media/photo/upload?response=url&album=",
+				paramName: 'userfile', // The name that will be used to transfer the file
+				maxFilesize: '{{$max_imagesize}}', // MB
+				url: '/media/photo/upload?response=url&album=',
 				accept: function(file, done) {
 					done();
 				},
 				init: function() {
-					this.on("success", function(file, serverResponse) {
+					this.on('success', function(file, serverResponse) {
 						var target = $('#profile-jot-text')
 						var resp = $(serverResponse).find('div#content').text()
 						if (target.setRangeText) {
 							//if setRangeText function is supported by current browser
-							target.setRangeText(" " + $.trim(resp) + " ")
+							target.setRangeText(' ' + $.trim(resp) + ' ')
 						} else {
 							target.focus()
-							document.execCommand('insertText', false /*no UI*/, " " + $.trim(resp) + " ");
+							document.execCommand('insertText', false /*no UI*/, ' ' + $.trim(resp) + ' ');
 						}
 					});
-					this.on("complete", function(file) {
+					this.on('complete', function(file) {
 						// Remove just uploaded file from dropzone, makes interface more clear.
 						// Image can be seen in posting-preview
 						// We need preview to get optical feedback about upload-progress.
diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index 127612b29c..00ca396d11 100644
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -66,29 +66,27 @@
 </div>
 
 <script>
-	// getMByte() is from view/theme/frio/js/dropzone-frio.js
-	// to workaround dysfunctional php Strings:getBytesFromShorthand
 	Dropzone.autoDiscover = false;
 	var dropzone{{$id}} = new Dropzone( '#dropzone-{{$id}}', {
-		paramName: "userfile", // The name that will be used to transfer the file
-		maxFilesize: getMBytes('{{$max_imagesize}}'), // MB
-		url: "/media/photo/upload?response=url&album=",
+		paramName: 'userfile', // The name that will be used to transfer the file
+		maxFilesize: {{$max_imagesize}}, // MB
+		url: '/media/photo/upload?response=url&album=',
 		accept: function(file, done) {
 			done();
 		},
 		init: function() {
-			this.on("success", function(file, serverResponse) {
+			this.on('success', function(file, serverResponse) {
 				var target = $('#comment-edit-text-{{$id}}')
 				var resp = $(serverResponse).find('div#content').text()
 				if (target.setRangeText) {
 					//if setRangeText function is supported by current browser
-					target.setRangeText(" " + $.trim(resp) + " ")
+					target.setRangeText(' ' + $.trim(resp) + ' ')
 				} else {
 					target.focus()
-					document.execCommand('insertText', false /*no UI*/, " " + $.trim(resp) + " ");
+					document.execCommand('insertText', false /*no UI*/, ' ' + $.trim(resp) + ' ');
 				}
 			});
-			this.on("complete", function(file) {
+			this.on('complete', function(file) {
 				// Remove just uploaded file from dropzone, makes interface more clear.
 				// Image can be seen in posting-preview
 				// We need preview to get optical feedback about upload-progress.
diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index e0cd989583..478f190562 100644
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -140,7 +140,6 @@
 	{{/if}}
 	<script type="text/javascript" src="view/theme/frio/js/textedit.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 	<script type="text/javascript" src="vendor/enyo/dropzone/dist/min/dropzone.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-	<script type="text/javascript" src="view/theme/frio/js/dropzone-frio.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 
 	{{* Include the strings which are needed for some js functions (e.g. translation)
 They are loaded into the html <head> so that js functions can use them *}}
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index 1ffe7dd3c1..006095302e 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -182,29 +182,27 @@ can load different content into the jot modal (e.g. the item edit jot)
 </script>
 
 <script>
-	// getMByte() is from view/theme/frio/js/dropzone-frio.js
-	// to workaround dysfunctional php Strings:getBytesFromShorthand
 	Dropzone.autoDiscover = false;
 	var dropzoneJot = new Dropzone( '#jot-text-wrap', {
-		paramName: "userfile", // The name that will be used to transfer the file
-		maxFilesize: getMBytes('{{$max_imagesize}}'), // MB
-		url: "/media/photo/upload?response=url&album=",
+		paramName: 'userfile', // The name that will be used to transfer the file
+		maxFilesize: {{$max_imagesize}}, // MB
+		url: '/media/photo/upload?response=url&album=',
 		accept: function(file, done) {
 			done();
 		},
 		init: function() {
-			this.on("success", function(file, serverResponse) {
+			this.on('success', function(file, serverResponse) {
 				var target = $('#profile-jot-text')
 				var resp = $(serverResponse).find('div#content').text()
 				if (target.setRangeText) {
 					//if setRangeText function is supported by current browser
-					target.setRangeText(" " + $.trim(resp) + " ")
+					target.setRangeText(' ' + $.trim(resp) + ' ')
 				} else {
 					target.focus()
-					document.execCommand('insertText', false /*no UI*/, " " + $.trim(resp) + " ");
+					document.execCommand('insertText', false /*no UI*/, ' ' + $.trim(resp) + ' ');
 				}
 			});
-			this.on("complete", function(file) {
+			this.on('complete', function(file) {
 				// Remove just uploaded file from dropzone, makes interface more clear.
 				// Image can be seen in posting-preview
 				// We need preview to get optical feedback about upload-progress.