From 5996a7089e789b7e4939251bda416100af100f5f Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Thu, 16 Apr 2015 19:14:20 +0000
Subject: [PATCH] Themes: Remove unnecessary JS functions. Call Block: Fixed
 issue in language file. User Edit: Fixed issue in language file. File Editor:
 Fix JS issue in header.

---
 app/call_block/app_languages.php | 16 ++++------------
 app/edit/header.php              |  2 +-
 core/users/app_languages.php     | 14 +++++++-------
 themes/accessible/template.php   | 23 -----------------------
 themes/classic/template.php      | 23 -----------------------
 themes/default/template.php      | 23 -----------------------
 themes/enhanced/template.php     | 24 +-----------------------
 themes/minimized/template.php    | 25 +------------------------
 8 files changed, 14 insertions(+), 136 deletions(-)

diff --git a/app/call_block/app_languages.php b/app/call_block/app_languages.php
index 803d2181ea..265d94e245 100644
--- a/app/call_block/app_languages.php
+++ b/app/call_block/app_languages.php
@@ -9,18 +9,10 @@ $text['title-call-block']['pt-br'] = "Bloqueio de chamadas";
 $text['title-call-block']['pl'] = "Blokowanie rozmów";
 $text['title-call-block']['sv-se'] = "Blockera Samtal";
 
-$text['prompt-block_recent_name']['en-us'] = "Block Recent Call
-
-Edit the Name, if desired...";
-$text['prompt-block_recent_name']['es-cl'] = "Bloqueo de llamadas recientes
-
-Edite el nombre, si lo desea...";
-$text['prompt-block_recent_name']['pt-pt'] = "Bloquear Chamadas Recentes
-
-Edite o nome, se desejar...";
-$text['prompt-block_recent_name']['fr-fr'] = "Bloquer appels récents
-
-Modifiez le nom, si vous le souhaitez...";
+$text['prompt-block_recent_name']['en-us'] = "Block Recent Call - Edit the Name, if desired...";
+$text['prompt-block_recent_name']['es-cl'] = "Bloqueo de llamadas recientes - Edite el nombre, si lo desea...";
+$text['prompt-block_recent_name']['pt-pt'] = "Bloquear Chamadas Recentes - Edite o nome, se desejar...";
+$text['prompt-block_recent_name']['fr-fr'] = "Bloquer appels récents - Modifiez le nom, si vous le souhaitez...";
 $text['prompt-block_recent_name']['nl-nl'] = "";
 $text['prompt-block_recent_name']['pt-br'] = "Bloquear chamadas recentes, edite o nome se assim desejar";
 $text['prompt-block_recent_name']['pl'] = "Zablokuj ostatnią rozmowę. Edytuj nazwę";
diff --git a/app/edit/header.php b/app/edit/header.php
index 0c078bd73b..010f002f18 100644
--- a/app/edit/header.php
+++ b/app/edit/header.php
@@ -74,7 +74,7 @@ echo "<SCRIPT language=\"JavaScript\">\n";
 echo "<!--\n";
 echo "function confirmdelete(url)\n";
 echo "{\n";
-echo " var confirmed = confirm(".$text['button-delete-this'].");\n";
+echo " var confirmed = confirm('".$text['button-delete-this']."');\n";
 echo " if (confirmed == true) {\n";
 echo "      window.location=url;\n";
 echo " }\n";
diff --git a/core/users/app_languages.php b/core/users/app_languages.php
index 60b36fe80b..9dc255334c 100644
--- a/core/users/app_languages.php
+++ b/core/users/app_languages.php
@@ -232,13 +232,13 @@ $text['message-copy']['pl'] = "Skopiowano poprawnie";
 $text['message-copy']['uk'] = "Скопійовано";
 $text['message-copy']['sv-se'] = "Kopiering Slutförd";
 
-$text['message-cannot_delete_own_account']['en-us'] = "You cannot delete your own user account.\\n\\nPlease login as a different user, then try again.";
-$text['message-cannot_delete_own_account']['es-cl'] = "No se puede eliminar su propia cuenta de usuario.\\n\\nPor favor, iniciar sesión como un usuario diferente, vuelva a intentarlo.";
-$text['message-cannot_delete_own_account']['pt-pt'] = "Você não pode excluir a sua própria conta de usuário.\\n\\nIdentifique-se como um usuário diferente, em seguida, tente novamente.";
-$text['message-cannot_delete_own_account']['fr-fr'] = "Vous ne pouvez pas supprimer votre propre compte utilisateur.\\n\\nSe il vous plaît vous identifier en tant qu'utilisateur différent, puis réessayez.";
-$text['message-cannot_delete_own_account']['pl'] = "Nie można usunąć własnego konta użytkownika.\\n\\n Zaloguj się jako inny użytkownik i spróbuj ponownie.";
-$text['message-cannot_delete_own_account']['uk'] = "Ви не можете видалити власний обліковий запис. Будь ласка, увійдіть під іншим користувачем, потім повторіть спробу.";
-$text['message-cannot_delete_own_account']['sv-se'] = "Du kan inte ta bort ditt egna användarkonto. Logg ain som en annan användare och försök igen.";
+$text['message-cannot_delete_own_account']['en-us'] = "You cannot delete your own user account. - Please login as a different user, then try again.";
+$text['message-cannot_delete_own_account']['es-cl'] = "No se puede eliminar su propia cuenta de usuario. - Por favor, iniciar sesión como un usuario diferente, vuelva a intentarlo.";
+$text['message-cannot_delete_own_account']['pt-pt'] = "Você não pode excluir a sua própria conta de usuário. - Identifique-se como um usuário diferente, em seguida, tente novamente.";
+$text['message-cannot_delete_own_account']['fr-fr'] = "Vous ne pouvez pas supprimer votre propre compte utilisateur. - Se il vous plaît vous identifier en tant qu'utilisateur différent, puis réessayez.";
+$text['message-cannot_delete_own_account']['pl'] = "Nie można usunąć własnego konta użytkownika. - Zaloguj się jako inny użytkownik i spróbuj ponownie.";
+$text['message-cannot_delete_own_account']['uk'] = "Ви не можете видалити власний обліковий запис. - Будь ласка, увійдіть під іншим користувачем, потім повторіть спробу.";
+$text['message-cannot_delete_own_account']['sv-se'] = "Du kan inte ta bort ditt egna användarkonto. - Logg ain som en annan användare och försök igen.";
 
 $text['message-add']['en-us'] = "Add Completed";
 $text['message-add']['es-cl'] = "Agregar Completado";
diff --git a/themes/accessible/template.php b/themes/accessible/template.php
index b7813c7d26..7fb272575c 100644
--- a/themes/accessible/template.php
+++ b/themes/accessible/template.php
@@ -447,29 +447,6 @@ table tr:last-child td:last-child {
 
 </style>
 
-<script type="text/javascript">
-<!--
-function jsconfirm(title,msg,url) {
-	if (confirm(msg)){
-		window.location = url;
-	}
-	else{
-	}
-}
-//-->
-</script>
-
-<SCRIPT language="JavaScript">
-<!--
-function confirmdelete(url) {
-	var confirmed = confirm("Are you sure want to delete this.");
-	if (confirmed == true) {
-		window.location=url;
-	}
-}
-//-->
-</SCRIPT>
-
 <script language="javascript" type="text/javascript" src="<?php echo PROJECT_PATH?>/resources/jquery/jquery-1.8.3.js"></script>
 
 <script language="JavaScript" type="text/javascript">
diff --git a/themes/classic/template.php b/themes/classic/template.php
index dc854dd8ac..b4ae7490e9 100644
--- a/themes/classic/template.php
+++ b/themes/classic/template.php
@@ -545,29 +545,6 @@ table tr:nth-last-child(-5) td:first-of-type {
 
 </style>
 
-<script type="text/javascript">
-<!--
-function jsconfirm(title,msg,url) {
-	if (confirm(msg)){
-		window.location = url;
-	}
-	else{
-	}
-}
-//-->
-</script>
-
-<SCRIPT language="JavaScript">
-<!--
-function confirmdelete(url) {
-	var confirmed = confirm("Are you sure want to delete this.");
-	if (confirmed == true) {
-		window.location=url;
-	}
-}
-//-->
-</SCRIPT>
-
 <script language="javascript" type="text/javascript" src="<?php echo PROJECT_PATH?>/resources/jquery/jquery-1.8.3.js"></script>
 
 <script language="JavaScript" type="text/javascript">
diff --git a/themes/default/template.php b/themes/default/template.php
index ad425d7717..cf908c72db 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -656,29 +656,6 @@ table tr:nth-last-child(-5) td:first-of-type {
 
 </style>
 
-<script type="text/javascript">
-<!--
-function jsconfirm(title,msg,url) {
-	if (confirm(msg)){
-		window.location = url;
-	}
-	else{
-	}
-}
-//-->
-</script>
-
-<SCRIPT language="JavaScript">
-<!--
-function confirmdelete(url) {
-	var confirmed = confirm("Are you sure want to delete this.");
-	if (confirmed == true) {
-		window.location=url;
-	}
-}
-//-->
-</SCRIPT>
-
 <script language="javascript" type="text/javascript" src="<?php echo PROJECT_PATH?>/resources/jquery/jquery-1.8.3.js"></script>
 
 <script language="JavaScript" type="text/javascript">
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index 26867f3fd2..0b0c0bd356 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -1165,29 +1165,6 @@ SPAN.playback_progress_bar {
 
 </style>
 
-<script type="text/javascript">
-	<!--
-		function jsconfirm(title,msg,url) {
-			if (confirm(msg)){
-				window.location = url;
-			}
-			else{
-			}
-		}
-	//-->
-</script>
-
-<SCRIPT language="JavaScript">
-	<!--
-		function confirmdelete(url) {
-			var confirmed = confirm("Are you sure want to delete this.");
-			if (confirmed == true) {
-				window.location=url;
-			}
-		}
-	//-->
-</SCRIPT>
-
 <?php if (substr_count($_SERVER["PHP_SELF"], "xml_cdr_statistics.php") == 0) { ?>
 	<!-- // javascript calendar and color picker (source: http://rightjs.org) -->
 	<script language="JavaScript" type='text/javascript' src='<?php echo PROJECT_PATH; ?>/resources/rightjs/right.js'></script>
@@ -1197,6 +1174,7 @@ SPAN.playback_progress_bar {
 
 <script language="JavaScript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery-1.11.1.js"></script>
 <script language="JavaScript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery.autosize.input.js"></script>
+
 <script language="JavaScript" type="text/javascript">
 	$(document).ready(function() {
 
diff --git a/themes/minimized/template.php b/themes/minimized/template.php
index b1cd605d16..a4bf7a2f65 100644
--- a/themes/minimized/template.php
+++ b/themes/minimized/template.php
@@ -1167,29 +1167,6 @@ SPAN.playback_progress_bar {
 
 </style>
 
-<script type="text/javascript">
-	<!--
-		function jsconfirm(title,msg,url) {
-			if (confirm(msg)){
-				window.location = url;
-			}
-			else{
-			}
-		}
-	//-->
-</script>
-
-<SCRIPT language="JavaScript">
-	<!--
-		function confirmdelete(url) {
-			var confirmed = confirm("Are you sure want to delete this.");
-			if (confirmed == true) {
-				window.location=url;
-			}
-		}
-	//-->
-</SCRIPT>
-
 <?php if (substr_count($_SERVER["PHP_SELF"], "xml_cdr_statistics.php") == 0) { ?>
 	<!-- // javascript calendar and color picker (source: http://rightjs.org) -->
 	<script language="JavaScript" type='text/javascript' src='<?php echo PROJECT_PATH; ?>/resources/rightjs/right.js'></script>
@@ -1197,7 +1174,7 @@ SPAN.playback_progress_bar {
 	<script language="JavaScript" type='text/javascript' src='<?php echo PROJECT_PATH; ?>/resources/rightjs/right-colorpicker-src.js'></script>
 <?php } ?>
 
-<script language="JavaScript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery-1.8.3.js"></script>
+<script language="JavaScript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery-1.11.1.js"></script>
 <script language="JavaScript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery.autosize.input.js"></script>
 
 <script language="JavaScript" type="text/javascript">