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

Merge pull request #1658 from brayanpereyra/master

Browse Source 
Creacion de logs para SYSTEM_NAME
This commit is contained in:
Erik Amaru Ortiz
2013-04-26 14:03:53 -07:00
parent ed361ac2af cf8e42cc99
commit 6101b7dffc
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ class Installer extends Controller
public $path_xmlforms; public $path_xmlforms;
public $path_shared; public $path_shared;
public $path_sep; public $path_sep;
public $systemName;
public $link; #resource for database connection public $link; #resource for database connection
@@ -29,6 +30,7 @@ class Installer extends Controller
$this->path_public = PATH_HOME . 'public_html/index.html'; $this->path_public = PATH_HOME . 'public_html/index.html';
$this->path_shared = PATH_TRUNK . 'shared/'; $this->path_shared = PATH_TRUNK . 'shared/';
$this->path_sep = PATH_SEP; $this->path_sep = PATH_SEP;
$this->systemName = '';
} }
public function index ($httpData) public function index ($httpData)
@@ -367,6 +369,7 @@ class Installer extends Controller
{ {
$pathSharedPartner = trim( $_REQUEST['pathShared'] ); $pathSharedPartner = trim( $_REQUEST['pathShared'] );
if (file_exists($pathSharedPartner.'partner.info')) { if (file_exists($pathSharedPartner.'partner.info')) {
$this->systemName = $this->getSystemName($pathSharedPartner);
$_REQUEST["PARTNER_FLAG"] = true; $_REQUEST["PARTNER_FLAG"] = true;
} }
$this->setResponseType( 'json' ); $this->setResponseType( 'json' );
@@ -691,9 +694,8 @@ class Installer extends Controller
if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) { if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) {
$dbText .= "\n"; $dbText .= "\n";
$dbText .= " define ('PARTNER_FLAG', " . ((defined('PARTNER_FLAG')) ? PARTNER_FLAG : ((isset($_REQUEST['PARTNER_FLAG'])) ? $_REQUEST['PARTNER_FLAG']:'false')) . ");\n"; $dbText .= " define ('PARTNER_FLAG', " . ((defined('PARTNER_FLAG')) ? PARTNER_FLAG : ((isset($_REQUEST['PARTNER_FLAG'])) ? $_REQUEST['PARTNER_FLAG']:'false')) . ");\n";
$systemName = $this->getSystemName(); if ($this->systemName != '') {
if ($systemName != '') { $dbText .= " define ('SYSTEM_NAME', " . $this->systemName . ");\n";
$dbText .= " define ('SYSTEM_NAME', " . $systemName . ");\n";
} }
} }
@@ -982,9 +984,8 @@ class Installer extends Controller
if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) { if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) {
$dbText .= "\n"; $dbText .= "\n";
$dbText .= " define ('PARTNER_FLAG', " . ((defined('PARTNER_FLAG')) ? PARTNER_FLAG : ((isset($_REQUEST['PARTNER_FLAG'])) ? $_REQUEST['PARTNER_FLAG']:'false')) . ");\n"; $dbText .= " define ('PARTNER_FLAG', " . ((defined('PARTNER_FLAG')) ? PARTNER_FLAG : ((isset($_REQUEST['PARTNER_FLAG'])) ? $_REQUEST['PARTNER_FLAG']:'false')) . ");\n";
$systemName = $this->getSystemName(); if ($this->systemName != '') {
if ($systemName != '') { $dbText .= " define ('SYSTEM_NAME', " . $this->systemName . ");\n";
$dbText .= " define ('SYSTEM_NAME', " . $systemName . ");\n";
} }
} }
@@ -1078,10 +1079,9 @@ class Installer extends Controller
return $info; return $info;
} }
public function getSystemName () public function getSystemName ($siteShared)
{ {
$systemName = '' $systemName = ''
$siteShared = $this->path_shared;
if (substr( $siteShared, - 1 ) != '/') { if (substr( $siteShared, - 1 ) != '/') {
$siteShared .= '/'; $siteShared .= '/';
} }