From: <wis...@us...> - 2017-05-06 01:51:27
|
Revision: 13238 http://sourceforge.net/p/xoops/svn/13238 Author: wishcraft Date: 2017-05-06 01:51:24 +0000 (Sat, 06 May 2017) Log Message: ----------- final fixes for Fontier+ 1.01! Modified Paths: -------------- XoopsModules/fontier+/releases/1.01/README.md XoopsModules/fontier+/releases/1.01/modules/fontier/glyph.php XoopsModules/fontier+/releases/1.01/modules/fontier/naming.php XoopsModules/fontier+/releases/1.01/modules/fontier/preview.php XoopsModules/fontier+/trunk/README.md XoopsModules/fontier+/trunk/modules/fontier/glyph.php XoopsModules/fontier+/trunk/modules/fontier/naming.php XoopsModules/fontier+/trunk/modules/fontier/preview.php Modified: XoopsModules/fontier+/releases/1.01/README.md =================================================================== --- XoopsModules/fontier+/releases/1.01/README.md 2017-05-06 01:07:37 UTC (rev 13237) +++ XoopsModules/fontier+/releases/1.01/README.md 2017-05-06 01:51:24 UTC (rev 13238) @@ -19,7 +19,10 @@ RewriteRule ^fontier/([0-9]+)/([0-9]+)/(.*?)/index.html ./modules/fontier/index.php?start=$1&limit=$2&base=$3 [L,NC,QSA] RewriteRule ^fontier/uploads.html$ ./modules/fontier/uploads.php [L,NC,QSA] RewriteRule ^fontier/releases.html$ ./modules/fontier/releases.php [L,NC,QSA] - RewriteRule ^fontier/(.*?) ./modules/fontier/$1 [L,NC,QSA] + RewriteRule ^fontier/naming/([0-9]+).(png|jpg|gif) ./modules/fontier/naming/$1.$2 [L,NC,QSA] + RewriteRule ^fontier/preview/([0-9]+).(png|jpg|gif) ./modules/fontier/preview/$1.$2 [L,NC,QSA] + RewriteRule ^fontier/glyph/([0-9]+)-([0-9]+).(png|jpg|gif) ./modules/fontier/glyph/$1-$2.$3 [L,NC,QSA] + RewriteRule ^fontier/font/([0-9]+)/(.*?).html ./modules/fontier/font.php?id=$1 [L,NC,QSA] ## Maintenance & Scheduled Actions Modified: XoopsModules/fontier+/releases/1.01/modules/fontier/glyph.php =================================================================== --- XoopsModules/fontier+/releases/1.01/modules/fontier/glyph.php 2017-05-06 01:07:37 UTC (rev 13237) +++ XoopsModules/fontier+/releases/1.01/modules/fontier/glyph.php 2017-05-06 01:51:24 UTC (rev 13238) @@ -57,8 +57,8 @@ } if ($fontierConfigsList['htaccess']) { - if (!strpos($font->getGlyphURL('id', $_GET['char'], $_GET['format']), $_SERVER['REQUEST_URI'])) { - header('Location: ' . $font->getGlyphURL('id', $_GET['char'], $_GET['format'])); + if (!strpos($font->getGlyphURL($_GET['char'], $_GET['format']), $_SERVER['REQUEST_URI'])) { + header('Location: ' . $font->getGlyphURL($_GET['char'], $_GET['format'])); exit(0); } } Modified: XoopsModules/fontier+/releases/1.01/modules/fontier/naming.php =================================================================== --- XoopsModules/fontier+/releases/1.01/modules/fontier/naming.php 2017-05-06 01:07:37 UTC (rev 13237) +++ XoopsModules/fontier+/releases/1.01/modules/fontier/naming.php 2017-05-06 01:51:24 UTC (rev 13238) @@ -49,8 +49,8 @@ } if ($fontierConfigsList['htaccess']) { - if (!strpos($identity->getNamingURL('id', $_GET['format']), $_SERVER['REQUEST_URI'])) { - header('Location: ' . $identity->getNamingURL('id', $_GET['format'])); + if (!strpos($identity->getNamingURL($_GET['format']), $_SERVER['REQUEST_URI'])) { + header('Location: ' . $identity->getNamingURL($_GET['format'])); exit(0); } } Modified: XoopsModules/fontier+/releases/1.01/modules/fontier/preview.php =================================================================== --- XoopsModules/fontier+/releases/1.01/modules/fontier/preview.php 2017-05-06 01:07:37 UTC (rev 13237) +++ XoopsModules/fontier+/releases/1.01/modules/fontier/preview.php 2017-05-06 01:51:24 UTC (rev 13238) @@ -48,8 +48,8 @@ } if ($fontierConfigsList['htaccess']) { - if (!strpos($font->getPreviewURL('id', $_GET['format']), $_SERVER['REQUEST_URI'])) { - header('Location: ' . $font->getPreviewURL('id', $_GET['format'])); + if (!strpos($font->getPreviewURL($_GET['format']), $_SERVER['REQUEST_URI'])) { + header('Location: ' . $font->getPreviewURL($_GET['format'])); exit(0); } } Modified: XoopsModules/fontier+/trunk/README.md =================================================================== --- XoopsModules/fontier+/trunk/README.md 2017-05-06 01:07:37 UTC (rev 13237) +++ XoopsModules/fontier+/trunk/README.md 2017-05-06 01:51:24 UTC (rev 13238) @@ -19,7 +19,10 @@ RewriteRule ^fontier/([0-9]+)/([0-9]+)/(.*?)/index.html ./modules/fontier/index.php?start=$1&limit=$2&base=$3 [L,NC,QSA] RewriteRule ^fontier/uploads.html$ ./modules/fontier/uploads.php [L,NC,QSA] RewriteRule ^fontier/releases.html$ ./modules/fontier/releases.php [L,NC,QSA] - RewriteRule ^fontier/(.*?) ./modules/fontier/$1 [L,NC,QSA] + RewriteRule ^fontier/naming/([0-9]+).(png|jpg|gif) ./modules/fontier/naming/$1.$2 [L,NC,QSA] + RewriteRule ^fontier/preview/([0-9]+).(png|jpg|gif) ./modules/fontier/preview/$1.$2 [L,NC,QSA] + RewriteRule ^fontier/glyph/([0-9]+)-([0-9]+).(png|jpg|gif) ./modules/fontier/glyph/$1-$2.$3 [L,NC,QSA] + RewriteRule ^fontier/font/([0-9]+)/(.*?).html ./modules/fontier/font.php?id=$1 [L,NC,QSA] ## Maintenance & Scheduled Actions Modified: XoopsModules/fontier+/trunk/modules/fontier/glyph.php =================================================================== --- XoopsModules/fontier+/trunk/modules/fontier/glyph.php 2017-05-06 01:07:37 UTC (rev 13237) +++ XoopsModules/fontier+/trunk/modules/fontier/glyph.php 2017-05-06 01:51:24 UTC (rev 13238) @@ -57,8 +57,8 @@ } if ($fontierConfigsList['htaccess']) { - if (!strpos($font->getGlyphURL('id', $_GET['char'], $_GET['format']), $_SERVER['REQUEST_URI'])) { - header('Location: ' . $font->getGlyphURL('id', $_GET['char'], $_GET['format'])); + if (!strpos($font->getGlyphURL($_GET['char'], $_GET['format']), $_SERVER['REQUEST_URI'])) { + header('Location: ' . $font->getGlyphURL($_GET['char'], $_GET['format'])); exit(0); } } Modified: XoopsModules/fontier+/trunk/modules/fontier/naming.php =================================================================== --- XoopsModules/fontier+/trunk/modules/fontier/naming.php 2017-05-06 01:07:37 UTC (rev 13237) +++ XoopsModules/fontier+/trunk/modules/fontier/naming.php 2017-05-06 01:51:24 UTC (rev 13238) @@ -49,8 +49,8 @@ } if ($fontierConfigsList['htaccess']) { - if (!strpos($identity->getNamingURL('id', $_GET['format']), $_SERVER['REQUEST_URI'])) { - header('Location: ' . $identity->getNamingURL('id', $_GET['format'])); + if (!strpos($identity->getNamingURL($_GET['format']), $_SERVER['REQUEST_URI'])) { + header('Location: ' . $identity->getNamingURL($_GET['format'])); exit(0); } } Modified: XoopsModules/fontier+/trunk/modules/fontier/preview.php =================================================================== --- XoopsModules/fontier+/trunk/modules/fontier/preview.php 2017-05-06 01:07:37 UTC (rev 13237) +++ XoopsModules/fontier+/trunk/modules/fontier/preview.php 2017-05-06 01:51:24 UTC (rev 13238) @@ -48,8 +48,8 @@ } if ($fontierConfigsList['htaccess']) { - if (!strpos($font->getPreviewURL('id', $_GET['format']), $_SERVER['REQUEST_URI'])) { - header('Location: ' . $font->getPreviewURL('id', $_GET['format'])); + if (!strpos($font->getPreviewURL($_GET['format']), $_SERVER['REQUEST_URI'])) { + header('Location: ' . $font->getPreviewURL($_GET['format'])); exit(0); } } |