new updater: windows OK. update version info

jonsito · Oct 14, 2015 · 601d4a3 · 601d4a3
1 parent 1b23228
commit 601d4a3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 237 deletions.
diff --git a/agility/server/auth/system.ini b/agility/server/auth/system.ini
@@ -3,8 +3,8 @@ program_name = "AgilityContest"
 author = "Juan Antonio Martinez"
 email = "[email protected]"
 license = "GPL"
-version_name = "2.1.1"
-version_date = "20151014_1336"
+version_name = "2.1.2"
+version_date = "20151014_1417"
 database_name = "agility"
 database_host = "localhost"
 database_user = "agility_operator"

diff --git a/agility/upgrade.php b/agility/upgrade.php
@@ -290,6 +290,10 @@ public function doUpgrade() {
     <head>
         <title>Actualizador de AgilityContest</title>
         <style>
+            .waiting {
+                cursor: progress;
+            }
+
             textarea {
                 -moz-box-sizing:border-box;
                 box-sizing:border-box;
@@ -325,10 +329,6 @@ public function doUpgrade() {
                 });
             };
 
-            function restart() {
-                window.location="https://localhost/agility/console";
-            }
-
             function fireUpdater() {
                 var txarea=$("#progress");
                 txarea.blur();
@@ -342,23 +342,37 @@ function fireUpdater() {
                     success: function(data) {
                         var done=false;
                         for(var n=0 ; n<data.length; n++) {
-                            var a=data[n];
-                            txarea.val(txarea.val()+"\\n"+a);
+                            var a=data[n].trim();
+                            if (a!=="") txarea.val(txarea.val()+"\\n"+a);
                             if (a.indexOf("DONE")==0) done=true;
                             if (a.indexOf("FATAL")==0) done=true;
                         }
-                        if (!done) setTimeout(fireUpdater,500); // call myself in 0.5 second
-                        else $("#doneBtn").css("display","inline");
+                        if (!done) {
+                            setTimeout(fireUpdater,500); // call myself in 0.5 second
+                        } else {
+                            txarea.removeClass("waiting");
+                            $("#doneBtn").css("display","inline");
+                        }
                         txarea.putCursorAtEnd();
                     },
                     error: function(XMLHttpRequest,textStatus,errorThrown) {
                         alert("Error: "+textStatus + " "+ errorThrown );
                     }
                 });
             }
+
+            function start() {
+                $("#progress").addClass("waiting");
+                fireUpdater();
+            }
+
+            function restart() {
+                window.location="https://localhost/agility/console";
+            }
+
         </script>
     </head>
-    <body onload="fireUpdater();">
+    <body onload="start();">
         <h2>Updating AgilityContest...</h2>
         <h3>New version: '.$up->getVersionName().' - '.$up->getVersionDate().' </h3>
         <form id="updater" name="updater" action="/agility/console">

diff --git a/agility/upgrade.php.orig b/agility/upgrade.php.orig