Skip to content

Commit fd3c367

Browse files
benkeenbenkeen
committed
continued work
1 parent acb216c commit fd3c367

16 files changed

+130
-97
lines changed

‎admin/settings.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
"g_success" => $success,
1919
"g_message" => $message,
2020
"head_title" => $L["module_name"],
21-
"module_settings" => $module->getSettings(),
22-
"head_js" => ""
21+
"module_settings" => $module->getSettings()
2322
);
2423

2524
$module->displayPage("templates/admin/settings.tpl", $page_vars);

‎admin/tab_html.php‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
22

3+
use FormTools\Core;
34
use FormTools\General;
45
use FormTools\Modules\SubmissionAccounts\Admin;
56

7+
$root_url = Core::getRootUrl();
68
$submission_account = Admin::getSubmissionAccount($form_id);
79

810
$login_url = "../login.php?form_id=$form_id";
@@ -16,14 +18,26 @@
1618
"tabs" => $tabs,
1719
"page" => $page,
1820
"js_files" => array(
19-
"global/scripts/generate_custom_login_form.js",
20-
"global/codemirror/js/codemirror.js"
21+
"$root_url/modules/submission_accounts/scripts/generate_custom_login_form.js",
22+
"$root_url/global/codemirror/lib/codemirror.js",
23+
"$root_url/global/codemirror/mode/xml/xml.js",
24+
"$root_url/global/codemirror/mode/smarty/smarty.js",
25+
"$root_url/global/codemirror/mode/php/php.js",
26+
"$root_url/global/codemirror/mode/htmlmixed/htmlmixed.js",
27+
"$root_url/global/codemirror/mode/css/css.js",
28+
"$root_url/global/codemirror/mode/javascript/javascript.js",
29+
"$root_url/global/codemirror/mode/clike/clike.js"
30+
),
31+
"css_files" => array(
32+
"$root_url/global/codemirror/lib/codemirror.css"
2133
)
2234
);
2335

2436
$page_vars["head_js"] = <<< END
2537
$(function() {
26-
setTimeout(function() { lf_ns.generate(); }, 200);
38+
setTimeout(function() {
39+
lf_ns.generate();
40+
}, 200);
2741
});
2842
END;
2943

‎admin/tab_main.php‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,35 @@
11
<?php
22

3+
use FormTools\Core;
4+
use FormTools\Fields;
5+
use FormTools\Modules\SubmissionAccounts\Admin;
6+
7+
$root_url = Core::getRootUrl();
8+
9+
$success = true;
10+
$message = "";
311
if (isset($request["update"])) {
412
$request["tab"] = "main";
5-
list ($g_success, $g_message) = sa_update_submission_account($form_id, $request);
13+
list ($success, $message) = Admin::updateSubmissionAccount($form_id, $request, $L);
614
}
715

816
// get a list of forms that already have a submission account configured. These are omitted from the
917
// list of available forms
10-
$submission_accounts = sa_get_submission_accounts();
18+
$submission_accounts = Admin::getSubmissionAccounts();
1119
$omit_forms = array();
1220
foreach ($submission_accounts as $configured_form) {
1321
if ($configured_form["form_id"] != $form_id) {
1422
$omit_forms[] = $configured_form["form_id"];
1523
}
1624
}
1725

18-
$js = sa_get_form_view_mapping_js();
19-
$submission_account = sa_get_submission_account($form_id);
20-
$form_fields = ft_get_form_fields($form_id);
26+
$js = Admin::getFormViewMappingJs();
27+
$submission_account = Admin::getSubmissionAccount($form_id);
28+
$form_fields = Fields::getFormFields($form_id);
2129

2230
$page_vars = array(
31+
"g_success" => $success,
32+
"g_message" => $message,
2333
"submission_account" => $submission_account,
2434
"omit_forms" => $omit_forms,
2535
"form_id" => $form_id,
@@ -28,6 +38,9 @@
2838
"form_fields" => $form_fields,
2939
"js_messages" => array(
3040
"phrase_please_select", "phrase_please_select_form", "word_delete"
41+
),
42+
"js_files" => array(
43+
"{$root_url}/modules/submission_accounts/scripts/manage_submission_account.js"
3144
)
3245
);
3346

‎admin/tab_menu.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"form_fields" => $form_fields,
2828
"js_messages" => array("phrase_please_select", "phrase_please_select_form", "word_na", "word_remove"),
2929
"js_files" => array(
30-
"$root_url/global/scripts/manage_user_menu.js",
30+
"$root_url/modules/submission_accounts/scripts/manage_user_menu.js",
3131
"$root_url/global/scripts/sortable.js"
3232
)
3333
);

‎admin/tab_users.php‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,27 @@
77

88
$submission_account = Admin::getSubmissionAccount($form_id);
99
$module_settings = $module->getSettings();
10+
$L = $module->getLangStrings();
1011

11-
if (isset($request["clear_results"]))
12-
list ($g_success, $g_message) = Admin::deleteSubmissionAccountData($form_id, $L);
13-
12+
$success = true;
13+
$message = "";
14+
if (isset($request["clear_results"])) {
15+
list ($success, $message) = Admin::deleteSubmissionAccountData($form_id, $L);
16+
}
1417

1518
// get the db column name which contains the username
1619
$field_info = Fields::getFormField($submission_account["username_field_id"]);
1720
$username_col = $field_info["col_name"];
1821

1922
$users_page = Modules::loadModuleField("submission_accounts", "users_page", "users_page", 1);
20-
$account_data = Admin::getSubmissionAccountData($form_id, $users_page, $username_col);
23+
$account_data = Admin::getSubmissionAccountData($form_id, $users_page, $username_col, $L);
2124

2225
$num_results = $account_data["num_results"];
23-
$results = $account_data["results"];
26+
$results = $account_data["results"];
2427

2528
$page_vars = array(
29+
"g_success" => $success,
30+
"g_message" => $message,
2631
"submission_account" => $submission_account,
2732
"form_id" => $form_id,
2833
"tabs" => $tabs,
@@ -33,7 +38,8 @@
3338
"username_col" => $username_col,
3439
"module_settings" => $module_settings,
3540
"js_messages" => array(
36-
"phrase_please_select", "phrase_please_select_form"
41+
"phrase_please_select",
42+
"phrase_please_select_form"
3743
)
3844
);
3945

‎code/Admin.class.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,16 @@ public static function addSubmissionAccount($info, $L)
7373

7474
// finally, add a couple of default menu items
7575
$db->query("
76-
INSERT INTO {PREFIX}module_submission_accounts_menus (form_id, display_text, url, page_identifier, is_submenu, list_order)
77-
VALUES (:form_id, 'Edit Submission', '/modules/submission_accounts/users/index.php', 'edit_submission', 'no', 1)
78-
");
76+
INSERT INTO {PREFIX}module_submission_accounts_menus (form_id, display_text, url, page_identifier, is_submenu, list_order)
77+
VALUES (:form_id, 'Edit Submission', '/modules/submission_accounts/users/index.php', 'edit_submission', 'no', 1)
78+
");
7979
$db->bind("form_id", $form_id);
8080
$db->execute();
8181

8282
$db->query("
83-
INSERT INTO {PREFIX}module_submission_accounts_menus (form_id, display_text, url, page_identifier, is_submenu, list_order)
84-
VALUES (:form_id, 'Logout', '/modules/submission_accounts/logout.php', 'logout', 'no', 2)
85-
");
83+
INSERT INTO {PREFIX}module_submission_accounts_menus (form_id, display_text, url, page_identifier, is_submenu, list_order)
84+
VALUES (:form_id, 'Logout', '/modules/submission_accounts/logout.php', 'logout', 'no', 2)
85+
");
8686
$db->bind("form_id", $form_id);
8787
$db->execute();
8888

‎code/Module.class.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ class Module extends FormToolsModule
1919
protected $version = "2.0.0";
2020
protected $date = "2017-12-26";
2121
protected $originLanguage = "en_us";
22-
protected $jsFiles = array("{MODULEROOT}/scripts/manage_submission_account.js");
2322
protected $cssFiles = array("{MODULEROOT}/css/styles.css");
2423

2524
protected $nav = array(
@@ -81,7 +80,7 @@ public function install($module_id)
8180
"logout_url" => "",
8281
"num_logged_in_users_per_page" => 10
8382
);
84-
Settings::set($settings, "submission_history");
83+
Settings::set($settings, "submission_accounts");
8584

8685
$db->query("
8786
CREATE TABLE IF NOT EXISTS {PREFIX}module_submission_accounts_view_override (
@@ -131,7 +130,7 @@ public function clearTables()
131130
$db->query("DROP TABLE IF EXISTS {PREFIX}module_submission_accounts_view_override");
132131
$db->execute();
133132

134-
$db->query("DELETE FROM IF EXISTS {PREFIX}settings WHERE module = 'submission_accounts'");
133+
$db->query("DELETE FROM {PREFIX}settings WHERE module = 'submission_accounts'");
135134
$db->execute();
136135
}
137136

‎code/actions.php‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,19 @@
2020

2121
$js_info = array();
2222
foreach ($form_fields as $field_info) {
23-
$js_info[] = "[{$field_info["field_id"]}, \"" . htmlspecialchars($field_info["field_title"],
24-
ENT_QUOTES) . "\"]";
23+
$js_info[] = array($field_info["field_id"], htmlspecialchars($field_info["field_title"], ENT_QUOTES));
2524
}
2625

27-
echo json_encode(array(
26+
echo returnJSON(array(
2827
"success" => true,
2928
"form_id" => $form_id,
3029
"fields" => $js_info
3130
));
3231
}
3332

33+
34+
function returnJSON($php)
35+
{
36+
header("Content-Type: application/json");
37+
return json_encode($php);
38+
}

‎css/styles.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@
2828
.edit_sa_menu li.col6 {
2929
width: 70px;
3030
}
31+
.sa-loading {
32+
float: right;
33+
}

‎forget_password.php‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,32 @@
22

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

5+
use FormTools\Administrator;
56
use FormTools\Modules;
7+
use FormTools\Settings;
8+
use FormTools\Modules\SubmissionAccounts\Admin;
69

710
$module = Modules::initModulePage();
811

912
// for errors that prevent the usage of this page
1013
$main_error = false;
1114
$error = "";
1215

13-
$module_settings = ft_get_module_settings("", "submission_accounts");
14-
$L = ft_get_module_lang_file_contents("submission_accounts");
16+
$module_settings = $module->getSettings();
17+
$L = $module->getLangStrings();
1518

1619
// get the default settings
17-
$settings = ft_get_settings();
20+
$settings = Settings::get();
1821
$g_theme = $settings["default_theme"];
1922
$g_swatch = $settings["default_client_swatch"];
2023

2124
// now, if there's a form ID available (e.g. passed to the page via GET or POST), see if the form has been
2225
// configured with submission accounts and if so, use the theme associated with the form
23-
$form_id = ft_load_module_field("submission_accounts", "form_id", "form_id", "");
26+
$form_id = Modules::loadModuleField("submission_accounts", "form_id", "form_id", "");
2427
$submission_account = array();
2528
if (!empty($form_id)) {
26-
$submission_account = sa_get_submission_account($form_id);
29+
$submission_account = Admin::getSubmissionAccount($form_id);
30+
2731
if (isset($submission_account["form_id"]) && $submission_account["submission_account_is_active"] == "yes") {
2832
$g_theme = $submission_account["theme"];
2933
$g_swatch = $submission_account["swatch"];
@@ -46,7 +50,7 @@
4650
list($g_success, $g_message) = sa_send_password($form_id, $_POST);
4751
}
4852

49-
$admin_info = ft_get_admin_info();
53+
$admin_info = Administrator::getAdminInfo();
5054
$admin_email = $admin_info["email"];
5155

5256
$replacements = array("site_admin_email" => "<a href=\"mailto:$admin_email\">$admin_email</a>");

0 commit comments

Comments
 (0)