diff options
Diffstat (limited to 'phpBB/includes/acp/acp_bots.php')
| -rw-r--r-- | phpBB/includes/acp/acp_bots.php | 27 | 
1 files changed, 13 insertions, 14 deletions
| diff --git a/phpBB/includes/acp/acp_bots.php b/phpBB/includes/acp/acp_bots.php index e28a8d6451..7384f719bf 100644 --- a/phpBB/includes/acp/acp_bots.php +++ b/phpBB/includes/acp/acp_bots.php @@ -157,7 +157,7 @@ class acp_bots  					{  						$error[] = $user->lang['ERR_BOT_NO_MATCHES'];  					} -			 +  					if ($bot_row['bot_ip'] && !preg_match('#^[\d\.,:]+$#', $bot_row['bot_ip']))  					{  						if (!$ip_list = gethostbynamel($bot_row['bot_ip'])) @@ -176,7 +176,7 @@ class acp_bots  					{  						$error[] = $user->lang['ERR_BOT_AGENT_MATCHES_UA'];  					} -					 +  					$bot_name = false;  					if ($bot_id)  					{ @@ -201,7 +201,7 @@ class acp_bots  					{  						$error[] = $user->lang['BOT_NAME_TAKEN'];  					} -					 +  					if (!sizeof($error))  					{  						// New bot? Create a new user and group entry @@ -219,7 +219,6 @@ class acp_bots  							{  								trigger_error($user->lang['NO_BOT_GROUP'] . adm_back_link($this->u_action . "&id=$bot_id&action=$action"), E_USER_WARNING);  							} -						  							$user_id = user_add(array(  								'user_type'				=> (int) USER_IGNORE, @@ -233,7 +232,7 @@ class acp_bots  								'user_style'			=> (int) $bot_row['bot_style'],  								'user_allow_massemail'	=> 0,  							)); -	 +  							$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array(  								'user_id'		=> (int) $user_id,  								'bot_name'		=> (string) $bot_row['bot_name'], @@ -242,7 +241,7 @@ class acp_bots  								'bot_ip'		=> (string) $bot_row['bot_ip'])  							);  							$db->sql_query($sql); -	 +  							$log = 'ADDED';  						}  						else if ($bot_id) @@ -289,12 +288,12 @@ class acp_bots  							$log = 'UPDATED';  						} -						 +  						$cache->destroy('_bots'); -						 +  						add_log('admin', 'LOG_BOT_' . $log, $bot_row['bot_name']);  						trigger_error($user->lang['BOT_' . $log] . adm_back_link($this->u_action)); -					 +  					}  				}  				else if ($bot_id) @@ -335,11 +334,11 @@ class acp_bots  					'U_ACTION'		=> $this->u_action . "&id=$bot_id&action=$action",  					'U_BACK'		=> $this->u_action,  					'ERROR_MSG'		=> (sizeof($error)) ? implode('<br />', $error) : '', -					 +  					'BOT_NAME'		=> $bot_row['bot_name'],  					'BOT_IP'		=> $bot_row['bot_ip'],  					'BOT_AGENT'		=> $bot_row['bot_agent'], -					 +  					'S_EDIT_BOT'		=> true,  					'S_ACTIVE_OPTIONS'	=> $s_active_options,  					'S_STYLE_OPTIONS'	=> $style_select, @@ -352,7 +351,7 @@ class acp_bots  			break;  		} -		 +  		if ($request->is_ajax() && ($action == 'activate' || $action == 'deactivate'))  		{  			$json_response = new \phpbb\json_response; @@ -397,7 +396,7 @@ class acp_bots  		}  		$db->sql_freeresult($result);  	} -	 +  	/**  	* Validate bot name against username table  	*/ @@ -417,7 +416,7 @@ class acp_bots  		$result = $db->sql_query($sql);  		$row = $db->sql_fetchrow($result);  		$db->sql_freeresult($result); -		 +  		return ($row) ? false : true;  	}  } | 
