Add flags to extension

rmcgirr83 · Aug 10, 2024 · 3bde9c4 · 3bde9c4
1 parent e76b15b
commit 3bde9c4
Show file tree

Hide file tree

Showing 264 changed files with 244 additions and 22 deletions.
diff --git a/adm/style/nationalflags_manage.html b/adm/style/nationalflags_manage.html
@@ -59,7 +59,7 @@ <h3>{{ lang('ERROR') }}</h3>
 	</fieldset>
 	<fieldset>
 		<dl>
-			<dt>{{ lang('IMAGES_ON_SERVER') }}{{ lang('COLON') }}</dt>
+			<dt>{{ L_IMAGES_ON_SERVER }}{{ lang('COLON') }}</dt>
 			<dd>{{ FLAG_LIST }}</dd>
 		</dl>
 	</fieldset>

diff --git a/composer.json b/composer.json
@@ -3,8 +3,8 @@
     "type": "phpbb-extension",
     "description": "Allows a user to be able to choose a national flag and have a top (those with the most users selecting the flag) number of flags display on the index page of a phpBB forum.  Header is link to a listing of all users of a flag.  Clicking on user count of the flag displays the users that have that flag set.  This extension requires at least phpBB version 3.3.4. Must have version 2.0.0 of Collapsible Forum Categories to take advantage of that extension.",
     "homepage": "https://github.com/rmcgirr83/nationalflags",
-    "version": "2.3.5",
-    "time": "2023-01-24",
+    "version": "2.4.0",
+    "time": "2024-08-10",
     "keywords": [
         "phpbb",
         "extension",
@@ -23,14 +23,14 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
-        "phpbb/phpbb": ">=3.3.4",
+        "php": ">=7.4",
+        "phpbb/phpbb": ">=3.3",
         "composer/installers": "~1.0"
     },
     "extra": {
         "display-name": "National Flags",
         "soft-require": {
-            "phpbb/phpbb": ">=3.3.4"
+            "phpbb/phpbb": ">=3.3"
         },
         "version-check": {
             "host": "www.phpbb.com",

diff --git a/controller/admin_controller.php b/controller/admin_controller.php
@@ -35,7 +35,7 @@ class admin_controller
 	* define our constants
 	**/
 	const MAX_WIDTH = 32;
-	const MAX_HEIGHT = 32;
+	const MAX_HEIGHT = 24;
 
 	/** @var cache $cache */
 	protected $cache;
@@ -356,15 +356,17 @@ public function add_flag()
 				$this->log_message('LOG_FLAG_ADD', $flag_row['flag_name'], 'MSG_FLAG_ADDED');
 			}
 		}
-
+		$flag_list =  $this->list_flag_names();
+		$flag_count = sizeof(explode(",", $flag_list));
 		$this->template->assign_vars([
 			'L_TITLE'		=> $this->language->lang('FLAG_ADD'),
+			'L_IMAGES_ON_SERVER'	=> $this->language->lang('IMAGES_ON_SERVER', $flag_count),
 			'U_ACTION'		=> $this->u_action . '&amp;action=add',
 			'U_BACK'		=> $this->u_action,
 			'FLAG_NAME'		=> $flag_row['flag_name'],
 			'FLAG_IMAGE'	=> $flag_row['flag_image'],
 			'ERROR_MSG'		=> (sizeof($errors)) ? implode('<br>', $errors) : '',
-			'FLAG_LIST'		=> $this->list_flag_names(),
+			'FLAG_LIST'		=> $flag_list,
 
 			'S_ADD_FLAG'	=> true,
 			'S_ERROR'		=> (sizeof($errors)) ? true : false,
@@ -434,8 +436,11 @@ public function edit_flag($flag_id)
 		}
 
 		$found_flag = $this->ext_path_web . 'flags/' . $row['flag_image'];
+		$flag_list =  $this->list_flag_names();
+		$flag_count = sizeof(explode(",", $flag_list));
 		$this->template->assign_vars([
 			'L_TITLE'		=> $this->language->lang('FLAG_EDIT'),
+			'L_IMAGES_ON_SERVER'	=> $this->language->lang('IMAGES_ON_SERVER', $flag_count),
 			'U_ACTION'		=> $this->u_action . "&amp;flag_id=$flag_id&amp;action=edit",
 			'U_BACK'		=> $this->u_action . '&amp;mode=manage',
 			'ERROR_MSG'		=> (sizeof($errors)) ? implode('<br>', $errors) : '',
@@ -445,7 +450,7 @@ public function edit_flag($flag_id)
 			'FLAG_ID'		=> $row['flag_id'],
 			'FLAG_DEFAULT'	=> $row['flag_default'],
 			'FOUND_FLAG'	=> (!empty($found_flag)) ? $found_flag : '',
-			'FLAG_LIST'		=> $this->list_flag_names(),
+			'FLAG_LIST'		=> $flag_list,
 
 			'S_ADD_FLAG'	=> true,
 			'S_UPLOAD_FLAG'	=> $this->can_upload_flag(),

diff --git a/ext.php b/ext.php
@@ -22,7 +22,7 @@ class ext extends \phpbb\extension\base
 	 */
 	public function is_enableable()
 	{
-		$enableable = (phpbb_version_compare(PHPBB_VERSION, '3.3.4', '>=') && version_compare(PHP_VERSION, '7.2.*', '>'));
+		$enableable = (phpbb_version_compare(PHPBB_VERSION, '3.3', '>=') && version_compare(PHP_VERSION, '7.4.*', '>'));
 		if (!$enableable)
 		{
 			$language = $this->container->get('language');

diff --git a/flags/ad.png b/flags/ad.png
diff --git a/flags/ae.png b/flags/ae.png
diff --git a/flags/af.png b/flags/af.png
diff --git a/flags/ag.png b/flags/ag.png
diff --git a/flags/ai.png b/flags/ai.png
diff --git a/flags/al.png b/flags/al.png
diff --git a/flags/am.png b/flags/am.png
diff --git a/flags/ao.png b/flags/ao.png
diff --git a/flags/aq.png b/flags/aq.png
diff --git a/flags/ar.png b/flags/ar.png
diff --git a/flags/as.png b/flags/as.png
diff --git a/flags/at.png b/flags/at.png
diff --git a/flags/au.png b/flags/au.png
diff --git a/flags/aw.png b/flags/aw.png
diff --git a/flags/ax.png b/flags/ax.png
diff --git a/flags/az.png b/flags/az.png
diff --git a/flags/ba.png b/flags/ba.png
diff --git a/flags/bb.png b/flags/bb.png
diff --git a/flags/bd.png b/flags/bd.png
diff --git a/flags/be.png b/flags/be.png
diff --git a/flags/bf.png b/flags/bf.png
diff --git a/flags/bg.png b/flags/bg.png
diff --git a/flags/bh.png b/flags/bh.png
diff --git a/flags/bi.png b/flags/bi.png
diff --git a/flags/bj.png b/flags/bj.png
diff --git a/flags/bl.png b/flags/bl.png
diff --git a/flags/bm.png b/flags/bm.png
diff --git a/flags/bn.png b/flags/bn.png
diff --git a/flags/bo.png b/flags/bo.png
diff --git a/flags/bq.png b/flags/bq.png
diff --git a/flags/br.png b/flags/br.png
diff --git a/flags/bs.png b/flags/bs.png
diff --git a/flags/bt.png b/flags/bt.png
diff --git a/flags/bv.png b/flags/bv.png
diff --git a/flags/bw.png b/flags/bw.png
diff --git a/flags/by.png b/flags/by.png
diff --git a/flags/bz.png b/flags/bz.png
diff --git a/flags/ca.png b/flags/ca.png
diff --git a/flags/cc.png b/flags/cc.png
diff --git a/flags/cd.png b/flags/cd.png
diff --git a/flags/cf.png b/flags/cf.png
diff --git a/flags/cg.png b/flags/cg.png
diff --git a/flags/ch.png b/flags/ch.png
diff --git a/flags/ci.png b/flags/ci.png
diff --git a/flags/ck.png b/flags/ck.png
diff --git a/flags/cl.png b/flags/cl.png
diff --git a/flags/cm.png b/flags/cm.png
diff --git a/flags/cn.png b/flags/cn.png
diff --git a/flags/co.png b/flags/co.png
diff --git a/flags/cr.png b/flags/cr.png
diff --git a/flags/cu.png b/flags/cu.png
diff --git a/flags/cv.png b/flags/cv.png
diff --git a/flags/cw.png b/flags/cw.png
diff --git a/flags/cx.png b/flags/cx.png
diff --git a/flags/cy.png b/flags/cy.png
diff --git a/flags/cz.png b/flags/cz.png
diff --git a/flags/de.png b/flags/de.png
diff --git a/flags/dj.png b/flags/dj.png
diff --git a/flags/dk.png b/flags/dk.png
diff --git a/flags/dm.png b/flags/dm.png
diff --git a/flags/do.png b/flags/do.png
diff --git a/flags/dz.png b/flags/dz.png
diff --git a/flags/ec.png b/flags/ec.png
diff --git a/flags/ee.png b/flags/ee.png
diff --git a/flags/eg.png b/flags/eg.png
diff --git a/flags/eh.png b/flags/eh.png
diff --git a/flags/er.png b/flags/er.png
diff --git a/flags/es.png b/flags/es.png
diff --git a/flags/et.png b/flags/et.png
diff --git a/flags/fi.png b/flags/fi.png
diff --git a/flags/fj.png b/flags/fj.png
diff --git a/flags/fk.png b/flags/fk.png
diff --git a/flags/fm.png b/flags/fm.png
diff --git a/flags/fo.png b/flags/fo.png
diff --git a/flags/fr.png b/flags/fr.png
diff --git a/flags/ga.png b/flags/ga.png
diff --git a/flags/gb-eng.png b/flags/gb-eng.png
diff --git a/flags/gb-nir.png b/flags/gb-nir.png
diff --git a/flags/gb-sct.png b/flags/gb-sct.png
diff --git a/flags/gb-wls.png b/flags/gb-wls.png
diff --git a/flags/gb.png b/flags/gb.png
diff --git a/flags/gd.png b/flags/gd.png
diff --git a/flags/ge.png b/flags/ge.png
diff --git a/flags/gf.png b/flags/gf.png
diff --git a/flags/gg.png b/flags/gg.png
diff --git a/flags/gh.png b/flags/gh.png
diff --git a/flags/gi.png b/flags/gi.png
diff --git a/flags/gl.png b/flags/gl.png
diff --git a/flags/gm.png b/flags/gm.png
diff --git a/flags/gn.png b/flags/gn.png
diff --git a/flags/gp.png b/flags/gp.png
diff --git a/flags/gq.png b/flags/gq.png
diff --git a/flags/gr.png b/flags/gr.png
diff --git a/flags/gs.png b/flags/gs.png
diff --git a/flags/gt.png b/flags/gt.png
diff --git a/flags/gu.png b/flags/gu.png
diff --git a/flags/gw.png b/flags/gw.png
diff --git a/flags/gy.png b/flags/gy.png
diff --git a/flags/hk.png b/flags/hk.png
diff --git a/flags/hm.png b/flags/hm.png
diff --git a/flags/hn.png b/flags/hn.png
diff --git a/flags/hr.png b/flags/hr.png
diff --git a/flags/ht.png b/flags/ht.png
diff --git a/flags/hu.png b/flags/hu.png
diff --git a/flags/id.png b/flags/id.png
diff --git a/flags/ie.png b/flags/ie.png
diff --git a/flags/il.png b/flags/il.png
diff --git a/flags/im.png b/flags/im.png
diff --git a/flags/in.png b/flags/in.png
diff --git a/flags/io.png b/flags/io.png
diff --git a/flags/iq.png b/flags/iq.png
diff --git a/flags/ir.png b/flags/ir.png
diff --git a/flags/is.png b/flags/is.png
diff --git a/flags/it.png b/flags/it.png
diff --git a/flags/je.png b/flags/je.png
diff --git a/flags/jm.png b/flags/jm.png
diff --git a/flags/jo.png b/flags/jo.png
diff --git a/flags/jp.png b/flags/jp.png
diff --git a/flags/ke.png b/flags/ke.png
diff --git a/flags/kg.png b/flags/kg.png
diff --git a/flags/kh.png b/flags/kh.png
diff --git a/flags/ki.png b/flags/ki.png
diff --git a/flags/km.png b/flags/km.png
diff --git a/flags/kn.png b/flags/kn.png
diff --git a/flags/kp.png b/flags/kp.png
diff --git a/flags/kr.png b/flags/kr.png
diff --git a/flags/kw.png b/flags/kw.png
diff --git a/flags/ky.png b/flags/ky.png
diff --git a/flags/kz.png b/flags/kz.png
diff --git a/flags/la.png b/flags/la.png
diff --git a/flags/lb.png b/flags/lb.png
diff --git a/flags/lc.png b/flags/lc.png
diff --git a/flags/li.png b/flags/li.png
diff --git a/flags/lk.png b/flags/lk.png
diff --git a/flags/lr.png b/flags/lr.png
diff --git a/flags/ls.png b/flags/ls.png
diff --git a/flags/lt.png b/flags/lt.png
diff --git a/flags/lu.png b/flags/lu.png
diff --git a/flags/lv.png b/flags/lv.png
diff --git a/flags/ly.png b/flags/ly.png
diff --git a/flags/ma.png b/flags/ma.png
diff --git a/flags/mc.png b/flags/mc.png
diff --git a/flags/md.png b/flags/md.png
diff --git a/flags/me.png b/flags/me.png
diff --git a/flags/mf.png b/flags/mf.png
diff --git a/flags/mg.png b/flags/mg.png
diff --git a/flags/mh.png b/flags/mh.png
diff --git a/flags/mk.png b/flags/mk.png
diff --git a/flags/ml.png b/flags/ml.png
diff --git a/flags/mm.png b/flags/mm.png
diff --git a/flags/mn.png b/flags/mn.png
diff --git a/flags/mo.png b/flags/mo.png
diff --git a/flags/mp.png b/flags/mp.png
diff --git a/flags/mq.png b/flags/mq.png
diff --git a/flags/mr.png b/flags/mr.png
diff --git a/flags/ms.png b/flags/ms.png
diff --git a/flags/mt.png b/flags/mt.png
diff --git a/flags/mu.png b/flags/mu.png
diff --git a/flags/mv.png b/flags/mv.png
diff --git a/flags/mw.png b/flags/mw.png
diff --git a/flags/mx.png b/flags/mx.png
diff --git a/flags/my.png b/flags/my.png
diff --git a/flags/mz.png b/flags/mz.png
diff --git a/flags/na.png b/flags/na.png
diff --git a/flags/nc.png b/flags/nc.png
diff --git a/flags/ne.png b/flags/ne.png
diff --git a/flags/nf.png b/flags/nf.png
diff --git a/flags/ng.png b/flags/ng.png
diff --git a/flags/ni.png b/flags/ni.png
diff --git a/flags/nl.png b/flags/nl.png
diff --git a/flags/no.png b/flags/no.png
diff --git a/flags/np.png b/flags/np.png
diff --git a/flags/nr.png b/flags/nr.png
diff --git a/flags/nu.png b/flags/nu.png
diff --git a/flags/nz.png b/flags/nz.png
diff --git a/flags/om.png b/flags/om.png
diff --git a/flags/pa.png b/flags/pa.png
diff --git a/flags/pe.png b/flags/pe.png
diff --git a/flags/pf.png b/flags/pf.png
diff --git a/flags/pg.png b/flags/pg.png
diff --git a/flags/ph.png b/flags/ph.png
diff --git a/flags/pk.png b/flags/pk.png
diff --git a/flags/pl.png b/flags/pl.png
diff --git a/flags/pm.png b/flags/pm.png
diff --git a/flags/pn.png b/flags/pn.png
diff --git a/flags/pr.png b/flags/pr.png
diff --git a/flags/ps.png b/flags/ps.png
diff --git a/flags/pt.png b/flags/pt.png
diff --git a/flags/pw.png b/flags/pw.png
diff --git a/flags/py.png b/flags/py.png
diff --git a/flags/qa.png b/flags/qa.png
diff --git a/flags/re.png b/flags/re.png
diff --git a/flags/readme.txt b/flags/readme.txt
@@ -1,9 +1,5 @@
-Flag icons - http://www.famfamfam.com
+Flag icons - https://flagpedia.net/download/icons
 
 These icons are public domain, and as such are free for any use (attribution appreciated but not required).
 
-Note that these flags are named using the ISO3166-1 alpha-2 country codes where appropriate. A list of codes can be found at http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
-
-If you find these icons useful, please donate via paypal to [email protected] (or click the donate button available at http://www.famfamfam.com/lab/icons/silk)
-
-Contact: [email protected]
+Note that these flags are named using the ISO3166-1 alpha-2 country codes where appropriate. A list of codes can be found at http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
diff --git a/flags/ro.png b/flags/ro.png
diff --git a/flags/rs.png b/flags/rs.png
diff --git a/flags/ru.png b/flags/ru.png
diff --git a/flags/rw.png b/flags/rw.png
diff --git a/flags/sa.png b/flags/sa.png
diff --git a/flags/sb.png b/flags/sb.png
diff --git a/flags/sc.png b/flags/sc.png
diff --git a/flags/sd.png b/flags/sd.png
diff --git a/flags/se.png b/flags/se.png
diff --git a/flags/sg.png b/flags/sg.png
diff --git a/flags/sh.png b/flags/sh.png
diff --git a/flags/si.png b/flags/si.png
diff --git a/flags/sj.png b/flags/sj.png
diff --git a/flags/sk.png b/flags/sk.png
diff --git a/flags/sl.png b/flags/sl.png
diff --git a/flags/sm.png b/flags/sm.png
diff --git a/flags/sn.png b/flags/sn.png
diff --git a/flags/so.png b/flags/so.png
diff --git a/flags/sr.png b/flags/sr.png
diff --git a/flags/ss.png b/flags/ss.png
diff --git a/flags/st.png b/flags/st.png
diff --git a/flags/sv.png b/flags/sv.png
diff --git a/flags/sx.png b/flags/sx.png
diff --git a/flags/sy.png b/flags/sy.png
diff --git a/flags/sz.png b/flags/sz.png
diff --git a/flags/tc.png b/flags/tc.png
diff --git a/flags/td.png b/flags/td.png
diff --git a/flags/tf.png b/flags/tf.png
diff --git a/flags/tg.png b/flags/tg.png
diff --git a/flags/th.png b/flags/th.png
diff --git a/flags/tj.png b/flags/tj.png
diff --git a/flags/tk.png b/flags/tk.png
diff --git a/flags/tl.png b/flags/tl.png
diff --git a/flags/tm.png b/flags/tm.png
diff --git a/flags/tn.png b/flags/tn.png
diff --git a/flags/to.png b/flags/to.png
diff --git a/flags/tr.png b/flags/tr.png
diff --git a/flags/tt.png b/flags/tt.png
diff --git a/flags/tv.png b/flags/tv.png
diff --git a/flags/tw.png b/flags/tw.png
diff --git a/flags/tz.png b/flags/tz.png
diff --git a/flags/ua.png b/flags/ua.png
diff --git a/flags/ug.png b/flags/ug.png
diff --git a/flags/um.png b/flags/um.png
diff --git a/flags/us.png b/flags/us.png
diff --git a/flags/uy.png b/flags/uy.png
diff --git a/flags/uz.png b/flags/uz.png
diff --git a/flags/va.png b/flags/va.png
diff --git a/flags/vc.png b/flags/vc.png
diff --git a/flags/ve.png b/flags/ve.png
diff --git a/flags/vg.png b/flags/vg.png
diff --git a/flags/vi.png b/flags/vi.png
diff --git a/flags/vn.png b/flags/vn.png
diff --git a/flags/vu.png b/flags/vu.png
diff --git a/flags/wf.png b/flags/wf.png
diff --git a/flags/ws.png b/flags/ws.png
diff --git a/flags/xk.png b/flags/xk.png
diff --git a/flags/ye.png b/flags/ye.png
diff --git a/flags/yt.png b/flags/yt.png
diff --git a/flags/za.png b/flags/za.png
diff --git a/flags/zm.png b/flags/zm.png
diff --git a/flags/zw.png b/flags/zw.png
diff --git a/language/en/acp/nationalflags_acp.php b/language/en/acp/nationalflags_acp.php
@@ -52,7 +52,7 @@
 	'FLAG_UPLOAD_NOTICE'				=> 'Uploading an image will overwrite an image file already located on the server if one exists.  The image file <strong>is</strong> case sensitive.',
 	'FLAG_UPLOAD_NO_OVERWRITE'			=> 'You will not be able to overwrite an already existing image with the same name and extension as shown below.',
 	'FLAG_FOUND'						=> 'Flag found',
-	'IMAGES_ON_SERVER'					=> 'Image names on server',
+	'IMAGES_ON_SERVER'					=> '%d Image names on server',
 
 	//Settings
 	'FLAGS_REQUIRED'					=> 'Required field',

diff --git a/language/en/common.php b/language/en/common.php
@@ -79,10 +79,12 @@
 	'BERMUDA' => 'Bermuda',
 	'BHUTAN' => 'Bhutan',
 	'BOLIVIA' => 'Bolivia',
-	'BONAIRE' => 'Bonaire',
+	'BONAIRE_SINT_EUSTATIUS_&AMP;_SABA' => 'Bonaire Sint Eustatius &amp; Saba',
 	'BOSNIA_&AMP;_HERZEGOVINA' => 'Bosnia &amp; Herzegovina',
 	'BOTSWANA' => 'Botswana',
+	'BOUVET_ISLAND'	=> 'Bouvet Island',
 	'BRAZIL' => 'Brazil',
+	'BRITISH_INDIAN_OCEAN_TERRITORY' => 'British Indian Ocean Territory',
 	'BRUNEI' => 'Brunei',
 	'BULGARIA' => 'Bulgaria',
 	'BURKINA_FASO' => 'Burkina Faso',
@@ -96,7 +98,7 @@
 	'CHAD' => 'Chad',
 	'CHILE' => 'Chile',
 	'CHINA' => 'China',
-	'COLUMBIA' => 'Columbia',
+	'COLUMBIA' => 'Colombia',
 	'COMOROS' => 'Comoros',
 	'CONGO' => 'Congo',
 	'CONGO_DEMOCRATIC_REPUBLIC' => 'Congo Democratic Republic',
@@ -114,6 +116,7 @@
 	'ECUADOR' => 'Ecuador',
 	'EGYPT' => 'Egypt',
 	'EL_SALVADOR' => 'El Salvador',
+	'ENGLAND' => 'England',
 	'EQUATORIAL_GUINEA' => 'Equatorial Guinea',
 	'ERITREA' => 'Eritrea',
 	'ESTONIA' => 'Estonia',
@@ -123,12 +126,14 @@
 	'FIJI' => 'Fiji',
 	'FINLAND' => 'Finland',
 	'FRANCE' => 'France',
+	'FRENCH_GUIANA' => 'French Guiana',
 	'GABON' => 'Gabon',
 	'GAMBIA' => 'Gambia',
 	'GEORGIA' => 'Georgia',
 	'GERMANY' => 'Germany',
 	'GHANA' => 'Ghana',
 	'GREAT_BRITAIN' => 'Great Britain',
+	'GUADELOUPE' => 'Guadeloupe',
 	'GREECE' => 'Greece',
 	'GREENLAND' => 'Greenland',
 	'GRENADA' => 'Grenada',
@@ -138,6 +143,7 @@
 	'GUINEA_BISSAU' => 'Guinea Bissau',
 	'GUYANA' => 'Guyana',
 	'HAITI' => 'Haiti',
+	'HEARD_&AMP;_MCDONALD_ISLANDS' => 'Heard &amp; McDonald Islands',
 	'HONDURAS' => 'Honduras',
 	'HONG_KONG' => 'Hong Kong',
 	'HUNGARY' => 'Hungary',
@@ -186,6 +192,7 @@
 	'MONACO' => 'Monaco',
 	'MONGOLIA' => 'Mongolia',
 	'MONTSERRAT' => 'Montserrat',
+	'MONTENEGRO' => 'Montenegro',
 	'MOROCCO' => 'Morocco',
 	'MOZAMBIQUE' => 'Mozambique',
 	'MYANMAR' => 'Myanmar',
@@ -199,6 +206,7 @@
 	'NIGER' => 'Niger',
 	'NIGERIA' => 'Nigeria',
 	'NORFOLK_ISLAND' => 'Norfolk Island',
+	'NORTHERN_IRELAND' => 'Northern Ireland',
 	'NORWAY' => 'Norway',
 	'OMAN' => 'Oman',
 	'PAKISTAN' => 'Pakistan',
@@ -214,17 +222,23 @@
 	'PORTUGAL' => 'Portugal',
 	'PUERTO_RICO' => 'Puerto Rico',
 	'QATAR' => 'Qatar',
+	'REUNION' => 'Reunion',
 	'ROMANIA' => 'Romania',
 	'RUSSIA' => 'Russia',
 	'RWANDA' => 'Rwanda',
+	'SAINT_PIERRE_&AMP;_MIQUELON' => 'Saint Pierre &amp; Miquelon',
 	'SAMOA' => 'Samoa',
 	'SAN_MARINO' => 'San Marino',
 	'SAO_TOME_&AMP;_PRINCIPE' => 'Sao Tome &amp; Principe',
 	'SAUDI_ARABIA' => 'Saudi Arabia',
+	'SERBIA' => 'Serbia',
+	'SVALBARD_$AMP;_JAN_MAYEN' => 'Svalbard and Jan Mayen',
+	'SCOTLAND'	=> 'Scotland',
 	'SENEGAL' => 'Senegal',
 	'SEYCHELLES' => 'Seychelles',
 	'SIERRA_LEONE' => 'Sierra Leone',
 	'SINGAPORE' => 'Singapore',
+	'SINT_MAARTEN_(DUTCH_PART)' => 'Sint Maarten (Dutch Part)',
 	'SLOVAKIA' => 'Slovakia',
 	'SLOVENIA' => 'Slovenia',
 	'SOLOMON_ISLANDS' => 'Solomon Islands',
@@ -257,6 +271,7 @@
 	'UGANDA' => 'Uganda',
 	'UKRAINE' => 'Ukraine',
 	'UNITED_ARAB_EMIRATES' => 'United Arab Emirates',
+	'UNITED_STATE_MINOR_OUTLYING_ISLANDS' => 'United States Minor Outlying islands',
 	'UNITED_STATES_OF_AMERICA' => 'United States of America',
 	'URUGUAY' => 'Uruguay',
 	'UZBEKISTAN' => 'Uzbekistan',
@@ -285,5 +300,12 @@
 	'TOKELAU' => 'Tokelau',
 	'WALLIS_AND_FUTUNA_ISLANDS' => 'Wallis and Futuna Islands',
 	'MAYOTTE' => 'Mayotte',
-	'SERBIA' => 'Serbia',
+	'ANTARCTICA' => 'Antarctica',
+	'ALAND_ISLANDS' => 'Åland Islands',
+	'GUERNSEY' => 'Guernsey',
+	'SOUTH_GEORGIA_&AMP;_THE_SOUTH_SANDWICH_ISLANDS' => 'South Georgia &amp; the South Sandwich Islands',
+	'JERSEY' => 'Jersey',
+	'NORTHERN_MARIANA_ISLANDS' => 'Northern Mariana Islands',
+	'HOLY_SEE' => 'Holy See',
+	'SAINT_BARTHELEMY' => 'Saint Barthélemy',
 ]);
diff --git a/migrations/m17_add_data.php b/migrations/m17_add_data.php
@@ -0,0 +1,130 @@
+<?php
+/**
+*
+* @package National Flags
+* @copyright (c) 2024 Rich Mcgirr (RMcGirr83)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace rmcgirr83\nationalflags\migrations;
+
+class m17_add_data extends \phpbb\db\migration\migration
+{
+
+	static public function depends_on()
+	{
+		return ['\rmcgirr83\nationalflags\migrations\m16_update_data'];
+	}
+
+	public function update_data()
+	{
+		return [
+			['custom', [
+				[&$this, 'flag_add_flags']
+			]],
+		];
+	}
+
+	public function flag_add_flags()
+	{
+		if ($this->db_tools->sql_table_exists($this->table_prefix . 'flags'))
+		{
+			$sql_ary = [
+				[
+					'flag_name'		=> 'Bouvet Island',
+					'flag_image'	=> 'bv.png',
+				],
+				[
+					'flag_name'		=> 'French Guiana',
+					'flag_image'	=> 'gf.png',
+				],
+				[
+					'flag_name'		=> 'Guadeloupe',
+					'flag_image'	=> 'gp.png',
+				],
+				[
+					'flag_name'		=> 'Heard &amp; McDonald Islands',
+					'flag_image'	=> 'hm.png',
+				],
+				[
+					'flag_name'		=> 'British Indian Ocean Territory',
+					'flag_image'	=> 'io.png',
+				],
+				[
+					'flag_name'		=> 'Saint Pierre &amp; Miquelon',
+					'flag_image'	=> 'pm.png',
+				],
+				[
+					'flag_name'		=> 'Reunion',
+					'flag_image'	=> 're.png',
+				],
+				[
+					'flag_name'		=> 'Svalbard &amp; Jan Mayen',
+					'flag_image'	=> 'sj.png',
+				],
+				[
+					'flag_name'		=> 'Sint Maarten (Dutch Part)',
+					'flag_image'	=> 'sx.png',
+				],
+				[
+					'flag_name'		=> 'United States Minor Outlying Islands',
+					'flag_image'	=> 'um.png',
+				],
+				[
+					'flag_name'		=> 'Serbia',
+					'flag_image'	=> 'rs.png',
+				],
+				[
+					'flag_name'		=> 'Montenegro',
+					'flag_image'	=> 'me.png',
+				],
+				[
+					'flag_name'		=> 'England',
+					'flag_image'	=> 'gb-eng.png',
+				],
+				[
+					'flag_name'		=> 'Scotland',
+					'flag_image'	=> 'gb-sct.png',
+				],
+				[
+					'flag_name'		=> 'Northern Ireland',
+					'flag_image'	=> 'gb-nir.png',
+				],
+				[
+					'flag_name'		=> 'Antarctica',
+					'flag_image'	=> 'aq.png',
+				],
+				[
+					'flag_name'		=> 'Aland Islands',
+					'flag_image'	=> 'ax.png',
+				],
+				[
+					'flag_name'		=> 'Bonaire Sint Eustatius &amp; Saba',
+					'flag_image'	=> 'bq.png',
+				],
+				[
+					'flag_name'		=> 'Guernsey',
+					'flag_image'	=> 'gg.png',
+				],
+				[
+					'flag_name'		=> 'South Georgia &amp; the South Sandwich Islands',
+					'flag_image'	=> 'gs.png',
+				],
+				[
+					'flag_name'		=> 'Jersey',
+					'flag_image'	=> 'je.png',
+				],
+				[
+					'flag_name'		=> 'Northern Mariana Islands',
+					'flag_image'	=> 'mp.png',
+				],
+								[
+					'flag_name'		=> 'Holy See',
+					'flag_image'	=> 'va.png',
+				],
+			];
+			$this->db->sql_multi_insert($this->table_prefix . 'flags', $sql_ary);
+		}
+	}
+}