1.3.0-a3

IMC-GER · IMC-GER · commit c6b0a0dc32f0 · 2023-10-05T20:50:27.000+02:00
- replace echo and exit_handler() with the function trigger_error()
diff --git a/imcger.zip b/imcger.zip
diff --git a/imcger/imgupload/composer.json b/imcger/imgupload/composer.json
@@ -3,8 +3,8 @@
     "type": "phpbb-extension",
     "description": "Using ImageMagick php librarie for resize image attachments and creating thumbnails.",
     "homepage": "https://github.com/IMC-GER/phpBB-Image-upload-use-ImageMagick/tags",
-    "version": "1.3.0-a2",
-    "time": "2023-10-03",
+    "version": "1.3.0-a3",
+    "time": "2023-10-04",
     "license": "GPL-2.0-only",
     "authors": [
         {
diff --git a/imcger/imgupload/core/save_rotated_img.php b/imcger/imgupload/core/save_rotated_img.php
@@ -14,6 +14,7 @@
  * @ignore
  */
 define('IN_PHPBB', true);
+global $user, $auth, $request, $language, $db, $config;
 $phpbb_root_path = './../../../../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.' . $phpEx);
@@ -22,7 +23,6 @@
 // Start session management
 $user->session_begin();
 $auth->acl($user->data);
-$user->setup('viewforum');
 
 // No ajax request, redirect to forum index
 if (!$request->is_ajax())
@@ -33,8 +33,8 @@
 // No user logged in, redirect in js to login page
 if ($user->data['user_id'] == ANONYMOUS)
 {
-	echo 'LOGIN_REQUIRED';
-	exit_handler();
+	// The flag E_USER_WARNING trigger a redirect to the login page
+	trigger_error('LOGIN_REQUIRED', E_USER_WARNING);
 }
 
 // Add language file
@@ -44,16 +44,14 @@
 
 if (!$data)
 {
-	echo $language->lang('IUL_NO_DATA_SEND');
-	exit_handler();
+	trigger_error($language->lang('IUL_NO_DATA_SEND'), E_USER_NOTICE);
 }
 
 list($img_attach_id, $img_rotate_deg) = explode(';', $data);
 
 if (!$img_attach_id || !$img_rotate_deg)
 {
-	echo $language->lang('IUL_WRONG_PARAM');
-	exit_handler();
+	trigger_error($language->lang('IUL_WRONG_PARAM'), E_USER_NOTICE);
 }
 
 if ($auth->acl_gets('u_attach', 'a_attach', 'f_attach'))
@@ -69,8 +67,7 @@
 
 if (!isset($img_data) || $img_data == false)
 {
-	echo $language->lang('IUL_NO_IMG_IN_DATABASE');
-	exit_handler();
+	trigger_error($language->lang('IUL_NO_IMG_IN_DATABASE'), E_USER_NOTICE);
 }
 
 // Get image file path
@@ -79,22 +76,20 @@
 
 if (file_exists($image_file_path))
 {
-    $img_data['filesize'] = rotate_image($image_file_path, $img_rotate_deg);
+	$img_data['filesize'] = rotate_image($image_file_path, $img_rotate_deg);
 }
 else
 {
-	echo $language->lang('IUL_IMG_NOT_EXIST');
-	exit_handler();
+	trigger_error($language->lang('IUL_IMG_NOT_EXIST'), E_USER_NOTICE);
 }
 
 if ($img_data['thumbnail'] && file_exists($thumb_file_path))
 {
-    rotate_image($thumb_file_path, $img_rotate_deg);
+	rotate_image($thumb_file_path, $img_rotate_deg);
 }
 else if ($img_data['thumbnail'])
 {
-	echo $language->lang('IUL_THUMB_NOT_EXIST');
-	exit_handler();
+	trigger_error($language->lang('IUL_THUMB_NOT_EXIST'), E_USER_NOTICE);
 }
 
 // Update DataBase
@@ -105,17 +100,16 @@
 // sql_nextid() to be removed in 4.1.0-a1, in future use sql_last_inserted_id() it exsits since 3.3.11-RC1
 $new_attachID = $db->sql_nextid();
 
-if ($new_attachID) {
+if ($new_attachID)
+{
 	$sql = 'DELETE FROM ' . ATTACHMENTS_TABLE . ' WHERE attach_id = ' . (int) $img_attach_id;
 	$db->sql_query($sql);
 
-	echo 'UPDATE-ROW_' . $img_attach_id . '_' . $new_attachID;
-	exit_handler();
+	trigger_error('UPDATE-ROW_' . $img_attach_id . '_' . $new_attachID, E_USER_NOTICE);
 }
 else
 {
-	echo $language->lang('IUL_DATABASE_NOT_UPDATE');
-	exit_handler();
+	trigger_error($language->lang('IUL_DATABASE_NOT_UPDATE'), E_USER_NOTICE);
 }
 
 
diff --git a/imcger/imgupload/styles/all/template/event/overall_footer_body_after.html b/imcger/imgupload/styles/all/template/event/overall_footer_body_after.html
@@ -105,11 +105,13 @@
 
 	xhr.onreadystatechange = function() {
 		if (xhr.readyState === 4) {
-		    if (xhr.responseText) {
-				if (xhr.responseText.startsWith('UPDATE-ROW_')) {
-					imcgerIuplUpdateRow(xhr.responseText);
+		    if (xhr.responseText) {		
+				let respText = JSON.parse(xhr.responseText);
+
+				if (respText.MESSAGE_TEXT.startsWith('UPDATE-ROW_')) {
+					imcgerIuplUpdateRow(respText.MESSAGE_TEXT);
 					imcgerIupl.imgOrientationValue[index] = 0;
-				} else if (xhr.responseText == 'LOGIN_REQUIRED') {
+				} else if (respText.S_USER_WARNING == true) {
 					window.location.assign(window.location.href.replace(window.location.hash, ''));
 				} else {
 					phpbb.alert('{{ IMGUPLOAD_TITLE }}', xhr.responseText);

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`* @ignore`
`15`	`15`	`*/`
`16`	`16`	`define('IN_PHPBB', true);`
	`17`	`+global $user, $auth, $request, $language, $db, $config;`
`17`	`18`	`$phpbb_root_path = './../../../../';`
`18`	`19`	`$phpEx = substr(strrchr(__FILE__, '.'), 1);`
`19`	`20`	`include($phpbb_root_path . 'common.' . $phpEx);`
`@@ -22,7 +23,6 @@`
`22`	`23`	`// Start session management`
`23`	`24`	`$user->session_begin();`
`24`	`25`	`$auth->acl($user->data);`
`25`		`-$user->setup('viewforum');`
`26`	`26`
`27`	`27`	`// No ajax request, redirect to forum index`
`28`	`28`	`if (!$request->is_ajax())`
`@@ -33,8 +33,8 @@`
`33`	`33`	`// No user logged in, redirect in js to login page`
`34`	`34`	`if ($user->data['user_id'] == ANONYMOUS)`
`35`	`35`	`{`
`36`		`- echo 'LOGIN_REQUIRED';`
`37`		`- exit_handler();`
	`36`	`+ // The flag E_USER_WARNING trigger a redirect to the login page`
	`37`	`+ trigger_error('LOGIN_REQUIRED', E_USER_WARNING);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// Add language file`
`@@ -44,16 +44,14 @@`
`44`	`44`
`45`	`45`	`if (!$data)`
`46`	`46`	`{`
`47`		`- echo $language->lang('IUL_NO_DATA_SEND');`
`48`		`- exit_handler();`
	`47`	`+ trigger_error($language->lang('IUL_NO_DATA_SEND'), E_USER_NOTICE);`
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`list($img_attach_id, $img_rotate_deg) = explode(';', $data);`
`52`	`51`
`53`	`52`	`if (!$img_attach_id \|\| !$img_rotate_deg)`
`54`	`53`	`{`
`55`		`- echo $language->lang('IUL_WRONG_PARAM');`
`56`		`- exit_handler();`
	`54`	`+ trigger_error($language->lang('IUL_WRONG_PARAM'), E_USER_NOTICE);`
`57`	`55`	`}`
`58`	`56`
`59`	`57`	`if ($auth->acl_gets('u_attach', 'a_attach', 'f_attach'))`
`@@ -69,8 +67,7 @@`
`69`	`67`
`70`	`68`	`if (!isset($img_data) \|\| $img_data == false)`
`71`	`69`	`{`
`72`		`- echo $language->lang('IUL_NO_IMG_IN_DATABASE');`
`73`		`- exit_handler();`
	`70`	`+ trigger_error($language->lang('IUL_NO_IMG_IN_DATABASE'), E_USER_NOTICE);`
`74`	`71`	`}`
`75`	`72`
`76`	`73`	`// Get image file path`
`@@ -79,22 +76,20 @@`
`79`	`76`
`80`	`77`	`if (file_exists($image_file_path))`
`81`	`78`	`{`
`82`		`- $img_data['filesize'] = rotate_image($image_file_path, $img_rotate_deg);`
	`79`	`+ $img_data['filesize'] = rotate_image($image_file_path, $img_rotate_deg);`
`83`	`80`	`}`
`84`	`81`	`else`
`85`	`82`	`{`
`86`		`- echo $language->lang('IUL_IMG_NOT_EXIST');`
`87`		`- exit_handler();`
	`83`	`+ trigger_error($language->lang('IUL_IMG_NOT_EXIST'), E_USER_NOTICE);`
`88`	`84`	`}`
`89`	`85`
`90`	`86`	`if ($img_data['thumbnail'] && file_exists($thumb_file_path))`
`91`	`87`	`{`
`92`		`- rotate_image($thumb_file_path, $img_rotate_deg);`
	`88`	`+ rotate_image($thumb_file_path, $img_rotate_deg);`
`93`	`89`	`}`
`94`	`90`	`else if ($img_data['thumbnail'])`
`95`	`91`	`{`
`96`		`- echo $language->lang('IUL_THUMB_NOT_EXIST');`
`97`		`- exit_handler();`
	`92`	`+ trigger_error($language->lang('IUL_THUMB_NOT_EXIST'), E_USER_NOTICE);`
`98`	`93`	`}`
`99`	`94`
`100`	`95`	`// Update DataBase`
`@@ -105,17 +100,16 @@`
`105`	`100`	`// sql_nextid() to be removed in 4.1.0-a1, in future use sql_last_inserted_id() it exsits since 3.3.11-RC1`
`106`	`101`	`$new_attachID = $db->sql_nextid();`
`107`	`102`
`108`		`-if ($new_attachID) {`
	`103`	`+if ($new_attachID)`
	`104`	`+{`
`109`	`105`	`$sql = 'DELETE FROM ' . ATTACHMENTS_TABLE . ' WHERE attach_id = ' . (int) $img_attach_id;`
`110`	`106`	`$db->sql_query($sql);`
`111`	`107`
`112`		`- echo 'UPDATE-ROW_' . $img_attach_id . '_' . $new_attachID;`
`113`		`- exit_handler();`
	`108`	`+ trigger_error('UPDATE-ROW_' . $img_attach_id . '_' . $new_attachID, E_USER_NOTICE);`
`114`	`109`	`}`
`115`	`110`	`else`
`116`	`111`	`{`
`117`		`- echo $language->lang('IUL_DATABASE_NOT_UPDATE');`
`118`		`- exit_handler();`
	`112`	`+ trigger_error($language->lang('IUL_DATABASE_NOT_UPDATE'), E_USER_NOTICE);`
`119`	`113`	`}`
`120`	`114`
`121`	`115`