From bc793912234a3ae3c761ab95778229ef6a0a69ae Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Wed, 11 Apr 2012 11:16:04 -0400 Subject: [PATCH] BUG 8875 "Feature: New ExtJS based Login & Main ProcessMaker inte..." SOLVED - windows on php ver. > 5.3.8 compatibility added --- workflow/engine/classes/class.system.php | 7 +++++-- .../templates/services/login_getStarted.html | 14 ++------------ workflow/public_html/sysGeneric.php | 12 +++++++----- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/workflow/engine/classes/class.system.php b/workflow/engine/classes/class.system.php index d909f402e..22b30d1b6 100755 --- a/workflow/engine/classes/class.system.php +++ b/workflow/engine/classes/class.system.php @@ -1008,7 +1008,7 @@ class System { return $cities; } - public function getSystemConfiguration($iniFile='') + public static function getSystemConfiguration($iniFile='') { $config = array( 'debug' => 0, @@ -1030,11 +1030,14 @@ class System { /* Read the env.ini */ $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) { $config = array_merge($config, $ini_contents); } - //echo '
'; print_r($config); die;
+    
     return $config;
   }
 
diff --git a/workflow/engine/templates/services/login_getStarted.html b/workflow/engine/templates/services/login_getStarted.html
index babd8dd16..c2d8977bf 100755
--- a/workflow/engine/templates/services/login_getStarted.html
+++ b/workflow/engine/templates/services/login_getStarted.html
@@ -1,11 +1,6 @@
 
-
 
-	
-
-
-
-
+
 
+
 
-
-Get Started
-
 
-
 
 
 
@@ -71,7 +62,6 @@ span.cLow {
 	  
The ProcessMaker Team
Don't show me again

-

     
     
 	
 
 
 
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 72a3a4107..fb45c1f49 100755
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -54,14 +54,16 @@
 
   require_once $pathhome  . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'class.system.php';
   $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
-  ini_set('display_errors','On');
-  ini_set('short_open_tag', 'on');
-  ini_set('asp_tags', 'on');
+  ini_set('display_errors', $config['debug']);
+  ini_set('error_reporting', $e_all);
+  ini_set('short_open_tag', 'On');
   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('soap.wsdl_cache_enabled', $config['wsdl_cache']);