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

PM-3474

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2015-09-25 19:55:26 -04:00
parent e93d5edbce
commit 8f740ed72a
10 changed files with 227 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1150,7 +1150,13 @@ class Bootstrap
$xmlConfiguration = file_get_contents($configurationFile); $xmlConfiguration = file_get_contents($configurationFile);
$xmlConfigurationObj = Bootstrap::xmlParser($xmlConfiguration); $xmlConfigurationObj = Bootstrap::xmlParser($xmlConfiguration);
if (!isset($xmlConfigurationObj->result['skinConfiguration']['__CONTENT__']['cssFiles']['__CONTENT__'][$skinVariant]['__CONTENT__'])) {
$xmlConfigurationObj->result['skinConfiguration']['__CONTENT__']['cssFiles']['__CONTENT__'][$skinVariant]['__CONTENT__'] = array('cssFile' => array());
}
$skinFilesArray = $xmlConfigurationObj->result['skinConfiguration']['__CONTENT__']['cssFiles']['__CONTENT__'][$skinVariant]['__CONTENT__']['cssFile']; $skinFilesArray = $xmlConfigurationObj->result['skinConfiguration']['__CONTENT__']['cssFiles']['__CONTENT__'][$skinVariant]['__CONTENT__']['cssFile'];
if (isset($skinFilesArray['__ATTRIBUTES__'])) {
$skinFilesArray = array($skinFilesArray);
}
foreach ($skinFilesArray as $keyFile => $cssFileInfo) { foreach ($skinFilesArray as $keyFile => $cssFileInfo) {
$enabledBrowsers = explode(",", $cssFileInfo['__ATTRIBUTES__']['enabledBrowsers']); $enabledBrowsers = explode(",", $cssFileInfo['__ATTRIBUTES__']['enabledBrowsers']);
$disabledBrowsers = explode(",", $cssFileInfo['__ATTRIBUTES__']['disabledBrowsers']); $disabledBrowsers = explode(",", $cssFileInfo['__ATTRIBUTES__']['disabledBrowsers']);

268
workflow/engine/classes/class.pmDynaform.php
View File

@@ -139,35 +139,13 @@ class pmDynaform
} }
} }
} }
//query & options //options & query
if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "dropdown" || $value === "suggest" || $value === "checkbox" || $value === "checkgroup" || $value === "radio" || $value === "datetime" || $value === "hidden")) { if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "hidden" || $value === "dropdown" || $value === "checkgroup" || $value === "radio" || $value === "suggest" )) {
if (!isset($json->data)) {
$json->data = array(
"value" => "",
"label" => ""
);
}
if (!isset($json->dbConnection)) if (!isset($json->dbConnection))
$json->dbConnection = "none"; $json->dbConnection = "none";
if (!isset($json->sql)) if (!isset($json->sql))
$json->sql = ""; $json->sql = "";
if (!isset($json->options))
$json->options = array();
if (!isset($json->optionsSql))
$json->optionsSql = array(); $json->optionsSql = array();
else {
//convert stdClass to array
if (is_array($json->options)) {
$option = array();
foreach ($json->options as $valueOptions) {
array_push($option, array(
"value" => $valueOptions->value,
"label" => isset($valueOptions->label) ? $valueOptions->label : ""
));
}
$json->options = $option;
}
}
if ($json->dbConnection !== "" && $json->dbConnection !== "none" && $json->sql !== "") { if ($json->dbConnection !== "" && $json->dbConnection !== "none" && $json->sql !== "") {
$cnn = Propel::getConnection($json->dbConnection); $cnn = Propel::getConnection($json->dbConnection);
$stmt = $cnn->createStatement(); $stmt = $cnn->createStatement();
@@ -175,68 +153,151 @@ class pmDynaform
$rs = $stmt->executeQuery(G::replaceDataField($json->sql, array()), \ResultSet::FETCHMODE_NUM); $rs = $stmt->executeQuery(G::replaceDataField($json->sql, array()), \ResultSet::FETCHMODE_NUM);
while ($rs->next()) { while ($rs->next()) {
$row = $rs->getRow(); $row = $rs->getRow();
$option = array( $option = new stdClass();
"label" => isset($row[1]) ? $row[1] : $row[0], $option->value = $row[0];
"value" => $row[0] $option->label = isset($row[1]) ? $row[1] : $row[0];
);
array_push($json->optionsSql, $option); array_push($json->optionsSql, $option);
} }
} catch (Exception $e) { } catch (Exception $e) {
} }
} }
if (isset($json->options[0])) {
$json->data = $json->options[0];
$no = count($json->options);
for ($io = 0; $io < $no; $io++) {
if ((is_array($json->options[$io]) ? $json->options[$io]["value"] : $json->options[$io]->value) === $json->defaultValue) {
$json->data = $json->options[$io];
}
}
}
} }
//data //data
if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "suggest" || $value === "dropdown" || $value === "radio" || $value === "datetime" || $value === "hidden")) { if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "hidden")) {
$json->data = array( $json->data = new stdClass();
"value" => isset($this->fields["APP_DATA"][$json->name]) ? $this->fields["APP_DATA"][$json->name] : (is_array($json->data) ? $json->data["value"] : $json->data->value), $json->data->value = "";
"label" => isset($this->fields["APP_DATA"][$json->name . "_label"]) ? $this->fields["APP_DATA"][$json->name . "_label"] : (is_array($json->data) ? $json->data["label"] : $json->data->label) $json->data->label = "";
); if (isset($json->optionsSql[0])) {
if ($json->data["label"] === "") { $json->data->value = $json->optionsSql[0]->value;
$json->data["label"] = $json->data["value"]; $json->data->label = $json->optionsSql[0]->value;
} }
//synchronize var_label if ($json->defaultValue !== "") {
if (isset($this->fields["APP_DATA"]["__VAR_CHANGED__"]) && $json->data->value = $json->defaultValue;
in_array($json->name, explode(",", $this->fields["APP_DATA"]["__VAR_CHANGED__"]))) { $json->data->label = $json->defaultValue;
$json->data["label"] = $json->data["value"]; }
foreach ($json->options as $io) { if (isset($this->fields["APP_DATA"][$json->name])) {
if ($json->data["value"] === $io->value) { $json->data->value = $this->fields["APP_DATA"][$json->name];
$json->data["label"] = $io->label; $json->data->label = $this->fields["APP_DATA"][$json->name];
} }
} }
foreach ($json->optionsSql as $io) { if ($key === "type" && ($value === "dropdown")) {
if ($json->data["value"] === $io["value"]) { $json->data = new stdClass();
$json->data["label"] = $io["label"]; $json->data->value = "";
$json->data->label = "";
if ($json->defaultValue !== "") {
foreach ($json->optionsSql as $os) {
if ($os->value === $json->defaultValue) {
$json->data->value = $os->value;
$json->data->label = $os->label;
} }
} }
$_SESSION["TRIGGER_DEBUG"]["DATA"][] = Array( foreach ($json->options as $os) {
"key" => $json->name . "_label", if ($os->value === $json->defaultValue) {
"value" => $json->data["label"] $json->data->value = $os->value;
); $json->data->label = $os->label;
} }
} }
if ($key === "type" && ($value === "checkbox" || $value === "checkgroup")) { }
$json->data = array( if (isset($this->fields["APP_DATA"][$json->name])) {
"value" => isset($this->fields["APP_DATA"][$json->name]) ? $this->fields["APP_DATA"][$json->name] : array(), $json->data->value = $this->fields["APP_DATA"][$json->name];
"label" => isset($this->fields["APP_DATA"][$json->name . "_label"]) ? $this->fields["APP_DATA"][$json->name . "_label"] : "[]" $json->data->label = $this->fields["APP_DATA"][$json->name . "_label"];
); }
//synchronize var_label }
if (isset($this->fields["APP_DATA"]["__VAR_CHANGED__"]) && if ($key === "type" && ($value === "suggest")) {
in_array($json->name, explode(",", $this->fields["APP_DATA"]["__VAR_CHANGED__"]))) { $json->data = new stdClass();
$json->data["label"] = G::json_encode($json->data["value"]); $json->data->value = "";
$_SESSION["TRIGGER_DEBUG"]["DATA"][] = Array( $json->data->label = "";
"key" => $json->name . "_label", if ($json->defaultValue !== "") {
"value" => $json->data["label"] $json->data->value = $json->defaultValue;
); $json->data->label = $json->defaultValue;
foreach ($json->optionsSql as $os) {
if ($os->value === $json->defaultValue) {
$json->data->value = $os->value;
$json->data->label = $os->label;
}
}
foreach ($json->options as $os) {
if ($os->value === $json->defaultValue) {
$json->data->value = $os->value;
$json->data->label = $os->label;
}
}
}
if (isset($this->fields["APP_DATA"][$json->name])) {
$json->data->value = $this->fields["APP_DATA"][$json->name];
$json->data->label = $this->fields["APP_DATA"][$json->name . "_label"];
}
}
if ($key === "type" && ($value === "radio")) {
$json->data = new stdClass();
$json->data->value = "";
$json->data->label = "";
if ($json->defaultValue !== "") {
foreach ($json->optionsSql as $os) {
if ($os->value === $json->defaultValue) {
$json->data->value = $os->value;
$json->data->label = $os->label;
}
}
foreach ($json->options as $os) {
if ($os->value === $json->defaultValue) {
$json->data->value = $os->value;
$json->data->label = $os->label;
}
}
}
if (isset($this->fields["APP_DATA"][$json->name])) {
$json->data->value = $this->fields["APP_DATA"][$json->name];
$json->data->label = $this->fields["APP_DATA"][$json->name . "_label"];
}
}
if ($key === "type" && ($value === "checkbox")) {
$json->data = new stdClass();
$json->data->value = "";
$json->data->label = "";
if (isset($this->fields["APP_DATA"][$json->name])) {
$json->data->value = $this->fields["APP_DATA"][$json->name];
$json->data->label = $this->fields["APP_DATA"][$json->name];
}
}
if ($key === "type" && ($value === "checkgroup")) {
$json->data = new stdClass();
$json->data->value = "";
$json->data->label = "[]";
if ($json->defaultValue !== "") {
$dataValue = array();
$dataLabel = array();
$dv = explode("|", $json->defaultValue);
foreach ($dv as $idv) {
foreach ($json->optionsSql as $os) {
if ($os->value === trim($idv)) {
array_push($dataValue, $os->value);
array_push($dataLabel, $os->label);
}
}
foreach ($json->options as $os) {
if ($os->value === trim($idv)) {
array_push($dataValue, $os->value);
array_push($dataLabel, $os->label);
}
}
}
$json->data->value = $dataValue;
$json->data->label = G::json_encode($dataLabel);
}
if (isset($this->fields["APP_DATA"][$json->name])) {
$json->data->value = $this->fields["APP_DATA"][$json->name];
$json->data->label = $this->fields["APP_DATA"][$json->name . "_label"];
}
}
if ($key === "type" && ($value === "datetime")) {
$json->data = new stdClass();
$json->data->value = "";
$json->data->label = "";
if (isset($this->fields["APP_DATA"][$json->name])) {
$json->data->value = $this->fields["APP_DATA"][$json->name];
$json->data->label = $this->fields["APP_DATA"][$json->name . "_label"];
} }
} }
if ($key === "type" && ($value === "file") && isset($this->fields["APP_DATA"]["APPLICATION"])) { if ($key === "type" && ($value === "file") && isset($this->fields["APP_DATA"]["APPLICATION"])) {
@@ -252,10 +313,55 @@ class pmDynaform
$row = $rs->getRow(); $row = $rs->getRow();
array_push($links, "../cases/cases_ShowDocument?a=" . $row["APP_DOC_UID"] . "&v=" . $row["DOC_VERSION"]); array_push($links, "../cases/cases_ShowDocument?a=" . $row["APP_DOC_UID"] . "&v=" . $row["DOC_VERSION"]);
} }
$json->data = array( $json->data = new stdClass();
"value" => $links, $json->data->value = $links;
"label" => isset($this->fields["APP_DATA"][$json->name . "_label"]) ? $this->fields["APP_DATA"][$json->name . "_label"] : "[]" $json->data->label = isset($this->fields["APP_DATA"][$json->name . "_label"]) ? $this->fields["APP_DATA"][$json->name . "_label"] : "[]";
); }
//synchronize var_label
if ($key === "type" && ($value === "dropdown" || $value === "suggest")) {
if (isset($this->fields["APP_DATA"]["__VAR_CHANGED__"]) && in_array($json->name, explode(",", $this->fields["APP_DATA"]["__VAR_CHANGED__"]))) {
foreach ($json->optionsSql as $io) {
if ($json->data->value === $io->value) {
$json->data->label = $io->label;
}
}
foreach ($json->options as $io) {
if ($json->data->value === $io->value) {
$json->data->label = $io->label;
}
}
$_SESSION["TRIGGER_DEBUG"]["DATA"][] = Array("key" => $json->name . "_label", "value" => $json->data->label);
}
}
if ($key === "type" && ($value === "checkgroup")) {
if (isset($this->fields["APP_DATA"]["__VAR_CHANGED__"]) && in_array($json->name, explode(",", $this->fields["APP_DATA"]["__VAR_CHANGED__"]))) {
$dataValue = array();
$dataLabel = array();
$dv = $this->fields["APP_DATA"][$json->name];
foreach ($dv as $idv) {
foreach ($json->optionsSql as $os) {
if ($os->value === $idv) {
array_push($dataValue, $os->value);
array_push($dataLabel, $os->label);
}
}
foreach ($json->options as $os) {
if ($os->value === $idv) {
array_push($dataValue, $os->value);
array_push($dataLabel, $os->label);
}
}
}
$json->data->value = $dataValue;
$json->data->label = G::json_encode($dataLabel);
$_SESSION["TRIGGER_DEBUG"]["DATA"][] = Array("key" => $json->name . "_label", "value" => $json->data->label);
}
}
if ($key === "type" && ($value === "datetime")) {
if (isset($this->fields["APP_DATA"]["__VAR_CHANGED__"]) && in_array($json->name, explode(",", $this->fields["APP_DATA"]["__VAR_CHANGED__"]))) {
$json->data->label = $json->data->value;
$_SESSION["TRIGGER_DEBUG"]["DATA"][] = Array("key" => $json->name . "_label", "value" => $json->data->label);
}
} }
//grid //grid
if ($key === "type" && ($value === "grid")) { if ($key === "type" && ($value === "grid")) {
@@ -378,7 +484,7 @@ class pmDynaform
$file = file_get_contents(PATH_HOME . "public_html" . PATH_SEP . "lib" . PATH_SEP . "pmdynaform" . PATH_SEP . "build" . PATH_SEP . "pmdynaform.html"); $file = file_get_contents(PATH_HOME . "public_html" . PATH_SEP . "lib" . PATH_SEP . "pmdynaform" . PATH_SEP . "build" . PATH_SEP . "pmdynaform.html");
$file = str_replace("{javascript}", $javascript, $file); $file = str_replace("{javascript}", $javascript, $file);
$file = str_replace("{sys_skin}", SYS_SKIN, $file);
echo $file; echo $file;
exit(0); exit(0);
} }
@@ -424,6 +530,7 @@ class pmDynaform
$file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html'); $file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html');
$file = str_replace("{javascript}", $javascrip, $file); $file = str_replace("{javascript}", $javascrip, $file);
$file = str_replace("{sys_skin}", SYS_SKIN, $file);
echo $file; echo $file;
exit(); exit();
} }
@@ -471,6 +578,7 @@ class pmDynaform
"</div>"; "</div>";
$file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html'); $file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html');
$file = str_replace("{javascript}", $javascrip, $file); $file = str_replace("{javascript}", $javascrip, $file);
$file = str_replace("{sys_skin}", SYS_SKIN, $file);
echo $file; echo $file;
exit(); exit();
} }
@@ -519,7 +627,7 @@ class pmDynaform
$file = file_get_contents(PATH_HOME . "public_html" . PATH_SEP . "lib" . PATH_SEP . "pmdynaform" . PATH_SEP . "build" . PATH_SEP . "pmdynaform.html"); $file = file_get_contents(PATH_HOME . "public_html" . PATH_SEP . "lib" . PATH_SEP . "pmdynaform" . PATH_SEP . "build" . PATH_SEP . "pmdynaform.html");
$file = str_replace("{javascript}", $javascrip, $file); $file = str_replace("{javascript}", $javascrip, $file);
$file = str_replace("{sys_skin}", SYS_SKIN, $file);
echo $file; echo $file;
exit(0); exit(0);
} }
@@ -554,6 +662,7 @@ class pmDynaform
$file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html'); $file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html');
$file = str_replace("{javascript}", $javascrip, $file); $file = str_replace("{javascript}", $javascrip, $file);
$file = str_replace("{sys_skin}", SYS_SKIN, $file);
echo $file; echo $file;
exit(); exit();
} }
@@ -587,6 +696,7 @@ class pmDynaform
$file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html'); $file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html');
$file = str_replace("{javascript}", $javascrip, $file); $file = str_replace("{javascript}", $javascrip, $file);
$file = str_replace("{sys_skin}", SYS_SKIN, $file);
echo $file; echo $file;
exit(); exit();
} }
@@ -603,7 +713,7 @@ class pmDynaform
$file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html'); $file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html');
$file = str_replace("{javascript}", $javascrip, $file); $file = str_replace("{javascript}", $javascrip, $file);
$file = str_replace("{sys_skin}", SYS_SKIN, $file);
echo $file; echo $file;
exit(); exit();
} }
@@ -633,6 +743,7 @@ class pmDynaform
"</div>"; "</div>";
$file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html'); $file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html');
$file = str_replace("{javascript}", $javascrip, $file); $file = str_replace("{javascript}", $javascrip, $file);
$file = str_replace("{sys_skin}", SYS_SKIN, $file);
return $file; return $file;
} }
@@ -1016,4 +1127,3 @@ class pmDynaform
} }
} }

2
workflow/engine/controllers/designer.php
View File

@@ -126,6 +126,8 @@ class Designer extends Controller
$translation->generateFileTranslationMafe(); $translation->generateFileTranslationMafe();
} }
$this->setVar('sys_skin', SYS_SKIN);
$this->setView('designer/index'); $this->setView('designer/index');
$this->render(); $this->render();
} }

4
workflow/engine/methods/login/authentication.php
View File

@@ -319,7 +319,9 @@ try {
} }
$aFields['DESCRIPTION'] .= '<br />' . G::LoadTranslation('ID_PLEASE_CHANGE_PASSWORD_POLICY') . '<br /><br /></span>'; $aFields['DESCRIPTION'] .= '<br />' . G::LoadTranslation('ID_PLEASE_CHANGE_PASSWORD_POLICY') . '<br /><br /></span>';
$G_PUBLISH = new Publisher; $G_PUBLISH = new Publisher;
if(SYS_SKIN == 'neoclassic'){ $version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
$version = isset($version[0]) ? intval($version[0]) : 0;
if ($version >= 3) {
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/changePasswordpm3', '', $aFields, 'changePassword'); $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/changePasswordpm3', '', $aFields, 'changePassword');
}else{ }else{
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/changePassword', '', $aFields, 'changePassword'); $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/changePassword', '', $aFields, 'changePassword');

4
workflow/engine/methods/login/forgotPassword.php
View File

@@ -23,7 +23,9 @@
* *
*/ */
$G_PUBLISH = new Publisher (); $G_PUBLISH = new Publisher ();
if(SYS_SKIN == 'neoclassic'){ $version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
$version = isset($version[0]) ? intval($version[0]) : 0;
if ($version >= 3) {
$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPasswordpm3', '', array(), 'retrivePassword.php'); $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPasswordpm3', '', array(), 'retrivePassword.php');
}else{ }else{
$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPassword', '', array(), 'retrivePassword.php'); $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPassword', '', array(), 'retrivePassword.php');

8
workflow/engine/methods/login/login.php
View File

@@ -171,7 +171,9 @@ if (!class_exists('pmLicenseManager')) {
$licenseManager =& pmLicenseManager::getSingleton(); $licenseManager =& pmLicenseManager::getSingleton();
if (in_array(G::encryptOld($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) { if (in_array(G::encryptOld($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) {
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
if(SYS_SKIN == 'neoclassic'){ $version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
$version = isset($version[0]) ? intval($version[0]) : 0;
if ($version >= 3) {
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpiredpm3', '', array(), 'licenseUpdate'); $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpiredpm3', '', array(), 'licenseUpdate');
}else{ }else{
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpired', '', array(), 'licenseUpdate'); $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpired', '', array(), 'licenseUpdate');
@@ -219,7 +221,9 @@ if (isset($oConf->aConfig["login_defaultLanguage"]) && $oConf->aConfig["login_de
} }
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
if(SYS_SKIN == 'neoclassic'){ $version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
$version = isset($version[0]) ? intval($version[0]) : 0;
if ($version >= 3) {
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/loginpm3', '', $aFields, SYS_URI . 'login/authentication.php'); $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/loginpm3', '', $aFields, SYS_URI . 'login/authentication.php');
}else{ }else{
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI . 'login/authentication.php'); $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI . 'login/authentication.php');

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

@@ -155,26 +155,20 @@ if (!defined('WS_IN_LOGIN')) {
define('WS_IN_LOGIN', 'serverconf'); define('WS_IN_LOGIN', 'serverconf');
} }
$fileLogin = 'login/sysLogin'; $fileLogin = 'login/sysLogin';
$version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
$version = isset($version[0]) ? intval($version[0]) : 0;
switch (WS_IN_LOGIN) { switch (WS_IN_LOGIN) {
case 'serverconf': case 'serverconf':
//Get Server Configuration //Get Server Configuration
$oServerConf = & serverConf::getSingleton (); $oServerConf = & serverConf::getSingleton ();
if ($oServerConf->getProperty ('LOGIN_NO_WS')) { if ($oServerConf->getProperty ('LOGIN_NO_WS')) {
if(SYS_SKIN == 'neoclassic'){ $fileLogin = $version >= 3 ? 'login/sysLoginNoWSpm3' : 'login/sysLoginNoWS';
$fileLogin = 'login/sysLoginNoWSpm3';
}else{
$fileLogin = 'login/sysLoginNoWS';
}
} else { } else {
$fileLogin = 'login/sysLogin'; $fileLogin = 'login/sysLogin';
} }
break; break;
case 'no': case 'no':
if(SYS_SKIN == 'neoclassic'){ $fileLogin = $version >= 3 ? 'login/sysLoginNoWSpm3' : 'login/sysLoginNoWS';
$fileLogin = 'login/sysLoginNoWSpm3';
}else{
$fileLogin = 'login/sysLoginNoWS';
}
break; break;
case 'yes': case 'yes':
$fileLogin = 'login/sysLogin'; $fileLogin = 'login/sysLogin';
@@ -183,6 +177,6 @@ switch (WS_IN_LOGIN) {
$fileLogin = 'login/sysLogin'; $fileLogin = 'login/sysLogin';
break; break;
} }
error_log($fileLogin);
$G_PUBLISH->AddContent ('xmlform', 'xmlform', $fileLogin, '', $aField, 'sysLogin'); $G_PUBLISH->AddContent ('xmlform', 'xmlform', $fileLogin, '', $aField, 'sysLogin');
G::RenderPage ("publish"); G::RenderPage ("publish");

4
workflow/engine/methods/tracker/login.php
View File

@@ -31,7 +31,9 @@
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
//echo G::generateUniqueNumber(); //echo G::generateUniqueNumber();
if(SYS_SKIN == 'neoclassic'){ $version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
$version = isset($version[0]) ? intval($version[0]) : 0;
if ($version >= 3) {
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'tracker/loginpm3', '', '', SYS_URI . 'tracker/authentication.php' ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'tracker/loginpm3', '', '', SYS_URI . 'tracker/authentication.php' );
}else{ }else{
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'tracker/login', '', '', SYS_URI . 'tracker/authentication.php' ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'tracker/login', '', '', SYS_URI . 'tracker/authentication.php' );

1
workflow/engine/templates/cases/pmdynaform.html
View File

@@ -9,6 +9,7 @@
<link rel="stylesheet" href="/lib/pmdynaform/libs/bootstrap-3.1.1/css/bootstrap.min.css"> <link rel="stylesheet" href="/lib/pmdynaform/libs/bootstrap-3.1.1/css/bootstrap.min.css">
<link rel="stylesheet" href="/lib/pmdynaform/libs/datepicker/bootstrap-datetimepicker.css"> <link rel="stylesheet" href="/lib/pmdynaform/libs/datepicker/bootstrap-datetimepicker.css">
<link rel="stylesheet" href="/lib/pmdynaform/build/css/PMDynaform.css"> <link rel="stylesheet" href="/lib/pmdynaform/build/css/PMDynaform.css">
<link rel="stylesheet" href="/css/{sys_skin}-pm3.css">
<script type="text/javascript" src="/lib/pmdynaform/libs/jquery/jquery-1.11.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/jquery/jquery-1.11.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/bootstrap-3.1.1/js/bootstrap.min.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/bootstrap-3.1.1/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/datepicker/bootstrap-datetimepicker.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/datepicker/bootstrap-datetimepicker.js"></script>

1
workflow/engine/templates/designer/index.html
View File

@@ -66,6 +66,7 @@
{else} {else}
<link rel="stylesheet" type="text/css" href="/lib/css/mafe-{$buildhash}.css" /> <link rel="stylesheet" type="text/css" href="/lib/css/mafe-{$buildhash}.css" />
<link rel="stylesheet" type="text/css" href="/css/{$sys_skin}-pm3.css" />
<script type="text/javascript"> <script type="text/javascript">
var prj_uid = "{$prj_uid}"; var prj_uid = "{$prj_uid}";
var app_uid = "{$app_uid}"; var app_uid = "{$app_uid}";