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

Merge branch '2.0-dev' of git.colosa.net:processmaker into 2.0-dev

Browse Source
This commit is contained in:
Carlos Pacha
2011-10-28 11:54:29 -04:00
parent fc9b5e7283 90d2433bb4
commit 31281756e1
10 changed files with 103 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/classes/class.propelTable.php
View File

@@ -396,12 +396,12 @@ class propelTable
if(is_object($value)){
$value = '';
}
// checking if the value variable is a html field, a html tag content can't contain   as white spaces
// checking if the value variable is a html field, a html tag content can't contain   as white spaces
$testValue = preg_match( "/<a ?.*>(.*)<\/a>/i", $htmlField, $value);
$this->tpl->assign( "value" , $htmlField );
if ($testValue>0 && (isset($value[1]) && strlen(trim($value[1])) == 0 )) {
$this->tpl->assign( "value" , "&nbsp;" );
$this->tpl->assign( "value" , $htmlField );
if ($testValue>0 && (isset($value[1]) && strlen(trim($value[1])) == 0 )) {
if ((trim($value[0])) == '')
$this->tpl->assign( "value" , "&nbsp;" );
// $this->tpl->assign( "value" , (preg_match('^[[:space:]]^', $value) && (substr($fieldName,0,3)!="PRO"))? str_ireplace(" ","&nbsp;",$htmlField):$htmlField );
} else {
$this->tpl->assign( "value" , $htmlField );

7
workflow/engine/classes/model/Language.php
View File

@@ -232,6 +232,13 @@ class Language extends BaseLanguage {
$errorMsg .= 'file doesn\'t exist: ' . PATH_XMLFORM . $xmlForm . "\n";
continue;
}
if (count($match) < 4) {
$near = isset($rowTranslation['msgid']) ? $rowTranslation['msgid'] :
(isset($rowTranslation['msgstr']) ? $rowTranslation['msgstr'] : '');
$errorMsg .= "Invalid Translation reference: \"$reference\", near -> ".$near."\n";
continue;
}
G::LoadSystem('dynaformhandler');
$dynaform = new dynaFormHandler(PATH_XMLFORM . $xmlForm);

22
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: ProcessMaker (Branch 2.0) 2.0.34.rc3-5-g1db9c66\n"
"Project-Id-Version: ProcessMaker (Branch 2.0) 2.0.34.rc6-4-gfd7334a\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2011-10-14 12:41:07\n"
"PO-Revision-Date: 2011-10-26 09:47:45\n"
"Last-Translator: \n"
"Language-Team: Colosa Developers Team <developers@colosa.com>\n"
"MIME-Version: 1.0\n"
@@ -11251,6 +11251,24 @@ msgstr "Add new note"
msgid "Invalid process name, please just use alphanumeric characters."
msgstr "Invalid process name, please just use alphanumeric characters."
# TRANSLATION
# LABEL/ID_INVALID_PROCESS_NAME2
#: LABEL/ID_INVALID_PROCESS_NAME2
msgid "[LABEL/ID_INVALID_PROCESS_NAME2] Invalid process name, please just use alphanumeric characters."
msgstr "Invalid process name, please just use alphanumeric characters."
# TRANSLATION
# LABEL/ID_HIDE_PROCESS_INF
#: LABEL/ID_HIDE_PROCESS_INF
msgid "Hide Process Information"
msgstr "Hide Process Information"
# TRANSLATION
# LABEL/ID_NEW_CASE_PANEL
#: LABEL/ID_NEW_CASE_PANEL
msgid "New Case Panel"
msgstr "New Case Panel"
# additionalTables/additionalTablesData.xml?ADD_TAB_NAME
# additionalTables/additionalTablesData.xml
#: text - ADD_TAB_NAME

4
workflow/engine/data/mssql/insert.sql
View File

@@ -5168,6 +5168,10 @@ SELECT 'LABEL','ID_CASES_NOTES_ADD','en','Add new note','2011-10-03'
SELECT 'LABEL','ID_INVALID_PROCESS_NAME','en','Invalid process name, please just use alphanumeric characters.','2011-10-14'
UNION ALL
SELECT 'LABEL','ID_INVALID_PROCESS_NAME2','en','Invalid process name, please just use alphanumeric characters.','2011-10-14'
UNION ALL
SELECT 'LABEL','ID_HIDE_PROCESS_INF','en','Hide Process Information','2011-10-19'
UNION ALL
SELECT 'LABEL','ID_NEW_CASE_PANEL','en','New Case Panel','2011-10-19'
;
INSERT INTO ISO_LOCATION ([IC_UID],[IL_UID],[IL_NAME],[IL_NORMAL_NAME],[IS_UID])

4
workflow/engine/data/mysql/insert.sql
View File

@@ -3294,7 +3294,9 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CASES_NOTES_CANCEL','en','Cancel this note','2011-10-03') ,
( 'LABEL','ID_CASES_NOTES_ADD','en','Add new note','2011-10-03') ,
( 'LABEL','ID_INVALID_PROCESS_NAME','en','Invalid process name, please just use alphanumeric characters.','2011-10-14') ,
( 'LABEL','ID_INVALID_PROCESS_NAME2','en','Invalid process name, please just use alphanumeric characters.','2011-10-14') ;
( 'LABEL','ID_INVALID_PROCESS_NAME2','en','Invalid process name, please just use alphanumeric characters.','2011-10-14') ,
( 'LABEL','ID_HIDE_PROCESS_INF','en','Hide Process Information','2011-10-19') ,
( 'LABEL','ID_NEW_CASE_PANEL','en','New Case Panel','2011-10-19') ;
INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('AD','','',' ','') ,

7
workflow/engine/xmlform/login/login.xml
View File

@@ -19,17 +19,16 @@
<en>Login</en>
</BSUBMIT>
<FORGOT_PASWORD_LINK type="link" link="forgotPassword" onclick="" colAlign="right" colWidth="135">
<FORGOT_PASWORD_LINK type="link" link="forgotPassword" onclick="" colAlign="right" colWidth="135" style="display:none;">
<en>Forgot Password</en>
</FORGOT_PASWORD_LINK>
<JS type="javascript"><![CDATA[
// enable/disable forgot password link
if(flagForgotPassword != 'on' )
hideRowById('FORGOT_PASWORD_LINK');
if(flagForgotPassword == 'on' )
document.getElementById("form[FORGOT_PASWORD_LINK]").style.display = 'block';//hideRowById('FORGOT_PASWORD_LINK');
var panel;

54
workflow/public_html/sysGeneric.php
View File

@@ -18,7 +18,7 @@ $startingTime = array_sum(explode(' ',microtime()));
$vVar = stripslashes($vVar);
}
}
if (ini_get('magic_quotes_gpc') == '1') {
strip_slashes($_POST);
}
@@ -30,7 +30,7 @@ $startingTime = array_sum(explode(' ',microtime()));
$endTime = array_sum(explode(' ',microtime()));
$time = $endTime - $startingTime;
$fpt= fopen ( PATH_DATA . 'log/time.log', 'a' );
fwrite( $fpt, sprintf ( "%s.%03d %15s %s %5.3f %s\n", date('H:i:s'), $time, getenv('REMOTE_ADDR'), substr($serverAddr,-4), $time, $_SERVER['REQUEST_URI'] ));
fwrite( $fpt, sprintf ( "%s.%03d %15s %s %5.3f %s\n", date('Y-m-d H:i:s'), $time, getenv('REMOTE_ADDR'), substr($serverAddr,-4), $time, $_SERVER['REQUEST_URI'] ));
fclose( $fpt);
}
@@ -128,8 +128,8 @@ $startingTime = array_sum(explode(' ',microtime()));
$virtualURITable['/[a-zA-Z][a-zA-Z0-9]{0,}()'] = 'sysUnnamed';
$virtualURITable['/(*)'] = PATH_HTML;
//****** verify if we need to redirect or stream the file, if G:VirtualURI returns true means we are going to redirect the page *****
if ( G::virtualURI($_SERVER['REQUEST_URI'], $virtualURITable , $realPath )) {
@@ -164,12 +164,12 @@ $startingTime = array_sum(explode(' ',microtime()));
}
die;
}
$requestUriArray=explode("/",$_SERVER['REQUEST_URI']);
if((isset($requestUriArray[1]))&&($requestUriArray[1]=='skin')) {
/*
* By JHL Feb 28, 11
@@ -187,17 +187,17 @@ $startingTime = array_sum(explode(' ',microtime()));
//Get that path in array
$paths = explode ( PATH_SEP, $forQuery[0] );
$fileToBeStreamed=str_replace("/skin/",PATH_CUSTOM_SKINS,$_SERVER['REQUEST_URI']);
if ( file_exists ( $fileToBeStreamed ) ) {
G::streamFile ( $fileToBeStreamed );
}
die;
}
switch ( $realPath ) {
case 'sysUnnamed' :
require_once('sysUnnamed.php'); die;
@@ -226,7 +226,7 @@ $startingTime = array_sum(explode(' ',microtime()));
}
//************** the request correspond to valid php page, now parse the URI **************
G::parseURI ( getenv( "REQUEST_URI" ) );
$oHeadPublisher->addMaborakFile( PATH_GULLIVER_HOME . 'js' . PATH_SEP . "widgets/jscalendar/lang/calendar-" . SYS_LANG . ".js");
define( 'SYS_URI' , '/sys' . SYS_TEMP . '/' . SYS_LANG . '/' . SYS_SKIN . '/' );
@@ -295,8 +295,8 @@ $startingTime = array_sum(explode(' ',microtime()));
if ( file_exists( PATH_DB . SYS_TEMP . '/db.php' ) ) {
require_once( PATH_DB . SYS_TEMP . '/db.php' );
define ( 'SYS_SYS' , SYS_TEMP );
// defining constant for workspace shared directory
// defining constant for workspace shared directory
define ( 'PATH_WORKSPACE' , PATH_DB . SYS_SYS . PATH_SEP );
// including workspace shared classes -> particularlly for pmTables
set_include_path(get_include_path() . PATH_SEPARATOR . PATH_WORKSPACE);
@@ -434,10 +434,10 @@ $startingTime = array_sum(explode(' ',microtime()));
//********* Setup plugins *************
$oPluginRegistry->setupPlugins(); //get and setup enabled plugins
$avoidChangedWorkspaceValidation = false;
//Load custom Classes and Model from Plugins.
G::LoadAllPluginModelClasses();
//*********jump to php file in methods directory *************
$collectionPlugin = '';
if ( $oPluginRegistry->isRegisteredFolder( SYS_COLLECTION ) ) {
@@ -467,8 +467,8 @@ $startingTime = array_sum(explode(' ',microtime()));
$phpFile = str_replace ( '.php', 'index.php', $phpFile );
$phpFile = include ( $phpFile );
}*/
$bWE = false;
$isControllerCall = false;
$bWE = false;
$isControllerCall = false;
if ( substr(SYS_COLLECTION , 0,8) === 'gulliver' ) {
$phpFile = PATH_GULLIVER_HOME . 'methods/' . substr( SYS_COLLECTION , 8) . SYS_TARGET.'.php';
}
@@ -493,7 +493,7 @@ $startingTime = array_sum(explode(' ',microtime()));
$bWE = true;
//$phpFile = PATH_DATA_SITE . 'public' . PATH_SEP . SYS_COLLECTION . PATH_SEP . $auxPart[ count($auxPart)-1];
}
//erik: verify if it is a Controller Class or httpProxyController Class
if( is_file(PATH_CONTROLLERS . SYS_COLLECTION . '.php') ) {
require_once PATH_CONTROLLERS . SYS_COLLECTION . '.php';
@@ -505,7 +505,7 @@ $startingTime = array_sum(explode(' ',microtime()));
$isControllerCall = true;
}
}
if ( ! $isControllerCall && ! file_exists( $phpFile ) ) {
$_SESSION['phpFileNotFound'] = $_SERVER['REQUEST_URI'];
print $phpFile;
@@ -513,7 +513,7 @@ $startingTime = array_sum(explode(' ',microtime()));
die;
}
}
//redirect to login, if user changed the workspace in the URL
if( ! $avoidChangedWorkspaceValidation && isset( $_SESSION['WORKSPACE'] ) && $_SESSION['WORKSPACE'] != SYS_SYS) {
$_SESSION['WORKSPACE'] = SYS_SYS;
@@ -536,7 +536,7 @@ $startingTime = array_sum(explode(' ',microtime()));
//get the language direction from ServerConf
define('SYS_LANG_DIRECTION', $oServerConf->getLanDirection() );
if((isset( $_SESSION['USER_LOGGED'] ))&&(!(isset($_GET['sid'])))) {
$RBAC->initRBAC();
$RBAC->loadUserRolePermission( $RBAC->sSystem, $_SESSION['USER_LOGGED'] , PATH_DATA, session_id());
@@ -581,7 +581,7 @@ $startingTime = array_sum(explode(' ',microtime()));
}
}
$_SESSION['phpLastFileFound'] = $_SERVER['REQUEST_URI'];
/***
* New feature for Gulliver framework to support Controllers & HttpProxyController classes handling
*
@@ -593,7 +593,7 @@ $startingTime = array_sum(explode(' ',microtime()));
$controller->call($controllerAction);
} else
require_once( $phpFile );
if ( defined('SKIP_HEADERS') ) {
header("Expires: " . gmdate("D, d M Y H:i:s", mktime( 0,0,0,date('m'),date('d'),date('Y') + 1) ) . " GMT");
header('Cache-Control: public');