Removed unused code

Author: jushar

MTA10/ceflauncher/CCefApp.h

@@ -72,7 +72,6 @@ class CCefApp : public CefApp, public CefRenderProcessHandler
 
         // Bind V8 --> C++ functions
         V8Helpers::BindV8Function ( handler, mtaObject, "triggerEvent", Javascript_triggerEvent );
-        // V8Helpers::BindV8Function ( handler, mtaObject, "triggerServerEvent", Javascript_triggerServerEvent ); // Disabled due to security issues
 
         // Assign mtaObject to global object
         globalObject->SetValue ( "mta", mtaObject, V8_PROPERTY_ATTRIBUTE_NONE );
@@ -87,15 +86,6 @@ class CCefApp : public CefApp, public CefRenderProcessHandler
         frame->GetBrowser ()->SendProcessMessage ( PID_BROWSER, message );
     }
 
-    static void Javascript_triggerServerEvent ( CefRefPtr<CefFrame> frame, const CefV8ValueList& arguments )
-    {
-        if ( arguments.size () == 0 )
-            return;
-
-        CefRefPtr<CefProcessMessage> message = V8Helpers::SerialiseV8Arguments ( "TriggerServerLuaEvent", arguments );
-        frame->GetBrowser ()->SendProcessMessage ( PID_BROWSER, message );
-    }
-
 public:
     IMPLEMENT_REFCOUNTING(CCefApp);
 

MTA10/core/CWebView.cpp

@@ -374,8 +374,11 @@ bool CWebView::VerifyFile ( const SString& strPath )
 bool CWebView::OnProcessMessageReceived ( CefRefPtr<CefBrowser> browser, CefProcessId source_process, CefRefPtr<CefProcessMessage> message )
 {
     CefRefPtr<CefListValue> argList = message->GetArgumentList ();
-    if ( message->GetName () == "TriggerLuaEvent" || message->GetName () == "TriggerServerLuaEvent" )
+    if ( message->GetName () == "TriggerLuaEvent" )
     {
+        if ( !m_bIsLocal )
+            return true;
+
         // Get event name
         CefString eventName = argList->GetString ( 0 );
 
@@ -390,7 +393,7 @@ bool CWebView::OnProcessMessageReceived ( CefRefPtr<CefBrowser> browser, CefProc
         }
 
         // Queue event to run on the main thread
-        auto func = std::bind ( &CWebBrowserEventsInterface::Events_OnTriggerEvent, m_pEventsInterface, SString ( eventName ), args, message->GetName () == "TriggerServerLuaEvent" );
+        auto func = std::bind ( &CWebBrowserEventsInterface::Events_OnTriggerEvent, m_pEventsInterface, SString ( eventName ), args );
         g_pCore->GetWebCore ()->AddEventToEventQueue ( func, this, "OnProcessMessageReceived1" );
 
         // The message was handled

MTA10/mods/shared_logic/CClientWebBrowser.cpp

@@ -194,23 +194,16 @@ void CClientWebBrowser::Events_OnChangeCursor ( unsigned char ucCursor )
     CallEvent ( "onClientBrowserCursorChange", Arguments, false );
 }
 
-void CClientWebBrowser::Events_OnTriggerEvent ( const SString& strEventName, const std::vector<std::string>& arguments, bool bIsServer )
+void CClientWebBrowser::Events_OnTriggerEvent ( const SString& strEventName, const std::vector<std::string>& arguments )
 {
     CLuaArguments Arguments;
     for ( std::vector<std::string>::const_iterator iter = arguments.begin (); iter != arguments.end (); ++iter )
     {
         Arguments.PushString ( *iter );
     }
 
-    if ( bIsServer )
-    {
-        CStaticFunctionDefinitions::TriggerServerEvent ( strEventName, *g_pClientGame->GetRootEntity (), Arguments );
-    }
-    else
-    {
-        bool bWasCancelled;
-        CStaticFunctionDefinitions::TriggerEvent ( strEventName, *this, Arguments, bWasCancelled );
-    }
+    bool bWasCancelled;
+    CStaticFunctionDefinitions::TriggerEvent ( strEventName, *this, Arguments, bWasCancelled );
 }
 
 void CClientWebBrowser::Events_OnTooltip ( const SString& strTooltip )

MTA10/mods/shared_logic/CClientWebBrowser.h

@@ -67,7 +67,7 @@ class CClientWebBrowser : public CClientTexture, public CWebBrowserEventsInterfa
     void                        Events_OnNavigate      ( const SString& strURL, bool bIsBlocked ) override;
     void                        Events_OnPopup         ( const SString& strTargetURL, const SString& strOpenerURL ) override;
     void                        Events_OnChangeCursor  ( unsigned char ucCursor ) override;
-    void                        Events_OnTriggerEvent  ( const SString& strEventName, const std::vector<std::string>& arguments, bool bIsServer = false ) override;
+    void                        Events_OnTriggerEvent  ( const SString& strEventName, const std::vector<std::string>& arguments ) override;
     void                        Events_OnTooltip       ( const SString& strTooltip ) override;
     void                        Events_OnInputFocusChanged ( bool bGainedFocus ) override;
     bool                        Events_OnResourcePathCheck ( SString& strURL ) override;

MTA10/sdk/core/CWebBrowserEventsInterface.h

@@ -22,7 +22,7 @@ class CWebBrowserEventsInterface
     virtual void Events_OnNavigate ( const SString& strURL, bool bIsBlocked ) = 0;
     virtual void Events_OnPopup ( const SString& strTargetURL, const SString& strOpenerURL ) = 0;
     virtual void Events_OnChangeCursor ( unsigned char ucCursor ) = 0;
-    virtual void Events_OnTriggerEvent ( const SString& strEventName, const std::vector<std::string>& arguments, bool bIsServer = false ) = 0;
+    virtual void Events_OnTriggerEvent ( const SString& strEventName, const std::vector<std::string>& arguments ) = 0;
     virtual void Events_OnTooltip ( const SString& strTooltip ) = 0;
     virtual void Events_OnInputFocusChanged ( bool bGainedFocus ) = 0;
     virtual bool Events_OnResourcePathCheck ( SString& strURL ) = 0;