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

BUG 8021 2.0.35.rc6: No muestra toda la información en "System Information"

Browse Source 
This problems was fixed, we are hiding some fields if we've not chosen a workspace.
This commit is contained in:
Carlos Pacha
2011-11-22 10:45:11 -04:00
parent ff4ee1b33d
commit 366a68a550
3 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
workflow/engine/methods/login/sysLogin.php
View File

@@ -42,7 +42,7 @@ function getLangFiles() {
if (file_exists ( $dir )) { if (file_exists ( $dir )) {
if ($handle = opendir ( $dir )) { if ($handle = opendir ( $dir )) {
while ( false !== ($file = readdir ( $handle )) ) { while ( false !== ($file = readdir ( $handle )) ) {
$fileParts = explode ( ".", $file ); $fileParts = explode ( ".", $file );
if ($fileParts [0] == "translation") { if ($fileParts [0] == "translation") {
$filesArray [$fileParts [1]] = $file; $filesArray [$fileParts [1]] = $file;
@@ -128,11 +128,20 @@ G::RenderPage ( "publish" );
?> ?>
<script type="text/javascript"> <script type="text/javascript">
var oInfoPanel;
var openInfoPanel = function() var openInfoPanel = function()
{ {
// note added by carlos pacha carlos[at]colosa[dot]com pckrlos[at]gmail[dot]com
// the following lines of code are getting the hight of panel. Related 8021 bug
var hightpnl= 424;
var varjs = "<?= isset($_POST['form']['USER_ENV'])?$_POST['form']['USER_ENV']:''; ?>";
if(varjs !=' ')
hightpnl= 330;
var oInfoPanel = new leimnud.module.panel(); var oInfoPanel = new leimnud.module.panel();
oInfoPanel.options = { oInfoPanel.options = {
size :{w:500,h:424}, size :{w:500,h:hightpnl},
position:{x:0,y:0,center:true}, position:{x:0,y:0,center:true},
title :'System Information', title :'System Information',
theme :'processmaker', theme :'processmaker',
@@ -148,13 +157,22 @@ G::RenderPage ( "publish" );
backgroundColor: 'white' backgroundColor: 'white'
}}; }};
oInfoPanel.make(); oInfoPanel.make();
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : '../login/dbInfo', url : '../login/dbInfo',
async : false, //async : false,
method: 'POST', method: 'POST',
args : '' args : ''
}); });
oRPC.callback = function(oRPC) {
oInfoPanel.loader.hide();
var scs = oRPC.xmlhttp.responseText.extractScript();
oInfoPanel.addContent(oRPC.xmlhttp.responseText);
scs.evalScript();
}.extend(this);
oRPC.make(); oRPC.make();
oInfoPanel.addContent(oRPC.xmlhttp.responseText); oInfoPanel.addContent(oRPC.xmlhttp.responseText);
}; };
</script> </script>

10
workflow/engine/skinEngine/skinEngine.php
View File

@@ -107,9 +107,7 @@ if(isset($_GET['debug'])){
print "<b>layout submenu file:</b>"; G::pr($layoutFileSubmenu); print "<b>layout submenu file:</b>"; G::pr($layoutFileSubmenu);
} }
// note added by carlos pacha carlos[at]colosa[dot]com pckrlos[at]gmail[dot]com
// the following line has true or false value to see the System information text. Related 8021 bug
$toSeeMsg = (array_key_exists('_DBArray', $_SESSION) && array_key_exists('availableWorkspace', $_SESSION['_DBArray']))?true:false;
switch(strtolower($G_SKIN)){ switch(strtolower($G_SKIN)){
case "blank"://This is a special template but need main skin styles case "blank"://This is a special template but need main skin styles
G::verifyPath ( PATH_SMARTY_C, true ); G::verifyPath ( PATH_SMARTY_C, true );
@@ -171,7 +169,7 @@ if (isset($G_ENABLE_BLANK_SKIN) && $G_ENABLE_BLANK_SKIN) {
$footer = ''; $footer = '';
if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) { if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
if (DB_SYSTEM_INFORMATION == 1) { if (DB_SYSTEM_INFORMATION == 1) {
$footer =(!$toSeeMsg)?"<a href=\"#\" onclick=\"openInfoPanel();return false;\" class=\"FooterLink\">| System Information |</a><br />":''; $footer = "<a href=\"#\" onclick=\"openInfoPanel();return false;\" class=\"FooterLink\">| System Information |</a><br />";
} }
$freeOfChargeText = ""; $freeOfChargeText = "";
@@ -319,7 +317,7 @@ if (isset($G_ENABLE_BLANK_SKIN) && $G_ENABLE_BLANK_SKIN) {
$footer = ''; $footer = '';
if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) { if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
if ( defined('SYS_SYS') ) { if ( defined('SYS_SYS') ) {
$footer = (!$toSeeMsg)?"<a href=\"#\" onclick=\"openInfoPanel();return false;\" class=\"FooterLink\">| System Information |</a><br />":''; $footer = "<a href=\"#\" onclick=\"openInfoPanel();return false;\" class=\"FooterLink\">| System Information |</a><br />";
} }
$footer .= "<br />Copyright <20> 2003-2008 Colosa, Inc. All rights reserved."; $footer .= "<br />Copyright <20> 2003-2008 Colosa, Inc. All rights reserved.";
} }
@@ -408,7 +406,7 @@ if (isset($G_ENABLE_BLANK_SKIN) && $G_ENABLE_BLANK_SKIN) {
$footer = ''; $footer = '';
if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) { if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
if (DB_SYSTEM_INFORMATION == 1) { if (DB_SYSTEM_INFORMATION == 1) {
$footer =(!$toSeeMsg) ? "<a href=\"#\" onclick=\"openInfoPanel();return false;\" class=\"FooterLink\">| System Information |</a><br />":''; $footer = "<a href=\"#\" onclick=\"openInfoPanel();return false;\" class=\"FooterLink\">| System Information |</a><br />";
} }
$freeOfChargeText = ""; $freeOfChargeText = "";

49
workflow/engine/xmlform/login/dbInfo.xml
View File

@@ -1,45 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<dynaForm name="dbInfo" basedir="" width="450"> <dynaForm name="dbInfo" basedir="" width="450" enableTemplate="0" ajaxSubmit="0" >
<ENVIRONMENT type="hidden" />
<DYNA_HEADER type="title"> <DYNA_HEADER type="title">
<en>System Information</en> <en>System Information</en>
<es><![CDATA[Información del sistema]]></es></DYNA_HEADER> </DYNA_HEADER>
<FLUID type="caption" group="5"> <FLUID type="caption" group="5">
<en>ProcessMaker</en> <en>ProcessMaker</en>
<es>ProcessMaker</es></FLUID> </FLUID>
<SYSTEM type="caption"> <SYSTEM type="caption">
<en>Operating System</en> <en>Operating System</en>
<es>Sistema operativo</es></SYSTEM> </SYSTEM>
<TIME_ZONE type="caption"> <TIME_ZONE type="caption">
<en>Time zone</en> <en>Time zone</en>
</TIME_ZONE> </TIME_ZONE>
<SERVER_SOFTWARE type="caption"> <SERVER_SOFTWARE type="caption">
<en>Web Server</en> <en>Web Server</en>
<es>Servidor Web</es></SERVER_SOFTWARE> </SERVER_SOFTWARE>
<SERVER_NAME type="caption" group="4"> <SERVER_NAME type="caption" group="4">
<en>Server Name</en> <en>Server Name</en>
<es>Nombre del servidor</es></SERVER_NAME> </SERVER_NAME>
<SERVER_ADDR type="caption"> <SERVER_ADDR type="caption">
<en>Server IP Address</en> <en>Server IP Address</en>
<es>IP del servidor</es></SERVER_ADDR> </SERVER_ADDR>
<PHP type="caption"> <PHP type="caption">
<en>PHP version</en> <en>PHP version</en>
<es><![CDATA[Versión PHP]]></es></PHP> </PHP>
<DATABASE type="caption"> <DATABASE type="caption">
<en>Database</en> <en>Database</en>
<es>Base de Datos</es></DATABASE> </DATABASE>
<DATABASE_SERVER type="caption"> <DATABASE_SERVER type="caption">
<en>Database Server IP Address</en> <en>Database Server IP Address</en>
<es><![CDATA[Dirección IP de la Base de Datos]]></es></DATABASE_SERVER> </DATABASE_SERVER>
<DATABASE_NAME type="caption"> <DATABASE_NAME type="caption">
<en>Database Name</en> <en>Database Name</en>
<es>Nombre de la Base de Datos</es></DATABASE_NAME> </DATABASE_NAME>
<AVAILABLE_DB type="caption"> <AVAILABLE_DB type="caption">
<en>Available Databases</en> <en>Available Databases</en>
<es>Bases de datos disponibles</es></AVAILABLE_DB> </AVAILABLE_DB>
<HTTP_USER_AGENT type="caption"> <HTTP_USER_AGENT type="caption">
<en><![CDATA[User's Browser]]></en> <en><![CDATA[User's Browser]]></en>
<es>Navegador del usuario</es></HTTP_USER_AGENT> </HTTP_USER_AGENT>
<IP type="caption"> <IP type="caption">
<en><![CDATA[User's Ip Address]]></en> <en><![CDATA[User's Ip Address]]></en>
<es>IP del usuario</es></IP> </IP>
</dynaForm> <JS type="javascript"><![CDATA[
// note added by carlos pacha carlos[at]colosa[dot]com pckrlos[at]gmail[dot]com
// the following fields are hidden if we've not chosen a workspace. Related 8021 bug
//var dynaformOnload = function(){
if(getField('ENVIRONMENT').value=='Not defined'){
hideRowById('DATABASE')
hideRowById('DATABASE_SERVER');
hideRowById('DATABASE_NAME');
hideRowById('AVAILABLE_DB');
}
//};
]]></JS>
</dynaForm>