Index: branches/unlabeled/unlabeled-1.1.2/kernel/include/obscure.php
===================================================================
diff -u -r6981 -r7308
--- branches/unlabeled/unlabeled-1.1.2/kernel/include/obscure.php	(.../obscure.php)	(revision 6981)
+++ branches/unlabeled/unlabeled-1.1.2/kernel/include/obscure.php	(.../obscure.php)	(revision 7308)
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php
+#!/usr/bin/php
 
 <?php
 
@@ -16,40 +16,40 @@
 	}
 
 	$functions = array();
-  
+
   $php = file($argv[1]);
   $n = 1;
   for($x=0;$x<count($php);$x++)
   {
   	$line = $php[$x];
-  	
+
   	if ( preg_match("/^[ ]*\/\/.*?$/", trim($line)) ) {
   		//echo  "SKIPPING ".$php[$x];
   		$php[$x] = "";
   		continue; //cut comments
   	}
-  	
+
   	if ( preg_match("/^\/\*.*\*\/$/", trim($line)) ) {
   		//echo  "SKIPPING ".$php[$x];
   		$php[$x] = "";
   		continue; //cut comments
   	}
-  	
+
   	if(substr($line,0,10)=="function _")
   	{
   		$dec_parts = explode(" ",$line,2);
   		$pp = explode("(",$dec_parts[1]);
   		$name = $pp[0];
   		$attribs="(".$pp[1];
-  		
+
   		//echo "found func $name attribs: $attribs\n";
-  	  		
+
   		$start = $x;
   		for($f=$x;$f<count($php);$f++)
   		{
   			if(substr($php[$f],0,1)=="}")
   			{
-  			  $end = $f;	
+  			  $end = $f;
   			  break;
   			}
   		}
@@ -67,37 +67,37 @@
   function GetVarName($s)
   {
   	  $alphabet = "abcdefghijklmnopqrstuvwxyz_ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-  	  
+
 	  $name = "";
   	  $var_end = 0;
-  	  $char = substr($s,$var_end,1);   		
+  	  $char = substr($s,$var_end,1);
   	  if(substr($s,0,1)=="$")
   	  {
   	  	$var_end++;
-		$char = substr($s,$var_end,1);   		
-  	  }  	  	 	  
+		$char = substr($s,$var_end,1);
+  	  }
   	  while(is_numeric(strpos($alphabet,$char)) && strlen($char))
   	  {
   		$name .= $char;
   		$var_end++;
-		$char = substr($s,$var_end,1); 			
+		$char = substr($s,$var_end,1);
   	  }
   	return $name;
   }
-  
+
   function obscure_func($NewName,$Attribs,$code)
-  { 	
+  {
   	global $functions;
-  	  	
+
   	$globals = array();
-  	
+
   	$globals[] = '$this';
   	$globals[] = '$_GET';
   	$globals[] = '$_FILES';
   	$globals[] = '$_POST';
   	$globals[] = '$_COOKIE';
   	$globals[] = '$_SERVER';
-  	
+
   	$variables = array();
 
 		$new_code = array();
@@ -114,12 +114,12 @@
   			$v = explode(",",$vars);
   			for($z=0;$z<count($v);$z++)
   			  $globals[] = ltrim($v[$z]);
-  		}  		
+  		}
   		$new_code[$x] = $line;
   	}
   	$code = $new_code;
   	for($x=0;$x<count($code);$x++)
-  	{  		
+  	{
   		foreach($functions as $name=>$attr)
   		{
   			$line = $code[$x];
@@ -149,13 +149,13 @@
 	  	  }
 	  	}
   	}
-  	
+
   	for($x=0;$x<count($code);$x++)
-  	{  		
+  	{
   		$line = $code[$x];
   		if(!strlen($line))
   		  continue;
-  		$p = strpos($line,"$");  		
+  		$p = strpos($line,"$");
   		while($p>0)
   		{
   			if(substr($line,$p,2)!="$$")
@@ -168,29 +168,29 @@
   			    	$variables[$name] = '$_'.gen_name($VarCount++);
   			  }
   			}
-  			$p = strpos($line,"$",$p+1);  		
-  		}  		
-  	}  
-  	
+  			$p = strpos($line,"$",$p+1);
+  		}
+  	}
+
   	for($x=0;$x<count($code);$x++)
-  	{  
+  	{
 //  		print_r($variables);
   		foreach($variables as $v=>$varname)
-  		{  			
+  		{
   			//echo "strpos ".$code[$x].', '.$v."\n";
   			$p = strpos($code[$x],$v);
   			while(is_numeric($p))
   			{
   			  $t = GetVarName(substr($code[$x],$p));
   			  if('$'.$t == $v)
-  			  {	
+  			  {
 			    $code[$x] = substr_replace($code[$x],$varname,$p,strlen($t)+1);
   			  }
   			  $p = strpos($code[$x],$v,$p+1);
   			}
-  		}  	
+  		}
   	}
-  	
+
   	$o = "function $NewName"."(";
   	if (is_array($a)) {
 	  	foreach($a as $attr)
@@ -207,24 +207,24 @@
   	//$o = str_replace("\n","",$o);
   	return $o;
   }
-  
+
   $out = "";
   $outline = 0;
-  
+
   $shuffled = array_rand($functions, count($functions));
 //  print_r($shuffled);
 
   foreach ($shuffled as $name) {
   	$pos = $functions[$name];
-   
+
   //foreach($functions as $name =>$pos)
   //{
   	 $dest = $pos["start"];
   	 $newname = $pos["newname"];
   	 if(!$outline)
   	   $outline = $dest;
-  	 
 
+
   	 unset($code);
   	 for($x=$dest+1;$x<=$pos["end"];$x++)
   	 {
@@ -237,10 +237,10 @@
   {
   	for($x=$pos["start"];$x<=$pos["end"];$x++)
   	{
-  		$php[$x] = "";  		
+  		$php[$x] = "";
   	}
   }
-  
+
   $code =array();
   for($x=0;$x<count($php);$x++) {
   	$line = $php[$x];
@@ -251,13 +251,13 @@
 	  $code[$x] = $line;
 	}
 	$php = $code;
-  
+
   $line=1;
-  
+
   $tmp_file = fopen($argv[1].'_', 'w');
-  
+
   for($x=0;$x<count($php);$x++)
-  {  	
+  {
   	if($x==$outline) {
   	  //echo "$line: ".$out;
   	  fwrite($tmp_file, $out);
@@ -270,5 +270,5 @@
   }
   fclose($tmp_file);
   rename($argv[1].'_', $argv[1]);
-  	
+
 ?>