From 90a77ba9d3e97718e9da7d1ee95ece4e756d26b7 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 27 Dec 2016 18:18:20 +0100
Subject: [ticket/security-203] Allow more characters for branch names

SECURITY-203
---
 phpBB/phpbb/version_helper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php
index e2d90af04a..70a009ed3d 100644
--- a/phpBB/phpbb/version_helper.php
+++ b/phpBB/phpbb/version_helper.php
@@ -243,7 +243,7 @@ class version_helper
 	*
 	* @param bool $force_update Ignores cached data. Defaults to false.
 	* @param bool $force_cache Force the use of the cache. Override $force_update.
-	* @return string Version info
+	* @return array Version info
 	* @throws \RuntimeException
 	*/
 	public function get_versions_matching_stability($force_update = false, $force_cache = false)
@@ -350,7 +350,7 @@ class version_helper
 		{
 			foreach ($versions_data as $branch => &$version_data)
 			{
-				if (!preg_match('/^[0-9]+\.[0-9]+$/', $branch))
+				if (!preg_match('/^[0-9a-z\-\.]+$/i', $branch))
 				{
 					unset($versions_data[$branch]);
 					continue;
-- 
cgit v1.2.1

.0</option>
<option value='distro/mdv2009.1'>distro/mdv2009.1</option>
<option value='distro/mdv2010.0'>distro/mdv2010.0</option>
<option value='distro/mes5'>distro/mes5</option>
<option value='distro/mes5-2.6.33'>distro/mes5-2.6.33</option>
<option value='distro/mes6'>distro/mes6</option>
<option value='distro/mga1'>distro/mga1</option>
<option value='distro/mga2'>distro/mga2</option>
<option value='distro/mga3'>distro/mga3</option>
<option value='distro/mga4'>distro/mga4</option>
<option value='distro/mga5'>distro/mga5</option>
<option value='distro/mga6'>distro/mga6</option>
<option value='distro/mga7'>distro/mga7</option>
<option value='distro/mga8'>distro/mga8</option>
<option value='distro/mga9'>distro/mga9</option>
<option value='master'>master</option>
<option value='topic/Corpo_2_1'>topic/Corpo_2_1</option>
<option value='topic/KA9_0'>topic/KA9_0</option>
<option value='topic/MDK-10-update'>topic/MDK-10-update</option>
<option value='topic/MDK-10_1-update'>topic/MDK-10_1-update</option>
<option value='topic/MDK-10_2-update'>topic/MDK-10_2-update</option>
<option value='topic/MDK-2006_0-update'>topic/MDK-2006_0-update</option>
<option value='topic/MDK92-branch'>topic/MDK92-branch</option>
<option value='topic/MDKC_1_0'>topic/MDKC_1_0</option>
<option value='topic/PCMCIA_CS_DISTRO'>topic/PCMCIA_CS_DISTRO</option>
<option value='topic/R9_0-64bit-branch'>topic/R9_0-64bit-branch</option>
<option value='topic/R9_1_HP-branch'>topic/R9_1_HP-branch</option>
<option value='topic/a'>topic/a</option>
<option value='topic/before_matchbox_wm'>topic/before_matchbox_wm</option>
<option value='topic/bug-13680'>topic/bug-13680</option>
<option value='topic/dietlibc'>topic/dietlibc</option>
<option value='topic/efi'>topic/efi</option>
<option value='topic/extlinux'>topic/extlinux</option>
<option value='topic/firewall'>topic/firewall</option>
<option value='topic/gdk-pixbuf-0-branch'>topic/gdk-pixbuf-0-branch</option>
<option value='topic/gi-ppc'>topic/gi-ppc</option>
<option value='topic/ia64-8_1'>topic/ia64-8_1</option>
<option value='topic/mandrakesoft'>topic/mandrakesoft</option>
<option value='topic/mlcd4'>topic/mlcd4</option>
<option value='topic/ppp'>topic/ppp</option>
<option value='topic/rp-pppoe'>topic/rp-pppoe</option>
<option value='topic/switching_to_dnf'>topic/switching_to_dnf</option>
<option value='topic/switching_to_urpmi'>topic/switching_to_urpmi</option>
<option value='topic/unlabeled-1.1.1'>topic/unlabeled-1.1.1</option>
<option value='topic/v_webmin_0_87'>topic/v_webmin_0_87</option>
<option value='topic/x86_64-branch'>topic/x86_64-branch</option>
<option value='user/animtim/designWork'>user/animtim/designWork</option>
<option value='user/bcornec/fixntp'>user/bcornec/fixntp</option>
<option value='user/colin/rescue-systemd'>user/colin/rescue-systemd</option>
<option value='user/ennael/mga6'>user/ennael/mga6</option>
<option value='user/erwan/bug-13680'>user/erwan/bug-13680</option>
<option value='user/jibz/aarch64'>user/jibz/aarch64</option>
<option value='user/martinw/mga6'>user/martinw/mga6</option>
<option value='user/pterjan/arm64'>user/pterjan/arm64</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Mageia Installer and base platform for many utilities</td><td class='sub right'>Thierry Vignaud [tv]</td></tr></table>
<table class='tabs'><tr><td>
<a href='/software/drakx/?h=18.54'>summary</a><a href='/software/drakx/refs/?h=18.54&amp;id=84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'>refs</a><a href='/software/drakx/log/perl-install/share/po?h=18.54'>log</a><a href='/software/drakx/tree/perl-install/share/po?h=18.54&amp;id=84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'>tree</a><a class='active' href='/software/drakx/commit/perl-install/share/po?h=18.54&amp;id=84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'>commit</a><a href='/software/drakx/diff/perl-install/share/po?h=18.54&amp;id=84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'>diff</a><a href='/software/drakx/stats/perl-install/share/po?h=18.54'>stats</a></td><td class='form'><form class='right' method='get' action='/software/drakx/log/perl-install/share/po'>
<input type='hidden' name='h' value='18.54'/><input type='hidden' name='id' value='84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/software/drakx/commit/?h=18.54&amp;id=84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'>root</a>/<a href='/software/drakx/commit/perl-install?h=18.54&amp;id=84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'>perl-install</a>/<a href='/software/drakx/commit/perl-install/share?h=18.54&amp;id=84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'>share</a>/<a href='/software/drakx/commit/perl-install/share/po?h=18.54&amp;id=84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'>po</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='18.54'/><input type='hidden' name='id' value='84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Thierry Vignaud &lt;thierry.vignaud@gmail.com&gt;</td><td class='right'>2013-11-30 19:25:06 +0100</td></tr>
<tr><th>committer</th><td>Thierry Vignaud &lt;thierry.vignaud@gmail.com&gt;</td><td class='right'>2013-11-30 19:25:06 +0100</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/software/drakx/commit/perl-install/share/po?h=18.54&amp;id=84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'>84f79bf3ccc9a21ed7fe947d265f6061d8e3773d</a> (<a href='/software/drakx/patch/perl-install/share/po?id=84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/software/drakx/tree/?h=18.54&amp;id=84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'>3a3a0642d18e396cb112cf51060f840a3fe96cd2</a> /<a href='/software/drakx/tree/perl-install/share/po?h=18.54&amp;id=84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'>perl-install/share/po</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/software/drakx/commit/perl-install/share/po?h=18.54&amp;id=40bdb1facddef1d217ab7936aa67105b5ae380d9'>40bdb1facddef1d217ab7936aa67105b5ae380d9</a> (<a href='/software/drakx/diff/perl-install/share/po?h=18.54&amp;id=84f79bf3ccc9a21ed7fe947d265f6061d8e3773d&amp;id2=40bdb1facddef1d217ab7936aa67105b5ae380d9'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/software/drakx/snapshot/drakx-84f79bf3ccc9a21ed7fe947d265f6061d8e3773d.tar'>drakx-84f79bf3ccc9a21ed7fe947d265f6061d8e3773d.tar</a><br/><a href='/software/drakx/snapshot/drakx-84f79bf3ccc9a21ed7fe947d265f6061d8e3773d.tar.gz'>drakx-84f79bf3ccc9a21ed7fe947d265f6061d8e3773d.tar.gz</a><br/><a href='/software/drakx/snapshot/drakx-84f79bf3ccc9a21ed7fe947d265f6061d8e3773d.tar.bz2'>drakx-84f79bf3ccc9a21ed7fe947d265f6061d8e3773d.tar.bz2</a><br/><a href='/software/drakx/snapshot/drakx-84f79bf3ccc9a21ed7fe947d265f6061d8e3773d.tar.xz'>drakx-84f79bf3ccc9a21ed7fe947d265f6061d8e3773d.tar.xz</a><br/><a href='/software/drakx/snapshot/drakx-84f79bf3ccc9a21ed7fe947d265f6061d8e3773d.zip'>drakx-84f79bf3ccc9a21ed7fe947d265f6061d8e3773d.zip</a><br/></td></tr></table>
<div class='commit-subject'>sync with code</div><div class='commit-msg'></div><div class='diffstat-header'><a href='/software/drakx/diff/?h=18.54&amp;id=84f79bf3ccc9a21ed7fe947d265f6061d8e3773d'>Diffstat</a> (limited to 'perl-install/share/po')</div><table summary='diffstat' class='diffstat'>