|
|
|
@ -5503,7 +5503,7 @@ namespace NLGUI
|
|
|
|
|
string suri = elm.getAttribute("href");
|
|
|
|
|
if(suri.find("ah:") == 0)
|
|
|
|
|
{
|
|
|
|
|
if (_TrustedDomain)
|
|
|
|
|
if (_TrustedDomain || suri.find("ah:script:") == 0)
|
|
|
|
|
_Link.back() = suri;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
@ -6360,11 +6360,13 @@ namespace NLGUI
|
|
|
|
|
|
|
|
|
|
void CGroupHTML::htmlOBJECTend(const CHtmlElement &elm)
|
|
|
|
|
{
|
|
|
|
|
if (!_TrustedDomain)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (_ObjectType=="application/ryzom-data")
|
|
|
|
|
{
|
|
|
|
|
if (!_TrustedDomain)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (!_ObjectData.empty())
|
|
|
|
|
{
|
|
|
|
|
if (addBnpDownload(_ObjectData, _ObjectAction, _ObjectScript, _ObjectMD5Sum))
|
|
|
|
@ -6374,6 +6376,24 @@ namespace NLGUI
|
|
|
|
|
_ObjectScript.clear();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (_ObjectType=="application/ryzom-tutorial")
|
|
|
|
|
{
|
|
|
|
|
strFindReplace(_ObjectScript, "[[", "\\[\\[");
|
|
|
|
|
strFindReplace(_ObjectScript, "]]", "\\]\\]");
|
|
|
|
|
strFindReplace(_ObjectScript, "\\[\\[", "]]..'[['..[[");
|
|
|
|
|
strFindReplace(_ObjectScript, "\\]\\]", "]]..']]'..[[");
|
|
|
|
|
CLuaManager::getInstance().executeLuaScript("\ngame:executeTutorial([["+_ObjectScript+"]])\n", true);
|
|
|
|
|
_ObjectScript.clear();
|
|
|
|
|
}
|
|
|
|
|
else if (_ObjectType=="application/ryzom-script")
|
|
|
|
|
{
|
|
|
|
|
strFindReplace(_ObjectScript, "[[", "\\[\\[");
|
|
|
|
|
strFindReplace(_ObjectScript, "]]", "\\]\\]");
|
|
|
|
|
strFindReplace(_ObjectScript, "\\[\\[", "]]..'[['..[[");
|
|
|
|
|
strFindReplace(_ObjectScript, "\\]\\]", "]]..']]'..[[");
|
|
|
|
|
CLuaManager::getInstance().executeLuaScript("\ngame:executeRyzomScript([["+_ObjectScript+"]])\n", true);
|
|
|
|
|
_ObjectScript.clear();
|
|
|
|
|
}
|
|
|
|
|
_Object = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|