rooty/Qware_core
0
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

Updated .gitignore files to remove lib/ path ignoring.

Browse Source
This commit is contained in:
Rooty 2022-11-01 10:46:39 +01:00
parent 8f133f68af
commit b138f17ffc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1463,8 +1463,6 @@ install/media/
!install/media/sign1.png !install/media/sign1.png
!install/media/step.png !install/media/step.png
lib/
lib/object_business/* lib/object_business/*
lib/object_coordination/* lib/object_coordination/*

6
lib/object_plugin/navigation/navigation.php
View File

@ -223,7 +223,7 @@ class Navigation extends Plugin{
public static function formatUrlNode($system, $navigationNodeId, $msg="",$param="") public static function formatUrlNode($system, $navigationNodeId, $msg="",$param="")
{ {
global $SERVER_NAME, $SCRIPT_NAME, $CONF_PERSISTANT_SECURE; global $SERVER_NAME, $SCRIPT_NAME, $CONF_PERSISTANT_SECURE;
// var_dump($GLOBALS["CONF_PLUGIN_URL_REWRITE"]); // var_dump($GLOBALS["CONF_PLUGIN_URL_REWRITE"]);
if ($GLOBALS["CONF_PLUGIN_URL_REWRITE"]) if ($GLOBALS["CONF_PLUGIN_URL_REWRITE"])
{ // [Urlrewrite] { // [Urlrewrite]
if(strtolower($system) == "navigationnode") if(strtolower($system) == "navigationnode")
@ -290,7 +290,7 @@ class Navigation extends Plugin{
* @param chaine identifiant du message(optionnel)... * @param chaine identifiant du message(optionnel)...
* @return chaine url formatté * @return chaine url formatté
*/ */
public static function formatUrl($oid, $className, $methodName, $msg="", $param="", $navigationNodeId=null) public static function formatUrl($oid, $className, $methodName, $msg="", $param="", $navigationNodeId=null, $urlparam=null)
{ {
global $SERVER_NAME, $SCRIPT_NAME, $CONF_PERSISTANT_SECURE; global $SERVER_NAME, $SCRIPT_NAME, $CONF_PERSISTANT_SECURE;
if ($GLOBALS["CONF_PLUGIN_URL_REWRITE"]) if ($GLOBALS["CONF_PLUGIN_URL_REWRITE"])
@ -318,6 +318,8 @@ class Navigation extends Plugin{
$url.="&msg=".$msg; $url.="&msg=".$msg;
if ($param!="") if ($param!="")
$url.="&param=".$param; $url.="&param=".$param;
if ($urlparam!="")
$url.="&".$urlparam;
}else{ }else{
$url =$GLOBALS['CONF_PAGE_EXECUTION']; $url =$GLOBALS['CONF_PAGE_EXECUTION'];
if($GLOBALS['CONF_URL_KEY']){ if($GLOBALS['CONF_URL_KEY']){