'.__('To control player location in your post, put', 'podpress').' '.$this->podcastTag.' '.__(' where you want it to appear', 'podpress').'.
'."\n";
echo ' '."\n";
} else {
@@ -1366,7 +1371,7 @@
echo '
';
echo ' '.__('iTunes:Image', 'podpress').' at least 600 x 600 pixels as Apple writes (01/2010) in "Making a Podcast " of their own Podcasting Resources. In the past 300 x 300 pixels were recommended. iTunes supports JPEG and PNG images (the file name extensions should ".jpg" or ".png").', 'podpress')."\n";
+ echo ' '.__('The iTunes image should be a square image with at least 600 x 600 pixels as Apple writes (01/2010) in "Making a Podcast " of their own Podcasting Resources. In the "FAQs: For Podcast Makers " 300 x 300 pixels are recommended by Apple. iTunes supports JPEG and PNG images (the file name extensions should ".jpg" or ".png").', 'podpress')."\n";
echo ' '."\n";
echo ' '.__('Use Global', 'podpress').' '."\n";
@@ -1483,7 +1488,12 @@
echo ' '."\n";
echo ' '."\n";
- echo ' '.__('Use Global', 'podpress').' ('.$this->settings['iTunes']['category'][0].') '."\n";
+ if ('' == trim($this->settings['iTunes']['category'][0])) {
+ $current_global = '[ '.__('nothing', 'podpress').' ]';
+ } else {
+ $current_global = $this->settings['iTunes']['category'][0];
+ }
+ echo ' '.__('Use Global', 'podpress').' ('.$current_global.') '."\n";
if (empty($data['iTunesCategory'][0])) {
podPress_itunesCategoryOptions(htmlentities('##Global##'), ENT_QUOTES, $blog_charset);
} else {
@@ -1494,7 +1504,12 @@
echo ' '."\n";
echo ' '."\n";
- echo ' '.__('Use Global', 'podpress').' ('.$this->settings['iTunes']['category'][1].') '."\n";
+ if ('' == trim($this->settings['iTunes']['category'][1])) {
+ $current_global = '[ '.__('nothing', 'podpress').' ]';
+ } else {
+ $current_global = $this->settings['iTunes']['category'][1];
+ }
+ echo ' '.__('Use Global', 'podpress').' ('.$current_global.') '."\n";
if (empty($data['iTunesCategory'][1])) {
podPress_itunesCategoryOptions(htmlentities('##Global##'), ENT_QUOTES, $blog_charset);
} else {
@@ -1504,7 +1519,12 @@
echo ' '."\n";
echo ' '."\n";
- echo ' '.__('Use Global', 'podpress').' ('.$this->settings['iTunes']['category'][2].') '."\n";
+ if ('' == trim($this->settings['iTunes']['category'][2])) {
+ $current_global = '[ '.__('nothing', 'podpress').' ]';
+ } else {
+ $current_global = $this->settings['iTunes']['category'][2];
+ }
+ echo ' '.__('Use Global', 'podpress').' ('.$current_global.') '."\n";
if (empty($data['iTunesCategory'][2])) {
podPress_itunesCategoryOptions(htmlentities('##Global##'), ENT_QUOTES, $blog_charset);
} else {
@@ -1526,7 +1546,11 @@
echo ' '.__('Clean', 'podpress').' '."\n";
echo ' '."\n";
echo ' '."\n";
- echo ' '.__('Headphones Required? Sets the parental advisory graphic in name column.', 'podpress')."\n";
+ echo ' '.__('Setting to indicate whether or not your podcast contains explicit material', 'podpress')."\n";
+ echo '
'.__('"No" (default) - no indicator will show up', 'podpress')."\n";
+ echo '
'.__('"Yes" - an "EXPLICIT" parental advisory graphic will appear next to your podcast artwork or name in iTunes', 'podpress')."\n";
+ echo '
'.__('"Clean" - means that you are sure that no explicit language or adult content is included any of the episodes, and a "CLEAN" graphic will appear', 'podpress')."\n";
+ echo '
'.__('You can also use such an option for each of your podcast episodes (in the post/page editor).', 'podpress').'
'."\n";
echo '
'."\n";
echo '
'."\n";
@@ -1537,13 +1561,13 @@
echo ' '.__('Use Global', 'podpress').' ('.podPress_stringLimiter(ucfirst(stripslashes($this->settings['rss_copyright'])), 40).') '."\n";
echo ' '.__('Custom', 'podpress').' '."\n";
echo ' '."\n";
- echo ' '."\n";
echo '
'."\n";
Index: podpress_admin_functions.php
===================================================================
--- podpress_admin_functions.php (Revision 210539)
+++ podpress_admin_functions.php (Arbeitskopie)
@@ -345,7 +345,7 @@
$options['video_mpg'] = __('MPG - Video', 'podpress');
$options['video_asf'] = __('ASF - Video', 'podpress');
$options['video_wmv'] = __('WMV - Video', 'podpress');
- $options['video_wma'] = __('WMA - Video', 'podpress');
+ $options['audio_wma'] = __('WMA - Audio', 'podpress');
$options['video_flv'] = __('FLV - Flash Video', 'podpress');
$options['video_swf'] = __('SWF - Flash content', 'podpress');
$options['ebook_pdf'] = __('PDF - eBook', 'podpress');
@@ -362,6 +362,8 @@
function podPress_videoDimensionOptions($selected='320:240') {
$dimensions = array();
reset($dimensions);
+ $dimensions_noimage = array();
+ reset($dimensions_noimage);
$dimensions['160:120'] = '160 x 120';
$dimensions['320:240'] = '320 x 240';
@@ -371,6 +373,7 @@
$dimensions['480:260'] = '480 x 260 [16:9 - 1.85:1]';
$dimensions['720:405'] = '720 x 405 [16:9 - 1.78:1]';
$dimensions['720:390'] = '720 x 390 [16:9 - 1.85:1]';
+
echo '
'."\n";
foreach ($dimensions as $key => $value) {
if ($key == $selected) {
@@ -381,6 +384,21 @@
echo ''.$value.' '."\n";
}
echo ' '."\n";
+ $dimensions_noimage['160:0'] = __('width: 160 px', 'podpress');
+ $dimensions_noimage['320:0'] = __('width: 320 px', 'podpress');
+ $dimensions_noimage['640:0'] = __('width: 640 px', 'podpress');
+ $dimensions_noimage['720:0'] = __('width: 720 px', 'podpress');
+ echo '
'."\n";
+ foreach ($dimensions_noimage as $key => $value) {
+ if ($key == $selected) {
+ $selected_str =' selected="selected"';
+ } else {
+ $selected_str ='';
+ }
+ echo ''.$value.' '."\n";
+ }
+ echo ' '."\n";
+
}
function podPress_itunesLanguageArray() {
@@ -596,7 +614,7 @@
$foundit = true;
echo ' selected="selected"';
}
- echo ' >'.$value.''."\n";
+ echo '>'.$value.''."\n";
}
if(!$foundit AND '##Global##' != $current) {
@@ -880,6 +898,8 @@
function podPress_getID3tags($mediafile, $resolved = false, $limitDownload = false) {
GLOBAL $podPress;
+ $tmp_download_exists = FALSE;
+
if($podPress->settings['enablePodangoIntegration']) {
if(substr($mediafile, 0, strlen('Podango:')) == 'Podango:') {
$fileNameParts = explode(':', $mediafile);
@@ -906,16 +926,33 @@
} else {
$uriFileName = $mediafile;
}
- $uriFileName = podPress_downloadFile($uriFileName, false, $limitDownload);
+ $siteurl = get_bloginfo('siteurl');
+ if (FALSE !== $siteurl AND FALSE !== strpos($uriFileName, $siteurl)) { // then it is not a real remote file - it is only an URL to a local file
+ // get the absolute folder of the file from the URL
+ $purl = parse_url($uriFileName);
+ $path_part = end(explode('wp-content', $purl['path']));
+ $uriFileName = WP_CONTENT_DIR.$path_part;
+ } else {
+ $uriFileName = podPress_downloadFile($uriFileName, false, $limitDownload);
+ $tmp_download_exists = TRUE;
+ }
}
$fileinfo = @$getID3->analyze($uriFileName);
-
- if(empty($fileinfo)) {
+
+ if (empty($fileinfo)) {
return 'Remote MP3 File could not be read.';
}
getid3_lib::CopyTagsToComments($fileinfo);
+
+ if (TRUE === $tmp_download_exists) { // if the file have been downloaded to a local folder then delete the tempfile
+ if ('' != $fileinfo['filenamepath']) { // take the folder and file from getID3 if possible
+ $unlink_result = @unlink($fileinfo['filenamepath']);
+ } else {
+ $unlink_result = @unlink($uriFileName);
+ }
+ }
return $fileinfo;
}
@@ -1034,7 +1071,10 @@
if($pos) {
$ext = substr($ext, 0, $pos);
}
- $localtempfilename = tempnam('/tmp', 'getID3').'.'.$ext;
+ $localtempfilename = @tempnam('/tmp', 'getID3').'.'.$ext;
+ if (FALSE == $localtempfilename OR '.'.$ext == $localtempfilename) {
+ $localtempfilename = 'podpress_tmp.'.$ext;
+ }
if (!$fp_local = @fopen($localtempfilename, 'wb')) {
$continue = false;
}
@@ -1116,9 +1156,11 @@
if(file_exists($systemFileName)) {
return filesize($systemFileName);
}
+
+ // if it is a remote file then get the file size from the header information:
$uriFileName = $podPress->convertPodcastFileNameToValidWebPath($mediafile);
+
// Request headers
-
$sRemoteHeaders = podPress_downloadFile($uriFileName, true);
// Parsing the headers
Index: podpress_class.php
===================================================================
--- podpress_class.php (Revision 210539)
+++ podpress_class.php (Arbeitskopie)
@@ -639,7 +639,6 @@
function insert_content($content = '') {
GLOBAL $post, $podPressTemplateData, $podPressTemplateUnauthorizedData, $wpdb;
-
if ( !empty($post->post_password) ) { // if there's a password
if ( stripslashes($_COOKIE['wp-postpass_'.COOKIEHASH]) != $post->post_password ) { // and it doesn't match the cookie
return $content;
@@ -671,7 +670,11 @@
$hasLocationDefined = (bool)strstr($content, $this->podcastTag);
if(!$hasLocationDefined) {
if($this->settings['contentBeforeMore'] == 'no') {
- return $content;
+ if (is_home() or is_archive()) {
+ if (FALSE !== strpos($content, 'class="more-link">')) {
+ return $content;
+ }
+ }
}
if($this->settings['contentLocation'] == 'start') {
$content = $this->podcastTag.$content;
@@ -698,11 +701,11 @@
$post->podPressMedia[$key]['previewImage'] = $this->settings['videoPreviewImage'];
}
- $supportedVideoTypes = array('video_mp4', 'video_m4v', 'video_mov', 'video_qt', 'video_avi', 'video_mpg', 'video_asf', 'video_wmv', 'video_wma', 'video_flv', 'video_swf');
+ $supportedVideoTypes = array('video_mp4', 'video_m4v', 'video_mov', 'video_qt', 'video_avi', 'video_mpg', 'video_asf', 'video_wmv', 'video_flv', 'video_swf');
if (TRUE == $this->settings['disableVideoPreview'] AND TRUE == in_array($post->podPressMedia[$key]['type'], $supportedVideoTypes)) {
$post->podPressMedia[$key]['disablePreview'] = true;
- }
-
+ }
+
if($post->podPressMedia[$key]['feedonly'] == 'on') {
continue;
}
@@ -721,7 +724,7 @@
$post->podPressMedia[$key]['stats'] = array('feed'=>$stats[0]->feed, 'web'=>$stats[0]->web, 'play'=>$stats[0]->play, 'total'=>$stats[0]->total);
}
}
- $supportedMediaTypes = array('audio_mp3', 'audio_ogg', 'audio_m4a', 'audio_mp4', 'audio_m3u', 'video_mp4', 'video_m4v', 'video_mov', 'video_qt', 'video_avi', 'video_mpg', 'video_asf', 'video_wmv', 'video_wma', 'video_flv', 'video_swf', 'ebook_pdf', 'embed_youtube');
+ $supportedMediaTypes = array('audio_mp3', 'audio_ogg', 'audio_m4a', 'audio_mp4', 'audio_m3u', 'video_mp4', 'video_m4v', 'video_mov', 'video_qt', 'video_avi', 'video_mpg', 'video_asf', 'video_wmv', 'audio_wma', 'video_flv', 'video_swf', 'ebook_pdf', 'embed_youtube');
if(!in_array($post->podPressMedia[$key]['type'], $supportedMediaTypes)) {
$post->podPressMedia[$key]['type'] = 'misc_other';
}
@@ -782,8 +785,8 @@
$post->podPressMedia[$key]['dimensionH'] = 30;
break;
case 'audio_m4a':
- case 'audio_m4a':
case 'audio_mp4':
+ case 'audio_wma':
case 'video_m4v':
case 'video_mp4':
case 'video_mov':
@@ -791,7 +794,6 @@
case 'video_avi':
case 'video_mpg':
case 'video_asf':
- case 'video_wma':
case 'video_wmv':
case 'video_flv':
case 'video_swf':
@@ -842,7 +844,7 @@
/* The theme file needs to populate these */
$podPressContent = podPress_webContent($podPressTemplateData);
}
- return str_replace($this->podcastTag,$podPressContent,$content);
+ return str_replace($this->podcastTag, $podPressContent, $content);
}
function xmlrpc_post_addMedia($input) {
Index: podpress_theme.php
===================================================================
--- podpress_theme.php (Revision 210539)
+++ podpress_theme.php (Arbeitskopie)
@@ -36,19 +36,33 @@
$val['dimensionH'] = "''";
}
$dividerNeeded = false;
-
+
+ $podPressEpisodeTitle = __($val['title'], 'podpress'); // if the title is not given by the author then it will be a defaultTitle (see podPress_defaultTitles)
+
if($val['enablePlayer']) {
if($podPressContent != '') {
$podPressContent .= "
\n";
}
- $podPressContent .= "\n".'
'."\n".''."\n".'
';
+ $podPressContent .= "\n".'
'."\n";
}
-
+
+ $podPressContent .= ''."\n".'
';
+
if(isset($val['image'])) {
if($val['enableDownload'] && !empty($val['URI'])) {
$podPressContent .= '
';
}
- $podPressContent .= ' ';
}
@@ -56,6 +70,7 @@
$val['enableDownload'] = false;
}
}
+
if($val['enableTorrentDownload']) {
$podPressContent .= '
';
if(strstr($val['image'], '_button')) {
@@ -63,12 +78,12 @@
} else {
$torrentimg = 'misc_torrent_icon.png';
}
- $podPressContent .= ' ';
}
$podPressContent .= ' ';
- $podPressContent .= __($val['title'], 'podpress');
+ $podPressContent .= $podPressEpisodeTitle;
if($podPressTemplateData['showDuration'] == 'enabled' && !empty($val['duration']) && preg_match("/([0-9]):([0-9])/", $val['duration'])) {
$podPressContent .= ' ['.$val['duration'].'m]';
@@ -90,10 +105,10 @@
} else {
$previewVal = 'false';
}
- $podPressContent .= "
".__('Play Now', 'podpress')." ";
+ $podPressContent .= '
'.__('Play Now', 'podpress').' ';
$dividerNeeded = true;
if($podPress->settings['contentAutoDisplayPlayer']) {
- $podPressPlayBlockScripts .= "podPressShowHidePlayer('".$GLOBALS['podPressPlayer']."', '".$val['URI_Player']."',".$val['dimensionW'].",".$val['dimensionH'].", '".$previewVal."', '".$val['previewImage']."');\n";
+ $podPressPlayBlockScripts .= 'podPressShowHidePlayer(\''.$GLOBALS['podPressPlayer'].'\', \''.$val['URI_Player'].'\', '.strval(intval($val['dimensionW'])).', '.strval(intval($val['dimensionH'])).', \''.$previewVal.'\', \''.$val['previewImage'].'\');';
}
}
@@ -101,7 +116,7 @@
if($dividerNeeded) {
$podPressContent .= $divider;
}
- $podPressContent .= "
".__('Play in Popup', 'podpress')." ";
+ $podPressContent .= '
'.__('Play in Popup', 'podpress').' ';
$dividerNeeded = true;
}
@@ -125,15 +140,16 @@
$dividerNeeded = true;
}
- $podPressContent .= '
'."\n".''."\n";
}
+
+ $podPressContent .= '
'."\n".''."\n";
}
if($podPress->settings['contentAutoDisplayPlayer']) {
$podPressPlayBlockScripts = '";
+ $podPressPlayBlockScripts .= "\n".'-->'."\n".'';
}
- return '
'.$podPressContent.'
'."\n".$podPressPlayBlockScripts;
+ return "\n".'
'.$podPressContent.'
'."\n".$podPressPlayBlockScripts."\n\n";
}
}
@@ -162,9 +178,11 @@
case 'video_mpg':
case 'video_asf':
case 'video_wmv':
- case 'video_wma':
return 'Online Video';
break;
+ case 'audio_wma':
+ return 'Online Audio';
+ break;
case 'video_swf':
return 'Flash Content';
break;
@@ -183,4 +201,4 @@
}
}
}
-
+?>
';
- strResult += ' 
';
- strResult += ' 
';
- strResult += ' 
';
- strResult += ' 
';
- strResult += ' 
';
- strResult += ' ';
- strResult += ' 
';
- strResult += ' 
';
- strResult += '