Browse Source

Merge branch 'fusionpbx:main' into patch-2

Alex 2 years ago
parent
commit
e5487f13d3
4 changed files with 26 additions and 8 deletions
  1. 3 0
      app_config.php
  2. 19 6
      app_menu.php
  3. 1 1
      message_logs.php
  4. 3 1
      messages.php

+ 3 - 0
app_config.php

@@ -39,6 +39,9 @@
 		$apps[$x]['permissions'][$y]['name'] = 'message_media_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'message_log_view';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'message_key';
 		//$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;

+ 19 - 6
app_menu.php

@@ -2,14 +2,27 @@
 
 $apps[$x]['menu'][0]['title']['en-us'] = 'Messages';
 $apps[$x]['menu'][0]['title']['en-gb'] = 'Messages';
+$apps[$x]['menu'][0]['title']['ar-eg'] = 'رسائل';
+$apps[$x]['menu'][0]['title']['de-at'] = 'Mitteilungen';
+$apps[$x]['menu'][0]['title']['de-ch'] = 'Mitteilungen';
+$apps[$x]['menu'][0]['title']['de-de'] = 'Mitteilungen';
 $apps[$x]['menu'][0]['title']['es-cl'] = 'Mensajes';
-$apps[$x]['menu'][0]['title']['fr-fr'] = 'Messages';
-$apps[$x]['menu'][0]['title']['fr-ca'] = 'Messages';
-$apps[$x]['menu'][0]['title']['nl-nl'] = 'Boodschappen';
-$apps[$x]['menu'][0]['title']['pl'] = 'Wiadomości';
+$apps[$x]['menu'][0]['title']['es-mx'] = 'Mensajes';
+$apps[$x]['menu'][0]['title']['fr-ca'] = 'messages';
+$apps[$x]['menu'][0]['title']['fr-fr'] = 'messages';
+$apps[$x]['menu'][0]['title']['he-il'] = 'הודעות';
+$apps[$x]['menu'][0]['title']['it-it'] = 'Messaggi';
+$apps[$x]['menu'][0]['title']['nl-nl'] = 'Berichten';
+$apps[$x]['menu'][0]['title']['pl-pl'] = 'Wiadomości';
+$apps[$x]['menu'][0]['title']['pt-br'] = 'Mensagens';
+$apps[$x]['menu'][0]['title']['pt-pt'] = 'Mensagens';
+$apps[$x]['menu'][0]['title']['ro-ro'] = 'Mesaje';
+$apps[$x]['menu'][0]['title']['ru-ru'] = 'Сообщения';
+$apps[$x]['menu'][0]['title']['uk-ua'] = 'Повідомлення';
 $apps[$x]['menu'][0]['title']['sv-se'] = 'Meddelanden';
-$apps[$x]['menu'][0]['title']['uk'] = 'Повідомлення';
-$apps[$x]['menu'][0]['title']['de-at'] = 'Mitteilungen';
+$apps[$x]['menu'][0]['title']['zh-cn'] = '留言';
+$apps[$x]['menu'][0]['title']['ja-jp'] = 'メッセージ';
+$apps[$x]['menu'][0]['title']['ko-kr'] = '메시지';
 $apps[$x]['menu'][0]['uuid'] = 'b2f6a2e0-cf25-4bd5-8079-6385f6871047';
 $apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
 $apps[$x]['menu'][0]['category'] = 'internal';

+ 1 - 1
message_logs.php

@@ -30,7 +30,7 @@
 	require_once "resources/paging.php";
 
 //check permissions
-	if (permission_exists('message_view')) {
+	if (permission_exists('message_log_view')) {
 		//access granted
 	}
 	else {

+ 3 - 1
messages.php

@@ -385,7 +385,9 @@
 		echo button::create(['type'=>'button','label'=>$text['label-new_message'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','onclick'=>"document.getElementById('message_new').reset(); $('#message_new_layer').fadeIn(200); unload_thread();"]);
 		//echo button::create(['type'=>'button','label'=>$text['label-new_message'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','onclick'=>"document.getElementById('message_new').reset();$('#message_new_layer').fadeIn(200); unload_thread();"]);
 	}
-	echo button::create(['type'=>'button','label'=>$text['label-log'],'icon'=>'list','link'=>'message_logs.php']);
+	if (permission_exists('message_log_view')) {
+		echo button::create(['type'=>'button','label'=>$text['label-log'],'icon'=>'list','link'=>'message_logs.php']);
+	}
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";