Skip to content

Commit f9cf529

Browse files
jsokoljsokol
committed
SimpleRisk 20231006-001 Release
1 parent a380746 commit f9cf529

5,986 files changed

Lines changed: 2245645 additions & 659973 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎simplerisk/account/mfa.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
setup_alert_requirements("..");
9494
?>
9595

96-
</style>
9796
</head>
9897

9998
<body>

‎simplerisk/admin/add_remove_values.php‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -97,27 +97,6 @@
9797
}
9898
};
9999

100-
$customAddFunction_risk_grouping = function($name) {
101-
$db = db_open();
102-
103-
// Get the order for the last place...
104-
$stmt = $db->prepare("SELECT MAX(`order`) FROM `risk_grouping`");
105-
$stmt->execute();
106-
$max_order = $stmt->fetchColumn();
107-
$new_order = intval($max_order) + 1;
108-
109-
// ...and add it there.
110-
$stmt = $db->prepare("INSERT INTO `risk_grouping` (`name`, `order`) VALUES (:name, :order)");
111-
$stmt->bindParam(":name", $name, PDO::PARAM_STR);
112-
$stmt->bindParam(":order", $new_order, PDO::PARAM_INT);
113-
$stmt->execute();
114-
$risk_grouping_id = $db->lastInsertId();
115-
116-
db_close($db);
117-
118-
return $risk_grouping_id;
119-
};
120-
121100
$customDeleteFunction_risk_grouping = function($value) {
122101

123102
$db = db_open();
@@ -266,7 +245,7 @@
266245
'risk_grouping' => array(
267246
'headerKey' => 'RiskGroupings',
268247
'lengthLimit' => 50,
269-
'customAddFunction' => $customAddFunction_risk_grouping,
248+
'customAddFunction' => 'add_risk_grouping',
270249
'customDeleteFunction' => $customDeleteFunction_risk_grouping,
271250
),
272251
'risk_function' => array(
@@ -313,7 +292,7 @@
313292
}
314293

315294
if (in_array($_POST['action'], array('update', 'delete'))) {
316-
if (!isset($_POST['id']) || !trim($_POST['id']) || !preg_match('/^\d+$/', trim($_POST['id']))) {
295+
if (!isset($_POST['id']) || !preg_match('/^\d+$/', trim($_POST['id']))) {
317296
set_alert(true, "bad", $lang['YouNeedToSpecifyAnIdParameter']);
318297
json_response(400, get_alert(true), NULL);
319298
} else {

‎simplerisk/admin/complianceforge.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ function display()
122122

123123
display_bootstrap_javascript();
124124
?>
125-
<link rel="stylesheet" type="text/css" href="../css/jquery-ui.min.css?<?php echo current_version("app"); ?>" />
125+
<link rel="stylesheet" type="text/css" href="../vendor/node_modules/jquery-ui/dist/themes/base/jquery-ui.min.css?<?php echo current_version("app"); ?>" />
126126

127127
<script src="../js/bootstrap-multiselect.js?<?php echo current_version("app"); ?>"></script>
128128
<meta name="viewport" content="width=device-width, initial-scale=1">

‎simplerisk/admin/complianceforge_scf.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ function display()
8888
display_bootstrap_javascript();
8989
?>
9090
<script src="../js/jquery.blockUI.min.js?<?php echo current_version("app"); ?>"></script>
91-
<link rel="stylesheet" type="text/css" href="../css/jquery-ui.min.css?<?php echo current_version("app"); ?>" />
91+
<link rel="stylesheet" type="text/css" href="../vendor/node_modules/jquery-ui/dist/themes/base/jquery-ui.min.css?<?php echo current_version("app"); ?>" />
9292

9393
<script src="../js/bootstrap-multiselect.js?<?php echo current_version("app"); ?>"></script>
9494
<meta name="viewport" content="width=device-width, initial-scale=1">

‎simplerisk/admin/content.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<title>SimpleRisk: Enterprise Risk Management Simplified</title>
6262
<meta name="viewport" content="width=device-width, initial-scale=1">
6363
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
64-
<link rel="stylesheet" type="text/css" href="../css/jquery-ui.min.css?<?php echo current_version("app"); ?>" />
64+
<link rel="stylesheet" type="text/css" href="../vendor/node_modules/jquery-ui/dist/themes/base/jquery-ui.min.css?<?php echo current_version("app"); ?>" />
6565
<link rel="stylesheet" href="../css/bootstrap.css?<?php echo current_version("app"); ?>">
6666
<link rel="stylesheet" href="../css/bootstrap-responsive.css?<?php echo current_version("app"); ?>">
6767

‎simplerisk/admin/fix_review_dates.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,15 @@
111111

112112
display_bootstrap_javascript();
113113
?>
114-
<script src="../js/jquery.dataTables.js?<?php echo current_version("app"); ?>"></script>
114+
<script src="../vendor/node_modules/datatables.net/js/jquery.dataTables.min.js?<?php echo current_version("app"); ?>"></script>
115115
<script src="../js/simplerisk/cve_lookup.js?<?php echo current_version("app"); ?>"></script>
116116
<script src="../js/simplerisk/common.js?<?php echo current_version("app"); ?>"></script>
117117
<script src="../js/simplerisk/pages/risk.js?<?php echo current_version("app"); ?>"></script>
118118
<script src="../js/bootstrap-multiselect.js?<?php echo current_version("app"); ?>"></script>
119119

120120
<link rel="stylesheet" href="../css/bootstrap.css?<?php echo current_version("app"); ?>">
121121
<link rel="stylesheet" href="../css/bootstrap-responsive.css?<?php echo current_version("app"); ?>">
122-
<link rel="stylesheet" href="../css/jquery.dataTables.css?<?php echo current_version("app"); ?>">
122+
<link rel="stylesheet" href="../vendor/node_modules/datatables.net-dt/css/jquery.dataTables.min.css?<?php echo current_version("app"); ?>">
123123

124124
<link rel="stylesheet" href="../css/divshot-util.css?<?php echo current_version("app"); ?>">
125125
<link rel="stylesheet" href="../css/divshot-canvas.css?<?php echo current_version("app"); ?>">

‎simplerisk/admin/fix_upload_encoding_issues.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@
7777

7878
display_bootstrap_javascript();
7979
?>
80-
<script src="../js/jquery.dataTables.js?<?php echo current_version("app"); ?>"></script>
80+
<script src="../vendor/node_modules/datatables.net/js/jquery.dataTables.min.js?<?php echo current_version("app"); ?>"></script>
8181

8282
<link rel="stylesheet" href="../css/bootstrap.css?<?php echo current_version("app"); ?>">
8383
<link rel="stylesheet" href="../css/bootstrap-responsive.css?<?php echo current_version("app"); ?>">
84-
<link rel="stylesheet" href="../css/jquery.dataTables.css?<?php echo current_version("app"); ?>">
84+
<link rel="stylesheet" href="../vendor/node_modules/datatables.net-dt/css/jquery.dataTables.min.css?<?php echo current_version("app"); ?>">
8585

8686
<link rel="stylesheet" href="../css/divshot-util.css?<?php echo current_version("app"); ?>">
8787
<link rel="stylesheet" href="../css/divshot-canvas.css?<?php echo current_version("app"); ?>">

‎simplerisk/admin/index.php‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,10 @@
187187

188188
// Update the default user role setting
189189
$default_user_role = (int)$_POST['default_user_role'];
190-
$current_default_user_role = get_setting("default_user_role");
191-
if ($default_user_role != $current_default_user_role)
192-
{
190+
$current_default_user_role = get_default_role_id();
191+
if ($default_user_role != $current_default_user_role) {
193192
// Update the default user role
194-
update_setting("default_user_role", $default_user_role);
193+
set_default_role($default_user_role);
195194
}
196195

197196
// Update the default current maturity setting
@@ -407,12 +406,19 @@
407406
$email = $_POST['email'];
408407
$subject = "SimpleRisk Test Email";
409408
$full_message = "This is a test email from SimpleRisk.";
410-
411-
// Send the e-mail
412-
send_email($name, $email, $subject, $full_message);
413-
414-
// Display an alert
415-
set_alert(true, "good", "A test email has been sent using the current settings.");
409+
$now = time();
410+
// Set limit the frequency of test mail to 5 minutes.
411+
if((isset($_SESSION['test_mail_sent']) && $now - intval($_SESSION['test_mail_sent']) > 300) || !isset($_SESSION['test_mail_sent'])) {
412+
// Send the e-mail
413+
send_email($name, $email, $subject, $full_message);
414+
415+
$_SESSION['test_mail_sent'] = time();
416+
417+
// Display an alert
418+
set_alert(true, "good", "A test email has been sent using the current settings.");
419+
} else {
420+
set_alert(true, "bad", $escaper->escapeHtml($lang['LimitedTestmailMessage']));
421+
}
416422
}
417423

418424
// If the Backups tab was submitted
@@ -719,7 +725,7 @@
719725
<title>SimpleRisk: Enterprise Risk Management Simplified</title>
720726
<meta name="viewport" content="width=device-width, initial-scale=1">
721727
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
722-
<link rel="stylesheet" type="text/css" href="../css/jquery-ui.min.css?<?php echo current_version("app"); ?>" />
728+
<link rel="stylesheet" type="text/css" href="../vendor/node_modules/jquery-ui/dist/themes/base/jquery-ui.min.css?<?php echo current_version("app"); ?>" />
723729
<link rel="stylesheet" href="../css/bootstrap.css?<?php echo current_version("app"); ?>">
724730
<link rel="stylesheet" href="../css/bootstrap-responsive.css?<?php echo current_version("app"); ?>">
725731

@@ -967,8 +973,8 @@ function checkbox_smtpauth()
967973
<td><?php echo $escaper->escapeHtml($lang['DefaultUserRole']) ?>:</td>
968974
<td>
969975
<?php
970-
// Create role dropdown
971-
create_dropdown("role", $escaper->escapeHtml(get_setting("default_user_role")), "default_user_role");
976+
// Create role dropdown
977+
create_dropdown("role", get_default_role_id(), "default_user_role");
972978
?>
973979
</td>
974980
</tr>

‎simplerisk/admin/risk_catalog.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@
5959

6060
display_bootstrap_javascript();
6161
?>
62-
<script src="../js/jquery.dataTables.js?<?php echo current_version("app"); ?>"></script>
62+
<script src="../vendor/node_modules/datatables.net/js/jquery.dataTables.min.js?<?php echo current_version("app"); ?>"></script>
6363
<script src="../js/dataTables.rowReorder.min.js?<?php echo current_version("app"); ?>"></script>
6464
<script src="../js/dataTables.rowGroup.min.js?<?php echo current_version("app"); ?>"></script>
6565

6666
<link rel="stylesheet" href="../css/bootstrap.css?<?php echo current_version("app"); ?>">
6767
<link rel="stylesheet" href="../css/bootstrap-responsive.css?<?php echo current_version("app"); ?>">
68-
<link rel="stylesheet" href="../css/jquery.dataTables.css?<?php echo current_version("app"); ?>">
68+
<link rel="stylesheet" href="../vendor/node_modules/datatables.net-dt/css/jquery.dataTables.min.css?<?php echo current_version("app"); ?>">
6969
<link rel="stylesheet" href="../css/rowReorder.dataTables.min.css?<?php echo current_version("app"); ?>">
7070

7171
<link rel="stylesheet" href="../css/divshot-util.css?<?php echo current_version("app"); ?>">

‎simplerisk/admin/ucf.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ function display()
164164

165165
display_bootstrap_javascript();
166166
?>
167-
<link rel="stylesheet" type="text/css" href="../css/jquery-ui.min.css?<?php echo current_version("app"); ?>" />
167+
<link rel="stylesheet" type="text/css" href="../vendor/node_modules/jquery-ui/dist/themes/base/jquery-ui.min.css?<?php echo current_version("app"); ?>" />
168168

169169
<script src="../js/bootstrap-multiselect.js?<?php echo current_version("app"); ?>"></script>
170170
<meta name="viewport" content="width=device-width, initial-scale=1">

0 commit comments

Comments
 (0)