Moved everything in wp-inst down a directory.

Uses's Ryan Boren's htaccess rules and mods
If you're upgrading, try this on a test server first!


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@591 7be80a69-a1ef-0310-a953-fb0f7c49ff36

4 files changed, 578 insertions, 0 deletions

diff --git a/wp-includes/js/tinymce/plugins/spellchecker/classes/HttpClient.class.php b/wp-includes/js/tinymce/plugins/spellchecker/classes/HttpClient.class.php
new file mode 100755
index 0000000..cae27f0
--- /dev/null
+++ b/wp-includes/js/tinymce/plugins/spellchecker/classes/HttpClient.class.php
@@ -0,0 +1,339 @@
+<?php
+
+/* Version 0.9, 6th April 2003 - Simon Willison ( http://simon.incutio.com/ )
+   Manual: http://scripts.incutio.com/httpclient/
+*/
+
+class HttpClient {
+    // Request vars
+    var $host;
+    var $port;
+    var $path;
+    var $method;
+    var $postdata = '';
+    var $cookies = array();
+    var $referer;
+    var $accept = 'text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,image/jpeg,image/gif,*/*';
+    var $accept_encoding = 'gzip';
+    var $accept_language = 'en-us';
+    var $user_agent = 'Incutio HttpClient v0.9';
+    // Options
+    var $timeout = 20;
+    var $use_gzip = true;
+    var $persist_cookies = true;  // If true, received cookies are placed in the $this->cookies array ready for the next request
+                                  // Note: This currently ignores the cookie path (and time) completely. Time is not important, 
+                                  //       but path could possibly lead to security problems.
+    var $persist_referers = true; // For each request, sends path of last request as referer
+    var $debug = false;
+    var $handle_redirects = true; // Auaomtically redirect if Location or URI header is found
+    var $max_redirects = 5;
+    var $headers_only = false;    // If true, stops receiving once headers have been read.
+    // Basic authorization variables
+    var $username;
+    var $password;
+    // Response vars
+    var $status;
+    var $headers = array();
+    var $content = '';
+    var $errormsg;
+    // Tracker variables
+    var $redirect_count = 0;
+    var $cookie_host = '';
+    function HttpClient($host, $port=80) {
+        $this->host = $host;
+        $this->port = $port;
+    }
+    function get($path, $data = false) {
+        $this->path = $path;
+        $this->method = 'GET';
+        if ($data) {
+            $this->path .= '?'.$this->buildQueryString($data);
+        }
+        return $this->doRequest();
+    }
+    function post($path, $data) {
+        $this->path = $path;
+        $this->method = 'POST';
+        $this->postdata = $this->buildQueryString($data);
+    	return $this->doRequest();
+    }
+    function buildQueryString($data) {
+        $querystring = '';
+        if (is_array($data)) {
+            // Change data in to postable data
+    		foreach ($data as $key => $val) {
+    			if (is_array($val)) {
+    				foreach ($val as $val2) {
+    					$querystring .= urlencode($key).'='.urlencode($val2).'&';
+    				}
+    			} else {
+    				$querystring .= urlencode($key).'='.urlencode($val).'&';
+    			}
+    		}
+    		$querystring = substr($querystring, 0, -1); // Eliminate unnecessary &
+    	} else {
+    	    $querystring = $data;
+    	}
+    	return $querystring;
+    }
+    function doRequest() {
+        // Performs the actual HTTP request, returning true or false depending on outcome
+		if (!$fp = @fsockopen($this->host, $this->port, $errno, $errstr, $this->timeout)) {
+		    // Set error message
+            switch($errno) {
+				case -3:
+					$this->errormsg = 'Socket creation failed (-3)';
+				case -4:
+					$this->errormsg = 'DNS lookup failure (-4)';
+				case -5:
+					$this->errormsg = 'Connection refused or timed out (-5)';
+				default:
+					$this->errormsg = 'Connection failed ('.$errno.')';
+			    $this->errormsg .= ' '.$errstr;
+			    $this->debug($this->errormsg);
+			}
+			return false;
+        }
+        socket_set_timeout($fp, $this->timeout);
+        $request = $this->buildRequest();
+        $this->debug('Request', $request);
+        fwrite($fp, $request);
+    	// Reset all the variables that should not persist between requests
+    	$this->headers = array();
+    	$this->content = '';
+    	$this->errormsg = '';
+    	// Set a couple of flags
+    	$inHeaders = true;
+    	$atStart = true;
+    	// Now start reading back the response
+    	while (!feof($fp)) {
+    	    $line = fgets($fp, 4096);
+    	    if ($atStart) {
+    	        // Deal with first line of returned data
+    	        $atStart = false;
+    	        if (!preg_match('/HTTP\/(\\d\\.\\d)\\s*(\\d+)\\s*(.*)/', $line, $m)) {
+    	            $this->errormsg = "Status code line invalid: ".htmlentities($line);
+    	            $this->debug($this->errormsg);
+    	            return false;
+    	        }
+    	        $http_version = $m[1]; // not used
+    	        $this->status = $m[2];
+    	        $status_string = $m[3]; // not used
+    	        $this->debug(trim($line));
+    	        continue;
+    	    }
+    	    if ($inHeaders) {
+    	        if (trim($line) == '') {
+    	            $inHeaders = false;
+    	            $this->debug('Received Headers', $this->headers);
+    	            if ($this->headers_only) {
+    	                break; // Skip the rest of the input
+    	            }
+    	            continue;
+    	        }
+    	        if (!preg_match('/([^:]+):\\s*(.*)/', $line, $m)) {
+    	            // Skip to the next header
+    	            continue;
+    	        }
+    	        $key = strtolower(trim($m[1]));
+    	        $val = trim($m[2]);
+    	        // Deal with the possibility of multiple headers of same name
+    	        if (isset($this->headers[$key])) {
+    	            if (is_array($this->headers[$key])) {
+    	                $this->headers[$key][] = $val;
+    	            } else {
+    	                $this->headers[$key] = array($this->headers[$key], $val);
+    	            }
+    	        } else {
+    	            $this->headers[$key] = $val;
+    	        }
+    	        continue;
+    	    }
+    	    // We're not in the headers, so append the line to the contents
+    	    $this->content .= $line;
+        }
+        fclose($fp);
+        // If data is compressed, uncompress it
+        if (isset($this->headers['content-encoding']) && $this->headers['content-encoding'] == 'gzip') {
+            $this->debug('Content is gzip encoded, unzipping it');
+            $this->content = substr($this->content, 10); // See http://www.php.net/manual/en/function.gzencode.php
+            $this->content = gzinflate($this->content);
+        }
+        // If $persist_cookies, deal with any cookies
+        if ($this->persist_cookies && isset($this->headers['set-cookie']) && $this->host == $this->cookie_host) {
+            $cookies = $this->headers['set-cookie'];
+            if (!is_array($cookies)) {
+                $cookies = array($cookies);
+            }
+            foreach ($cookies as $cookie) {
+                if (preg_match('/([^=]+)=([^;]+);/', $cookie, $m)) {
+                    $this->cookies[$m[1]] = $m[2];
+                }
+            }
+            // Record domain of cookies for security reasons
+            $this->cookie_host = $this->host;
+        }
+        // If $persist_referers, set the referer ready for the next request
+        if ($this->persist_referers) {
+            $this->debug('Persisting referer: '.$this->getRequestURL());
+            $this->referer = $this->getRequestURL();
+        }
+        // Finally, if handle_redirects and a redirect is sent, do that
+        if ($this->handle_redirects) {
+            if (++$this->redirect_count >= $this->max_redirects) {
+                $this->errormsg = 'Number of redirects exceeded maximum ('.$this->max_redirects.')';
+                $this->debug($this->errormsg);
+                $this->redirect_count = 0;
+                return false;
+            }
+            $location = isset($this->headers['location']) ? $this->headers['location'] : '';
+            $uri = isset($this->headers['uri']) ? $this->headers['uri'] : '';
+            if ($location || $uri) {
+                $url = parse_url($location.$uri);
+                // This will FAIL if redirect is to a different site
+                return $this->get($url['path']);
+            }
+        }
+        return true;
+    }
+    function buildRequest() {
+        $headers = array();
+        $headers[] = "{$this->method} {$this->path} HTTP/1.0"; // Using 1.1 leads to all manner of problems, such as "chunked" encoding
+        $headers[] = "Host: {$this->host}";
+        $headers[] = "User-Agent: {$this->user_agent}";
+        $headers[] = "Accept: {$this->accept}";
+        if ($this->use_gzip) {
+            $headers[] = "Accept-encoding: {$this->accept_encoding}";
+        }
+        $headers[] = "Accept-language: {$this->accept_language}";
+        if ($this->referer) {
+            $headers[] = "Referer: {$this->referer}";
+        }
+    	// Cookies
+    	if ($this->cookies) {
+    	    $cookie = 'Cookie: ';
+    	    foreach ($this->cookies as $key => $value) {
+    	        $cookie .= "$key=$value; ";
+    	    }
+    	    $headers[] = $cookie;
+    	}
+    	// Basic authentication
+    	if ($this->username && $this->password) {
+    	    $headers[] = 'Authorization: BASIC '.base64_encode($this->username.':'.$this->password);
+    	}
+    	// If this is a POST, set the content type and length
+    	if ($this->postdata) {
+    	    $headers[] = 'Content-Type: application/x-www-form-urlencoded';
+    	    $headers[] = 'Content-Length: '.strlen($this->postdata);
+    	}
+    	$request = implode("\r\n", $headers)."\r\n\r\n".$this->postdata;
+    	return $request;
+    }
+    function getStatus() {
+        return $this->status;
+    }
+    function getContent() {
+        return $this->content;
+    }
+    function getHeaders() {
+        return $this->headers;
+    }
+    function getHeader($header) {
+        $header = strtolower($header);
+        if (isset($this->headers[$header])) {
+            return $this->headers[$header];
+        } else {
+            return false;
+        }
+    }
+    function getError() {
+        return $this->errormsg;
+    }
+    function getCookies() {
+        return $this->cookies;
+    }
+    function getRequestURL() {
+        $url = 'http://'.$this->host;
+        if ($this->port != 80) {
+            $url .= ':'.$this->port;
+        }            
+        $url .= $this->path;
+        return $url;
+    }
+    // Setter methods
+    function setUserAgent($string) {
+        $this->user_agent = $string;
+    }
+    function setAuthorization($username, $password) {
+        $this->username = $username;
+        $this->password = $password;
+    }
+    function setCookies($array) {
+        $this->cookies = $array;
+    }
+    // Option setting methods
+    function useGzip($boolean) {
+        $this->use_gzip = $boolean;
+    }
+    function setPersistCookies($boolean) {
+        $this->persist_cookies = $boolean;
+    }
+    function setPersistReferers($boolean) {
+        $this->persist_referers = $boolean;
+    }
+    function setHandleRedirects($boolean) {
+        $this->handle_redirects = $boolean;
+    }
+    function setMaxRedirects($num) {
+        $this->max_redirects = $num;
+    }
+    function setHeadersOnly($boolean) {
+        $this->headers_only = $boolean;
+    }
+    function setDebug($boolean) {
+        $this->debug = $boolean;
+    }
+    // "Quick" static methods
+    function quickGet($url) {
+        $bits = parse_url($url);
+        $host = $bits['host'];
+        $port = isset($bits['port']) ? $bits['port'] : 80;
+        $path = isset($bits['path']) ? $bits['path'] : '/';
+        if (isset($bits['query'])) {
+            $path .= '?'.$bits['query'];
+        }
+        $client = new HttpClient($host, $port);
+        if (!$client->get($path)) {
+            return false;
+        } else {
+            return $client->getContent();
+        }
+    }
+    function quickPost($url, $data) {
+        $bits = parse_url($url);
+        $host = $bits['host'];
+        $port = isset($bits['port']) ? $bits['port'] : 80;
+        $path = isset($bits['path']) ? $bits['path'] : '/';
+        $client = new HttpClient($host, $port);
+        if (!$client->post($path, $data)) {
+            return false;
+        } else {
+            return $client->getContent();
+        }
+    }
+    function debug($msg, $object = false) {
+        if ($this->debug) {
+            print '<div style="border: 1px solid red; padding: 0.5em; margin: 0.5em;"><strong>HttpClient Debug:</strong> '.$msg;
+            if ($object) {
+                ob_start();
+        	    print_r($object);
+        	    $content = htmlentities(ob_get_contents());
+        	    ob_end_clean();
+        	    print '<pre>'.$content.'</pre>';
+        	}
+        	print '</div>';
+        }
+    }   
+}
+
+?>
\ No newline at end of file
diff --git a/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyGoogleSpell.class.php b/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyGoogleSpell.class.php
new file mode 100755
index 0000000..971da10
--- /dev/null
+++ b/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyGoogleSpell.class.php
@@ -0,0 +1,73 @@
+<?php

+/* * 

+ * Tiny Spelling Interface for TinyMCE Spell Checking.

+ *

+ * Copyright © 2006 Moxiecode Systems AB

+ */

+

+require_once("HttpClient.class.php");

+

+class TinyGoogleSpell {

+	var $lang;

+

+	function TinyGoogleSpell(&$config, $lang, $mode, $spelling, $jargon, $encoding) {

+		$this->lang = $lang;

+	}

+

+	// Returns array with bad words or false if failed.

+	function checkWords($word_array) {

+		$words = array();

+		$wordstr = implode(' ', $word_array);

+

+		$matches = $this->_getMatches($wordstr);

+

+		for ($i=0; $i<count($matches); $i++)

+			$words[] = substr($wordstr, $matches[$i][1], $matches[$i][2]);

+

+		return $words;

+	}

+

+	// Returns array with suggestions or false if failed.

+	function getSuggestion($word) {

+		$sug = array();

+

+		$matches = $this->_getMatches($word);

+

+		if (count($matches) > 0)

+			$sug = explode("\t", $matches[0][4]);

+

+		return $sug;

+	}

+

+	function _getMatches($word_list) {

+		$xml = "";

+

+		// Setup HTTP Client

+		$client = new HttpClient('www.google.com');

+		$client->setUserAgent('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR');

+		$client->setHandleRedirects(false);

+		$client->setDebug(false);

+

+		// Setup XML request

+		$xml .= '<?xml version="1.0" encoding="utf-8" ?>';

+		$xml .= '<spellrequest textalreadyclipped="0" ignoredups="0" ignoredigits="1" ignoreallcaps="1">';

+		$xml .= '<text>' . htmlentities($word_list) . '</text></spellrequest>';

+

+		// Execute HTTP Post to Google

+		if (!$client->post('/tbproxy/spell?lang=' . $this->lang, $xml)) {

+			$this->errorMsg[] = 'An error occurred: ' . $client->getError();

+			return array();

+		}

+

+		// Grab and parse content

+		$xml = $client->getContent();

+		preg_match_all('/<c o="([^"]*)" l="([^"]*)" s="([^"]*)">([^<]*)<\/c>/', $xml, $matches, PREG_SET_ORDER);

+

+		return $matches;

+	}

+}

+

+// Setup classname, should be the same as the name of the spellchecker class

+$spellCheckerConfig['class'] = "TinyGoogleSpell";

+

+?>

diff --git a/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspell.class.php b/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspell.class.php
new file mode 100755
index 0000000..21fb194
--- /dev/null
+++ b/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspell.class.php
@@ -0,0 +1,64 @@
+<?php

+/* * 

+ * Tiny Spelling Interface for TinyMCE Spell Checking.

+ *

+ * Copyright © 2006 Moxiecode Systems AB

+ *

+ */

+

+class TinyPSpell {

+	var $lang;

+	var $mode;

+	var $string;

+	var $plink;

+	var $errorMsg;

+

+	var $jargon;

+	var $spelling;

+	var $encoding;

+

+	function TinyPSpell(&$config, $lang, $mode, $spelling, $jargon, $encoding) {

+		$this->lang = $lang;

+		$this->mode = $mode;

+		$this->plink = false;

+		$this->errorMsg = array();

+

+		if (!function_exists("pspell_new")) {

+			$this->errorMsg[] = "PSpell not found.";

+			return;

+		}

+

+		$this->plink = pspell_new($this->lang, $this->spelling, $this->jargon, $this->encoding, $this->mode);

+	}

+

+	// Returns array with bad words or false if failed.

+	function checkWords($wordArray) {

+		if (!$this->plink) {

+			$this->errorMsg[] = "No PSpell link found for checkWords.";

+			return array();

+		}

+

+		$wordError = array();

+		foreach($wordArray as $word) {

+			if(!pspell_check($this->plink, trim($word)))

+				$wordError[] = $word;

+		}

+

+		return $wordError;

+	}

+

+	// Returns array with suggestions or false if failed.

+	function getSuggestion($word) {

+		if (!$this->plink) {

+			$this->errorMsg[] = "No PSpell link found for getSuggestion.";

+			return array();

+		}

+

+		return pspell_suggest($this->plink, $word);

+	}

+}

+

+// Setup classname, should be the same as the name of the spellchecker class

+$spellCheckerConfig['class'] = "TinyPspell";

+

+?>
\ No newline at end of file
diff --git a/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspellShell.class.php b/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspellShell.class.php
new file mode 100755
index 0000000..41c0948
--- /dev/null
+++ b/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspellShell.class.php
@@ -0,0 +1,102 @@
+<?php

+/* * 

+ * Tiny Spelling Interface for TinyMCE Spell Checking.

+ *

+ * Copyright © 2006 Moxiecode Systems AB

+ *

+ */

+

+class TinyPspellShell {

+	var $lang;

+	var $mode;

+	var $string;

+	var $error;

+	var $errorMsg;

+

+	var $cmd;

+	var $tmpfile;

+

+	var $jargon;

+	var $spelling;

+	var $encoding;

+

+	function TinyPspellShell(&$config, $lang, $mode, $spelling, $jargon, $encoding) {

+		$this->lang = $lang;

+		$this->mode = $mode;

+		$this->error = false;

+		$this->errorMsg = array();

+

+		$this->tmpfile = tempnam($config['tinypspellshell.tmp'], "tinyspell");

+		$this->cmd = "cat ". $this->tmpfile ." | " . $config['tinypspellshell.aspell'] . " -a --lang=". $this->lang;

+	}

+

+	// Returns array with bad words or false if failed.

+	function checkWords($wordArray) {

+		if ($fh = fopen($this->tmpfile, "w")) {

+			fwrite($fh, "!\n");

+			foreach($wordArray as $key => $value)

+				fwrite($fh, "^" . $value . "\n");

+

+			fclose($fh);

+		} else {

+			$this->errorMsg[] = "PSpell not found.";

+			return array();

+		}

+

+		$data = shell_exec($this->cmd);

+		@unlink($this->tmpfile);

+		$returnData = array();

+		$dataArr = preg_split("/\n/", $data, -1, PREG_SPLIT_NO_EMPTY);

+

+		foreach($dataArr as $dstr) {

+			$matches = array();

+

+			// Skip this line.

+			if (strpos($dstr, "@") === 0)

+				continue;

+

+			preg_match("/\& (.*) .* .*: .*/i", $dstr, $matches);

+

+			if (!empty($matches[1]))

+				$returnData[] = $matches[1];

+		}

+

+		return $returnData;

+	}

+

+	// Returns array with suggestions or false if failed.

+	function getSuggestion($word) {

+		if ($fh = fopen($this->tmpfile, "w")) {

+			fwrite($fh, "!\n");

+			fwrite($fh, "^$word\n");

+			fclose($fh);

+		} else

+			die("Error opening tmp file.");

+

+		$data = shell_exec($this->cmd);

+		@unlink($this->tmpfile);

+		$returnData = array();

+		$dataArr = preg_split("/\n/", $data, -1, PREG_SPLIT_NO_EMPTY);

+

+		foreach($dataArr as $dstr) {

+			$matches = array();

+

+			// Skip this line.

+			if (strpos($dstr, "@") === 0)

+				continue;

+

+			preg_match("/\& .* .* .*: (.*)/i", $dstr, $matches);

+

+			if (!empty($matches[1])) {

+				// For some reason, the exec version seems to add commas?

+				$returnData[] = str_replace(",", "", $matches[1]);

+			}

+		}

+		return $returnData;

+	}

+}

+

+// Setup classname, should be the same as the name of the spellchecker class

+$spellCheckerConfig['class'] = "TinyPspellShell";

+

+?>