Create site word list dir if it doesn't exist

pinc/wordcheck_engine.inc

@@ -841,6 +841,17 @@ function get_project_word_file($projectid, $code)
     );
 }
 
+/**
+ * Get paths to the site good and bad word dir/url.
+ *
+ * @return string[]
+ */
+function get_site_word_paths()
+{
+    global $dyn_dir, $dyn_url;
+    return ["$dyn_dir/words", "$dyn_url/words"];
+}
+
 /**
  * Get a file info object for a site word list
  *
@@ -851,7 +862,7 @@ function get_project_word_file($projectid, $code)
  */
 function get_site_word_file($langcode3, $code)
 {
-    global $dyn_dir, $dyn_url;
+    [$site_words_dir, $site_words_url] = get_site_word_paths();
 
     $filename_for_code = [
         'good' => "good_words.$langcode3.txt",
@@ -862,8 +873,8 @@ function get_site_word_file($langcode3, $code)
 
     return get_file_info_object(
         $filename_for_code[$code],
-        "$dyn_dir/words",
-        "$dyn_url/words"
+        $site_words_dir,
+        $site_words_url
     );
 }
 
@@ -1066,49 +1077,37 @@ function get_site_possible_bad_word_lists(): array
 /**
  * Get site word files that match a pattern
  *
- * Returns an associative array of words ifiles in the site's words
- * with their corresponding URL.
+ * Returns an associative array of word files in the site's word list
+ * dir with their corresponding URL.
  *
  * Note: 'empty' files (2 bytes in size or smaller) are not returned
  * regardless of the pattern specified
  *
  * @param string $pattern
  *   Regex that files must match to be included in the returned array.
  *   If blank all files will be returned.
- * @param bool $urlbase
- *   If TRUE files will be turned as a URL,
- *   If FALSE absolute filesystem paths are returned
  *
  * @return array<string, string>
  */
-function get_site_word_files(string $pattern = "", bool $urlbase = true): array
+function get_site_word_files(string $pattern = "/txt$/"): array
 {
-    global $dyn_dir;
-    global $dyn_url;
-
-    if ($urlbase) {
-        $base = $dyn_url;
-    } else {
-        $base = $dyn_dir;
-    }
+    [$site_words_dir, $site_words_url] = get_site_word_paths();
 
     $wordLists = [];
-
-    $wordsDir = "$dyn_dir/words";
-    if (is_dir($wordsDir)) {
-        foreach (scandir($wordsDir) as $filename) {
+    if (is_dir($site_words_dir)) {
+        foreach (scandir($site_words_dir) as $filename) {
             // skip files that don't match the pattern
             if (!empty($pattern) && !preg_match($pattern, $filename)) {
                 continue;
             }
 
             // skip files that are only two bytes or smaller
             // as these usually contain just \r and/or \n
-            if (filesize("$wordsDir/$filename") <= 2) {
+            if (filesize("$site_words_dir/$filename") <= 2) {
                 continue;
             }
 
-            $wordLists["$wordsDir/$filename"] = "$base/words/$filename";
+            $wordLists["$site_words_dir/$filename"] = "$site_words_url/$filename";
         }
     }
 

tools/site_admin/manage_site_word_lists.php

@@ -77,7 +77,7 @@
     echo "<th>" . _("Number of Words") . "</th>";
     echo "</tr>";
 
-    $site_lists = get_site_word_files("/txt$/");
+    $site_lists = get_site_word_files();
     asort($site_lists);
     foreach ($site_lists as $full_filename => $url) {
         $filename = basename($full_filename);
@@ -216,6 +216,13 @@ function _handle_action($action, $list_type, $language, $word_string)
 
         case "saveconfirmed":
             // save the list if requested
+
+            // if the $site_words_dir doesn't exist already, create it
+            [$site_words_dir, $site_words_url] = get_site_word_paths();
+            if (!is_dir($site_words_dir) && !mkdir($site_words_dir)) {
+                throw new RuntimeException(sprintf(_("Unable to create site word list dir %s"), $site_words_dir));
+            }
+
             $fileObject = get_site_word_file($langcode3, $list_type);
             $words = explode("\n", $word_string);
             save_word_list($fileObject->abs_path, $words);