Skip to content
This repository has been archived by the owner on Dec 13, 2024. It is now read-only.

Review PR #58

Open
wants to merge 26 commits into
base: 5.0-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
02a196f
Added signature
bembelimen Jun 22, 2021
15f3cad
Add signature
bembelimen Jun 22, 2021
e0d5a7b
Add new signature
bembelimen Jun 23, 2021
3618e06
Merge pull request #4 from joomla-projects/4.1-dev
bembelimen Jun 23, 2021
1f35d5d
Merge remote-tracking branch 'upstream/4.3-dev' into dev
fancyFranci Jan 11, 2023
03b3b1d
[GSoC 21] Cookie Manager Admin UI with plugin to block/unblock cookie…
rjharishabh Jan 22, 2023
bbf96f2
Merge branch '4.3-dev' of https://github.com/joomla/joomla-cms into dev
fancyFranci Jan 23, 2023
467aa75
Merge branch '4.3-dev' of github.com:joomla/joomla-cms into cleanup
Hackwar May 18, 2023
7a53503
Moving all cookiemanager files to com_privacy
Hackwar May 18, 2023
3e8a3b4
Adding new views to privacy menu in backend
Hackwar May 18, 2023
25ade73
Move config options from cookiemanager to com_privacy
Hackwar May 18, 2023
944f80d
Removing old cookiemanager component
Hackwar May 18, 2023
d4e815a
Renaming tables
Hackwar May 19, 2023
e720215
Switching to PSR-12
Hackwar May 19, 2023
c022317
Fixing menu links
Hackwar May 19, 2023
a150d04
Rename in code from com_cookiemanager to com_privacy
Hackwar May 19, 2023
bb55f37
Renaming tables in code and renaming cookiemanager consent view to co…
Hackwar May 19, 2023
db2fc21
Moving language strings over to privacy component
Hackwar May 19, 2023
91dec44
Reorder menu items
Hackwar May 19, 2023
5c58f51
Merge pull request #54 from Hackwar/cleanup
Hackwar May 22, 2023
99c59bf
Merge branch '5.0-dev' of github.com:joomla/joomla-cms into 5.0-dev
Hackwar May 22, 2023
62918d8
Merge pull request #55 from Hackwar/5.0-dev
Hackwar May 22, 2023
8761e50
Some cleanup...
Hackwar May 22, 2023
a2732d7
Merge pull request #56 from Hackwar/cleanup
Hackwar May 22, 2023
f360abf
Cookieconsent for 5.0 (#57)
fancyFranci Jun 14, 2023
e03bd7e
Merge branch '5.0-dev' into dev
bembelimen Jul 2, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,6 @@ trigger:

---
kind: signature
hmac: 6b06b1c7f407650fe98f0851dc865911f399422116fa4f250a52d01a556397ed
hmac: f93ecde6afe7ed244066613dd6b9c10f8139feefd9341b1627fd0a348f8fc802

...
2 changes: 1 addition & 1 deletion administrator/components/com_actionlogs/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
label="COM_ACTIONLOGS_LOG_EXTENSIONS_LABEL"
multiple="true"
layout="joomla.form.field.list-fancy-select"
default="com_banners,com_cache,com_categories,com_checkin,com_config,com_contact,com_content,com_installer,com_media,com_menus,com_messages,com_modules,com_newsfeeds,com_plugins,com_redirect,com_scheduler,com_tags,com_templates,com_users"
default="com_banners,com_cache,com_categories,com_checkin,com_config,com_contact,com_content,com_installer,com_media,com_menus,com_messages,com_modules,com_newsfeeds,com_plugins,com_privacy,com_redirect,com_scheduler,com_tags,com_templates,com_users"
/>
<field
name="loggable_api"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
--
-- Table structure for table `#__privacy_cookies`
--

CREATE TABLE IF NOT EXISTS `#__privacy_cookies` (
`id` int NOT NULL AUTO_INCREMENT PRIMARY KEY,
`title` varchar(255) NOT NULL,
`alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
`cookie_name` varchar(255) NOT NULL,
`cookie_desc` varchar(255) NOT NULL,
`exp_period` varchar(20) NOT NULL,
`exp_value` int NOT NULL DEFAULT 0,
`catid` int NOT NULL DEFAULT 0,
`published` tinyint NOT NULL DEFAULT 1,
`ordering` int NOT NULL DEFAULT 0,
`created` datetime NOT NULL,
`created_by` int unsigned NOT NULL DEFAULT 0,
`modified` datetime NOT NULL,
`modified_by` int unsigned NOT NULL DEFAULT 0,
KEY `idx_state` (`published`),
KEY `idx_catid` (`catid`),
KEY `idx_createdby` (`created_by`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;

-- --------------------------------------------------------

--
-- Table structure for table `#__privacy_scripts`
--

CREATE TABLE IF NOT EXISTS `#__privacy_scripts` (
`id` int NOT NULL AUTO_INCREMENT PRIMARY KEY,
`title` varchar(255) NOT NULL,
`alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
`position` int NOT NULL DEFAULT 4,
`type` int NOT NULL DEFAULT 1,
`code` text NOT NULL,
`catid` int NOT NULL DEFAULT 0,
`published` tinyint NOT NULL DEFAULT 1,
`ordering` int NOT NULL DEFAULT 0,
KEY `idx_state` (`published`),
KEY `idx_catid` (`catid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;

-- --------------------------------------------------------

--
-- Table structure for table `#__privacy_cookie_consents`
--

CREATE TABLE IF NOT EXISTS `#__privacy_cookie_consents` (
`id` int NOT NULL AUTO_INCREMENT PRIMARY KEY,
`uuid` varchar(32) NOT NULL,
`ccuuid` varchar(64) NOT NULL,
`consent_opt_in` varchar(255) NOT NULL,
`consent_opt_out` varchar(255) NOT NULL,
`consent_date` datetime NOT NULL,
`user_agent` varchar(150) NOT NULL,
`url` varchar(100) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;

INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`) VALUES
(0, 'plg_system_privacyconsent', 'plugin', 'privacyconsent', 'system', 0, 1, 1, 0, 1, '', '', '');
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
--
-- Table structure for table "#__privacy_cookies"
--

CREATE TABLE IF NOT EXISTS "#__privacy_cookies" (
"id" serial NOT NULL,
"title" varchar(255) NOT NULL,
"alias" varchar(400) NOT NULL,
"cookie_name" varchar(255) NOT NULL,
"cookie_desc" varchar(255) NOT NULL,
"exp_period" varchar(20) NOT NULL,
"exp_value" integer DEFAULT 0 NOT NULL,
"catid" integer DEFAULT 0 NOT NULL,
"published" smallint DEFAULT 1 NOT NULL,
"ordering" integer DEFAULT 0 NOT NULL,
"created" timestamp without time zone NOT NULL,
"created_by" integer DEFAULT 0 NOT NULL,
"modified" timestamp without time zone NOT NULL,
"modified_by" integer DEFAULT 0 NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "#__privacy_cookies_idx_state" on "#__privacy_cookies" ("published");
CREATE INDEX "#__privacy_cookies_idx_catid" on "#__privacy_cookies" ("catid");
CREATE INDEX "#__privacy_cookies_idx_createdby" on "#__privacy_cookies" ("created_by");

--
-- Table structure for table "#__privacy_scripts"
--

CREATE TABLE IF NOT EXISTS "#__privacy_scripts" (
"id" serial NOT NULL,
"title" varchar(255) NOT NULL,
"alias" varchar(400) NOT NULL,
"position" integer DEFAULT 4 NOT NULL,
"type" integer DEFAULT 1 NOT NULL,
"code" text NOT NULL,
"catid" integer DEFAULT 0 NOT NULL,
"published" smallint DEFAULT 1 NOT NULL,
"ordering" integer DEFAULT 0 NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "#__privacy_scripts_idx_state" on "#__privacy_scripts" ("published");
CREATE INDEX "#__privacy_scripts_idx_catid" on "#__privacy_scripts" ("catid");

--
-- Table structure for table "#__privacy_cookie_consents"
--

CREATE TABLE IF NOT EXISTS "#__privacy_cookie_consents" (
"id" serial NOT NULL,
"uuid" varchar(32) NOT NULL,
"ccuuid" varchar(64) NOT NULL,
"consent_opt_in" varchar(255) NOT NULL,
"consent_opt_out" varchar(255) NOT NULL,
"consent_date" timestamp without time zone NOT NULL,
"user_agent" varchar(150) NOT NULL,
"url" varchar(100) NOT NULL,
PRIMARY KEY ("id")
);

INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
(0, 'plg_system_privacyconsent', 'plugin', 'privacyconsent', 'system', 0, 1, 1, 0, 1, '', '', '', 0, 0);
32 changes: 32 additions & 0 deletions administrator/components/com_menus/presets/alternate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,38 @@
element="com_privacy"
link="index.php?option=com_privacy&amp;view=consents"
/>

<menuitem
type="separator"
/>

<menuitem
title="MOD_MENU_COM_PRIVACY_CATEGORIES"
type="component"
element="com_privacy"
link="index.php?option=com_categories&amp;extension=com_privacy"
/>

<menuitem
title="MOD_MENU_COM_PRIVACY_COOKIES"
type="component"
element="com_privacy"
link="index.php?option=com_privacy&amp;view=cookies"
/>

<menuitem
title="MOD_MENU_COM_PRIVACY_SCRIPTS"
type="component"
element="com_privacy"
link="index.php?option=com_privacy&amp;view=scripts"
/>

<menuitem
title="MOD_MENU_COM_PRIVACY_COOKIE_CONSENTS"
type="component"
element="com_privacy"
link="index.php?option=com_privacy&amp;view=cookieconsents"
/>
</menuitem>

<menuitem
Expand Down
32 changes: 32 additions & 0 deletions administrator/components/com_menus/presets/default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,38 @@
element="com_privacy"
link="index.php?option=com_privacy&amp;view=consents"
/>

<menuitem
type="separator"
/>

<menuitem
title="MOD_MENU_COM_PRIVACY_CATEGORIES"
type="component"
element="com_privacy"
link="index.php?option=com_categories&amp;extension=com_privacy"
/>

<menuitem
title="MOD_MENU_COM_PRIVACY_COOKIES"
type="component"
element="com_privacy"
link="index.php?option=com_privacy&amp;view=cookies"
/>

<menuitem
title="MOD_MENU_COM_PRIVACY_SCRIPTS"
type="component"
element="com_privacy"
link="index.php?option=com_privacy&amp;view=scripts"
/>

<menuitem
title="MOD_MENU_COM_PRIVACY_COOKIE_CONSENTS"
type="component"
element="com_privacy"
link="index.php?option=com_privacy&amp;view=cookieconsents"
/>
</menuitem>

<menuitem
Expand Down
20 changes: 20 additions & 0 deletions administrator/components/com_privacy/access.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8" ?>
<access component="com_privacy">
<section name="component">
<action name="core.admin" title="JACTION_ADMIN" />
<action name="core.options" title="JACTION_OPTIONS" />
<action name="core.manage" title="JACTION_MANAGE" />
<action name="core.create" title="JACTION_CREATE" />
<action name="core.delete" title="JACTION_DELETE" />
<action name="core.edit" title="JACTION_EDIT" />
<action name="core.edit.state" title="JACTION_EDITSTATE" />
<action name="core.edit.own" title="JACTION_EDITOWN" />
</section>
<section name="category">
<action name="core.create" title="JACTION_CREATE" />
<action name="core.delete" title="JACTION_DELETE" />
<action name="core.edit" title="JACTION_EDIT" />
<action name="core.edit.state" title="JACTION_EDITSTATE" />
<action name="core.edit.own" title="JACTION_EDITOWN" />
</section>
</access>
Loading