Merge pull request #230 from iMattPro/updates

Delete all phpbb cookies option

Author: iMattPro

includes/qi.php

@@ -12,6 +12,9 @@
  */
 class qi
 {
+	/** @var string The prefix name of phpBB board cookies */
+	const PHPBB_COOKIE_PREFIX = 'phpbb3_';
+
 	/**
 	* Output the standard page header
 	*/
@@ -535,7 +538,7 @@ public static function delete_cookies($name)
 				$crumb = trim($crumbs[0]);
 				if (strpos($crumb, $name) === 0)
 				{
-					self::set_cookie($name);
+					self::set_cookie($crumb);
 				}
 			}
 		}

index.php

@@ -97,6 +97,12 @@
 	$profile = '';
 }
 
+// delete all phpbb cookies if requested
+if (qi_request_var('delete-cookies', '') === qi::PHPBB_COOKIE_PREFIX)
+{
+	qi::delete_cookies(qi::PHPBB_COOKIE_PREFIX);
+}
+
 // load settings profile
 $settings->import_profile($profile);
 

language/en/qi.php

@@ -128,6 +128,9 @@
 	'DEFAULT_LANG'		=> 'Default language',
 	'DEFAULT_LANG_EXPLAIN'	=> 'The default language that will be used for your boards. Language packs need to be in <code>sources/phpBB3/language/</code> to be available in this list.',
 	'DELETE'			=> 'Delete',
+	'DELETE_COOKIES'	=> 'Delete all phpBB cookies',
+	'DELETE_COOKIES_CONFIRM' => 'This will log you out of all phpBB boards on this server. Are you sure you want to continue?',
+	'DELETE_COOKIES_TITLE'	=> 'Over time and many QI board installs, loads of cookies that may no longer be needed can build up in your server.',
 	'DELETE_FILES_IF_EXIST'	=> 'Delete files if they exist',
 	'DELETE_FILES_IF_EXIST_EXPLAIN'	=> 'Have &quot;Delete files if they exist&quot; checked by default when creating boards.',
 	'DELETE_PROFILE'	=> 'Delete profile',

modules/qi_create.php

@@ -367,7 +367,7 @@ public function run()
 			'server_protocol'	=> $settings->get_server_protocol(),
 			'newest_username'	=> $admin_name,
 			'avatar_salt'		=> md5(mt_rand()),
-			'cookie_name'		=> 'phpbb3_' . strtolower(gen_rand_string(5)),
+			'cookie_name'		=> qi::PHPBB_COOKIE_PREFIX . strtolower(gen_rand_string(5)),
 		);
 
 		if (defined('PHPBB_31'))

modules/qi_phpinfo.php

@@ -81,6 +81,7 @@ public function run()
 		$template->assign_vars(array(
 			'S_PHPINFO'	=> true,
 			'PHPINFO'	=> $output,
+			'U_DELETE_COOKIES' => qi::url('phpinfo') . '&delete-cookies=' . qi::PHPBB_COOKIE_PREFIX,
 		));
 
 		// Output page

style/overall_footer.twig

@@ -1,8 +1,9 @@
 
 			</div>
 			<footer class="text-center py-3">
-				<p class="mb-0"><small>{{ lang('PHPBB_QI_FULLLINK', QI_VERSION) }}</small></p>
-				<p class="mb-0"><small>{{ lang('POWERED_BY_PHPBB') }}</small></p>
+				{% if U_DELETE_COOKIES %}<p class="small">[ <a title="{{ lang('DELETE_COOKIES_TITLE') }}" href="{{ U_DELETE_COOKIES }}" data-qi-confirm="{{ lang('DELETE_COOKIES_CONFIRM') }}">{{ lang('DELETE_COOKIES') }}</a> ]</p>{% endif %}
+				<p class="mb-0 small">{{ lang('PHPBB_QI_FULLLINK', QI_VERSION) }}</p>
+				<p class="mb-0 small">{{ lang('POWERED_BY_PHPBB') }}</p>
 				{% if TRANSLATION_INFO %}<p class="mb-0">{{ TRANSLATION_INFO }}</p>{% endif %}
 			</footer>
 		</div>