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

Commit b125697

Browse files
SoftCreatRSoftCreatR
committed
Preparing release 1.2.0
- Added user group option to disable the plugin for certain user groups
1 parent b51fb63 commit b125697

File tree

7 files changed

+46
-2
lines changed

7 files changed

+46
-2
lines changed

‎files/lib/system/event/listener/ScUploadFilterAbstractPageListener.class.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ class ScUploadFilterAbstractPageListener implements IParameterizedEventListener
1515
/**
1616
* @inheritDoc
1717
*/
18-
public function execute($eventObj, $className, $eventName, array &$parameters) {
18+
public function execute($eventObj, $className, $eventName, array &$parameters) {
19+
if (WCF::getSession()->getPermission('user.uploadFilter.canIgnoreUploadFilter')) return;
20+
1921
$tz = WCF::getUser()->getTimeZone();
2022
$now = new DateTime('now', $tz);
2123
$start = DateTime::createFromFormat('!Y-m-d', SC_UPLOAD_FREE_SUNDAY_START_DATE, $tz);

‎files/lib/system/event/listener/ScUploadFilterAttachmentListListener.class.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class ScUploadFilterAttachmentListListener implements IParameterizedEventListene
1515
* @inheritDoc
1616
*/
1717
public function execute($eventObj, $className, $eventName, array &$parameters) {
18+
if (WCF::getSession()->getPermission('user.uploadFilter.canIgnoreUploadFilter')) return;
1819
if (!SC_UPLOAD_FREE_SUNDAY_HIDE_ATTACHMENTS) return;
1920

2021
$tz = WCF::getUser()->getTimeZone();

‎files/lib/system/event/listener/ScUploadFilterHtmlOutputListener.class.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ class ScUploadFilterHtmlOutputListener implements IParameterizedEventListener {
1818
* @inheritDoc
1919
*/
2020
public function execute($eventObj, $className, $eventName, array &$parameters) {
21+
if (WCF::getSession()->getPermission('user.uploadFilter.canIgnoreUploadFilter')) return;
22+
2123
$tz = WCF::getUser()->getTimeZone();
2224
$now = new DateTime('now', $tz);
2325
$start = DateTime::createFromFormat('!Y-m-d', SC_UPLOAD_FREE_SUNDAY_START_DATE, $tz);

‎language/de.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
<item name="wcf.message.error.scUploadFilter"><![CDATA[Diese{if $type === 'image'}s Bild{elseif $type === 'quote'}s Zitat{elseif $type === 'media'}s Medium{else}r Dateianhang{/if} wird aktuell auf mögliche Urheberrechtsverstöße geprüft. Voraussichtlicher Abschluss der Prüfung: <strong>Wird berechnet...</strong>.<br /><br /><i class="icon icon16 fa-info-circle"></i> <a href="https://pledge2019.eu/de">Weitere Informationen</a>]]></item>
55
</category>
66

7+
<category name="wcf.acp.group">
8+
<item name="wcf.acp.group.option.category.user.uploadFilter"><![CDATA[Uploadfreier Sonntag]]></item>
9+
<item name="wcf.acp.group.option.user.uploadFilter.canIgnoreUploadFilter"><![CDATA[Kann die Einschränkungen des "Uploadfreien Sonntag" umgehen]]></item>
10+
</category>
11+
712
<category name="wcf.acp.option">
813
<item name="wcf.acp.option.category.sc_upload_free_sunday"><![CDATA[Uploadfreier Sonntag]]></item>
914
<item name="wcf.acp.option.category.sc_upload_free_sunday.general"><![CDATA[Allgemein]]></item>

‎language/en.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
<item name="wcf.message.error.scUploadFilter"><![CDATA[This {if $type === 'image'}image{elseif $type === 'quote'}quote{elseif $type === 'media'}media{else}attachment{/if} is being checked for possible copyright issues. Current predicted waiting time: <strong>Calculating...</strong>.<br /><br /><i class="icon icon16 fa-info-circle"></i> <a href="https://pledge2019.eu/en">More informations</a>]]></item>
55
</category>
66

7+
<category name="wcf.acp.group">
8+
<item name="wcf.acp.group.option.category.user.uploadFilter"><![CDATA[Upload Free Sunday]]></item>
9+
<item name="wcf.acp.group.option.user.uploadFilter.canIgnoreUploadFilter"><![CDATA[Can avoid the "Upload Free Sunday" restrictions]]></item>
10+
</category>
11+
712
<category name="wcf.acp.option">
813
<item name="wcf.acp.option.category.sc_upload_free_sunday"><![CDATA[Upload Free Sunday]]></item>
914
<item name="wcf.acp.option.category.sc_upload_free_sunday.general"><![CDATA[General]]></item>

‎package.xml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<packagedescription><![CDATA[Provides functionalities for the "upload free sunday" on 03rd March 2019.]]></packagedescription>
77
<packagedescription language="de"><![CDATA[Stellt Funktionalitäten für den "Uploadfreien Sonntag" am 03. März 2019 zur Verfügung.]]></packagedescription>
88
<packageurl><![CDATA[https://support.softcreatr.com/thread/2985-artikel-13-uploadfreier-sonntag-wsc-plugin/]]></packageurl>
9-
<version>1.1.0 pl 2</version>
9+
<version>1.2.0</version>
1010
<date>2019-03-03</date>
1111
<license><![CDATA[GNU General Public License <https://www.gnu.org/licenses/gpl-3.0.txt>]]></license>
1212
</packageinformation>
@@ -34,6 +34,7 @@
3434
<instruction type="option" />
3535
<instruction type="eventListener" />
3636
<instruction type="templateListener" />
37+
<instruction type="userGroupOption" />
3738
<instruction type="language" />
3839
</instructions>
3940

@@ -84,4 +85,14 @@
8485
<!-- config -->
8586
<instruction type="templateListener" />
8687
</instructions>
88+
89+
<instructions type="update" fromversion="1.1.0 pl 2">
90+
<!-- files -->
91+
<instruction type="file" />
92+
93+
<!-- config -->
94+
<instruction type="templateListener" />
95+
<instruction type="userGroupOption" />
96+
<instruction type="language" />
97+
</instructions>
8798
</package>

‎userGroupOption.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<data xmlns="https://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.woltlab.com https://www.woltlab.com/XSD/vortex/userGroupOption.xsd">
3+
<import>
4+
<categories>
5+
<category name="user.uploadFilter">
6+
<parent>user</parent>
7+
</category>
8+
</categories>
9+
10+
<options>
11+
<option name="user.uploadFilter.canIgnoreUploadFilter">
12+
<categoryname>user.uploadFilter</categoryname>
13+
<optiontype>boolean</optiontype>
14+
<defaultvalue>0</defaultvalue>
15+
</option>
16+
</options>
17+
</import>
18+
</data>

0 commit comments

Comments
 (0)