Skip to content
This repository was archived by the owner on Mar 10, 2024. It is now read-only.

Commit 3621098

Browse files
devotedsoulsdevotedsouls
authored
Merge pull request #365 from opencad-app/release/beta
Merge beta.
2 parents c4e000d + 8c91cc4 commit 3621098

37 files changed

+70
-336
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ patch.diff
1515
mirror_ssh
1616
log_file
1717
sql.php
18-
*adminer*.php
18+
*adminer*.php
19+
errorlog

‎.htaccess‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ RewriteCond %{REQUEST_FILENAME} !-f
66
RewriteCond %{REQUEST_FILENAME} !-d
77
RewriteRule . /index.php [L]
88
</IfModule>
9-
### Begin ATVG ErrorPages ###
9+
### Begin ErrorPages ###
1010
ErrorDocument 403 /plugins/error/static/403.php
1111
ErrorDocument 404 /plugins/error/static/404.php
1212
ErrorDocument 502 /plugins/error/static/502.php
1313
ErrorDocument 503 /plugins/error/static/503.php
14-
### End ATVG ErrorPages ###
14+
### End ErrorPages ###

‎cad.php‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,9 @@
2121
include(__DIR__."/plugins/api_auth.php");
2222

2323
// TODO: Verify user has permission to be on this page
24-
25-
if (empty($_SESSION['logged_in']))
26-
{
27-
header('Location: ./index.php');
28-
die("Not logged in");
29-
}
30-
else
24+
if (!empty($_SESSION['logged_in']))
3125
{
32-
$name = $_SESSION['name'];
26+
$name = $_SESSION['name'];
3327
}
3428

3529
if(isset($_SESSION['dispatch']))

‎civilian.php‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@
2121
include(__DIR__."/actions/publicFunctions.php");
2222
include(__DIR__."/actions/generalActions.php");
2323

24-
if (empty($_SESSION['logged_in']))
25-
{
26-
header('Location: ./index.php');
27-
die("Not logged in");
28-
}
29-
else
24+
if (!empty($_SESSION['logged_in']))
3025
{
3126
$name = $_SESSION['name'];
3227
$uid = $_SESSION['id'];

‎oc-admin/.htaccess‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
### Begin ATVG ErrorPages ###
1+
### Begin ErrorPages ###
22
ErrorDocument 403 \oc-admin/plugins/error/static/403.php
33
ErrorDocument 404 \oc-admin/plugins/error/static/404.php
44
ErrorDocument 502 \oc-admin/plugins/error/static/502.php
55
ErrorDocument 503 \oc-admin/plugins/error/static/503.php
6-
### End ATVG ErrorPages ###
6+
### End ErrorPages ###

‎oc-admin/about.php‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<span class="glyphicon glyphicon-fullscreen" aria-hidden="true"></span>
102102
</a>
103103
<a data-toggle="tooltip" data-placement="top" title="Need Help?"
104-
href="https://guides.opencad.io/">
104+
href="https://docs.opencad.io/">
105105
<span class="fas fa-info-circle" aria-hidden="true"></span>
106106
</a>
107107
<a data-toggle="tooltip" data-placement="top" title="Logout"
@@ -214,14 +214,13 @@ class="fas fa-sign-out-alt pull-right"></i> Log Out</a></li>
214214
</div>
215215
<!-- ./ row tile_count -->
216216
<h2>About OpenCAD</h2>
217-
<p>OpenCAD is an opensource project licensed under GNU GPL v3. The original code and
217+
<p>OpenCAD is an open source project licensed under GNU GPL v3. The original code and
218218
concept by <a href="https://github.com/ossified"
219219
title="a link to the original developer's GitHub.">Shane Gill</a>. This project
220-
is maintained Stormlight Tech.</p>
221-
<h3>Got Feedback?</h3>
220+
is maintained by Overt Source</p>
221+
<!--<h3>Got Feedback?</h3>
222222
<p>The OpenCAD team wants to know what you think. Please send us your feedback today!
223-
</p>
224-
<a href="#" id="getFeedbackJIRA">Send Feedback</a>
223+
</p>-->
225224
</div>
226225
<!-- ./ x_content -->
227226
</div>
@@ -250,21 +249,6 @@ class="fas fa-sign-out-alt pull-right"></i> Log Out</a></li>
250249
include (__DIR__ . "/oc-admin-includes/globalModals.inc.php");
251250
include (__DIR__ . "/../oc-includes/jquery-colsolidated.inc.php"); ?>
252251

253-
<script type="text/javascript"
254-
src="https://jira.opencad.io/s/a0c4d8ca8eced10a4b49aaf45ec76490-T/-f9bgig/77001/9e193173deda371ba40b4eda00f7488e/2.0.24/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?locale=en-US&collectorId=296607a1">
255-
</script>
256-
257-
<script type="text/javascript">
258-
window.ATL_JQ_PAGE_PROPS = {
259-
"triggerFunction": function(showCollectorDialog) {
260-
//Requires that jQuery is available!
261-
jQuery("#getFeedbackJIRA").click(function(e) {
262-
e.preventDefault();
263-
showCollectorDialog();
264-
});
265-
}
266-
};
267-
</script>
268252
</body>
269253

270254
</html>

‎oc-admin/admin.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164

165165
</div>
166166

167-
<?php /* HIUE SEARCH FUNCTION FOR NOW
167+
<?php /* HIDE SEARCH FUNCTION FOR NOW
168168
<div class="title_right">
169169
<div class="col-md-5 col-sm-5 col-xs-12 form-group pull-right top_search">
170170
<div class="input-group">
@@ -265,9 +265,7 @@
265265
include (__DIR__ . "/oc-admin-includes/globalModals.inc.php");
266266
include (__DIR__ . "/../oc-includes/jquery-colsolidated.inc.php"); ?>
267267

268-
<script type="text/javascript"
269-
src="https://jira.opencad.io/s/a0c4d8ca8eced10a4b49aaf45ec76490-T/-f9bgig/77001/9e193173deda371ba40b4eda00f7488e/2.0.24/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?locale=en-US&collectorId=ede74ac1">
270-
</script>
268+
271269
</body>
272270

273271
</html>

‎oc-admin/dataManagement/citationTypeManager.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,7 @@ class="form-horizontal">
309309
})
310310
</script>
311311

312-
<script type="text/javascript"
313-
src="https://jira.opencad.io/s/a0c4d8ca8eced10a4b49aaf45ec76490-T/-f9bgig/77001/9e193173deda371ba40b4eda00f7488e/2.0.24/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?locale=en-US&collectorId=ede74ac1">
314-
</script>
312+
315313
</body>
316314

317315
</html>

‎oc-admin/dataManagement/departmentsManager.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,7 @@ class="fas fa-sign-out-alt pull-right"></i> Log Out</a></li>
318318
})
319319
</script>
320320

321-
<script type="text/javascript"
322-
src="https://jira.opencad.io/s/a0c4d8ca8eced10a4b49aaf45ec76490-T/-f9bgig/77001/9e193173deda371ba40b4eda00f7488e/2.0.24/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?locale=en-US&collectorId=ede74ac1">
323-
</script>
321+
324322
</body>
325323

326324
</html>

‎oc-admin/dataManagement/incidentTypeManager.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,7 @@ class="form-horizontal">
311311
})
312312
</script>
313313

314-
<script type="text/javascript"
315-
src="https://jira.opencad.io/s/a0c4d8ca8eced10a4b49aaf45ec76490-T/-f9bgig/77001/9e193173deda371ba40b4eda00f7488e/2.0.24/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?locale=en-US&collectorId=ede74ac1">
316-
</script>
314+
317315
</body>
318316

319317
</html>

0 commit comments

Comments
 (0)