| + + + + | +
\n$addSQL\n\n"); + if(!$result) { + $msg = 'Error updating bot personality.'; + } + elseif($msg == "") { + $msg = 'Bot personality added.'; + } + } + + $updateSQL = "UPDATE `botpersonality` SET `value` = CASE `name` \n"; + $sql = "SELECT * FROM `botpersonality` where bot = $botId;"; + $changes = array(); + $additions = array(); + $result = mysql_query($sql, $dbconn) or $msg .= SQL_Error(mysql_errno()); + if ($result) { + while ($row = mysql_fetch_assoc($result)) { + $id = $row['id']; + $name = $row['name']; + $value = $row['value']; + $postVal = (isset($_POST[$name])) ? $_POST[$name] : ''; + if (!empty($postVal)) { + if ($postVal != $value){ + $changes[$id] = mysql_real_escape_string(stripslashes_deep($postVal)); + $additions[$id] = $name; + } + } + } + } + if (!empty($additions)) { + $changesText = implode(',', array_keys($changes)); + foreach ($changes as $id => $value) { + $name = $additions[$id]; + $updateSQL .= sprintf("WHEN '%s' THEN '%s' \n", $name, $value); + } + $updateSQL .= "END WHERE `id` IN ($changesText);"; + $saveSQL = str_replace("\n", "\r\n", $updateSQL); + $result = mysql_query($updateSQL, $dbconn) or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\n
\n$updateSQL\n\n"); + if (!$result) $msg = 'Error updating bot.'; + $msg = (empty($msg)) ? 'Bot personality updated.' : $msg; + } + else $msg = 'Something'; + mysql_close($dbconn); + return $msg; +} + +function addBotPersonality() { + $dbconn = db_open(); +/* + $postVars = print_r($_POST, true); + die ("Post vars:
\n
\n$postVars\n"); +*/ + $bot_id = $_POST['bot_id']; + $sql = "Insert into `botpersonality` (`id`, `bot`, `name`, `value`) values\n"; + $sql2 = "(null, $bot_id, '[key]', '[value]'),\n"; + $msg = ""; + $newEntryNames = (isset($_POST['newEntryName'])) ? $_POST['newEntryName'] : ''; + $newEntryValues = (isset($_POST['newEntryValue'])) ? $_POST['newEntryValue'] : ''; + if (!empty($newEntryNames)) { + foreach ($newEntryNames as $index => $key) { + $value = $newEntryValues[$index]; + if (!empty($value)) { + $tmpSQL = str_replace('[key]', $key, $sql2); + $tmpSQL = str_replace('[value]', $value, $tmpSQL); + $sql .= $tmpSQL; + } + } + } + + $skipKeys = array('bot_id', 'action', 'func', 'newEntryName', 'newEntryValue'); + foreach($_POST as $key => $value) { + if(!in_array($key, $skipKeys)) { + #if($value=="") continue; + if (is_array($value)) { + foreach ($value as $index => $fieldValue) { + $field = $key[$fieldValue]; + $fieldValue = mysql_real_escape_string(trim($fieldValue)); + $tmpSQL = str_replace('[key]', $field, $sql2); + $tmpSQL = str_replace('[value]', $fieldValue, $tmpSQL); + $sql .= $tmpSQL; + } + continue; + } + else { + $value = mysql_real_escape_string(trim($value)); + $tmpSQL = str_replace('[key]', $key, $sql2); + $tmpSQL = str_replace('[value]', $value, $tmpSQL); + $sql .= $tmpSQL; + } + } + } + $sql = rtrim($sql,",\n"); + $result = mysql_query($sql,$dbconn) or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\n$sql\n\n"); + if(!$result) { + $msg = 'Error updating bot personality.'; + } + elseif($msg == "") { + $msg = 'Bot personality added!'; + } + mysql_close($dbconn); + return $msg; +} + + + function newForm() { + $out = '
\n
| +'; + $tr = ' | ||
| +'; + + $lastBit = ' | ||
| + | + | + |
| - - - - | -
\n$sql\n\n"); - while ($row = mysql_fetch_assoc($result)) { - $id = $row['id']; - $name = $row['name']; - $value = $row['value']; - $postVal = (isset($_POST[$name])) ? $_POST[$name] : ''; - if (!empty($postVal)) { - if ($postVal != $value){ - $changes[$id] = mysql_escape_string(stripslashes_deep($postVal)); - $additions[$id] = $name; - } - } - } - $changesText = implode(',', array_keys($changes)); - foreach ($changes as $id => $value) { - $name = $additions[$id]; - $updateSQL .= sprintf("WHEN '%s' THEN '%s' \n", $name, $value); - } - $updateSQL .= "END WHERE `id` IN ($changesText);"; - #die ("
\n
\nupdate SQL = \n$updateSQL\n
\n$updateSQL\n\n"); - #die("result = $result
\n
\n$sql\n\n"); - if(!$result) { - $msg = 'Error updating bot personality.'; - } - elseif($msg == "") { - $msg = 'Bot personality added.'; - } - mysql_close($dbconn); - return $msg; -} - - function newForm() { - return <<
\n
|
- Your Name: - - |
-
- Your Email Address: - - |
-
- Subject: - - |
- |
|
- Message: - - |
- |||
|
- - Use this handy form to submit a bug report to Liz and Company over at the Program O website. - Please describe the problem as completely as possible, including what actions you were trying - to perform at the time that you noticed the problem. - - |
-
- - - |
-
- - Answer the question you see in the image on the left into the text area - below. We are looking for a one word answer (no numbers). Sry, but bots are not allowed. - - - |
- |
| - - | -|||
|
+ Your Name: + + |
+
+ Your Email Address: + + |
+
+ Subject: + + |
+ |
|
+ Message: + + |
+ |||
|
+ + Use this handy form to submit a bug report to Liz and Company over at the Program O website. + Please describe the problem as completely as possible, including what actions you were trying + to perform at the time that you noticed the problem. + + |
+
+ + + |
+
+ + Answer the question you see in the image on the left into the text area + below. We are looking for a one word answer (no numbers). Sry, but bots are not allowed. + + + |
+ |
| + + | +|||
[convo]
- - - - - - - - - - - - - - - - - - - - - -[blank]
-
-
- [rssRowTitle]
-[rssRowContent]
-- Here's where you add, remove or edit admin accounts. -
-[members_list_form] -[members_content] -[action] Admin Account:
- - - -[blank]- This uploader can only handle aiml files of 1MB or less. - This script does not perform XML validation, but you can - validate your AIML files prior to uploading - (STRONGLY SUGGESTED) using W3School's - XML Validator. -
-[upload_content] -[convo]
+ + + + + + + + + + + + + + + + + + + + + +[blank]
+
+
+ [rssRowTitle]
+[rssRowContent]
++ Here's where you add, remove or edit admin accounts. +
+[members_list_form] +[members_content] +[action] Admin Account:
+ + + +[blank]+ Use this uploader to add AIML categories to your chatbot's database. You have the option + to upload either individual AIML files, or ZIP archive files of up to 2MB in size. + This uploader no longer performs XML validation, so you need to validate your AIML files prior to + uploading them. It's STRONGLY SUGGESTED that you use either W3School's + XML Validator, + or the GCC AIML Validator. + There are other XML validators available, but the W3Schools validator is one of the best, + and the one at Geek Cave Creations is specifically designed to validate AIML files. +
+[upload_content] +© 2011 My Program-O
www.program-o.com
' . print_r($_SESSION, true) . "
© 2011-2012 My Program-O
www.program-o.com
' . print_r($_SESSION, true) . "
$description
"; + } + } + } + else $out = 'RSS Feed not available'; + return $out; + } + + function getCurrentVersion() + { + $url = 'https://api.github.com/repos/Program-O/Program-O/contents/version.txt'; + $out = false; + if (function_exists('curl_init')) + { + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + $out = curl_exec($ch); + if (false === $out) trigger_error('Not sure what it is, but there\'s a problem with checking the current version on GitHub. Maybe this will help: "' . curl_error($ch) . '"'); + curl_close($ch); + $repoArray = json_decode($out, true); + $versionB64 = $repoArray['content']; + $version = base64_decode($versionB64); + $out = $version; + } + return $out; + } + +?> diff --git a/admin/logs.php b/admin/logs.php index 0e40182..7c4433e 100644 --- a/admin/logs.php +++ b/admin/logs.php @@ -1,241 +1,241 @@ - - - -endScript; - - $topNav = $template->getSection('TopNav'); - $leftNav = $template->getSection('LeftNav'); - $main = $template->getSection('Main'); - $topNavLinks = makeLinks('top', $topLinks, 12); - $leftNavLinks = makeLinks('left', $leftLinks, 12); - $FooterInfo = getFooter(); - $errMsgClass = (!empty($msg)) ? "ShowError" : "HideError"; - $errMsgStyle = $template->getSection($errMsgClass); - $rightNav = $template->getSection('RightNav'); - $navHeader = $template->getSection('NavHeader'); - $noLeftNav = ''; - $noTopNav = ''; - $noRightNav = ''; - $headerTitle = 'Actions:'; - $pageTitle = 'My-Program O - Chat Logs'; - $mainContent = $template->getSection('ConversationLogs1'); - $mainTitle = 'Chat Logs'; - - $rightNav = str_replace('[rightNavLinks]', $show_this . $user_list, $rightNav); - $rightNav = str_replace('[navHeader]', $navHeader, $rightNav); - $rightNav = str_replace('[headerTitle]', 'Log Actions:', $rightNav); - $mainContent = str_replace('[show_this]', '', $mainContent); - $mainContent = str_replace('[convo]', $convo, $mainContent); - $mainContent = str_replace('[bot_name]', $bot_name, $mainContent); - -function getUserNames() { - $dbconn = db_open(); - $sql = "select `id`, `name` from `users` where 1;"; - $result = mysql_query($sql,$dbconn); - $nameList = array(); - while ($row = mysql_fetch_assoc($result)) { - $nameList[$row['id']] = $row['name']; - } - mysql_close($dbconn); - return $nameList; -} - -function getuserList($showing) { - //db globals - global $template, $adm_dbn; - $nameList = getUserNames(); - $curUserid = (isset($_GET['id'])) ? $_GET['id'] : -1; - #die ("user names:$description
"; - } - } - return $out; - } - - function getXML_section($file, $tagName, $count = 1) { - $startTagSearch = "<$tagName>"; - $endTagSearch = ""; - $atomicTagSearch = "<$tagName />"; - $alternateAtomicTagSearch = "<$tagName/>"; - $foundPositions = array(-1); - $pos = 0; - $n = 0; - while ($pos !== false) { - switch (true) { - case ($newPos = stripos($file, $startTagSearch, $pos)): - case ($newPos = stripos($file, $atomicTagSearch, $pos)): - case ($newPos = stripos($file, $alternateAtomicTagSearch, $pos)): - $foundPositions[] = $newPos; - break; - default: - $pos = $newPos; - } - $n++; - if ($n > 50) break; - } - $startPos = $foundPositions[$count]; - $endPos = stripos($file, $endTagSearch, $startPos); - $len = $endPos - $startPos; - return substr($file, $startPos, $len); - } - +getSection('NoRightNav'); + $logo = $template->getSection('Logo'); + $topNav = $template->getSection('TopNav'); + $leftNav = $template->getSection('LeftNav'); + $main = $template->getSection('Main'); + $rightNav = ''; + $footer = trim($template->getSection('Footer')); + #$lowerScripts = ''; + #$pageTitleInfo = ''; + $divDecoration = $template->getSection('DivDecoration'); + $topNavLinks = makeLinks('top', $topLinks, 12); + $navHeader = $template->getSection('NavHeader'); + $leftNavLinks = makeLinks('left', $leftLinks, 12); + $mainTitle = 'Home'; + $rightNavLinks = ''; + $FooterInfo = getFooter(); + $titleSpan = $template->getSection('TitleSpan'); + $errMsgStyle = (!empty($msg)) ? "ShowError" : "HideError"; + $errMsgStyle = $template->getSection($errMsgStyle); + $mediaType = ' media="screen"'; + $upperScripts = ''; + $noLeftNav = ''; + $noTopNav = ''; + $pageTitle = 'My-Program O - Main Page'; + $headerTitle = 'Actions:'; + $mainContent = <<\n Post Vars:\n$myPost\n\n"); - - $uname = ''; - $action = (isset($_POST['action'])) ? ucfirst(strtolower($_POST['action'])) : 'Add'; - if (!empty($_POST)) { - $msg = save($action); - $action = 'Add'; - } - $id = (isset($_POST['id'])) ? $_POST['id'] : getNextID(); - $id = ($id <= 0) ? getNextID() : $id; - if (isset($_POST['memberSelect'])) { - $id = $_POST['memberSelect']; - getMemberData($_POST['memberSelect']); - } - $upperScripts = <<
$sql
\n Post Vars:\n$myPost\n\n"); + + $uname = ''; + $action = (isset($_POST['action'])) ? ucfirst(strtolower($_POST['action'])) : 'Add'; + if (!empty($_POST)) { + $msg = save($action); + #$action = ($action == 'editfromlist') ? 'Edit' : $action; + } + + $id = (isset($_POST['id']) and $action != 'Add') ? $_POST['id'] : getNextID(); + $id = ($id <= 0) ? getNextID() : $id; + if (isset($_POST['memberSelect'])) { + $id = $_POST['memberSelect']; + getMemberData($_POST['memberSelect']); + } + $upperScripts = <<
$sql
\n$sql\n\n"); - $result = mysql_query($sql,$dbconn) or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
-
-
- 
-
-endLink;
-
- $htmltbl .= <<\n$sql\n\n"); + $result = mysql_query($sql,$dbconn) or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
+
+
+
+
+endLink;
+
+ $htmltbl .= <<| missspelling | -Correction | -Action | -
|---|---|---|
| $misspell | -$correction | -$action | -
| missspelling | +Correction | +Action | +
|---|---|---|
| $misspell | +$correction | +$action | +
|$mainContent|
|$mainContent|
$sql
- 
- ' . htmlentities("File contents:
\n$aimlFile"));
+ try
+ {
+ libxml_use_internal_errors(true);
+ $xml = new DOMDocument();
+ $xml->loadXML($aimlFile);
+ //$xml->validate();
+ $aiml = new SimpleXMLElement($xml->saveXML());
+ $rowCount = 0;
+ if (!empty ($aiml->topic))
+ {
+ foreach ($aiml->topic as $topicXML)
+ {
+ # handle any topic tag(s) in the file
+ $topicAttributes = $topicXML->attributes();
+ $topic = $topicAttributes['name'];
+ foreach ($topicXML->category as $category)
+ {
+ $fullCategory = $category->asXML();
+ $pattern = $category->pattern;
+ $pattern = str_replace("'", ' ', $pattern);
+ $that = $category->that;
+ $template = $category->template->asXML();
+ $template = str_replace('', '', $template);
+ $template = str_replace('', '', $template);
+ $aiml_add = str_replace("\r\n", '', $fullCategory);
+ # Strip CRLF from category (windows)
+ $aiml_add = str_replace("\n", '', $aiml_add);
+ # Strip LF from category (mac/*nix)
+ $sql_add = str_replace('[aiml_add]', mysql_real_escape_string($aiml_add), $sql_template);
+ $sql_add = str_replace('[pattern]', $pattern, $sql_add);
+ $sql_add = str_replace('[that]', $that, $sql_add);
+ $sql_add = str_replace('[template]', mysql_real_escape_string($template), $sql_add);
+ $sql_add = str_replace('[topic]', $topic, $sql_add);
+ $sql .= "$sql_add";
+ $rowCount++;
+ if ($rowCount >= 100)
+ {
+ $rowCount = 0;
+ $sql = rtrim($sql, ",\n") . ';';
+ $success = (updateDB($sql) >= 0) ? true : false;
+ $sql = $sql_start;
+ }
+ }
+ }
+ }
+ if (!empty ($aiml->category))
+ {
+ foreach ($aiml->category as $category)
+ {
+ $fullCategory = $category->asXML();
+ $pattern = $category->pattern;
+ $pattern = str_replace("'", ' ', $pattern);
+ $that = $category->that;
+ $template = $category->template->asXML();
+ $template = str_replace('', '', $template);
+ $template = str_replace('', '', $template);
+ $aiml_add = str_replace("\r\n", '', $fullCategory);
+ # Strip CRLF from category (windows)
+ $aiml_add = str_replace("\n", '', $aiml_add);
+ # Strip LF from category (mac/*nix)
+ $sql_add = str_replace('[aiml_add]', mysql_real_escape_string($aiml_add), $sql_template);
+ $sql_add = str_replace('[pattern]', $pattern, $sql_add);
+ $sql_add = str_replace('[that]', $that, $sql_add);
+ $sql_add = str_replace('[template]', mysql_real_escape_string($template), $sql_add);
+ $sql_add = str_replace('[topic]', '', $sql_add);
+ $sql .= "$sql_add";
+ $rowCount++;
+ if ($rowCount >= 100)
+ {
+ $rowCount = 0;
+ $sql = rtrim($sql, ",\n") . ';';
+ $success = (updateDB($sql) >= 0) ? true : false;
+ $sql = $sql_start;
+ }
+ }
+ }
+ if ($sql != $sql_start)
+ {
+ $sql = rtrim($sql, ",\n") . ';';
+ $success = (updateDB($sql) >= 0) ? true : false;
+ }
+ $msg = "Successfully added $fileName to the database.
\n";
+ }
+ catch (Exception $e)
+ {
+ $success = false;
+ $msg = "There was a problem adding file $fileName to the database. Please validate the file and try again.
\n";
+ $msg = libxml_display_errors($msg);
+ }
+ return $msg;
+ }
+
+ function updateDB($sql)
+ {
+ $dbconn = db_open();
+ $result = mysql_query($sql, $dbconn) or die('You have a SQL error on line ' . __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = " . htmlentities($sql) . "
\n");
+ $commit = mysql_affected_rows($dbconn);
+ return $commit;
+ }
+
+ function processUpload()
+ {
+ global $msg;
+ // Validate the uploaded file
+ if ($_FILES['aimlfile']['size'] === 0 or empty ($_FILES['aimlfile']['tmp_name']))
+ {
+ $msg = 'No file was selected.';
+ }
+ elseif ($_FILES['aimlfile']['size'] > 2000000)
+ {
+ $msg = 'The file was too large.';
+ }
+ else
+ if ($_FILES['aimlfile']['error'] !== UPLOAD_ERR_OK)
+ {
+ // There was a PHP error
+ $msg = 'There was an error uploading.';
+ }
+ else
+ {
+ // Create uploads directory if necessary
+ if (!file_exists('uploads'))
+ mkdir('uploads');
+ // Move the file
+ $file = './uploads/' . $_FILES['aimlfile']['name'];
+ if (move_uploaded_file($_FILES['aimlfile']['tmp_name'], $file))
+ {
+ if ($_FILES['aimlfile']['type'] == 'application/zip') return processZip($file);
+ else return parseAIML($file,file_get_contents($file));
+ }
+ else
+ {
+ $msg = 'There was an error moving the file.';
+ }
+ }
+ //die($msg);
+ $_SESSION['errorMessage'] = $msg;
+ }
+
+ function getAIML_List()
+ {
+ global $dbn, $bot_id;
+ $out = " \n";
+ $dbconn = db_open();
+ $sql = "SELECT DISTINCT filename FROM `aiml` where `bot_id` = $bot_id order by `filename`;";
+ $result = mysql_query($sql, $dbconn) or die(mysql_error());
+ while ($row = mysql_fetch_assoc($result))
+ {
+ if (empty ($row['filename']))
+ {
+ $curOption = " No Filename entry
\n";
+ }
+ else
+ $out .= $row['filename'] . "
\n";
+ }
+ mysql_close($dbconn);
+ $out .= " \n";
+ return $out;
+ }
+
+ function getBotList()
+ {
+ global $dbn, $bot_id;
+ $botOptions = '';
+ $dbconn = db_open();
+ $sql = 'SELECT `bot_name`, `bot_id` FROM `bots` order by `bot_id`;';
+ $result = mysql_query($sql, $dbconn) or die(mysql_error());
+ while ($row = mysql_fetch_assoc($result))
+ {
+ $bn = $row['bot_name'];
+ $bi = $row['bot_id'];
+ $sel = ($bot_id == $bi) ? ' selected="selected"' : '';
+ $botOptions .= " $bn\n";
+ }
+ mysql_close($dbconn);
+ return $botOptions;
+ }
+
+ function libxml_display_errors($msg)
+ {
+ $errors = libxml_get_errors();
+ //die ('Errors = ' . print_r($errors));
+ foreach ($errors as $error)
+ {
+ $msg .= libxml_display_error($error) . "
\n";
+ }
+ libxml_clear_errors();
+ return $msg;
+ }
+
+ function libxml_display_error($error)
+ {
+ $out = "
\n";
+ switch ($error->level)
+ {
+ case LIBXML_ERR_WARNING :
+ $out .= "Warning $error->code: ";
+ break;
+ case LIBXML_ERR_ERROR :
+ $out .= "Error $error->code: ";
+ break;
+ case LIBXML_ERR_FATAL :
+ $out .= "Fatal Error $error->code: ";
+ break;
+ }
+ $out .= trim($error->message);
+ if ($error->file)
+ {
+ $out .= " in $error->file";
+ }
+ $out .= " on line $error->line\n";
+ return $out;
+ }
+
+ function processZip($fileName)
+ {
+ $out = '';
+ $zipName = basename($fileName);
+ $zip = new ZipArchive;
+ $res = $zip->open($fileName);
+ if ($res === TRUE) {
+ $numFiles = $zip->numFiles;
+ for ($loop = 0; $loop < $numFiles-1; $loop++)
+ {
+ $curName = $zip->getNameIndex($loop);
+ if (strstr($curName, '/') !== false)
+ {
+ $endPos = strrpos($curName, '/') + 1;
+ $curName = substr($curName, $endPos);
+ }
+ if (empty($curName)) continue;
+ $fp = $zip->getStream($zip->getNameIndex($loop));
+ if(!$fp)
+ {
+ $out .= "Processing for $curName failed.
\n";
+ }
+ else
+ {
+ $curText = '';
+ while (!feof($fp))
+ {
+ $curText .= fread($fp, 8192);
+ }
+ fclose($fp);
+ $out .= "Processing file $curName
\n";
+ if (!stristr($curName, '.aiml'))
+ {
+ $out .= "file $curName is not an AIML file - Ignoring.
\n";
+ continue;
+ }
+ $out .= parseAIML($curName, $curText);
+ }
+ }
+ $zip->close();
+ $out .= "Upload complete. $numFiles files were processed.
\n";
+ }
+ else
+ {
+ $out = "Upload failed. $fileName was either corrupted, or not a zip file." ;
+ }
+ return $out;
+ }
+
?>
\ No newline at end of file
diff --git a/admin/wordcensor.php b/admin/wordcensor.php
index 6b160ae..b9079f6 100644
--- a/admin/wordcensor.php
+++ b/admin/wordcensor.php
@@ -1,303 +1,307 @@
-
-
-endScript;
-
- $group = (isset($_GET['group'])) ? $_GET['group'] : 1;
- $content = $template->getSection('SearchWordCensorForm');
- if (isset($_REQUEST['action'])) {
- switch($_REQUEST['action']) {
- case 'search':
- $content .= runWordCensorSearch();
- $content .= wordCensorForm();
- break;
- case 'update':
- $x = updateWordCensor();
- $content .= wordCensorForm();
- break;
- case 'del':
- $content .= (isset($_GET['id']))&&($_GET['id']!="") ? delWordCensor($_GET['id']) . wordCensorForm() : wordCensorForm();
- break;
- case 'edit':
- $content .= (isset($_GET['id']))&&($_GET['id']!="") ? editWordCensorForm($_GET['id']) : wordCensorForm();
- break;
- case 'add':
- $x = insertWordCensor();
- $content .= wordCensorForm();
- break;
- default:
- $content .= wordCensorForm();
- }
- }
- else {
- $content .= wordCensorForm();
- }
- $content = str_replace('[group]', $group, $content);
-
- $topNav = $template->getSection('TopNav');
- $leftNav = $template->getSection('LeftNav');
- $main = $template->getSection('Main');
- $topNavLinks = makeLinks('top', $topLinks, 12);
- $navHeader = $template->getSection('NavHeader');
- $rightNav = $template->getSection('RightNav');
- $leftNavLinks = makeLinks('left', $leftLinks, 12);
- $rightNavLinks = getWordCensorWords();
- $FooterInfo = getFooter();
- $errMsgClass = (!empty($msg)) ? "ShowError" : "HideError";
- $errMsgStyle = $template->getSection($errMsgClass);
- $noLeftNav = '';
- $noTopNav = '';
- $noRightNav = '';
- $headerTitle = 'Actions:';
- $pageTitle = 'My-Program O - Word Censor Editor';
- $mainContent = $content;
- $mainTitle = 'Word Censor Editor';
-
- $mainContent = str_replace('[wordCensorForm]', wordCensorForm(), $mainContent);
- $rightNav = str_replace('[rightNavLinks]', $rightNavLinks, $rightNav);
- $rightNav = str_replace('[navHeader]', $navHeader, $rightNav);
- $rightNav = str_replace('[headerTitle]', paginate(), $rightNav);
-
- function paginate() {
- $dbConn = db_open();
- $sql = "select count(*) from `wordcensor` where 1";
- $result = mysql_query($sql) or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = $sql
\n");
- $row = mysql_fetch_array($result);
- $rowCount = $row[0];
- mysql_close($dbConn);
- $lastPage = intval($rowCount / 50);
- $remainder = ($rowCount / 50) - $lastPage;
- if ($remainder > 0) $lastPage++;
- #die ("Session values:
\n" . print_r($_SESSION, true) . "
\nCount = $count
\n");
- $out = "Censored Words
\n50 words per page:
\n";
- $link=" - [label]";
- $curStart = (isset($_GET['group'])) ? $_GET['group'] : 1;
- $firstPage = 1;
- $prev = ($curStart > ($firstPage + 1)) ? $curStart - 1 : -1;
- $next = ($lastPage > ($curStart + 1)) ? $curStart + 1 : -1;
- $firstLink = ($firstPage != $curStart) ? str_replace('[group]', '1', $link) : '';
- $prevLink = ($prev > 0) ? str_replace('[group]', $prev, $link) : '';
- $curLink = "- $curStart ";
- if (empty($firstLink) and empty($prevLink)) $curLink = $curStart;
- $nextLink = ($next > 0) ? str_replace('[group]', $next, $link) : '';
- $lastLink = ($lastPage > $curStart) ? str_replace('[group]', $lastPage, $link) : '';
- $firstLink = str_replace('[label]', 'first', $firstLink);
- $prevLink = str_replace('[label]', '<<', $prevLink);
- $nextLink = str_replace('[label]', '>>', $nextLink);
- $lastLink = str_replace('[label]', 'last', $lastLink);
- $out .= ltrim("$firstLink\n$prevLink\n$curLink\n$nextLink\n$lastLink", " - ");
- return $out;
- }
-
- function getWordCensorWords() {
- global $template;
- # pagination variables
- $group = (isset($_GET['group'])) ? $_GET['group'] : 1;
- $_SESSION['poadmin']['group'] = $group;
- $startEntry = ($group - 1) * 50;
- $startEntry = ($startEntry < 0) ? 0 : $startEntry;
- $end = $group + 50;
- $_SESSION['poadmin']['page_start'] = $group;
- $dbconn = db_open();
- $curID = (isset($_GET['id'])) ? $_GET['id'] : -1;
- $sql = "select `censor_id`,`word_to_censor` from `wordcensor` where 1 order by abs(`censor_id`) asc limit $startEntry, 50;";
- #die ("SQL = $sql
\n");
- $baseLink = $template->getSection('NavLink');
- $links = ' ' . "\n";
- $result = mysql_query($sql, $dbconn) or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = $sql
\n");
- $count = 0;
- while ($row = mysql_fetch_assoc($result)) {
- $linkId = $row['censor_id'];
- $linkClass = ($linkId == $curID) ? 'selected' : 'noClass';
- $word_to_censor = $row['word_to_censor'];
- $tmpLink = str_replace('[linkClass]', " class=\"$linkClass\"", $baseLink);
- $linkHref = " href=\"./?page=wordcensor&action=edit&id=$linkId&group=$group#$linkId\" name=\"$linkId\"";
- $tmpLink = str_replace('[linkHref]', $linkHref, $tmpLink);
- $tmpLink = str_replace('[linkOnclick]', '', $tmpLink);
- $tmpLink = str_replace('[linkTitle]', " title=\"Edit spelling replace_with for the word '$word_to_censor'\"", $tmpLink);
- $tmpLink = str_replace('[linkLabel]', $word_to_censor, $tmpLink);
- $links .= "$tmpLink\n";
- $count++;
- }
- $page_count = intval($count / 50);
- $_SESSION['poadmin']['page_count'] = $page_count + (($count / 50) > $page_count) ? 1 : 0;
- $links .= "\n \n";
- return $links;
- }
-
-function wordCensorForm() {
- global $template;
- $out = $template->getSection('WordCensorForm');
- $group = (isset($_GET['group'])) ? $_GET['group'] : 1;
- $out = str_replace('[group]', $group, $out);
- return $out;
-}
-
-function insertWordCensor() {
- //global vars
- global $template, $msg;
- $dbconn = db_open();
-
- $replace_with = mysql_escape_string(trim($_POST['replace_with']));
- $word_to_censor = mysql_escape_string(trim($_POST['word_to_censor']));
-
- if(($replace_with == "") || ($word_to_censor == "")) {
- $msg = ' You must enter a spelling mistake and the replace_with.' . "\n";
- }
- else {
- $sql = "INSERT INTO `wordcensor` VALUES (NULL,'$word_to_censor','$replace_with')";
- $result = mysql_query($sql,$dbconn) or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = $sql
\n");
-
- if($result) {
- $msg = 'Correction added.';
- }
- else {
- $msg = 'There was a problem editing the replace_with - no changes made.';
- }
- }
- mysql_close($dbconn);
-
- return $msg;
-}
-
-function delWordCensor($id) {
- global $template, $msg;
- $dbconn = db_open();
- if($id=="") {
- $msg = 'There was a problem editing the replace_with - no changes made.';
- }
- else {
- $sql = "DELETE FROM `wordcensor` WHERE `censor_id` = '$id' LIMIT 1";
- $result = mysql_query($sql,$dbconn)or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = $sql
\n");
- if($result) {
- $msg = 'Correction deleted.';
- }
- else {
- $msg = 'There was a problem editing the replace_with - no changes made.';
- }
- }
- mysql_close($dbconn);
-}
-
-
-function runWordCensorSearch() {
- //global vars
- global $template;
- $dbconn = db_open();
- $i=0;
- $search = mysql_escape_string(trim($_POST['search']));
- $sql = "SELECT * FROM `wordcensor` WHERE `word_to_censor` LIKE '%$search%' OR `replace_with` LIKE '%$search%' LIMIT 50";
- $result = mysql_query($sql,$dbconn)or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = $sql
\n");
- $htmltbl = '
-
-
- word_to_censor
- Correction
- Action
-
-
- ';
- while($row=mysql_fetch_array($result)) {
- $i++;
- $word_to_censor = strtoupper($row['word_to_censor']);
- $replace_with = strtoupper($row['replace_with']);
- $id = $row['censor_id'];
- $group = round(($id / 50));
- $action = "![](\"images/edit.png\")
- ![](\"images/del.png\")
";
- $htmltbl .= "
- $word_to_censor
- $replace_with
- $action
- ";
- }
- $htmltbl .= "
";
-
- if($i >= 50) {
- $msg = "Found more than 50 results for '$search', please refine your search further";
- }
- elseif($i == 0) {
- $msg = "Found 0 results for '$search'. You can use the form below to add that entry.";
- $htmltbl="";
- }
- else {
- $msg = "Found $i results for '$search'";
- }
- $htmlresults = "$msg".$htmltbl;
- mysql_close($dbconn);
- return $htmlresults;
-}
-
-function editWordCensorForm($id) {
- //global vars
- global $template;
- $group = (isset($_GET['group'])) ? $_GET['group'] : 1;
- $form = $template->getSection('EditWordCensorForm');
- $dbconn = db_open();
- $sql = "SELECT * FROM `wordcensor` WHERE `censor_id` = '$id' LIMIT 1";
- $result = mysql_query($sql,$dbconn)or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = $sql
\n");
- $row = mysql_fetch_array($result);
- $form = str_replace('[censor_id]', $row['censor_id'], $form);
- $form = str_replace('[word_to_censor]', strtoupper($row['word_to_censor']), $form);
- $form = str_replace('[replace_with]', strtoupper($row['replace_with']), $form);
- $form = str_replace('[group]', $group, $form);
- mysql_close($dbconn);
- return $form;
-}
-
-function updateWordCensor() {
- //global vars
- global $template, $msg;
- $dbconn = db_open();
- $word_to_censor = mysql_escape_string(trim($_POST['word_to_censor']));
- $replace_with = mysql_escape_string(trim($_POST['replace_with']));
- $id = trim($_POST['id']);
- if(($id=="")||($word_to_censor=="")||($replace_with=="")) {
- $msg = 'There was a problem editing the replace_with - no changes made.';
- }
- else {
- $sql = "UPDATE `wordcensor` SET `word_to_censor` = '$word_to_censor',`replace_with`='$replace_with' WHERE `censor_id`='$id' LIMIT 1";
- $result = mysql_query($sql,$dbconn)or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = $sql
\n");
- if($result) {
- $msg = 'Correction edited.';
- }
- else {
- $msg = 'There was a problem editing the replace_with - no changes made.';
- }
- }
-}
-
+
+
+endScript;
+ $form = print_r($_REQUEST, true);
+ #die("\nRequest vars:\n\n$form\n
\n");
+ $group = (isset($_REQUEST['group'])) ? $_REQUEST['group'] : 1;
+ $content = $template->getSection('SearchWordCensorForm');
+ $wc_action = isset($_REQUEST['action']) ? strtolower($_REQUEST['action']) : '';
+ $wc_id = isset($_REQUEST['censor_id']) ? $_REQUEST['censor_id'] : -1;
+ if (!empty($wc_action)) {
+ switch($wc_action) {
+ case 'search':
+ $content .= runWordCensorSearch();
+ $content .= wordCensorForm();
+ break;
+ case 'update':
+ $x = updateWordCensor();
+ $content .= wordCensorForm();
+ break;
+ case 'delete':
+ #die("Delete called! id = $wc_id");
+ $content .= ($wc_id >= 0) ? delWordCensor($wc_id) . wordCensorForm() : wordCensorForm();
+ break;
+ case 'edit':
+ $content .= ($wc_id >= 0) ? editWordCensorForm($wc_id) : wordCensorForm();
+ break;
+ case 'add':
+ $x = insertWordCensor();
+ $content .= wordCensorForm();
+ break;
+ default:
+ $content .= wordCensorForm();
+ }
+ }
+ else {
+ $content .= wordCensorForm();
+ }
+ $content = str_replace('[group]', $group, $content);
+
+ $topNav = $template->getSection('TopNav');
+ $leftNav = $template->getSection('LeftNav');
+ $main = $template->getSection('Main');
+ $topNavLinks = makeLinks('top', $topLinks, 12);
+ $navHeader = $template->getSection('NavHeader');
+ $rightNav = $template->getSection('RightNav');
+ $leftNavLinks = makeLinks('left', $leftLinks, 12);
+ $rightNavLinks = getWordCensorWords();
+ $FooterInfo = getFooter();
+ $errMsgClass = (!empty($msg)) ? "ShowError" : "HideError";
+ $errMsgStyle = $template->getSection($errMsgClass);
+ $noLeftNav = '';
+ $noTopNav = '';
+ $noRightNav = '';
+ $headerTitle = 'Actions:';
+ $pageTitle = 'My-Program O - Word Censor Editor';
+ $mainContent = $content;
+ $mainTitle = 'Word Censor Editor';
+
+ $mainContent = str_replace('[wordCensorForm]', wordCensorForm(), $mainContent);
+ $rightNav = str_replace('[rightNavLinks]', $rightNavLinks, $rightNav);
+ $rightNav = str_replace('[navHeader]', $navHeader, $rightNav);
+ $rightNav = str_replace('[headerTitle]', paginate(), $rightNav);
+
+ function paginate() {
+ $dbConn = db_open();
+ $sql = "select count(*) from `wordcensor` where 1";
+ $result = mysql_query($sql) or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = $sql
\n");
+ $row = mysql_fetch_array($result);
+ $rowCount = $row[0];
+ mysql_close($dbConn);
+ $lastPage = intval($rowCount / 50);
+ $remainder = ($rowCount / 50) - $lastPage;
+ if ($remainder > 0) $lastPage++;
+ #die ("Session values:
\n" . print_r($_SESSION, true) . "
\nCount = $count
\n");
+ $out = "Censored Words
\n50 words per page:
\n";
+ $link=" - [label]";
+ $curStart = (isset($_GET['group'])) ? $_GET['group'] : 1;
+ $firstPage = 1;
+ $prev = ($curStart > ($firstPage + 1)) ? $curStart - 1 : -1;
+ $next = ($lastPage > ($curStart + 1)) ? $curStart + 1 : -1;
+ $firstLink = ($firstPage != $curStart) ? str_replace('[group]', '1', $link) : '';
+ $prevLink = ($prev > 0) ? str_replace('[group]', $prev, $link) : '';
+ $curLink = "- $curStart ";
+ if (empty($firstLink) and empty($prevLink)) $curLink = $curStart;
+ $nextLink = ($next > 0) ? str_replace('[group]', $next, $link) : '';
+ $lastLink = ($lastPage > $curStart) ? str_replace('[group]', $lastPage, $link) : '';
+ $firstLink = str_replace('[label]', 'first', $firstLink);
+ $prevLink = str_replace('[label]', '<<', $prevLink);
+ $nextLink = str_replace('[label]', '>>', $nextLink);
+ $lastLink = str_replace('[label]', 'last', $lastLink);
+ $out .= ltrim("$firstLink\n$prevLink\n$curLink\n$nextLink\n$lastLink", " - ");
+ return $out;
+ }
+
+ function getWordCensorWords() {
+ global $template;
+ # pagination variables
+ $group = (isset($_GET['group'])) ? $_GET['group'] : 1;
+ $_SESSION['poadmin']['group'] = $group;
+ $startEntry = ($group - 1) * 50;
+ $startEntry = ($startEntry < 0) ? 0 : $startEntry;
+ $end = $group + 50;
+ $_SESSION['poadmin']['page_start'] = $group;
+ $dbconn = db_open();
+ $curID = (isset($_GET['id'])) ? $_GET['id'] : -1;
+ $sql = "select `censor_id`,`word_to_censor` from `wordcensor` where 1 order by abs(`censor_id`) asc limit $startEntry, 50;";
+ #die ("SQL = $sql
\n");
+ $baseLink = $template->getSection('NavLink');
+ $links = ' ' . "\n";
+ $result = mysql_query($sql, $dbconn) or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = $sql
\n");
+ $count = 0;
+ while ($row = mysql_fetch_assoc($result)) {
+ $linkId = $row['censor_id'];
+ $linkClass = ($linkId == $curID) ? 'selected' : 'noClass';
+ $word_to_censor = $row['word_to_censor'];
+ $tmpLink = str_replace('[linkClass]', " class=\"$linkClass\"", $baseLink);
+ $linkHref = " href=\"./?page=wordcensor&action=edit&censor_id=$linkId&group=$group#$linkId\" name=\"$linkId\"";
+ $tmpLink = str_replace('[linkHref]', $linkHref, $tmpLink);
+ $tmpLink = str_replace('[linkOnclick]', '', $tmpLink);
+ $tmpLink = str_replace('[linkTitle]', " title=\"Edit spelling replace_with for the word '$word_to_censor'\"", $tmpLink);
+ $tmpLink = str_replace('[linkLabel]', $word_to_censor, $tmpLink);
+ $links .= "$tmpLink\n";
+ $count++;
+ }
+ $page_count = intval($count / 50);
+ $_SESSION['poadmin']['page_count'] = $page_count + (($count / 50) > $page_count) ? 1 : 0;
+ $links .= "\n \n";
+ return $links;
+ }
+
+function wordCensorForm() {
+ global $template;
+ $out = $template->getSection('WordCensorForm');
+ $group = (isset($_GET['group'])) ? $_GET['group'] : 1;
+ $out = str_replace('[group]', $group, $out);
+ return $out;
+}
+
+function insertWordCensor() {
+ //global vars
+ global $template, $msg;
+ $dbconn = db_open();
+
+ $replace_with = mysql_real_escape_string(trim($_POST['replace_with']));
+ $word_to_censor = mysql_real_escape_string(trim($_POST['word_to_censor']));
+
+ if(($replace_with == "") || ($word_to_censor == "")) {
+ $msg = ' You must enter a spelling mistake and the replace_with.' . "\n";
+ }
+ else {
+ $sql = "INSERT INTO `wordcensor` (`censor_id`, `word_to_censor`, `replace_with`, `bot_exclude`) VALUES (NULL,'$word_to_censor','$replace_with', '')";
+ $result = mysql_query($sql,$dbconn) or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = $sql
\n");
+
+ if($result) {
+ $msg = 'Correction added.';
+ }
+ else {
+ $msg = 'There was a problem editing the replace_with - no changes made.';
+ }
+ }
+ mysql_close($dbconn);
+
+ return $msg;
+}
+
+function delWordCensor($id) {
+ global $template, $msg;
+ $dbconn = db_open();
+ if($id=="") {
+ $msg = 'There was a problem editing the replace_with - no changes made.';
+ }
+ else {
+ $sql = "DELETE FROM `wordcensor` WHERE `censor_id` = '$id' LIMIT 1";
+ $result = mysql_query($sql,$dbconn)or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = $sql
\n");
+ if($result) {
+ $msg = 'Correction deleted.';
+ }
+ else {
+ $msg = 'There was a problem editing the replace_with - no changes made.';
+ }
+ }
+ mysql_close($dbconn);
+}
+
+
+function runWordCensorSearch() {
+ //global vars
+ global $template;
+ $dbconn = db_open();
+ $i=0;
+ $search = mysql_real_escape_string(trim($_POST['search']));
+ $sql = "SELECT * FROM `wordcensor` WHERE `word_to_censor` LIKE '%$search%' OR `replace_with` LIKE '%$search%' LIMIT 50";
+ $result = mysql_query($sql,$dbconn)or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = $sql
\n");
+ $htmltbl = '
+
+
+ word_to_censor
+ Correction
+ Action
+
+
+ ';
+ while($row=mysql_fetch_array($result)) {
+ $i++;
+ $word_to_censor = strtoupper($row['word_to_censor']);
+ $replace_with = strtoupper($row['replace_with']);
+ $id = $row['censor_id'];
+ $group = round(($id / 50));
+ $action = "
+ ";
+ $htmltbl .= "
+ $word_to_censor
+ $replace_with
+ $action
+ ";
+ }
+ $htmltbl .= "
";
+
+ if($i >= 50) {
+ $msg = "Found more than 50 results for '$search', please refine your search further";
+ }
+ elseif($i == 0) {
+ $msg = "Found 0 results for '$search'. You can use the form below to add that entry.";
+ $htmltbl="";
+ }
+ else {
+ $msg = "Found $i results for '$search'";
+ }
+ $htmlresults = "$msg".$htmltbl;
+ mysql_close($dbconn);
+ return $htmlresults;
+}
+
+function editWordCensorForm($id) {
+ //global vars
+ global $template;
+ $group = (isset($_GET['group'])) ? $_GET['group'] : 1;
+ $form = $template->getSection('EditWordCensorForm');
+ $dbconn = db_open();
+ $sql = "SELECT * FROM `wordcensor` WHERE `censor_id` = '$id' LIMIT 1";
+ $result = mysql_query($sql,$dbconn)or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = $sql
\n");
+ $row = mysql_fetch_array($result);
+ $form = str_replace('[censor_id]', $row['censor_id'], $form);
+ $form = str_replace('[word_to_censor]', strtoupper($row['word_to_censor']), $form);
+ $form = str_replace('[replace_with]', strtoupper($row['replace_with']), $form);
+ $form = str_replace('[group]', $group, $form);
+ mysql_close($dbconn);
+ return $form;
+}
+
+function updateWordCensor() {
+ //global vars
+ global $template, $msg;
+ $dbconn = db_open();
+ $word_to_censor = mysql_real_escape_string(trim($_POST['word_to_censor']));
+ $replace_with = mysql_real_escape_string(trim($_POST['replace_with']));
+ $id = trim($_POST['id']);
+ if(($id=="")||($word_to_censor=="")||($replace_with=="")) {
+ $msg = 'There was a problem editing the replace_with - no changes made.';
+ }
+ else {
+ $sql = "UPDATE `wordcensor` SET `word_to_censor` = '$word_to_censor',`replace_with`='$replace_with' WHERE `censor_id`='$id' LIMIT 1";
+ $result = mysql_query($sql,$dbconn)or die('You have a SQL error on line '. __LINE__ . ' of ' . __FILE__ . '. Error message is: ' . mysql_error() . ".
\nSQL = $sql
\n");
+ if($result) {
+ $msg = 'Correction edited.';
+ }
+ else {
+ $msg = 'There was a problem editing the replace_with - no changes made.';
+ }
+ }
+}
+
?>
\ No newline at end of file
diff --git a/aiml tag list.txt b/aiml tag list.txt
new file mode 100644
index 0000000..2e7bee5
--- /dev/null
+++ b/aiml tag list.txt
@@ -0,0 +1,37 @@
+
+
+
+
+ (pattern-side - no index)
+
+
+
+
+
+, ,
+
+- ,
- ,
-
+
+
+
+
+
+
+
+
+
diff --git a/chatbot/addons/checkForBan/checkForBan.php b/chatbot/addons/checkForBan/checkForBan.php
index 4e36f7a..77976f0 100644
--- a/chatbot/addons/checkForBan/checkForBan.php
+++ b/chatbot/addons/checkForBan/checkForBan.php
@@ -1,42 +1,57 @@
-$default_debugemail.
-endMessage;
- $convoArr['abort'] = true;
- }
- return $convoArr;
- }
-
-?>
+\n\n";
+ $IP = $_SERVER['REMOTE_ADDR'];
+ if (!file_exists($banList)) $x = file_put_contents($banList,'');
+ $ipList = file($banList, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+ $l = print_r($ipList, true);
+ //die("$l\n
\n");
+ if (in_array($IP,$ipList)) {
+ $convoArr['send_to_user'] = <<$default_debugemail.
+endMessage;
+ $convoArr['abort'] = true;
+ exit($convoArr['send_to_user']);
+ }
+ return $convoArr;
+ }
+
+ function add_to_ban($ip)
+ {
+ $pathInfo = pathinfo(realpath(__FILE__));
+ $thisDir = $pathInfo['dirname'];
+ $banList = $thisDir . DIRECTORY_SEPARATOR . 'banList.txt';
+ $x = file_put_contents($banList, $ip . PHP_EOL, FILE_APPEND);
+ }
+
+?>
diff --git a/chatbot/addons/custom_tags/code_tag/code_tag.php b/chatbot/addons/custom_tags/code_tag/code_tag.php
index ec4725d..e6870e4 100644
--- a/chatbot/addons/custom_tags/code_tag/code_tag.php
+++ b/chatbot/addons/custom_tags/code_tag/code_tag.php
@@ -1,10 +1,10 @@
-
\ No newline at end of file
diff --git a/chatbot/addons/custom_tags/custom_tags.php b/chatbot/addons/custom_tags/custom_tags.php
index 1b9720f..8ff4e3a 100644
--- a/chatbot/addons/custom_tags/custom_tags.php
+++ b/chatbot/addons/custom_tags/custom_tags.php
@@ -1,28 +1,32 @@
-([^<]*)#i';
- $replace[$j]='\'.call_user_func(\'just_run_code\',\'$1\').\'';
-
-
- $mergeArr['find']=$find;
- $mergeArr['replace']=$replace;
-
- return $mergeArr;
-
+ tag
+***************************************/
+include('code_tag/code_tag.php');
+
+
+function custom_aiml_to_phpfunctions($find,$replace,$j)
+{
+ //custom code aiml tags
+ //found in code_tags/code_tags.php
+ $j++;
+ $find[$j]='#([^<]*)#i';
+ $replace[$j]='\'.just_run_code(\'$1\').\'';
+
+ $j++;
+ $find[$j]='#([^<]*) #i';
+ $replace[$j]='\'.add_to_ban(\'$1\').\'';
+
+
+ $mergeArr['find']=$find;
+ $mergeArr['replace']=$replace;
+
+ return $mergeArr;
+
}
\ No newline at end of file
diff --git a/chatbot/addons/load_addons.php b/chatbot/addons/load_addons.php
index c679073..be6fd4a 100644
--- a/chatbot/addons/load_addons.php
+++ b/chatbot/addons/load_addons.php
@@ -1,46 +1,49 @@
-' . print_r($convoArr, true) . "\n \n");
- $curTime = date('H:i:s');
- $response = str_replace('[serverTime]',$curTime, $response);
- if ($convoArr['send_to_user'] != $response) $convoArr['send_to_user'] = $response;
- $convoArr = run_censor($convoArr);
- if ($format == 'html') $convoArr = checkForParsing($convoArr);
- return $convoArr;
-}
-
-
-
-
-
-
-
-
-
-
+' . print_r($convoArr, true) . "\n \n");
+ $curTime = date('H:i:s');
+ $response = str_replace('[serverTime]',$curTime, $response);
+ if ($convoArr['send_to_user'] != $response) $convoArr['send_to_user'] = $response;
+ $convoArr = run_censor($convoArr);
+ if ($format == 'html') $convoArr = checkForParsing($convoArr);
+ $ip = $convoArr['client_properties']['ip_address'];
+ if ($convoArr['client_properties']['banned'] === true) add_to_ban($ip);
+ return $convoArr;
+}
+
+
+
+
+
+
+
+
+
+
?>
\ No newline at end of file
diff --git a/chatbot/addons/parseBBCode/INSTALL b/chatbot/addons/parseBBCode/INSTALL
index b852a67..c3804c8 100644
--- a/chatbot/addons/parseBBCode/INSTALL
+++ b/chatbot/addons/parseBBCode/INSTALL
@@ -1,45 +1,47 @@
-/***************************************
-* www.program-o.com
-* PROGRAM O
-* Version: 2.0.1
-* FILE: parse_BBCode/INSTALL
-* AUTHOR: ELIZABETH PERREAU
-* DATE: MAY 4TH 2011
-* DETAILS: BBCode parser INSTALL instructions
-***************************************/
-
-
-
-STEP 1:
-----------------------------------------------------------------------------------------------
-- put the parseBBCode folder in the bot chatbot/addons/ folder
-
-
-STEP 2:
-----------------------------------------------------------------------------------------------
-- add the following lines to load_addons.php
-
-//load the word censor functions
-include("parseBBCode/parseBBCode.php");
-
-
-STEP 3:
-----------------------------------------------------------------------------------------------
-- add the following line to the function run_post_response_useraddon() (in load_addons.php)
-
-//run the BBCode output parser before outputting
-checkForParsing($convoArr);
-
-
-STEP 4: (Optional and experimental)
-----------------------------------------------------------------------------------------------
-- add the following line to the function start_response_useraddon() (in load_addons.php)
-
-//run the BBCode input parser before sending into the system
-parseInput($convoArr);
-
-
-
-
-
-
+/***************************************
+* www.program-o.com
+* PROGRAM O
+* Version: 2.0.5
+* FILE: parse_BBCode/INSTALL
+* AUTHOR: DAVE MORTON
+* DATE: FEB 26th, 2012
+* DETAILS: BBCode parser INSTALL instructions
+***************************************/
+
+
+
+STEP 1:
+----------------------------------------------------------------------------------------------
+- put the parseBBCode folder in the bot chatbot/addons/ folder
+
+
+STEP 2:
+----------------------------------------------------------------------------------------------
+- add the following lines to load_addons.php
+
+//load the word censor functions
+include("parseBBCode/parseBBCode.php");
+
+
+STEP 3:
+----------------------------------------------------------------------------------------------
+- add the following line to the function run_post_response_useraddon() (in load_addons.php)
+
+//run the BBCode output parser before outputting
+checkForParsing($convoArr);
+
+
+STEP 4: (Optional and experimental)
+----------------------------------------------------------------------------------------------
+- add the following line to the function start_response_useraddon() (in load_addons.php)
+
+//run the BBCode input parser before sending into the system
+parseInput($convoArr);
+
+
+
+Please note that this addon comes "standard" with the original Program O version 2.0 package, and
+is already installed and set up by default. the only time you will need to install this addon is
+if you have previously uninstalled or removed it.
+
+
diff --git a/chatbot/addons/parseBBCode/README b/chatbot/addons/parseBBCode/README
index d9afe72..1ff0445 100644
--- a/chatbot/addons/parseBBCode/README
+++ b/chatbot/addons/parseBBCode/README
@@ -1,52 +1,58 @@
-/***************************************
-* www.program-o.com
-* PROGRAM O
-* Version: 2.0.3
-* Addon Version: 0.2.5
-* FILE: parseBBCode/README
-* AUTHOR: DAVE MORTON
-* DATE: NOVEMBER 29TH 2011
-* DETAILS: BBCode parser README
-***************************************/
-
-This addon for Program O allows both the bot and the user (experimentally) to use BBCode style tags,
-just like in most popular forums. and chatrooms.
-
-Usage:
-
-Formatting:
-[b]bold[/b] - bold text
-[i]italic[/i] - italicized text
-[u]underline[/u] - underlined text
-[s]strikethrough[/s] - strikethrough text
-
-Color:
-There are two means for "describing" the color in color tags:
-1.) [color=red]Red Text[/color] - named color
-2.) [color=#FFFFFF]White Text[/color] - CSS style Hex color number
-
-This addon uses only the color names stored in colors.dat. You can add any named color you wish by
-adding the color name, followed by a comma and space, then it's CSS "Hex Triplet" equivilent, all as
-one line, to the end of the file colors.dat. For example:
-
-Taupe, #483C32
-HunterGreen, #355E3B
-
-Note that any color names that normally have spaces should use Camelized Text, as seen in example #2,
-above. There are 147 color entries in the default version of colors.dat - these colors are the only
-ones that are supported in every current web browser, so use care when adding a named color, as it
-may not turn out exactly the way you intend. It won't hurt anything, but some browsers may display a
-different color than you intend.
-
-
-Links & Images:
-Your bot can display images without having to resort to HTML IMG tags, in the following ways:
-
-Images:
-[img]http://example.com/path/to/your/image[/img]
-
-Links:
-[url]http://example.com/[/url] - Displays a link with the link text being the same as the web address.
-[url=http://example.com/]my page[/url] - Displays a link with the text as "my page".
-[link]http://example.com/[/link] - Displays a link with the link text being the same as the web address.
-[link=http://example.com/]my page[/link] - Displays a link with the text as "my page".
+/***************************************
+* www.program-o.com
+* PROGRAM O
+* Version: 2.0.3
+* Addon Version: 0.2.5
+* FILE: parseBBCode/README
+* AUTHOR: DAVE MORTON
+* DATE: NOVEMBER 29TH 2011
+* DETAILS: BBCode parser README
+***************************************/
+
+This addon for Program O allows both the bot and the user (experimentally) to use BBCode style tags,
+just like in most popular forums. and chatrooms.
+
+Usage:
+
+Formatting:
+[b]bold[/b] - bold text
+[i]italic[/i] - italicized text
+[u]underline[/u] - underlined text
+[s]strikethrough[/s] - strikethrough text
+
+Color:
+There are two means for "describing" the color in color tags:
+1.) [color=red]Red Text[/color] - named color
+2.) [color=#FFFFFF]White Text[/color] - CSS style Hex color number
+
+This addon uses only the color names stored in colors.dat. You can add any named color you wish by
+adding the color name, followed by a comma and space, then it's CSS "Hex Triplet" equivilent, all as
+one line, to the end of the file colors.dat. For example:
+
+Taupe, #483C32
+HunterGreen, #355E3B
+
+Note that any color names that normally have spaces MUST use Camelized Text, as seen in example #2,
+above. There are 147 color entries in the default version of colors.dat - these colors are the only
+ones that are supported in every current web browser, so use care when adding a named color, as it
+may not turn out exactly the way you intend. It won't hurt anything, but some browsers may display a
+different color than you intend.
+
+
+Links & Images:
+Your bot can display images without having to resort to HTML IMG tags, in the following ways:
+
+Images:
+[img]http://example.com/path/to/your/image[/img]
+
+Links:
+[url]http://example.com/[/url] - Displays a link with the link text being the same as the web address.
+[url=http://example.com/]my page[/url] - Displays a link with the text as "my page".
+[link]http://example.com/[/link] - Displays a link with the link text being the same as the web address.
+[link=http://example.com/]my page[/link] - Displays a link with the text as "my page".
+
+
+Lastly:
+The BBCode input parser is currently experimental in nature, and is quite likely to "break" the user's input
+before it goes to the interpreter, so it's use is NOT recommended at this time. Plans to add a function to
+strip the BBCode tags from the user's input are in the works, but have not been designed yet.
\ No newline at end of file
diff --git a/chatbot/addons/parseBBCode/colors.dat b/chatbot/addons/parseBBCode/colors.dat
index f685efa..f6ebaf1 100644
--- a/chatbot/addons/parseBBCode/colors.dat
+++ b/chatbot/addons/parseBBCode/colors.dat
@@ -1,147 +1,147 @@
-AliceBlue, #F0F8FF
-AntiqueWhite, #FAEBD7
-Aqua, #00FFFF
-Aquamarine, #7FFFD4
-Azure, #F0FFFF
-Beige, #F5F5DC
-Bisque, #FFE4C4
-Black, #000000
-BlanchedAlmond, #FFEBCD
-Blue, #0000FF
-BlueViolet, #8A2BE2
-Brown, #A52A2A
-BurlyWood, #DEB887
-CadetBlue, #5F9EA0
-Chartreuse, #7FFF00
-Chocolate, #D2691E
-Coral, #FF7F50
-CornflowerBlue, #6495ED
-Cornsilk, #FFF8DC
-Crimson, #DC143C
-Cyan, #00FFFF
-DarkBlue, #00008B
-DarkCyan, #008B8B
-DarkGoldenRod, #B8860B
-DarkGray, #A9A9A9
-DarkGrey, #A9A9A9
-DarkGreen, #006400
-DarkKhaki, #BDB76B
-DarkMagenta, #8B008B
-DarkOliveGreen, #556B2F
-Darkorange, #FF8C00
-DarkOrchid, #9932CC
-DarkRed, #8B0000
-DarkSalmon, #E9967A
-DarkSeaGreen, #8FBC8F
-DarkSlateBlue, #483D8B
-DarkSlateGray, #2F4F4F
-DarkSlateGrey, #2F4F4F
-DarkTurquoise, #00CED1
-DarkViolet, #9400D3
-DeepPink, #FF1493
-DeepSkyBlue, #00BFFF
-DimGray, #696969
-DimGrey, #696969
-DodgerBlue, #1E90FF
-FireBrick, #B22222
-FloralWhite, #FFFAF0
-ForestGreen, #228B22
-Fuchsia, #FF00FF
-Gainsboro, #DCDCDC
-GhostWhite, #F8F8FF
-Gold, #FFD700
-GoldenRod, #DAA520
-Gray, #808080
-Grey, #808080
-Green, #008000
-GreenYellow, #ADFF2F
-HoneyDew, #F0FFF0
-HotPink, #FF69B4
-IndianRed , #CD5C5C
-Indigo , #4B0082
-Ivory, #FFFFF0
-Khaki, #F0E68C
-Lavender, #E6E6FA
-LavenderBlush, #FFF0F5
-LawnGreen, #7CFC00
-LemonChiffon, #FFFACD
-LightBlue, #ADD8E6
-LightCoral, #F08080
-LightCyan, #E0FFFF
-LightGoldenRodYellow, #FAFAD2
-LightGray, #D3D3D3
-LightGrey, #D3D3D3
-LightGreen, #90EE90
-LightPink, #FFB6C1
-LightSalmon, #FFA07A
-LightSeaGreen, #20B2AA
-LightSkyBlue, #87CEFA
-LightSlateGray, #778899
-LightSlateGrey, #778899
-LightSteelBlue, #B0C4DE
-LightYellow, #FFFFE0
-Lime, #00FF00
-LimeGreen, #32CD32
-Linen, #FAF0E6
-Magenta, #FF00FF
-Maroon, #800000
-MediumAquaMarine, #66CDAA
-MediumBlue, #0000CD
-MediumOrchid, #BA55D3
-MediumPurple, #9370D8
-MediumSeaGreen, #3CB371
-MediumSlateBlue, #7B68EE
-MediumSpringGreen, #00FA9A
-MediumTurquoise, #48D1CC
-MediumVioletRed, #C71585
-MidnightBlue, #191970
-MintCream, #F5FFFA
-MistyRose, #FFE4E1
-Moccasin, #FFE4B5
-NavajoWhite, #FFDEAD
-Navy, #000080
-OldLace, #FDF5E6
-Olive, #808000
-OliveDrab, #6B8E23
-Orange, #FFA500
-OrangeRed, #FF4500
-Orchid, #DA70D6
-PaleGoldenRod, #EEE8AA
-PaleGreen, #98FB98
-PaleTurquoise, #AFEEEE
-PaleVioletRed, #D87093
-PapayaWhip, #FFEFD5
-PeachPuff, #FFDAB9
-Peru, #CD853F
-Pink, #FFC0CB
-Plum, #DDA0DD
-PowderBlue, #B0E0E6
-Purple, #800080
-Red, #FF0000
-RosyBrown, #BC8F8F
-RoyalBlue, #4169E1
-SaddleBrown, #8B4513
-Salmon, #FA8072
-SandyBrown, #F4A460
-SeaGreen, #2E8B57
-SeaShell, #FFF5EE
-Sienna, #A0522D
-Silver, #C0C0C0
-SkyBlue, #87CEEB
-SlateBlue, #6A5ACD
-SlateGray, #708090
-SlateGrey, #708090
-Snow, #FFFAFA
-SpringGreen, #00FF7F
-SteelBlue, #4682B4
-Tan, #D2B48C
-Teal, #008080
-Thistle, #D8BFD8
-Tomato, #FF6347
-Turquoise, #40E0D0
-Violet, #EE82EE
-Wheat, #F5DEB3
-White, #FFFFFF
-WhiteSmoke, #F5F5F5
-Yellow, #FFFF00
-YellowGreen, #9ACD32
+AliceBlue, #F0F8FF
+AntiqueWhite, #FAEBD7
+Aqua, #00FFFF
+Aquamarine, #7FFFD4
+Azure, #F0FFFF
+Beige, #F5F5DC
+Bisque, #FFE4C4
+Black, #000000
+BlanchedAlmond, #FFEBCD
+Blue, #0000FF
+BlueViolet, #8A2BE2
+Brown, #A52A2A
+BurlyWood, #DEB887
+CadetBlue, #5F9EA0
+Chartreuse, #7FFF00
+Chocolate, #D2691E
+Coral, #FF7F50
+CornflowerBlue, #6495ED
+Cornsilk, #FFF8DC
+Crimson, #DC143C
+Cyan, #00FFFF
+DarkBlue, #00008B
+DarkCyan, #008B8B
+DarkGoldenRod, #B8860B
+DarkGray, #A9A9A9
+DarkGrey, #A9A9A9
+DarkGreen, #006400
+DarkKhaki, #BDB76B
+DarkMagenta, #8B008B
+DarkOliveGreen, #556B2F
+Darkorange, #FF8C00
+DarkOrchid, #9932CC
+DarkRed, #8B0000
+DarkSalmon, #E9967A
+DarkSeaGreen, #8FBC8F
+DarkSlateBlue, #483D8B
+DarkSlateGray, #2F4F4F
+DarkSlateGrey, #2F4F4F
+DarkTurquoise, #00CED1
+DarkViolet, #9400D3
+DeepPink, #FF1493
+DeepSkyBlue, #00BFFF
+DimGray, #696969
+DimGrey, #696969
+DodgerBlue, #1E90FF
+FireBrick, #B22222
+FloralWhite, #FFFAF0
+ForestGreen, #228B22
+Fuchsia, #FF00FF
+Gainsboro, #DCDCDC
+GhostWhite, #F8F8FF
+Gold, #FFD700
+GoldenRod, #DAA520
+Gray, #808080
+Grey, #808080
+Green, #008000
+GreenYellow, #ADFF2F
+HoneyDew, #F0FFF0
+HotPink, #FF69B4
+IndianRed , #CD5C5C
+Indigo , #4B0082
+Ivory, #FFFFF0
+Khaki, #F0E68C
+Lavender, #E6E6FA
+LavenderBlush, #FFF0F5
+LawnGreen, #7CFC00
+LemonChiffon, #FFFACD
+LightBlue, #ADD8E6
+LightCoral, #F08080
+LightCyan, #E0FFFF
+LightGoldenRodYellow, #FAFAD2
+LightGray, #D3D3D3
+LightGrey, #D3D3D3
+LightGreen, #90EE90
+LightPink, #FFB6C1
+LightSalmon, #FFA07A
+LightSeaGreen, #20B2AA
+LightSkyBlue, #87CEFA
+LightSlateGray, #778899
+LightSlateGrey, #778899
+LightSteelBlue, #B0C4DE
+LightYellow, #FFFFE0
+Lime, #00FF00
+LimeGreen, #32CD32
+Linen, #FAF0E6
+Magenta, #FF00FF
+Maroon, #800000
+MediumAquaMarine, #66CDAA
+MediumBlue, #0000CD
+MediumOrchid, #BA55D3
+MediumPurple, #9370D8
+MediumSeaGreen, #3CB371
+MediumSlateBlue, #7B68EE
+MediumSpringGreen, #00FA9A
+MediumTurquoise, #48D1CC
+MediumVioletRed, #C71585
+MidnightBlue, #191970
+MintCream, #F5FFFA
+MistyRose, #FFE4E1
+Moccasin, #FFE4B5
+NavajoWhite, #FFDEAD
+Navy, #000080
+OldLace, #FDF5E6
+Olive, #808000
+OliveDrab, #6B8E23
+Orange, #FFA500
+OrangeRed, #FF4500
+Orchid, #DA70D6
+PaleGoldenRod, #EEE8AA
+PaleGreen, #98FB98
+PaleTurquoise, #AFEEEE
+PaleVioletRed, #D87093
+PapayaWhip, #FFEFD5
+PeachPuff, #FFDAB9
+Peru, #CD853F
+Pink, #FFC0CB
+Plum, #DDA0DD
+PowderBlue, #B0E0E6
+Purple, #800080
+Red, #FF0000
+RosyBrown, #BC8F8F
+RoyalBlue, #4169E1
+SaddleBrown, #8B4513
+Salmon, #FA8072
+SandyBrown, #F4A460
+SeaGreen, #2E8B57
+SeaShell, #FFF5EE
+Sienna, #A0522D
+Silver, #C0C0C0
+SkyBlue, #87CEEB
+SlateBlue, #6A5ACD
+SlateGray, #708090
+SlateGrey, #708090
+Snow, #FFFAFA
+SpringGreen, #00FF7F
+SteelBlue, #4682B4
+Tan, #D2B48C
+Teal, #008080
+Thistle, #D8BFD8
+Tomato, #FF6347
+Turquoise, #40E0D0
+Violet, #EE82EE
+Wheat, #F5DEB3
+White, #FFFFFF
+WhiteSmoke, #F5F5F5
+Yellow, #FFFF00
+YellowGreen, #9ACD32
diff --git a/chatbot/addons/parseBBCode/emotes.dat b/chatbot/addons/parseBBCode/emotes.dat
index 3c0fe8d..3ec882d 100644
--- a/chatbot/addons/parseBBCode/emotes.dat
+++ b/chatbot/addons/parseBBCode/emotes.dat
@@ -1,218 +1,218 @@
-;), smile3.gif, 15, 15, ;)
-:(, smile2.gif, 15, 15, :(
-:x, kiss.gif, 19, 19, :x
-:P, smile4.gif, 15, 15, :P
-:*, star.gif, 25, 25, :*
-:,(, cry.gif, 21, 16, :,(
-8), cool.gif, 17, 17, 8)
-:afk, afk.gif, 25, 25, :afk
-:bnna, banana.gif, 33, 35, :bnna
-:cool, cool.gif, 17, 17, :cool
-:brb, brb.gif, 25, 25, :brb
-:bulb, bulb.gif, 19, 19, :bulb
-:cry, cry.gif, 21, 16, :cry
-:D, biggrin.gif, 15, 15, :D
-:devil, devil.gif, 19, 24, :devil
-:eek, smile5.gif, 15, 15, :eek
-:evil, evil.gif, 32, 32, :evil
-:fart, 27.gif, 53, 26, :fart
-:jump, jump.gif, 31, 31, :jump
-:lol, lol.gif, 15, 15, :lol
-:mad, mad.gif, 15, 22, :mad
-:pent, pnt.gif, 25, 25, :pent
-:rar, rar.gif, 25, 20, :rar
-:rockon, 35.gif, 52, 40, :rockon
-:rose, rose.gif, 25, 25, :rose
-:wink, smile3.gif, 15, 15, :wink
-:zzz, zzz.gif, 26, 33, :zzz
-:), smile.gif, 15, 15, :)
-:-), biggrin.gif, 15, 15, :-)
-:rolleyes, rolleyes.gif, 15, 15, :rolleyes
-:confused, confused.gif, 15, 15, :confused
-:cool, cool.gif, 15, 15, :cool
-:blush, redface-1.gif, 15, 15, :blush
-:lol, lol.gif, 15, 15, :lol
-:mad, mad.gif, 15, 15, :mad
-:rofl, rofl.gif, 15, 15, :rofl
-:p, tongue.gif, 15, 15, :p
-:nono, nonono.gif, 15, 15, :nono
-(:, upsidedown.gif, 15, 15, (:
-:(x), tapedshut.gif, 15, 15, :(x)
-:eye, cyclops.gif, 15, 15, :eye
-:goof, goof.gif, 15, 16, :goof
-:sick, dead.gif, 15, 15, :sick
-:injured, ouch.gif, 15, 15, :injured
-:shifty, shifty_suspect.gif, 15, 15, :shifty
-:weee, weee.gif, 23, 17, :weee
-:wave, wave.gif, 25, 15, :wave
-:hohoho, santa-new.gif, 22, 20, :hohoho
-:wiki, wiki.gif, 36, 30, :wiki
-:vinnie, emot-sissies.gif, 80, 21, :vinnie
-:eatme, chomp.gif, 15, 15, :eatme
-:agree, agree.gif, 15, 15, :agree
-:faq2, faq-mad.gif, 36, 30, :faq2
-:hush, shhh.gif, 17, 20, :hush
-:crazy, looney.gif, 15, 15, :crazy
-:juggle, juggle-new.gif, 31, 34, :juggle
-:bomb, bomb.gif, 20, 15, :bomb
-:unhappy, jpshakehead.gif, 15, 15, :unhappy
-:smoke, stoner.gif, 21, 20, :smoke
-:drink, beer-fresh.gif, 45, 20, :drink
-:footmouth, footinmouth.gif, 18, 17, :footmouth
-:inspector, detective.gif, 25, 25, :inspector
-:twocents, twocents.gif, 23, 15, :twocents
-:mspac, pm-mspacman.gif, 15, 15, :mspac
-:<, emot-v2.gif, 15, 15, :<
-:whip, whip-new.gif, 50, 15, :whip
-:toast, toast.gif, 36, 33, :toast
-:headbang, banghead.gif, 25, 20, :headbang
-:cap, cap.gif, 19, 19, :cap
-:cd, cd.gif, 15, 15, :cd
-:mrpac, pm-pacman.gif, 15, 15, :mrpac
-:camera, camera-p.gif, 15, 15, :camera
-:dollar, money.gif, 15, 16, :dollar
-:irock, irock.gif, 36, 30, :irock
-:fire, hot.gif, 15, 18, :fire
-:scratch, scratchchin.gif, 15, 20, :scratch
-:eyebrow, eyebrows-new.gif, 15, 15, :eyebrow
-:smashy, smashy.gif, 30, 26, :smashy
-:award, trophy_bronze.gif, 15, 15, :award
-:-/, wonky2.gif, 15, 15, :-/
-:brothercake, favicon.gif, 16, 16, :brothercake
-:ice, cold.gif, 15, 18, :ice
-:teach, teacher.gif, 25, 25, :teach
-:sing, sing.gif, 22, 15, :sing
-:stir, stirthepot.gif, 25, 25, :stir
-:tdown, tdown.gif, 16, 17, :tdown
-:spf, spf.gif, 36, 30, :spf
-:-\, wonky.gif, 15, 15, :-\
-:find, clue.gif, 21, 16, :find
-:magic, wizard.gif, 24, 25, :magic
-:cookie, cookie.gif, 15, 15, :cookie
-:hat, winter.gif, 17, 25, :hat
-:tup, tup.gif, 16, 17, :tup
-:good, angel_002.gif, 15, 19, :good
-:google, google.gif, 36, 30, :google
-:beer, cheers.gif, 21, 15, :beer
-:afro, afro.gif, 25, 25, :afro
-:coffee, hotjava.gif, 16, 24, :coffee
-:umbrella, umbrella.gif, 25, 25, :umbrella
-:aparty, party_002.gif, 17, 27, :aparty
-:disagree, disagree.gif, 15, 15, :disagree
-:faq1, faq-roll.gif, 36, 30, :faq1
-:heart_smiley, heart_smiley.gif, 25, 30, :heart_smiley
-:stilletto, stilletto.gif, 29, 16, :stilletto
-:smiley_vtines, smiley_vtines.gif, 50, 30, :smiley_vtines
-:hearts, sitepoint_val_comp.png, 35, 29, :hearts
-:avalentine, oK6Fl11107543566.gif, 50, 25, :avalentine
-:lust, Lust_by_Zikes.gif, 19, 16, :lust
-:valentine-ii, valentine-ii.gif, 50, 30, :valentine-ii
-:prezsmall, prezsmall.gif, 22, 19, :prezsmall
-:valentine, valentine.gif, 30, 16, :valentine
-:vsmiley, vsmiley.GIF, 23, 27, :vsmiley
-:lovestruck, sitepoint_smilie_v2.gif, 17, 17, :lovestruck
-:love, Love_by_Zikes.gif, 17, 17, :love
-:for_you, sitepoint_smilie_v1_2.gif, 26, 23, :for_you
-:loveblush, sp_val.gif, 20, 18, :loveblush
-:headoverheels, valentine2.gif, 30, 30, :headoverheels
-:big_pink_valentine, zlgEII1107536829.gif, 50, 30, :big_pink_valentine
-:pumpkin, pumpkin.png, 24, 24, :pumpkin
-:goof, goof_002.gif, 15, 16, :goof
-:xeye, xeye.gif, 15, 15, :xeye
-:bawling, bawling.gif, 21, 16, :bawling
-:o, redface.gif, 16, 16, :oyawnb.gif
-:eek2, eek2.gif, 15, 15, :eek2
-:musicman, dazzler.gif, 26, 26, :musicman
-:fangel, headscratch.gif, 20, 20, :fangel
-:mcamara, i3.gif, 15, 15, :mcamara
-:king, king.gif, 17, 22, :king
-:lightbulb, lightbulb.gif, 15, 15, :lightbulb
-:dodgy, dodgy.gif, 15, 15, :dodgy
-:nighty, nighty.gif, 19, 25, :nighty
-:vampire, vampire.gif, 32, 32, :vampire
-:rainbow, rainbow.gif, 15, 15, :rainbow
-:nod, agree_002.gif, 20, 28, :nod
-:hbday, bday_2.gif, 81, 26, :hbday
-:cheer2, cheer4.gif, 35, 25, :cheer2
-:daisy, daisy.gif, 41, 41, :daisy
-:flower, flower.gif, 24, 24, :flower
-:warning, i21.gif, 15, 15, :warning
-:flippy, jumping.gif, 32, 32, :flippy
-:lympics, olympics.gif, 53, 26, :lympics
-:nanaman, banana.gif, 33, 35, :nanaman
-:devil, devil.gif, 15, 20, :devil
-:kiss, kiss.gif, 15, 15, :kiss
-:frosty, frosty.gif, 20, 27, :frosty
-:jack1, pumpkin.gif, 29, 23, :jack1
-:bday, bday.gif, 15, 15, :bday
-:cheer, cheer.gif, 35, 25, :cheer
-:ghost, eyemouth.gif, 15, 15, :ghost
-:note, i20.gif, 15, 15, :note
-:bouncy3, jump3.gif, 31, 31, :bouncy3
-:karate, karate.gif, 20, 18, :karate
-:wavey, wavey.gif, 25, 29, :wavey
-:eyes, privateeyes.gif, 15, 15, :eyes
-:sparty, party.gif, 37, 33, :sparty
-:argue, argue.gif, 50, 25, :argue
-:bunny, bunny.gif, 32, 32, :bunny
-:xtree, ctree.gif, 26, 33, :xtree
-:elf, elf.gif, 32, 32, :elf
-:hangin, i2.gif, 15, 15, :hangin
-:bouncy2, jump2.gif, 31, 31, :bouncy2
-:mears, mickmouse.gif, 21, 20, :mears
-:kaioken, kaioken.gif, 32, 31, :kaioken
-:teleport, teleport.gif, 40, 15, :teleport
-:flake, flake.gif, 15, 15, :flake
-:apresent, present.gif, 23, 15, :apresent
-:jack2, pumpkin2.gif, 15, 15, :jack2
-:angel6, angelfly.gif, 42, 23, :angel6
-:bubbly, bubbly.gif, 32, 32, :bubbly
-:wacko, crazy.gif, 15, 15, :wacko
-:drinky, drink.gif, 45, 20, :drinky
-:deer, hert.gif, 25, 25, :deer
-:bouncy, jump.gif, 31, 31, :bouncy
-:lman, ladysman.gif, 55, 19, :lman
-:Partydude, party_2.gif, 48, 30, :Partydude
-:idea, idea.gif, 15, 32, :idea
-:splat, splat.gif, 30, 30, :splat
-:angel, angel.gif, 29, 29, :angel
-:stpatty, patty.gif, 22, 27, :stpatty
-:santa2, xmas.gif, 22, 25, :santa2
-:angel5, angel_2.gif, 42, 23, :angel5
-:badpc, crash.gif, 30, 30, :badpc
-:kitty2, hello.gif, 30, 25, :kitty2
-:jester2, joker.gif, 31, 26, :jester2
-:girl, lady.gif, 22, 24, :girl
-:Partier, party2.gif, 41, 36, :Partier
-:smash, smash.gif, 30, 26, :smash
-:cold, cold_002.gif, 20, 30, :cold
-:alien, alien.gif, 16, 16, :alien
-:angel4, angel3.gif, 15, 17, :angel4
-:wall, brickwall.gif, 30, 15, :wall
-:cool2, cool_2.gif, 15, 15, :cool2
-:weyes, dizzy.gif, 15, 15, :weyes
-:love, hearts.gif, 40, 40, :love
-:jester, jester.gif, 24, 23, :jester
-:queen, kitfly.gif, 30, 21, :queen
-:Partyguy, party1.gif, 17, 26, :Partyguy
-:EL, embarassedlaugh.gif, 16, 15, :EL
-:sleeping, sleeping.gif, 20, 24, :sleeping
-:bat, blackbat.gif, 31, 18, :bat
-:kitty, kitty.gif, 19, 18, :kitty
-:rwb, rwb.gif, 17, 17, :rwb
-:angel3, angel2.gif, 120, 30, :angel3
-:confused2, confused2.gif, 33, 26, :confused2
-:looko, headshake.gif, 15, 15, :looko
-:kiss2, kiss1.gif, 15, 15, :kiss2
-:lips, lips.gif, 20, 15, :lips
-:redhot, redhot.gif, 16, 16, :redhot
-:heart, heart.gif, 16, 16, :heart
-:witch, heks.gif, 21, 22, :witch
-:santa, santasmile.gif, 21, 22, :santa
-:angel2, angel1.gif, 33, 25, :angel2
-:apart, bighug.gif, 27, 15, :apart
-:clown, clown.gif, 15, 15, :clown
-:pinkribbon, sm_BreastCancerRibbon.gif, 32, 32, :pinkribbon
-:blueribbon, blueribbon-a.gif, 32, 32, :blueribbon
-:movember, movember-face.gif, 75, 15, :movember
+;), smile3.gif, 15, 15, ;)
+:(, smile2.gif, 15, 15, :(
+:x, kiss.gif, 19, 19, :x
+:P, smile4.gif, 15, 15, :P
+:*, star.gif, 25, 25, :*
+:,(, cry.gif, 21, 16, :,(
+8), cool.gif, 17, 17, 8)
+:afk, afk.gif, 25, 25, :afk
+:bnna, banana.gif, 33, 35, :bnna
+:cool, cool.gif, 17, 17, :cool
+:brb, brb.gif, 25, 25, :brb
+:bulb, bulb.gif, 19, 19, :bulb
+:cry, cry.gif, 21, 16, :cry
+:D, biggrin.gif, 15, 15, :D
+:devil, devil.gif, 19, 24, :devil
+:eek, smile5.gif, 15, 15, :eek
+:evil, evil.gif, 32, 32, :evil
+:fart, 27.gif, 53, 26, :fart
+:jump, jump.gif, 31, 31, :jump
+:lol, lol.gif, 15, 15, :lol
+:mad, mad.gif, 15, 22, :mad
+:pent, pnt.gif, 25, 25, :pent
+:rar, rar.gif, 25, 20, :rar
+:rockon, 35.gif, 52, 40, :rockon
+:rose, rose.gif, 25, 25, :rose
+:wink, smile3.gif, 15, 15, :wink
+:zzz, zzz.gif, 26, 33, :zzz
+:), smile.gif, 15, 15, :)
+:-), biggrin.gif, 15, 15, :-)
+:rolleyes, rolleyes.gif, 15, 15, :rolleyes
+:confused, confused.gif, 15, 15, :confused
+:cool, cool.gif, 15, 15, :cool
+:blush, redface-1.gif, 15, 15, :blush
+:lol, lol.gif, 15, 15, :lol
+:mad, mad.gif, 15, 15, :mad
+:rofl, rofl.gif, 15, 15, :rofl
+:p, tongue.gif, 15, 15, :p
+:nono, nonono.gif, 15, 15, :nono
+(:, upsidedown.gif, 15, 15, (:
+:(x), tapedshut.gif, 15, 15, :(x)
+:eye, cyclops.gif, 15, 15, :eye
+:goof, goof.gif, 15, 16, :goof
+:sick, dead.gif, 15, 15, :sick
+:injured, ouch.gif, 15, 15, :injured
+:shifty, shifty_suspect.gif, 15, 15, :shifty
+:weee, weee.gif, 23, 17, :weee
+:wave, wave.gif, 25, 15, :wave
+:hohoho, santa-new.gif, 22, 20, :hohoho
+:wiki, wiki.gif, 36, 30, :wiki
+:vinnie, emot-sissies.gif, 80, 21, :vinnie
+:eatme, chomp.gif, 15, 15, :eatme
+:agree, agree.gif, 15, 15, :agree
+:faq2, faq-mad.gif, 36, 30, :faq2
+:hush, shhh.gif, 17, 20, :hush
+:crazy, looney.gif, 15, 15, :crazy
+:juggle, juggle-new.gif, 31, 34, :juggle
+:bomb, bomb.gif, 20, 15, :bomb
+:unhappy, jpshakehead.gif, 15, 15, :unhappy
+:smoke, stoner.gif, 21, 20, :smoke
+:drink, beer-fresh.gif, 45, 20, :drink
+:footmouth, footinmouth.gif, 18, 17, :footmouth
+:inspector, detective.gif, 25, 25, :inspector
+:twocents, twocents.gif, 23, 15, :twocents
+:mspac, pm-mspacman.gif, 15, 15, :mspac
+:<, emot-v2.gif, 15, 15, :<
+:whip, whip-new.gif, 50, 15, :whip
+:toast, toast.gif, 36, 33, :toast
+:headbang, banghead.gif, 25, 20, :headbang
+:cap, cap.gif, 19, 19, :cap
+:cd, cd.gif, 15, 15, :cd
+:mrpac, pm-pacman.gif, 15, 15, :mrpac
+:camera, camera-p.gif, 15, 15, :camera
+:dollar, money.gif, 15, 16, :dollar
+:irock, irock.gif, 36, 30, :irock
+:fire, hot.gif, 15, 18, :fire
+:scratch, scratchchin.gif, 15, 20, :scratch
+:eyebrow, eyebrows-new.gif, 15, 15, :eyebrow
+:smashy, smashy.gif, 30, 26, :smashy
+:award, trophy_bronze.gif, 15, 15, :award
+:-/, wonky2.gif, 15, 15, :-/
+:brothercake, favicon.gif, 16, 16, :brothercake
+:ice, cold.gif, 15, 18, :ice
+:teach, teacher.gif, 25, 25, :teach
+:sing, sing.gif, 22, 15, :sing
+:stir, stirthepot.gif, 25, 25, :stir
+:tdown, tdown.gif, 16, 17, :tdown
+:spf, spf.gif, 36, 30, :spf
+:-\, wonky.gif, 15, 15, :-\
+:find, clue.gif, 21, 16, :find
+:magic, wizard.gif, 24, 25, :magic
+:cookie, cookie.gif, 15, 15, :cookie
+:hat, winter.gif, 17, 25, :hat
+:tup, tup.gif, 16, 17, :tup
+:good, angel_002.gif, 15, 19, :good
+:google, google.gif, 36, 30, :google
+:beer, cheers.gif, 21, 15, :beer
+:afro, afro.gif, 25, 25, :afro
+:coffee, hotjava.gif, 16, 24, :coffee
+:umbrella, umbrella.gif, 25, 25, :umbrella
+:aparty, party_002.gif, 17, 27, :aparty
+:disagree, disagree.gif, 15, 15, :disagree
+:faq1, faq-roll.gif, 36, 30, :faq1
+:heart_smiley, heart_smiley.gif, 25, 30, :heart_smiley
+:stilletto, stilletto.gif, 29, 16, :stilletto
+:smiley_vtines, smiley_vtines.gif, 50, 30, :smiley_vtines
+:hearts, sitepoint_val_comp.png, 35, 29, :hearts
+:avalentine, oK6Fl11107543566.gif, 50, 25, :avalentine
+:lust, Lust_by_Zikes.gif, 19, 16, :lust
+:valentine-ii, valentine-ii.gif, 50, 30, :valentine-ii
+:prezsmall, prezsmall.gif, 22, 19, :prezsmall
+:valentine, valentine.gif, 30, 16, :valentine
+:vsmiley, vsmiley.GIF, 23, 27, :vsmiley
+:lovestruck, sitepoint_smilie_v2.gif, 17, 17, :lovestruck
+:love, Love_by_Zikes.gif, 17, 17, :love
+:for_you, sitepoint_smilie_v1_2.gif, 26, 23, :for_you
+:loveblush, sp_val.gif, 20, 18, :loveblush
+:headoverheels, valentine2.gif, 30, 30, :headoverheels
+:big_pink_valentine, zlgEII1107536829.gif, 50, 30, :big_pink_valentine
+:pumpkin, pumpkin.png, 24, 24, :pumpkin
+:goof, goof_002.gif, 15, 16, :goof
+:xeye, xeye.gif, 15, 15, :xeye
+:bawling, bawling.gif, 21, 16, :bawling
+:o, redface.gif, 16, 16, :oyawnb.gif
+:eek2, eek2.gif, 15, 15, :eek2
+:musicman, dazzler.gif, 26, 26, :musicman
+:fangel, headscratch.gif, 20, 20, :fangel
+:mcamara, i3.gif, 15, 15, :mcamara
+:king, king.gif, 17, 22, :king
+:lightbulb, lightbulb.gif, 15, 15, :lightbulb
+:dodgy, dodgy.gif, 15, 15, :dodgy
+:nighty, nighty.gif, 19, 25, :nighty
+:vampire, vampire.gif, 32, 32, :vampire
+:rainbow, rainbow.gif, 15, 15, :rainbow
+:nod, agree_002.gif, 20, 28, :nod
+:hbday, bday_2.gif, 81, 26, :hbday
+:cheer2, cheer4.gif, 35, 25, :cheer2
+:daisy, daisy.gif, 41, 41, :daisy
+:flower, flower.gif, 24, 24, :flower
+:warning, i21.gif, 15, 15, :warning
+:flippy, jumping.gif, 32, 32, :flippy
+:lympics, olympics.gif, 53, 26, :lympics
+:nanaman, banana.gif, 33, 35, :nanaman
+:devil, devil.gif, 15, 20, :devil
+:kiss, kiss.gif, 15, 15, :kiss
+:frosty, frosty.gif, 20, 27, :frosty
+:jack1, pumpkin.gif, 29, 23, :jack1
+:bday, bday.gif, 15, 15, :bday
+:cheer, cheer.gif, 35, 25, :cheer
+:ghost, eyemouth.gif, 15, 15, :ghost
+:note, i20.gif, 15, 15, :note
+:bouncy3, jump3.gif, 31, 31, :bouncy3
+:karate, karate.gif, 20, 18, :karate
+:wavey, wavey.gif, 25, 29, :wavey
+:eyes, privateeyes.gif, 15, 15, :eyes
+:sparty, party.gif, 37, 33, :sparty
+:argue, argue.gif, 50, 25, :argue
+:bunny, bunny.gif, 32, 32, :bunny
+:xtree, ctree.gif, 26, 33, :xtree
+:elf, elf.gif, 32, 32, :elf
+:hangin, i2.gif, 15, 15, :hangin
+:bouncy2, jump2.gif, 31, 31, :bouncy2
+:mears, mickmouse.gif, 21, 20, :mears
+:kaioken, kaioken.gif, 32, 31, :kaioken
+:teleport, teleport.gif, 40, 15, :teleport
+:flake, flake.gif, 15, 15, :flake
+:apresent, present.gif, 23, 15, :apresent
+:jack2, pumpkin2.gif, 15, 15, :jack2
+:angel6, angelfly.gif, 42, 23, :angel6
+:bubbly, bubbly.gif, 32, 32, :bubbly
+:wacko, crazy.gif, 15, 15, :wacko
+:drinky, drink.gif, 45, 20, :drinky
+:deer, hert.gif, 25, 25, :deer
+:bouncy, jump.gif, 31, 31, :bouncy
+:lman, ladysman.gif, 55, 19, :lman
+:Partydude, party_2.gif, 48, 30, :Partydude
+:idea, idea.gif, 15, 32, :idea
+:splat, splat.gif, 30, 30, :splat
+:angel, angel.gif, 29, 29, :angel
+:stpatty, patty.gif, 22, 27, :stpatty
+:santa2, xmas.gif, 22, 25, :santa2
+:angel5, angel_2.gif, 42, 23, :angel5
+:badpc, crash.gif, 30, 30, :badpc
+:kitty2, hello.gif, 30, 25, :kitty2
+:jester2, joker.gif, 31, 26, :jester2
+:girl, lady.gif, 22, 24, :girl
+:Partier, party2.gif, 41, 36, :Partier
+:smash, smash.gif, 30, 26, :smash
+:cold, cold_002.gif, 20, 30, :cold
+:alien, alien.gif, 16, 16, :alien
+:angel4, angel3.gif, 15, 17, :angel4
+:wall, brickwall.gif, 30, 15, :wall
+:cool2, cool_2.gif, 15, 15, :cool2
+:weyes, dizzy.gif, 15, 15, :weyes
+:love, hearts.gif, 40, 40, :love
+:jester, jester.gif, 24, 23, :jester
+:queen, kitfly.gif, 30, 21, :queen
+:Partyguy, party1.gif, 17, 26, :Partyguy
+:EL, embarassedlaugh.gif, 16, 15, :EL
+:sleeping, sleeping.gif, 20, 24, :sleeping
+:bat, blackbat.gif, 31, 18, :bat
+:kitty, kitty.gif, 19, 18, :kitty
+:rwb, rwb.gif, 17, 17, :rwb
+:angel3, angel2.gif, 120, 30, :angel3
+:confused2, confused2.gif, 33, 26, :confused2
+:looko, headshake.gif, 15, 15, :looko
+:kiss2, kiss1.gif, 15, 15, :kiss2
+:lips, lips.gif, 20, 15, :lips
+:redhot, redhot.gif, 16, 16, :redhot
+:heart, heart.gif, 16, 16, :heart
+:witch, heks.gif, 21, 22, :witch
+:santa, santasmile.gif, 21, 22, :santa
+:angel2, angel1.gif, 33, 25, :angel2
+:apart, bighug.gif, 27, 15, :apart
+:clown, clown.gif, 15, 15, :clown
+:pinkribbon, sm_BreastCancerRibbon.gif, 32, 32, :pinkribbon
+:blueribbon, blueribbon-a.gif, 32, 32, :blueribbon
+:movember, movember-face.gif, 75, 15, :movember
:wavejump, waveJump.gif, 248, 31, :wavejump
\ No newline at end of file
diff --git a/chatbot/addons/parseBBCode/images/emotes.txt b/chatbot/addons/parseBBCode/images/emotes.txt
index 3c0fe8d..3ec882d 100644
--- a/chatbot/addons/parseBBCode/images/emotes.txt
+++ b/chatbot/addons/parseBBCode/images/emotes.txt
@@ -1,218 +1,218 @@
-;), smile3.gif, 15, 15, ;)
-:(, smile2.gif, 15, 15, :(
-:x, kiss.gif, 19, 19, :x
-:P, smile4.gif, 15, 15, :P
-:*, star.gif, 25, 25, :*
-:,(, cry.gif, 21, 16, :,(
-8), cool.gif, 17, 17, 8)
-:afk, afk.gif, 25, 25, :afk
-:bnna, banana.gif, 33, 35, :bnna
-:cool, cool.gif, 17, 17, :cool
-:brb, brb.gif, 25, 25, :brb
-:bulb, bulb.gif, 19, 19, :bulb
-:cry, cry.gif, 21, 16, :cry
-:D, biggrin.gif, 15, 15, :D
-:devil, devil.gif, 19, 24, :devil
-:eek, smile5.gif, 15, 15, :eek
-:evil, evil.gif, 32, 32, :evil
-:fart, 27.gif, 53, 26, :fart
-:jump, jump.gif, 31, 31, :jump
-:lol, lol.gif, 15, 15, :lol
-:mad, mad.gif, 15, 22, :mad
-:pent, pnt.gif, 25, 25, :pent
-:rar, rar.gif, 25, 20, :rar
-:rockon, 35.gif, 52, 40, :rockon
-:rose, rose.gif, 25, 25, :rose
-:wink, smile3.gif, 15, 15, :wink
-:zzz, zzz.gif, 26, 33, :zzz
-:), smile.gif, 15, 15, :)
-:-), biggrin.gif, 15, 15, :-)
-:rolleyes, rolleyes.gif, 15, 15, :rolleyes
-:confused, confused.gif, 15, 15, :confused
-:cool, cool.gif, 15, 15, :cool
-:blush, redface-1.gif, 15, 15, :blush
-:lol, lol.gif, 15, 15, :lol
-:mad, mad.gif, 15, 15, :mad
-:rofl, rofl.gif, 15, 15, :rofl
-:p, tongue.gif, 15, 15, :p
-:nono, nonono.gif, 15, 15, :nono
-(:, upsidedown.gif, 15, 15, (:
-:(x), tapedshut.gif, 15, 15, :(x)
-:eye, cyclops.gif, 15, 15, :eye
-:goof, goof.gif, 15, 16, :goof
-:sick, dead.gif, 15, 15, :sick
-:injured, ouch.gif, 15, 15, :injured
-:shifty, shifty_suspect.gif, 15, 15, :shifty
-:weee, weee.gif, 23, 17, :weee
-:wave, wave.gif, 25, 15, :wave
-:hohoho, santa-new.gif, 22, 20, :hohoho
-:wiki, wiki.gif, 36, 30, :wiki
-:vinnie, emot-sissies.gif, 80, 21, :vinnie
-:eatme, chomp.gif, 15, 15, :eatme
-:agree, agree.gif, 15, 15, :agree
-:faq2, faq-mad.gif, 36, 30, :faq2
-:hush, shhh.gif, 17, 20, :hush
-:crazy, looney.gif, 15, 15, :crazy
-:juggle, juggle-new.gif, 31, 34, :juggle
-:bomb, bomb.gif, 20, 15, :bomb
-:unhappy, jpshakehead.gif, 15, 15, :unhappy
-:smoke, stoner.gif, 21, 20, :smoke
-:drink, beer-fresh.gif, 45, 20, :drink
-:footmouth, footinmouth.gif, 18, 17, :footmouth
-:inspector, detective.gif, 25, 25, :inspector
-:twocents, twocents.gif, 23, 15, :twocents
-:mspac, pm-mspacman.gif, 15, 15, :mspac
-:<, emot-v2.gif, 15, 15, :<
-:whip, whip-new.gif, 50, 15, :whip
-:toast, toast.gif, 36, 33, :toast
-:headbang, banghead.gif, 25, 20, :headbang
-:cap, cap.gif, 19, 19, :cap
-:cd, cd.gif, 15, 15, :cd
-:mrpac, pm-pacman.gif, 15, 15, :mrpac
-:camera, camera-p.gif, 15, 15, :camera
-:dollar, money.gif, 15, 16, :dollar
-:irock, irock.gif, 36, 30, :irock
-:fire, hot.gif, 15, 18, :fire
-:scratch, scratchchin.gif, 15, 20, :scratch
-:eyebrow, eyebrows-new.gif, 15, 15, :eyebrow
-:smashy, smashy.gif, 30, 26, :smashy
-:award, trophy_bronze.gif, 15, 15, :award
-:-/, wonky2.gif, 15, 15, :-/
-:brothercake, favicon.gif, 16, 16, :brothercake
-:ice, cold.gif, 15, 18, :ice
-:teach, teacher.gif, 25, 25, :teach
-:sing, sing.gif, 22, 15, :sing
-:stir, stirthepot.gif, 25, 25, :stir
-:tdown, tdown.gif, 16, 17, :tdown
-:spf, spf.gif, 36, 30, :spf
-:-\, wonky.gif, 15, 15, :-\
-:find, clue.gif, 21, 16, :find
-:magic, wizard.gif, 24, 25, :magic
-:cookie, cookie.gif, 15, 15, :cookie
-:hat, winter.gif, 17, 25, :hat
-:tup, tup.gif, 16, 17, :tup
-:good, angel_002.gif, 15, 19, :good
-:google, google.gif, 36, 30, :google
-:beer, cheers.gif, 21, 15, :beer
-:afro, afro.gif, 25, 25, :afro
-:coffee, hotjava.gif, 16, 24, :coffee
-:umbrella, umbrella.gif, 25, 25, :umbrella
-:aparty, party_002.gif, 17, 27, :aparty
-:disagree, disagree.gif, 15, 15, :disagree
-:faq1, faq-roll.gif, 36, 30, :faq1
-:heart_smiley, heart_smiley.gif, 25, 30, :heart_smiley
-:stilletto, stilletto.gif, 29, 16, :stilletto
-:smiley_vtines, smiley_vtines.gif, 50, 30, :smiley_vtines
-:hearts, sitepoint_val_comp.png, 35, 29, :hearts
-:avalentine, oK6Fl11107543566.gif, 50, 25, :avalentine
-:lust, Lust_by_Zikes.gif, 19, 16, :lust
-:valentine-ii, valentine-ii.gif, 50, 30, :valentine-ii
-:prezsmall, prezsmall.gif, 22, 19, :prezsmall
-:valentine, valentine.gif, 30, 16, :valentine
-:vsmiley, vsmiley.GIF, 23, 27, :vsmiley
-:lovestruck, sitepoint_smilie_v2.gif, 17, 17, :lovestruck
-:love, Love_by_Zikes.gif, 17, 17, :love
-:for_you, sitepoint_smilie_v1_2.gif, 26, 23, :for_you
-:loveblush, sp_val.gif, 20, 18, :loveblush
-:headoverheels, valentine2.gif, 30, 30, :headoverheels
-:big_pink_valentine, zlgEII1107536829.gif, 50, 30, :big_pink_valentine
-:pumpkin, pumpkin.png, 24, 24, :pumpkin
-:goof, goof_002.gif, 15, 16, :goof
-:xeye, xeye.gif, 15, 15, :xeye
-:bawling, bawling.gif, 21, 16, :bawling
-:o, redface.gif, 16, 16, :oyawnb.gif
-:eek2, eek2.gif, 15, 15, :eek2
-:musicman, dazzler.gif, 26, 26, :musicman
-:fangel, headscratch.gif, 20, 20, :fangel
-:mcamara, i3.gif, 15, 15, :mcamara
-:king, king.gif, 17, 22, :king
-:lightbulb, lightbulb.gif, 15, 15, :lightbulb
-:dodgy, dodgy.gif, 15, 15, :dodgy
-:nighty, nighty.gif, 19, 25, :nighty
-:vampire, vampire.gif, 32, 32, :vampire
-:rainbow, rainbow.gif, 15, 15, :rainbow
-:nod, agree_002.gif, 20, 28, :nod
-:hbday, bday_2.gif, 81, 26, :hbday
-:cheer2, cheer4.gif, 35, 25, :cheer2
-:daisy, daisy.gif, 41, 41, :daisy
-:flower, flower.gif, 24, 24, :flower
-:warning, i21.gif, 15, 15, :warning
-:flippy, jumping.gif, 32, 32, :flippy
-:lympics, olympics.gif, 53, 26, :lympics
-:nanaman, banana.gif, 33, 35, :nanaman
-:devil, devil.gif, 15, 20, :devil
-:kiss, kiss.gif, 15, 15, :kiss
-:frosty, frosty.gif, 20, 27, :frosty
-:jack1, pumpkin.gif, 29, 23, :jack1
-:bday, bday.gif, 15, 15, :bday
-:cheer, cheer.gif, 35, 25, :cheer
-:ghost, eyemouth.gif, 15, 15, :ghost
-:note, i20.gif, 15, 15, :note
-:bouncy3, jump3.gif, 31, 31, :bouncy3
-:karate, karate.gif, 20, 18, :karate
-:wavey, wavey.gif, 25, 29, :wavey
-:eyes, privateeyes.gif, 15, 15, :eyes
-:sparty, party.gif, 37, 33, :sparty
-:argue, argue.gif, 50, 25, :argue
-:bunny, bunny.gif, 32, 32, :bunny
-:xtree, ctree.gif, 26, 33, :xtree
-:elf, elf.gif, 32, 32, :elf
-:hangin, i2.gif, 15, 15, :hangin
-:bouncy2, jump2.gif, 31, 31, :bouncy2
-:mears, mickmouse.gif, 21, 20, :mears
-:kaioken, kaioken.gif, 32, 31, :kaioken
-:teleport, teleport.gif, 40, 15, :teleport
-:flake, flake.gif, 15, 15, :flake
-:apresent, present.gif, 23, 15, :apresent
-:jack2, pumpkin2.gif, 15, 15, :jack2
-:angel6, angelfly.gif, 42, 23, :angel6
-:bubbly, bubbly.gif, 32, 32, :bubbly
-:wacko, crazy.gif, 15, 15, :wacko
-:drinky, drink.gif, 45, 20, :drinky
-:deer, hert.gif, 25, 25, :deer
-:bouncy, jump.gif, 31, 31, :bouncy
-:lman, ladysman.gif, 55, 19, :lman
-:Partydude, party_2.gif, 48, 30, :Partydude
-:idea, idea.gif, 15, 32, :idea
-:splat, splat.gif, 30, 30, :splat
-:angel, angel.gif, 29, 29, :angel
-:stpatty, patty.gif, 22, 27, :stpatty
-:santa2, xmas.gif, 22, 25, :santa2
-:angel5, angel_2.gif, 42, 23, :angel5
-:badpc, crash.gif, 30, 30, :badpc
-:kitty2, hello.gif, 30, 25, :kitty2
-:jester2, joker.gif, 31, 26, :jester2
-:girl, lady.gif, 22, 24, :girl
-:Partier, party2.gif, 41, 36, :Partier
-:smash, smash.gif, 30, 26, :smash
-:cold, cold_002.gif, 20, 30, :cold
-:alien, alien.gif, 16, 16, :alien
-:angel4, angel3.gif, 15, 17, :angel4
-:wall, brickwall.gif, 30, 15, :wall
-:cool2, cool_2.gif, 15, 15, :cool2
-:weyes, dizzy.gif, 15, 15, :weyes
-:love, hearts.gif, 40, 40, :love
-:jester, jester.gif, 24, 23, :jester
-:queen, kitfly.gif, 30, 21, :queen
-:Partyguy, party1.gif, 17, 26, :Partyguy
-:EL, embarassedlaugh.gif, 16, 15, :EL
-:sleeping, sleeping.gif, 20, 24, :sleeping
-:bat, blackbat.gif, 31, 18, :bat
-:kitty, kitty.gif, 19, 18, :kitty
-:rwb, rwb.gif, 17, 17, :rwb
-:angel3, angel2.gif, 120, 30, :angel3
-:confused2, confused2.gif, 33, 26, :confused2
-:looko, headshake.gif, 15, 15, :looko
-:kiss2, kiss1.gif, 15, 15, :kiss2
-:lips, lips.gif, 20, 15, :lips
-:redhot, redhot.gif, 16, 16, :redhot
-:heart, heart.gif, 16, 16, :heart
-:witch, heks.gif, 21, 22, :witch
-:santa, santasmile.gif, 21, 22, :santa
-:angel2, angel1.gif, 33, 25, :angel2
-:apart, bighug.gif, 27, 15, :apart
-:clown, clown.gif, 15, 15, :clown
-:pinkribbon, sm_BreastCancerRibbon.gif, 32, 32, :pinkribbon
-:blueribbon, blueribbon-a.gif, 32, 32, :blueribbon
-:movember, movember-face.gif, 75, 15, :movember
+;), smile3.gif, 15, 15, ;)
+:(, smile2.gif, 15, 15, :(
+:x, kiss.gif, 19, 19, :x
+:P, smile4.gif, 15, 15, :P
+:*, star.gif, 25, 25, :*
+:,(, cry.gif, 21, 16, :,(
+8), cool.gif, 17, 17, 8)
+:afk, afk.gif, 25, 25, :afk
+:bnna, banana.gif, 33, 35, :bnna
+:cool, cool.gif, 17, 17, :cool
+:brb, brb.gif, 25, 25, :brb
+:bulb, bulb.gif, 19, 19, :bulb
+:cry, cry.gif, 21, 16, :cry
+:D, biggrin.gif, 15, 15, :D
+:devil, devil.gif, 19, 24, :devil
+:eek, smile5.gif, 15, 15, :eek
+:evil, evil.gif, 32, 32, :evil
+:fart, 27.gif, 53, 26, :fart
+:jump, jump.gif, 31, 31, :jump
+:lol, lol.gif, 15, 15, :lol
+:mad, mad.gif, 15, 22, :mad
+:pent, pnt.gif, 25, 25, :pent
+:rar, rar.gif, 25, 20, :rar
+:rockon, 35.gif, 52, 40, :rockon
+:rose, rose.gif, 25, 25, :rose
+:wink, smile3.gif, 15, 15, :wink
+:zzz, zzz.gif, 26, 33, :zzz
+:), smile.gif, 15, 15, :)
+:-), biggrin.gif, 15, 15, :-)
+:rolleyes, rolleyes.gif, 15, 15, :rolleyes
+:confused, confused.gif, 15, 15, :confused
+:cool, cool.gif, 15, 15, :cool
+:blush, redface-1.gif, 15, 15, :blush
+:lol, lol.gif, 15, 15, :lol
+:mad, mad.gif, 15, 15, :mad
+:rofl, rofl.gif, 15, 15, :rofl
+:p, tongue.gif, 15, 15, :p
+:nono, nonono.gif, 15, 15, :nono
+(:, upsidedown.gif, 15, 15, (:
+:(x), tapedshut.gif, 15, 15, :(x)
+:eye, cyclops.gif, 15, 15, :eye
+:goof, goof.gif, 15, 16, :goof
+:sick, dead.gif, 15, 15, :sick
+:injured, ouch.gif, 15, 15, :injured
+:shifty, shifty_suspect.gif, 15, 15, :shifty
+:weee, weee.gif, 23, 17, :weee
+:wave, wave.gif, 25, 15, :wave
+:hohoho, santa-new.gif, 22, 20, :hohoho
+:wiki, wiki.gif, 36, 30, :wiki
+:vinnie, emot-sissies.gif, 80, 21, :vinnie
+:eatme, chomp.gif, 15, 15, :eatme
+:agree, agree.gif, 15, 15, :agree
+:faq2, faq-mad.gif, 36, 30, :faq2
+:hush, shhh.gif, 17, 20, :hush
+:crazy, looney.gif, 15, 15, :crazy
+:juggle, juggle-new.gif, 31, 34, :juggle
+:bomb, bomb.gif, 20, 15, :bomb
+:unhappy, jpshakehead.gif, 15, 15, :unhappy
+:smoke, stoner.gif, 21, 20, :smoke
+:drink, beer-fresh.gif, 45, 20, :drink
+:footmouth, footinmouth.gif, 18, 17, :footmouth
+:inspector, detective.gif, 25, 25, :inspector
+:twocents, twocents.gif, 23, 15, :twocents
+:mspac, pm-mspacman.gif, 15, 15, :mspac
+:<, emot-v2.gif, 15, 15, :<
+:whip, whip-new.gif, 50, 15, :whip
+:toast, toast.gif, 36, 33, :toast
+:headbang, banghead.gif, 25, 20, :headbang
+:cap, cap.gif, 19, 19, :cap
+:cd, cd.gif, 15, 15, :cd
+:mrpac, pm-pacman.gif, 15, 15, :mrpac
+:camera, camera-p.gif, 15, 15, :camera
+:dollar, money.gif, 15, 16, :dollar
+:irock, irock.gif, 36, 30, :irock
+:fire, hot.gif, 15, 18, :fire
+:scratch, scratchchin.gif, 15, 20, :scratch
+:eyebrow, eyebrows-new.gif, 15, 15, :eyebrow
+:smashy, smashy.gif, 30, 26, :smashy
+:award, trophy_bronze.gif, 15, 15, :award
+:-/, wonky2.gif, 15, 15, :-/
+:brothercake, favicon.gif, 16, 16, :brothercake
+:ice, cold.gif, 15, 18, :ice
+:teach, teacher.gif, 25, 25, :teach
+:sing, sing.gif, 22, 15, :sing
+:stir, stirthepot.gif, 25, 25, :stir
+:tdown, tdown.gif, 16, 17, :tdown
+:spf, spf.gif, 36, 30, :spf
+:-\, wonky.gif, 15, 15, :-\
+:find, clue.gif, 21, 16, :find
+:magic, wizard.gif, 24, 25, :magic
+:cookie, cookie.gif, 15, 15, :cookie
+:hat, winter.gif, 17, 25, :hat
+:tup, tup.gif, 16, 17, :tup
+:good, angel_002.gif, 15, 19, :good
+:google, google.gif, 36, 30, :google
+:beer, cheers.gif, 21, 15, :beer
+:afro, afro.gif, 25, 25, :afro
+:coffee, hotjava.gif, 16, 24, :coffee
+:umbrella, umbrella.gif, 25, 25, :umbrella
+:aparty, party_002.gif, 17, 27, :aparty
+:disagree, disagree.gif, 15, 15, :disagree
+:faq1, faq-roll.gif, 36, 30, :faq1
+:heart_smiley, heart_smiley.gif, 25, 30, :heart_smiley
+:stilletto, stilletto.gif, 29, 16, :stilletto
+:smiley_vtines, smiley_vtines.gif, 50, 30, :smiley_vtines
+:hearts, sitepoint_val_comp.png, 35, 29, :hearts
+:avalentine, oK6Fl11107543566.gif, 50, 25, :avalentine
+:lust, Lust_by_Zikes.gif, 19, 16, :lust
+:valentine-ii, valentine-ii.gif, 50, 30, :valentine-ii
+:prezsmall, prezsmall.gif, 22, 19, :prezsmall
+:valentine, valentine.gif, 30, 16, :valentine
+:vsmiley, vsmiley.GIF, 23, 27, :vsmiley
+:lovestruck, sitepoint_smilie_v2.gif, 17, 17, :lovestruck
+:love, Love_by_Zikes.gif, 17, 17, :love
+:for_you, sitepoint_smilie_v1_2.gif, 26, 23, :for_you
+:loveblush, sp_val.gif, 20, 18, :loveblush
+:headoverheels, valentine2.gif, 30, 30, :headoverheels
+:big_pink_valentine, zlgEII1107536829.gif, 50, 30, :big_pink_valentine
+:pumpkin, pumpkin.png, 24, 24, :pumpkin
+:goof, goof_002.gif, 15, 16, :goof
+:xeye, xeye.gif, 15, 15, :xeye
+:bawling, bawling.gif, 21, 16, :bawling
+:o, redface.gif, 16, 16, :oyawnb.gif
+:eek2, eek2.gif, 15, 15, :eek2
+:musicman, dazzler.gif, 26, 26, :musicman
+:fangel, headscratch.gif, 20, 20, :fangel
+:mcamara, i3.gif, 15, 15, :mcamara
+:king, king.gif, 17, 22, :king
+:lightbulb, lightbulb.gif, 15, 15, :lightbulb
+:dodgy, dodgy.gif, 15, 15, :dodgy
+:nighty, nighty.gif, 19, 25, :nighty
+:vampire, vampire.gif, 32, 32, :vampire
+:rainbow, rainbow.gif, 15, 15, :rainbow
+:nod, agree_002.gif, 20, 28, :nod
+:hbday, bday_2.gif, 81, 26, :hbday
+:cheer2, cheer4.gif, 35, 25, :cheer2
+:daisy, daisy.gif, 41, 41, :daisy
+:flower, flower.gif, 24, 24, :flower
+:warning, i21.gif, 15, 15, :warning
+:flippy, jumping.gif, 32, 32, :flippy
+:lympics, olympics.gif, 53, 26, :lympics
+:nanaman, banana.gif, 33, 35, :nanaman
+:devil, devil.gif, 15, 20, :devil
+:kiss, kiss.gif, 15, 15, :kiss
+:frosty, frosty.gif, 20, 27, :frosty
+:jack1, pumpkin.gif, 29, 23, :jack1
+:bday, bday.gif, 15, 15, :bday
+:cheer, cheer.gif, 35, 25, :cheer
+:ghost, eyemouth.gif, 15, 15, :ghost
+:note, i20.gif, 15, 15, :note
+:bouncy3, jump3.gif, 31, 31, :bouncy3
+:karate, karate.gif, 20, 18, :karate
+:wavey, wavey.gif, 25, 29, :wavey
+:eyes, privateeyes.gif, 15, 15, :eyes
+:sparty, party.gif, 37, 33, :sparty
+:argue, argue.gif, 50, 25, :argue
+:bunny, bunny.gif, 32, 32, :bunny
+:xtree, ctree.gif, 26, 33, :xtree
+:elf, elf.gif, 32, 32, :elf
+:hangin, i2.gif, 15, 15, :hangin
+:bouncy2, jump2.gif, 31, 31, :bouncy2
+:mears, mickmouse.gif, 21, 20, :mears
+:kaioken, kaioken.gif, 32, 31, :kaioken
+:teleport, teleport.gif, 40, 15, :teleport
+:flake, flake.gif, 15, 15, :flake
+:apresent, present.gif, 23, 15, :apresent
+:jack2, pumpkin2.gif, 15, 15, :jack2
+:angel6, angelfly.gif, 42, 23, :angel6
+:bubbly, bubbly.gif, 32, 32, :bubbly
+:wacko, crazy.gif, 15, 15, :wacko
+:drinky, drink.gif, 45, 20, :drinky
+:deer, hert.gif, 25, 25, :deer
+:bouncy, jump.gif, 31, 31, :bouncy
+:lman, ladysman.gif, 55, 19, :lman
+:Partydude, party_2.gif, 48, 30, :Partydude
+:idea, idea.gif, 15, 32, :idea
+:splat, splat.gif, 30, 30, :splat
+:angel, angel.gif, 29, 29, :angel
+:stpatty, patty.gif, 22, 27, :stpatty
+:santa2, xmas.gif, 22, 25, :santa2
+:angel5, angel_2.gif, 42, 23, :angel5
+:badpc, crash.gif, 30, 30, :badpc
+:kitty2, hello.gif, 30, 25, :kitty2
+:jester2, joker.gif, 31, 26, :jester2
+:girl, lady.gif, 22, 24, :girl
+:Partier, party2.gif, 41, 36, :Partier
+:smash, smash.gif, 30, 26, :smash
+:cold, cold_002.gif, 20, 30, :cold
+:alien, alien.gif, 16, 16, :alien
+:angel4, angel3.gif, 15, 17, :angel4
+:wall, brickwall.gif, 30, 15, :wall
+:cool2, cool_2.gif, 15, 15, :cool2
+:weyes, dizzy.gif, 15, 15, :weyes
+:love, hearts.gif, 40, 40, :love
+:jester, jester.gif, 24, 23, :jester
+:queen, kitfly.gif, 30, 21, :queen
+:Partyguy, party1.gif, 17, 26, :Partyguy
+:EL, embarassedlaugh.gif, 16, 15, :EL
+:sleeping, sleeping.gif, 20, 24, :sleeping
+:bat, blackbat.gif, 31, 18, :bat
+:kitty, kitty.gif, 19, 18, :kitty
+:rwb, rwb.gif, 17, 17, :rwb
+:angel3, angel2.gif, 120, 30, :angel3
+:confused2, confused2.gif, 33, 26, :confused2
+:looko, headshake.gif, 15, 15, :looko
+:kiss2, kiss1.gif, 15, 15, :kiss2
+:lips, lips.gif, 20, 15, :lips
+:redhot, redhot.gif, 16, 16, :redhot
+:heart, heart.gif, 16, 16, :heart
+:witch, heks.gif, 21, 22, :witch
+:santa, santasmile.gif, 21, 22, :santa
+:angel2, angel1.gif, 33, 25, :angel2
+:apart, bighug.gif, 27, 15, :apart
+:clown, clown.gif, 15, 15, :clown
+:pinkribbon, sm_BreastCancerRibbon.gif, 32, 32, :pinkribbon
+:blueribbon, blueribbon-a.gif, 32, 32, :blueribbon
+:movember, movember-face.gif, 75, 15, :movember
:wavejump, waveJump.gif, 248, 31, :wavejump
\ No newline at end of file
diff --git a/chatbot/addons/parseBBCode/inputEmotes.dat b/chatbot/addons/parseBBCode/inputEmotes.dat
index ffec74b..6932e9a 100644
--- a/chatbot/addons/parseBBCode/inputEmotes.dat
+++ b/chatbot/addons/parseBBCode/inputEmotes.dat
@@ -1,123 +1,123 @@
-:-)
-O:-)
-:-D
-:'(
-:-[
-XD
-:O
-:-!
-:-(
-:(
-:-\
-8-)
-:-*
-:-X
-:-$
-:-)
-:)
-:-P
-;-)
-;)
->:O
->-)
-O:)
-X(
-=D>
-0-+
-~X(
-;;)
-:bz
-:D
->:D<
-o=>
-=">
->:/
-=((
-=:)
-:-c
-:-@
-~:>
-:O)
-:-/
-:-??
-B-)
-3:-O
-<):)
-:((
-\:D/
-8->
->:)
-:o3
-=P~
-:-L
-;))
-o->
-:!!
-@-)
-*-:)
-:))
-:^o
-L-)
-:x
-$-)
-:(|)
-:-SS
-:-B
-%-(
-[-(
-^:)^
-:-j
-:)]
-<:-P
-:)>-
->:P
-:@)
-:ar!
-[-o<
-/:)
-\m/
-8-|
-=))
-@};-
-@>->--
-:kiss
-:rar
-[-x
-:-&
-:-<
-8-}
-8-X
-|-)
-:>
-(*)
-:P
-:|
-:-O
-=;
-:-?
-:-q
-:-bd
-:-t
-:-w
-:-h
-#:-S
-:-"
-:-S
-(:|
-:s
-:-|
-:-#
-:$
-:^)
-:d
-<:o)
-^o)
-+o(
-:o
-*-)
-:[
-^^
-^ ^
-^_^
-(^ ^)
+:-)
+O:-)
+:-D
+:'(
+:-[
+XD
+:O
+:-!
+:-(
+:(
+:-\
+8-)
+:-*
+:-X
+:-$
+:-)
+:)
+:-P
+;-)
+;)
+>:O
+>-)
+O:)
+X(
+=D>
+0-+
+~X(
+;;)
+:bz
+:D
+>:D<
+o=>
+=">
+>:/
+=((
+=:)
+:-c
+:-@
+~:>
+:O)
+:-/
+:-??
+B-)
+3:-O
+<):)
+:((
+\:D/
+8->
+>:)
+:o3
+=P~
+:-L
+;))
+o->
+:!!
+@-)
+*-:)
+:))
+:^o
+L-)
+:x
+$-)
+:(|)
+:-SS
+:-B
+%-(
+[-(
+^:)^
+:-j
+:)]
+<:-P
+:)>-
+>:P
+:@)
+:ar!
+[-o<
+/:)
+\m/
+8-|
+=))
+@};-
+@>->--
+:kiss
+:rar
+[-x
+:-&
+:-<
+8-}
+8-X
+|-)
+:>
+(*)
+:P
+:|
+:-O
+=;
+:-?
+:-q
+:-bd
+:-t
+:-w
+:-h
+#:-S
+:-"
+:-S
+(:|
+:s
+:-|
+:-#
+:$
+:^)
+:d
+<:o)
+^o)
++o(
+:o
+*-)
+:[
+^^
+^ ^
+^_^
+(^ ^)
(^_^)
\ No newline at end of file
diff --git a/chatbot/addons/parseBBCode/parseBBCode.php b/chatbot/addons/parseBBCode/parseBBCode.php
index 4d7f8d8..8d12c7f 100644
--- a/chatbot/addons/parseBBCode/parseBBCode.php
+++ b/chatbot/addons/parseBBCode/parseBBCode.php
@@ -1,131 +1,131 @@
-Emotes File = ' . print_r($smilieArray, true) . ""; +// print_r($tmp_rows); +// echo ""; + + runDebug( __FILE__, __FUNCTION__, __LINE__, "Found '$i' relevant rows",2); + + return $tmp_rows; +} + +/** + * function match_wildcard_rows() + * This function takes a sentance and converts AIML wildcards to PHP wildcards + * so that it can be matched in php + * @param string $item + * @return string matchme +**/ +function match_wildcard_rows($item){ + + //runDebug( __FILE__, __FUNCTION__, __LINE__, ""); + $item = trim($item); + $item = str_replace("*",")(.*)(",$item); + $item = str_replace("_",")(.*)(",$item); + $item = str_replace("+","\+",$item); + $item = "(".str_replace(" ","\s",$item).")"; + $item = str_replace("()","",$item); + + $matchme = "/\b^".$item."$\b/i"; + return $matchme; +} + +/** + * function score_matches() + * This function takes all the relevant sql results and scores them + * to find the most likely match with the aiml + * @param int $bot_parent_id - the id of the parent bot + * @param array $allrows - all the results + * @param string $lookingfor - the user input + * @param string $current_thatpattern - the current that pattern + * @param string $current_topic - the current topic + * @return array allrows - the SCORED results +**/ +function score_matches($bot_parent_id,$allrows,$lookingfor,$current_thatpattern,$current_topic,$default_aiml_pattern){ + global $commonwordsArr; + + runDebug( __FILE__, __FUNCTION__, __LINE__, "Scoring the matches",4); + + //set the scores for each type of word or sentance to be used in this function + $default_pattern_points = 2; + $underscore_points = 100; + $starscore_points = 1; + $uncommon_word_points = 6; + $common_word_points = 3; + $direct_match = 1; + $topic_match = 50; + $that_pattern_match = 75; + $that_pattern_match_general = 9; + $this_bot_match = 500; //even the worst match from the actual bot is better than the best match from the base bot + + //loop through all relevant results + foreach($allrows as $all => $subrow){ + //get items + + + if((!isset($subrow['pattern'])) || (trim($subrow['pattern'])=='')) { + $aiml_pattern=''; + } else { + $aiml_pattern = trim($subrow['pattern']); + } + + if((!isset($subrow['thatpattern'])) || (trim($subrow['thatpattern'])=='')) { + $aiml_thatpattern =''; + } else { + $aiml_thatpattern = trim($subrow['thatpattern']); + } + + if((!isset($subrow['topic'])) || (trim($subrow['topic'])=='')) { + $aiml_topic =''; + } else { + $aiml_topic = trim($subrow['topic']); + } + + if($aiml_pattern=='') + { + continue; + } + + //convert aiml wildcards to php wildcards + if($aiml_thatpattern!=""){ + $aiml_thatpattern_wildcards = match_wildcard_rows($aiml_thatpattern); + }else{ + $aiml_thatpattern_wildcards = ""; + } + + //to debug the scoring... + $allrows[$all]['track_score']=""; + + //if the aiml is from the actual bot and not the base bot + //any match in the current bot is better than the base bot + if(($bot_parent_id!=0)&&($allrows[$all]['bot_id']!=$bot_parent_id)){ + $allrows[$all]['score']+=$this_bot_match; + $allrows[$all]['track_score'].="a"; + } + //if the result aiml pattern matches the user input increase score + if($aiml_pattern==$lookingfor){ + $allrows[$all]['score']+=$direct_match; + $allrows[$all]['track_score'].="b"; + } + //if the result topic matches the user stored aiml topic increase score + if(($aiml_topic==$current_topic) && ($aiml_topic!="")) { + $allrows[$all]['score']+=$topic_match; + $allrows[$all]['track_score'].="c"; + } + //if the result that pattern matches the user stored that pattern increase score + if(($aiml_thatpattern==$current_thatpattern) && ($aiml_thatpattern!="") && ($aiml_pattern!="*")){ + $allrows[$all]['score']+=$that_pattern_match; + $allrows[$all]['track_score'].="d"; + }elseif(($aiml_thatpattern_wildcards!="") && ($aiml_thatpattern!="") && ($aiml_pattern!="*") && (preg_match($aiml_thatpattern_wildcards,$current_thatpattern,$m))){ + $allrows[$all]['score']+=$that_pattern_match; + $allrows[$all]['track_score'].="e"; + } + //if the that pattern is just a star we need to score it seperately as this is very general + if( ($aiml_pattern=="*")&&( (substr($aiml_thatpattern, -1)=="*") || (substr($aiml_thatpattern, 0, 1)=="*")) ) + { + + //if the result that pattern matches the user stored that pattern increase score with a lower number + if(($aiml_thatpattern==$current_thatpattern) && ($aiml_thatpattern!="")){ + $allrows[$all]['score']+=$that_pattern_match_general; + $allrows[$all]['track_score'].="f"; + }elseif(($aiml_thatpattern_wildcards!="") && ($aiml_thatpattern!="") && (preg_match($aiml_thatpattern_wildcards,$current_thatpattern,$m))){ + $allrows[$all]['score']+=$that_pattern_match_general; + $allrows[$all]['track_score'].="g"; + } + } + + + //if stored result == default pattern increase score + if(strtolower($aiml_pattern)==strtolower($default_aiml_pattern)){ + $allrows[$all]['score']+=$default_pattern_points; + $allrows[$all]['track_score'].="h"; + } elseif($aiml_pattern=="*"){ //if stored result == * increase score + $allrows[$all]['score']+=$starscore_points; + $allrows[$all]['track_score'].="i"; + } elseif($aiml_pattern=="_"){ //if stored result == _ increase score + $allrows[$all]['score']+=$underscore_points; + $allrows[$all]['track_score'].="j"; + } else { //if stored result == none of the above BREAK INTO WORDS AND SCORE INDIVIDUAL WORDS + $wordsArr = explode(" ",$aiml_pattern); + foreach($wordsArr as $index => $word){ + $word = strtolower(trim($word)); + if(in_Array($word,$commonwordsArr)){ // if it is a commonword increase with (lower) score + $allrows[$all]['score']+=$common_word_points; + $allrows[$all]['track_score'].="k"; + } elseif($word=="*"){ + $allrows[$all]['score']+=$starscore_points; //if it is a star wildcard increase score + $allrows[$all]['track_score'].="l"; + } elseif($word=="_"){ + $allrows[$all]['score']+=$underscore_points; //if it is a underscore wildcard increase score + $allrows[$all]['track_score'].="m"; + } else { + $allrows[$all]['score']+=$uncommon_word_points; //else it must be an uncommon word so increase the score + $allrows[$all]['track_score'].="n"; + } + } + } + } + + //send off for debugging + sort2DArray("show top scoring aiml matches",$allrows,"score", 1,10); + + /* + echo "
"; + print_r($allrows); + echo ""; + */ + + return $allrows; //return the scored rows +} + +/** + * function get_highest_score_rows() + * This function takes all the relevant and scored aiml results + * and saves the highest scoring rows + * @param array $allrows - all the results + * @param string $lookingfor - the user input + * @return array bestResponseArr - best response and its parts (topic etc) +**/ +function get_highest_score_rows($allrows,$lookingfor){ + + $bestResponse = array(); + $bestResponseArr = array(); + $last_high_score = 0; + + //loop through the results + foreach($allrows as $all => $subrow){ + if(!isset($subrow['score'])) + {} + elseif($subrow['score']>$last_high_score){ //if higher than last score then reset tmp array and store this result + $tmpArr = array(); + $tmpArr[]=$subrow; + $last_high_score=$subrow['score']; + } elseif($subrow['score']==$last_high_score){//if same score as current high score add to array + $tmpArr[]=$subrow; + } + } + + + //there may be any number of results with the same score so pick any random one + $bestResponseArr = $tmpArr[array_rand($tmpArr)]; + $cRes = count($tmpArr); + runDebug( __FILE__, __FUNCTION__, __LINE__, "Best Responses: ".print_r($tmpArr,true),4); + runDebug( __FILE__, __FUNCTION__, __LINE__, "Will use randomly picked best response chosen out of $cRes responses with same score: ".$bestResponseArr['aiml_id']." - ".$bestResponseArr['pattern'],2); + //return the best response + return $bestResponseArr; +} + + + + + +/** + * function get_convo_var() + * This function takes fetches a variable from the conversation array + * @param array $convoArr - conversation array + * @param string $index_1 - convoArr[$index_1] + * @param string $index_2 - convoArr[$index_1][$index_2] + * @param int $index_3 - convoArr[$index_1][$index_2][$index_3] + * @param int $index_4 - convoArr[$index_1][$index_2][$index_3][$index_4] + * @return string $value - the value of the element + * + * + * examples + * + * $convoArr['conversation']['bot_id'] = get_convo_var($convoArr,'conversation','bot_id') + * $convoArr['that'][1][1] = get_convo_var($convoArr,'that','',1,1) +**/ +function get_convo_var($convoArr,$index_1,$index_2="",$index_3="",$index_4=""){ + + global $offset; + + runDebug( __FILE__, __FUNCTION__, __LINE__, "Get from ConvoArr [$index_1][$index_2][$index_3][$index_4]",4); + + if($index_2=="") $index_2 = "~NULL~"; + if($index_3=="") $index_3 = $offset; + if($index_4=="") $index_4 = $offset; + + if((isset($convoArr[$index_1])) &&(!is_array($convoArr[$index_1]))&&($convoArr[$index_1]!='')){ + $value = $convoArr[$index_1]; + } + elseif((isset($convoArr[$index_1][$index_3]))&&(!is_array($convoArr[$index_1][$index_3]))&&($convoArr[$index_1][$index_3]!='')){ + $value = $convoArr[$index_1][$index_3]; + } + elseif((isset($convoArr[$index_1][$index_3][$index_4]))&&(!is_array($convoArr[$index_1][$index_3][$index_4]))&&($convoArr[$index_1][$index_3][$index_4]!='')){ + $value = $convoArr[$index_1][$index_3][$index_4]; + } + elseif((isset($convoArr[$index_1][$index_2]))&&(!is_array($convoArr[$index_1][$index_2]))&&($convoArr[$index_1][$index_2]!='')){ + $value = $convoArr[$index_1][$index_2]; + } + elseif((isset($convoArr[$index_1][$index_2][$index_3]))&&(!is_array($convoArr[$index_1][$index_2][$index_3]))&&($convoArr[$index_1][$index_2][$index_3]!='')){ + $value = $convoArr[$index_1][$index_2][$index_3]; + } + elseif((isset($convoArr[$index_1][$index_2][$index_3][$index_4]))&&(!is_array($convoArr[$index_1][$index_2][$index_3][$index_4]))&&($convoArr[$index_1][$index_2][$index_3][$index_4]!='')){ + $value = $convoArr[$index_1][$index_2][$index_3][$index_4]; + } + else + { + $value = ""; + } + + runDebug( __FILE__, __FUNCTION__, __LINE__, "Get from ConvoArr [$index_1][$index_2][$index_3][$index_4] FOUND: ConvoArr Value = '$value'",4); + return $value; +} + + + + + + + + + + + + + + + + + + + + + + + +/** + * function find_userdefined_aiml() + * This function searches the user defined aiml patterns first + * @param array $convoArr - conversation array + * @return array allrows +**/ +function find_userdefined_aiml($convoArr) +{ + global $dbn,$con; + + $i = 0; + $allrows = array(); + $bot_id = get_convo_var($convoArr,'conversation','bot_id'); + $user_id = get_convo_var($convoArr,'conversation','user_id'); + $lookingfor = mysql_real_escape_string(get_convo_var($convoArr,"aiml","lookingfor")); + + //build sql + $sql = "SELECT * FROM `$dbn`.`aiml_userdefined` WHERE + `botid` = '$bot_id' AND + `userid` = '$user_id' AND + `pattern` = '$lookingfor'"; + + runDebug( __FILE__, __FUNCTION__, __LINE__, "User defined SQL: $sql",3); + + $result = db_query($sql,$con); + + //if there is a result get it + if(($result)&&(mysql_num_rows($result)>0)){ + //loop through results + while($row=mysql_fetch_array($result)) { + $allrows['pattern'] = $row['pattern']; + $allrows['thatpattern'] = $row['thatpattern']; + $allrows['template'] = $row['template']; + $allrows['topic'] = $row['topic']; + $i++; + } + } + + runDebug( __FILE__, __FUNCTION__, __LINE__, "User defined rows found: '$i'",2); + + //return rows + return $allrows; +} + +/** + * function get_aiml_to_parse() + * This function controls all the process to match the aiml in the db to the user input + * @param array $convoArr - conversation array + * @return array $convoArr +**/ +function get_aiml_to_parse($convoArr) +{ + global $offset; + runDebug( __FILE__, __FUNCTION__, __LINE__, "Running all functions to get the correct aiml from the DB",4); + + $lookingfor = get_convo_var($convoArr,"aiml","lookingfor"); + $current_thatpattern = get_convo_var($convoArr,'that','',1,1); + $current_topic = get_convo_var($convoArr,'topic'); + + $default_aiml_pattern = get_convo_var($convoArr,'conversation','default_aiml_pattern'); + $bot_parent_id = get_convo_var($convoArr,'conversation','bot_parent_id'); + $sendConvoArr = $convoArr; + + //check if match in user defined aiml + $allrows = find_userdefined_aiml($convoArr); + + //if there is no match in the user defined aiml tbl + if((!isset($allrows) ) || (count($allrows)<=0) ){ + //look for a match in the normal aiml tbl + $allrows = find_aiml_matches($convoArr); + //unset all irrelvant matches + $allrows = unset_all_bad_pattern_matches($allrows,$lookingfor,$current_thatpattern,$current_topic,$default_aiml_pattern); + //score the relevant matches + $allrows = score_matches($bot_parent_id,$allrows,$lookingfor,$current_thatpattern,$current_topic,$default_aiml_pattern); + //get the highest + $allrows = get_highest_score_rows($allrows,$lookingfor); + } + + //Now we have the results put into the conversation array + $convoArr['aiml']['pattern']=$allrows['pattern']; + $convoArr['aiml']['thatpattern']=$allrows['thatpattern']; + $convoArr['aiml']['template']=$allrows['template']; + $convoArr['aiml']['html_template']=htmlentities($allrows['template']); + $convoArr['aiml']['topic']=$allrows['topic']; + $convoArr['aiml']['score']=$allrows['score']; + $convoArr['aiml']['aiml_to_php'] = $allrows['aiml_to_php']; + $convoArr['aiml']['aiml_id'] = $allrows['aiml_id']; + //return + + runDebug( __FILE__, __FUNCTION__, __LINE__, "Will be parsing id:".$allrows['aiml_id'] ." (".$allrows['pattern'].")",4); + + return $convoArr; +} + +/** + * function find_aiml_matches() + * This function builds the sql to use to get a match from the tbl + * @param array $convoArr - conversation array + * @return array $convoArr +**/ +function find_aiml_matches($convoArr){ + + global $con,$dbn,$error_response,$use_parent_bot; + + runDebug( __FILE__, __FUNCTION__, __LINE__, "Finding the aiml matches from the DB",4); + + $i=0; + + //TODO convert to get_it + $bot_id = get_convo_var($convoArr,"conversation","bot_id"); + $bot_parent_id = get_convo_var($convoArr,"conversation","bot_parent_id"); + $default_aiml_pattern = get_convo_var($convoArr,"conversation","default_aiml_pattern"); + #$lookingfor = get_convo_var($convoArr,"aiml","lookingfor"); + $lookingfor = mysql_real_escape_string(get_convo_var($convoArr,"aiml","lookingfor")); + + //get the first and last words of the cleaned user input + $lastInputWord = get_last_word($lookingfor); + $firstInputWord = get_first_word($lookingfor); + + //get the stored topic + $storedtopic = mysql_real_escape_string(get_convo_var($convoArr,"topic")); + + //get the cleaned user input + $lastthat = get_convo_var($convoArr,'that','',1,1); + + //build like patterns + if($lastthat!=""){ + $thatPatternSQL = " OR ".make_like_pattern($lastthat,'thatpattern'); + } else { + $thatPattern = ""; + //$lastThatPattern = ""; + //$firstThatPattern = ""; + $thatPatternSQL = ""; + //$storedthatpattern =""; + } + + //get the word count + $word_count = wordsCount_inSentance($lookingfor); + + + if($bot_parent_id!=0) + { + $sql_bot_select = " (bot_id = '$bot_id' OR bot_id = '$bot_parent_id') "; + } + else + { + $sql_bot_select = " bot_id = '$bot_id' "; + } + + + if($word_count==1){ //if there is one word do this + $sql = "SELECT * FROM `$dbn`.`aiml` WHERE + $sql_bot_select AND ( + ((`pattern` = '_') OR (`pattern` = '*') OR (`pattern` = '$lookingfor') OR (`pattern` = '$default_aiml_pattern' ) ) + AND ((`thatpattern` = '_') OR (`thatpattern` = '*') OR (`thatpattern` = '') OR (`thatpattern` = '$lastthat') $thatPatternSQL ) + AND ( (`topic`='') OR (`topic`='".$storedtopic."')))"; + } else { //otherwise do this + $sql_add = make_like_pattern($lookingfor,'pattern'); + $sql = "SELECT * FROM `$dbn`.`aiml` WHERE + $sql_bot_select AND ( + ((`pattern` = '_') OR + (`pattern` = '*') OR + (`pattern` like '$lookingfor') OR + ($sql_add) OR + (`pattern` = '$default_aiml_pattern' )) + AND ((`thatpattern` = '_') OR (`thatpattern` = '*') OR (`thatpattern` = '') OR (`thatpattern` = '$lastthat') $thatPatternSQL ) + AND ((`topic`='') OR (`topic`='".$storedtopic."')))"; + } + runDebug( __FILE__, __FUNCTION__, __LINE__, "Match AIML sql: $sql",3); + + $result = db_query($sql,$con); + + if(($result)&&(mysql_num_rows($result)>0)){ + runDebug( __FILE__, __FUNCTION__, __LINE__, "FOUND: '".mysql_num_rows($result)."' potential AIML matches",2); + //loop through results + while($row=mysql_fetch_array($result)) { + $allrows[$i]['aiml_id'] = $row['id']; + $allrows[$i]['bot_id'] = $row['bot_id']; + $allrows[$i]['pattern'] = $row['pattern']; + $allrows[$i]['thatpattern'] = $row['thatpattern']; + $allrows[$i]['template'] = $row['template']; + $allrows[$i]['topic'] = $row['topic']; + $allrows[$i]['aiml_to_php'] = $row['php_code']; + $i++; + } + } + else + { + runDebug( __FILE__, __FUNCTION__, __LINE__, "Error: FOUND NO AIML matches in DB",1); + $allrows[$i]['aiml_id'] = "-1"; + $allrows[$i]['bot_id'] = "-1"; + $allrows[$i]['pattern'] = "no results"; + $allrows[$i]['thatpattern'] = ""; + $allrows[$i]['template'] = "
DBH = $dbh");
+ }
+
+ $fetchMode = PDO::FETCH_ASSOC;
+ $sql = "SHOW tables in `$dbn`;";
+ $query = $dbh->query($sql);
+ $script_sql = $sql1;
+ $result = $query->fetchAll($fetchMode);
+ foreach ($result as $row)
+ {
+ $addFlag = false;
+ $table_name = $row["Tables_in_$dbn"];
+ $sql = "SHOW COLUMNS FROM `$dbn`.`$table_name`;";
+ $query = $dbh->query($sql);
+ $this_result = $query->fetchAll();
+ $tmp_sql_row = str_replace('[table]', $table_name, $sql_row1);
+ foreach ($this_result as $table_row)
+ {
+ #die ('this result = ' . print_r($this_result, true));
+ $field = $table_row['Field'];
+ $type = $table_row['Type'];
+ $null = $table_row['Null'];
+ $null = ($null == 'NO') ? 'NOT NULL' : 'NULL';
+ if ($type == 'text' or (strstr($type, 'varchar')))
+ {
+ $tmp_sql_field_row = str_replace('[field]', $field, $sql_row2);
+ $tmp_sql_field_row = str_replace('[type]', $type, $tmp_sql_field_row);
+ $tmp_sql_field_row = str_replace('[null]', $null, $tmp_sql_field_row);
+ $tmp_sql_row .= $tmp_sql_field_row;
+ $addFlag = true;
+ }
+ }
+ $script_sql .= ($addFlag) ? rtrim($tmp_sql_row,"\n,") . ";\n" : '';
+ }
+
+ $result = $dbh->exec($script_sql);
+
+ if (false !== $result) die('Database converted successfully! Enjoy! Your Chatbot');
+ die("There was a problem. SQL =\n$script_sql");
+
+
+
+?>
\ No newline at end of file
diff --git a/config/default_botpersonality_fields.dat b/config/default_botpersonality_fields.dat
new file mode 100644
index 0000000..7d3f314
--- /dev/null
+++ b/config/default_botpersonality_fields.dat
@@ -0,0 +1,60 @@
+name
+gender
+botmaster
+master
+age
+website
+email
+birthday
+birthplace
+size
+version
+build
+language
+feelings
+etype
+emotions
+ethics
+orientation
+baseballteam
+footballteam
+hockeyteam
+favoritesport
+vocabulary
+celebrities
+celebrity
+favoriteactor
+favoriteactress
+favoriteartist
+favoritemusician
+favoritesong
+favoriteauthor
+friend
+nationality
+religion
+president
+party
+kingdom
+phylum
+class
+order
+family
+genus
+species
+boyfriend
+favoritebook
+favoriteband
+favoritecolor
+favoritefood
+favoritemovie
+forfun
+friends
+girlfriend
+kindmusic
+location
+looklike
+question
+sign
+talkabout
+wear
+loves
diff --git a/config/global_config.php b/config/global_config.php
deleted file mode 100644
index 2b4a05e..0000000
--- a/config/global_config.php
+++ /dev/null
@@ -1,294 +0,0 @@
-
\ No newline at end of file
diff --git a/config/global_config.tpl b/config/global_config.tpl
index 8e5b134..a308ff4 100644
--- a/config/global_config.tpl
+++ b/config/global_config.tpl
@@ -1,295 +1,232 @@
-
\ No newline at end of file
diff --git a/config/install_config.php b/config/install_config.php
new file mode 100644
index 0000000..0d446e8
--- /dev/null
+++ b/config/install_config.php
@@ -0,0 +1,68 @@
+
\ No newline at end of file
diff --git a/config/error.log b/config/uploads/index.html
similarity index 100%
rename from config/error.log
rename to config/uploads/index.html
diff --git a/config/verbList.dat b/config/verbList.dat
index 485d161..72c8974 100644
--- a/config/verbList.dat
+++ b/config/verbList.dat
@@ -1,1870 +1,1870 @@
-# verbList.dat
-#
-# �2011/2012 Geek Cave Creations - Written for use with the Program O AIML Interpreter script
-# Written by Dave Morton
-#
-# contains a list of 1,800+ verbs, for use in determining whether "I" or "me" should be used when transforming a phrase from second person into first person.
-# It's also used for verb modification when changing from first person to second or third.
-# lines prefixed with # are ignored
-# lines prefixed with "~ " indicate a verb that needs no modification.
-# lines prefixed with "$ " indicate that first person and second person verbs are the same.
-# lines with no prefix are lists of three comma separated words, one for for each "person".
-#
-# other rules:
-# 1.) when first person verbs are the same as second person, then gender-neutral "they" is the same, as well.
-# 2.) most past-tense verbs cover all "person" modes, and don't need to be modified.
-#
-# empty lines are ignored
-# line formats:
-# 1.) first, second, third
-# 2.) $ first/second, third
-# 3.) ~ first/second/third
-#
-# Begin List:
-#
-$ accept, accepts
-$ account, accounts
-$ achieve, achieves
-$ act, acts
-$ add, adds
-$ admit, admits
-$ affect, affects
-$ afford, affords
-$ agree, agrees
-$ aim, aims
-$ allow, allows
-$ amuse, amuses
-$ answer, answers
-$ appear, appears
-$ apply, applies
-$ argue, argues
-$ arrange, arranges
-$ arrive, arrives
-$ ask, asks
-$ attack, attacks
-$ avoid, avoids
-$ base, bases
-$ become, becomes
-$ begin, begins
-$ believe, believes
-$ belong, belongs
-$ break, breaks
-$ build, builds
-$ burn, burns
-$ buy, buys
-$ call, calls
-$ care, cares
-$ carry, carries
-$ catch, catches
-$ cause, causes
-$ change, changes
-$ charge, charges
-$ check, checks
-$ choose, chooses
-$ claim, claims
-$ clean, cleans
-$ clear, clears
-$ climb, climbs
-$ close, closes
-$ collect, collects
-$ come, comes
-$ commit, commits
-$ compare, compares
-$ complain, complains
-$ complete, completes
-$ concern, concerns
-$ confirm, confirms
-$ connect, connects
-$ consider, considers
-$ consist, consists
-$ contact, contacts
-$ contain, contains
-$ continue, continues
-$ contribute, contributes
-$ control, controls
-$ cook, cooks
-$ copy, copies
-$ correct, corrects
-$ count, counts
-$ cover, covers
-$ create, creates
-$ cross, crosses
-$ cry, cries
-$ damage, damages
-$ dance, dances
-$ deal, deals
-$ decide, decides
-$ deliver, delivers
-$ demand, demands
-$ deny, denies
-$ depend, depends
-$ describe, describes
-$ design, designs
-$ destroy, destroys
-$ develop, develops
-$ die, dies
-$ disappear, disappears
-$ discover, discovers
-$ discuss, discusses
-$ divide, divides
-$ do, does
-$ draw, draws
-$ dress, dresses
-$ drink, drinks
-$ drive, drives
-$ drop, drops
-$ eat, eats
-$ enable, enables
-$ encourage, encourages
-$ end, ends
-$ enjoy, enjoys
-$ examine, examines
-$ exist, exists
-$ expect, expects
-$ experience, experiences
-$ explain, explains
-$ express, expresses
-$ extend, extends
-$ face, faces
-$ fail, fails
-$ fall, falls
-$ fasten, fastens
-$ feed, feeds
-$ feel, feels
-$ fight, fights
-$ fill, fills
-$ find, finds
-$ finish, finishes
-$ fit, fits
-$ fly, flies
-$ fold, folds
-$ follow, follows
-$ force, forces
-$ forget, forgets
-$ forgive, forgives
-$ form, forms
-$ found, founds
-$ gain, gains
-$ get, gets
-$ give, gives
-$ grow, grows
-$ handle, handles
-$ happen, happens
-$ hate, hates
-$ have, has
-$ head, heads
-$ hear, hears
-$ help, helps
-$ hide, hides
-$ hold, holds
-$ hope, hopes
-$ identify, identifies
-$ imagine, imagines
-$ improve, improves
-$ include, includes
-$ increase, increases
-$ indicate, indicates
-$ influence, influences
-$ inform, informs
-$ intend, intends
-$ introduce, introduces
-$ invite, invites
-$ involve, involves
-$ join, joins
-$ jump, jumps
-$ keep, keeps
-$ kick, kicks
-$ kill, kills
-$ knock, knocks
-$ know, knows
-$ last, lasts
-$ laugh, laughs
-$ lay, lays
-$ learn, learns
-$ leave, leaves
-$ lend, lends
-$ lie, lies
-$ like, likes
-$ limit, limits
-$ link, links
-$ listen, listens
-$ live, lives
-$ look, looks
-$ lose, loses
-$ love, loves
-$ make, makes
-$ manage, manages
-$ mark, marks
-$ matter, matters
-$ mean, means
-$ measure, measures
-$ meet, meets
-$ mention, mentions
-$ mind, minds
-$ miss, misses
-$ move, moves
-$ need, needs
-$ notice, notices
-$ obtain, obtains
-$ occur, occurs
-$ offer, offers
-$ open, opens
-$ order, orders
-$ own, owns
-$ pass, passes
-$ pay, pays
-$ perform, performs
-$ pick, picks
-$ place, places
-$ plan, plans
-$ play, plays
-$ point, points
-$ prefer, prefers
-$ prepare, prepares
-$ present, presents
-$ press, presses
-$ prevent, prevents
-$ produce, produces
-$ promise, promises
-$ protect, protects
-$ prove, proves
-$ provide, provides
-$ publish, publishes
-$ pull, pulls
-$ push, pushes
-$ raise, raises
-$ reach, reaches
-$ realize, realizes
-$ receive, receives
-$ recognize, recognizes
-$ record, records
-$ reduce, reduces
-$ refer, refers
-$ reflect, reflects
-$ refuse, refuses
-$ regard, regards
-$ relate, relates
-$ release, releases
-$ remain, remains
-$ remember, remembers
-$ remove, removes
-$ repeat, repeats
-$ replace, replaces
-$ reply, replies
-$ report, reports
-$ represent, represents
-$ require, requires
-$ rest, rests
-$ result, results
-$ return, returns
-$ reveal, reveals
-$ ring, rings
-$ rise, rises
-$ roll, rolls
-$ run, runs
-$ save, saves
-$ say, says
-$ scream, screams
-$ see, sees
-$ seem, seems
-$ sell, sells
-$ send, sends
-$ separate, separates
-$ serve, serves
-$ settle, settles
-$ shake, shakes
-$ share, shares
-$ shoot, shoots
-$ shout, shouts
-$ show, shows
-$ sing, sings
-$ sit, sits
-$ sleep, sleeps
-$ smile, smiles
-$ sort, sorts
-$ sound, sounds
-$ speak, speaks
-$ stand, stands
-$ start, starts
-$ state, states
-$ stay, stays
-$ stick, sticks
-$ stop, stops
-$ study, studies
-$ succeed, succeeds
-$ suffer, suffers
-$ suggest, suggests
-$ suit, suits
-$ supply, supplies
-$ support, supports
-$ suppose, supposes
-$ survive, survives
-$ take, takes
-$ talk, talks
-$ teach, teaches
-$ tell, tells
-$ tend, tends
-$ test, tests
-$ thank, thanks
-$ think, thinks
-$ throw, throws
-$ touch, touches
-$ train, trains
-$ travel, travels
-$ treat, treats
-$ try, tries
-$ turn, turns
-$ understand, understands
-$ use, uses
-$ visit, visits
-$ vote, votes
-$ wait, waits
-$ walk, walks
-$ want, wants
-$ warn, warns
-$ wash, washes
-$ watch, watches
-$ wear, wears
-$ will, wills
-$ win, wins
-$ wish, wishes
-$ wonder, wonders
-$ work, works
-$ worry, worries
-$ write, writes
-am, are, is
-was, were, was
-~ ably
-~ abnormally
-~ about
-~ abroad
-~ abruptly
-~ absently
-~ absentmindedly
-~ absolutely
-~ absurdly
-~ abundantly
-~ abysmally
-~ accepted
-~ accidentally
-~ accordingly
-~ accounted
-~ accurately
-~ achieved
-~ acted
-~ actively
-~ actually
-~ acutely
-~ adamantly
-~ added
-~ additionally
-~ adequately
-~ admirably
-~ admitted
-~ adroitly
-~ adventurously
-~ advisedly
-~ affected
-~ affectingly
-~ affectionately
-~ afforded
-~ afterwards
-~ aggressively
-~ agonizingly
-~ agreed
-~ ahead
-~ aimed
-~ aimlessly
-~ alarmingly
-~ alertly
-~ allowed
-~ alluringly
-~ almost
-~ aloud
-~ already
-~ also
-~ alternatively
-~ altogether
-~ altruistically
-~ always
-~ amazingly
-~ ambitiously
-~ amicably
-~ amply
-~ amused
-~ amusingly
-~ analytically
-~ anew
-~ angelically
-~ angrily
-~ annually
-~ anonymously
-~ answered
-~ antagonistically
-~ anxiously
-~ anymore
-~ apart
-~ appallingly
-~ apparently
-~ appealingly
-~ appeared
-~ applied
-~ apprehensively
-~ appropriately
-~ approvingly
-~ approximately
-~ arbitrarily
-~ ardently
-~ argued
-~ aridly
-~ around
-~ arranged
-~ arrived
-~ arrogantly
-~ articulately
-~ artificially
-~ asked
-~ askew
-~ aslant
-~ assiduously
-~ assuredly
-~ astonishingly
-~ astutely
-~ ate
-~ athletically
-~ atrociously
-~ attacked
-~ attractively
-~ audaciously
-~ audibly
-~ auspiciously
-~ austerely
-~ authentically
-~ authoritatively
-~ autocratically
-~ avidly
-~ avoided
-~ away
-~ awfully
-~ awkwardly
-~ awry
-~ backward
-~ backwards
-~ badly
-~ barely
-~ based
-~ bashfully
-~ basically
-~ be
-~ beat
-~ became
-~ before
-~ beforehand
-~ began
-~ beguilingly
-~ behind
-~ believed
-~ belonged
-~ beneficially
-~ benevolently
-~ beside
-~ between
-~ bitterly
-~ blandly
-~ blatantly
-~ bleakly
-~ blindly
-~ blithely
-~ bluntly
-~ boastfully
-~ boldly
-~ boorishly
-~ bought
-~ bountifully
-~ brashly
-~ bravely
-~ brazenly
-~ briefly
-~ brightly
-~ brilliantly
-~ briskly
-~ broadly
-~ broke
-~ brusquely
-~ brutally
-~ built
-~ buoyantly
-~ burned
-~ busily
-~ buxomly
-~ called
-~ callously
-~ calmly
-~ came
-~ can
-~ candidly
-~ capably
-~ capriciously
-~ cared
-~ carefully
-~ carelessly
-~ carnally
-~ carried
-~ casually
-~ cataclysmically
-~ categorically
-~ caught
-~ caused
-~ caustically
-~ cautiously
-~ centrally
-~ ceremonially
-~ certainly
-~ changeably
-~ changed
-~ charged
-~ charmingly
-~ cheaply
-~ checked
-~ cheerfully
-~ chiefly
-~ childishly
-~ chose
-~ churlishly
-~ civilly
-~ claimed
-~ cleaned
-~ cleared
-~ clearly
-~ cleverly
-~ climatically
-~ climbed
-~ cliquishly
-~ closed
-~ closely
-~ clumsily
-~ coarsely
-~ cogently
-~ coherently
-~ collected
-~ collectively
-~ comically
-~ commendably
-~ committed
-~ compared
-~ compassionately
-~ competently
-~ complained
-~ completed
-~ completely
-~ conceitedly
-~ conceptually
-~ concerned
-~ concisely
-~ conclusively
-~ confidentially
-~ confidently
-~ confirmed
-~ congenially
-~ connected
-~ conscientiously
-~ consciously
-~ consensually
-~ consentingly
-~ consequently
-~ considerably
-~ considerately
-~ considered
-~ consisted
-~ conspicuously
-~ constantly
-~ contacted
-~ contained
-~ contemporaneously
-~ contentiously
-~ continually
-~ continued
-~ contributed
-~ controlled
-~ conveniently
-~ conventionally
-~ cooked
-~ coolly
-~ copied
-~ copiously
-~ cordially
-~ corrected
-~ correctly
-~ correspondingly
-~ corruptly
-~ cost
-~ costly
-~ could
-~ counted
-~ courageously
-~ courteously
-~ covered
-~ covertly
-~ cowardly
-~ cravenly
-~ created
-~ credulously
-~ cried
-~ crisply
-~ critically
-~ crookedly
-~ crossed
-~ crossly
-~ crucially
-~ crudely
-~ cruelly
-~ cryptically
-~ culturally
-~ cunningly
-~ curtly
-~ curvaceously
-~ customarily
-~ cut
-~ daily
-~ daintily
-~ damaged
-~ danced
-~ dangerously
-~ dauntlessly
-~ dazzlingly
-~ deadly
-~ dealt
-~ dearly
-~ debatably
-~ deceitfully
-~ decently
-~ deceptively
-~ decided
-~ decidedly
-~ decreasingly
-~ deeply
-~ deferentially
-~ defiantly
-~ definitely
-~ deftly
-~ deleteriously
-~ deliberately
-~ delicately
-~ delightfully
-~ delivered
-~ demanded
-~ denied
-~ densely
-~ depended
-~ dependently
-~ derisively
-~ described
-~ designed
-~ desolately
-~ despondently
-~ destroyed
-~ destructively
-~ developed
-~ developmentally
-~ deviously
-~ devotedly
-~ diabolically
-~ dictatorially
-~ did
-~ died
-~ diligently
-~ dimly
-~ diplomatically
-~ directly
-~ disappeared
-~ disastrously
-~ discourteously
-~ discovered
-~ discreetly
-~ discriminately
-~ discussed
-~ disdainfully
-~ disgracefully
-~ dismally
-~ disorderly
-~ disparagingly
-~ disproportionally
-~ dissolutely
-~ distinctly
-~ distressingly
-~ divided
-~ divinely
-~ dogmatically
-~ doubtfully
-~ drably
-~ dramatically
-~ drank
-~ drastically
-~ dreadfully
-~ dressed
-~ drew
-~ drolly
-~ dropped
-~ drove
-~ drunkenly
-~ dryly
-~ dubiously
-~ dully
-~ dynamically
-~ eagerly
-~ earlier
-~ early
-~ easily
-~ ecstatically
-~ eerily
-~ effectively
-~ effeminately
-~ egotistically
-~ elaborately
-~ electrifyingly
-~ elegantly
-~ eloquently
-~ elsewhere
-~ eminently
-~ emotionally
-~ emphatically
-~ enabled
-~ encouraged
-~ ended
-~ endlessly
-~ energetically
-~ enjoyably
-~ enjoyed
-~ enormously
-~ enterprisingly
-~ enthusiastically
-~ enticingly
-~ entirely
-~ enviably
-~ enviously
-~ equally
-~ erotically
-~ erratically
-~ erroneously
-~ esoterically
-~ especially
-~ essentially
-~ eternally
-~ euphorically
-~ evasively
-~ even
-~ evenly
-~ eventually
-~ evermore
-~ evidently
-~ exactly
-~ examined
-~ exceedingly
-~ excellently
-~ exceptionally
-~ excessively
-~ excitedly
-~ excruciatingly
-~ exhilaratingly
-~ existed
-~ exorbitantly
-~ expectantly
-~ expected
-~ expediently
-~ experienced
-~ expertly
-~ explained
-~ explicitly
-~ expressed
-~ expressly
-~ exquisitely
-~ extended
-~ extensively
-~ extraordinarily
-~ extravagantly
-~ extremely
-~ extrovertly
-~ exuberantly
-~ faced
-~ factually
-~ failed
-~ faintly
-~ fairly
-~ faithfully
-~ falsely
-~ famously
-~ fanatically
-~ fancifully
-~ fantastically
-~ far
-~ fashionably
-~ fast
-~ fastened
-~ fastidiously
-~ fatally
-~ fatefully
-~ faultlessly
-~ favorably
-~ fearfully
-~ fed
-~ feebly
-~ fell
-~ felt
-~ ferociously
-~ fervently
-~ fiendishly
-~ fiercely
-~ filled
-~ financially
-~ finely
-~ finished
-~ firmly
-~ fitfully
-~ fitted
-~ flagrantly
-~ flamboyantly
-~ flatly
-~ fleetingly
-~ flew
-~ flexibly
-~ flippantly
-~ flowerily
-~ fluently
-~ folded
-~ followed
-~ fondly
-~ foolishly
-~ forced
-~ forcefully
-~ forever
-~ forgave
-~ forgetfully
-~ forgot
-~ forlornly
-~ formally
-~ formed
-~ forth
-~ fortuitously
-~ fortunately
-~ forward
-~ fought
-~ foully
-~ found
-~ founded
-~ frailly
-~ frankly
-~ frantically
-~ fraternally
-~ fraudulently
-~ freely
-~ frenetically
-~ frequently
-~ freshly
-~ frightfully
-~ frigidly
-~ frivolously
-~ frugally
-~ fully
-~ fundamentally
-~ furiously
-~ further
-~ furthermore
-~ furtively
-~ gaily
-~ gained
-~ gallantly
-~ gaudily
-~ gave
-~ generously
-~ gentlemanly
-~ gently
-~ ghastly
-~ gigantically
-~ gladly
-~ glamorously
-~ glaringly
-~ gleefully
-~ glibly
-~ gloriously
-~ glumly
-~ go
-~ goodly
-~ got
-~ gracefully
-~ graciously
-~ grandly
-~ graphically
-~ gratuitously
-~ gravely
-~ greedily
-~ grievously
-~ grimly
-~ grossly
-~ grotesquely
-~ grown
-~ grudgingly
-~ gruelingly
-~ gruffly
-~ guardedly
-~ habitually
-~ had
-~ haggardly
-~ handily
-~ handled
-~ handsomely
-~ haphazardly
-~ happened
-~ happily
-~ hardly
-~ harmfully
-~ harmoniously
-~ harshly
-~ hastily
-~ hated
-~ headed
-~ heard
-~ heartlessly
-~ heavenly
-~ heavily
-~ hectically
-~ hedonistically
-~ heedlessly
-~ heinously
-~ held
-~ hellishly
-~ helped
-~ helpfully
-~ heroically
-~ hesitantly
-~ hid
-~ hideously
-~ highly
-~ hilariously
-~ hit
-~ hollowly
-~ honestly
-~ hoped
-~ hopefully
-~ horrendously
-~ horribly
-~ hotly
-~ hourly
-~ hugely
-~ humanely
-~ humorously
-~ hungrily
-~ hurt
-~ hygienically
-~ hypnotically
-~ hysterically
-~ ideally
-~ identified
-~ idiomatically
-~ idiotically
-~ ignominiously
-~ ignorantly
-~ illustriously
-~ imagined
-~ immaculately
-~ immensely
-~ immoderately
-~ immodestly
-~ immorally
-~ immovably
-~ impartially
-~ impatiently
-~ impeccably
-~ imperfectly
-~ imperiously
-~ impersonally
-~ impertinently
-~ impetuously
-~ impolitely
-~ importantly
-~ improved
-~ impudently
-~ impulsively
-~ inaccurately
-~ inadequately
-~ inadvertently
-~ inanely
-~ incessantly
-~ incidentally
-~ included
-~ incoherently
-~ inconsistently
-~ incorrectly
-~ increased
-~ increasingly
-~ incredibly
-~ indecently
-~ indefinitely
-~ independently
-~ indicated
-~ indiscriminately
-~ indisputably
-~ indistinctly
-~ indubitably
-~ indulgently
-~ industriously
-~ ineffectually
-~ ineptly
-~ inevitably
-~ infamously
-~ infectiously
-~ infinitely
-~ influenced
-~ influentially
-~ informally
-~ informed
-~ infrequently
-~ ingeniously
-~ inherently
-~ initially
-~ injudiciously
-~ innately
-~ innocently
-~ inordinately
-~ inquisitively
-~ insanely
-~ insatiably
-~ inscrutably
-~ insincerely
-~ insistently
-~ insolently
-~ insufferably
-~ insultingly
-~ intelligently
-~ intelligibly
-~ intended
-~ intensely
-~ intentionally
-~ interminably
-~ intermittently
-~ intrepidly
-~ intricately
-~ intrinsically
-~ introduced
-~ invariably
-~ invigoratingly
-~ invited
-~ involved
-~ irascibly
-~ ironically
-~ irrationally
-~ irrefutably
-~ irregularly
-~ irresponsibly
-~ irritably
-~ jauntily
-~ jealously
-~ jocularly
-~ joined
-~ jointly
-~ jokingly
-~ joyfully
-~ joyously
-~ jubilantly
-~ judiciously
-~ jumped
-~ justifiably
-~ justly
-~ keenly
-~ kept
-~ kicked
-~ killed
-~ kindly
-~ kingly
-~ knew
-~ knocked
-~ knowingly
-~ laboriously
-~ lackadaisically
-~ laconically
-~ laid
-~ lamely
-~ lasciviously
-~ lasted
-~ lately
-~ latently
-~ later
-~ laudably
-~ laughed
-~ lavishly
-~ lawlessly
-~ lazily
-~ lead
-~ learned
-~ left
-~ left
-~ legitimately
-~ leisurely
-~ leniently
-~ lent
-~ less
-~ let
-~ lethargically
-~ lewdly
-~ liberally
-~ licentiously
-~ lied
-~ lightly
-~ liked
-~ limited
-~ limply
-~ linked
-~ listened
-~ listlessly
-~ lived
-~ lively
-~ locally
-~ logically
-~ longingly
-~ looked
-~ loosely
-~ loquaciously
-~ lost
-~ loudly
-~ loved
-~ lovingly
-~ lowly
-~ lucidly
-~ luckily
-~ ludicrously
-~ lustfully
-~ lustily
-~ luxuriantly
-~ made
-~ madly
-~ magnanimously
-~ magnetically
-~ mainly
-~ malevolently
-~ maliciously
-~ malignantly
-~ managed
-~ manifestly
-~ mannerly
-~ marked
-~ marvelously
-~ massively
-~ masterly
-~ materially
-~ mattered
-~ may
-~ meant
-~ measured
-~ meekly
-~ melodramatically
-~ memorably
-~ menacingly
-~ mentioned
-~ mercifully
-~ meritoriously
-~ merrily
-~ met
-~ methodically
-~ meticulously
-~ might
-~ mildly
-~ minded
-~ mindfully
-~ minutely
-~ miserably
-~ missed
-~ misspelled
-~ mistakenly
-~ mockingly
-~ modestly
-~ momentarily
-~ monetarily
-~ monotonously
-~ monstrously
-~ monthly
-~ monumentally
-~ moodily
-~ morbidly
-~ more
-~ morosely
-~ mortally
-~ mostly
-~ mournfully
-~ moved
-~ mundanely
-~ murderously
-~ must
-~ mutinously
-~ mysteriously
-~ naively
-~ nakedly
-~ naturally
-~ nearby
-~ nearly
-~ neatly
-~ needed
-~ negatively
-~ neglectfully
-~ negligibly
-~ neighborly
-~ nervously
-~ neurotically
-~ never
-~ newly
-~ nicely
-~ nimbly
-~ noisily
-~ nonchalantly
-~ normally
-~ not
-~ notably
-~ noticed
-~ now
-~ numerically
-~ obediently
-~ objectively
-~ obligingly
-~ obliquely
-~ obnoxiously
-~ obscenely
-~ obscurely
-~ obsequiously
-~ obsessively
-~ obtained
-~ obtrusively
-~ obviously
-~ occurred
-~ oddly
-~ offered
-~ officially
-~ often
-~ ominously
-~ on
-~ once
-~ onerously
-~ only
-~ onward
-~ opaquely
-~ open
-~ openly
-~ oppressively
-~ optimistically
-~ opulently
-~ ordered
-~ orderly
-~ ordinarily
-~ originally
-~ ornamentally
-~ ornately
-~ ostensibly
-~ ostentatiously
-~ ought
-~ out
-~ outlandishly
-~ outward
-~ outwardly
-~ overconfidently
-~ overly
-~ owned
-~ paid
-~ painfully
-~ painstakingly
-~ palatably
-~ paradoxically
-~ pardonably
-~ parsimoniously
-~ partially
-~ particularly
-~ passed
-~ passionately
-~ passively
-~ patently
-~ pathetically
-~ peacefully
-~ peculiarly
-~ pensively
-~ perennially
-~ perfectly
-~ performed
-~ perilously
-~ permissively
-~ perpetually
-~ persuasively
-~ pertly
-~ pessimistically
-~ petulantly
-~ phenomenally
-~ picked
-~ pictorially
-~ pivotally
-~ placed
-~ placidly
-~ plainly
-~ planned
-~ plausibly
-~ played
-~ playfully
-~ pleasantly
-~ pleasingly
-~ plentifully
-~ poignantly
-~ pointed
-~ pointedly
-~ pointlessly
-~ politely
-~ politically
-~ pompously
-~ ponderously
-~ poorly
-~ popularly
-~ pornographically
-~ positively
-~ possibly
-~ potentially
-~ potently
-~ powerfully
-~ practically
-~ precariously
-~ preciously
-~ precisely
-~ preferred
-~ preliminarily
-~ prematurely
-~ prepared
-~ preposterously
-~ presented
-~ presently
-~ pressed
-~ presumably
-~ presumptuously
-~ prevented
-~ previously
-~ prickly
-~ primarily
-~ princely
-~ principally
-~ privately
-~ probably
-~ prodigiously
-~ produced
-~ productively
-~ profanely
-~ professionally
-~ proficiently
-~ profitably
-~ profoundly
-~ profusely
-~ prominently
-~ promised
-~ promptly
-~ properly
-~ propitiously
-~ proportionally
-~ protected
-~ proved
-~ provided
-~ providentially
-~ provisionally
-~ provocatively
-~ prudently
-~ psychedelically
-~ publicly
-~ published
-~ pulled
-~ punctually
-~ purely
-~ purposely
-~ pushed
-~ put
-~ putridly
-~ queenly
-~ queerly
-~ questionably
-~ quickly
-~ quietly
-~ quirkily
-~ quixotically
-~ racially
-~ radically
-~ raised
-~ ran
-~ rancorously
-~ randomly
-~ rapaciously
-~ rapidly
-~ rarely
-~ rashly
-~ rationally
-~ ravenously
-~ ravenously
-~ reached
-~ read
-~ realized
-~ really
-~ rearward
-~ reasonably
-~ rebelliously
-~ received
-~ recently
-~ recklessly
-~ recognized
-~ recorded
-~ reduced
-~ referred
-~ reflected
-~ refused
-~ regarded
-~ regretfully
-~ regularly
-~ related
-~ released
-~ relentlessly
-~ reliantly
-~ reluctantly
-~ remained
-~ remembered
-~ remotely
-~ removed
-~ repeated
-~ repeatedly
-~ replaced
-~ replied
-~ reported
-~ represented
-~ required
-~ resentfully
-~ resiliently
-~ resolutely
-~ resoundingly
-~ respectively
-~ responsively
-~ rested
-~ restfully
-~ restlessly
-~ resulted
-~ returned
-~ revealed
-~ reverentially
-~ reverently
-~ richly
-~ ridiculously
-~ right
-~ righteously
-~ rightfully
-~ rigidly
-~ rigorously
-~ ringed
-~ riotously
-~ ritualistically
-~ robustly
-~ rolled
-~ romantically
-~ rose
-~ roughly
-~ routinely
-~ rowdily
-~ rudely
-~ ruthlessly
-~ sacredly
-~ sadistically
-~ sadly
-~ safely
-~ said
-~ sang
-~ sarcastically
-~ sassily
-~ sat
-~ satanically
-~ saucily
-~ savagely
-~ saved
-~ saw
-~ scandalously
-~ scarcely
-~ scathingly
-~ scholarly
-~ scornfully
-~ screams
-~ secularly
-~ securely
-~ sedately
-~ seductively
-~ seemed
-~ seemingly
-~ seemly
-~ seldom
-~ selectively
-~ selfishly
-~ sensationally
-~ senselessly
-~ sensually
-~ sent
-~ sentimentally
-~ separated
-~ separately
-~ serenely
-~ seriously
-~ served
-~ set
-~ settled
-~ severely
-~ sexually
-~ shabbily
-~ shakily
-~ shall
-~ shamefully
-~ shamelessly
-~ shared
-~ sharply
-~ sheepishly
-~ shockingly
-~ shook
-~ shortly
-~ shot
-~ should
-~ shouted
-~ showed
-~ shrewdly
-~ shrilly
-~ shut
-~ shyly
-~ sickly
-~ silently
-~ simply
-~ singly
-~ singularly
-~ sinisterly
-~ sizably
-~ skeptically
-~ skillfully
-~ sleepily
-~ slept
-~ slightly
-~ sloppily
-~ slovenly
-~ slowly
-~ slyly
-~ smartly
-~ smiled
-~ smoothly
-~ smugly
-~ snidely
-~ snobbishly
-~ soberly
-~ socially
-~ softly
-~ sold
-~ solemnly
-~ solidly
-~ somberly
-~ sometimes
-~ somewhat
-~ soon
-~ sooner
-~ soothingly
-~ sorrowfully
-~ sorted
-~ sounded
-~ sourly
-~ spaciously
-~ sparingly
-~ spasmodically
-~ specially
-~ specifically
-~ spectacularly
-~ speculatively
-~ speedily
-~ spinelessly
-~ spiritually
-~ spitefully
-~ splendidly
-~ spoke
-~ spontaneously
-~ sporadically
-~ spotlessly
-~ sprightly
-~ spryly
-~ squalidly
-~ started
-~ stated
-~ stately
-~ statically
-~ staunchly
-~ staunchly
-~ stayed
-~ steadfastly
-~ steadily
-~ stealthily
-~ steeply
-~ sternly
-~ stiffly
-~ stimulatingly
-~ stirringly
-~ stood
-~ stoped
-~ straight
-~ strangely
-~ strenuously
-~ strictly
-~ strikingly
-~ strongly
-~ stubbornly
-~ stuck
-~ studied
-~ studiously
-~ stunningly
-~ stupidly
-~ sturdily
-~ stylishly
-~ suavely
-~ sublimely
-~ substantially
-~ subtly
-~ succeeded
-~ successfully
-~ succinctly
-~ suddenly
-~ suffered
-~ suggested
-~ suggestively
-~ suitably
-~ suited
-~ sullenly
-~ summarily
-~ superbly
-~ superficially
-~ superlatively
-~ supernaturally
-~ supplied
-~ supported
-~ supposed
-~ supposedly
-~ supremely
-~ surly
-~ surprisingly
-~ surreptitiously
-~ survived
-~ suspiciously
-~ sweetly
-~ swiftly
-~ symmetrically
-~ sympathetically
-~ systematically
-~ tactfully
-~ talked
-~ tamely
-~ tangibly
-~ tastefully
-~ taught
-~ tearfully
-~ tediously
-~ temperamentally
-~ tempestuously
-~ temporally
-~ tenaciously
-~ tended
-~ tenderly
-~ tensely
-~ tentatively
-~ terribly
-~ terrifically
-~ tersely
-~ tested
-~ testily
-~ thanked
-~ theatrically
-~ then
-~ thickly
-~ thinly
-~ thirstily
-~ thoroughly
-~ thought
-~ thoughtfully
-~ thoughtlessly
-~ threw
-~ thrillingly
-~ thunderously
-~ tightly
-~ timelessly
-~ timely
-~ timidly
-~ timorously
-~ tiredly
-~ tirelessly
-~ told
-~ tolerably
-~ tolerantly
-~ tomorrow
-~ too
-~ took
-~ torpidly
-~ tortuously
-~ totally
-~ touched
-~ traditionally
-~ tragically
-~ trained
-~ tranquilly
-~ traumatically
-~ traveled
-~ treacherously
-~ treated
-~ tremendously
-~ tried
-~ trivially
-~ truly
-~ truthfully
-~ tumultuously
-~ turned
-~ typically
-~ tyrannically
-~ ultimately
-~ unambiguously
-~ unassailably
-~ unbearably
-~ uncaringly
-~ unceasingly
-~ uncertainly
-~ uncivilly
-~ unclearly
-~ uncommonly
-~ unconditionally
-~ unconsciously
-~ uncontrollably
-~ undeniably
-~ understandably
-~ understood
-~ undoubtedly
-~ unduly
-~ uneasily
-~ unemotionally
-~ unendingly
-~ unequally
-~ unequivocally
-~ unerringly
-~ unevenly
-~ uneventfully
-~ unexpectedly
-~ unfairly
-~ unfashionably
-~ unfathomably
-~ unflinchingly
-~ unforgivably
-~ unfortunately
-~ unfriendly
-~ ungainly
-~ ungentlemanly
-~ ungraciously
-~ unhesitatingly
-~ uniformly
-~ unintelligently
-~ unintentionally
-~ uniquely
-~ unlikely
-~ unmannerly
-~ unnaturally
-~ unpleasantly
-~ unquestionably
-~ unrealistically
-~ unreasonably
-~ unreliably
-~ unremittingly
-~ unreservedly
-~ unrestrainedly
-~ unruly
-~ unscrupulously
-~ unseemly
-~ unselfishly
-~ unshakably
-~ unsophisticatedly
-~ unspeakably
-~ unstintingly
-~ unsuccessfully
-~ unusually
-~ unwaveringly
-~ unwisely
-~ unwittingly
-~ upright
-~ urbanely
-~ urgently
-~ used
-~ uselessly
-~ usually
-~ utterly
-~ vacantly
-~ vacuously
-~ vaguely
-~ vainly
-~ valiantly
-~ variably
-~ variously
-~ vastly
-~ vehemently
-~ venomously
-~ verbosely
-~ verifiably
-~ very
-~ vicariously
-~ viciously
-~ victoriously
-~ vigorously
-~ vilely
-~ violently
-~ virtually
-~ virtuously
-~ visibly
-~ visited
-~ vitally
-~ vivaciously
-~ vividly
-~ vociferously
-~ voluminously
-~ voluntarily
-~ voluptuously
-~ voraciously
-~ voted
-~ vulgarly
-~ vulnerably
-~ waited
-~ walked
-~ wanted
-~ wantonly
-~ warily
-~ warmly
-~ warned
-~ washed
-~ watched
-~ watchfully
-~ weakly
-~ wearily
-~ weekly
-~ well
-~ went
-~ whimsically
-~ wholesomely
-~ wholly
-~ wickedly
-~ widely
-~ wildly
-~ willed
-~ willingly
-~ wily
-~ wined
-~ wisely
-~ wished
-~ wobbly
-~ woefully
-~ wondered
-~ woodenly
-~ wore
-~ worked
-~ worldly
-~ worried
-~ worshipfully
-~ worthily
-~ would
-~ wretchedly
-~ wrongly
-~ wrote
-~ yearly
-~ yesterday
+# verbList.dat
+#
+# �2011/2012 Geek Cave Creations - Written for use with the Program O AIML Interpreter script
+# Written by Dave Morton
+#
+# contains a list of 1,800+ verbs, for use in determining whether "I" or "me" should be used when transforming a phrase from second person into first person.
+# It's also used for verb modification when changing from first person to second or third.
+# lines prefixed with # are ignored
+# lines prefixed with "~ " indicate a verb that needs no modification.
+# lines prefixed with "$ " indicate that first person and second person verbs are the same.
+# lines with no prefix are lists of three comma separated words, one for for each "person".
+#
+# other rules:
+# 1.) when first person verbs are the same as second person, then gender-neutral "they" is the same, as well.
+# 2.) most past-tense verbs cover all "person" modes, and don't need to be modified.
+#
+# empty lines are ignored
+# line formats:
+# 1.) first, second, third
+# 2.) $ first/second, third
+# 3.) ~ first/second/third
+#
+# Begin List:
+#
+$ accept, accepts
+$ account, accounts
+$ achieve, achieves
+$ act, acts
+$ add, adds
+$ admit, admits
+$ affect, affects
+$ afford, affords
+$ agree, agrees
+$ aim, aims
+$ allow, allows
+$ amuse, amuses
+$ answer, answers
+$ appear, appears
+$ apply, applies
+$ argue, argues
+$ arrange, arranges
+$ arrive, arrives
+$ ask, asks
+$ attack, attacks
+$ avoid, avoids
+$ base, bases
+$ become, becomes
+$ begin, begins
+$ believe, believes
+$ belong, belongs
+$ break, breaks
+$ build, builds
+$ burn, burns
+$ buy, buys
+$ call, calls
+$ care, cares
+$ carry, carries
+$ catch, catches
+$ cause, causes
+$ change, changes
+$ charge, charges
+$ check, checks
+$ choose, chooses
+$ claim, claims
+$ clean, cleans
+$ clear, clears
+$ climb, climbs
+$ close, closes
+$ collect, collects
+$ come, comes
+$ commit, commits
+$ compare, compares
+$ complain, complains
+$ complete, completes
+$ concern, concerns
+$ confirm, confirms
+$ connect, connects
+$ consider, considers
+$ consist, consists
+$ contact, contacts
+$ contain, contains
+$ continue, continues
+$ contribute, contributes
+$ control, controls
+$ cook, cooks
+$ copy, copies
+$ correct, corrects
+$ count, counts
+$ cover, covers
+$ create, creates
+$ cross, crosses
+$ cry, cries
+$ damage, damages
+$ dance, dances
+$ deal, deals
+$ decide, decides
+$ deliver, delivers
+$ demand, demands
+$ deny, denies
+$ depend, depends
+$ describe, describes
+$ design, designs
+$ destroy, destroys
+$ develop, develops
+$ die, dies
+$ disappear, disappears
+$ discover, discovers
+$ discuss, discusses
+$ divide, divides
+$ do, does
+$ draw, draws
+$ dress, dresses
+$ drink, drinks
+$ drive, drives
+$ drop, drops
+$ eat, eats
+$ enable, enables
+$ encourage, encourages
+$ end, ends
+$ enjoy, enjoys
+$ examine, examines
+$ exist, exists
+$ expect, expects
+$ experience, experiences
+$ explain, explains
+$ express, expresses
+$ extend, extends
+$ face, faces
+$ fail, fails
+$ fall, falls
+$ fasten, fastens
+$ feed, feeds
+$ feel, feels
+$ fight, fights
+$ fill, fills
+$ find, finds
+$ finish, finishes
+$ fit, fits
+$ fly, flies
+$ fold, folds
+$ follow, follows
+$ force, forces
+$ forget, forgets
+$ forgive, forgives
+$ form, forms
+$ found, founds
+$ gain, gains
+$ get, gets
+$ give, gives
+$ grow, grows
+$ handle, handles
+$ happen, happens
+$ hate, hates
+$ have, has
+$ head, heads
+$ hear, hears
+$ help, helps
+$ hide, hides
+$ hold, holds
+$ hope, hopes
+$ identify, identifies
+$ imagine, imagines
+$ improve, improves
+$ include, includes
+$ increase, increases
+$ indicate, indicates
+$ influence, influences
+$ inform, informs
+$ intend, intends
+$ introduce, introduces
+$ invite, invites
+$ involve, involves
+$ join, joins
+$ jump, jumps
+$ keep, keeps
+$ kick, kicks
+$ kill, kills
+$ knock, knocks
+$ know, knows
+$ last, lasts
+$ laugh, laughs
+$ lay, lays
+$ learn, learns
+$ leave, leaves
+$ lend, lends
+$ lie, lies
+$ like, likes
+$ limit, limits
+$ link, links
+$ listen, listens
+$ live, lives
+$ look, looks
+$ lose, loses
+$ love, loves
+$ make, makes
+$ manage, manages
+$ mark, marks
+$ matter, matters
+$ mean, means
+$ measure, measures
+$ meet, meets
+$ mention, mentions
+$ mind, minds
+$ miss, misses
+$ move, moves
+$ need, needs
+$ notice, notices
+$ obtain, obtains
+$ occur, occurs
+$ offer, offers
+$ open, opens
+$ order, orders
+$ own, owns
+$ pass, passes
+$ pay, pays
+$ perform, performs
+$ pick, picks
+$ place, places
+$ plan, plans
+$ play, plays
+$ point, points
+$ prefer, prefers
+$ prepare, prepares
+$ present, presents
+$ press, presses
+$ prevent, prevents
+$ produce, produces
+$ promise, promises
+$ protect, protects
+$ prove, proves
+$ provide, provides
+$ publish, publishes
+$ pull, pulls
+$ push, pushes
+$ raise, raises
+$ reach, reaches
+$ realize, realizes
+$ receive, receives
+$ recognize, recognizes
+$ record, records
+$ reduce, reduces
+$ refer, refers
+$ reflect, reflects
+$ refuse, refuses
+$ regard, regards
+$ relate, relates
+$ release, releases
+$ remain, remains
+$ remember, remembers
+$ remove, removes
+$ repeat, repeats
+$ replace, replaces
+$ reply, replies
+$ report, reports
+$ represent, represents
+$ require, requires
+$ rest, rests
+$ result, results
+$ return, returns
+$ reveal, reveals
+$ ring, rings
+$ rise, rises
+$ roll, rolls
+$ run, runs
+$ save, saves
+$ say, says
+$ scream, screams
+$ see, sees
+$ seem, seems
+$ sell, sells
+$ send, sends
+$ separate, separates
+$ serve, serves
+$ settle, settles
+$ shake, shakes
+$ share, shares
+$ shoot, shoots
+$ shout, shouts
+$ show, shows
+$ sing, sings
+$ sit, sits
+$ sleep, sleeps
+$ smile, smiles
+$ sort, sorts
+$ sound, sounds
+$ speak, speaks
+$ stand, stands
+$ start, starts
+$ state, states
+$ stay, stays
+$ stick, sticks
+$ stop, stops
+$ study, studies
+$ succeed, succeeds
+$ suffer, suffers
+$ suggest, suggests
+$ suit, suits
+$ supply, supplies
+$ support, supports
+$ suppose, supposes
+$ survive, survives
+$ take, takes
+$ talk, talks
+$ teach, teaches
+$ tell, tells
+$ tend, tends
+$ test, tests
+$ thank, thanks
+$ think, thinks
+$ throw, throws
+$ touch, touches
+$ train, trains
+$ travel, travels
+$ treat, treats
+$ try, tries
+$ turn, turns
+$ understand, understands
+$ use, uses
+$ visit, visits
+$ vote, votes
+$ wait, waits
+$ walk, walks
+$ want, wants
+$ warn, warns
+$ wash, washes
+$ watch, watches
+$ wear, wears
+$ will, wills
+$ win, wins
+$ wish, wishes
+$ wonder, wonders
+$ work, works
+$ worry, worries
+$ write, writes
+am, are, is
+was, were, was
+~ ably
+~ abnormally
+~ about
+~ abroad
+~ abruptly
+~ absently
+~ absentmindedly
+~ absolutely
+~ absurdly
+~ abundantly
+~ abysmally
+~ accepted
+~ accidentally
+~ accordingly
+~ accounted
+~ accurately
+~ achieved
+~ acted
+~ actively
+~ actually
+~ acutely
+~ adamantly
+~ added
+~ additionally
+~ adequately
+~ admirably
+~ admitted
+~ adroitly
+~ adventurously
+~ advisedly
+~ affected
+~ affectingly
+~ affectionately
+~ afforded
+~ afterwards
+~ aggressively
+~ agonizingly
+~ agreed
+~ ahead
+~ aimed
+~ aimlessly
+~ alarmingly
+~ alertly
+~ allowed
+~ alluringly
+~ almost
+~ aloud
+~ already
+~ also
+~ alternatively
+~ altogether
+~ altruistically
+~ always
+~ amazingly
+~ ambitiously
+~ amicably
+~ amply
+~ amused
+~ amusingly
+~ analytically
+~ anew
+~ angelically
+~ angrily
+~ annually
+~ anonymously
+~ answered
+~ antagonistically
+~ anxiously
+~ anymore
+~ apart
+~ appallingly
+~ apparently
+~ appealingly
+~ appeared
+~ applied
+~ apprehensively
+~ appropriately
+~ approvingly
+~ approximately
+~ arbitrarily
+~ ardently
+~ argued
+~ aridly
+~ around
+~ arranged
+~ arrived
+~ arrogantly
+~ articulately
+~ artificially
+~ asked
+~ askew
+~ aslant
+~ assiduously
+~ assuredly
+~ astonishingly
+~ astutely
+~ ate
+~ athletically
+~ atrociously
+~ attacked
+~ attractively
+~ audaciously
+~ audibly
+~ auspiciously
+~ austerely
+~ authentically
+~ authoritatively
+~ autocratically
+~ avidly
+~ avoided
+~ away
+~ awfully
+~ awkwardly
+~ awry
+~ backward
+~ backwards
+~ badly
+~ barely
+~ based
+~ bashfully
+~ basically
+~ be
+~ beat
+~ became
+~ before
+~ beforehand
+~ began
+~ beguilingly
+~ behind
+~ believed
+~ belonged
+~ beneficially
+~ benevolently
+~ beside
+~ between
+~ bitterly
+~ blandly
+~ blatantly
+~ bleakly
+~ blindly
+~ blithely
+~ bluntly
+~ boastfully
+~ boldly
+~ boorishly
+~ bought
+~ bountifully
+~ brashly
+~ bravely
+~ brazenly
+~ briefly
+~ brightly
+~ brilliantly
+~ briskly
+~ broadly
+~ broke
+~ brusquely
+~ brutally
+~ built
+~ buoyantly
+~ burned
+~ busily
+~ buxomly
+~ called
+~ callously
+~ calmly
+~ came
+~ can
+~ candidly
+~ capably
+~ capriciously
+~ cared
+~ carefully
+~ carelessly
+~ carnally
+~ carried
+~ casually
+~ cataclysmically
+~ categorically
+~ caught
+~ caused
+~ caustically
+~ cautiously
+~ centrally
+~ ceremonially
+~ certainly
+~ changeably
+~ changed
+~ charged
+~ charmingly
+~ cheaply
+~ checked
+~ cheerfully
+~ chiefly
+~ childishly
+~ chose
+~ churlishly
+~ civilly
+~ claimed
+~ cleaned
+~ cleared
+~ clearly
+~ cleverly
+~ climatically
+~ climbed
+~ cliquishly
+~ closed
+~ closely
+~ clumsily
+~ coarsely
+~ cogently
+~ coherently
+~ collected
+~ collectively
+~ comically
+~ commendably
+~ committed
+~ compared
+~ compassionately
+~ competently
+~ complained
+~ completed
+~ completely
+~ conceitedly
+~ conceptually
+~ concerned
+~ concisely
+~ conclusively
+~ confidentially
+~ confidently
+~ confirmed
+~ congenially
+~ connected
+~ conscientiously
+~ consciously
+~ consensually
+~ consentingly
+~ consequently
+~ considerably
+~ considerately
+~ considered
+~ consisted
+~ conspicuously
+~ constantly
+~ contacted
+~ contained
+~ contemporaneously
+~ contentiously
+~ continually
+~ continued
+~ contributed
+~ controlled
+~ conveniently
+~ conventionally
+~ cooked
+~ coolly
+~ copied
+~ copiously
+~ cordially
+~ corrected
+~ correctly
+~ correspondingly
+~ corruptly
+~ cost
+~ costly
+~ could
+~ counted
+~ courageously
+~ courteously
+~ covered
+~ covertly
+~ cowardly
+~ cravenly
+~ created
+~ credulously
+~ cried
+~ crisply
+~ critically
+~ crookedly
+~ crossed
+~ crossly
+~ crucially
+~ crudely
+~ cruelly
+~ cryptically
+~ culturally
+~ cunningly
+~ curtly
+~ curvaceously
+~ customarily
+~ cut
+~ daily
+~ daintily
+~ damaged
+~ danced
+~ dangerously
+~ dauntlessly
+~ dazzlingly
+~ deadly
+~ dealt
+~ dearly
+~ debatably
+~ deceitfully
+~ decently
+~ deceptively
+~ decided
+~ decidedly
+~ decreasingly
+~ deeply
+~ deferentially
+~ defiantly
+~ definitely
+~ deftly
+~ deleteriously
+~ deliberately
+~ delicately
+~ delightfully
+~ delivered
+~ demanded
+~ denied
+~ densely
+~ depended
+~ dependently
+~ derisively
+~ described
+~ designed
+~ desolately
+~ despondently
+~ destroyed
+~ destructively
+~ developed
+~ developmentally
+~ deviously
+~ devotedly
+~ diabolically
+~ dictatorially
+~ did
+~ died
+~ diligently
+~ dimly
+~ diplomatically
+~ directly
+~ disappeared
+~ disastrously
+~ discourteously
+~ discovered
+~ discreetly
+~ discriminately
+~ discussed
+~ disdainfully
+~ disgracefully
+~ dismally
+~ disorderly
+~ disparagingly
+~ disproportionally
+~ dissolutely
+~ distinctly
+~ distressingly
+~ divided
+~ divinely
+~ dogmatically
+~ doubtfully
+~ drably
+~ dramatically
+~ drank
+~ drastically
+~ dreadfully
+~ dressed
+~ drew
+~ drolly
+~ dropped
+~ drove
+~ drunkenly
+~ dryly
+~ dubiously
+~ dully
+~ dynamically
+~ eagerly
+~ earlier
+~ early
+~ easily
+~ ecstatically
+~ eerily
+~ effectively
+~ effeminately
+~ egotistically
+~ elaborately
+~ electrifyingly
+~ elegantly
+~ eloquently
+~ elsewhere
+~ eminently
+~ emotionally
+~ emphatically
+~ enabled
+~ encouraged
+~ ended
+~ endlessly
+~ energetically
+~ enjoyably
+~ enjoyed
+~ enormously
+~ enterprisingly
+~ enthusiastically
+~ enticingly
+~ entirely
+~ enviably
+~ enviously
+~ equally
+~ erotically
+~ erratically
+~ erroneously
+~ esoterically
+~ especially
+~ essentially
+~ eternally
+~ euphorically
+~ evasively
+~ even
+~ evenly
+~ eventually
+~ evermore
+~ evidently
+~ exactly
+~ examined
+~ exceedingly
+~ excellently
+~ exceptionally
+~ excessively
+~ excitedly
+~ excruciatingly
+~ exhilaratingly
+~ existed
+~ exorbitantly
+~ expectantly
+~ expected
+~ expediently
+~ experienced
+~ expertly
+~ explained
+~ explicitly
+~ expressed
+~ expressly
+~ exquisitely
+~ extended
+~ extensively
+~ extraordinarily
+~ extravagantly
+~ extremely
+~ extrovertly
+~ exuberantly
+~ faced
+~ factually
+~ failed
+~ faintly
+~ fairly
+~ faithfully
+~ falsely
+~ famously
+~ fanatically
+~ fancifully
+~ fantastically
+~ far
+~ fashionably
+~ fast
+~ fastened
+~ fastidiously
+~ fatally
+~ fatefully
+~ faultlessly
+~ favorably
+~ fearfully
+~ fed
+~ feebly
+~ fell
+~ felt
+~ ferociously
+~ fervently
+~ fiendishly
+~ fiercely
+~ filled
+~ financially
+~ finely
+~ finished
+~ firmly
+~ fitfully
+~ fitted
+~ flagrantly
+~ flamboyantly
+~ flatly
+~ fleetingly
+~ flew
+~ flexibly
+~ flippantly
+~ flowerily
+~ fluently
+~ folded
+~ followed
+~ fondly
+~ foolishly
+~ forced
+~ forcefully
+~ forever
+~ forgave
+~ forgetfully
+~ forgot
+~ forlornly
+~ formally
+~ formed
+~ forth
+~ fortuitously
+~ fortunately
+~ forward
+~ fought
+~ foully
+~ found
+~ founded
+~ frailly
+~ frankly
+~ frantically
+~ fraternally
+~ fraudulently
+~ freely
+~ frenetically
+~ frequently
+~ freshly
+~ frightfully
+~ frigidly
+~ frivolously
+~ frugally
+~ fully
+~ fundamentally
+~ furiously
+~ further
+~ furthermore
+~ furtively
+~ gaily
+~ gained
+~ gallantly
+~ gaudily
+~ gave
+~ generously
+~ gentlemanly
+~ gently
+~ ghastly
+~ gigantically
+~ gladly
+~ glamorously
+~ glaringly
+~ gleefully
+~ glibly
+~ gloriously
+~ glumly
+~ go
+~ goodly
+~ got
+~ gracefully
+~ graciously
+~ grandly
+~ graphically
+~ gratuitously
+~ gravely
+~ greedily
+~ grievously
+~ grimly
+~ grossly
+~ grotesquely
+~ grown
+~ grudgingly
+~ gruelingly
+~ gruffly
+~ guardedly
+~ habitually
+~ had
+~ haggardly
+~ handily
+~ handled
+~ handsomely
+~ haphazardly
+~ happened
+~ happily
+~ hardly
+~ harmfully
+~ harmoniously
+~ harshly
+~ hastily
+~ hated
+~ headed
+~ heard
+~ heartlessly
+~ heavenly
+~ heavily
+~ hectically
+~ hedonistically
+~ heedlessly
+~ heinously
+~ held
+~ hellishly
+~ helped
+~ helpfully
+~ heroically
+~ hesitantly
+~ hid
+~ hideously
+~ highly
+~ hilariously
+~ hit
+~ hollowly
+~ honestly
+~ hoped
+~ hopefully
+~ horrendously
+~ horribly
+~ hotly
+~ hourly
+~ hugely
+~ humanely
+~ humorously
+~ hungrily
+~ hurt
+~ hygienically
+~ hypnotically
+~ hysterically
+~ ideally
+~ identified
+~ idiomatically
+~ idiotically
+~ ignominiously
+~ ignorantly
+~ illustriously
+~ imagined
+~ immaculately
+~ immensely
+~ immoderately
+~ immodestly
+~ immorally
+~ immovably
+~ impartially
+~ impatiently
+~ impeccably
+~ imperfectly
+~ imperiously
+~ impersonally
+~ impertinently
+~ impetuously
+~ impolitely
+~ importantly
+~ improved
+~ impudently
+~ impulsively
+~ inaccurately
+~ inadequately
+~ inadvertently
+~ inanely
+~ incessantly
+~ incidentally
+~ included
+~ incoherently
+~ inconsistently
+~ incorrectly
+~ increased
+~ increasingly
+~ incredibly
+~ indecently
+~ indefinitely
+~ independently
+~ indicated
+~ indiscriminately
+~ indisputably
+~ indistinctly
+~ indubitably
+~ indulgently
+~ industriously
+~ ineffectually
+~ ineptly
+~ inevitably
+~ infamously
+~ infectiously
+~ infinitely
+~ influenced
+~ influentially
+~ informally
+~ informed
+~ infrequently
+~ ingeniously
+~ inherently
+~ initially
+~ injudiciously
+~ innately
+~ innocently
+~ inordinately
+~ inquisitively
+~ insanely
+~ insatiably
+~ inscrutably
+~ insincerely
+~ insistently
+~ insolently
+~ insufferably
+~ insultingly
+~ intelligently
+~ intelligibly
+~ intended
+~ intensely
+~ intentionally
+~ interminably
+~ intermittently
+~ intrepidly
+~ intricately
+~ intrinsically
+~ introduced
+~ invariably
+~ invigoratingly
+~ invited
+~ involved
+~ irascibly
+~ ironically
+~ irrationally
+~ irrefutably
+~ irregularly
+~ irresponsibly
+~ irritably
+~ jauntily
+~ jealously
+~ jocularly
+~ joined
+~ jointly
+~ jokingly
+~ joyfully
+~ joyously
+~ jubilantly
+~ judiciously
+~ jumped
+~ justifiably
+~ justly
+~ keenly
+~ kept
+~ kicked
+~ killed
+~ kindly
+~ kingly
+~ knew
+~ knocked
+~ knowingly
+~ laboriously
+~ lackadaisically
+~ laconically
+~ laid
+~ lamely
+~ lasciviously
+~ lasted
+~ lately
+~ latently
+~ later
+~ laudably
+~ laughed
+~ lavishly
+~ lawlessly
+~ lazily
+~ lead
+~ learned
+~ left
+~ left
+~ legitimately
+~ leisurely
+~ leniently
+~ lent
+~ less
+~ let
+~ lethargically
+~ lewdly
+~ liberally
+~ licentiously
+~ lied
+~ lightly
+~ liked
+~ limited
+~ limply
+~ linked
+~ listened
+~ listlessly
+~ lived
+~ lively
+~ locally
+~ logically
+~ longingly
+~ looked
+~ loosely
+~ loquaciously
+~ lost
+~ loudly
+~ loved
+~ lovingly
+~ lowly
+~ lucidly
+~ luckily
+~ ludicrously
+~ lustfully
+~ lustily
+~ luxuriantly
+~ made
+~ madly
+~ magnanimously
+~ magnetically
+~ mainly
+~ malevolently
+~ maliciously
+~ malignantly
+~ managed
+~ manifestly
+~ mannerly
+~ marked
+~ marvelously
+~ massively
+~ masterly
+~ materially
+~ mattered
+~ may
+~ meant
+~ measured
+~ meekly
+~ melodramatically
+~ memorably
+~ menacingly
+~ mentioned
+~ mercifully
+~ meritoriously
+~ merrily
+~ met
+~ methodically
+~ meticulously
+~ might
+~ mildly
+~ minded
+~ mindfully
+~ minutely
+~ miserably
+~ missed
+~ misspelled
+~ mistakenly
+~ mockingly
+~ modestly
+~ momentarily
+~ monetarily
+~ monotonously
+~ monstrously
+~ monthly
+~ monumentally
+~ moodily
+~ morbidly
+~ more
+~ morosely
+~ mortally
+~ mostly
+~ mournfully
+~ moved
+~ mundanely
+~ murderously
+~ must
+~ mutinously
+~ mysteriously
+~ naively
+~ nakedly
+~ naturally
+~ nearby
+~ nearly
+~ neatly
+~ needed
+~ negatively
+~ neglectfully
+~ negligibly
+~ neighborly
+~ nervously
+~ neurotically
+~ never
+~ newly
+~ nicely
+~ nimbly
+~ noisily
+~ nonchalantly
+~ normally
+~ not
+~ notably
+~ noticed
+~ now
+~ numerically
+~ obediently
+~ objectively
+~ obligingly
+~ obliquely
+~ obnoxiously
+~ obscenely
+~ obscurely
+~ obsequiously
+~ obsessively
+~ obtained
+~ obtrusively
+~ obviously
+~ occurred
+~ oddly
+~ offered
+~ officially
+~ often
+~ ominously
+~ on
+~ once
+~ onerously
+~ only
+~ onward
+~ opaquely
+~ open
+~ openly
+~ oppressively
+~ optimistically
+~ opulently
+~ ordered
+~ orderly
+~ ordinarily
+~ originally
+~ ornamentally
+~ ornately
+~ ostensibly
+~ ostentatiously
+~ ought
+~ out
+~ outlandishly
+~ outward
+~ outwardly
+~ overconfidently
+~ overly
+~ owned
+~ paid
+~ painfully
+~ painstakingly
+~ palatably
+~ paradoxically
+~ pardonably
+~ parsimoniously
+~ partially
+~ particularly
+~ passed
+~ passionately
+~ passively
+~ patently
+~ pathetically
+~ peacefully
+~ peculiarly
+~ pensively
+~ perennially
+~ perfectly
+~ performed
+~ perilously
+~ permissively
+~ perpetually
+~ persuasively
+~ pertly
+~ pessimistically
+~ petulantly
+~ phenomenally
+~ picked
+~ pictorially
+~ pivotally
+~ placed
+~ placidly
+~ plainly
+~ planned
+~ plausibly
+~ played
+~ playfully
+~ pleasantly
+~ pleasingly
+~ plentifully
+~ poignantly
+~ pointed
+~ pointedly
+~ pointlessly
+~ politely
+~ politically
+~ pompously
+~ ponderously
+~ poorly
+~ popularly
+~ pornographically
+~ positively
+~ possibly
+~ potentially
+~ potently
+~ powerfully
+~ practically
+~ precariously
+~ preciously
+~ precisely
+~ preferred
+~ preliminarily
+~ prematurely
+~ prepared
+~ preposterously
+~ presented
+~ presently
+~ pressed
+~ presumably
+~ presumptuously
+~ prevented
+~ previously
+~ prickly
+~ primarily
+~ princely
+~ principally
+~ privately
+~ probably
+~ prodigiously
+~ produced
+~ productively
+~ profanely
+~ professionally
+~ proficiently
+~ profitably
+~ profoundly
+~ profusely
+~ prominently
+~ promised
+~ promptly
+~ properly
+~ propitiously
+~ proportionally
+~ protected
+~ proved
+~ provided
+~ providentially
+~ provisionally
+~ provocatively
+~ prudently
+~ psychedelically
+~ publicly
+~ published
+~ pulled
+~ punctually
+~ purely
+~ purposely
+~ pushed
+~ put
+~ putridly
+~ queenly
+~ queerly
+~ questionably
+~ quickly
+~ quietly
+~ quirkily
+~ quixotically
+~ racially
+~ radically
+~ raised
+~ ran
+~ rancorously
+~ randomly
+~ rapaciously
+~ rapidly
+~ rarely
+~ rashly
+~ rationally
+~ ravenously
+~ ravenously
+~ reached
+~ read
+~ realized
+~ really
+~ rearward
+~ reasonably
+~ rebelliously
+~ received
+~ recently
+~ recklessly
+~ recognized
+~ recorded
+~ reduced
+~ referred
+~ reflected
+~ refused
+~ regarded
+~ regretfully
+~ regularly
+~ related
+~ released
+~ relentlessly
+~ reliantly
+~ reluctantly
+~ remained
+~ remembered
+~ remotely
+~ removed
+~ repeated
+~ repeatedly
+~ replaced
+~ replied
+~ reported
+~ represented
+~ required
+~ resentfully
+~ resiliently
+~ resolutely
+~ resoundingly
+~ respectively
+~ responsively
+~ rested
+~ restfully
+~ restlessly
+~ resulted
+~ returned
+~ revealed
+~ reverentially
+~ reverently
+~ richly
+~ ridiculously
+~ right
+~ righteously
+~ rightfully
+~ rigidly
+~ rigorously
+~ ringed
+~ riotously
+~ ritualistically
+~ robustly
+~ rolled
+~ romantically
+~ rose
+~ roughly
+~ routinely
+~ rowdily
+~ rudely
+~ ruthlessly
+~ sacredly
+~ sadistically
+~ sadly
+~ safely
+~ said
+~ sang
+~ sarcastically
+~ sassily
+~ sat
+~ satanically
+~ saucily
+~ savagely
+~ saved
+~ saw
+~ scandalously
+~ scarcely
+~ scathingly
+~ scholarly
+~ scornfully
+~ screams
+~ secularly
+~ securely
+~ sedately
+~ seductively
+~ seemed
+~ seemingly
+~ seemly
+~ seldom
+~ selectively
+~ selfishly
+~ sensationally
+~ senselessly
+~ sensually
+~ sent
+~ sentimentally
+~ separated
+~ separately
+~ serenely
+~ seriously
+~ served
+~ set
+~ settled
+~ severely
+~ sexually
+~ shabbily
+~ shakily
+~ shall
+~ shamefully
+~ shamelessly
+~ shared
+~ sharply
+~ sheepishly
+~ shockingly
+~ shook
+~ shortly
+~ shot
+~ should
+~ shouted
+~ showed
+~ shrewdly
+~ shrilly
+~ shut
+~ shyly
+~ sickly
+~ silently
+~ simply
+~ singly
+~ singularly
+~ sinisterly
+~ sizably
+~ skeptically
+~ skillfully
+~ sleepily
+~ slept
+~ slightly
+~ sloppily
+~ slovenly
+~ slowly
+~ slyly
+~ smartly
+~ smiled
+~ smoothly
+~ smugly
+~ snidely
+~ snobbishly
+~ soberly
+~ socially
+~ softly
+~ sold
+~ solemnly
+~ solidly
+~ somberly
+~ sometimes
+~ somewhat
+~ soon
+~ sooner
+~ soothingly
+~ sorrowfully
+~ sorted
+~ sounded
+~ sourly
+~ spaciously
+~ sparingly
+~ spasmodically
+~ specially
+~ specifically
+~ spectacularly
+~ speculatively
+~ speedily
+~ spinelessly
+~ spiritually
+~ spitefully
+~ splendidly
+~ spoke
+~ spontaneously
+~ sporadically
+~ spotlessly
+~ sprightly
+~ spryly
+~ squalidly
+~ started
+~ stated
+~ stately
+~ statically
+~ staunchly
+~ staunchly
+~ stayed
+~ steadfastly
+~ steadily
+~ stealthily
+~ steeply
+~ sternly
+~ stiffly
+~ stimulatingly
+~ stirringly
+~ stood
+~ stoped
+~ straight
+~ strangely
+~ strenuously
+~ strictly
+~ strikingly
+~ strongly
+~ stubbornly
+~ stuck
+~ studied
+~ studiously
+~ stunningly
+~ stupidly
+~ sturdily
+~ stylishly
+~ suavely
+~ sublimely
+~ substantially
+~ subtly
+~ succeeded
+~ successfully
+~ succinctly
+~ suddenly
+~ suffered
+~ suggested
+~ suggestively
+~ suitably
+~ suited
+~ sullenly
+~ summarily
+~ superbly
+~ superficially
+~ superlatively
+~ supernaturally
+~ supplied
+~ supported
+~ supposed
+~ supposedly
+~ supremely
+~ surly
+~ surprisingly
+~ surreptitiously
+~ survived
+~ suspiciously
+~ sweetly
+~ swiftly
+~ symmetrically
+~ sympathetically
+~ systematically
+~ tactfully
+~ talked
+~ tamely
+~ tangibly
+~ tastefully
+~ taught
+~ tearfully
+~ tediously
+~ temperamentally
+~ tempestuously
+~ temporally
+~ tenaciously
+~ tended
+~ tenderly
+~ tensely
+~ tentatively
+~ terribly
+~ terrifically
+~ tersely
+~ tested
+~ testily
+~ thanked
+~ theatrically
+~ then
+~ thickly
+~ thinly
+~ thirstily
+~ thoroughly
+~ thought
+~ thoughtfully
+~ thoughtlessly
+~ threw
+~ thrillingly
+~ thunderously
+~ tightly
+~ timelessly
+~ timely
+~ timidly
+~ timorously
+~ tiredly
+~ tirelessly
+~ told
+~ tolerably
+~ tolerantly
+~ tomorrow
+~ too
+~ took
+~ torpidly
+~ tortuously
+~ totally
+~ touched
+~ traditionally
+~ tragically
+~ trained
+~ tranquilly
+~ traumatically
+~ traveled
+~ treacherously
+~ treated
+~ tremendously
+~ tried
+~ trivially
+~ truly
+~ truthfully
+~ tumultuously
+~ turned
+~ typically
+~ tyrannically
+~ ultimately
+~ unambiguously
+~ unassailably
+~ unbearably
+~ uncaringly
+~ unceasingly
+~ uncertainly
+~ uncivilly
+~ unclearly
+~ uncommonly
+~ unconditionally
+~ unconsciously
+~ uncontrollably
+~ undeniably
+~ understandably
+~ understood
+~ undoubtedly
+~ unduly
+~ uneasily
+~ unemotionally
+~ unendingly
+~ unequally
+~ unequivocally
+~ unerringly
+~ unevenly
+~ uneventfully
+~ unexpectedly
+~ unfairly
+~ unfashionably
+~ unfathomably
+~ unflinchingly
+~ unforgivably
+~ unfortunately
+~ unfriendly
+~ ungainly
+~ ungentlemanly
+~ ungraciously
+~ unhesitatingly
+~ uniformly
+~ unintelligently
+~ unintentionally
+~ uniquely
+~ unlikely
+~ unmannerly
+~ unnaturally
+~ unpleasantly
+~ unquestionably
+~ unrealistically
+~ unreasonably
+~ unreliably
+~ unremittingly
+~ unreservedly
+~ unrestrainedly
+~ unruly
+~ unscrupulously
+~ unseemly
+~ unselfishly
+~ unshakably
+~ unsophisticatedly
+~ unspeakably
+~ unstintingly
+~ unsuccessfully
+~ unusually
+~ unwaveringly
+~ unwisely
+~ unwittingly
+~ upright
+~ urbanely
+~ urgently
+~ used
+~ uselessly
+~ usually
+~ utterly
+~ vacantly
+~ vacuously
+~ vaguely
+~ vainly
+~ valiantly
+~ variably
+~ variously
+~ vastly
+~ vehemently
+~ venomously
+~ verbosely
+~ verifiably
+~ very
+~ vicariously
+~ viciously
+~ victoriously
+~ vigorously
+~ vilely
+~ violently
+~ virtually
+~ virtuously
+~ visibly
+~ visited
+~ vitally
+~ vivaciously
+~ vividly
+~ vociferously
+~ voluminously
+~ voluntarily
+~ voluptuously
+~ voraciously
+~ voted
+~ vulgarly
+~ vulnerably
+~ waited
+~ walked
+~ wanted
+~ wantonly
+~ warily
+~ warmly
+~ warned
+~ washed
+~ watched
+~ watchfully
+~ weakly
+~ wearily
+~ weekly
+~ well
+~ went
+~ whimsically
+~ wholesomely
+~ wholly
+~ wickedly
+~ widely
+~ wildly
+~ willed
+~ willingly
+~ wily
+~ wined
+~ wisely
+~ wished
+~ wobbly
+~ woefully
+~ wondered
+~ woodenly
+~ wore
+~ worked
+~ worldly
+~ worried
+~ worshipfully
+~ worthily
+~ would
+~ wretchedly
+~ wrongly
+~ wrote
+~ yearly
+~ yesterday
~ zealously
\ No newline at end of file
diff --git a/fresh_install_README.txt b/fresh_install_README.txt
index d60b2e8..26383f0 100644
--- a/fresh_install_README.txt
+++ b/fresh_install_README.txt
@@ -1,22 +1,42 @@
-Install files for Program O v2.
---------------------------------------------------------------------------------------------
-
-
-step 1 - upload
---------------------------------------------------------------------------------------------
-# Upload the files to your server.
-
-
-step 2 - Run the installer
---------------------------------------------------------------------------------------------
-All that's required is that you point any major web browser to your newly created
-Program O directory (e.g. http://www.example.com/ProgramO/) and the install
-script will do the rest. Just follow the prompts, and supply the necessary
-information in the forms provided.
-
-step 3 - Upload the AIML files
---------------------------------------------------------------------------------------------
-To perform this action when the installation is complete, go to the admin page
-(e.g. http://www.example.com/ProgramO/admin/) and log in with the admin credentials
-you provided during the installation process. Then select "Upload AIML" from
+Install files for Program O v2.
+--------------------------------------------------------------------------------------------
+
+
+step 1 - upload
+--------------------------------------------------------------------------------------------
+# Upload the files to your server, to the directory of your choice.
+
+step 2 - Create the Database
+--------------------------------------------------------------------------------------------
+This step will vary, depending on whether you're installing locally or remotely, and also on
+where you host your remote installation.
+
+For local installation, access your local MySQL database server through the tool of your choice
+(e.g. the MySQL Toolkit, phpMyAdmin, etc.), create an empty database and note the name; then create
+a user/password for that database with full permissions.
+
+For remote database creation, it's highly recommended to contact your hosting provider for details.
+Often times you will need to log on to a "Dashboard" or "Control Panel" page in order to create
+the remote database, and there are literally dozens of different versions, each with their own way
+of doing things, so trying to outline remote database creation here would be near impossible.
+
+Please note that we STRONGLY suggest the use of phpMyAdmin for monitoring, maintaining and working
+with your database IN ADDITION to the admin pages. The vast majority of hosting providers
+offer phpMyAdmin as a part of your database package, so contact them if you're unsure about
+whether you have it. For local installations of phpMyAdmin, visit http://www.phpmyadmin.net
+for detailed information on installing and usint this very powerful and easy to use database
+management tool.
+
+step 3 - Run the installer
+--------------------------------------------------------------------------------------------
+All that's required is that you point any major web browser to your newly created
+Program O directory (e.g. http://www.example.com/ProgramO/) and the install
+script will do the rest. Just follow the prompts, and supply the necessary
+information in the forms provided.
+
+step 4 - Upload the AIML files
+--------------------------------------------------------------------------------------------
+To perform this action when the installation is complete, go to the admin page
+(e.g. http://www.example.com/ProgramO/admin/) and log in with the admin credentials
+you provided during the installation process. Then select "Upload AIML" from
the left nav menu and follow the prompts.
\ No newline at end of file
diff --git a/gui/index.php b/gui/index.php
index 66f446d..858f3c1 100644
--- a/gui/index.php
+++ b/gui/index.php
@@ -1,31 +1,30 @@
-
-
-
-
- Program O Installation help
-
-
-
-
-
-
- Program O GUI Samples
-
-
-
-
-
-
-
-
- The following are simple, "bare-bones" examples of how to interface with Program O on your
- website. The Twitter example will require some basic installation and configuration prior to
- use. View the files index.php and page.php in the twitter directory prior to use.
-
-
-
-
-
-
-
+
+
+
+
+ Program O Installation help
+
+
+
+
+
+
+ Program O GUI Samples
+
+
+
+
+
+
+
+
+ The following are simple, "bare-bones" examples of how to interface with Program O on your
+ website. The Twitter example will require some basic installation and configuration prior to
+ use. View the files index.php and page.php in the twitter directory prior to use.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gui/jquery/index.php b/gui/jquery/index.php
index df1e62a..dd6890e 100644
--- a/gui/jquery/index.php
+++ b/gui/jquery/index.php
@@ -1,8 +1,21 @@
-
@@ -64,3 +77,4 @@
+
diff --git a/gui/jquery/main.css b/gui/jquery/main.css
index fae078e..fe74995 100644
--- a/gui/jquery/main.css
+++ b/gui/jquery/main.css
@@ -1,147 +1,147 @@
-
- body{
- font-family: sans-serif;
- font-size:12px;
- }
-
- .man {
- background:url("http://github.com/small_man.png");
- height:194px;
- width:133px;
- float:right;
- }
-
- .dog {
- background:url("http://github.com/small_dog.png");
- height:198px;
- width:278px;
- float:left;
- }
-
- .manspeech {
- height:200px;
- width:133px;
- float:right;
- position:relative;
- display:block;
- min-height:14px;
- }
-
- .dogspeech {
- height:200px;
- width:278px;
- float:left;
- position:relative;
- min-height:14px;
- }
-
- .botsay{
- overflow: auto;
- max-height: 150px;
- color:red;
- font-weight:bold;
- }
-
- .usersay{
- overflow: auto;
- max-height: 150px;
- color:green;
- font-weight:bold;
- }
-
- .centerthis {
- margin: 0 auto;
- width:450px;
- }
- .clearthis {
- clear:both;
- }
-
-
-
-
-
-/* ============================================================================================================================
-== BUBBLE WITH A BORDER AND TRIANGLE
-** ============================================================================================================================ */
-
-/* THE SPEECH BUBBLE
-------------------------------------------------------------------------------------------------------------------------------- */
-
-.triangle-border {
- padding:5px;
- margin:0.5em 0 1em;
- border:5px solid #5a8f00;
- color:#333;
- background:#fff;
- /* css3 */
- -webkit-border-radius:10px;
- -moz-border-radius:10px;
- border-radius:10px;
- position: absolute; bottom: 0;
- width:95%;
-}
-
-.blue{
- border:5px solid lightblue;
-}
-
-.orange{
- border:5px solid orange;
-}
-
-/* Variant : for left positioned triangle
------------------------------------------- */
-
-.triangle-border.left {
- margin-left:3px;
-}
-
-/* Variant : for right positioned triangle
------------------------------------------- */
-
-.triangle-border.right {
- margin-right:3px;
-}
-
-/* THE TRIANGLE
-------------------------------------------------------------------------------------------------------------------------------- */
-
-.triangle-border:before {
- content:"";
- position:absolute;
- bottom:-20px; /* value = - border-top-width - border-bottom-width */
- left:40px; /* controls horizontal position */
- border-width:20px 20px 0;
- border-style:solid;
- border-color:#000 transparent;
- /* reduce the damage in FF3.0 */
- display:block;
- width:0;
-}
-
-.blue:before {
- border-color:lightblue transparent;
-}
-
-.orange:before {
- border-color:orange transparent;
-}
-
-
-
-/* creates the smaller triangle */
-.triangle-border:after {
- content:"";
- position:absolute;
- bottom:-13px; /* value = - border-top-width - border-bottom-width */
- left:47px; /* value = (:before left) + (:before border-left) - (:after border-left) */
- border-width:13px 13px 0;
- border-style:solid;
- border-color:#fff transparent;
- /* reduce the damage in FF3.0 */
- display:block;
- width:0;
-}
-
-
+
+ body{
+ font-family: sans-serif;
+ font-size:12px;
+ }
+
+ .man {
+ background:url("http://github.com/small_man.png");
+ height:194px;
+ width:133px;
+ float:right;
+ }
+
+ .dog {
+ background:url("http://github.com/small_dog.png");
+ height:198px;
+ width:278px;
+ float:left;
+ }
+
+ .manspeech {
+ height:200px;
+ width:133px;
+ float:right;
+ position:relative;
+ display:block;
+ min-height:14px;
+ }
+
+ .dogspeech {
+ height:200px;
+ width:278px;
+ float:left;
+ position:relative;
+ min-height:14px;
+ }
+
+ .botsay{
+ overflow: auto;
+ max-height: 150px;
+ color:red;
+ font-weight:bold;
+ }
+
+ .usersay{
+ overflow: auto;
+ max-height: 150px;
+ color:green;
+ font-weight:bold;
+ }
+
+ .centerthis {
+ margin: 0 auto;
+ width:450px;
+ }
+ .clearthis {
+ clear:both;
+ }
+
+
+
+
+
+/* ============================================================================================================================
+== BUBBLE WITH A BORDER AND TRIANGLE
+** ============================================================================================================================ */
+
+/* THE SPEECH BUBBLE
+------------------------------------------------------------------------------------------------------------------------------- */
+
+.triangle-border {
+ padding:5px;
+ margin:0.5em 0 1em;
+ border:5px solid #5a8f00;
+ color:#333;
+ background:#fff;
+ /* css3 */
+ -webkit-border-radius:10px;
+ -moz-border-radius:10px;
+ border-radius:10px;
+ position: absolute; bottom: 0;
+ width:95%;
+}
+
+.blue{
+ border:5px solid lightblue;
+}
+
+.orange{
+ border:5px solid orange;
+}
+
+/* Variant : for left positioned triangle
+------------------------------------------ */
+
+.triangle-border.left {
+ margin-left:3px;
+}
+
+/* Variant : for right positioned triangle
+------------------------------------------ */
+
+.triangle-border.right {
+ margin-right:3px;
+}
+
+/* THE TRIANGLE
+------------------------------------------------------------------------------------------------------------------------------- */
+
+.triangle-border:before {
+ content:"";
+ position:absolute;
+ bottom:-20px; /* value = - border-top-width - border-bottom-width */
+ left:40px; /* controls horizontal position */
+ border-width:20px 20px 0;
+ border-style:solid;
+ border-color:#000 transparent;
+ /* reduce the damage in FF3.0 */
+ display:block;
+ width:0;
+}
+
+.blue:before {
+ border-color:lightblue transparent;
+}
+
+.orange:before {
+ border-color:orange transparent;
+}
+
+
+
+/* creates the smaller triangle */
+.triangle-border:after {
+ content:"";
+ position:absolute;
+ bottom:-13px; /* value = - border-top-width - border-bottom-width */
+ left:47px; /* value = (:before left) + (:before border-left) - (:after border-left) */
+ border-width:13px 13px 0;
+ border-style:solid;
+ border-color:#fff transparent;
+ /* reduce the damage in FF3.0 */
+ display:block;
+ width:0;
+}
+
+
diff --git a/gui/plain/index.php b/gui/plain/index.php
index fb2ff69..0b19ce5 100644
--- a/gui/plain/index.php
+++ b/gui/plain/index.php
@@ -1,31 +1,44 @@
-
@@ -33,18 +46,18 @@
-
+
Program O AIML PHP Chatbot
-
+
-
+
\ No newline at end of file
diff --git a/gui/plain/index_better_divs.php b/gui/plain/index_better_divs.php
index e109f08..e0d777a 100644
--- a/gui/plain/index_better_divs.php
+++ b/gui/plain/index_better_divs.php
@@ -1,75 +1,83 @@
- ' : "";
-$thisScript = $_SERVER['PHP_SELF'] . '#new';
-
-
-$content = <<
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Welcome to the Program O Project website This is the home of the Open Source PHP MySQL AIML Chatbot Project. Program O is an AIML engine written in PHP with MySQL. Here you can find support, help, bot addons, a brilliant and friendly community and ofcourse the Program O download files.
- - - - -
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Welcome to the Program O Project website This is the home of the Open Source PHP MySQL AIML Chatbot Project. Program O is an AIML engine written in PHP with MySQL. Here you can find support, help, bot addons, a brilliant and friendly community and ofcourse the Program O download files.
+ + + + +
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gui/twitter/twitlib/tmhOAuth.php b/gui/twitter/twitlib/tmhOAuth.php
new file mode 100644
index 0000000..4785f54
--- /dev/null
+++ b/gui/twitter/twitlib/tmhOAuth.php
@@ -0,0 +1,656 @@
+params = array();
+ $this->headers = array();
+ $this->auto_fixed_time = false;
+ $this->buffer = null;
+
+ // default configuration options
+ $this->config = array_merge(
+ array(
+ // leave 'user_agent' blank for default, otherwise set this to
+ // something that clearly identifies your app
+ 'user_agent' => '',
+
+ 'use_ssl' => true,
+ 'host' => 'api.twitter.com',
+
+ 'consumer_key' => '',
+ 'consumer_secret' => '',
+ 'user_token' => '',
+ 'user_secret' => '',
+ 'force_nonce' => false,
+ 'nonce' => false, // used for checking signatures. leave as false for auto
+ 'force_timestamp' => false,
+ 'timestamp' => false, // used for checking signatures. leave as false for auto
+
+ // oauth signing variables that are not dynamic
+ 'oauth_version' => '1.0',
+ 'oauth_signature_method' => 'HMAC-SHA1',
+
+ // you probably don't want to change any of these curl values
+ 'curl_connecttimeout' => 30,
+ 'curl_timeout' => 10,
+
+ // for security this should always be set to 2.
+ 'curl_ssl_verifyhost' => 2,
+ // for security this should always be set to true.
+ 'curl_ssl_verifypeer' => true,
+
+ // you can get the latest cacert.pem from here http://curl.haxx.se/ca/cacert.pem
+ 'curl_cainfo' => dirname(__FILE__) . '/cacert.pem',
+ 'curl_capath' => dirname(__FILE__),
+
+ 'curl_followlocation' => false, // whether to follow redirects or not
+
+ // support for proxy servers
+ 'curl_proxy' => false, // really you don't want to use this if you are using streaming
+ 'curl_proxyuserpwd' => false, // format username:password for proxy, if required
+ 'curl_encoding' => '', // leave blank for all supported formats, else use gzip, deflate, identity
+
+ // streaming API
+ 'is_streaming' => false,
+ 'streaming_eol' => "\r\n",
+ 'streaming_metrics_interval' => 60,
+
+ // header or querystring. You should always use header!
+ // this is just to help me debug other developers implementations
+ 'as_header' => true,
+ 'debug' => false,
+ ),
+ $config
+ );
+ $this->set_user_agent();
+ }
+
+ function set_user_agent() {
+ if (!empty($this->config['user_agent']))
+ return;
+
+ if ($this->config['curl_ssl_verifyhost'] && $this->config['curl_ssl_verifypeer']) {
+ $ssl = '+SSL';
+ } else {
+ $ssl = '-SSL';
+ }
+
+ $ua = 'tmhOAuth ' . self::VERSION . $ssl . ' - //github.com/themattharris/tmhOAuth';
+ $this->config['user_agent'] = $ua;
+ }
+
+ /**
+* Generates a random OAuth nonce.
+* If 'force_nonce' is true a nonce is not generated and the value in the configuration will be retained.
+*
+* @param string $length how many characters the nonce should be before MD5 hashing. default 12
+* @param string $include_time whether to include time at the beginning of the nonce. default true
+* @return void
+*/
+ private function create_nonce($length=12, $include_time=true) {
+ if ($this->config['force_nonce'] == false) {
+ $sequence = array_merge(range(0,9), range('A','Z'), range('a','z'));
+ $length = $length > count($sequence) ? count($sequence) : $length;
+ shuffle($sequence);
+
+ $prefix = $include_time ? microtime() : '';
+ $this->config['nonce'] = md5(substr($prefix . implode('', $sequence), 0, $length));
+ }
+ }
+
+ /**
+* Generates a timestamp.
+* If 'force_timestamp' is true a nonce is not generated and the value in the configuration will be retained.
+*
+* @return void
+*/
+ private function create_timestamp() {
+ $this->config['timestamp'] = ($this->config['force_timestamp'] == false ? time() : $this->config['timestamp']);
+ }
+
+ /**
+* Encodes the string or array passed in a way compatible with OAuth.
+* If an array is passed each array value will will be encoded.
+*
+* @param mixed $data the scalar or array to encode
+* @return $data encoded in a way compatible with OAuth
+*/
+ private function safe_encode($data) {
+ if (is_array($data)) {
+ return array_map(array($this, 'safe_encode'), $data);
+ } else if (is_scalar($data)) {
+ return str_ireplace(
+ array('+', '%7E'),
+ array(' ', '~'),
+ rawurlencode($data)
+ );
+ } else {
+ return '';
+ }
+ }
+
+ /**
+* Decodes the string or array from it's URL encoded form
+* If an array is passed each array value will will be decoded.
+*
+* @param mixed $data the scalar or array to decode
+* @return $data decoded from the URL encoded form
+*/
+ private function safe_decode($data) {
+ if (is_array($data)) {
+ return array_map(array($this, 'safe_decode'), $data);
+ } else if (is_scalar($data)) {
+ return rawurldecode($data);
+ } else {
+ return '';
+ }
+ }
+
+ /**
+* Returns an array of the standard OAuth parameters.
+*
+* @return array all required OAuth parameters, safely encoded
+*/
+ private function get_defaults() {
+ $defaults = array(
+ 'oauth_version' => $this->config['oauth_version'],
+ 'oauth_nonce' => $this->config['nonce'],
+ 'oauth_timestamp' => $this->config['timestamp'],
+ 'oauth_consumer_key' => $this->config['consumer_key'],
+ 'oauth_signature_method' => $this->config['oauth_signature_method'],
+ );
+
+ // include the user token if it exists
+ if ( $this->config['user_token'] )
+ $defaults['oauth_token'] = $this->config['user_token'];
+
+ // safely encode
+ foreach ($defaults as $k => $v) {
+ $_defaults[$this->safe_encode($k)] = $this->safe_encode($v);
+ }
+
+ return $_defaults;
+ }
+
+ /**
+* Extracts and decodes OAuth parameters from the passed string
+*
+* @param string $body the response body from an OAuth flow method
+* @return array the response body safely decoded to an array of key => values
+*/
+ function extract_params($body) {
+ $kvs = explode('&', $body);
+ $decoded = array();
+ foreach ($kvs as $kv) {
+ $kv = explode('=', $kv, 2);
+ $kv[0] = $this->safe_decode($kv[0]);
+ $kv[1] = $this->safe_decode($kv[1]);
+ $decoded[$kv[0]] = $kv[1];
+ }
+ return $decoded;
+ }
+
+ /**
+* Prepares the HTTP method for use in the base string by converting it to
+* uppercase.
+*
+* @param string $method an HTTP method such as GET or POST
+* @return void value is stored to a class variable
+* @author themattharris
+*/
+ private function prepare_method($method) {
+ $this->method = strtoupper($method);
+ }
+
+ /**
+* Prepares the URL for use in the base string by ripping it apart and
+* reconstructing it.
+*
+* Ref: 3.4.1.2
+*
+* @param string $url the request URL
+* @return void value is stored to a class variable
+* @author themattharris
+*/
+ private function prepare_url(http://github.com/$url) {
+ $parts = parse_url(http://github.com/$url);
+
+ $port = isset($parts['port']) ? $parts['port'] : false;
+ $scheme = $parts['scheme'];
+ $host = $parts['host'];
+ $path = isset($parts['path']) ? $parts['path'] : false;
+
+ $port or $port = ($scheme == 'https') ? '443' : '80';
+
+ if (($scheme == 'https' && $port != '443')
+ || ($scheme == 'http' && $port != '80')) {
+ $host = "$host:$port";
+ }
+ $this->url = strtolower("$scheme://$host$path");
+ }
+
+ /**
+* Prepares all parameters for the base string and request.
+* Multipart parameters are ignored as they are not defined in the specification,
+* all other types of parameter are encoded for compatibility with OAuth.
+*
+* @param array $params the parameters for the request
+* @return void prepared values are stored in class variables
+*/
+ private function prepare_params($params) {
+ // do not encode multipart parameters, leave them alone
+ if ($this->config['multipart']) {
+ $this->request_params = $params;
+ $params = array();
+ }
+
+ // signing parameters are request parameters + OAuth default parameters
+ $this->signing_params = array_merge($this->get_defaults(), (array)$params);
+
+ // Remove oauth_signature if present
+ // Ref: Spec: 9.1.1 ("The oauth_signature parameter MUST be excluded.")
+ if (isset($this->signing_params['oauth_signature'])) {
+ unset($this->signing_params['oauth_signature']);
+ }
+
+ // Parameters are sorted by name, using lexicographical byte value ordering.
+ // Ref: Spec: 9.1.1 (1)
+ uksort($this->signing_params, 'strcmp');
+
+ // encode. Also sort the signed parameters from the POST parameters
+ foreach ($this->signing_params as $k => $v) {
+ $k = $this->safe_encode($k);
+ $v = $this->safe_encode($v);
+ $_signing_params[$k] = $v;
+ $kv[] = "{$k}={$v}";
+ }
+
+ // auth params = the default oauth params which are present in our collection of signing params
+ $this->auth_params = array_intersect_key($this->get_defaults(), $_signing_params);
+ if (isset($_signing_params['oauth_callback'])) {
+ $this->auth_params['oauth_callback'] = $_signing_params['oauth_callback'];
+ unset($_signing_params['oauth_callback']);
+ }
+
+ if (isset($_signing_params['oauth_verifier'])) {
+ $this->auth_params['oauth_verifier'] = $_signing_params['oauth_verifier'];
+ unset($_signing_params['oauth_verifier']);
+ }
+
+ // request_params is already set if we're doing multipart, if not we need to set them now
+ if ( ! $this->config['multipart'])
+ $this->request_params = array_diff_key($_signing_params, $this->get_defaults());
+
+ // create the parameter part of the base string
+ $this->signing_params = implode('&', $kv);
+ }
+
+ /**
+* Prepares the OAuth signing key
+*
+* @return void prepared signing key is stored in a class variables
+*/
+ private function prepare_signing_key() {
+ $this->signing_key = $this->safe_encode($this->config['consumer_secret']) . '&' . $this->safe_encode($this->config['user_secret']);
+ }
+
+ /**
+* Prepare the base string.
+* Ref: Spec: 9.1.3 ("Concatenate Request Elements")
+*
+* @return void prepared base string is stored in a class variables
+*/
+ private function prepare_base_string() {
+ $base = array(
+ $this->method,
+ $this->url,
+ $this->signing_params
+ );
+ $this->base_string = implode('&', $this->safe_encode($base));
+ }
+
+ /**
+* Prepares the Authorization header
+*
+* @return void prepared authorization header is stored in a class variables
+*/
+ private function prepare_auth_header() {
+ $this->headers = array();
+ uksort($this->auth_params, 'strcmp');
+ if (!$this->config['as_header']) :
+ $this->request_params = array_merge($this->request_params, $this->auth_params);
+ return;
+ endif;
+
+ foreach ($this->auth_params as $k => $v) {
+ $kv[] = "{$k}=\"{$v}\"";
+ }
+ $this->auth_header = 'OAuth ' . implode(', ', $kv);
+ $this->headers['Authorization'] = $this->auth_header;
+ }
+
+ /**
+* Signs the request and adds the OAuth signature. This runs all the request
+* parameter preparation methods.
+*
+* @param string $method the HTTP method being used. e.g. POST, GET, HEAD etc
+* @param string $url the request URL without query string parameters
+* @param array $params the request parameters as an array of key=value pairs
+* @param string $useauth whether to use authentication when making the request.
+*/
+ private function sign($method, $url, $params, $useauth) {
+ $this->prepare_method($method);
+ $this->prepare_url(http://github.com/$url);
+ $this->prepare_params($params);
+
+ // we don't sign anything is we're not using auth
+ if ($useauth) {
+ $this->prepare_base_string();
+ $this->prepare_signing_key();
+
+ $this->auth_params['oauth_signature'] = $this->safe_encode(
+ base64_encode(
+ hash_hmac(
+ 'sha1', $this->base_string, $this->signing_key, true
+ )));
+
+ $this->prepare_auth_header();
+ }
+ }
+
+ /**
+* Make an HTTP request using this library. This method doesn't return anything.
+* Instead the response should be inspected directly.
+*
+* @param string $method the HTTP method being used. e.g. POST, GET, HEAD etc
+* @param string $url the request URL without query string parameters
+* @param array $params the request parameters as an array of key=value pairs
+* @param string $useauth whether to use authentication when making the request. Default true.
+* @param string $multipart whether this request contains multipart data. Default false
+*/
+ function request($method, $url, $params=array(), $useauth=true, $multipart=false) {
+ $this->config['multipart'] = $multipart;
+
+ $this->create_nonce();
+ $this->create_timestamp();
+
+ $this->sign($method, $url, $params, $useauth);
+ return $this->curlit();
+ }
+
+ /**
+* Make a long poll HTTP request using this library. This method is
+* different to the other request methods as it isn't supposed to disconnect
+*
+* Using this method expects a callback which will receive the streaming
+* responses.
+*
+* @param string $method the HTTP method being used. e.g. POST, GET, HEAD etc
+* @param string $url the request URL without query string parameters
+* @param array $params the request parameters as an array of key=value pairs
+* @param string $callback the callback function to stream the buffer to.
+*/
+ function streaming_request($method, $url, $params=array(), $callback='') {
+ if ( ! empty($callback) ) {
+ if ( ! function_exists($callback) ) {
+ return false;
+ }
+ $this->config['streaming_callback'] = $callback;
+ }
+ $this->metrics['start'] = time();
+ $this->metrics['interval_start'] = $this->metrics['start'];
+ $this->metrics['tweets'] = 0;
+ $this->metrics['last_tweets'] = 0;
+ $this->metrics['bytes'] = 0;
+ $this->metrics['last_bytes'] = 0;
+ $this->config['is_streaming'] = true;
+ $this->request($method, $url, $params);
+ }
+
+ /**
+* Handles the updating of the current Streaming API metrics.
+*/
+ function update_metrics() {
+ $now = time();
+ if (($this->metrics['interval_start'] + $this->config['streaming_metrics_interval']) > $now)
+ return false;
+
+ $this->metrics['tps'] = round( ($this->metrics['tweets'] - $this->metrics['last_tweets']) / $this->config['streaming_metrics_interval'], 2);
+ $this->metrics['bps'] = round( ($this->metrics['bytes'] - $this->metrics['last_bytes']) / $this->config['streaming_metrics_interval'], 2);
+
+ $this->metrics['last_bytes'] = $this->metrics['bytes'];
+ $this->metrics['last_tweets'] = $this->metrics['tweets'];
+ $this->metrics['interval_start'] = $now;
+ return $this->metrics;
+ }
+
+ /**
+* Utility function to create the request URL in the requested format
+*
+* @param string $request the API method without extension
+* @param string $format the format of the response. Default json. Set to an empty string to exclude the format
+* @return string the concatenation of the host, API version, API method and format
+*/
+ function url(http://github.com/$request,%20$format='json') {
+ $format = strlen($format) > 0 ? ".$format" : '';
+ $proto = $this->config['use_ssl'] ? 'https:/' : 'http:/';
+
+ // backwards compatibility with v0.1
+ if (isset($this->config['v']))
+ $this->config['host'] = $this->config['host'] . '/' . $this->config['v'];
+
+ return implode('/', array(
+ $proto,
+ $this->config['host'],
+ $request . $format
+ ));
+ }
+
+ /**
+* Public access to the private safe decode/encode methods
+*
+* @param string $text the text to transform
+* @param string $mode the transformation mode. either encode or decode
+* @return the string as transformed by the given mode
+*/
+ function transformText($text, $mode='encode') {
+ return $this->{"safe_$mode"}($text);
+ }
+
+ /**
+* Utility function to parse the returned curl headers and store them in the
+* class array variable.
+*
+* @param object $ch curl handle
+* @param string $header the response headers
+* @return the string length of the header
+*/
+ private function curlHeader($ch, $header) {
+ $i = strpos($header, ':');
+ if ( ! empty($i) ) {
+ $key = str_replace('-', '_', strtolower(substr($header, 0, $i)));
+ $value = trim(substr($header, $i + 2));
+ $this->response['headers'][$key] = $value;
+ }
+ return strlen($header);
+ }
+
+ /**
+* Utility function to parse the returned curl buffer and store them until
+* an EOL is found. The buffer for curl is an undefined size so we need
+* to collect the content until an EOL is found.
+*
+* This function calls the previously defined streaming callback method.
+*
+* @param object $ch curl handle
+* @param string $data the current curl buffer
+*/
+ private function curlWrite($ch, $data) {
+ $l = strlen($data);
+ if (strpos($data, $this->config['streaming_eol']) === false) {
+ $this->buffer .= $data;
+ return $l;
+ }
+
+ $buffered = explode($this->config['streaming_eol'], $data);
+ $content = $this->buffer . $buffered[0];
+
+ $this->metrics['tweets']++;
+ $this->metrics['bytes'] += strlen($content);
+
+ if ( ! function_exists($this->config['streaming_callback']))
+ return 0;
+
+ $metrics = $this->update_metrics();
+ $stop = call_user_func(
+ $this->config['streaming_callback'],
+ $content,
+ strlen($content),
+ $metrics
+ );
+ $this->buffer = $buffered[1];
+ if ($stop)
+ return 0;
+
+ return $l;
+ }
+
+ /**
+* Makes a curl request. Takes no parameters as all should have been prepared
+* by the request method
+*
+* @return void response data is stored in the class variable 'response'
+*/
+ private function curlit() {
+ // method handling
+ switch ($this->method) {
+ case 'POST':
+ break;
+ default:
+ // GET, DELETE request so convert the parameters to a querystring
+ if ( ! empty($this->request_params)) {
+ foreach ($this->request_params as $k => $v) {
+ // Multipart params haven't been encoded yet.
+ // Not sure why you would do a multipart GET but anyway, here's the support for it
+ if ($this->config['multipart']) {
+ $params[] = $this->safe_encode($k) . '=' . $this->safe_encode($v);
+ } else {
+ $params[] = $k . '=' . $v;
+ }
+ }
+ $qs = implode('&', $params);
+ $this->url = strlen($qs) > 0 ? $this->url . '?' . $qs : $this->url;
+ $this->request_params = array();
+ }
+ break;
+ }
+
+ // configure curl
+ $c = curl_init();
+ curl_setopt_array($c, array(
+ CURLOPT_USERAGENT => $this->config['user_agent'],
+ CURLOPT_CONNECTTIMEOUT => $this->config['curl_connecttimeout'],
+ CURLOPT_TIMEOUT => $this->config['curl_timeout'],
+ CURLOPT_RETURNTRANSFER => true,
+ CURLOPT_SSL_VERIFYPEER => $this->config['curl_ssl_verifypeer'],
+ CURLOPT_SSL_VERIFYHOST => $this->config['curl_ssl_verifyhost'],
+
+ CURLOPT_FOLLOWLOCATION => $this->config['curl_followlocation'],
+ CURLOPT_PROXY => $this->config['curl_proxy'],
+ CURLOPT_ENCODING => $this->config['curl_encoding'],
+ CURLOPT_URL => $this->url,
+ // process the headers
+ CURLOPT_HEADERFUNCTION => array($this, 'curlHeader'),
+ CURLOPT_HEADER => false,
+ CURLINFO_HEADER_OUT => true,
+ ));
+
+ if ($this->config['curl_cainfo'] !== false)
+ curl_setopt($c, CURLOPT_CAINFO, $this->config['curl_cainfo']);
+
+ if ($this->config['curl_capath'] !== false)
+ curl_setopt($c, CURLOPT_CAPATH, $this->config['curl_capath']);
+
+ if ($this->config['curl_proxyuserpwd'] !== false)
+ curl_setopt($c, CURLOPT_PROXYUSERPWD, $this->config['curl_proxyuserpwd']);
+
+ if ($this->config['is_streaming']) {
+ // process the body
+ $this->response['content-length'] = 0;
+ curl_setopt($c, CURLOPT_TIMEOUT, 0);
+ curl_setopt($c, CURLOPT_WRITEFUNCTION, array($this, 'curlWrite'));
+ }
+
+ switch ($this->method) {
+ case 'GET':
+ break;
+ case 'POST':
+ curl_setopt($c, CURLOPT_POST, true);
+ break;
+ default:
+ curl_setopt($c, CURLOPT_CUSTOMREQUEST, $this->method);
+ }
+
+ if ( ! empty($this->request_params) ) {
+ // if not doing multipart we need to implode the parameters
+ if ( ! $this->config['multipart'] ) {
+ foreach ($this->request_params as $k => $v) {
+ $ps[] = "{$k}={$v}";
+ }
+ $this->request_params = implode('&', $ps);
+ }
+ curl_setopt($c, CURLOPT_POSTFIELDS, $this->request_params);
+ } else {
+ // CURL will set length to -1 when there is no data, which breaks Twitter
+ $this->headers['Content-Type'] = '';
+ $this->headers['Content-Length'] = '';
+ }
+
+ // CURL defaults to setting this to Expect: 100-Continue which Twitter rejects
+ $this->headers['Expect'] = '';
+
+ if ( ! empty($this->headers)) {
+ foreach ($this->headers as $k => $v) {
+ $headers[] = trim($k . ': ' . $v);
+ }
+ curl_setopt($c, CURLOPT_HTTPHEADER, $headers);
+ }
+
+ if (isset($this->config['prevent_request']) && true == $this->config['prevent_request'])
+ return;
+
+ // do it!
+ $response = curl_exec($c);
+ $code = curl_getinfo($c, CURLINFO_HTTP_CODE);
+ $info = curl_getinfo($c);
+ $error = curl_error($c);
+ $errno = curl_errno($c);
+ curl_close($c);
+
+ // store the response
+ $this->response['code'] = $code;
+ $this->response['response'] = $response;
+ $this->response['info'] = $info;
+ $this->response['error'] = $error;
+ $this->response['errno'] = $errno;
+ return $code;
+ }
+}
\ No newline at end of file
diff --git a/gui/xml/index.php b/gui/xml/index.php
index da632a8..9f485d7 100644
--- a/gui/xml/index.php
+++ b/gui/xml/index.php
@@ -1,103 +1,123 @@
-
-[bot_name]: [botsay]+ If you've been directed here, then your web server doesn't allow the install script to modify file permissions automatically. + If this is the case, then modification of the permissions for the config file will have to be done manually, BEFORE + the install script can continue. Otherwise, you'll end up with a corrupted installation, and will have to start over. + This problem seems to be limited to Linux systems, since Windows handles file permissions differently. +
++ To manually change file permissions on a remote server, you usually have a couple of options. If your hosting provider provides + a user control panel, you can use the File Management section to change permissions. You can also use the FTP client software + that you used to upload the file to change permissions. The methods for changing file permissions with an FTP client application + vary from program to program, so if you're unsure about how to go about the task, try reading your FTP program's Help file. + Search for either "file permissions", or "CHMOD". If you still need help, feel free to visit the + Program O Support Forum to ask for assistance. +
++ The correct setting for the file permissions for the config file is 755. If you're unsure what this means, then have a look at + http://www.perlfect.com/articles/chmod.shtml for a good tutorial + about the CHMOD command, and what the various settings mean. For our purposes, that setting means that the config file can + only be written to by the file's "owner", while everyone can read and execute the file. If the file can't be properly written + to, then the script can't save the settings that you've set or changed, and your bot won't work correctly, so it's important + that the config file has it's permissions set correctly. +
+
$msg
-
-
| - |
- - - +0) + { + $row=mysql_fetch_array($result); + $_SESSION['poadmin']['uid']=$row['id']; + $_SESSION['poadmin']['name']=$row['uname']; + $_SESSION['poadmin']['lip']=$row['lastip']; + $_SESSION['poadmin']['llastlogin']=date('l jS \of F Y h:i:s A', strtotime($row['lastlogin'])); + + + if(!empty($_SERVER['HTTP_CLIENT_IP'])) //check ip from share internet + { + $ip=$_SERVER['HTTP_CLIENT_IP']; + } + elseif(!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) //to check ip is pass from proxy + { + $ip=$_SERVER['HTTP_X_FORWARDED_FOR']; + } + else + { + $ip=$_SERVER['REMOTE_ADDR']; + } + + $sqlupdate = "UPDATE `$dbn`.`myprogramo` SET `lastip` = '$ip', `lastlogin` = CURRENT_TIMESTAMP WHERE uname = '".$uname."' limit 1"; + //echo $sql; + mysql_query($sqlupdate,$dbconn)or die(mysql_error()); + + $_SESSION['poadmin']['ip']=$ip; + $_SESSION['poadmin']['lastlogin']=date('l jS \of F Y h:i:s A'); + } + else + { + $msg = "incorrect username/password"; + } + + mysql_close($dbconn); + + if($msg == "") + { + header("location: pages/index.php"); + } +} +elseif(isset($_GET['msg'])) +{ + $msg = htmlentities($_GET['msg']); +} +else +{ + $msg = ""; +} +?> + + + + +
$msg
+
+
| + |
+ + + diff --git a/install/install.tpl.htm b/install/install.tpl.htm new file mode 100644 index 0000000..984a42b --- /dev/null +++ b/install/install.tpl.htm @@ -0,0 +1,295 @@ + + + + +
+ Please note that all fields are required, but many are already filled out with generic, default + values. +
+
+ For more detailed information with this page, please see the Help Page, or
+ click the help icon 
for an individual field.
+
POST vars:\n\n".print_r($_POST, true)."\n\n\n"); +#die ("page = $page"); +$action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; +if (!empty($action)) $message = $action($page); +$pageTemplate = 'Container'; +$pageNotes = ucwords("Page $page Notes"); +$content = getSection('Header', $page_template, false); +$content .= getSection($pageTemplate, $page_template); +$content .= getSection('Footer', $page_template); +$content .= getSection("jQuery$page", $page_template); +$notes = getSection($pageNotes, $page_template); +$submitButton = getSection('SubmitButton', $page_template); +$main = ($page == 1) ? getSection('InstallForm',$page_template) : $message; +$tmpSearchArray = array(); +$content = str_replace('[mainPanel]', $main, $content); +$content = str_replace('[http_host]', $myHost, $content); +$content = str_replace('[notes]', $notes, $content); +$content = str_replace('[PHP_SELF]', PHP_SELF, $content); +$content = str_replace('[errorMessage]', $_SESSION['errorMessage'], $content); +$content = str_replace('[cr6]', "\n ", $content); +$content = str_replace('[cr4]', "\n ", $content); +$content = str_replace("\r\n", "\n", $content); +$content = str_replace("\n\n", "\n", $content); +$content .= <<
Executing function Save - Config file saved as config.php.test\n\n\n"); + + // Now, update the data to the database, starting with making sure the tables are installed + $sql = "show tables;"; + $conn = mysql_connect($myPostVars['dbh'], $myPostVars['dbu'], $myPostVars['dbp']) or install_error('Could not connect to the database!',mysql_error(), $sql); + $dbn = $myPostVars['dbn']; + $db = mysql_select_db($dbn,$conn) or install_error("Can't select the database $dbn!", mysql_error(), "use $dbn"); + $result = mysql_query($sql,$conn) or install_error('Unknown database error!',mysql_error(), $sql); + $out = mysql_fetch_assoc($result); + if (empty($out)) { + $sql = file_get_contents('new.sql'); + $queries = preg_split("/;/", $sql); + foreach ($queries as $query){ + if (strlen(trim($query)) > 0) { + $result = mysql_query($query,$conn) or install_error('Error creating new tables for DB!',mysql_error(), $sql); + $success = mysql_affected_rows(); + } + } + } + $sql = 'select `error_response` from `bots` where 1 limit 1'; + $result = mysql_query($sql,$conn) or upgrade($conn); + $sql = 'select `php_code` from `aiml` where 1 limit 1'; + $result = mysql_query($sql,$conn) or upgrade($conn); + // $default_pattern, $default_remember_up_to, $default_conversation_lines, $default_error_response + $sql_template = " +INSERT IGNORE INTO `bots` (`bot_id`, `bot_name`, `bot_desc`, `bot_active`, `bot_parent_id`, `format`, `use_aiml_code`, `update_aiml_code`, `save_state`, `conversation_lines`, `remember_up_to`, `debugemail`, `debugshow`, `debugmode`, `error_response`, `default_aiml_pattern`) +VALUES ([bot_id], '[bot_name]', '[bot_desc]', '[bot_active]', '[bot_parent_id]', '[format]', '[use_aiml_code]', '[update_aiml_code]', '[save_state]', +'$default_conversation_lines', '$default_remember_up_to', '[debugemail]', '[debugshow]', '[debugmode]', '$default_error_response', '$default_pattern');"; + + require_once (_LIB_PATH_ . 'error_functions.php'); + require_once (_LIB_PATH_ . 'db_functions.php'); + $bot_id = 1; + $sql = str_replace('[bot_id]', $bot_id, $sql_template); + $sql = str_replace('[bot_name]',$myPostVars["bot_name"], $sql); + $sql = str_replace('[bot_desc]',$myPostVars["bot_desc"], $sql); + $sql = str_replace('[bot_active]',$myPostVars["bot_active"], $sql); + $sql = str_replace('[bot_parent_id]',1, $sql); + $sql = str_replace('[format]',$myPostVars["default_format"], $sql); + // "Use PHP from DB setting + if (!isset($myPostVars["default_use_aiml_code"])) $myPostVars["default_use_aiml_code"] = 0; + $sql = str_replace('[use_aiml_code]',$myPostVars["default_use_aiml_code"], $sql); + // "Update PHP in DB setting + if (!isset($myPostVars["default_update_aiml_code"])) $myPostVars["default_update_aiml_code"] = 0; + $sql = str_replace('[update_aiml_code]',$myPostVars["default_update_aiml_code"], $sql); + $sql = str_replace('[save_state]',$myPostVars["default_save_state"], $sql); + $sql = str_replace('[conversation_lines]',$default_conversation_lines, $sql); + $sql = str_replace('[remember_up_to]',$default_remember_up_to, $sql); + $sql = str_replace('[debugemail]',$myPostVars["default_debugemail"], $sql); + $sql = str_replace('[debugshow]',$myPostVars["default_debugshow"], $sql); + $sql = str_replace('[debugmode]',$myPostVars["default_debugmode"], $sql); + $sql = str_replace('[error_response]',$default_error_response, $sql); + $sql = str_replace('[default_aiml_pattern]',$default_pattern, $sql); + $save = file_put_contents(_CONF_PATH_ . 'sql.txt', $sql); + $x = db_query($sql, $conn) or install_error('Could not enter bot info for bot #' . $bot_id . '!', mysql_error(), $sql); + $encrypted_adm_dbp = md5($myPostVars["adm_dbp"]); + $adm_dbu = $myPostVars["adm_dbu"]; + $cur_ip = $_SERVER['REMOTE_ADDR']; + $adminSQL = "insert ignore into `myprogramo` (`id`, `uname`, `pword`, `lastip`) values(null, '$adm_dbu', '$encrypted_adm_dbp', '$cur_ip');"; + $result = db_query($adminSQL, $conn) or install_error('Could not add admin credentials! Check line #' . __LINE__, mysql_error(), $sql); + + mysql_close($conn); + + return ($result and empty($_SESSION['errorMessage'])) ? getSection('InstallComplete', $page_template) : getSection('InstallError', $page_template); + +} + +function install_error($msg, $err, $sql) { + $errorTemplate = <<
"; - print_r($log); - echo ""; - } -} - - -/** - * function email_debug() - * Handles the debug when it is emailed to the botmaster - * @param string $email - email address - * @param string $log - the data to send -**/ -function email_debug($email,$log) -{ - $to = $email; - $subject = 'Debug Data'; - $message = $log; - $headers = 'From: '.$email . "\r\n" . - 'Reply-To: '.$email . "\r\n" . - 'X-Mailer: PHP/' . phpversion(); - - mail($to, $subject, $message, $headers); -} - - - - -/** - * function outputDebug() - * Used in the install/upgrade files will display it straightaway - * @param string $fileName - the file the error came from - * @param string $functionName - the function that triggered the error - * @param string $line - the line of code - * @param string $info - the message to display -**/ -function outputDebug($fileName, $functionName, $line, $info) { - - global $srai_iterations; - list($usec, $sec) = explode(" ",microtime()); - - //build timestamp index for the debug array - $string = ((float)$usec + (float)$sec); - $string2 = explode(".", $string); - $index = date("d-m-Y H:i:s", $string2[0]).":".$string2[1]; - - if($srai_iterations<1){ - $sr_it = 0;} - else { - $sr_it = $srai_iterations;} - - //add to array - print "
"; + print_r($log); + echo ""; + } +} + + +/** + * function email_debug() + * Handles the debug when it is emailed to the botmaster + * @param string $email - email address + * @param string $log - the data to send +**/ +function email_debug($email,$log) +{ + $to = $email; + $subject = 'Debug Data'; + $message = $log; + $headers = 'From: '.$email . "\r\n" . + 'Reply-To: '.$email . "\r\n" . + 'X-Mailer: PHP/' . phpversion(); + + mail($to, $subject, $message, $headers); +} + + + + +/** + * function outputDebug() + * Used in the install/upgrade files will display it straightaway + * @param string $fileName - the file the error came from + * @param string $functionName - the function that triggered the error + * @param string $line - the line of code + * @param string $info - the message to display +**/ +function outputDebug($fileName, $functionName, $line, $info) { + + global $srai_iterations; + list($usec, $sec) = explode(" ",microtime()); + + //build timestamp index for the debug array + $string = ((float)$usec + (float)$sec); + $string2 = explode(".", $string); + $index = date("d-m-Y H:i:s", $string2[0]).":".$string2[1]; + + if($srai_iterations<1){ + $sr_it = 0;} + else { + $sr_it = $srai_iterations;} + + //add to array + print "
Elizabeth