Simplify solution

Author: Leinad4Mind

core/config/services_controller.yml

@@ -193,7 +193,6 @@ services:
             - '@phpbbgallery.core.image'
             - '@phpbbgallery.core.notification.helper'
             - '@phpbbgallery.core.url'
-            - '@phpbbgallery.core.config'
             - '@phpbbgallery.core.log'
             - '@phpbbgallery.core.report'
             - '@user_loader'

core/controller/moderate.php

@@ -62,9 +62,6 @@ class moderate
 	/** @var \phpbbgallery\core\url  */
 	protected $url;
 
-	/** @var \phpbbgallery\core\config  */
-	protected $gallery_config;
-
 	/** @var \phpbbgallery\core\log  */
 	protected $gallery_log;
 
@@ -97,7 +94,6 @@ class moderate
 	 * @param \phpbbgallery\core\image\image         $image
 	 * @param \phpbbgallery\core\notification\helper $notification_helper
 	 * @param \phpbbgallery\core\url                 $url
-	 * @param \phpbbgallery\core\config              $gallery_config
 	 * @param \phpbbgallery\core\log                 $gallery_log
 	 * @param \phpbbgallery\core\report              $report
 	 * @param \phpbb\user_loader                     $user_loader
@@ -110,7 +106,7 @@ public function __construct(\phpbb\config\config $config, \phpbb\request\request
 		\phpbb\template\template $template, \phpbb\user $user, \phpbb\language\language $language,
 		\phpbb\controller\helper $helper, \phpbbgallery\core\album\display $display, \phpbbgallery\core\moderate $moderate,
 		\phpbbgallery\core\auth\auth $gallery_auth, \phpbbgallery\core\misc $misc, \phpbbgallery\core\album\album $album, \phpbbgallery\core\image\image $image,
-		\phpbbgallery\core\notification\helper $notification_helper, \phpbbgallery\core\url $url, \phpbbgallery\core\config $gallery_config, \phpbbgallery\core\log $gallery_log,
+		\phpbbgallery\core\notification\helper $notification_helper, \phpbbgallery\core\url $url, \phpbbgallery\core\log $gallery_log,
 		\phpbbgallery\core\report $report, \phpbb\user_loader $user_loader,
 		$root_path, $php_ext)
 	{
@@ -128,7 +124,6 @@ public function __construct(\phpbb\config\config $config, \phpbb\request\request
 		$this->image = $image;
 		$this->notification_helper = $notification_helper;
 		$this->url = $url;
-		$this->gallery_config = $gallery_config;
 		$this->gallery_log = $gallery_log;
 		$this->report = $report;
 		$this->user_loader = $user_loader;
@@ -329,8 +324,8 @@ public function action_log($page, $album_id)
 			'U_GALLERY_MCP_LOGS'			=> $album_id > 0 ? $this->helper->route('phpbbgallery_core_moderate_action_log_album', array('album_id' => $album_id)) : $this->helper->route('phpbbgallery_core_moderate_action_log'),
 			'U_ALBUM_NAME'					=> $album_id > 0 ? $album['album_name'] : false,
 		));
-		$limit = $this->gallery_config->get('items_per_page');
-		$this->gallery_log->build_list('moderator', $limit, $page, $album_id);
+
+		$this->gallery_log->build_list('moderator', 0, $page, $album_id);
 		return $this->helper->render('gallery/moderate_actions.html', $this->language->lang('GALLERY'));
 	}
 

core/log.php

@@ -132,7 +132,11 @@ public function build_list($type, $limit = 0, $page = 1, $album = 0, $image = 0,
 		if ($limit == 0)
 		{
 			$limit = $this->gallery_config->get('items_per_page');
-			$page = (int) ($page / $limit) + 1;
+			// If its called from ACP album is -1, if from MCP then is not
+			if ($album == -1)
+			{
+				$page = (int) ($page / $limit) + 1;
+			}
 		}
 		$this->language->add_lang(['info_acp_gallery_logs'], 'phpbbgallery/core');
 

tests/controller/gallery_moderate_test.php

@@ -63,7 +63,6 @@ public function get_controller($user_id, $group, $is_registered)
 			$this->gallery_image,
 			$this->gallery_notification_helper,
 			$this->gallery_url,
-			$this->gallery_config,
 			$this->log,
 			$this->gallery_report,
 			$this->user_loader,