From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 6 Jun 2016 15:28:59 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~1512
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ce7c3d483ea91b194d10f3ede89d268f12996254;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

ce7c3d483ea91b194d10f3ede89d268f12996254
diff --cc wcfsetup/install/files/lib/data/style/StyleEditor.class.php
index ca698d852e,7a07ab6082..e6b18c6745
--- a/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
+++ b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
@@@ -476,34 -451,37 +476,34 @@@ class StyleEditor extends DatabaseObjec
  		}
  		
  		// save style
 -		if ($style !== null) {
 -			$style->update($styleData);
 -		}
 -		else {
 +		if ($style === null) {
  			$styleData['packageID'] = $packageID;
  			$style = new StyleEditor(self::create($styleData));
 -		}
 -		
 -		// import preview image
 -		if (!empty($data['image'])) {
 -			$fileExtension = mb_substr($data['image'], mb_strrpos($data['image'], '.'));
 -			$index = $tar->getIndexByFilename($data['image']);
 -			if ($index !== false) {
 -				$filename = WCF_DIR.'images/stylePreview-'.$style->styleID.$fileExtension;
 -				$tar->extract($index, $filename);
 -				FileUtil::makeWritable($filename);
 -				
 -				if (file_exists($filename)) {
 -					try {
 -						if (($imageData = getimagesize($filename)) !== false) {
 -							switch ($imageData[2]) {
 -								case IMAGETYPE_PNG:
 -								case IMAGETYPE_JPEG:
 -								case IMAGETYPE_JPG:
 -								case IMAGETYPE_GIF:
 -									$style->update(array('image' => 'stylePreview-'.$style->styleID.$fileExtension));
 +			
 +			// import preview image
 +			if (!empty($data['image'])) {
 +				$fileExtension = mb_substr($data['image'], mb_strrpos($data['image'], '.'));
 +				$index = $tar->getIndexByFilename($data['image']);
 +				if ($index !== false) {
 +					$filename = WCF_DIR.'images/stylePreview-'.$style->styleID.$fileExtension;
 +					$tar->extract($index, $filename);
 +					FileUtil::makeWritable($filename);
 +			
 +					if (file_exists($filename)) {
 +						try {
 +							if (($imageData = getimagesize($filename)) !== false) {
 +								switch ($imageData[2]) {
- 									case IMG_PNG:
- 									case IMG_JPEG:
- 									case IMG_JPG:
- 									case IMG_GIF:
++									case IMAGETYPE_PNG:
++									case IMAGETYPE_JPEG:
++									case IMAGETYPE_JPG:
++									case IMAGETYPE_GIF:
 +										$style->update(['image' => 'stylePreview-'.$style->styleID.$fileExtension]);
 +								}
  							}
  						}
 -					}
 -					catch (SystemException $e) {
 -						// broken image
 +						catch (SystemException $e) {
 +							// broken image
 +						}
  					}
  				}
  			}
diff --cc wcfsetup/setup/db/install.sql
index 2f02131c9c,162c5bd866..1a99576fed
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@@ -2126,13 -1876,9 +2126,11 @@@ INSERT INTO wcf1_template_group (parent
  -- media providers
  -- Videos
  	-- Youtube
 -	INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('YouTube', 'https?://(?:.+?\\.)?youtu(?:\\.be/|be\\.com/(?:#/)?watch\\?(?:.*?&)?v=)(?P<ID>[a-zA-Z0-9_-]+)(?:(?:\\?|&)t=(?P<start>\\d+)$)?', '<iframe style="max-width:100%;" width="560" height="315" src="https://www.youtube.com/embed/{$ID}?wmode=transparent&amp;start={$start}" allowfullscreen></iframe>');
 +	INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('YouTube', 'https?://(?:.+?\\.)?youtu(?:\\.be/|be\\.com/(?:#/)?watch\\?(?:.*?&)?v=)(?P<ID>[a-zA-Z0-9_-]+)(?:(?:\\?|&)t=(?P<start>\\d+)$)?', '<div class="videoContainer"><iframe src="https://www.youtube.com/embed/{$ID}?wmode=transparent&amp;start={$start}" allowfullscreen></iframe></div>');
 +	-- Youtube playlist
 +	INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('YouTube Playlist', 'https?://(?:.+?\\.)?youtu(?:\\.be/|be\\.com/)playlist\\?(?:.*?&)?list=(?P<ID>[a-zA-Z0-9_-]+)', '<div class="videoContainer"><iframe src="https://www.youtube.com/embed/videoseries?list={$ID}" allowfullscreen></iframe></div>');
  	-- Vimeo
  	INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('Vimeo', 'https?://vimeo\\.com/(?P<ID>\\d+)', '<iframe src="https://player.vimeo.com/video/{$ID}" width="400" height="225" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>');
- 	-- MyVideo
- 	INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('MyVideo', 'http://(?:www\\.)?myvideo\\.de/watch/(?P<ID>\\d+)', '<object width="611" height="383" type="application/x-shockwave-flash" data="http://www.myvideo.de/movie/{$ID}"><param name="movie" value="http://www.myvideo.de/movie/{$ID}" /><param name="AllowFullscreen" value="true" /><param name="AllowScriptAccess" value="always" /><param name="wmode" value="transparent" /></object>');
  	-- Clipfish
  	INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('Clipfish', 'http://(?:www\\.)?clipfish\\.de/(?:.*?/)?video/(?P<ID>\\d+)/', '<div style="width:464px; height:404px;"><div style="width:464px; height:384px;"><iframe src="http://www.clipfish.de/embed_video/?vid={$ID}&amp;as=0&amp;col=990000" name="Clipfish Embedded Video" width="464" height="384" align="left" marginheight="0" marginwidth="0" scrolling="no"></iframe></div></div>');
  	-- Veoh