Buf Gixes (something different for a change)

Fixed the following bugs:

1.) If the install script encountered certain errors, only the message
"Installation Failed!" was displayed.
2.) Some entries in the debug array were being overwritten by later
entries that had the same generated index.
3.) In the function parse_condition_tag(), mixed content AIML wasn't
being parsed.

Author: Dave-Morton

admin/default.page.htm

@@ -720,7 +720,7 @@ <h3>Help...</h3>
             <tr>
               <td>
                   <label for="aimlfile">File:</label>
-                  <input type="file" id="aimlfile" name="aimlfile" />&nbsp; &nbsp;
+                  <input type="file" id="aimlfile" name="aimlfile" onchange="checkSize();" />&nbsp; &nbsp;
               </td>
               <td>
                   <input type="checkbox" id="clearDB" name="clearDB" />&nbsp; &nbsp;

admin/upload.php

@@ -44,6 +44,29 @@ function showHide() {
             alert('display = ' + display);
         }
       }
+      function checkSize(){
+        var file_upload = document.getElementById('aimlfile');
+        if (!file_upload.files) return false;
+        var fileSize = file_upload.files[0].size;//.fileSize;
+        var fileName = file_upload.files[0].name;//.fileSize;
+        if (fileSize > 2000000){
+          showError("The file " + fileName + " exceeds the file size limit of 2MB. Please choose a different file.")
+          file_upload.value = null;
+        }
+        var fileType = file_upload.files[0].type;//.fileSize;
+        //showError('The file type is ' + file_upload.files[0].type);
+        if (fileType != 'text/aiml' && fileType != 'application/x-zip-compressed') {
+          //showError("The file " + fileName + " is neither an AIML file, nor a zip archive. Please select another file.")
+          //file_upload.value = null;
+        }
+      }
+      function showError(msg){
+        var errorDiv = document.getElementById("errMsg");
+        var closeButton = '<div class="closeButton" id="closeButton" onclick="closeStatus(\'errMsg\')" title="Click to hide">&nbsp;</div>';
+          errorDiv.innerHTML = closeButton + msg;
+          errorDiv.style.display = 'block';
+
+      }
 //-->
     </script>
 endScript;
@@ -208,10 +231,10 @@ function parseAIML($fn,$aimlContent, $from_zip = false)
     catch (Exception $e)
     {
       $trace = print_r($e->getTrace(), true);
-      file_put_contents(_LOG_PATH_ . 'error.trace.log', $trace . "\nEnd Trace\n\n", FILE_APPEND);
+      //file_put_contents(_LOG_PATH_ . 'error.trace.log', $trace . "\nEnd Trace\n\n", FILE_APPEND);
       $success = false;
       $_SESSION['failCount']++;
-      $msg = "There was a problem adding file $fileName to the database. Please refer to the message below to correct the problem and try again.";
+      $msg = "There was a problem adding file $fileName to the database. Please refer to the message below to correct the problem and try again.<br>\n" . $e->getMessage();
       $msg = libxml_display_errors($msg);
     }
     return $msg;
@@ -362,6 +385,9 @@ function processZip($fileName)
         if(!$fp)
         {
           $out .= "Processing for $curName failed.<br />\n";
+          $bad_aiml_files = (!isset($bad_aiml_files)) ? array() : $bad_aiml_files;
+          $bad_aiml_files[] = $curName;
+          $_SESSION['bad_aiml_files'] = $curName;
         }
         else
         {
@@ -378,6 +404,16 @@ function processZip($fileName)
       $zip->close();
       $failCount = $_SESSION['failCount'];
       $out .= "<br />\nUpload complete. $numFiles files were processed, and $failCount files encountered errors.<br />\n";
+      if (isset($_SESSION['bad_aiml_files']))
+      {
+        $out .= "<br />\nThe following AIML files encountered errors:<br />\n";
+        foreach ($_SESSION['bad_aiml_files'] as $fn)
+        {
+          $out .= "$fn, ";
+        }
+        $out = rtrim($out, ', ') . "<br .>\nPlease test each of these files independently, to locate the errors within.";
+        unset($_SESSION['bad_aiml_files']);
+      }
     }
     else
     {

chatbot/addons/word_censor/word_censor.php

@@ -19,7 +19,7 @@
   **/
   function run_censor($convoArr)
   {
-    if (!isset ($_SESSION['programo_bigArray']['censor']))
+    if (!isset ($_SESSION['pgo_word_censor']))
     {
       initialise_censor($convoArr['conversation']['bot_id']);
     }
@@ -30,7 +30,6 @@ function run_censor($convoArr)
   /**
   * function intialise_censor()
   * A function to build session array containing the words from the censor list in the db
-
   **/
   function initialise_censor($bot_id)
   {
@@ -39,7 +38,10 @@ function initialise_censor($bot_id)
     $result = db_query($sql, $con);
     while ($row = mysql_fetch_assoc($result))
     {
-      $_SESSION['programo_bigArray']['censor'][base64_encode("/\b" . $row['word_to_censor'] . "\b/i")] = base64_encode("/\b" . $row['replace_with'] . "\b/i");
+      $index = "/\b{$row['word_to_censor']}\b/i";
+      $index = $row['word_to_censor'];
+      $value = $row['replace_with'];
+      $_SESSION['pgo_word_censor'][$index] = $value;
     }
     mysql_free_result($result);
   }
@@ -52,9 +54,9 @@ function initialise_censor($bot_id)
   **/
   function censor_words($output)
   {
-    foreach ($_SESSION['programo_bigArray']['censor'] as $find => $replace)
+    foreach ($_SESSION['pgo_word_censor'] as $find => $replace)
     {
-      $output = preg_replace(base64_decode($find), base64_decode($replace), $output);
+      $output = preg_replace("/\b$find\b/i", $replace, $output);
     }
     return $output;
   }

chatbot/core/aiml/parse_aiml_as_XML.php

@@ -528,7 +528,7 @@ function parse_condition_tag($convoArr, $element, $parentName, $level)
       runDebug(__FILE__, __FUNCTION__, __LINE__, "search string = $path", 4);
       $choice = $element->xpath($path);
       $pick = $choice[0];
-      runDebug(__FILE__, __FUNCTION__, __LINE__, 'Found a match. Pick = ' . print_r($choice, true), 4);
+      runDebug(__FILE__, __FUNCTION__, __LINE__, 'Found a match. Pick = ' . print_r($pick, true), 4);
     }
     else // nothing matches
     {
@@ -538,7 +538,11 @@ function parse_condition_tag($convoArr, $element, $parentName, $level)
     $children = (is_object($pick)) ? $pick->children() : null;
     if (!empty ($children))
     {
-      $response = parseTemplateRecursive($convoArr, $children, $level + 1);
+      foreach ($children as $child)
+      {
+        $response[] = parseTemplateRecursive($convoArr, $child, $level + 1);
+      }
+      runDebug(__FILE__, __FUNCTION__, __LINE__, "Response = " . print_r($response, true), 4);
     }
     else
     {

install/install_programo.php

@@ -167,7 +167,7 @@ function Save()
     }
     else
       $out = getSection('InstallError', $page_template);
-    return $out;
+    return $out . $_SESSION['errorMessage'];
   }
 
   function install_error($msg, $err, $sql)

library/error_functions.php

@@ -93,8 +93,16 @@ function runDebug($fileName, $functionName, $line, $info, $level = 0)
         outputDebug($fileName, $functionName, $line, $info);
       }
       list($usec, $sec) = explode(' ', microtime());
+      $usecD = $usec / 1000;
+      $usecD = str_replace('0.000', '', $usecD);
       //build timestamp index for the debug array
-      $index = date('d-m-Y H:i:s') . ltrim($usec, '0') . "[$level][$debug_level] - Elapsed: $elapsed_time milliseconds";
+      $index = date('d-m-Y H:i:s.') . $usecD . "[$level][$debug_level] - Elapsed: $elapsed_time milliseconds";
+
+      //If there's already an index in the debug array with the same value, just add a space, to make a new, unique index that is visually identical.
+      while (array_key_exists($index, $debugArr))
+      {
+        $index .= ' ';
+      }
       //mem_tracer($fileName, $functionName, $line); # only uncomment this to trace memory leaks!
       //add to array
       $debugArr[$index]['fileName'] = basename($fileName);