Merge branch 'bareos-16.2'

bareos · Mar 25, 2017 · 5fcdad4 · 5fcdad4
2 parents cc5b39f + 9705f55
commit 5fcdad4
Show file tree

Hide file tree

Showing 14 changed files with 3,734 additions and 4,139 deletions.
diff --git a/module/Auth/src/Auth/Controller/AuthController.php b/module/Auth/src/Auth/Controller/AuthController.php
@@ -102,7 +102,24 @@ public function loginAction()
                   }
 
                   if(array_key_exists('obsarch', $dird_version)) {
-                     $dird_arch = $dird_version['obsarch'];
+                     if(preg_match("/ubuntu/i", $dird_dist) && $dird_version['obsarch'] == "x86_64") {
+                        $dird_arch = "amd64";
+                     }
+                     elseif(preg_match("/debian/i", $dird_dist) && $dird_version['obsarch'] == "x86_64") {
+                        $dird_arch = "amd64";
+                     }
+                     elseif(preg_match("/windows/i", $dird_dist) && $dird_version['obsarch'] == "Win32") {
+                        $dird_arch = "32";
+                     }
+                     elseif(preg_match("/windows/i", $dird_dist) && $dird_version['obsarch'] == "Win64") {
+                        $dird_arch = "64";
+                     }
+                     else {
+                        $dird_arch = $dird_version['obsarch'];
+                     }
+                  }
+                  else {
+                     $dird_arch = null;
                   }
 
                   if(array_key_exists('version', $dird_version)) {

diff --git a/module/Auth/view/auth/auth/login.phtml b/module/Auth/view/auth/auth/login.phtml
@@ -192,7 +192,7 @@ get latest versions information via ajax call
 
 function getVersions() {
 
-   var update_url = "https://download.bareos.com/release-info/bareos-release-info.js?callback=jsonCallback";
+   var update_url = window.location.protocol + "//download.bareos.com/release-info/bareos-release-info.js?callback=jsonCallback";
 
    var v = $.ajax({
       method: "GET",
@@ -201,7 +201,7 @@ function getVersions() {
       contentType: 'application/javascript',
       dataType: 'jsonp',
       timeout: 15000,
-      error: function() {
+      error: function(jqXHR, textStatus, errorThrown) {
          return false;
       },
       success: function(result) {

diff --git a/module/Client/src/Client/Controller/ClientController.php b/module/Client/src/Client/Controller/ClientController.php
@@ -210,7 +210,21 @@ public function getDataAction()
          }
 
          if(array_key_exists('obsarch', $dird_version)) {
-            $dird_arch = $dird_version['obsarch'];
+            if(preg_match("/debian/i", $dird_dist) && $dird_version['obsarch'] == "x86_64") {
+               $dird_arch = "amd64";
+            }
+            elseif(preg_match("/ubuntu/i", $dird_dist) && $dird_version['obsarch'] == "x86_64") {
+               $dird_arch = "amd64";
+            }
+            elseif(preg_match("/windows/i", $dird_dist) && $dird_version['obsarch'] == "Win32") {
+               $dird_arch = "32";
+            }
+            elseif(preg_match("/windows/i", $dird_dist) && $dird_version['obsarch'] == "Win64") {
+               $dird_arch = "64";
+            }
+            else {
+               $dird_arch = $dird_version['obsarch'];
+            }
          }
          else {
             $dird_arch = null;
@@ -283,10 +297,24 @@ public function getDataAction()
             }
 
             if(array_key_exists(4, $uname)) {
-               $fd_arch = $uname[4];
+               if(preg_match("/debian/i", $fd_dist) && $uname[4] == "x86_64") {
+                  $fd_arch = "amd64";
+               }
+               elseif(preg_match("/ubuntu/i", $fd_dist) && $uname[4] == "x86_64") {
+                  $fd_arch = "amd64";
+               }
+               elseif(preg_match("/windows/i", $fd_dist) && $uname[4] == "Win32") {
+                  $fd_arch = "32";
+               }
+               elseif(preg_match("/windows/i", $fd_dist) && $uname[4] == "Win64") {
+                  $fd_arch = "64";
+               }
+               else {
+                  $fd_arch = $uname[4];
+               }
             }
             else {
-               $fd_arch = "";
+               $fd_arch = NULL;
             }
 
             $result[$i]['installed_fd'] = $fd_vers;

diff --git a/public/css/Bootstrap-3.3.7/fonts/glyphicons-halflings-regular.ttf b/public/css/Bootstrap-3.3.7/fonts/glyphicons-halflings-regular.ttf
diff --git a/public/css/Bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff b/public/css/Bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff
diff --git a/public/css/Bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff2 b/public/css/Bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff2
diff --git a/public/css/bootstrap-select.css b/public/css/bootstrap-select.css