whatever i changed

jcrutchy · May 1, 2015 · 76a30cd · 76a30cd
1 parent 646b2e1
commit 76a30cd
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 56 deletions.
diff --git a/scripts/feeds.php b/scripts/feeds.php
@@ -115,7 +115,6 @@
   $data=$data.$new_history[$i].PHP_EOL;
 }
 file_put_contents(FEED_HISTORY_FILE,$data,FILE_APPEND);
-pm($feed_chan,chr(3)."08"."************");
 for ($i=count($results)-1;$i>=0;$i--)
 {
   $item=$results[$i];
@@ -129,6 +128,7 @@
     pm($feed_chan,$msg);
   }
 }
+pm($feed_chan,chr(3)."08"."************");
 
 #####################################################################################################
 

diff --git a/scripts/sed.php b/scripts/sed.php
@@ -45,12 +45,9 @@
     # bot parted channel
     return;
   case 7:
-    for ($i=0;$i<count($delims);$i++)
+    if (shell_sed($msg,$nick,$dest)==True)
     {
-      if (shell_sed($msg,$nick,$dest,$delims[$i])==True)
-      {
-        return;
-      }
+      return;
     }
     break;
   case 8:
@@ -65,52 +62,42 @@
 
 #####################################################################################################
 
-function shell_sed($trailing,$nick,$dest,$delim="/")
+function shell_sed($trailing,$nick,$dest)
 {
-  # [nick[:|,|>|.] ]s/pattern/replace[/[param]]
-  $trailing=str_replace("\\\\","\nB\n",$trailing);
-  $trailing=str_replace("\/","\nF\n",$trailing);
-  $parts=explode($delim,$trailing);
-  if (count($parts)<3)
+  # [nick[:|,|>|.] ]sed_cmd
+  global $delims;
+  $trailing=trim($trailing);
+  if (trim($trailing)=="")
   {
     return False;
   }
-  $start=ltrim($parts[0]);
-  if (trim($start)=="")
-  {
-    return False;
-  }
-  $start_arr=explode(" ",$start);
+  $parts=explode(" ",$trailing);
   $sed_nick="";
-  if (count($start_arr)==1)
+  if (count($parts)>1)
   {
-    if (strtolower($start_arr[0])<>"s")
+    $sed_nick=$parts[0];
+    if (strpos(":,>.",substr($sed_nick,strlen($sed_nick)-1))!==False)
     {
-      return False;
+      $sed_nick=substr($sed_nick,0,strlen($sed_nick)-1);
     }
+    array_shift($parts);
   }
-  elseif (count($start_arr)==2)
+  if ($sed_nick=="")
   {
-    if (strtolower($start_arr[1])=="s")
-    {
-      $sed_nick=$start_arr[0];
-      if (strpos(":,>.",substr($sed_nick,strlen($sed_nick)-1))!==False)
-      {
-        $sed_nick=substr($sed_nick,0,strlen($sed_nick)-1);
-      }
-    }
-    else
-    {
-      return False;
-    }
+    $sed_nick=$nick;
   }
-  else
+  $sed_cmd=implode(" ",$parts);
+  if (strlen($sed_cmd)<5)
   {
     return False;
   }
-  if ($sed_nick=="")
+  if (strtolower($sed_cmd[0])<>"s")
   {
-    $sed_nick=$nick;
+    return False;
+  }
+  if (in_array($sed_cmd[1],$delims)==False)
+  {
+    return False;
   }
   $index="last_".strtolower($sed_nick)."_".strtolower($dest);
   $last=get_bucket($index);
@@ -123,30 +110,27 @@ function shell_sed($trailing,$nick,$dest,$delim="/")
   {
     $last=trim(substr($last,strlen($action_delim)),chr(1));
   }
-  $pattern=$parts[1];
-  if ($pattern=="")
+  $command="echo ".escapeshellarg($last)." | sed -e ".escapeshellarg($sed_cmd);
+  $cwd=NULL;
+  $env=NULL;
+  $descriptorspec=array(0=>array("pipe","r"),1=>array("pipe","w"),2=>array("pipe","w"));
+  $process=proc_open($command,$descriptorspec,$pipes,$cwd,$env);
+  $result=trim(stream_get_contents($pipes[1]));
+  $result_lines=explode("\n",$result);
+  if (count($result_lines)>1)
   {
     return False;
   }
-  $replace=$parts[2];
-  $param="";
-  if (isset($parts[3])==True)
+  fclose($pipes[1]);
+  $stderr=trim(stream_get_contents($pipes[2]));
+  fclose($pipes[2]);
+  proc_close($process);
+  if ($stderr<>"")
   {
-    $param=$parts[3];
+    term_echo($stderr);
+    return True;
   }
-  $pattern=str_replace("\nB\n","\\",$pattern);
-  $replace=str_replace("\nB\n","\\",$replace);
-  $pattern=str_replace("\nF\n","/",$pattern);
-  $replace=str_replace("\nF\n","/",$replace);
-  $pattern=str_replace("\\\\","\nDB\n",$pattern);
-  $pattern=str_replace("/","\/",$pattern);
-  $pattern=str_replace("\nDB\n","\\\\",$pattern);
-  term_echo("*** SED: NICK: $nick");
-  term_echo("*** SED: SUBJECT: $last");
-  term_echo("*** SED: PATTERN: $pattern");
-  term_echo("*** SED: REPLACE: $replace");
-  $result=trim(shell_exec("echo ".escapeshellarg($last)." | sed -e ".escapeshellarg("s/$pattern/$replace/$param")));
-  if ($result==$last)
+  if (($result==$last) or ($result==$sed_cmd))
   {
     $result="";
   }