Continued work

Author: benkeen

files.php

@@ -1,28 +1,32 @@
 <?php
 
-require_once("../../global/library.php");
-
-use FormTools\Modules\Files;
-use FormTools\Modules\General;
 
+require_once("../../global/library.php");
 
-ft_init_module_page();
+use FormTools\Core;
+use FormTools\Modules;
+use FormTools\Themes;
+use FormTools\Modules\SystemCheck\Files;
+use FormTools\Modules\SystemCheck\General;
 
-$settings = ft_get_settings();
-$core_version = ($settings["release_type"] == "beta") ? "{$settings["program_version"]}-beta-{$settings["release_date"]}" : $settings["program_version"];
+Core::init();
+Core::$user->checkAuth("admin");
+Modules::initModulePage();
+$L = Modules::getModuleLangFile("system_check", Core::$user->getLang());
+$root_url = Core::getRootUrl();
 
 $word_testing_uc = mb_strtoupper($L["word_untested"]);
 $word_passed_uc  = mb_strtoupper($L["word_passed"]);
 $word_failed_uc  = mb_strtoupper($L["word_failed"]);
-$notify_file_verification_complete_problems = ft_sanitize($L["notify_file_verification_complete_problems"]);
+$notify_file_verification_complete_problems = addcslashes($L["notify_file_verification_complete_problems"], '"');
 
 $page_vars = array();
-$page_vars["core_version"] = $core_version;
+$page_vars["core_version"] = Core::getVersionString();
 $page_vars["module_list"] = General::getCompatibleModules("files");
 $page_vars["theme_list"] = Files::getCompatibleThemes();
 $page_vars["head_string"] =<<< EOF
-<script src="{$g_root_url}/modules/system_check/global/scripts/tests.js"></script>
-<link type="text/css" rel="stylesheet" href="{$g_root_url}/modules/system_check/global/css/styles.css">
+<script src="{$root_url}/modules/system_check/global/scripts/tests.js"></script>
+<link type="text/css" rel="stylesheet" href="{$root_url}/modules/system_check/global/css/styles.css">
 <script>
 g.messages = [];
 g.messages["word_testing_c"] = "{$L["word_testing_c"]}";
@@ -39,8 +43,8 @@
 g.messages["validation_no_components_selected"] = "{$L["validation_no_components_selected"]}";
 g.messages["notify_file_verification_complete_problems"] = "$notify_file_verification_complete_problems";
 var loading = new Image();
-loading.src = "$g_root_url/modules/system_check/images/loading.gif";
+loading.src = "$root_url/modules/system_check/images/loading.gif";
 </script>
 EOF;
 
-ft_display_module_page("templates/files.tpl", $page_vars);
+Themes::displayModulePage("templates/files.tpl", $page_vars);

index.php

@@ -1,11 +1,20 @@
 <?php
 
 require_once("../../global/library.php");
-ft_init_module_page();
+
+use FormTools\Core;
+use FormTools\Modules;
+use FormTools\Themes;
+
+Core::init();
+Core::$user->checkAuth("admin");
+Modules::initModulePage();
+
+$root_url = Core::getRootUrl();
 
 $page_vars = array();
 $page_vars["head_string"] =<<< END
-<link type="text/css" rel="stylesheet" href="{$g_root_url}/modules/system_check/global/css/styles.css?v=2">
+<link type="text/css" rel="stylesheet" href="{$root_url}/modules/system_check/global/css/styles.css?v=2">
 END;
 
-ft_display_module_page("templates/index.tpl", $page_vars);
+Themes::displayModulePage("templates/index.tpl", $page_vars);

lang/en_us.php

@@ -41,8 +41,6 @@
 $L["phrase_suhosin_extension"] = "Suhosin Extension";
 $L["phrase_curl_extension"] = "Curl Extension";
 $L["phrase_simplexml_extension"] = "SimpleXML Extension";
-$L["phrase_ft3_compatibility"] = "FT3 compatibility";
-$L["phrase_formtools3_compatibility"] = "Form Tools 3 compatibility";
 
 $L["text_tables_test"] = "The following tables will be tested to confirm they exist, and that the column information is valid.";
 $L["text_module_intro"] = "This module lets you run tests on your Form Tools installation to look for potential problems. Choose one of the tests below.";

module.php

@@ -10,13 +10,13 @@
 $MODULE["version"]         = "2.0.0";
 $MODULE["date"]            = "2017-06-04";
 $MODULE["origin_language"] = "en_us";
+$MODULE["namespace"]       = "SystemCheck";
 
 // define the module navigation - the keys are keys defined in the language file. This lets
 // the navigation - like everything else - be customized to the users language. The paths are always built
 // relative to the module's root, so help/index.php means: /[form tools root]/modules/export_manager/help/index.php
 $MODULE["nav"] = array(
   "module_name"                   => array('{$module_dir}/index.php', false),
-  "phrase_ft3_compatibility"      => array('{$module_dir}/ft3.php', true),
   "phrase_file_verification"      => array('{$module_dir}/files.php', true),
   "phrase_table_verification"     => array('{$module_dir}/tables.php', true),
   "phrase_hook_verification"      => array('{$module_dir}/hooks.php', true),

templates/ft3.tpl

@@ -20,10 +20,6 @@
   <hr size="1" />
 
   <table cellspacing="0" class="index_link_table">
-  <tr>
-      <td valign="top" width="160"><a href="ft3.php">{$L.phrase_formtools3_compatibility}</a></td>
-      <td>{$L.text_ft3_compatibility}</td>
-  </tr>
   <tr>
     <td valign="top" width="160"><a href="files.php">{$L.phrase_file_verification}</a></td>
     <td>{$L.text_file_check} {$L.text_problems_identified_not_fixed}</td>