Changeset 1599229
- Timestamp:
- 02/19/2017 09:45:32 PM (9 years ago)
- Location:
- shownotes/trunk
- Files:
-
- 12 edited
-
OSFphp/osf.php (modified) (6 diffs)
-
OSFphp/parse.php (modified) (1 diff)
-
readme.md (modified) (2 diffs)
-
readme.txt (modified) (3 diffs)
-
shownotes.php (modified) (5 diffs)
-
snsettings.php (modified) (4 diffs)
-
static/shownotes.js (modified) (1 diff)
-
static/shownotes_admin.js (modified) (1 diff)
-
static/style_four.css (modified) (1 diff)
-
static/style_one.css (modified) (1 diff)
-
static/style_three.css (modified) (1 diff)
-
static/style_two.css (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
shownotes/trunk/OSFphp/osf.php
r898846 r1599229 98 98 $osf_starttime = $unixtimestamps[0][0]; 99 99 $regexTS = array( 100 '/\n[0-9:]{9,23}/ e',100 '/\n[0-9:]{9,23}/', 101 101 'osf_time_from_timestamp(\'\\0\')' 102 102 ); 103 return preg_replace($regexTS[0], $regexTS[1], $shownotes); 103 return preg_replace_callback($regexTS[0], function ($matches) { 104 return osf_time_from_timestamp($matches[0]); 105 }, $shownotes); 104 106 } 105 107 } … … 153 155 $regex['podcaster'] = '/(Podcaster|Zusammengetragen)[^:]*:([ \S]*)/'; 154 156 preg_match_all($regex[$persons], $header, $persons); 155 $persons = preg_split('/(,|;| und | and )/', $persons[2][0]);157 $persons = preg_split('/(,|;| und | and )/', @$persons[2][0]); 156 158 $personsArray = array(); 157 159 $personsArrayHTML = array(); … … 176 178 preg_match_all($regex, $header, $date); 177 179 date_default_timezone_set('Europe/Berlin'); 178 $date = strtotime( $date[2][0]);180 $date = strtotime(@$date[2][0]); 179 181 if($date != false) { 180 182 return $date; … … 186 188 $regex = '/(Podcast|Podcastname|Sendung)[^:]*:([ \S]*)/'; 187 189 preg_match_all($regex, $header, $title); 188 return $title[2][0];190 return @$title[2][0]; 189 191 } 190 192 … … 192 194 $regex = '/(Episode|Folge)[^:]*:([ \S]*)/'; 193 195 preg_match_all($regex, $header, $number); 194 return $number[2][0];196 return @$number[2][0]; 195 197 } 196 198 … … 198 200 $regex = '/(Title|Episodetitle|Thema|Subject)[^:]*:([ \S]*)/i'; 199 201 preg_match_all($regex, $header, $title); 200 return $title[2][0];202 return @$title[2][0]; 201 203 } 202 204 203 205 function osf_parser($shownotes, $data) { 204 206 // Diese Funktion ist das Herzstück des OSF-Parsers 205 $tagsmode = $data['tagsmode'];207 $tagsmode = @$data['tagsmode']; 206 208 $specialtags = $data['tags']; 207 209 $exportall = $data['fullmode']; -
shownotes/trunk/OSFphp/parse.php
r829816 r1599229 30 30 $shownotesArray = osf_parser($shownotesString, $data); 31 31 32 $return['podcast'] = osf_get_podcastname( $shownotesArray['header']);33 $return['episode'] = str_replace($return['podcast'], '', osf_get_episodenumber( $shownotesArray['header']));34 $return['shownoter'] = osf_get_persons('shownoter', $shownotesArray['header']);35 $return['podcaster'] = osf_get_persons('podcaster', $shownotesArray['header']);36 $return['episodetime'] = osf_get_episodetime( $shownotesArray['header']);37 $return['subject'] = osf_get_episodename( $shownotesArray['header']);32 $return['podcast'] = osf_get_podcastname(@$shownotesArray['header']); 33 $return['episode'] = str_replace($return['podcast'], '', osf_get_episodenumber(@$shownotesArray['header'])); 34 $return['shownoter'] = osf_get_persons('shownoter', @$shownotesArray['header']); 35 $return['podcaster'] = osf_get_persons('podcaster', @$shownotesArray['header']); 36 $return['episodetime'] = osf_get_episodetime(@$shownotesArray['header']); 37 $return['subject'] = osf_get_episodename(@$shownotesArray['header']); 38 38 39 39 $return['json'] = json_encode($shownotesArray['export']); -
shownotes/trunk/readme.md
r1244742 r1599229 4 4 Donate link: https://flattr.com/profile/simonwaldherr 5 5 Tags: shownotes, osf, markup, podlove, markdown, etherpad, affiliate 6 Requires at least: 3.3.17 Tested up to: 4. 36 Requires at least: 4.0 7 Tested up to: 4.6 8 8 Stable tag: trunk 9 9 License: MIT License … … 58 58 59 59 ##Changelog 60 61 ###0.5.6 62 63 * fix “PHP Error: The /e modifier is deprecated” 60 64 61 65 ###0.5.5 -
shownotes/trunk/readme.txt
r1244742 r1599229 3 3 Donate link: https://flattr.com/profile/simonwaldherr 4 4 Tags: shownotes, osf, markup, podlove, md, podcast, markdown, etherpad, affiliate 5 Requires at least: 3.3.16 Tested up to: 4. 35 Requires at least: 4.0 6 Tested up to: 4.6 7 7 Stable tag: trunk 8 8 License: MIT License … … 72 72 73 73 == Changelog == 74 75 = 0.5.6 = 76 * fix “PHP Error: The /e modifier is deprecated” 74 77 75 78 = 0.5.5 = … … 233 236 == Upgrade Notice == 234 237 238 = 0.5.6 = 239 fix “PHP Error: The /e modifier is deprecated” 240 235 241 = 0.5.5 = 236 242 set search to shownotes + blogpost as default, but you can turn it off (opt-out in settings page) -
shownotes/trunk/shownotes.php
r1244742 r1599229 4 4 /** 5 5 * @package Shownotes 6 * @version 0.5. 56 * @version 0.5.6 7 7 */ 8 8 … … 12 12 Description: Convert OSF-Shownotes to HTML for your Podcast 13 13 Author: Simon Waldherr 14 Version: 0.5. 514 Version: 0.5.6 15 15 Author URI: http://waldherr.eu 16 16 License: MIT License … … 40 40 'style_five' 41 41 ); 42 wp_enqueue_style('shownotesstyle', plugins_url('static/' . $css_styles[$shownotes_options['css_id']] . '.css', __FILE__), array(), '0.5. 5');42 wp_enqueue_style('shownotesstyle', plugins_url('static/' . $css_styles[$shownotes_options['css_id']] . '.css', __FILE__), array(), '0.5.6'); 43 43 } 44 44 } … … 285 285 function shownotesshortcode_add_admin_scripts() { 286 286 if (!is_feed()) { 287 wp_enqueue_script('majax', plugins_url('static/majaX/majax.js', __FILE__), array(), '0.5. 5', false);288 wp_enqueue_script('importPad', plugins_url('static/shownotes_admin.js', __FILE__), array(), '0.5. 5', false);289 wp_enqueue_script('tinyosf', plugins_url('static/tinyOSF/tinyosf.js', __FILE__), array(), '0.5. 5', false);290 wp_enqueue_script('tinyosf_exportmodules', plugins_url('static/tinyOSF/tinyosf_exportmodules.js', __FILE__), array(), '0.5. 5', false);287 wp_enqueue_script('majax', plugins_url('static/majaX/majax.js', __FILE__), array(), '0.5.6', false); 288 wp_enqueue_script('importPad', plugins_url('static/shownotes_admin.js', __FILE__), array(), '0.5.6', false); 289 wp_enqueue_script('tinyosf', plugins_url('static/tinyOSF/tinyosf.js', __FILE__), array(), '0.5.6', false); 290 wp_enqueue_script('tinyosf_exportmodules', plugins_url('static/tinyOSF/tinyosf_exportmodules.js', __FILE__), array(), '0.5.6', false); 291 291 } 292 292 } … … 294 294 function shownotesshortcode_add_scripts() { 295 295 if (!is_feed()) { 296 wp_enqueue_script('importPad', plugins_url('static/shownotes.js', __FILE__), array(), '0.5. 5', false);296 wp_enqueue_script('importPad', plugins_url('static/shownotes.js', __FILE__), array(), '0.5.6', false); 297 297 } 298 298 } -
shownotes/trunk/snsettings.php
r1244742 r1599229 97 97 98 98 $options = get_option('shownotes_options'); 99 $version = '0.5. 5';99 $version = '0.5.6'; 100 100 101 101 if(isset($options['version'])) { … … 103 103 if($version != $lastversion) { 104 104 print '<h3>Version</h3><p>Congratulations, you just upgraded the <b>shownotes</b> plugin from <b>version '.$lastversion.'</b> to <b>version '.$version.'</b></p>'; 105 if(versionInt($lastversion) < versionInt('0.5.6')) { 106 print '<p><b>0.5.6: </b>fix "PHP Error: The /e modifier is deprecated"</p>'; 107 } 105 108 if(versionInt($lastversion) < versionInt('0.5.5')) { 106 109 print '<p><b>0.5.5: </b>searching shownotes <b>AND</b> blogpost by default (you can opt out if you need)</p>'; … … 125 128 } 126 129 if(versionInt($lastversion) < versionInt('0.4.0')) { 127 print '<p><b>0.4.0: </b>more icons and a & #34;error on save" bugfix</p>';130 print '<p><b>0.4.0: </b>more icons and a "error on save" bugfix</p>'; 128 131 } 129 132 if(versionInt($lastversion) < versionInt('0.3.9')) { … … 325 328 $scriptname = explode('/wp-admin', $_SERVER['SCRIPT_FILENAME']); 326 329 $dirname = explode('/wp-content', dirname(__FILE__)); 327 print '<p>This is <strong>Version 0.5. 5</strong> of the <strong> Shownotes</strong>.<br>330 print '<p>This is <strong>Version 0.5.6</strong> of the <strong> Shownotes</strong>.<br> 328 331 The <strong>Including file</strong> is: <code>wp-admin' . $scriptname[1] . '</code><br> 329 332 The <strong>plugin-directory</strong> is: <code>wp-content' . $dirname[1] . '</code></p> -
shownotes/trunk/static/shownotes.js
r1244742 r1599229 8 8 * Github: https://github.com/SimonWaldherr/wp-osf-shownotes 9 9 * Wordpress: http://wordpress.org/plugins/shownotes/ 10 * Version: 0.5. 510 * Version: 0.5.6 11 11 */ 12 12 -
shownotes/trunk/static/shownotes_admin.js
r1244742 r1599229 8 8 * Github: https://github.com/SimonWaldherr/wp-osf-shownotes 9 9 * Wordpress: http://wordpress.org/plugins/shownotes/ 10 * Version: 0.5. 510 * Version: 0.5.6 11 11 */ 12 12 -
shownotes/trunk/static/style_four.css
r1244742 r1599229 1 /* https://github.com/SimonWaldherr/wp-osf-shownotes/blob/master/static/style_four.css 0.5. 5*/1 /* https://github.com/SimonWaldherr/wp-osf-shownotes/blob/master/static/style_four.css 0.5.6 */ 2 2 3 3 .osf_chaptertime { -
shownotes/trunk/static/style_one.css
r1244742 r1599229 1 /* https://github.com/SimonWaldherr/wp-osf-shownotes/blob/master/static/style_one.css 0.5. 5*/1 /* https://github.com/SimonWaldherr/wp-osf-shownotes/blob/master/static/style_one.css 0.5.6 */ 2 2 3 3 .osf_chaptertime { -
shownotes/trunk/static/style_three.css
r1244742 r1599229 1 /* https://github.com/SimonWaldherr/wp-osf-shownotes/blob/master/static/style_three.css 0.5. 5*/1 /* https://github.com/SimonWaldherr/wp-osf-shownotes/blob/master/static/style_three.css 0.5.6 */ 2 2 3 3 .osf_chaptertime { -
shownotes/trunk/static/style_two.css
r1244742 r1599229 1 /* https://github.com/SimonWaldherr/wp-osf-shownotes/blob/master/static/style_two.css 0.5. 5*/1 /* https://github.com/SimonWaldherr/wp-osf-shownotes/blob/master/static/style_two.css 0.5.6 */ 2 2 3 3 .osf_chaptertime {
Note: See TracChangeset
for help on using the changeset viewer.