Partly fix services, tables and migrations

Author: Crizz0

acp/acp_pastebin_info.php

@@ -8,23 +8,23 @@
 
 class acp_pastebin_info
 {
-    function module()
-    {
-        return [
-            'filename'	=> 'phpbbde\pastebin\acp\acp_pastebin_module_info',
-            'title'		=> 'PASTEBIN_NAV_TITLE',
-            'modes'     => [
-                'settings' => [
-                    'title'     => 'PASTEBIN_NAV_CONFIG',
-                    'auth'      => 'ext_phpbbde/pastebin && a_pastebin',
-                    'cat'       => ['ACP_PASTEBIN_TITLE']
-                ],
+	function module()
+	{
+		return [
+			'filename' => 'phpbbde\pastebin\acp\acp_pastebin_module',
+			'title' => 'PASTEBIN_NAV_TITLE',
+			'modes' => [
+				'settings' => [
+					'title' => 'PASTEBIN_NAV_CONFIG',
+					'auth' => 'ext_phpbbde/pastebin && acl_a_pastebin',
+					'cat' => ['ACP_PASTEBIN_TITLE']
+				],
 				'languages' => [
-					'title'     => 'PASTEBIN_NAV_LANGS',
-					'auth'      => 'ext_phpbbde/pastebin && a_pastebin',
-					'cat'       => ['ACP_PASTEBIN_TITLE']
+					'title' => 'PASTEBIN_NAV_LANGS',
+					'auth' => 'ext_phpbbde/pastebin && acl_a_pastebin',
+					'cat' => ['ACP_PASTEBIN_TITLE']
 				],
-            ],
-        ];
-    }
+			],
+		];
+	}
 }

adm/style/acp_pastebin_langs.html

@@ -18,11 +18,7 @@ <h1>{{ lang('PASTEBIN_LANG_CONFIG') }}</h1>
     </thead>
     <tbody>
     {% for item in loops.langlist %}
-        {% if loop.index is even %}
-            <tr class="row1">
-        {% else %}
-            <tr class="row2">
-        {% endif %}
+        <tr>
             <td>{{ item.LANG_ID }}</td>
             <td>{{ item.LANG_NAME }}</td>
             <td>{{ item.LANG_NAME_CLEAN }}</td>
@@ -33,5 +29,13 @@ <h1>{{ lang('PASTEBIN_LANG_CONFIG') }}</h1>
     </tbody>
 </table>
 
+<dl>
+    <dt><label for="allowed">{L_ALLOWED}{L_COLON}</label></dt>
+    <dd><input type="checkbox" class="radio" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd>
+</dl>
+
+<td class="centered-text"><input type="checkbox" class="radio" name="delete[{{ attachments.ATTACH_ID }}]" /></td>
+
+TODO: Add submit button, form drumherum, checkbox für LANG_ACTIVE und input feld für FILE_EXTENSION
 
 {% include 'overall_footer.html' %}

config/services.yml

@@ -10,15 +10,16 @@ services:
     phpbbde.pastebin.functions.utility:
         class: phpbbde\pastebin\functions\utility
         arguments:
-            - '%phpbbde.pastebin.hightlightlangs%'
             - '%core.php_ext%'
             - '@language'
+
     phpbbde.pastebin.functions.pastebin:
         class: phpbbde\pastebin\functions\pastebin
         arguments:
             - '@dbal.conn'
             - '@user'
-            - '%tables.phpbbde.pastebin.pastebin%'
+            - '%phpbbde.pastebin.tables.pastebin%'
+
     phpbbde.pastebin.controller.main:
         class: phpbbde\pastebin\controller\main
         arguments:
@@ -37,7 +38,8 @@ services:
             - '@phpbbde.pastebin.functions.pastebin'
             - '%core.root_path%'
             - '%core.php_ext%'
-            - '%tables.phpbbde.pastebin.pastebin%'
+            - '%phpbbde.pastebin.tables.pastebin%'
+
     phpbbde.pastebin.settings.acp:
         class: phpbbde\pastebin\controller\acp_pastebin_settings
         arguments:
@@ -47,6 +49,7 @@ services:
             - '@language'
             - '@request'
             - '@template'
+
     phpbbde.pastebin.languages.acp:
         class: phpbbde\pastebin\controller\acp_pastebin_languages
         arguments:
@@ -55,7 +58,7 @@ services:
             - '@request'
             - '@dbal.conn'
             - '@template'
-            - '%phpbbde.pastebin.tables.pastebin_langs'
+
     phpbbde.pastebin.base_listener:
         class: phpbbde\pastebin\event\base_events
         arguments:
@@ -71,14 +74,22 @@ services:
         class: phpbbde\pastebin\event\acp_events
         tags:
             - {name: event.listener}
+
     phpbbde.pastebin.cron.main:
         class: phpbbde\pastebin\cron\main
         arguments:
             - '@config'
             - '@dbal.conn'
             - '%phpbbde.pastebin.cron.prune_interval%'
-            - '%tables.phpbbde.pastebin.pastebin%'
+            - '%phpbbde.pastebin.tables.pastebin%'
         calls:
             - [set_name, [phpbbde.pastebin.cron.main]]
         tags:
             - {name: cron.task}
+
+    phpbbde.pastebin.listener:
+        class: phpbbde\pastebin\event\permission_listener
+        arguments:
+            - '@auth'
+        tags:
+            - { name: event.listener }

config/tables.yml

@@ -1,3 +1,2 @@
 parameters:
-  phpbbde.pastebin.tables.pastebin: '%core.table_prefix%pastebin'
-  phpbbde.pastebin.tables.pastebin_langs: '%core.table_prefix%pastebin_langs'
+  phpbbde.pastebin.tables.pastebin: '%core.table_prefix%pastebin'

controller/acp_pastebin_languages.php

@@ -26,8 +26,6 @@ public function module_settings(): void
 
 		$result = $this->db->sql_query($sql);
 
-		$this->db->sql_freeresult($result);
-
 		while ($rows = $this->db->sql_fetchrow($result))
 		{
 			$this->template->assign_block_vars('langlist', [
@@ -38,5 +36,7 @@ public function module_settings(): void
 				'LANG_FILE_EXTENSION' 	=> $rows['lang_file_extension'],
 			]);
 		};
+
+		$this->db->sql_freeresult($result);
 	}
 }

event/permission_listener.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ *
+ *
+ */
+
+namespace phpbbde\pastebin\event;
+
+/**
+ * @ignore
+ */
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Event listener
+ */
+
+class permission_listener implements EventSubscriberInterface
+{
+	public function __construct(protected \phpbb\auth\auth $auth)
+	{
+	}
+
+	public static function getSubscribedEvents()
+	{
+		return array(
+			'core.permissions' => 'permissions',
+		);
+	}
+
+	/**
+	 * Add permissions
+	 *
+	 * @param	object	$event	The event object
+	 * @return	null
+	 * @access	public
+	 */
+	public function permissions($event)
+	{
+		$permissions = $event['permissions'];
+		$permissions['a_pastebin'] = array('lang' => 'ACL_A_PASTEBIN', 'cat' => 'misc');
+		$event['permissions'] = $permissions;
+	}
+}