fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1613 from brayanpereyra/DOC-SYSTEM

Browse Source 
DOCSYSTEM Arreglo para obtener la direccion de servidor
This commit is contained in:
Erik Amaru Ortiz
2013-04-22 12:21:21 -07:00
parent fe8d2ac2f9 defaca05be
commit 93cf246e88
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.configuration.php
View File

@@ -551,7 +551,7 @@ class Configurations // extends Configuration
$langLocate = 'PTB';
break;
case 'en':
case 'en_US':
case 'en-US':
default:
$langLocate = 'EST';
break;

10
workflow/engine/controllers/installer.php
View File

@@ -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';