diff --git a/core/upgrade/app_languages.php b/core/upgrade/app_languages.php index a41cc3b8ad..e8d52fe36b 100644 --- a/core/upgrade/app_languages.php +++ b/core/upgrade/app_languages.php @@ -170,6 +170,11 @@ $text['message-upgrade_svn']['pt-pt'] = "Fonte arquivos atualizados"; $text['message-upgrade_svn']['fr-fr'] = "Source Fichiers mis à jour"; + $text['message-upgrade_svn_failed']['en-us'] = "Source Files Update Failed - Please Run SVN Update Via Console"; + $text['message-upgrade_svn_failed']['es-cl'] = "Fuente actualización de archivos Error - Por favor, ejecuta svn update Vía Consola"; + $text['message-upgrade_svn_failed']['pt-pt'] = "Fonte Arquivos Update Failed - execute o SVN Atualização Via Console"; + $text['message-upgrade_svn_failed']['fr-fr'] = "Source des fichiers de mise à jour a échoué - Se il vous plaît Exécutez SVN Update Via Console"; + $text['message-upgrade_schema']['en-us'] = "Schema Verified"; $text['message-upgrade_schema']['es-cl'] = "Esquema Verified"; $text['message-upgrade_schema']['pt-pt'] = "Esquema Verificado"; diff --git a/core/upgrade/index.php b/core/upgrade/index.php index f74f6da62c..c1232d87d4 100644 --- a/core/upgrade/index.php +++ b/core/upgrade/index.php @@ -58,10 +58,23 @@ if (sizeof($_POST) > 0) { if ($do["svn"] && permission_exists("upgrade_svn") && !is_dir("/usr/share/examples/fusionpbx")) { $cmd = "svn up /var/www/fusionpbx"; exec($cmd, $response_svn_update); + $update_failed = true; if (sizeof($response_svn_update) > 0) { $_SESSION["response_svn_update"] = $response_svn_update; + foreach ($response_svn_update as $response_line) { + if (substr_count($response_line, "Updated to revision") > 0 || substr_count($response_line, "At revision") > 0) { + $update_failed = false; + } + } + } + if ($update_failed) { + $_SESSION["message_delay"] = 3500; + $_SESSION["message_mood"] = 'negative'; + $response_message = $text['message-upgrade_svn_failed']; + } + else { + $response_message = $text['message-upgrade_svn']; } - $response_message = $text['message-upgrade_svn']; } // load an array of the database schema and compare it with the active database @@ -115,15 +128,15 @@ if (sizeof($_POST) > 0) { require_once "resources/header.php"; $document['title'] = $text['title-upgrade']; -echo "
"; -echo "".$text['header-upgrade']."
"; +echo "".$text['header-upgrade'].""; +echo "

"; echo $text['description-upgrade']; -echo "


"; +echo "

"; echo "
\n"; if (permission_exists("upgrade_svn") && !is_dir("/usr/share/examples/fusionpbx")) { - echo "\n"; + echo "
\n"; echo "\n"; echo "
\n"; echo " ".$text['label-upgrade_svn']; @@ -139,7 +152,7 @@ if (permission_exists("upgrade_svn") && !is_dir("/usr/share/examples/fusionpbx") } if (permission_exists("upgrade_schema")) { - echo "\n"; + echo "
\n"; echo "\n"; echo "
\n"; echo " ".$text['label-upgrade_schema']; @@ -154,7 +167,7 @@ if (permission_exists("upgrade_schema")) { echo "
\n"; echo "