Fax Queue - List: Add Resend option.

2025-12-30 00:53:50 +00:00 · 2025-09-10 15:29:28 -06:00
parent a2cba69ba1
commit c072806120
3 changed files with 184 additions and 15 deletions
--- a/app/fax_queue/app_languages.php
+++ b/app/fax_queue/app_languages.php
@@ -1066,4 +1066,112 @@ $text['label-busy']['zh-cn'] = "忙碌的";
 $text['label-busy']['ja-jp'] = "忙しい";
 $text['label-busy']['ko-kr'] = "바쁘다";

-?>
+$text['button-resend']['en-us'] = "Resend";
+$text['button-resend']['en-gb'] = "Resend";
+$text['button-resend']['ar-eg'] = "إعادة إرسال";
+$text['button-resend']['de-at'] = "Erneut senden";
+$text['button-resend']['de-ch'] = "Erneut senden";
+$text['button-resend']['de-de'] = "Erneut senden";
+$text['button-resend']['el-gr'] = "Εκ νέου αποστολή";
+$text['button-resend']['es-cl'] = "Reenviar";
+$text['button-resend']['es-mx'] = "Reenviar";
+$text['button-resend']['fr-ca'] = "Renvoyer";
+$text['button-resend']['fr-fr'] = "Renvoyer";
+$text['button-resend']['he-il'] = "שלח שוב";
+$text['button-resend']['it-it'] = "Invia nuovamente";
+$text['button-resend']['ka-ge'] = "თავიდან გაგზავნა";
+$text['button-resend']['nl-nl'] = "Opnieuw versturen";
+$text['button-resend']['pl-pl'] = "Wysłać ponownie";
+$text['button-resend']['pt-br'] = "Reenviar";
+$text['button-resend']['pt-pt'] = "Reenviar";
+$text['button-resend']['ro-ro'] = "Retrimiteți";
+$text['button-resend']['ru-ru'] = "Отправить";
+$text['button-resend']['sv-se'] = "Skicka igen";
+$text['button-resend']['uk-ua'] = "Надіслати повторно";
+$text['button-resend']['tr-tr'] = "Yeniden gönder";
+$text['button-resend']['zh-cn'] = "重发";
+$text['button-resend']['ja-jp'] = "再送信";
+$text['button-resend']['ko-kr'] = "재전송";
+
+$text['modal_title-resend']['en-us'] = "Resend Faxes";
+$text['modal_title-resend']['en-gb'] = "Resend Faxes";
+$text['modal_title-resend']['ar-eg'] = "إعادة إرسال الفاكسات";
+$text['modal_title-resend']['de-at'] = "Faxe erneut senden";
+$text['modal_title-resend']['de-ch'] = "Faxe erneut senden";
+$text['modal_title-resend']['de-de'] = "Faxe erneut senden";
+$text['modal_title-resend']['el-gr'] = "Επανάληψη αποστολής φαξ";
+$text['modal_title-resend']['es-cl'] = "Reenviar faxes";
+$text['modal_title-resend']['es-mx'] = "Reenviar faxes";
+$text['modal_title-resend']['fr-ca'] = "Renvoyer des télécopies";
+$text['modal_title-resend']['fr-fr'] = "Renvoyer des fax";
+$text['modal_title-resend']['he-il'] = "שליחה חוזרת של פקסים";
+$text['modal_title-resend']['it-it'] = "Invia nuovamente i fax";
+$text['modal_title-resend']['ka-ge'] = "ფაქსების ხელახლა გაგზავნა";
+$text['modal_title-resend']['nl-nl'] = "Faxen opnieuw verzenden";
+$text['modal_title-resend']['pl-pl'] = "Ponowne wysyłanie faksów";
+$text['modal_title-resend']['pt-br'] = "Reenviar faxes";
+$text['modal_title-resend']['pt-pt'] = "Reenviar faxes";
+$text['modal_title-resend']['ro-ro'] = "Reenviar faxes";
+$text['modal_title-resend']['ru-ru'] = "Повторно отправлять факсы";
+$text['modal_title-resend']['sv-se'] = "Skicka om fax";
+$text['modal_title-resend']['uk-ua'] = "Skicka om fax";
+$text['modal_title-resend']['tr-tr'] = "Faksları Yeniden Gönder";
+$text['modal_title-resend']['zh-cn'] = "重新发送传真";
+$text['modal_title-resend']['ja-jp'] = "FAXの再送信";
+$text['modal_title-resend']['ko-kr'] = "팩스 재전송";
+
+$text['modal_message-resend']['en-us'] = "You are about to resend the selected faxes in the fax queue.";
+$text['modal_message-resend']['en-gb'] = "You are about to resend the selected faxes in the fax queue.";
+$text['modal_message-resend']['ar-eg'] = "أنت على وشك إعادة إرسال الفاكسات المحددة في قائمة انتظار الفاكسات.";
+$text['modal_message-resend']['de-at'] = "Sie sind dabei, die ausgewählten Faxe in der Faxwarteschlange erneut zu senden.";
+$text['modal_message-resend']['de-ch'] = "Sie sind dabei, die ausgewählten Faxe in der Faxwarteschlange erneut zu senden.";
+$text['modal_message-resend']['de-de'] = "Sie sind dabei, die ausgewählten Faxe in der Faxwarteschlange erneut zu senden.";
+$text['modal_message-resend']['el-gr'] = "Πρόκειται να στείλετε ξανά τα επιλεγμένα φαξ στην ουρά φαξ.";
+$text['modal_message-resend']['es-cl'] = "Está a punto de reenviar los faxes seleccionados en la cola de fax.";
+$text['modal_message-resend']['es-mx'] = "Está a punto de reenviar los faxes seleccionados en la cola de fax.";
+$text['modal_message-resend']['fr-ca'] = "Vous êtes sur le point de retourner les télécopies sélectionnées dans la file d'attente de fax.";
+$text['modal_message-resend']['fr-fr'] = "Vous êtes sur le point de renvoyer les fax sélectionnés dans la file d'attente de fax.";
+$text['modal_message-resend']['he-il'] = "אתה עומד לשלוח שוב את הפקסים שנבחרו בתור הפקסים.";
+$text['modal_message-resend']['it-it'] = "Stai per inviare nuovamente i fax selezionati nella coda fax.";
+$text['modal_message-resend']['ka-ge'] = "თქვენ აპირებთ ფაქსის რიგში არჩეულ ფაქსებს ხელახლა გაგზავნოთ.";
+$text['modal_message-resend']['nl-nl'] = "U staat op het punt de geselecteerde faxen in de faxwachtrij opnieuw te verzenden.";
+$text['modal_message-resend']['pl-pl'] = "Zamierzasz ponownie wysłać wybrane faksy z kolejki faksów.";
+$text['modal_message-resend']['pt-br'] = "Você está prestes a reenviar os faxes selecionados na fila de fax.";
+$text['modal_message-resend']['pt-pt'] = "Está prestes a reenviar os faxes seleccionados na fila de fax.";
+$text['modal_message-resend']['ro-ro'] = "Sunteți pe cale să retrimiteți faxurile selectate din coada de faxuri.";
+$text['modal_message-resend']['ru-ru'] = "Вы собираетесь повторно отправить выбранные факсы из очереди факсов.";
+$text['modal_message-resend']['sv-se'] = "Du ska skicka om de valda faxen i faxkön.";
+$text['modal_message-resend']['uk-ua'] = "Faks kuyruğundaki seçili faksları yeniden göndermek üzeresiniz.";
+$text['modal_message-resend']['tr-tr'] = "Faks kuyruğundaki seçili faksları yeniden göndermek üzeresiniz.";
+$text['modal_message-resend']['zh-cn'] = "您即将重新发送传真队列中选定的传真。";
+$text['modal_message-resend']['ja-jp'] = "ファックス キュー内の選択したファックスを再送信しようとしています。";
+$text['modal_message-resend']['ko-kr'] = "팩스 대기열에서 선택한 팩스를 다시 보내려고 합니다.";
+
+$text['message-resending_faxes']['en-us'] = "Resending Fax(es)";
+$text['message-resending_faxes']['en-gb'] = "Resending Fax(es)";
+$text['message-resending_faxes']['ar-eg'] = "إعادة إرسال الفاكسات";
+$text['message-resending_faxes']['de-at'] = "Erneutes Senden von Faxen";
+$text['message-resending_faxes']['de-ch'] = "Erneutes Senden von Faxen";
+$text['message-resending_faxes']['de-de'] = "Erneutes Senden von Faxen";
+$text['message-resending_faxes']['el-gr'] = "Επανάληψη αποστολής φαξ";
+$text['message-resending_faxes']['es-cl'] = "Reenvío de faxes";
+$text['message-resending_faxes']['es-mx'] = "Reenvío de faxes";
+$text['message-resending_faxes']['fr-ca'] = "Vous êtes sur le point de retourner les télécopies sélectionnées dans la file d'attente de fax.";
+$text['message-resending_faxes']['fr-fr'] = "Vous êtes sur le point de renvoyer les fax sélectionnés dans la file d'attente de fax.";
+$text['message-resending_faxes']['he-il'] = "אתה עומד לשלוח שוב את הפקסים שנבחרו בתור הפקסים.";
+$text['message-resending_faxes']['it-it'] = "Stai per inviare nuovamente i fax selezionati nella coda fax.";
+$text['message-resending_faxes']['ka-ge'] = "თქვენ აპირებთ ფაქსის რიგში არჩეულ ფაქსებს ხელახლა გაგზავნოთ.";
+$text['message-resending_faxes']['nl-nl'] = "U staat op het punt de geselecteerde faxen in de faxwachtrij opnieuw te verzenden.";
+$text['message-resending_faxes']['pl-pl'] = "Zamierzasz ponownie wysłać wybrane faksy z kolejki faksów.";
+$text['message-resending_faxes']['pt-br'] = "Você está prestes a reenviar os faxes selecionados na fila de fax.";
+$text['message-resending_faxes']['pt-pt'] = "Está prestes a reenviar os faxes seleccionados na fila de fax.";
+$text['message-resending_faxes']['ro-ro'] = "Sunteți pe cale să retrimiteți faxurile selectate din coada de faxuri.";
+$text['message-resending_faxes']['ru-ru'] = "Вы собираетесь повторно отправить выбранные факсы из очереди факсов.";
+$text['message-resending_faxes']['sv-se'] = "Du ska skicka om de valda faxen i faxkön.";
+$text['message-resending_faxes']['uk-ua'] = "Ви збираєтеся повторно надіслати вибрані факси з черги факсів.";
+$text['message-resending_faxes']['tr-tr'] = "Faks kuyruğundaki seçili faksları yeniden göndermek üzeresiniz.";
+$text['message-resending_faxes']['zh-cn'] = "您即将重新发送传真队列中选定的传真。";
+$text['message-resending_faxes']['ja-jp'] = "ファックス キュー内の選択したファックスを再送信しようとしています。";
+$text['message-resending_faxes']['ko-kr'] = "팩스 대기열에서 선택한 팩스를 다시 보내려고 합니다.";
+
+?>
--- a/app/fax_queue/fax_queue.php
+++ b/app/fax_queue/fax_queue.php
@@ -78,12 +78,12 @@
 					$obj->copy($fax_queue);
 				}
 				break;
-			//case 'toggle':
-			//	if ($permission['fax_queue_edit']) {
-			//		$obj = new fax_queue;
-			//		$obj->toggle($fax_queue);
-			//	}
-			//	break;
+			case 'resend':
+				if ($permission['fax_queue_edit']) {
+					$obj = new fax_queue;
+					$obj->resend($fax_queue);
+				}
+				break;
 			case 'delete':
 				if ($permission['fax_queue_delete']) {
 					$obj = new fax_queue;
@@ -249,9 +249,9 @@
 	if ($permission['fax_queue_add'] && $fax_queue) {
 		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$settings->get('theme', 'button_icon_copy'),'id'=>'btn_copy','name'=>'btn_copy','style'=>'display:none;','onclick'=>"modal_open('modal-copy','btn_copy');"]);
 	}
-	//if ($permission['fax_queue_edit'] && $fax_queue) {
-	//	echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$settings->get('theme', 'button_icon_toggle'),'id'=>'btn_toggle','name'=>'btn_toggle','style'=>'display:none;','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
-	//}
+	if ($permission['fax_queue_edit'] && $fax_queue) {
+		echo button::create(['type'=>'button','label'=>$text['button-resend'],'icon'=>'fax','id'=>'btn_resend','name'=>'btn_resend','collapse'=>'hide-xs','style'=>'display: none;','class'=>'+revealed','onclick'=>"modal_open('modal-resend','btn_resend');"]);
+	}
 	if ($permission['fax_queue_delete'] && $fax_queue) {
 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$settings->get('theme', 'button_icon_delete'),'id'=>'btn_delete','name'=>'btn_delete','style'=>'display:none;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
 	}
@@ -260,7 +260,7 @@
 			echo "		<input type='hidden' name='show' value='all'>\n";
 		}
 		else {
-			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$settings->get('theme', 'button_icon_all'),'link'=>'?show=all']);
+			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$settings->get('theme', 'button_icon_all'),'style'=>'margin-left: 15px;','link'=>'?show=all']);
 		}
 	}
 	echo			"<form id='form_search' class='inline' method='get'>\n";
@@ -274,7 +274,7 @@
 	echo "			<option value='busy' ".(!empty($_GET["fax_status"]) && $_GET["fax_status"] == "busy" ? "selected='selected'" : null).">".ucwords($text['label-busy'])."</option>\n";
 	echo "			<option value='failed' ".(!empty($_GET["fax_status"]) && $_GET["fax_status"] == "failed" ? "selected='selected'" : null).">".ucwords($text['label-failed'])."</option>\n";
 	echo "		</select>\n";
-	echo			"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search ?? '')."\" placeholder=\"".$text['label-search']."\" />";
+	echo			"<input type='text' class='txt list-search' style='margin-left: 0;' name='search' id='search' value=\"".escape($search ?? '')."\" placeholder=\"".$text['label-search']."\" />";
 	echo button::create(['label'=>$text['button-search'],'icon'=>$settings->get('theme', 'button_icon_search'),'type'=>'submit','id'=>'btn_search']);
 	if (!empty($paging_controls_mini)) {
 		echo		"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
@@ -287,9 +287,16 @@
 	if ($permission['fax_queue_add'] && $fax_queue) {
 		echo modal::create(['id'=>'modal-copy','type'=>'copy','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_copy','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('copy'); list_form_submit('form_list');"])]);
 	}
-	//if ($permission['fax_queue_edit'] && $fax_queue) {
-	//	echo modal::create(['id'=>'modal-toggle','type'=>'toggle','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_toggle','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('toggle'); list_form_submit('form_list');"])]);
-	//}
+	if (permission_exists('fax_queue_edit') && $fax_queue) {
+		echo modal::create([
+			'id'=>'modal-resend',
+			'title'=>$text['modal_title-resend'],
+			'message'=>$text['modal_message-resend'],
+			'actions'=>
+				button::create(['type'=>'button','label'=>$text['button-cancel'],'icon'=>$settings->get('theme', 'button_icon_cancel'),'collapse'=>'hide-xs','onclick'=>'modal_close();']).
+				button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','collapse'=>'never','style'=>'float: right;','onclick'=>"modal_close(); list_action_set('resend'); list_form_submit('form_list');"])
+			]);
+	}
 	if ($permission['fax_queue_delete'] && $fax_queue) {
 		echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]);
 	}
--- a/app/fax_queue/resources/classes/fax_queue.php
+++ b/app/fax_queue/resources/classes/fax_queue.php
@@ -104,6 +104,60 @@
 			}
 		}

+		/**
+		 * resend selected faxes in the fax queue
+		 */
+		public function resend($records) {
+			if (permission_exists($this->name.'_edit')) {
+
+				//add multi-lingual support
+					$language = new text;
+					$text = $language->get();
+
+				//validate the token
+					$token = new token;
+					if (!$token->validate($_SERVER['PHP_SELF'])) {
+						message::add($text['message-invalid_token'],'negative');
+						header('Location: '.$this->location);
+						exit;
+					}
+
+				//resend multiple faxes
+					if (is_array($records) && @sizeof($records) != 0) {
+						//build the fax array
+							$x = 0;
+							foreach ($records as $record) {
+								//add to the array
+									if ($record['checked'] == 'true' && is_uuid($record['fax_queue_uuid'])) {
+										$array[$this->table][$x][$this->name.'_uuid'] = $record['fax_queue_uuid'];
+										$array[$this->table][$x]['fax_status'] = 'waiting';
+										$array[$this->table][$x]['fax_retry_date'] = null;
+										$array[$this->table][$x]['fax_notify_date'] = null;
+										$array[$this->table][$x]['fax_retry_count'] = '0';
+									}
+
+								//increment the id
+									$x++;
+							}
+
+						//save the changes
+							if (is_array($array) && @sizeof($array) != 0) {
+								//save the array
+									$database = new database;
+									$database->app_name = $this->app_name;
+									$database->app_uuid = $this->app_uuid;
+									$database->save($array);
+									unset($array);
+
+								//set message
+									message::add($text['message-resending_faxes']);
+							}
+							unset($records);
+					}
+
+			}
+		}
+
 		/**
 		 * toggle a field between two values
 		 */