Added NGLVERSION ctcp reply and an option to enable/disable it

diff --git a/NGL fserv/src/NGLfserv_classes_gui_globals.kvs b/NGL fserv/src/NGLfserv_classes_gui_globals.kvs
index 3fe0dc47543aa2f4cbafb2abab20dc8541a5f885..6db9ddc3aa41cfa2eb62703fcbe2f2c8fd9e97e7 100644 (file)
--- a/NGL fserv/src/NGLfserv_classes_gui_globals.kvs
+++ b/NGL fserv/src/NGLfserv_classes_gui_globals.kvs
@@ -98,13 +98,12 @@ alias(NGLfserv::classes::gui::globals)
                        %maxCache->$setTooltip($tr("<b>(Advanced)</b> Maxium number of cached results"))
                        %main_layout->$addWidget(%gbFind,1,1)
                                
-                       // Box debug
-                       %gbDebug=$new(NGLfserv::classes::customwidgets::groupbox,$$,gbDebug,"Debug",5,20)
-                       %gbDebug->$setColumnLayout(1,Vertical)
-                       %debug_box=$new(NGLfserv::classes::customwidgets::box,%gbDebug,box,vertical)
-                       %debug_box->$setSpacing(1)
-                       %debug_box->$addWidget(checkbox,"Enable Debugging","\%G_NGLdebug")
-                       %main_layout->$addWidget(%gbDebug,1,2)
+                       // Box other
+                       %gb=$new(NGLfserv::classes::customwidgets::groupbox,$$,gb,"Other",5,20)
+                       %gb->$setColumnLayout(1,Horizontal)
+                       $$->%ckbDebug=$new(NGLfserv::classes::customwidgets::checkbox,%gb,cb,"Enable debug","\%G_NGLdebug")
+                       $$->%ckbNGLVersion=$new(NGLfserv::classes::customwidgets::checkbox,%gb,cb,"Respond to NGLVERSION","\%NGLRespondToNGLVersion")
+                       %main_layout->$addWidget(%gb,1,2)
                                        
                        objects.connect $$->%spinBoxInstantSend valueChanged $$ commit
                        objects.connect $$->%spinBoxResendInterval valueChanged $$ commit

diff --git a/NGL fserv/src/NGLfserv_config_load.kvs b/NGL fserv/src/NGLfserv_config_load.kvs
index bce114cf2182f0ef08c9492dc86ce37beffb9bcd..252995113b7d41c4801879629b0445008b2609b8 100644 (file)
--- a/NGL fserv/src/NGLfserv_config_load.kvs
+++ b/NGL fserv/src/NGLfserv_config_load.kvs
@@ -71,8 +71,11 @@ alias(NGLfserv::config::load)
        %MaxSessions = $config.read(%c,"MaxSessions",5)\r
        \r
        // LoadSendDelay \r
-       %LoadSendsDelay = $config.read(%c,"LoadSendsDelay",30000) \r
-       \r
+       %LoadSendsDelay = $config.read(%c,"LoadSendsDelay",30000)\r
+\r
+       // NGLRespondToNGLVersion\r
+       %NGLRespondToNGLVersion = $config.read(%c,"NGLRespondToNGLVersion",$true)\r
+\r
        %G_NGLdebug=$config.read(%c,"NGLdebug",0)\r
        \r
        %CloneDetection=$config.read(%c,"CloneDetection",$true)\r

diff --git a/NGL fserv/src/NGLfserv_config_save.kvs b/NGL fserv/src/NGLfserv_config_save.kvs
index 78851e4dd56f4f9132f388601a5cd9d280203907..51c14137a5f44ff39fd5f9be63259c95f9023708 100644 (file)
--- a/NGL fserv/src/NGLfserv_config_save.kvs
+++ b/NGL fserv/src/NGLfserv_config_save.kvs
@@ -24,6 +24,7 @@ alias(NGLfserv::config::save)
        config.write %c UsePswd %UsePswd
        config.write %c CloneDetection %CloneDetection
        config.write %c LoadSendsDelay %LoadSendsDelay
+       config.write %c NGLRespondToNGLVersion %NGLRespondToNGLVersion
        
        config.write %c Triggersnumber $length(%Triggers{})
        if (!$length(%Triggers{})) {

diff --git a/NGL fserv/src/NGLfserv_events_eventshandler.kvs b/NGL fserv/src/NGLfserv_events_eventshandler.kvs
index 3d7cc9a9a7552d1c80a732c8477e2b734890b807..aa9a7fa0e9ca75345998437af4750ad78a34dbd2 100644 (file)
--- a/NGL fserv/src/NGLfserv_events_eventshandler.kvs
+++ b/NGL fserv/src/NGLfserv_events_eventshandler.kvs
@@ -1,71 +1,77 @@
 alias(NGLfserv::events::eventshandler)
 {
-       switch($0)\r
-       {\r
-               case ("ENABLE")\r
-               {\r
-                       eventctl --enable OnChannelMessage NGLfserv_!list\r
-                       eventctl --enable OnChannelMessage NGLfserv_@find\r
-                       eventctl --enable OnChannelMessage NGLfserv_!trigger\r
-                       eventctl --enable OnChannelMessage NGLfserv_!myqueues\r
-                       eventctl --enable OnCtcpRequest NGLfserv_trigger\r
-                       eventctl --enable OnCtcpRequest NGLfserv_qget\r
-                       eventctl --enable OnDCCChatConnectionInProgress NGLfserv\r
-                       eventctl --enable OnDccChatConnected NGLfserv\r
-                       eventctl --enable OnDCCChatDisconnected NGLfserv\r
-                       eventctl --enable OnDCCChatError NGLfserv\r
-                       eventctl --enable OnDCCFileTransferBegin NGLfserv\r
-                       eventctl --enable OnDCCFileTransferFailed NGLfserv\r
-                       eventctl --enable OnDCCFileTransferSuccess NGLfserv\r
-                       eventctl --enable OnDCCChatMessage NGLfserv\r
-                       eventctl --enable OnNickChange NGLfserv\r
-                       eventctl --enable OnPart NGLfserv\r
-                       eventctl --enable OnQuit NGLfserv\r
-                       eventctl --enable OnDCCChatWindowClosing NGLfserv\r
-               }\r
-               case ("DISABLE")\r
-               {\r
-                       eventctl --disable OnChannelMessage NGLfserv_!list\r
-                       eventctl --disable OnChannelMessage NGLfserv_@find\r
-                       eventctl --disable OnChannelMessage NGLfserv_!trigger\r
-                       eventctl --disable OnChannelMessage NGLfserv_!myqueues\r
-                       eventctl --disable OnCtcpRequest NGLfserv_trigger\r
-                       eventctl --disable OnCtcpRequest NGLfserv_qget\r
-                       eventctl --disable OnDCCChatConnectionInProgress NGLfserv\r
-                       eventctl --disable OnDccChatConnected NGLfserv\r
-                       eventctl --disable OnDCCChatDisconnected NGLfserv\r
-                       eventctl --disable OnDCCChatError NGLfserv\r
-                       eventctl --disable OnDCCFileTransferBegin NGLfserv\r
-                       eventctl --disable OnDCCFileTransferFailed NGLfserv\r
-                       eventctl --disable OnDCCFileTransferSuccess NGLfserv\r
-                       eventctl --disable OnDCCChatMessage NGLfserv\r
-                       eventctl --disable OnNickChange NGLfserv\r
-                       eventctl --disable OnPart NGLfserv\r
-                       eventctl --disable OnQuit NGLfserv\r
-                       eventctl --disable OnDCCChatWindowClosing NGLfserv\r
-               }\r
-               case ("UNINSTALL")\r
-               {\r
-                       eventctl --unregister OnChannelMessage NGLfserv_!list\r
-                       eventctl --unregister OnChannelMessage NGLfserv_@find\r
-                       eventctl --unregister OnChannelMessage NGLfserv_!trigger\r
-                       eventctl --unregister OnChannelMessage NGLfserv_!myqueues\r
-                       eventctl --unregister OnCtcpRequest NGLfserv_trigger\r
-                       eventctl --unregister OnCtcpRequest NGLfserv_qget\r
-                       eventctl --unregister OnDCCChatConnectionInProgress NGLfserv\r
-                       eventctl --unregister OnDccChatConnected NGLfserv\r
-                       eventctl --unregister OnDCCChatDisconnected NGLfserv\r
-                       eventctl --unregister OnDCCChatError NGLfserv\r
-                       eventctl --unregister OnDCCFileTransferBegin NGLfserv\r
-                       eventctl --unregister OnDCCFileTransferFailed NGLfserv\r
-                       eventctl --unregister OnDCCFileTransferSuccess NGLfserv\r
-                       eventctl --unregister OnDCCChatMessage NGLfserv\r
-                       eventctl --unregister OnKVIrcStartup NGLfserv\r
-                       eventctl --unregister OnNickChange NGLfserv\r
-                       eventctl --unregister OnPart NGLfserv\r
-                       eventctl --unregister OnQuit NGLfserv\r
-                       eventctl --unregister OnDCCChatWindowClosing NGLfserv\r
-               }\r
+       switch($0)
+       {
+               case ("ENABLE")
+               {
+                       eventctl --enable OnChannelMessage NGLfserv_!list
+                       eventctl --enable OnChannelMessage NGLfserv_@find
+                       eventctl --enable OnChannelMessage NGLfserv_!trigger
+                       eventctl --enable OnChannelMessage NGLfserv_!myqueues
+                       eventctl --enable OnCtcpRequest NGLfserv_trigger
+                       eventctl --enable OnCtcpRequest NGLfserv_qget
+                       eventctl --enable OnCtcpRequest NGLfserv_NORESEND
+                       eventctl --enable OnCtcpRequest NGLfserv_NGLVERSION
+                       eventctl --enable OnDCCChatConnectionInProgress NGLfserv
+                       eventctl --enable OnDccChatConnected NGLfserv
+                       eventctl --enable OnDCCChatDisconnected NGLfserv
+                       eventctl --enable OnDCCChatError NGLfserv
+                       eventctl --enable OnDCCFileTransferBegin NGLfserv
+                       eventctl --enable OnDCCFileTransferFailed NGLfserv
+                       eventctl --enable OnDCCFileTransferSuccess NGLfserv
+                       eventctl --enable OnDCCChatMessage NGLfserv
+                       eventctl --enable OnNickChange NGLfserv
+                       eventctl --enable OnPart NGLfserv
+                       eventctl --enable OnQuit NGLfserv
+                       eventctl --enable OnDCCChatWindowClosing NGLfserv
+               }
+               case ("DISABLE")
+               {
+                       eventctl --disable OnChannelMessage NGLfserv_!list
+                       eventctl --disable OnChannelMessage NGLfserv_@find
+                       eventctl --disable OnChannelMessage NGLfserv_!trigger
+                       eventctl --disable OnChannelMessage NGLfserv_!myqueues
+                       eventctl --disable OnCtcpRequest NGLfserv_trigger
+                       eventctl --disable OnCtcpRequest NGLfserv_qget
+                       eventctl --disable OnCtcpRequest NGLfserv_NORESEND
+                       eventctl --disable OnCtcpRequest NGLfserv_NGLVERSION
+                       eventctl --disable OnDCCChatConnectionInProgress NGLfserv
+                       eventctl --disable OnDccChatConnected NGLfserv
+                       eventctl --disable OnDCCChatDisconnected NGLfserv
+                       eventctl --disable OnDCCChatError NGLfserv
+                       eventctl --disable OnDCCFileTransferBegin NGLfserv
+                       eventctl --disable OnDCCFileTransferFailed NGLfserv
+                       eventctl --disable OnDCCFileTransferSuccess NGLfserv
+                       eventctl --disable OnDCCChatMessage NGLfserv
+                       eventctl --disable OnNickChange NGLfserv
+                       eventctl --disable OnPart NGLfserv
+                       eventctl --disable OnQuit NGLfserv
+                       eventctl --disable OnDCCChatWindowClosing NGLfserv
+               }
+               case ("UNINSTALL")
+               {
+                       eventctl --unregister OnChannelMessage NGLfserv_!list
+                       eventctl --unregister OnChannelMessage NGLfserv_@find
+                       eventctl --unregister OnChannelMessage NGLfserv_!trigger
+                       eventctl --unregister OnChannelMessage NGLfserv_!myqueues
+                       eventctl --unregister OnCtcpRequest NGLfserv_trigger
+                       eventctl --unregister OnCtcpRequest NGLfserv_qget
+                       eventctl --unregister OnCtcpRequest NGLfserv_NORESEND
+                       eventctl --unregister OnCtcpRequest NGLfserv_NGLVERSION
+                       eventctl --unregister OnDCCChatConnectionInProgress NGLfserv
+                       eventctl --unregister OnDccChatConnected NGLfserv
+                       eventctl --unregister OnDCCChatDisconnected NGLfserv
+                       eventctl --unregister OnDCCChatError NGLfserv
+                       eventctl --unregister OnDCCFileTransferBegin NGLfserv
+                       eventctl --unregister OnDCCFileTransferFailed NGLfserv
+                       eventctl --unregister OnDCCFileTransferSuccess NGLfserv
+                       eventctl --unregister OnDCCChatMessage NGLfserv
+                       eventctl --unregister OnKVIrcStartup NGLfserv
+                       eventctl --unregister OnNickChange NGLfserv
+                       eventctl --unregister OnPart NGLfserv
+                       eventctl --unregister OnQuit NGLfserv
+                       eventctl --unregister OnDCCChatWindowClosing NGLfserv
+               }
        }
 }
 

diff --git a/NGL fserv/src/NGLfserv_events_init.kvs b/NGL fserv/src/NGLfserv_events_init.kvs
index 366db3d4fba62c4134d0a98bef31cc3666df42e7..32133230dde8efd0bacec53ea5691296003aa36e 100644 (file)
--- a/NGL fserv/src/NGLfserv_events_init.kvs
+++ b/NGL fserv/src/NGLfserv_events_init.kvs
@@ -304,6 +304,15 @@ alias(NGLfserv::events::init)
                        }
                }
        }
+       event(OnCtcpRequest,"NGLfserv_NGLVERSION")
+       {
+               %requesting=$0
+               %ctcpName=$4
+               if($str.cmpnocase(%ctcpName,"NGLVERSION")==0 && %NGLRespondToNGLVersion) {
+                       notice -q %requesting Running NGL File Server version $addon.version(NGLfserv)
+                       halt
+               }
+       }
        event(OnDCCChatConnectionInProgress,"NGLfserv")
        {
                %id=$0