diff --git a/workflow/engine/bin/tasks/cliUpgrade.php b/workflow/engine/bin/tasks/cliUpgrade.php index 92cbeb6d8..25f66a87f 100755 --- a/workflow/engine/bin/tasks/cliUpgrade.php +++ b/workflow/engine/bin/tasks/cliUpgrade.php @@ -129,16 +129,16 @@ function run_upgrade($command, $args) // SAVE Upgrades/Patches $arrayPatch = glob(PATH_TRUNK . 'patch-*'); - if (count($arrayPatch)) { + if ($arrayPatch) { foreach ($arrayPatch as $value) { if (file_exists($value)) { // copy content the patch $names = pathinfo($value); $nameFile = $names['basename']; - $fichero = file_get_contents($value); - $fichero = eregi_replace("[\n|\r|\n\r]", ' ', $fichero); - CLI::logging($fichero . ' installed (' . $nameFile . ')', PATH_DATA . 'log/upgrades.log'); + $contentFile = file_get_contents($value); + $contentFile = preg_replace("[\n|\r|\n\r]", '', $contentFile); + CLI::logging($contentFile . ' installed (' . $nameFile . ')', PATH_DATA . 'log/upgrades.log'); // move file of patch $newFile = PATH_DATA . $nameFile; diff --git a/workflow/engine/controllers/main.php b/workflow/engine/controllers/main.php index 088757416..74336bd7e 100644 --- a/workflow/engine/controllers/main.php +++ b/workflow/engine/controllers/main.php @@ -732,8 +732,8 @@ class Main extends Controller } } - $sysSection = G::loadTranslation( 'ID_SYSTEM_INFO' ); - $pmSection = 'ProcessMaker Information'; + $sysSection = G::loadTranslation('ID_SYSTEM_INFO' ); + $pmSection = G::LoadTranslation('ID_PROCESS_INFORMATION'); $properties = array (); $ee = class_exists( 'pmLicenseManager' ) ? " - Enterprise Edition" : ''; @@ -741,55 +741,55 @@ class Main extends Controller ); if (file_exists(PATH_DATA. 'log/upgrades.log')) { - $properties[] = array ('Upgrades/Patches', 'View log' ,$pmSection); + $properties[] = array (G::LoadTranslation('ID_UPGRADES_PATCHES'), '' . G::LoadTranslation( 'ID_UPGRADE_VIEW_LOG') . '' ,$pmSection); } else { - $properties[] = array ('Upgrades/Patches', 'Never upgraded' ,$pmSection); + $properties[] = array (G::LoadTranslation('ID_UPGRADES_PATCHES'), G::LoadTranslation( 'ID_UPGRADE_NEVER_UPGRADE') ,$pmSection); } - $properties[] = array ('Operating System',$redhat,$sysSection + $properties[] = array (G::LoadTranslation('ID_OPERATING_SYSTEM') ,$redhat,$sysSection ); - $properties[] = array ('Time Zone',(defined( 'TIME_ZONE' )) ? TIME_ZONE : "Unknown",$sysSection + $properties[] = array (G::LoadTranslation('ID_TIME_ZONE') ,(defined( 'TIME_ZONE' )) ? TIME_ZONE : "Unknown",$sysSection ); - $properties[] = array ('Web Server',getenv( 'SERVER_SOFTWARE' ),$sysSection + $properties[] = array (G::LoadTranslation('ID_WEB_SERVER') ,getenv( 'SERVER_SOFTWARE' ),$sysSection ); - $properties[] = array ('Server Name',getenv( 'SERVER_NAME' ),$pmSection + $properties[] = array (G::LoadTranslation('ID_SERVER_NAME') ,getenv( 'SERVER_NAME' ),$pmSection ); - $properties[] = array ('Server IP Address',$this->lookup( $ip ),$sysSection + $properties[] = array (G::LoadTranslation('ID_SERVER_IP') ,$this->lookup( $ip ),$sysSection ); - $properties[] = array ('PHP Version',phpversion(),$sysSection + $properties[] = array (G::LoadTranslation('ID_PHP_VERSION') ,phpversion(),$sysSection ); if (defined( "DB_HOST" )) { - $properties[] = array ('Data Base',$dbNetView->dbName( DB_ADAPTER ) . ' (Version ' . $sMySQLVersion . ')',$pmSection + $properties[] = array (G::LoadTranslation('ID_DATABASE') ,$dbNetView->dbName( DB_ADAPTER ) . ' (Version ' . $sMySQLVersion . ')',$pmSection ); - $properties[] = array ('Data Base Server',DB_HOST,$pmSection + $properties[] = array (G::LoadTranslation('ID_DATABASE_SERVER') ,DB_HOST,$pmSection ); - $properties[] = array ('Data Base Name',DB_NAME,$pmSection + $properties[] = array (G::LoadTranslation('ID_DATABASE_NAME') ,DB_NAME,$pmSection ); - $properties[] = array ('Available DB Engines',$availdb,$sysSection + $properties[] = array (G::LoadTranslation('ID_AVAILABLE_DB') ,$availdb,$sysSection ); } else { - $properties[] = array ('Data Base',"Not defined",$pmSection + $properties[] = array (G::LoadTranslation('ID_DATABASE') ,"Not defined",$pmSection ); - $properties[] = array ('Data Base Server',"Not defined",$pmSection + $properties[] = array (G::LoadTranslation('ID_DATABASE_SERVER') ,"Not defined",$pmSection ); - $properties[] = array ('Data Base Name',"Not defined",$pmSection + $properties[] = array (G::LoadTranslation('ID_DATABASE_NAME') ,"Not defined",$pmSection ); - $properties[] = array ('Available DB Engines',"Not defined",$sysSection + $properties[] = array (G::LoadTranslation('ID_AVAILABLE_DB') ,"Not defined",$sysSection ); } - $properties[] = array ('Workspace',defined( "SYS_SYS" ) ? SYS_SYS : "Not defined",$pmSection + $properties[] = array ( G::LoadTranslation('ID_WORKSPACE') ,defined( "SYS_SYS" ) ? SYS_SYS : "Not defined",$pmSection ); - $properties[] = array ('Server Protocol',getenv( 'SERVER_PROTOCOL' ),$sysSection + $properties[] = array ( G::LoadTranslation('ID_SERVER_PROTOCOL') ,getenv( 'SERVER_PROTOCOL' ),$sysSection ); - $properties[] = array ('Server Port',getenv( 'SERVER_PORT' ),$sysSection + $properties[] = array ( G::LoadTranslation('ID_SERVER_PORT') ,getenv( 'SERVER_PORT' ),$properties ); - //$properties[] = array('Remote Host', getenv ('REMOTE_HOST'), $sysSection); - $properties[] = array ('Server Addr.',getenv( 'SERVER_ADDR' ),$sysSection + //$sysSection[] = array('Remote Host', getenv ('REMOTE_HOST'), $sysSection); + $properties[] = array ( G::LoadTranslation('ID_SERVER_NAME') , getenv( 'SERVER_ADDR' ),$sysSection ); - $properties[] = array ('User\'s Browser',getenv( 'HTTP_USER_AGENT' ),$sysSection + $properties[] = array ( G::LoadTranslation('ID_USER_BROWSER') , getenv( 'HTTP_USER_AGENT' ),$sysSection ); return $properties; diff --git a/workflow/engine/templates/setup/dbInfo.js b/workflow/engine/templates/setup/dbInfo.js index 2ecc512f5..5c04e15fd 100644 --- a/workflow/engine/templates/setup/dbInfo.js +++ b/workflow/engine/templates/setup/dbInfo.js @@ -31,5 +31,5 @@ Ext.onReady(dbInfo.application.init, dbInfo.application); function showUpgradedLogs() { - window.location = '../../uxmodern/main/screamFileUpgrades.php'; + window.location = '../../uxmodern/main/screamFileUpgrades'; }