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

Merge pull request #1646 from victorsl/BUG-0000

Browse Source 
BUG 0000 "Safe upgrade for JavaScript files" SOLVED
This commit is contained in:
julceslauhub
2013-04-26 11:51:14 -07:00
parent 12159535b4 8ef92c1a8b
commit 6d3970ee75
17 changed files with 415 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,7 +367,7 @@ class Installer extends Controller
{
$pathSharedPartner = trim( $_REQUEST['pathShared'] );
if (file_exists($pathSharedPartner.'partner.info')) {
$_REQUEST['PARTNER_FLAG'] = true;
$_REQUEST["PARTNER_FLAG"] = true;
}
$this->setResponseType( 'json' );
if ($_REQUEST['db_engine'] == 'mysql') {
@@ -382,13 +382,13 @@ class Installer extends Controller
public function forceTogenerateTranslationsFiles ($url)
{
$ch = curl_init();
curl_setopt( $ch, CURLOPT_URL, (isset( $_SERVER['HTTPS'] ) ? ($_SERVER['HTTPS'] != '' ? 'https://' : 'http://') : 'http://') . $_SERVER['HTTP_HOST'] . '/js/ext/translation.en.js?r=' . rand( 1, 10000 ) );
curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
curl_setopt( $ch, CURLOPT_FRESH_CONNECT, 1 );
curl_setopt( $ch, CURLOPT_TIMEOUT, 60 );
curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, 20 );
curl_exec( $ch );
curl_close( $ch );
curl_setopt($ch, CURLOPT_URL, G::browserCacheFilesUrl((isset($_SERVER["HTTPS"])? (($_SERVER["HTTPS"] != "")? "https://" : "http://") : "http://") . $_SERVER["HTTP_HOST"] . "/js/ext/translation.en.js?r=" . rand(1, 10000)));
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_FRESH_CONNECT, 1);
curl_setopt($ch, CURLOPT_TIMEOUT, 60);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 20);
curl_exec($ch);
curl_close($ch);
}
/**
@@ -1407,7 +1407,7 @@ EOL;
$output = curl_exec($ch);
curl_close($ch);
/**
/**
* Upload translation .po file
*/
@@ -1430,7 +1430,7 @@ EOL;
$output = curl_exec($ch);
curl_close($ch);
/**
/**
* Upload skin file
*/

14
workflow/engine/controllers/main.php
View File

@@ -277,10 +277,11 @@ class Main extends Controller
$this->setVar( 'advise_text', $adviseText );
$loginScript = $this->getHeadPublisher()->getExtJsLibraries();
$loginScript .= $this->getHeadPublisher()->getExtJsScripts();
$this->setVar( 'login_script', $loginScript );
$this->setVar( 'login_vars', $this->getHeadPublisher()->getExtJsVariablesScript() );
$this->setVar("login_script", $loginScript);
$this->setVar("login_vars", $this->getHeadPublisher()->getExtJsVariablesScript());
$this->setVar("URL_TRANSLATION_JS", G::browserCacheFilesUrl("/js/ext/translation.en.js"));
$this->setLayout( 'pm-modern-login' );
$this->setLayout("pm-modern-login");
$this->render();
}
@@ -342,10 +343,11 @@ class Main extends Controller
$loginScript = $this->getHeadPublisher()->getExtJsLibraries();
$loginScript .= $this->getHeadPublisher()->getExtJsScripts();
$this->setVar( 'login_script', $loginScript );
$this->setVar( 'login_vars', $this->getHeadPublisher()->getExtJsVariablesScript() );
$this->setVar("login_script", $loginScript);
$this->setVar("login_vars", $this->getHeadPublisher()->getExtJsVariablesScript());
$this->setVar("URL_TRANSLATION_JS", G::browserCacheFilesUrl("/js/ext/translation.en.js"));
$this->setLayout( 'pm-modern-login' );
$this->setLayout("pm-modern-login");
$this->render();
}