Skip to content

Commit 5d25d20

Browse files
benkeenbenkeen
committed
misc compatibility updates
2 parents 1d2778e + 3a13e78 commit 5d25d20

15 files changed

Lines changed: 37 additions & 36 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
"line-reader": "^0.4.0",
111111
"load-grunt-tasks": "^4.0.0",
112112
"mini-css-extract-plugin": "^0.8.0",
113-
"moment": "^2.22.2",
113+
"moment": "^2.29.4",
114114
"n-readlines": "^1.0.0",
115115
"postcss-loader": "^3.0.0",
116116
"prop-types": "^15.6.1",

‎src/admin/forms/option_lists/index.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
// visible page should be now be 1
4646
$total_num_option_lists = OptionLists::getNumOptionLists();
4747
$total_pages = ceil($total_num_option_lists / $num_option_lists_per_page);
48-
if ($option_list_page > $total_pages) {
48+
49+
if ($total_pages > 0 && $option_list_page > $total_pages) {
4950
$option_list_page = $total_pages;
5051
}
5152

@@ -55,7 +56,6 @@
5556
"per_page" => Sessions::get("settings.num_option_lists_per_page")
5657
));
5758

58-
5959
$num_option_lists = $list_info["num_results"];
6060
$option_lists = $list_info["results"];
6161

‎src/global/code/Core.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ class Core
263263
/**
264264
* The current version of the Form Tools Core.
265265
*/
266-
private static $version = "3.0.20";
266+
private static $version = "3.1.0";
267267

268268
/**
269269
* The release type: alpha, beta or main

‎src/global/code/Database.class.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
/**
44
* PDO database connectivity methods. Added in 2.3.0 to replace the older mysql_* methods.
55
*
6-
* @copyright Benjamin Keen 2018
6+
* @copyright Benjamin Keen 2023
77
* @author Benjamin Keen <ben.keen@gmail.com>
8-
* @package 2-3-x
8+
* @package 3-1-x
99
* @subpackage Database
1010
*/
1111

‎src/global/code/Fields.class.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ public static function deleteFormFields($form_id, $field_ids)
473473
$message = $LANG["notify_form_field_removed"];
474474
}
475475

476-
extract(Hooks::processHookCalls("end", compact("removed_fields", "form_id", "field_ids", "success", "message"), array("success", "message")), EXTR_OVERWRITE);
476+
extract(Hooks::processHookCalls("end", compact("removed_fields", "form_id", "field_ids", "message"), array("success", "message")), EXTR_OVERWRITE);
477477

478478
return array(true, $message);
479479
}
@@ -600,7 +600,7 @@ public static function addFormFieldsAdvanced($form_id, $fields)
600600
}
601601
}
602602

603-
extract(Hooks::processHookCalls("end", compact("infohash", "form_id"), array("success", "message")), EXTR_OVERWRITE);
603+
extract(Hooks::processHookCalls("end", compact("form_id"), array("success", "message")), EXTR_OVERWRITE);
604604

605605
return array($success, $message);
606606
}
@@ -1034,7 +1034,7 @@ public static function getExtendedFieldSettings($field_id, $setting_id = "", $co
10341034
);
10351035
}
10361036

1037-
extract(Hooks::processHookCalls("end", compact("field_id", "setting_name"), array("settings")), EXTR_OVERWRITE);
1037+
extract(Hooks::processHookCalls("end", compact("field_id", "settings"), array("settings")), EXTR_OVERWRITE);
10381038

10391039
return $settings;
10401040
}

‎src/global/code/Forms.class.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static function cacheFormStats($form_id = "")
5757
foreach ($form_ids as $form_id) {
5858
try {
5959
$db->query("
60-
SELECT count(*)
60+
SELECT count(*)
6161
FROM {PREFIX}form_$form_id
6262
WHERE is_finalized = 'yes'
6363
");
@@ -102,7 +102,7 @@ public static function searchForms($params = array())
102102
"order" => "form_id-DESC"
103103
), $params);
104104

105-
extract(Hooks::processHookCalls("start", compact("account_id", "is_admin", "search_criteria"), array("search_criteria")), EXTR_OVERWRITE);
105+
extract(Hooks::processHookCalls("start", compact("search_criteria"), array("search_criteria")), EXTR_OVERWRITE);
106106

107107
$results = self::getSearchFormSqlClauses($search_criteria);
108108

@@ -130,7 +130,7 @@ public static function searchForms($params = array())
130130
$form_info[] = Forms::getForm($form_id);
131131
}
132132

133-
extract(Hooks::processHookCalls("end", compact("account_id", "is_admin", "search_criteria", "form_info"), array("form_info")), EXTR_OVERWRITE);
133+
extract(Hooks::processHookCalls("end", compact("search_criteria", "form_info"), array("form_info")), EXTR_OVERWRITE);
134134

135135
return $form_info;
136136
}

‎src/global/code/General.class.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
/**
44
* General methods. Added in 2.3.0 - will replace the older genera.php file.
55
*
6-
* @copyright Benjamin Keen 2018
6+
* @copyright Benjamin Keen 2023
77
* @author Benjamin Keen <ben.keen@gmail.com>
8-
* @package 2-3-x
8+
* @package 3-1-x
99
* @subpackage Database
1010
*/
1111

@@ -376,7 +376,7 @@ public static function evalSmartyString($placeholder_str, $placeholders = array(
376376

377377
$output = $smarty->fetch(realpath(__DIR__ . "/../smarty_plugins/eval.tpl"));
378378

379-
extract(Hooks::processHookCalls("end", compact("output", "placeholder_str", "placeholders", "theme"), array("output")), EXTR_OVERWRITE);
379+
extract(Hooks::processHookCalls("end", compact("output", "placeholder_str", "placeholders"), array("output")), EXTR_OVERWRITE);
380380

381381
return $output;
382382
}
@@ -1426,7 +1426,7 @@ public static function copyTableRow($table_name, $col_names, $primary_key_col_na
14261426
$col_name_str = implode(", ", $col_names);
14271427

14281428
$db->query("INSERT INTO $table_name ($col_name_str)
1429-
SELECT $col_name_str FROM $table_name
1429+
SELECT $col_name_str FROM $table_name
14301430
WHERE $primary_key_col_name = :primary_key
14311431
");
14321432
$db->bind("primary_key", $primary_key_value);

‎src/global/code/OmitLists.class.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
/**
44
* Omit Lists are a handy way to fine-tune access to Form and Views by essentially blacklisting particular users.
55
*
6-
* @copyright Benjamin Keen 2018
6+
* @copyright Benjamin Keen 2023
77
* @author Benjamin Keen <ben.keen@gmail.com>
8-
* @package 3-0-x
8+
* @package 3-1-x
99
* @subpackage OmitLists
1010
*/
1111

@@ -42,7 +42,7 @@ public static function getPublicFormOmitList($form_id)
4242
$client_ids[] = $row["account_id"];
4343
}
4444

45-
extract(Hooks::processHookCalls("end", compact("clients_id", "form_id"), array("client_ids")), EXTR_OVERWRITE);
45+
extract(Hooks::processHookCalls("end", compact("client_ids", "form_id"), array("client_ids")), EXTR_OVERWRITE);
4646

4747
return $client_ids;
4848
}

‎src/global/code/Settings.class.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
/**
44
* The installation class. Added in 2.3.0.
55
*
6-
* @copyright Benjamin Keen 2018
6+
* @copyright Benjamin Keen 2023
77
* @author Benjamin Keen <ben.keen@gmail.com>
8-
* @package 3-0-x
8+
* @package 3-1-x
99
* @subpackage Templates
1010
*/
1111

@@ -42,7 +42,7 @@ public static function get($settings = "", $module = "")
4242
$where_module_clause = (!empty($module)) ? "WHERE module = :module" : "";
4343
$and_module_clause = (!empty($module)) ? "AND module = :module" : "";
4444

45-
$result = "";
45+
$result = array();
4646
if (empty($settings)) {
4747
$db->query("
4848
SELECT setting_name, setting_value
@@ -71,7 +71,10 @@ public static function get($settings = "", $module = "")
7171
}
7272
$db->execute();
7373
$info = $db->fetch();
74-
$result = $info["setting_value"];
74+
75+
if ($info) {
76+
$result = $info["setting_value"];
77+
}
7578

7679
} else if (is_array($settings)) {
7780
$result = array();

‎src/global/code/Submissions.class.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
/**
44
* This file defines all functions related to managing form submissions.
55
*
6-
* @copyright Benjamin Keen 2018
6+
* @copyright Benjamin Keen 2023
77
* @author Benjamin Keen <ben.keen@gmail.com>
8-
* @package 3-0-x
8+
* @package 3-1-x
99
* @subpackage Submissions
1010
*/
1111

@@ -529,7 +529,7 @@ public static function deleteSubmissions($form_id, $view_id, $submissions_to_del
529529
return array(false, "");
530530
}
531531

532-
extract(Hooks::processHookCalls("start", compact("form_id", "view_id", "submissions_to_delete", "omit_list", "search_fields", "is_admin"), array("submission_ids")), EXTR_OVERWRITE);
532+
extract(Hooks::processHookCalls("start", compact("form_id", "view_id", "submissions_to_delete", "omit_list", "search_fields"), array("submission_ids")), EXTR_OVERWRITE);
533533

534534
$form_info = Forms::getForm($form_id);
535535
$form_fields = Fields::getFormFields($form_id);
@@ -627,7 +627,7 @@ public static function deleteSubmissions($form_id, $view_id, $submissions_to_del
627627
}
628628

629629
$submissions_to_delete = $submission_ids;
630-
extract(Hooks::processHookCalls("end", compact("form_id", "view_id", "submissions_to_delete", "omit_list", "search_fields", "is_admin"), array("success", "message")), EXTR_OVERWRITE);
630+
extract(Hooks::processHookCalls("end", compact("form_id", "view_id", "submissions_to_delete", "omit_list", "search_fields"), array("success", "message")), EXTR_OVERWRITE);
631631

632632
return array($success, $message);
633633
}
@@ -1129,7 +1129,7 @@ public static function searchSubmissions($form_id, $view_id, $results_per_page,
11291129
$return_hash["search_num_results"] = $search_num_results;
11301130
$return_hash["view_num_results"] = $view_num_results;
11311131

1132-
extract(Hooks::processHookCalls("end", compact("form_id", "submission_id", "view_id", "results_per_page", "page_num", "order", "columns", "search_fields", "submission_ids", "return_hash"), array("return_hash")), EXTR_OVERWRITE);
1132+
extract(Hooks::processHookCalls("end", compact("form_id", "view_id", "results_per_page", "page_num", "order", "search_fields", "submission_ids", "return_hash"), array("return_hash")), EXTR_OVERWRITE);
11331133

11341134
return $return_hash;
11351135
}

0 commit comments

Comments
 (0)