check op on #C not on #PHP for CGod.class.php

[PHP-P10.git] / Bots / CGod.class.php

diff --git a/Bots/CGod.class.php b/Bots/CGod.class.php
index db64989c70272f1385c5ce9eb85dd297bbd6da4f..4871694f1c3f45e1925105605c01cea92b368e25 100644 (file)
--- a/Bots/CGod.class.php
+++ b/Bots/CGod.class.php
@@ -66,19 +66,21 @@ class {$_NAME} extends Bot {
        public function loop() {
                foreach($this->ccache as $id => $c) {
                        if(!$this->checkstate($c)) {
+                unlink("tmp/debug_".$c['id'].".c");
+                unlink("tmp/debug_".$c['id']);
                                unset($this->ccache[$id]);
                        }
                }
        }
        
        function recive_privmsg($user, $channel, $message) {
-               $opOnPHPChannel = false;
-               $PHPChannel = P10_Channel::getChannelByName("#PHP");
-               if($PHPChannel) {
-                       $privs = $PHPChannel->getUserPrivs($user);
-                       $opOnPHPChannel = ($privs & P10_Channel::USERPRIV_OPED);
+               $opOnCChannel = false;
+               $CChannel = P10_Channel::getChannelByName("#C");
+               if($CChannel) {
+                       $privs = $CChannel->getUserPrivs($user);
+                       $opOnCChannel = ($privs & P10_Channel::USERPRIV_OPED);
                }
-               if(!$user->getModes()->hasMode('o') && !$opOnPHPChannel) return 0;
+               if(!$user->getModes()->hasMode('o') && !$opOnCChannel) return 0;
                $exp=explode(" ", $message, 2);
                switch (strtolower($exp[0])) {
                        case "~c":
@@ -92,12 +94,13 @@ class {$_NAME} extends Bot {
                 $fp = fopen("tmp/debug_".$entry['id'].".c", "w");
                 fwrite($fp, "#include \"includes.h\"\n".$exp[1]);
                 fclose($fp);
-                $err = shell_exec("gcc -o tmp/debug_".$entry['id']." tmp/debug_".$entry['id'].".c");
+                $err = shell_exec("gcc -o tmp/debug_".$entry['id']." tmp/debug_".$entry['id'].".c 2>&1");
                 if($err) {
                     $err=str_replace("\r","",$err);
                     $lines=explode("\n",$err);
                     $i=0;
                     foreach($lines as $line) {
+                        if($line == "") continue;
                         $i++;
                         if($i>100) {
                             $this->uplink->privmsg($this->c, $entry['channel'], "too many lines!");
@@ -106,10 +109,12 @@ class {$_NAME} extends Bot {
                         $this->uplink->privmsg($this->c, $entry['channel'], $line);
                     }
                 }
-                if(!file_exists("tmp/debug_".$entry['id']))
+                if(!file_exists("tmp/debug_".$entry['id'])) {
+                    unlink("tmp/debug_".$entry['id'].".c");
                     break;
+                }
                                $descriptor = array(0 => array("pipe", "r"),1 => array("pipe", "w"),2 => array("pipe", "w"));
-                               $entry['proc'] = proc_open('./debug_'.$entry['id'], $descriptor, $entry['pipes']);
+                               $entry['proc'] = proc_open('tmp/debug_'.$entry['id'], $descriptor, $entry['pipes']);
                                if(!is_resource($entry['proc'])) {
                                        $this->uplink->notice($this->c, $user, "error while loading c!");
                                        return;
@@ -143,6 +148,7 @@ class {$_NAME} extends Bot {
                                $lines=explode("\n",$out);
                                $i=0;
                                foreach($lines as $line) {
+                    if($line == "") continue;
                                        $i++;
                                        if($i>1000) {
                                                $this->uplink->privmsg($this->c, $c['channel'], "too many lines!");
@@ -156,6 +162,7 @@ class {$_NAME} extends Bot {
                                $lines=explode("\n",$eout);
                                $i=0;
                                foreach($lines as $line) {
+                    if($line == "") continue;
                                        $i++;
                                        if($i>1000) { 
                                                $this->uplink->privmsg($this->c, $c['channel'], "too many lines!");