Просмотр исходного кода

Messages app improvements. Output escaped. Display limit added as Default Setting. Media download fixed. Sending of media/file attachments enabled, but not yet functional - waiting on feedback from provider.

Nate 6 лет назад
Родитель
Сommit
c0974f01de

+ 60 - 0
core/default_settings/app_languages.php

@@ -581,6 +581,66 @@ $text['label-12-hour']['ru-ru'] = "12-часовой";
 $text['label-12-hour']['sv-se'] = "12-timmars";
 $text['label-12-hour']['uk-ua'] = "12-годинний";
 
+$text['label-hours']['en-us'] = "Hour(s)";
+$text['label-hours']['ar-eg'] = "";
+$text['label-hours']['de-at'] = "";
+$text['label-hours']['de-ch'] = "";
+$text['label-hours']['de-de'] = "";
+$text['label-hours']['es-cl'] = "";
+$text['label-hours']['es-mx'] = "";
+$text['label-hours']['fr-ca'] = "";
+$text['label-hours']['fr-fr'] = "";
+$text['label-hours']['he-il'] = "";
+$text['label-hours']['it-it'] = "";
+$text['label-hours']['nl-nl'] = "";
+$text['label-hours']['pl-pl'] = "";
+$text['label-hours']['pt-br'] = "";
+$text['label-hours']['pt-pt'] = "";
+$text['label-hours']['ro-ro'] = "";
+$text['label-hours']['ru-ru'] = "";
+$text['label-hours']['sv-se'] = "";
+$text['label-hours']['uk-ua'] = "";
+
+$text['label-days']['en-us'] = "Day(s)";
+$text['label-days']['ar-eg'] = "";
+$text['label-days']['de-at'] = "";
+$text['label-days']['de-ch'] = "";
+$text['label-days']['de-de'] = "";
+$text['label-days']['es-cl'] = "";
+$text['label-days']['es-mx'] = "";
+$text['label-days']['fr-ca'] = "";
+$text['label-days']['fr-fr'] = "";
+$text['label-days']['he-il'] = "";
+$text['label-days']['it-it'] = "";
+$text['label-days']['nl-nl'] = "";
+$text['label-days']['pl-pl'] = "";
+$text['label-days']['pt-br'] = "";
+$text['label-days']['pt-pt'] = "";
+$text['label-days']['ro-ro'] = "";
+$text['label-days']['ru-ru'] = "";
+$text['label-days']['sv-se'] = "";
+$text['label-days']['uk-ua'] = "";
+
+$text['label-messages']['en-us'] = "Message(s)";
+$text['label-messages']['ar-eg'] = "";
+$text['label-messages']['de-at'] = "";
+$text['label-messages']['de-ch'] = "";
+$text['label-messages']['de-de'] = "";
+$text['label-messages']['es-cl'] = "";
+$text['label-messages']['es-mx'] = "";
+$text['label-messages']['fr-ca'] = "";
+$text['label-messages']['fr-fr'] = "";
+$text['label-messages']['he-il'] = "";
+$text['label-messages']['it-it'] = "";
+$text['label-messages']['nl-nl'] = "";
+$text['label-messages']['pl-pl'] = "";
+$text['label-messages']['pt-br'] = "";
+$text['label-messages']['pt-pt'] = "";
+$text['label-messages']['ro-ro'] = "";
+$text['label-messages']['ru-ru'] = "";
+$text['label-messages']['sv-se'] = "";
+$text['label-messages']['uk-ua'] = "";
+
 $text['header-default_settings']['en-us'] = "Default Settings";
 $text['header-default_settings']['ar-eg'] = "";
 $text['header-default_settings']['de-at'] = "Standard Einstellungen"; //copied from de-de

+ 12 - 0
core/default_settings/default_setting_edit.php

@@ -497,6 +497,18 @@
 		echo "		<option value='7' ".(($default_setting_value == "7") ? "selected='selected'" : null).">MMM DD</option>\n";
 		echo "	</select>\n";
 	}
+	elseif ($category == "message" && $subcategory == "display_last" && $name == "text") {
+		$array = explode(' ',$default_setting_value);
+		if (!is_numeric($array[0])) { $array[1] = $array[0]; $array[0] = ''; }
+		echo "	<input type='text' class='formfld' id='default_setting_value_1' value=\"".$array[0]."\" onchange=\"$('#default_setting_value').val($('#default_setting_value_1').val() + ' ' + $('#default_setting_value_2 option:selected').val());\">\n";
+		echo "	<select class='formfld' id='default_setting_value_2' onchange=\"$('#default_setting_value').val($('#default_setting_value_1').val() + ' ' + $('#default_setting_value_2 option:selected').val());\">\n";
+		echo "		<option value='hours' ".($array[1] == "hours" ? "selected='selected'" : null).">".$text['label-hours']."</option>\n";
+		echo "		<option value='days' ".($array[1] == "days" ? "selected='selected'" : null).">".$text['label-days']."</option>\n";
+		echo "		<option value='messages' ".($array[1] == "messages" ? "selected='selected'" : null).">".$text['label-messages']."</option>\n";
+		echo "	</select>\n";
+		echo "	<input type='hidden' id='default_setting_value' name='default_setting_value' value=\"".$default_setting_value."\">\n";
+		unset($array);
+	}
 	elseif ($category == "theme" && $subcategory == "domain_visible" && $name == "text" ) {
 		echo "    <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
 		echo "    	<option value='false' ".(($default_setting_value == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";