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

Merge branch 'master' into michael-angelo

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2013-08-30 11:32:46 -04:00
parent 324e0f6320 4ee27b7be1
commit 78666829c8
8 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.bootstrap.php
View File

@@ -85,7 +85,7 @@ class Bootstrap
}
// default configuration
$config = array('debug' => 0, 'debug_sql' => 0, 'debug_time' => 0, 'debug_calendar' => 0, 'wsdl_cache' => 1, 'memory_limit' => '128M', 'time_zone' => 'America/New_York', 'memcached' => 0, 'memcached_server' => '', 'default_skin' => 'neoclassic', 'default_lang' => 'en', 'proxy_host' => '', 'proxy_port' => '', 'proxy_user' => '', 'proxy_pass' => '' );
$config = array('debug' => 0, 'debug_sql' => 0, 'debug_time' => 0, 'debug_calendar' => 0, 'wsdl_cache' => 1, 'memory_limit' => "256M", 'time_zone' => 'America/New_York', 'memcached' => 0, 'memcached_server' => '', 'default_skin' => 'neoclassic', 'default_lang' => 'en', 'proxy_host' => '', 'proxy_port' => '', 'proxy_user' => '', 'proxy_pass' => '' );
// read the global env.ini configuration file
if ($readGlobalIniFile && ($globalConf = @parse_ini_file($globalIniFile)) !== false) {

2
gulliver/system/class.xmlform.php
View File

@@ -3028,7 +3028,7 @@ class XmlForm_Field_Checkbox extends XmlForm_Field
public $required = false;
public $value = 'on';
public $falseValue = 'off';
public $labelOnRight = true;
public $labelOnRight = false;
public $readOnly = false;
/**

3
workflow/engine/bin/cron_single.php
View File

@@ -5,7 +5,8 @@
*/
ini_set('display_errors', 1);
error_reporting(E_ALL);
ini_set('memory_limit', '128M');
ini_set("memory_limit", "256M");
if (!defined('SYS_LANG')) {
define('SYS_LANG', 'en');

3
workflow/engine/classes/class.system.php
View File

@@ -1074,8 +1074,7 @@ class System
}
// default configuration
$config = array ('debug' => 0,'debug_sql' => 0,'debug_time' => 0,'debug_calendar' => 0,'wsdl_cache' => 1,'memory_limit' => '128M','time_zone' => 'America/New_York','memcached' => 0,'memcached_server' => '','default_skin' => 'neoclassic','default_lang' => 'en','proxy_host' => '','proxy_port' => '','proxy_user' => '','proxy_pass' => ''
);
$config = array ('debug' => 0,'debug_sql' => 0,'debug_time' => 0,'debug_calendar' => 0,'wsdl_cache' => 1,'memory_limit' => "256M", 'time_zone' => 'America/New_York','memcached' => 0,'memcached_server' => '','default_skin' => 'neoclassic','default_lang' => 'en','proxy_host' => '','proxy_port' => '','proxy_user' => '','proxy_pass' => '');
// read the global env.ini configuration file
if ($readGlobalIniFile && ($globalConf = @parse_ini_file( $globalIniFile )) !== false) {

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

@@ -35,6 +35,14 @@ class Installer extends Controller
public function index ($httpData)
{
$partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
if ($partnerFlag){
$this->includeExtJS( 'installer/stopInstall');
$this->setView( 'installer/mainStopInstall' );
G::RenderPage( 'publish', 'extJs' );
return;
}
$licenseContent = file_get_contents( PATH_TRUNK . 'LICENSE.txt' );
$this->includeExtJS( 'installer/CardLayout', false );
@@ -1164,7 +1172,7 @@ class Installer extends Controller
$db_password = $_REQUEST['db_password'];
$fp = @fsockopen( $db_hostname, $db_port, $errno, $errstr, 30 );
if (! $fp) {
$info->message .= G::LoadTranslation('ID_CONNECTION_ERROR', SYS_LANG, Array($errstr ($errno)));
$info->message .= G::LoadTranslation('ID_CONNECTION_ERROR', SYS_LANG, Array("$errstr ($errno)"));
return $info;
}
@@ -1204,7 +1212,7 @@ class Installer extends Controller
$fp = @fsockopen( $db_hostname, $db_port, $errno, $errstr, 30 );
if (! $fp) {
$info->message .= G::LoadTranslation('ID_CONNECTION_ERROR', SYS_LANG, Array($errstr ($errno)));
$info->message .= G::LoadTranslation('ID_CONNECTION_ERROR', SYS_LANG, Array("$errstr ($errno)"));
return $info;
}

5
workflow/engine/templates/installer/mainStopInstall.html Normal file
View File

@@ -0,0 +1,5 @@
<table width="100%" align="center">
<td align="center">
<div id="bodyNoInsatalled" style=" width:320px; height: 200px; margin: 2% auto; "></div>
</td>
</table>

16
workflow/engine/templates/installer/stopInstall.js Normal file
View File

@@ -0,0 +1,16 @@
Ext.onReady(function() {
var formLicenseLog = new Ext.FormPanel({
labelWidth : 60,
frame : true,
autoScroll: true,
monitorValid : true,
renderTo : 'bodyNoInsatalled',
title : _('ID_TITLE_NO_INSTALL'),
items:[
{html: _('ID_NO_INSTALL')}
]
});
});

14
workflow/engine/xmlform/users/users_ShortOptionsAdhoc.xml Executable file → Normal file
View File

@@ -70,5 +70,19 @@ var changeView = function(iType)
Pm.tmp.usersPanel.currentRPC.make();
};
var usersGroup = function(GRP_UID, c){
var div = document.getElementById('users'+c);
div.style.display = (div.style.display == 'none') ? 'block' : 'none';
var oRPC = new leimnud.module.rpc.xmlhttp({
url : '../users/users_Ajax',
async : false,
method: 'POST',
args : 'function=usersGroup&GRP_UID=' + GRP_UID
});
oRPC.make();
div.innerHTML=oRPC.xmlhttp.responseText;
};
]]></js>
</dynaForm>