Browse Source

Upgrade: Completed Data Type check option and multilinguified everything.

Nate Jones 11 years ago
parent
commit
09a9d4fa40

+ 1 - 1
core/upgrade/app_config.php

@@ -44,7 +44,7 @@
 		$apps[$x]['permissions'][$y]['menu']['uuid'] = "8c826e92-be3c-0944-669a-24e5b915d562";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "upgrade_domains";
+		$apps[$x]['permissions'][$y]['name'] = "upgrade_apps";
 		$apps[$x]['permissions'][$y]['menu']['uuid'] = "e7bb1296-3141-48c9-a95a-82d2768d0ae4";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;

+ 100 - 8
core/upgrade/app_languages.php

@@ -10,15 +10,15 @@
 	$text['title-upgrade']['pt-pt'] = "Actualizar";
 	$text['title-upgrade']['fr-fr'] = "Mise à jour";
 
-	$text['header-svn_update_results']['en-us'] = "SVN Update Results";
-	$text['header-svn_update_results']['es-cl'] = "";
-	$text['header-svn_update_results']['pt-pt'] = "";
-	$text['header-svn_update_results']['fr-fr'] = "";
+	$text['header-svn_update_results']['en-us'] = "SVN Results";
+	$text['header-svn_update_results']['es-cl'] = "SVN Respuesta";
+	$text['header-svn_update_results']['pt-pt'] = "SVN Response";
+	$text['header-svn_update_results']['fr-fr'] = "Réponse SVN";
 
-	$text['header-upgrade_schema_results']['en-us'] = "Upgrade Schema Results";
-	$text['header-upgrade_schema_results']['es-cl'] = "Actualiza Esquema Resultados";
-	$text['header-upgrade_schema_results']['pt-pt'] = "Resultados Atualização do Esquema";
-	$text['header-upgrade_schema_results']['fr-fr'] = "Résultats Mise à Jour du Schéma";
+	$text['header-upgrade_schema_results']['en-us'] = "Schema Results";
+	$text['header-upgrade_schema_results']['es-cl'] = "Resultados de Esquema";
+	$text['header-upgrade_schema_results']['pt-pt'] = "Resultados de Esquema";
+	$text['header-upgrade_schema_results']['fr-fr'] = "Résultats de Schéma";
 
 	$text['header-database_type']['en-us'] = "Database Type";
 	$text['header-database_type']['es-cl'] = "Tipo de base de datos";
@@ -30,6 +30,11 @@
 	$text['header-upgrade']['pt-pt'] = "Actualizar";
 	$text['header-upgrade']['fr-fr'] = "Mise à jour";
 
+	$text['description-upgrade']['en-us'] = "Select the actions below you wish to perform.";
+	$text['description-upgrade']['es-cl'] = "Seleccione las acciones a continuación que desea realizar.";
+	$text['description-upgrade']['pt-pt'] = "Selecione as ações abaixo você deseja executar.";
+	$text['description-upgrade']['fr-fr'] = "Sélectionnez les actions ci-dessous que vous souhaitez effectuer.";
+
 	$text['header-message']['en-us'] = "Message";
 	$text['header-message']['es-cl'] = "Mensaje";
 	$text['header-message']['pt-pt'] = "Mensagem";
@@ -95,11 +100,98 @@
 	$text['option-false']['pt-pt'] = "Não";
 	$text['option-false']['fr-fr'] = "Non";
 
+	$text['label-upgrade_svn']['en-us'] = "Source Code";
+	$text['label-upgrade_svn']['es-cl'] = "Código Fuente";
+	$text['label-upgrade_svn']['pt-pt'] = "Source Code";
+	$text['label-upgrade_svn']['fr-fr'] = "Source Code";
+
+	$text['description-upgrade_svn']['en-us'] = "Updates FusionPBX source files from the Subversion respository.";
+	$text['description-upgrade_svn']['es-cl'] = "Archivos de origen Actualizaciones FusionPBX del repositorio Subversion.";
+	$text['description-upgrade_svn']['pt-pt'] = "Arquivos de origem Atualizações FusionPBX do repositório Subversion.";
+	$text['description-upgrade_svn']['fr-fr'] = "Fichiers sources des mises à jour FusionPBX du respository Subversion.";
+
+	$text['label-upgrade_schema']['en-us'] = "Schema";
+	$text['label-upgrade_schema']['es-cl'] = "Esquema";
+	$text['label-upgrade_schema']['pt-pt'] = "Esquema";
+	$text['label-upgrade_schema']['fr-fr'] = "Schéma";
+
+	$text['description-upgrade_schema']['en-us'] = "Checks to ensure table and field integrity in the database.";
+	$text['description-upgrade_schema']['es-cl'] = "Los cheques para asegurar mesa y campo de integridad en la base de datos.";
+	$text['description-upgrade_schema']['pt-pt'] = "Verifica para garantir a mesa e campo de integridade no banco de dados.";
+	$text['description-upgrade_schema']['fr-fr'] = "Contrôles pour assurer table et du champ d'intégrité dans la base de données.";
+
+	$text['label-upgrade_data_types']['en-us'] = "Data Types";
+	$text['label-upgrade_data_types']['es-cl'] = "Tipos de datos";
+	$text['label-upgrade_data_types']['pt-pt'] = "Tipos de Dados";
+	$text['label-upgrade_data_types']['fr-fr'] = "Types de données";
+
+	$text['description-upgrade_data_types']['en-us'] = "Detects and updates incorrect field data types.";
+	$text['description-upgrade_data_types']['es-cl'] = "Detecta y actualiza los tipos de datos de campo correctos.";
+	$text['description-upgrade_data_types']['pt-pt'] = "Detecta e atualizações de campo incorreta tipos de dados.";
+	$text['description-upgrade_data_types']['fr-fr'] = "Détecte et met à jour les types de données de champ incorrect.";
+
+	$text['label-upgrade_apps']['en-us'] = "App Defaults";
+	$text['label-upgrade_apps']['es-cl'] = "predeterminadas de la aplicación";
+	$text['label-upgrade_apps']['pt-pt'] = "Padrões de aplicativos";
+	$text['label-upgrade_apps']['fr-fr'] = "Défaut de l'application";
+
+	$text['description-upgrade_apps']['en-us'] = "Executes the default settings for each application.";
+	$text['description-upgrade_apps']['es-cl'] = "Ejecuta la configuración predeterminada para cada aplicación.";
+	$text['description-upgrade_apps']['pt-pt'] = "Executa as configurações padrão para cada aplicação.";
+	$text['description-upgrade_apps']['fr-fr'] = "Exécute les paramètres par défaut pour chaque application.";
+
+	$text['label-upgrade_menu']['en-us'] = "Menu Defaults";
+	$text['label-upgrade_menu']['es-cl'] = "Omisión del menú";
+	$text['label-upgrade_menu']['pt-pt'] = "Menu Defaults";
+	$text['label-upgrade_menu']['fr-fr'] = "Des réglages par défaut";
+
+	$text['description-upgrade_menu']['en-us'] = "Restores the default items in the selected menu.";
+	$text['description-upgrade_menu']['es-cl'] = "Restaura los elementos predeterminados del menú seleccionado.";
+	$text['description-upgrade_menu']['pt-pt'] = "Restaura os itens padrão do menu selecionado.";
+	$text['description-upgrade_menu']['fr-fr'] = "Restaure les éléments par défaut dans le menu sélectionné.";
+
+	$text['label-upgrade_permissions']['en-us'] = "Permission Defaults";
+	$text['label-upgrade_permissions']['es-cl'] = "predeterminados de permisos";
+	$text['label-upgrade_permissions']['pt-pt'] = "Padrões de permissão";
+	$text['label-upgrade_permissions']['fr-fr'] = "Défaut, l'autorisation";
+
+	$text['description-upgrade_permissions']['en-us'] = "Restores default group permissions.";
+	$text['description-upgrade_permissions']['es-cl'] = "Restaura permisos de grupo por defecto.";
+	$text['description-upgrade_permissions']['pt-pt'] = "Restaura as permissões do grupo padrão.";
+	$text['description-upgrade_permissions']['fr-fr'] = "Restaure les permissions de groupe par défaut.";
+
+	$text['button-upgrade_execute']['en-us'] = "Execute";
+	$text['button-upgrade_execute']['es-cl'] = "Ejecutar";
+	$text['button-upgrade_execute']['pt-pt'] = "Executar";
+	$text['button-upgrade_execute']['fr-fr'] = "Exécuter";
+
+	$text['message-upgrade_svn']['en-us'] = "Source Files Updated";
+	$text['message-upgrade_svn']['es-cl'] = "Fuente archivos actualizados";
+	$text['message-upgrade_svn']['pt-pt'] = "Fonte arquivos atualizados";
+	$text['message-upgrade_svn']['fr-fr'] = "Source Fichiers mis à jour";
+
+	$text['message-upgrade_schema']['en-us'] = "Schema Verified";
+	$text['message-upgrade_schema']['es-cl'] = "Esquema Verified";
+	$text['message-upgrade_schema']['pt-pt'] = "Esquema Verificado";
+	$text['message-upgrade_schema']['fr-fr'] = "Schéma Verified";
+
+	$text['message-upgrade_apps']['en-us'] = "App Defaults Executed";
+	$text['message-upgrade_apps']['es-cl'] = "Predeterminadas de la aplicación Ejecutados";
+	$text['message-upgrade_apps']['pt-pt'] = "Padrões de aplicação executou";
+	$text['message-upgrade_apps']['fr-fr'] = "Défaut de l'application exécutés";
+
+	$text['message-upgrade_menu']['en-us'] = "Menu Defaults Restored";
+	$text['message-upgrade_menu']['es-cl'] = "Omisión del menú Restauradas";
+	$text['message-upgrade_menu']['pt-pt'] = "Menu Defaults Restaurado";
+	$text['message-upgrade_menu']['fr-fr'] = "Réglages par défaut rétablies";
+
 	$text['message-upgrade']['en-us'] = "Upgrade Completed";
 	$text['message-upgrade']['es-cl'] = "Actualización Completa";
 	$text['message-upgrade']['pt-pt'] = "Actualização Efectuada";
 	$text['message-upgrade']['fr-fr'] = "Mis à jour";
 
+/******************/
+
 	$text['login-message_text']['en-us'] = "Keep up with the FusionPBX project by configuring your preferences in the newly added <a href=''/app/notifications/notification_edit.php''>Notifications</a> section, under the System menu!";
 	$text['login-message_text']['es-cl'] = "Manténgase al día con el proyecto FusionPBX configurando sus preferencias en la sección <a href=''/app/notifications/notification_edit.php''>Notificaciones</a> acaba de agregar, en el menú del sistema!";
 	$text['login-message_text']['pt-pt'] = "Mantenha-se com o projeto FusionPBX configurando suas preferências na seção <a href=''/app/notifications/notification_edit.php''>Notificações</a> recém-adicionado, no menu Sistema!";

+ 51 - 39
core/upgrade/index.php

@@ -34,7 +34,7 @@ require_once "resources/check_auth.php";
 if (
 	!permission_exists('upgrade_svn') &&
 	!permission_exists('upgrade_schema') &&
-	!permission_exists('upgrade_domains') &&
+	!permission_exists('upgrade_apps') &&
 	!permission_exists('menu_restore') &&
 	!permission_exists('group_edit')
 	) {
@@ -42,6 +42,14 @@ if (
 	exit;
 }
 
+
+//add multi-lingual support
+require_once "app_languages.php";
+foreach($text as $key => $value) {
+	$text[$key] = $value[$_SESSION['domain']['language']['code']];
+}
+
+
 if (sizeof($_POST) > 0) {
 
 	$do = $_POST['do'];
@@ -53,7 +61,7 @@ if (sizeof($_POST) > 0) {
 		if (sizeof($response_svn_update) > 0) {
 			$_SESSION["response_svn_update"] = $response_svn_update;
 		}
-		$response_message = "SVN Updated";
+		$response_message = $text['message-upgrade_svn'];
 	}
 
 	// load the default database into memory and compare it with the active database
@@ -61,23 +69,23 @@ if (sizeof($_POST) > 0) {
 		$included = true;
 		$response_output = "return";
 		$response_format = "html";
-		$upgrade_data_types = (is_bool($_POST["do_datatypes"])) ? check_str($_POST["do_datatypes"]) : false;
+		$upgrade_data_types = check_str($do["data_types"]);
 		require_once "core/upgrade/upgrade_schema.php";
 		if ($response_upgrade_schema != '') {
 			$_SESSION["response_upgrade_schema"] = $response_upgrade_schema;
 		}
 		unset($apps);
-		$response_message = "Schema Upgraded";
+		$response_message = $text['message-upgrade_schema'];
 	}
 
-	// upgrade the domains
-	if ($do["domains"] && permission_exists("upgrade_domains")) {
+	// process the apps defaults
+	if ($do["apps"] && permission_exists("upgrade_apps")) {
 		$included = true;
 		$domain_language_code = $_SESSION['domain']['language']['code'];
 		require_once "core/upgrade/upgrade_domains.php";
 		$_SESSION['domain']['language']['code'] = $domain_language_code;
 		unset($domain_language_code);
-		$response_message = "Domain(s) Upgraded";
+		$response_message = $text['message-upgrade_apps'];
 	}
 
 	// restore defaults of the selected menu
@@ -88,18 +96,18 @@ if (sizeof($_POST) > 0) {
 		$included = true;
 		require_once("core/menu/menu_restore_default.php");
 		unset($sel_menu);
-		$response_message = "Menu Defaults Restored";
+		$response_message = $text['message-upgrade_menu'];
 	}
 
 	// restore default permissions
 	if ($do["permissions"] && permission_exists("group_edit")) {
 		$included = true;
 		require_once("core/users/permissions_default.php");
-		$response_message = "Permission Defauls Restored";
+		$response_message = "Permission Defaults Restored";
 	}
 
 	if (sizeof($_POST['do']) > 1) {
-		$response_message = "Upgrades Complete";
+		$response_message = $text['message-upgrade'];
 	}
 
 	$_SESSION["message"] = $response_message;
@@ -109,18 +117,12 @@ if (sizeof($_POST) > 0) {
 } // if
 
 
-//add multi-lingual support
-require_once "app_languages.php";
-foreach($text as $key => $value) {
-	$text[$key] = $value[$_SESSION['domain']['language']['code']];
-}
-
 require_once "resources/header.php";
 $document['title'] = $text['title-upgrade'];
 
 echo "<br />";
 echo "<b>".$text['header-upgrade']."</b><br>";
-echo "Select the upgrade/update/restore actions below you wish to perform.";
+echo $text['description-upgrade'];
 echo "<br><br><br>";
 
 echo "<form name='frm' method='post' action=''>\n";
@@ -129,11 +131,13 @@ if (permission_exists("upgrade_svn")) {
 	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "	<td width='30%' class='vncell'>\n";
-	echo "		SVN Update";
+	echo "		".$text['label-upgrade_svn'];
 	echo "	</td>\n";
 	echo "	<td width='70%' class='vtable' style='height: 50px;'>\n";
-	echo "		<input type='checkbox' class='formfld' name='do[svn]' id='do_svn' value='1'>";
-	echo "		<br />\n";
+	echo "		<label for='do_svn'>";
+	echo "			<input type='checkbox' class='formfld' name='do[svn]' id='do_svn' value='1'>";
+	echo "			".$text['description-upgrade_svn'];
+	echo "		</label>\n";
 	echo "	</td>\n";
 	echo "</tr>\n";
 	echo "</table>\n";
@@ -143,11 +147,13 @@ if (permission_exists("upgrade_schema")) {
 	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "	<td width='30%' class='vncell'>\n";
-	echo "		Upgrade Schema";
+	echo "		".$text['label-upgrade_schema'];
 	echo "	</td>\n";
 	echo "	<td width='70%' class='vtable' style='height: 50px;'>\n";
-	echo "		<input type='checkbox' class='formfld' name='do[schema]' id='do_schema' value='1' onchange=\"$('#do_datatypes').prop('checked', false); $('#tr_data_types').slideToggle('fast');\">";
-	echo "		<br />\n";
+	echo "		<label for='do_schema'>";
+	echo "			<input type='checkbox' class='formfld' name='do[schema]' id='do_schema' value='1' onchange=\"$('#do_data_types').prop('checked', false); $('#tr_data_types').slideToggle('fast');\">";
+	echo "			".$text['description-upgrade_schema'];
+	echo "		</label>\n";
 	echo "	</td>\n";
 	echo "</tr>\n";
 	echo "</table>\n";
@@ -156,26 +162,30 @@ if (permission_exists("upgrade_schema")) {
 	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "	<td width='30%' class='vncell'>\n";
-	echo "		Upgrade Data Types";
+	echo "		".$text['label-upgrade_data_types'];
 	echo "	</td>\n";
 	echo "	<td width='70%' class='vtable' style='height: 50px;'>\n";
-	echo "		<input type='checkbox' class='formfld' name='do[datatypes]' id='do_datatypes' value='true'>";
-	echo "		<br />\n";
+	echo "		<label for='do_data_types'>";
+	echo "			<input type='checkbox' class='formfld' name='do[data_types]' id='do_data_types' value='true'>";
+	echo "			".$text['description-upgrade_data_types'];
+	echo "		</label>\n";
 	echo "	</td>\n";
 	echo "</tr>\n";
 	echo "</table>\n";
 	echo "</div>\n";
 }
 
-if (permission_exists("upgrade_domains")) {
+if (permission_exists("upgrade_apps")) {
 	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "	<td width='30%' class='vncell'>\n";
-	echo "		Upgrade Domain(s)";
+	echo "		".$text['label-upgrade_apps'];
 	echo "	</td>\n";
 	echo "	<td width='70%' class='vtable' style='height: 50px;'>\n";
-	echo "		<input type='checkbox' class='formfld' name='do[domains]' id='do_domains' value='1'>";
-	echo "		<br />\n";
+	echo "		<label for='do_apps'>";
+	echo "			<input type='checkbox' class='formfld' name='do[apps]' id='do_apps' value='1'>";
+	echo "			".$text['description-upgrade_apps'];
+	echo "		</label>\n";
 	echo "	</td>\n";
 	echo "</tr>\n";
 	echo "</table>\n";
@@ -185,14 +195,14 @@ if (permission_exists("menu_restore")) {
 	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "	<td width='30%' class='vncell'>\n";
-	echo "		Restore Menu Defaults";
+	echo "		".$text['label-upgrade_menu'];
 	echo "	</td>\n";
 	echo "	<td width='70%' class='vtable' style='height: 50px;'>\n";
 	echo "		<table cellpadding='0' cellspacing='0' border='0'>";
 	echo "			<tr><td>";
-	echo "				<input type='checkbox' class='formfld' name='do[menu]' id='do_menu' value='1' onchange=\"$('#sel_menu').fadeToggle('fast');\">";
-	echo "			</td><td>";
-	echo "				<select name='sel_menu' id='sel_menu' class='formfld' style='display: none; margin-left: 15px;'>\n";
+	echo "				<input type='checkbox' class='formfld' name='do[menu]' id='do_menu' value='1' onchange=\"$('#td_sel_menu').fadeToggle('fast');\">";
+	echo "			</td><td id='td_sel_menu' style='display: none; padding: 0px 3px 0px 8px;'>";
+	echo "				<select name='sel_menu' id='sel_menu' class='formfld'>\n";
 		$sql = "select * from v_menus ";
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement->execute();
@@ -202,7 +212,7 @@ if (permission_exists("menu_restore")) {
 		}
 		unset ($sql, $result, $prep_statement);
 	echo "				</select>\n";
-	echo "			</td></tr>";
+	echo "			</td><td class='vtable' style='border: none; padding: 3px;'><label for='do_menu'>".$text['description-upgrade_menu']."</label></td></tr>";
 	echo "		</table>";
 	echo "	</td>\n";
 	echo "</tr>\n";
@@ -213,11 +223,13 @@ if (permission_exists("group_edit")) {
 	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "	<td width='30%' class='vncell'>\n";
-	echo "		Restore Permission Defaults";
+	echo "		".$text['label-upgrade_permissions'];
 	echo "	</td>\n";
 	echo "	<td width='70%' class='vtable' style='height: 50px;'>\n";
-	echo "		<input type='checkbox' class='formfld' name='do[permissions]' id='do_permissions' value='1'>";
-	echo "		<br />\n";
+	echo "		<label for='do_permissions'>";
+	echo "			<input type='checkbox' class='formfld' name='do[permissions]' id='do_permissions' value='1'>";
+	echo "			".$text['description-upgrade_permissions'];
+	echo "		</label>\n";
 	echo "	</td>\n";
 	echo "</tr>\n";
 	echo "</table>\n";
@@ -226,7 +238,7 @@ if (permission_exists("group_edit")) {
 echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 echo "<tr>\n";
 echo "	<td colspan='2' style='text-align: right;'>\n";
-echo "		<input type='submit' class='btn' value='Execute'>\n";
+echo "		<input type='submit' class='btn' value='".$text['button-upgrade_execute']."'>\n";
 echo "	</td>\n";
 echo "</tr>\n";
 echo "</table>\n";

+ 1 - 1
core/upgrade/upgrade_domains.php

@@ -41,7 +41,7 @@
 		include "root.php";
 		require_once "resources/require.php";
 		require_once "resources/check_auth.php";
-		if (permission_exists('upgrade_schema') || permission_exists('upgrade_svn') || if_group("superadmin")) {
+		if (permission_exists('upgrade_apps') || if_group("superadmin")) {
 			//echo "access granted";
 		}
 		else {

+ 13 - 7
core/upgrade/upgrade_schema.php

@@ -37,6 +37,13 @@
 		require_once "resources/require.php";
 		$_SERVER["DOCUMENT_ROOT"] = $document_root;
 		$response_format = 'text'; //html, text
+
+		//add multi-lingual support
+		require_once "app_languages.php";
+		foreach($text as $key => $value) {
+			$text[$key] = $value[$_SESSION['domain']['language']['code']];
+		}
+
 	}
 	else if (!$included) {
 		include "root.php";
@@ -50,6 +57,12 @@
 			exit;
 		}
 
+		//add multi-lingual support
+		require_once "app_languages.php";
+		foreach($text as $key => $value) {
+			$text[$key] = $value[$_SESSION['domain']['language']['code']];
+		}
+
 		require_once "resources/header.php";
 		$document['title'] = $text['title-upgrade_schema'];
 
@@ -57,13 +70,6 @@
 	}
 
 
-//add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
-
-
 //set the default
 	if (!isset($response_output)) {
 		$response_output = "echo";

+ 2 - 5
resources/schema.php

@@ -276,9 +276,6 @@ function db_upgrade_schema ($db, $db_type, $db_name, $response_output) {
 	global $response_format;
 	global $upgrade_data_types;
 
-	// set default
-	if (!isset($upgrade_data_types)) { $upgrade_data_types = false; }
-
 	//PHP PDO check if table or column exists
 		//check if table exists
 			// SELECT * FROM sqlite_master WHERE type='table' AND name='v_cdr'
@@ -437,7 +434,7 @@ function db_upgrade_schema ($db, $db_type, $db_name, $response_output) {
 												}
 											}
 										}
-//									//change the data type if it has been changed
+									//change the data type if it has been changed
 										//if the data type in the app db array is different than the type in the database then change the data type
 										if ($upgrade_data_types) {
 											$db_field_type = db_column_data_type ($db, $db_type, $db_name, $table_name, $field_name);
@@ -487,7 +484,7 @@ function db_upgrade_schema ($db, $db_type, $db_name, $response_output) {
 												}
 											}
 										}
-//
+
 								}
 							}
 							unset($column_array);