From defaca05be154a78b0661d65ccd1649f3ddb825d Mon Sep 17 00:00:00 2001
From: Brayan Osmar Pereyra Suxo <brayan@colosa.com>
Date: Mon, 22 Apr 2013 15:04:13 -0400
Subject: [PATCH] DOCSYSTEM Arreglo para obtener la direccion de servidor

Arreglo para obtener la direccion de servidor
---
 workflow/engine/classes/class.configuration.php |  2 +-
 workflow/engine/controllers/installer.php       | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php
index b3a7fa60b..e33b2599c 100755
--- a/workflow/engine/classes/class.configuration.php
+++ b/workflow/engine/classes/class.configuration.php
@@ -551,7 +551,7 @@ class Configurations // extends Configuration
                             $langLocate = 'PTB';
                             break;
                         case 'en':
-                        case 'en_US':
+                        case 'en-US':
                         default:
                             $langLocate = 'EST';
                             break;
diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php
index 11edc3bc8..206e1e047 100644
--- a/workflow/engine/controllers/installer.php
+++ b/workflow/engine/controllers/installer.php
@@ -1335,8 +1335,14 @@ EOL;
         ini_set('max_execution_time', '0');
         ini_set('memory_limit', '256M');
 
-        $serv = 'http://'.$_SERVER['SERVER_NAME'];
-
+        $serv = 'http://';
+        if (isset($_SERVER['HTTPS']) && trim($_SERVER['HTTPS']) != '') {
+            $serv = 'https://';
+        }
+        $serv .= $_SERVER['SERVER_NAME'];
+        if (isset($_SERVER['SERVER_PORT']) && trim($_SERVER['SERVER_PORT']) != '') {
+            $serv .= ':' . $_SERVER['SERVER_PORT'];
+        }
 
         // create session
         $cookiefile =  sys_get_temp_dir() . PATH_SEP . 'curl-session';