Skip to content

Commit 6763d53

Browse files
benkeenbenkeen
committed
a few more updates
1 parent a560bea commit 6763d53

9 files changed

Lines changed: 105 additions & 81 deletions

File tree

‎env.php‎

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,46 @@
11
<?php
22

33
require_once("../../global/library.php");
4-
ft_init_module_page();
54

6-
$page = ft_load_module_field("system_check", "page", "page", "summary");
5+
use FormTools\Core;
6+
use FormTools\General;
7+
use FormTools\Modules;
8+
9+
Core::init();
10+
Core::$user->checkAuth("admin");
11+
Modules::initModulePage();
12+
$L = Modules::getModuleLangFile("system_check", Core::$user->getLang());
13+
14+
$page = Modules::loadModuleField("system_check", "page", "page", "summary");
715

816
$page_vars = array();
917

10-
$same_page = ft_get_clean_php_self();
18+
$same_page = General::getCleanPhpSelf();
1119
$tabs = array(
12-
"summary" => array(
13-
"tab_label" => $L["word_summary"],
14-
"tab_link" => "{$same_page}?page=summary",
15-
"pages" => array("summary")
16-
),
17-
"phpinfo" => array(
18-
"tab_label" => "phpinfo",
19-
"tab_link" => "{$same_page}?page=phpinfo",
20-
"pages" => array("phpinfo")
21-
)
20+
"summary" => array(
21+
"tab_label" => $L["word_summary"],
22+
"tab_link" => "{$same_page}?page=summary",
23+
"pages" => array("summary")
24+
),
25+
"phpinfo" => array(
26+
"tab_label" => "phpinfo",
27+
"tab_link" => "{$same_page}?page=phpinfo",
28+
"pages" => array("phpinfo")
29+
)
2230
);
2331

24-
2532
$page_vars["page"] = $page;
2633
$page_vars["tabs"] = $tabs;
2734

2835
switch ($page)
2936
{
30-
case "summary":
31-
require_once("env_tab_summary.php");
32-
break;
33-
case "phpinfo":
34-
require_once("env_tab_phpinfo.php");
35-
break;
36-
default:
37-
require_once("env_tab_summary.php");
38-
break;
39-
}
37+
case "summary":
38+
require_once("env_tab_summary.php");
39+
break;
40+
case "phpinfo":
41+
require_once("env_tab_phpinfo.php");
42+
break;
43+
default:
44+
require_once("env_tab_summary.php");
45+
break;
46+
}

‎env_tab_phpinfo.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22

3-
require_once("../../global/library.php");
4-
ft_init_module_page();
3+
use FormTools\Themes;
54

6-
7-
ft_display_module_page("templates/env.tpl", $page_vars);
5+
Themes::displayModulePage("templates/env.tpl", $page_vars);

‎env_tab_summary.php‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,36 @@
11
<?php
22

3-
$settings = ft_get_settings();
3+
use FormTools\Modules;
4+
use FormTools\Settings;
5+
use FormTools\Themes;
6+
7+
$settings = Settings::get();
48

59
$php_version = PHP_VERSION;
6-
$mysql_version = mysql_get_server_info();
10+
$mysql_version = ""; // mysql_get_server_info(); TODO
711
$suhosin_installed = (extension_loaded("suhosin")) ? $L["word_installed"] : $L["phrase_not_installed"];
812
$sessions_available = (extension_loaded("session")) ? $L["word_available"] : $L["phrase_not_available"];
913
$curl_available = (extension_loaded("curl")) ? $L["word_available"] : $L["phrase_not_available"];
1014
$simplexml_available = (extension_loaded("simpleXML")) ? $L["word_available"] : $L["phrase_not_available"];
1115

1216
$page_vars["env_info"] = array(
13-
"php_version" => $php_version,
14-
"mysql_version" => $mysql_version,
15-
"suhosin_installed" => $suhosin_installed,
16-
"sessions_available" => $sessions_available,
17-
"curl_available" => $curl_available,
18-
"simpleXML_available" => $simplexml_available
17+
"php_version" => $php_version,
18+
"mysql_version" => $mysql_version,
19+
"suhosin_installed" => $suhosin_installed,
20+
"sessions_available" => $sessions_available,
21+
"curl_available" => $curl_available,
22+
"simpleXML_available" => $simplexml_available
1923
);
2024

21-
$modules = ft_get_modules();
2225
$module_list = array();
23-
foreach ($modules as $module_info)
24-
{
26+
foreach (Modules::getList() as $module_info) {
2527
$is_enabled = ucwords($module_info["is_enabled"]);
2628
$module_list[] = "{$module_info["module_name"]}, {$module_info["version"]}, $is_enabled";
2729
}
2830
$module_list_str = implode("\n", $module_list);
2931

30-
$themes = ft_get_themes();
31-
foreach ($themes as $theme_info)
32-
{
32+
$theme_list = array();
33+
foreach (Themes::getList() as $theme_info) {
3334
$is_enabled = ucwords($theme_info["is_enabled"]);
3435
$theme_list[] = "{$theme_info["theme_name"]}, {$theme_info["theme_version"]}, $is_enabled";
3536
}
@@ -56,4 +57,4 @@
5657

5758
$page_vars["report_card"] = $report_card;
5859

59-
ft_display_module_page("templates/env.tpl", $page_vars);
60+
Themes::displayModulePage("templates/env.tpl", $page_vars);

‎files.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php
22

3-
43
require_once("../../global/library.php");
54

65
use FormTools\Core;

‎global/code/Orphans.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ function sc_find_table_orphans($table_name, $remove_orphans)
136136
}
137137

138138

139-
function sc_clean_orphans()
139+
public static function cleanOrphans()
140140
{
141141
global $g_root_dir;
142142

‎help.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<?php
22

33
require_once("../../global/library.php");
4-
ft_init_module_page();
54

6-
$page_vars = array();
7-
ft_display_module_page("templates/help.tpl", $page_vars);
5+
use FormTools\Core;
6+
use FormTools\Modules;
7+
use FormTools\Themes;
8+
9+
Core::init();
10+
Core::$user->checkAuth("admin");
11+
Modules::initModulePage();
12+
13+
Themes::displayModulePage("templates/help.tpl", array());

‎hooks.php‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@
22

33
require_once("../../global/library.php");
44

5+
use FormTools\Core;
6+
use FormTools\Modules;
7+
use FormTools\Themes;
58
use FormTools\Modules\SystemCheck\General;
69
use FormTools\Modules\SystemCheck\Hooks;
710

8-
9-
ft_init_module_page();
11+
Core::init();
12+
Core::$user->checkAuth("admin");
13+
Modules::initModulePage();
14+
$L = Modules::getModuleLangFile("system_check", Core::$user->getLang());
15+
$root_url = Core::getRootUrl();
1016

1117
if (isset($_GET["repair"])) {
1218
$module_ids = explode(",", $_GET["repair"]);
@@ -20,15 +26,14 @@
2026
$word_testing_uc = mb_strtoupper($L["word_untested"]);
2127
$word_passed_uc = mb_strtoupper($L["word_passed"]);
2228
$word_failed_uc = mb_strtoupper($L["word_failed"]);
23-
$notify_hook_verification_complete_problems = ft_sanitize($L["notify_hook_verification_complete_problems"]);
29+
$notify_hook_verification_complete_problems = addcslashes($L["notify_hook_verification_complete_problems"], '"');
2430

2531
$page_vars = array();
2632
$page_vars["module_list"] = General::getCompatibleModules("hooks");
27-
//print_r($page_vars["module_list"]);
2833

2934
$page_vars["head_string"] =<<< EOF
30-
<script src="{$g_root_url}/modules/system_check/global/scripts/tests.js"></script>
31-
<link type="text/css" rel="stylesheet" href="{$g_root_url}/modules/system_check/global/css/styles.css">
35+
<script src="{$root_url}/modules/system_check/global/scripts/tests.js"></script>
36+
<link type="text/css" rel="stylesheet" href="{$root_url}/modules/system_check/global/css/styles.css">
3237
<script>
3338
g.messages = [];
3439
g.messages["word_testing_c"] = "{$L["word_testing_c"]}";
@@ -46,7 +51,7 @@
4651
g.messages["notify_hook_verification_complete_problems"] = "$notify_hook_verification_complete_problems";
4752
4853
var loading = new Image();
49-
loading.src = "$g_root_url/modules/system_check/images/loading.gif";
54+
loading.src = "$root_url/modules/system_check/images/loading.gif";
5055
$(function() {
5156
$("#repair_hooks").live("click", function() {
5257
window.location = "hooks.php?repair=" + sc_ns.hook_verification_failed_module_ids.toString();
@@ -55,4 +60,4 @@
5560
</script>
5661
EOF;
5762

58-
ft_display_module_page("templates/hooks.tpl", $page_vars);
63+
Themes::displayModulePage("templates/hooks.tpl", $page_vars);

‎orphans.php‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,33 @@
22

33
require_once("../../global/library.php");
44

5-
use FormTools\Modules\General;
6-
7-
8-
ft_init_module_page();
9-
10-
if (isset($_GET["clean"]))
11-
{
12-
list($g_success, $g_message) = sc_clean_orphans();
5+
use FormTools\Core;
6+
use FormTools\Modules;
7+
use FormTools\Themes;
8+
use FormTools\Modules\SystemCheck\General;
9+
use FormTools\Modules\SystemCheck\Orphans;
10+
11+
Core::init();
12+
Core::$user->checkAuth("admin");
13+
Modules::initModulePage();
14+
$L = Modules::getModuleLangFile("system_check", Core::$user->getLang());
15+
$root_url = Core::getRootUrl();
16+
17+
if (isset($_GET["clean"])) {
18+
list($g_success, $g_message) = Orphans::cleanOrphans();
1319
}
1420

1521
$word_testing_uc = mb_strtoupper($L["word_untested"]);
1622
$word_passed_uc = mb_strtoupper($L["word_passed"]);
1723
$word_failed_uc = mb_strtoupper($L["word_failed"]);
18-
$notify_hook_verification_complete_problems = ft_sanitize($L["notify_hook_verification_complete_problems"]);
24+
$notify_hook_verification_complete_problems = addcslashes($L["notify_hook_verification_complete_problems"], '"');
1925

2026
$page_vars = array();
2127
$page_vars["module_list"] = General::getCompatibleModules("hooks");
2228

2329
$page_vars["head_string"] =<<< EOF
24-
<script src="{$g_root_url}/modules/system_check/global/scripts/tests.js"></script>
25-
<link type="text/css" rel="stylesheet" href="{$g_root_url}/modules/system_check/global/css/styles.css">
30+
<script src="{$root_url}/modules/system_check/global/scripts/tests.js"></script>
31+
<link type="text/css" rel="stylesheet" href="{$root_url}/modules/system_check/global/css/styles.css">
2632
<script>
2733
g.messages = [];
2834
g.messages["word_testing_c"] = "{$L["word_testing_c"]}";
@@ -40,7 +46,7 @@
4046
g.messages["notify_hook_verification_complete_problems"] = "$notify_hook_verification_complete_problems";
4147
4248
var loading = new Image();
43-
loading.src = "$g_root_url/modules/system_check/images/loading.gif";
49+
loading.src = "$root_url/modules/system_check/images/loading.gif";
4450
$(function() {
4551
$("#repair_hooks").live("click", function() {
4652
window.location = "hooks.php?repair=" + sc_ns.hook_verification_failed_module_ids.toString();
@@ -49,4 +55,4 @@
4955
</script>
5056
EOF;
5157

52-
ft_display_module_page("templates/orphans.tpl", $page_vars);
58+
Themes::displayModulePage("templates/orphans.tpl", $page_vars);

‎tables.php‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22

33
require_once("../../global/library.php");
44

5-
use FormTools\Settings;
6-
use FormTools\Modules\General;
5+
use FormTools\Core;
6+
use FormTools\Modules;
7+
use FormTools\Themes;
8+
use FormTools\Modules\SystemCheck\General;
79

8-
ft_init_module_page();
10+
Core::init();
11+
Core::$user->checkAuth("admin");
12+
Modules::initModulePage();
13+
$L = Modules::getModuleLangFile("system_check", Core::$user->getLang());
914

10-
// ------------------------------------------------------------------------------------------------
11-
12-
$settings = Settings::get();
13-
$core_version = ($settings["release_type"] == "beta") ? "{$settings["program_version"]}-beta-{$settings["release_date"]}" : $settings["program_version"];
15+
$root_url = Core::getRootUrl();
1416

1517
// ---------------------------------------
1618
// *** example for generating config file for a module. Make sure you omit the table prefixes! ***
@@ -67,10 +69,10 @@
6769

6870
$page_vars = array();
6971
$page_vars["module_list"] = General::getCompatibleModules("tables");
70-
$page_vars["core_version"] = $core_version;
72+
$page_vars["core_version"] = Core::getVersionString();
7173
$page_vars["head_string"] =<<< EOF
72-
<script src="{$g_root_url}/modules/system_check/global/scripts/tests.js"></script>
73-
<link type="text/css" rel="stylesheet" href="{$g_root_url}/modules/system_check/global/css/styles.css">
74+
<script src="{$root_url}/modules/system_check/global/scripts/tests.js"></script>
75+
<link type="text/css" rel="stylesheet" href="{$root_url}/modules/system_check/global/css/styles.css">
7476
<script>
7577
g.messages = [];
7678
g.messages["word_testing_c"] = "{$L["word_testing_c"]}";
@@ -87,8 +89,8 @@
8789
g.messages["validation_no_components_selected"] = "{$L["validation_no_components_selected"]}";
8890
8991
var loading = new Image();
90-
loading.src = "$g_root_url/modules/system_check/images/loading.gif";
92+
loading.src = "$root_url/modules/system_check/images/loading.gif";
9193
</script>
9294
EOF;
9395

94-
ft_display_module_page("templates/tables.tpl", $page_vars);
96+
Themes::displayModulePage("templates/tables.tpl", $page_vars);

0 commit comments

Comments
 (0)