satanasov · satanasov · Jul 31, 2025 · Jul 31, 2025
diff --git a/.gitattributes b/.gitattributes
@@ -1,9 +1,9 @@
-.gitattributes	export-ignore
-.idea	export-ignore
-phpunit.xml.dist	export-ignore
-.vscode	export-ignore
-.codegpt	export-ignore
-gallery-core.json	export-ignore
+.gitattributes			export-ignore
+.idea					export-ignore
+phpunit.xml.dist		export-ignore
+.vscode					export-ignore
+.codegpt				export-ignore
+gallery-core.json		export-ignore
 gallery-cleanup.json	export-ignore
-gallery-exif.json	export-ignore
-gallery-import.json	export-ignore
+gallery-exif.json		export-ignore
+gallery-import.json		export-ignore
diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,7 @@ env:
     - IMAGE_ICC="1"        # Should we run icc profile sniffer on your images?
     - EPV="1"              # Should we run EPV (Extension Pre Validator) on your code?
     - PHPBB_BRANCH="3.3.x"
-    - COVERAGE="1"		   # Should we run covarage?
+    - COVERAGE="1"		   # Should we run coverage?
 
 branches:
   only:
@@ -58,7 +58,7 @@ install:
   - sh -c "if [ '$COVER' != '0' ]; then sed -i '/phpenv/d' travis/setup-php-extensions.sh; fi"
   - travis/prepare-extension.sh $EXTNAME $PHPBB_BRANCH
   - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION
-  - sh -c "if [ '$COVERAGE' != '0' ] && [ '$COVER' != '0' ]; then phpBB/ext/$EXTNAME/travis/prepare-covarage.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
+  - sh -c "if [ '$COVERAGE' != '0' ] && [ '$COVER' != '0' ]; then phpBB/ext/$EXTNAME/travis/prepare-coverage.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
   - ../$EXTNAME/travis/prepare-epv.sh $EPV $NOTESTS
 
 before_script:

diff --git a/acpcleanup/acp/main_info.php b/acpcleanup/acp/main_info.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP CleanUp Extension
+* @package phpBB Gallery - ACP CleanUp Extension
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/acpcleanup/acp/main_module.php b/acpcleanup/acp/main_module.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP CleanUp Extension
+* @package phpBB Gallery - ACP CleanUp Extension
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/acpcleanup/cleanup.php b/acpcleanup/cleanup.php
@@ -144,16 +144,16 @@ public function delete_author_comments($comment_ids)
 	}
 
 	/**
-	* Delete unwanted and obsolent personal galleries.
+	* Delete unwanted and obsolete personal galleries.
 	*
 	* @param	array	$unwanted_pegas		User IDs we want to delete the pegas.
-	* @param	array	$obsolent_pegas		User IDs we want to delete the pegas.
+	* @param	array	$obsolete_pegas		User IDs we want to delete the pegas.
 	* @return	array	Language keys for the success messages.
 	*/
-	public function delete_pegas($unwanted_pegas, $obsolent_pegas)
+	public function delete_pegas($unwanted_pegas, $obsolete_pegas)
 	{
 
-		$delete_pegas = array_merge($unwanted_pegas, $obsolent_pegas);
+		$delete_pegas = array_merge($unwanted_pegas, $obsolete_pegas);
 
 		$delete_images = $delete_albums = $user_image_count = array();
 		$num_pegas = 0;
@@ -267,7 +267,7 @@ public function delete_pegas($unwanted_pegas, $obsolent_pegas)
 		\phpbbgallery\core\user::update_users($delete_pegas, array('personal_album_id' => 0));
 */
 		$return = array();
-		if ($obsolent_pegas)
+		if ($obsolete_pegas)
 		{
 			$return[] = 'CLEAN_PERSONALS_DONE';
 		}

diff --git a/acpcleanup/language/bg/info_acp_gallery_cleanup.php b/acpcleanup/language/bg/info_acp_gallery_cleanup.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP CleanUp Extension [English]
+* @package phpBB Gallery - ACP CleanUp Extension [English]
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/acpcleanup/language/de/info_acp_gallery_cleanup.php b/acpcleanup/language/de/info_acp_gallery_cleanup.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP CleanUp Extension [German]
+* @package phpBB Gallery - ACP CleanUp Extension [German]
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/acpcleanup/language/en/info_acp_gallery_cleanup.php b/acpcleanup/language/en/info_acp_gallery_cleanup.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP CleanUp Extension [English]
+* @package phpBB Gallery - ACP CleanUp Extension [English]
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/acpcleanup/language/fr/info_acp_gallery_cleanup.php b/acpcleanup/language/fr/info_acp_gallery_cleanup.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP CleanUp Extension [French]
+* @package phpBB Gallery - ACP CleanUp Extension [French]
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 * @translator fr (c) pokyto aka le.poke http://www.lestontonsfraggers.com inspired by darky - http://www.foruminfopc.fr/ and Team http://www.phpbb-fr.com/

diff --git a/acpcleanup/language/it/info_acp_gallery_cleanup.php b/acpcleanup/language/it/info_acp_gallery_cleanup.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP CleanUp Extension [English]
+* @package phpBB Gallery - ACP CleanUp Extension [English]
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/acpcleanup/language/ru/info_acp_gallery_cleanup.php b/acpcleanup/language/ru/info_acp_gallery_cleanup.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP CleanUp Extension [Russian]
+* @package phpBB Gallery - ACP CleanUp Extension [Russian]
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/acpimport/acp/main_info.php b/acpimport/acp/main_info.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP Import Extension
+* @package phpBB Gallery - ACP Import Extension
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/acpimport/acp/main_module.php b/acpimport/acp/main_module.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP Import Extension
+* @package phpBB Gallery - ACP Import Extension
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/acpimport/language/bg/info_acp_gallery_acpimport.php b/acpimport/language/bg/info_acp_gallery_acpimport.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP Import Extension [Bulgarian]
+* @package phpBB Gallery - ACP Import Extension [Bulgarian]
 * @copyright (c) 2014 Lucifer - http://www.anavaro.com/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/acpimport/language/de/info_acp_gallery_acpimport.php b/acpimport/language/de/info_acp_gallery_acpimport.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP Import Extension [English]
+* @package phpBB Gallery - ACP Import Extension [English]
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/acpimport/language/en/info_acp_gallery_acpimport.php b/acpimport/language/en/info_acp_gallery_acpimport.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP Import Extension [English]
+* @package phpBB Gallery - ACP Import Extension [English]
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/acpimport/language/fr/info_acp_gallery_acpimport.php b/acpimport/language/fr/info_acp_gallery_acpimport.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP Import Extension [French]
+* @package phpBB Gallery - ACP Import Extension [French]
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 * @translator fr (c) pokyto aka le.poke http://www.lestontonsfraggers.com inspired by darky - http://www.foruminfopc.fr/ and Team http://www.phpbb-fr.com/

diff --git a/acpimport/language/it/info_acp_gallery_acpimport.php b/acpimport/language/it/info_acp_gallery_acpimport.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP Import Extension [English]
+* @package phpBB Gallery - ACP Import Extension [English]
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/acpimport/language/ru/info_acp_gallery_acpimport.php b/acpimport/language/ru/info_acp_gallery_acpimport.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - ACP Import Extension [Russian]
+* @package phpBB Gallery - ACP Import Extension [Russian]
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/core/acp/config_info.php b/core/acp/config_info.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - Config ACP Module
+* @package phpBB Gallery - Config ACP Module
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/core/acp/config_module.php b/core/acp/config_module.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Gallery - Config ACP Module
+* @package phpBB Gallery - Config ACP Module
 * @copyright (c) 2012 nickvergessen - http://www.flying-bits.org/
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *

diff --git a/core/acp/main_module.php b/core/acp/main_module.php
@@ -528,7 +528,7 @@ function overview()
 		/* Resync stats as per server
 		 * Time: 0.271s
 		 * Queries: 1087
-		 * Peak Memmoty usage: 8.62MB
+		 * Peak Memory usage: 8.62MB
 		 */
 		if (isset($resync_albums_to_cpf_stage))
 		{

diff --git a/core/album/display.php b/core/album/display.php
@@ -492,7 +492,7 @@ public function display_albums($root_data = '', $display_moderators = true, $ret
 				unset($right_id);
 			}
 
-			// if this is invizible due zebra ... make it go away
+			// if this is invisible due zebra ... make it go away
 			if ($this->gallery_auth->get_zebra_state($zebra_array, (int) $row['album_user_id'], (int) $row['album_id']) < (int) $row['album_auth_access'])
 			{
 				continue;

diff --git a/core/album/manage.php b/core/album/manage.php
@@ -997,10 +997,10 @@ public function delete_album_content($album_id)
 		// Adjust users image counts
 		if (!empty($image_counts))
 		{
-			foreach ($image_counts as $image_user_id => $substract)
+			foreach ($image_counts as $image_user_id => $subtract)
 			{
 				$this->gallery_user->set_user_id($image_user_id);
-				$this->gallery_user->update_images((0 - $substract));
+				$this->gallery_user->update_images((0 - $subtract));
 			}
 		}
 
@@ -1072,7 +1072,7 @@ public function move_album_by($album_row, $action = 'move_up', $steps = 1)
 
 		/**
 		* $left_id and $right_id define the scope of the nodes that are affected by the move.
-		* $diff_up and $diff_down are the values to substract or add to each node's left_id
+		* $diff_up and $diff_down are the values to subtract or add to each node's left_id
 		* and right_id in order to move them up or down.
 		* $move_up_left and $move_up_right define the scope of the nodes that are moving
 		* up. Other nodes in the scope of ($left_id, $right_id) are considered to move down.

diff --git a/core/comment.php b/core/comment.php
@@ -175,6 +175,7 @@ public function sync_image_comments($image_ids = false)
 			GROUP BY comment_image_id, comment_id
 			ORDER BY comment_id DESC';
 		$result = $this->db->sql_query($sql);
+
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$resync[$row['comment_image_id']] = array(

diff --git a/core/controller/image.php b/core/controller/image.php
@@ -599,6 +599,7 @@ public function base($image_id, $page = 0)
 		{
 			$this->display_comments($image_id, $this->data, $album_id, $album_data, ($page - 1) * $this->gallery_config->get('items_per_page'), $this->gallery_config->get('items_per_page'));
 		}
+
 		return $this->helper->render('gallery/viewimage_body.html', $page_title);
 	}
 
@@ -640,9 +641,9 @@ protected function display_comments($image_id, $image_data, $album_id, $album_da
 
 			$this->load_users_data();
 
+			// Load online-information
 			if ($this->config['load_onlinetrack'] && sizeof($this->users_id_array))
 			{
-				// Load online-information
 				$sql = 'SELECT session_user_id, MAX(session_time) as online_time, MIN(session_viewonline) AS viewonline
 					FROM ' . SESSIONS_TABLE . '
 					WHERE ' . $this->db->sql_in_set('session_user_id', $this->users_id_array) . '
@@ -661,7 +662,7 @@ protected function display_comments($image_id, $image_data, $album_id, $album_da
 			{
 				$edit_info = '';
 
-				// Let's deply new profile
+				// Let's deploy new profile
 				$poster_id = $row['comment_user_id'];
 
 				if ($row['comment_edit_count'] > 0)

diff --git a/core/controller/index.php b/core/controller/index.php
@@ -229,7 +229,7 @@ public function base()
 			}
 		}
 		$this->display_legend();
-		$this->display_brithdays();
+		$this->display_birthdays();
 		$this->assign_dropdown_links('phpbbgallery_core_index');
 
 		$this->template->assign_block_vars('navlinks', array(
@@ -396,7 +396,7 @@ protected function display_legend()
 		));
 	}
 
-	protected function display_brithdays()
+	protected function display_birthdays()
 	{
 		// Generate birthday list if required ...
 		if ($this->config['load_birthdays'] && $this->config['allow_birthdays'] && $this->config['phpbb_gallery_disp_birthdays'] && $this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel'))

diff --git a/core/controller/moderate.php b/core/controller/moderate.php
@@ -330,7 +330,7 @@ public function action_log($page, $album_id)
 
 	/**
 	 * Index Controller
-	 *    Route: gallery/modarate/reports
+	 *    Route: gallery/moderate/reports
 	 *
 	 * @param $page
 	 * @param $album_id
@@ -536,7 +536,7 @@ public function album_overview($album_id, $page)
 
 	/**
 	 * Index Controller
-	 *    Route: gallery/modarate/image/{image_id}
+	 *    Route: gallery/moderate/image/{image_id}
 	 *
 	 * @param $image_id
 	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
@@ -687,7 +687,7 @@ public function image($image_id)
 
 	/**
 	 * Index Controller
-	 *    Route: gallery/modarate/image/{image_id}/approve
+	 *    Route: gallery/moderate/image/{image_id}/approve
 	 *
 	 * @param $image_id
 	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
@@ -754,7 +754,7 @@ public function approve($image_id)
 
 	/**
 	 * Index Controller
-	 *    Route: gallery/modarate/image/{image_id}/unapprove
+	 *    Route: gallery/moderate/image/{image_id}/unapprove
 	 *
 	 * @param $image_id
 	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
@@ -794,7 +794,7 @@ public function unapprove($image_id)
 
 	/**
 	 * Index Controller
-	 *    Route: gallery/modarate/image/{image_id}/move
+	 *    Route: gallery/moderate/image/{image_id}/move
 	 *
 	 * @param $image_id
 	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
@@ -842,7 +842,7 @@ public function move($image_id): \Symfony\Component\HttpFoundation\Response
 
 	/**
 	 * Index Controller
-	 *    Route: gallery/modarate/image/{image_id}/lock
+	 *    Route: gallery/moderate/image/{image_id}/lock
 	 *
 	 * @param $image_id
 	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object