Upd. Settings. Custom server option refactoring.

Author: svfcode

cleantalk.antispam/include.php

@@ -184,8 +184,8 @@ public static function OnPageStartHandler()
             if ( $bot_detector ) {
                 if (class_exists('COption')) {
                     $use_custom_server = \COption::GetOptionString( 'cleantalk.antispam', 'use_custom_server', '' );
-                    if ($use_custom_server == '1') {
-                        Asset::getInstance()->addJs('https://moderate.cleantalk.ru/ct-bot-detector-wrapper.js');
+                    if ($use_custom_server !== '') {
+                        Asset::getInstance()->addJs('https://moderate.' . $use_custom_server . '/ct-bot-detector-wrapper.js');
                     } else {
                         Asset::getInstance()->addJs('https://moderate.cleantalk.org/ct-bot-detector-wrapper.js');
                     }
@@ -1720,10 +1720,10 @@ private static function GetWorkServer() {
 
         if (class_exists('COption')) {
             $use_custom_server = \COption::GetOptionString( 'cleantalk.antispam', 'use_custom_server', '' );
-            if ($use_custom_server == '1') {
+            if ($use_custom_server !== '') {
                 return array(
-                    'work_url' => 'http://moderate.cleantalk.ru',
-                    'server_url' => 'http://moderate.cleantalk.ru',
+                    'work_url' => 'http://moderate.' . $use_custom_server,
+                    'server_url' => 'http://moderate.' . $use_custom_server,
                     'server_ttl' => 0,
                     'server_changed' => 0,
                 );
@@ -1775,9 +1775,9 @@ private static function SetWorkServer($work_url = 'http://moderate.cleantalk.org
 
         if (class_exists('COption')) {
             $use_custom_server = \COption::GetOptionString( 'cleantalk.antispam', 'use_custom_server', '' );
-            if ($use_custom_server == '1') {
-                $work_url = 'http://moderate.cleantalk.ru';
-                $server_url = 'http://moderate.cleantalk.ru';
+            if ($use_custom_server !== '') {
+                $work_url = 'http://moderate.' . $use_custom_server;
+                $server_url = 'http://moderate.' . $use_custom_server;
             }
         }
 

cleantalk.antispam/lib/Cleantalk/Common/API.php

@@ -658,8 +658,8 @@ public static function send_request($data, $url = null, $timeout = 10, $ssl = fa
 		if ($url == self::$URL) {
 			if (class_exists('COption')) {
 				$use_custom_server = \COption::GetOptionString( 'cleantalk.antispam', 'use_custom_server', '' );
-				if ($use_custom_server == '1') {
-					$url = 'https://api.cleantalk.ru';
+				if ($use_custom_server !== '') {
+					$url = 'https://api.' . $use_custom_server;
 				}
 			}
 		}

cleantalk.antispam/options.php

@@ -204,25 +204,22 @@
 
         // Custom server
         if (isset($_POST['use_custom_server']) && $_POST['use_custom_server'] !== '') {
-            if (strpos($_POST['use_custom_server'], 'cleantalk.ru') !== false) {
-                if (file_get_contents('https://moderate.cleantalk.ru') === false) {
-                    Option::set( $sModuleId, 'use_custom_server', '' );
-                    CAdminNotify::Add(array(
-                        'MESSAGE' => GetMessage( 'CLEANTALK_SERVER_NOT_AVAILABLE' ),
-                        'TAG' => 'server_not_available',
-                        'MODULE_ID' => 'main',
-                        'ENABLE_CLOSE' => 'Y'));
-                } else {
-                    Option::set( $sModuleId, 'use_custom_server', '1' );
-                    CAdminNotify::DeleteByTag('server_not_available');
-                }
-            } else {
+            // Remove path, query, fragment
+            $domain = preg_replace('/[\/\?#].*$/', '', $_POST['use_custom_server']);
+            // Remove invalid characters (keep letters, numbers, hyphens, dots)
+            $domain = preg_replace('/[^a-zA-Z0-9\.\-]/', '', $domain);
+            // Convert to lowercase and trim
+            $domain = strtolower(trim($domain));
+            if (file_get_contents('https://moderate.' . $domain) === false) {
                 Option::set( $sModuleId, 'use_custom_server', '' );
                 CAdminNotify::Add(array(
                     'MESSAGE' => GetMessage( 'CLEANTALK_SERVER_NOT_AVAILABLE' ),
                     'TAG' => 'server_not_available',
                     'MODULE_ID' => 'main',
                     'ENABLE_CLOSE' => 'Y'));
+            } else {
+                Option::set( $sModuleId, 'use_custom_server', $domain );
+                CAdminNotify::DeleteByTag('server_not_available');
             }
         }
     }
@@ -742,7 +739,7 @@ function ctDisableInputLine(ct_input_line){
                     type="text"
                     name="use_custom_server"
                     id="use_custom_server"
-                    value="<?php echo $current_options['use_custom_server'] == '1' ? 'cleantalk.ru' : ''; ?>" />
+                    value="<?php echo $current_options['use_custom_server']; ?>" />
             <div style="padding: 10px 0 10px 0">
                 <?php echo GetMessage( 'CLEANTALK_USE_CUSTOM_SERVER_DESCRIPTION' ); ?>
             </div>