forked from GNUsocial/gnu-social
		
	is_otr -> isOtr
This commit is contained in:
		@@ -418,7 +418,7 @@ abstract class ImPlugin extends Plugin
 | 
				
			|||||||
     * @param string $txt message text
 | 
					     * @param string $txt message text
 | 
				
			||||||
     * @return boolean true if OTR
 | 
					     * @return boolean true if OTR
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    protected function is_otr($txt)
 | 
					    protected function isOtr($txt)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        if (preg_match('/^\?OTR/', $txt)) {
 | 
					        if (preg_match('/^\?OTR/', $txt)) {
 | 
				
			||||||
            return true;
 | 
					            return true;
 | 
				
			||||||
@@ -456,7 +456,7 @@ abstract class ImPlugin extends Plugin
 | 
				
			|||||||
        } else if ($this->isAutoreply($notice_text)) {
 | 
					        } else if ($this->isAutoreply($notice_text)) {
 | 
				
			||||||
            common_log(LOG_INFO, 'Ignoring auto reply from ' . $from);
 | 
					            common_log(LOG_INFO, 'Ignoring auto reply from ' . $from);
 | 
				
			||||||
            return;
 | 
					            return;
 | 
				
			||||||
        } else if ($this->is_otr($notice_text)) {
 | 
					        } else if ($this->isOtr($notice_text)) {
 | 
				
			||||||
            common_log(LOG_INFO, 'Ignoring OTR from ' . $from);
 | 
					            common_log(LOG_INFO, 'Ignoring OTR from ' . $from);
 | 
				
			||||||
            return;
 | 
					            return;
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -247,7 +247,7 @@ class IrcPlugin extends ImPlugin {
 | 
				
			|||||||
        } else if ($this->isAutoreply($notice_text)) {
 | 
					        } else if ($this->isAutoreply($notice_text)) {
 | 
				
			||||||
            common_log(LOG_INFO, 'Ignoring auto reply from ' . $nick);
 | 
					            common_log(LOG_INFO, 'Ignoring auto reply from ' . $nick);
 | 
				
			||||||
            return;
 | 
					            return;
 | 
				
			||||||
        } else if ($this->is_otr($notice_text)) {
 | 
					        } else if ($this->isOtr($notice_text)) {
 | 
				
			||||||
            common_log(LOG_INFO, 'Ignoring OTR from ' . $nick);
 | 
					            common_log(LOG_INFO, 'Ignoring OTR from ' . $nick);
 | 
				
			||||||
            return;
 | 
					            return;
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user