aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoshyPHP <s9e.dev@gmail.com>2015-04-06 21:32:22 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-04-24 13:31:37 +0200
commit245d042e43374e6467f447507783a68fae186ef1 (patch)
tree3e19ce8c054da4d7f250fc4a6f5633b493c4784e /phpBB
parent2fa99602c6f6431e99468ca13f4a58344a401c24 (diff)
downloadforums-245d042e43374e6467f447507783a68fae186ef1.tar
forums-245d042e43374e6467f447507783a68fae186ef1.tar.gz
forums-245d042e43374e6467f447507783a68fae186ef1.tar.bz2
forums-245d042e43374e6467f447507783a68fae186ef1.tar.xz
forums-245d042e43374e6467f447507783a68fae186ef1.zip
[ticket/8672] Updated the text_formatter.s9e service
PHPBB3-8672
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/textformatter/s9e/parser.php14
1 files changed, 5 insertions, 9 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 77328ee4d9..0582f235e0 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -367,7 +367,6 @@ class parser implements \phpbb\textformatter\parser_interface
{
// Validate the URL
$url = BuiltInFilters::filterUrl($url, $url_config, $logger);
-
if ($url === false)
{
return false;
@@ -375,26 +374,23 @@ class parser implements \phpbb\textformatter\parser_interface
if ($max_height || $max_width)
{
- $stats = @getimagesize($url);
-
- if ($stats === false)
+ $imagesize = new \phpbb\upload\imagesize();
+ $size_info = $imagesize->get_imagesize($url);
+ if ($size_info === false)
{
$logger->err('UNABLE_GET_IMAGE_SIZE');
-
return false;
}
- if ($max_height && $max_height < $stats[1])
+ if ($max_height && $max_height < $size_info['height'])
{
$logger->err('MAX_IMG_HEIGHT_EXCEEDED', array('max_height' => $max_height));
-
return false;
}
- if ($max_width && $max_width < $stats[0])
+ if ($max_width && $max_width < $size_info['width'])
{
$logger->err('MAX_IMG_WIDTH_EXCEEDED', array('max_width' => $max_width));
-
return false;
}
}
rakx-ede63b3b0df1883f368711a6ca6746455d2a4076.tar.bz2
drakx-ede63b3b0df1883f368711a6ca6746455d2a4076.tar.xz
drakx-ede63b3b0df1883f368711a6ca6746455d2a4076.zip
no_comment
Diffstat (limited to 'perl-install/Makefile')
-rw-r--r--perl-install/Makefile31
1 files changed, 15 insertions, 16 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index ddc412be3..4555835f7 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -15,7 +15,7 @@ clean:
tar-drakxtools: clean
$(MAKE) -C ../tools clean
cd .. ; rm -rf drakxtools ; cp -af perl-install drakxtools ; cp -af tools/ddcprobe tools/pnp_serial drakxtools
- cd ../drakxtools ; rm -rf install* ForMakefile.pm pkgs.pm ftp.pm t.pm standalone/CVS ; mv Makefile.drakxtools Makefile ; mv -f standalone/* .
+ cd ../drakxtools ; rm -rf install* pkgs.pm ftp.pm t.pm */CVS ; mv Makefile.drakxtools Makefile ; mv -f standalone/* share/* .
cd .. ; tar cfy drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile Makefile.config MonitorsDB Newt c ddcprobe pnp_serial po pci_probing resize_fat diskdrake.rc $(STANDALONEPMS) icons *.pm)
cd .. ; rm -rf drakxtools
@@ -45,9 +45,9 @@ install_pms: $(DIRS)
done
# perl -pe 's/#-.*//; $$_ = "\n" if (/^=head/ .. /^=cut/) || /use (diagnostics)/' $$i > $(DESTREP4PMS)/$$i; \
- cp *.rc $(DESTREP4PMS)
+ cp share/*.rc $(DESTREP4PMS)
install -d $(DESTREP4PMS)/po
- cp -f po/*.po* $(DESTREP4PMS)/po ||:
+ cp -f share/po/*.po* $(DESTREP4PMS)/po ||:
chmod a+x $(DESTREP4PMS)/install2
chmod a+x $(DESTREP4PMS)/commands
chmod a+x $(DESTREP4PMS)/standalone/*
@@ -55,8 +55,8 @@ install_pms: $(DIRS)
get_needed_files: $(DIRS)
# export PERL_INSTALL_TEST=1 ; strace -f -e trace=file -o '| grep -v "(No such file or directory)" | sed -e "s/[^\"]*\"//" -e "s/\".*//" | grep "^/" | grep -v -e "^/tmp" -e "^/home" -e "^/proc" -e "^/var" -e "^/dev" -e "^/etc" -e "^/usr/lib/rpm" > /tmp/list ' $(PERL) -d install2 < /dev/null
- cp -f `../tools/specific_arch list` /tmp/list
-# cp -f list /tmp/list
+ cp -f `../tools/specific_arch share/list` /tmp/list
+# cp -f share/list /tmp/list
# perl -pi -e "s/ARCH/$(ARCH)/" /tmp/list
find auto -follow -name "*.so" >> /tmp/list
@@ -109,17 +109,16 @@ endif
perl -ane 'symlink "$$F[1]", "$(DEST)/usr/bin/$$F[0]"' aliases
- tar xfy `../tools/specific_arch locales.tar.bz2` -C $(DEST)
-# DEST=$(DEST) perl -I. -MForMakefile -e 'locale()'
-# DEST=$(DEST) perl -I. -MForMakefile -e 'xmodmap()'
+ tar xfy `../tools/specific_arch share/locales.tar.bz2` -C $(DEST)
- cp -a keymaps $(DEST)/usr/share
- cp -a consolefonts $(DEST)/usr/share
- cp template.in/*.in modparm.lst $(DEST)/usr/share
- cp MonitorsDB $(DEST)/usr/X11R6/lib/X11
- cp logo-mandrake.xpm $(DEST)/usr/share
- cp -a themes $(DEST)/usr/share/gtk
- cp compss compssUsers compssList $(ROOTDEST)/Mandrake/base
+ cp -a modparm.lst $(DEST)/usr/share
+ cd share ; cp -a keymaps $(DEST)/usr/share
+ cd share ; cp -a consolefonts $(DEST)/usr/share
+ cd share ; cp template.in/*.in $(DEST)/usr/share
+ cd share ; cp MonitorsDB $(DEST)/usr/X11R6/lib/X11
+ cd share ; cp logo-mandrake.xpm $(DEST)/usr/share
+ cd share ; cp -a themes $(DEST)/usr/share/gtk
+ cd share ; cp compss compssUsers compssList $(ROOTDEST)/Mandrake/base
if [ -f "../modules/modules.cz2" ]; then \
cp -f ../modules/modules.cz2 $(DEST)/lib/; \
@@ -130,7 +129,7 @@ endif
cp -f ../modules/pristine/* $(DEST)/lib/modules ||: ; \
fi
-# echo -e "#!/bin/sh\n\nexec '/usr/bin/sh'" > $(DEST)/usr/bin/runinstall2
+# echo -e '#!/bin/sh\n\nexec "/usr/bin/sh"' > $(DEST)/usr/bin/runinstall2
# chmod a+x $(DEST)/usr/bin/runinstall2
tar xyC $(DEST) -f ../install/install1_pcmcia.tar.bz2 ./etc/pcmcia