Skip to content
GitLab
Verified Commit e184a8b9 authored by AtjonTV's avatar AtjonTV
Browse files

v18.8.24

parent f4462b74
Hide whitespace changes
Inline Side-by-side
CHANGELOG.md
View file @ e184a8b9
......@@ -2,6 +2,12 @@
----
## 18.8.x
##### 18.8.24
(24.08.2018)
[Based on OpenCAD 0.2.2.7/0.2.3]
* Upgrade to new base [07d3048f8](https://gitlab.atvg-studios.at/third-party/OpenCAD/commits/07d3048f81b1fc3f70a3807f6d5bea02cf3e3270)
##### 18.8.23
(23.08.2018)
[Based on OpenCAD 0.2.2.7/0.2.3]
......
actions/adminActions.php
View file @ e184a8b9
......@@ -622,7 +622,7 @@ function getUsers()
echo '<input name="deleteUser" type="submit" class="btn btn-xs btn-link" onclick="deleteUser(' . $row[0] . ')" value="Delete" disabled />';
}
if ($row[4] == '2')
if ($row[5] == '2')
{
if ( ( MODERATOR_REACTIVATE_USER == true && $_SESSION['admin_privilege'] == 1 ) || ( $_SESSION['admin_privilege'] == 2 ) )
{
......@@ -653,7 +653,7 @@ function getUsers()
<button name="editUser" type="button" data-toggle="modal" id="' . $row[0] . '" data-target="#editUserModal" class="btn btn-xs btn-link" disabled >Edit</button>
<input name="deleteUser" type="submit" class="btn btn-xs btn-link" onclick="deleteUser(' . $row[0] . ')" value="Delete" disabled />
';
if ($row[4] == '2')
if ($row[5] == '2')
{
echo '<input name="reactivateUser" type="submit" class="btn btn-xs btn-link" value="Reactivate" disabled/>';
}
......
oc-functions.php
View file @ e184a8b9
......@@ -87,12 +87,12 @@ function pageLoadTime() {
**/
function getOpenCADVersion()
{
echo '18.8.23';
echo '18.8.24';
}
function getOpenCADBuild()
{
echo '1535027290';
echo '1535190237';
}
function getOpenCADBase()
......
patches/OCPHP-160-2.patch 0 → 100644
View file @ e184a8b9
diff --git a/sql/oc_GTAV_data.sql b/sql/oc_GTAV_data.sql
index 169f2e6..89a81c7 100644
--- a/sql/oc_GTAV_data.sql
+++ b/sql/oc_GTAV_data.sql
@@ -256,7 +256,7 @@ INSERT INTO `colors` (`id`, `color_group`, `color_name`) VALUES
-- Dumping data for table `departments`
--
-INSERT INTO `departments` (`department_id`, `department_name`, `department_short_name`, `department_long_name`) VALUES
+INSERT INTO `departments` (`department_id`, `department_name`, `department_short_name`, `department_long_name`, `allow_department`) VALUES
(1, 'Communications', 'SAECOMM', 'San Andreas Emergency Communications', 0),
(2, 'State', 'SASP', 'San Andreas State Police', 0),
(3, 'Highway', 'SAHP', 'San Andreas Highway Patrol', 0),
diff --git a/sql/oc_structure.sql b/sql/oc_structure.sql
index 200a06b..5597899 100644
--- a/sql/oc_structure.sql
+++ b/sql/oc_structure.sql
@@ -135,11 +135,11 @@ CREATE TABLE `colors` (
--
CREATE TABLE `departments` (
- `department_id` int(11) NOT NULL,
+ `department_id` int(11) NOT NULL COMMENT 'The functional name of the department. (eg. Police, Fire, EMS)',
`department_name` varchar(255) DEFAULT NULL,
- `department_short_name` varchar(10) NOT NULL,
- `department_long_name` varchar(255) NOT NULL,
- `allow_department` int(11) NOT NULL
+ `department_short_name` varchar(10) NOT NULL COMMENT 'The name of the department. (eg. Los Angeles Police Department, Blaine County Sheriffs\' Office',
+ `department_long_name` varchar(255) NOT NULL COMMENT 'The acronym of the department name. (eg. BCSO, LAPD, LAFD)',
+ `allow_department` int(11) NOT NULL COMMENT 'If 0 then department is disabled, if 1 then department is enabled.'
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
-- --------------------------------------------------------
--
2.18.0
patches/OCPHP-160-3.patch 0 → 100644
View file @ e184a8b9
diff --git a/sql/oc_structure.sql b/sql/oc_structure.sql
index 5597899..fe65488 100644
--- a/sql/oc_structure.sql
+++ b/sql/oc_structure.sql
@@ -4,9 +4,7 @@
CREATE TABLE `aop` (
`aop` varchar(255) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
--- --------------------------------------------------------
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
--
-- Table structure for table `bolos_persons`
@@ -22,8 +20,6 @@ CREATE TABLE `bolos_persons` (
`last_seen` varchar(255) NOT NULL COMMENT 'Last observed location of BOLO suspect.'
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
--- --------------------------------------------------------
-
--
-- Table structure for table `bolos_vehicles`
--
@@ -126,7 +122,7 @@ CREATE TABLE `colors` (
`id` int(11) NOT NULL,
`color_group` varchar(255) DEFAULT NULL,
`color_name` varchar(255) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
-- --------------------------------------------------------
@@ -135,9 +131,9 @@ CREATE TABLE `colors` (
--
CREATE TABLE `departments` (
- `department_id` int(11) NOT NULL COMMENT 'The functional name of the department. (eg. Police, Fire, EMS)',
- `department_name` varchar(255) DEFAULT NULL,
- `department_short_name` varchar(10) NOT NULL COMMENT 'The name of the department. (eg. Los Angeles Police Department, Blaine County Sheriffs\' Office',
+ `department_id` int(11) NOT NULL,
+ `department_name` varchar(255) DEFAULT NULL COMMENT 'The functional name of the department. (eg. Police, Fire, EMS)',
+ `department_short_name` varchar(10) NOT NULL COMMENT 'The name of the department. (eg. Los Angeles Police Department, Blaine County Sheriffs'' Office',
`department_long_name` varchar(255) NOT NULL COMMENT 'The acronym of the department name. (eg. BCSO, LAPD, LAFD)',
`allow_department` int(11) NOT NULL COMMENT 'If 0 then department is disabled, if 1 then department is enabled.'
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
--
2.18.0
patches/OCPHP-385.patch 0 → 100644
View file @ e184a8b9
diff --git a/actions/adminActions.php b/actions/adminActions.php
index d192782..7c5682e 100644
--- a/actions/adminActions.php
+++ b/actions/adminActions.php
@@ -627,7 +627,7 @@ function getUsers()
echo '<input name="deleteUser" type="submit" class="btn btn-xs btn-link" onclick="deleteUser(' . $row[0] . ')" value="Delete" disabled />';
}
- if ($row[4] == '2')
+ if ($row[5] == '2')
{
if ( ( MODERATOR_REACTIVATE_USER == true && $_SESSION['admin_privilege'] == 1 ) || ( $_SESSION['admin_privilege'] == 2 ) )
{
@@ -659,7 +659,7 @@ function getUsers()
<button name="editUser" type="button" data-toggle="modal" id="' . $row[0] . '" data-target="#editUserModal" class="btn btn-xs btn-link" disabled >Edit</button>
<input name="deleteUser" type="submit" class="btn btn-xs btn-link" onclick="deleteUser(' . $row[0] . ')" value="Delete" disabled />
';
- if ($row[4] == '2')
+ if ($row[5] == '2')
{
echo '<input name="reactivateUser" type="submit" class="btn btn-xs btn-link" value="Reactivate" disabled/>';
}
--
2.18.0
patches/merged/OCPHP-160-1.patch 0 → 100644
View file @ e184a8b9
diff --git a/sql/oc_GTAV_data.sql b/sql/oc_GTAV_data.sql
index 7eaadc1..169f2e6 100644
--- a/sql/oc_GTAV_data.sql
+++ b/sql/oc_GTAV_data.sql
@@ -1,7 +1,3 @@
---
--- Database: `opencad_dev`
---
-
--
-- Dumping data for table `colors`
--
@@ -260,15 +256,15 @@ INSERT INTO `colors` (`id`, `color_group`, `color_name`) VALUES
-- Dumping data for table `departments`
--
-INSERT INTO `departments` (`department_id`, `department_name`) VALUES
-(1, 'Communications'),
-(2, 'State'),
-(3, 'Highway'),
-(4, 'Sheriff'),
-(5, 'Police'),
-(6, 'Fire'),
-(7, 'EMS'),
-(8, 'Civilian');
+INSERT INTO `departments` (`department_id`, `department_name`, `department_short_name`, `department_long_name`) VALUES
+(1, 'Communications', 'SAECOMM', 'San Andreas Emergency Communications', 0),
+(2, 'State', 'SASP', 'San Andreas State Police', 0),
+(3, 'Highway', 'SAHP', 'San Andreas Highway Patrol', 0),
+(4, 'Sheriff', 'BCSO', 'Blaine County Sheriffs\' Office', 0),
+(5, 'Police', 'SAPD', 'San Andreas Police Department', 0),
+(6, 'Fire', 'SAFD', 'San Andreas Fire Department', 0),
+(7, 'EMS', 'SAEMS', 'San Andreas Emergency Services', 0),
+(8, 'Civilian', 'SACS', 'San Andreas Civilian Services', 0);
--
-- Dumping data for table `genders`
diff --git a/sql/oc_structure.sql b/sql/oc_structure.sql
index 1ebfc33..200a06b 100644
--- a/sql/oc_structure.sql
+++ b/sql/oc_structure.sql
@@ -136,9 +136,10 @@ CREATE TABLE `colors` (
CREATE TABLE `departments` (
`department_id` int(11) NOT NULL,
- `department_name` varchar(255) DEFAULT NULL COMMENT 'The functional name of the department. (eg. Police, Fire, EMS)',
- `department_long_name` varchar(255) DEFAULT NULL COMMENT 'The name of the department. (eg. Los Angeles Police Department, Blaine County Sheriffs\' Office',
- `department_short_name` varchar(6) DEFAULT NULL COMMENT 'The acronym of the department name. (eg. BCSO, LAPD, LAFD)'
+ `department_name` varchar(255) DEFAULT NULL,
+ `department_short_name` varchar(10) NOT NULL,
+ `department_long_name` varchar(255) NOT NULL,
+ `allow_department` int(11) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
-- --------------------------------------------------------
--
2.18.0
sql/oc_GTAV_data.sql
View file @ e184a8b9
......@@ -260,15 +260,15 @@ INSERT INTO `colors` (`id`, `color_group`, `color_name`) VALUES
-- Dumping data for table `departments`
--
INSERT INTO `departments` (`department_id`, `department_name`) VALUES
(1, 'Communications'),
(2, 'State'),
(3, 'Highway'),
(4, 'Sheriff'),
(5, 'Police'),
(6, 'Fire'),
(7, 'EMS'),
(8, 'Civilian');
INSERT INTO `departments` (`department_id`, `department_name`, `department_short_name`, `department_long_name`, `allow_department`) VALUES
(1, 'Communications', 'SAECOMM', 'San Andreas Emergency Communications', 0),
(2, 'State', 'SASP', 'San Andreas State Police', 0),
(3, 'Highway', 'SAHP', 'San Andreas Highway Patrol', 0),
(4, 'Sheriff', 'BCSO', 'Blaine County Sheriffs` Office', 0),
(5, 'Police', 'SAPD', 'San Andreas Police Department', 0),
(6, 'Fire', 'SAFD', 'San Andreas Fire Department', 0),
(7, 'EMS', 'SAEMS', 'San Andreas Emergency Services', 0),
(8, 'Civilian', 'SACS', 'San Andreas Civilian Services', 0);
--
-- Dumping data for table `genders`
......@@ -320,7 +320,7 @@ INSERT INTO `streets` (`id`, `name`, `county`) VALUES
(1, 'Abattoir Avenue', 'Los Santos County'),
(2, 'Abe Milton Parkway', 'Los Santos County'),
(3, 'Ace Jones Drive', 'Los Santos County'),
(4, 'Adam\'s Apple Boulevard', 'Los Santos County'),
(4, 'Adam`s Apple Boulevard', 'Los Santos County'),
(5, 'Aguja Street', 'Los Santos County'),
(6, 'Alta Place', 'Los Santos County'),
(7, 'Alta Street', 'Los Santos County'),
......@@ -519,7 +519,7 @@ INSERT INTO `streets` (`id`, `name`, `county`) VALUES
(200, 'Niland Avenue', 'Blaine County'),
(201, 'North Calafia Way', 'Blaine County'),
(202, 'Nowhere Road', 'Blaine County'),
(203, 'O\'Neil Way', 'Blaine County'),
(203, 'O`Neil Way', 'Blaine County'),
(204, 'Paleto Boulevard', 'Blaine County'),
(205, 'Panorama Drive', 'Blaine County'),
(206, 'Procopio Drive', 'Blaine County'),
......
sql/oc_structure.sql
View file @ e184a8b9
......@@ -18,7 +18,7 @@ CREATE TABLE `active_users` (
CREATE TABLE `aop` (
`aop` varchar(255) NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
-- --------------------------------------------------------
......@@ -140,7 +140,7 @@ CREATE TABLE `colors` (
`id` int(11) NOT NULL,
`color_group` varchar(255) DEFAULT NULL,
`color_name` varchar(255) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
-- --------------------------------------------------------
......@@ -150,7 +150,10 @@ CREATE TABLE `colors` (
CREATE TABLE `departments` (
`department_id` int(11) NOT NULL,
`department_name` varchar(255) DEFAULT NULL
`department_name` varchar(255) DEFAULT NULL COMMENT 'The functional name of the department. (eg. Police, Fire, EMS)',
`department_short_name` varchar(10) NOT NULL COMMENT 'The name of the department. (eg. Los Angeles Police Department, Blaine County Sheriffs` Office',
`department_long_name` varchar(255) NOT NULL COMMENT 'The acronym of the department name. (eg. BCSO, LAPD, LAFD)',
`allow_department` int(11) NOT NULL COMMENT 'If 0 then department is disabled, if 1 then department is enabled.'
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
-- --------------------------------------------------------
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © 2015-2023 ATVG-Studios; Instance Issues&Notes; Terms and Privacy