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

BUG 8875 "Feature: New ExtJS based Login & Main ProcessMaker inte..." SOLVED

Browse Source 
- windows on php ver. > 5.3.8 compatibility added
This commit is contained in:
Erik Amaru Ortiz
2012-04-11 11:16:04 -04:00
parent 943a2a7d98
commit bc79391223
3 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1008,7 +1008,7 @@ class System {
return $cities; return $cities;
} }
public function getSystemConfiguration($iniFile='') public static function getSystemConfiguration($iniFile='')
{ {
$config = array( $config = array(
'debug' => 0, 'debug' => 0,
@@ -1030,11 +1030,14 @@ class System {
/* Read the env.ini */ /* Read the env.ini */
$ini_contents = parse_ini_file($iniFile, false); $ini_contents = parse_ini_file($iniFile, false);
// validation debug config, ony accept bynary values, 1 to enable
$ini_contents['debug'] = $ini_contents['debug'] == 1 ? 1 : 0;
if ($ini_contents !== false) { if ($ini_contents !== false) {
$config = array_merge($config, $ini_contents); $config = array_merge($config, $ini_contents);
} }
//echo '<pre>'; print_r($config); die;
return $config; return $config;
} }

14
workflow/engine/templates/services/login_getStarted.html
View File

@@ -1,11 +1,6 @@
<html> <html>
<!-- #BeginTemplate "a_logo_izq_en.dwt" -->
<head> <head>
<script type='text/javascript' src='/js/maborak/core/maborak.js'></script> <script type='text/javascript' src='/js/maborak/core/maborak.js'></script>
<script type='text/javascript' src='/jsform/login/login.js'></script>
<script type='text/javascript' src='/jscore/labels/en.js'></script>
<script type='text/javascript' src='/js/widgets/js-calendar/unicode-letter.js'></script>
<script type='text/javascript' src='/js/widgets/js-calendar/lang/en.js'></script>
<script type='text/javascript'> <script type='text/javascript'>
var leimnud = new maborak(); var leimnud = new maborak();
leimnud.make({ leimnud.make({
@@ -21,11 +16,8 @@
} }
}catch(e){} }catch(e){}
</script> </script>
<!-- #BeginEditable "doctitle" -->
<title>Get Started</title>
<!-- #EndEditable -->
<style type="text/css"> <style type="text/css">
body,table { body,table {
FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-FAMILY: Arial, Helvetica, sans-serif;
@@ -50,7 +42,6 @@ span.cLow {
} }
</style> </style>
<meta http-equiv="Content-Language" content="en">
</head> </head>
<body> <body>
<table width="600" border="0" cellspacing="0" cellpadding="0"> <table width="600" border="0" cellspacing="0" cellpadding="0">
@@ -71,7 +62,6 @@ span.cLow {
</span></p> </span></p>
<p><span class="cLow">The ProcessMaker Team</span></p> <p><span class="cLow">The ProcessMaker Team</span></p>
<p><input type="checkbox" name="getStarted" id="getStarted" onclick="saveConfig();"><span class="cLow">Don't show me again</span></p> <p><input type="checkbox" name="getStarted" id="getStarted" onclick="saveConfig();"><span class="cLow">Don't show me again</span></p>
<!-- #EndEditable -->
</td> </td>
</tr> </tr>
</table> </table>

12
workflow/public_html/sysGeneric.php
View File

@@ -54,14 +54,16 @@
require_once $pathhome . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'class.system.php'; require_once $pathhome . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'class.system.php';
$config = System::getSystemConfiguration($pathhome . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'env.ini'); $config = System::getSystemConfiguration($pathhome . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'env.ini');
$e_all = defined('E_DEPRECATED') ? E_ALL ^ E_DEPRECATED : E_ALL;
$e_all = defined('E_DEPRECATED') ? E_ALL & ~E_DEPRECATED : E_ALL;
$e_all = defined('E_STRICT') ? E_ALL & ~E_STRICT : $e_all;
$e_all = $config['debug'] ? $e_all : $e_all & ~E_NOTICE;
// Do not change any of these settings directly, use env.ini instead // Do not change any of these settings directly, use env.ini instead
ini_set('display_errors','On'); ini_set('display_errors', $config['debug']);
ini_set('short_open_tag', 'on'); ini_set('error_reporting', $e_all);
ini_set('asp_tags', 'on'); ini_set('short_open_tag', 'On');
ini_set('default_charset', "UTF-8"); ini_set('default_charset', "UTF-8");
ini_set('error_reporting', ($config['debug'] ? $e_all : $e_all ^ E_NOTICE));
ini_set('memory_limit', $config['memory_limit']); ini_set('memory_limit', $config['memory_limit']);
ini_set('soap.wsdl_cache_enabled', $config['wsdl_cache']); ini_set('soap.wsdl_cache_enabled', $config['wsdl_cache']);