add 3 holidays, widget tib's day shift fix

"PHP Warning:  Missing argument 2" fix in 259 and 262 strings

README.md

@@ -1,6 +1,6 @@
 Discordian Date Function
 
-under DWTWL 2.5 license: https://soundragon.su/license/license.html
+under DWTWL 2.55 license: https://soundragon.su/license/license.html
 
 https://wordpress.org/plugins/discordian-date-function/
 
@@ -8,6 +8,6 @@ This plugin allows WordPress to easily show Erisian dates instead of the standar
 
 This functional based on the Discordian Date plugin by Dan Johnson.
 
-Also provides a widget which displays the current date according to the Discordian calendar, with notification of 70 holydays.
+Also provides a widget which displays the current date according to the Discordian calendar, with notification of more than 70 holydays.
 
 And you can add the shortcode [todаy_ddate] in posts or pages for show the Discordian date of today.

ddatefunc.php

@@ -2,8 +2,8 @@
 /*
 Plugin Name: Discordian Date Function
 Plugin URI: https://is3.soundragon.su/discordian-date-function
-Description: Convert dates in Wordpress to Discordian dates. Also, this plugin provides shortcode and widget used to display the current erisian date with notification of 70 holydays. Based on the Discordian Date plugin by Dan Johnson.
-Version: 0.5
+Description: Convert dates in Wordpress to customizable Discordian dates. Also, this plugin provides shortcode and widget used to display the current erisian date with notification of 70 holydays. Based on the Discordian Date plugin by Dan Johnson.
+Version: 0.555
 Author: ivan zlax
 Author URI: https://is3.soundragon.su/about
 */
@@ -31,12 +31,19 @@ function get_ddate($content, $format = "", $originalRequest = null) {
   }
 
   $dyear=$standard_date["year"]+1166;
+  $gyear=$standard_date["year"];
   $yday=$standard_date["yday"];
+  // Check Tib's day according to Gregorian calendar
+  if ($gyear%4==0&&$gyear%100!=0 || $gyear%400==0) {
+    if ($standard_date["yday"]==59) $sttib="St. Tib's";
+    if ($standard_date["yday"]>59) $yday=$standard_date["yday"]-1;
+  }
   $mon=$standard_date["mon"];
   $mday=$standard_date["mday"];
   $dseason=(int)($yday/73);
   $name_season=$season_list[$dseason];
   $dday=($yday-(73*$dseason))+1;
+  $clear_dday=$dday;
   $suff=$dday%10;
 
   switch ($suff) {
@@ -54,8 +61,39 @@ function get_ddate($content, $format = "", $originalRequest = null) {
   }
 
   $dweekday=$day_list[($yday%5)];
-  $ddate=$dweekday.", the ".$dday." day of ".$name_season.", in the yold ".$dyear;
 
+  if ($originalRequest == "now") {
+    $ddate=$dweekday.", the ".$dday." day of ".$name_season.", in the yold ".$dyear;
+    if (isset($sttib)) $ddate=$sttib." day, in the yold ".$dyear;
+  } else {
+    $patterns = array();
+    $patterns[0] = '%DY';
+    $patterns[1] = '%DS';
+    $patterns[2] = '%DD';
+    $patterns[3] = '%DC';
+    $patterns[4] = '%DW';
+    $patterns[5] = '%GY';
+    $patterns[6] = '%GM';
+    $patterns[7] = '%GN';
+    $patterns[8] = '%GD';
+    $patterns[9] = '%GW';
+    $replacements = array();
+    $replacements[0] = $dyear;
+    $replacements[1] = $name_season;
+    $replacements[2] = $dday;
+    $replacements[3] = $clear_dday;
+    if (isset($sttib)) {
+      $replacements[2] = $sttib;
+      $replacements[3] = "tib";
+    }
+    $replacements[4] = $dweekday;
+    $replacements[5] = $standard_date["year"];
+    $replacements[6] = $standard_date["month"];
+    $replacements[7] = $standard_date["mon"];
+    $replacements[8] = $standard_date["mday"];
+    $replacements[9] = $standard_date["weekday"];
+    $ddate = str_replace($patterns, $replacements, get_option('ddatefunc_string'));
+  }
   return $ddate;
 }
 
@@ -74,35 +112,36 @@ class Discordian_Date_Widget extends WP_Widget {
     $mon=$now["mon"];
     $mday=$now["mday"];
     $dseason=(int)($yday/73);
+    if ($now["year"]%4==0&&$now["year"]%100!=0 || $now["year"]%400==0)            
+      if ($now["yday"]>59) $yday=$now["yday"]-1;
     $dday=($yday-(73*$dseason))+1;
     $a_holiday=array("Mungday", "Mojoday", "Syaday", "Zaraday", "Maladay");
     $s_holiday=array("Chaoflux", "Discoflux", "Confuflux", "Bureflux", "Afflux");
+    $m_holyday=array("Chaomas", "Discomas", "Confumas", "Buremas", "Afmas");
+    $t_holyday=array("Chaosloth", "Discosloth", "Confusloth", "Buresloth", "Afsloth");
+    $e_holyday=array("Mungeye", "Mojeye", "Syadeye", "Zareye", "Maleye");
     $holyday="";
 
     if ($dday==5) {
-      $holyday = " Celebrate ".$a_holiday[$dseason].".";
+      $holyday = " Celebrate Apostle Day, ".$a_holiday[$dseason].".";
+    } elseif ($dday==23) {
+      $holyday = " Celebrate Synaptyclypse Day, ".$m_holiday[$dseason].".";
+    } elseif ($dday==27) {
+      $holyday = " Celebrate Sloth Day, ".$t_holiday[$dseason].".";
     } elseif ($dday==50) {
-      $holyday = " Celebrate ".$s_holiday[$dseason].".";
+      $holyday = " Celebrate Flux Day, ".$s_holiday[$dseason].".";
+    } elseif ($dday==73) {
+      $holyday = " Celebrate Eye Day, ".$e_holiday[$dseason].".";
     } elseif ($mon==2 && $mday==29) {
       $holyday = " Celebrate St. Tib's Day.";
-    } elseif ($dseason==2 && $dday==28) {
-      $holyday = " Celebrate St. George’s Day.";
-    } elseif ($dseason==2 && $dday==57) {
-      $holyday = " Celebrate John Dillinger Day.";
-    } elseif ($dseason==4 && $dday==65) {
-      $holyday = " Celebrate Circlemas.";
-    } elseif ($dday==23) {
-      $holyday = " Celebrate Synaptyclypse Day.";
-    } elseif ($dday==27) {
-      $holyday = " Celebrate Sloth Day.";
-    } elseif ($dday==73) {
-      $holyday = " Celebrate Eye Day.";
     } elseif ($dseason==0 && $dday==8) {
       $holyday = " Celebrate Death of Emperor Norton.";
     } elseif ($dseason==0 && $dday==10) {
-      $holyday = " Celebrate Backwards Day, Reformed / Binary Day.";
+      $holyday = " Celebrate Backwards/Binary Day.";
     } elseif ($dseason==0 && $dday==11) {
       $holyday = " Celebrate RAW Day.";
+    } elseif ($dseason==0 && $dday==14) {
+      $holyday = " Celebrate Golden Apple Presentation Day.";
     } elseif ($dseason==0 && $dday==17) {
       $holyday = " Celebrate Joshmas.";
     } elseif ($dseason==0 && $dday==18) {
@@ -126,11 +165,9 @@ class Discordian_Date_Widget extends WP_Widget {
     } elseif ($dseason==1 && $dday==11) {
       $holyday = " Celebrate Discordians for Jesus/Love Your Neighbor Day.";
     } elseif ($dseason==1 && $dday==18) {
-      $holyday = " Celebrate April Fool’s Day.";
+      $holyday = " Celebrate Fool’s Day.";
     } elseif ($dseason==1 && $dday==19) {
-      $holyday = " Celebrate St John the Blasphemist’s Day.";
-    } elseif ($dseason==1 && $dday==23) {
-      $holyday = " Celebrate Jake Day.";
+      $holyday = " Celebrate St. John the Blasphemist’s Day.";
     } elseif ($dseason==1 && $dday==34) {
       $holyday = " Celebrate Omarmas.";
     } elseif ($dseason==1 && $dday==43) {
@@ -143,20 +180,30 @@ class Discordian_Date_Widget extends WP_Widget {
       $holyday = " Celebrate Towel Day.";
     } elseif ($dseason==2 && $dday==26) {
       $holyday = " Celebrate Imaginary Friend/Captain Tuttle Day.";
+    } elseif ($dseason==2 && $dday==28) {
+      $holyday = " Celebrate St. George’s Day.";
+    } elseif ($dseason==2 && $dday==30) {
+      $holyday = " Celebrate Zoog Day.";
+    } elseif ($dseason==2 && $dday==36) {
+      $holyday = " Celebrate June 31st for Popes.";
     } elseif ($dseason==2 && $dday==37) {
       $holyday = " Celebrate Mid-Year’s Day.";
     } elseif ($dseason==2 && $dday==40) {
       $holyday = " Celebrate X-Day.";
     } elseif ($dseason==2 && $dday==55) {
       $holyday = " Celebrate Mal-2 Day.";
+    } elseif ($dseason==2 && $dday==57) {
+      $holyday = " Celebrate John Dillinger Day.";
     } elseif ($dseason==3 && $dday==3) {
       $holyday = " Celebrate Multiversal Underwear Day.";
     } elseif ($dseason==3 && $dday==18) {
       $holyday = " Celebrate Festival of Hanky-Panky Spankies.";
     } elseif ($dseason==3 && $dday==33) {
-      $holyday = " Celebrate Cat Dancing & Foot Fetish Day aka Pussyfoot Day.";
+      $holyday = " Celebrate Cat Dancing & Pussyfoot Day.";
     } elseif ($dseason==3 && $dday==37) {
       $holyday = " Celebrate Mass of Planet Eris/Eristotle.";
+    } elseif ($dseason==3 && $dday==39) {
+      $holyday = " Celebrate St. Mammes's Day.";
     } elseif ($dseason==3 && $dday==41) {
       $holyday = " Celebrate Emperor Norton Proclamation Day.";
     } elseif ($dseason==3 && $dday==57) {
@@ -175,25 +222,18 @@ class Discordian_Date_Widget extends WP_Widget {
       $holyday = " Celebrate 537 Day, sometimes Turkey Day.";
     } elseif ($dseason==4 && $dday==40) {
       $holyday = " Celebrate Omar’s Day.";
+    } elseif ($dseason==4 && $dday==43) {
+      $holyday = " Celebrate Day D.";
     } elseif ($dseason==4 && $dday==46) {
       $holyday = " Celebrate Hug Day II.";
-    } elseif ($dseason==4 && $dday==67) {
-      $holyday = " Celebrate Santa Claus Day.";
-    } elseif ($dseason==4 && $dday==72) {
-      $holyday = " Celebrate New Year’s Eve Eve.";
+    } elseif ($dseason==4 && $dday==65) {
+      $holyday = " Celebrate Circlemas.";
     }
 
     extract($args);
     $title = $instance['title'];
     $body = apply_filters('widget_text', $instance['body']);
 
-    if (!empty($title)) {
-      ob_start();
-      eval(" ?>$title<?php ");
-      $title2 = ob_get_contents();
-      ob_end_clean();
-    }
-
     ob_start();
     echo "<div class=\"discordian_date_func\" style=\"width:100%;text-align:center;font-size:18px;line-height:36px;padding-top:40px;padding-bottom:40px;\"> Today is ";
     echo get_ddate($content, $format, "now").".";
@@ -226,17 +266,17 @@ class Discordian_Date_Widget extends WP_Widget {
   }
 }
 
-function get_the_ddate_post($content, $format){
+function get_the_ddate_post($content, $format = null) {
   return get_ddate($content, $format, "get_the_date"); }
 
-function get_the_ddate_comment($content, $format){
+function get_the_ddate_comment($content, $format = null) {
   return get_ddate($content, $format, "get_comment_date"); }
 
 function register_ddatefunc_widget() {
   register_widget( 'Discordian_Date_Widget' );
 }
 
-function today_ddate(){
+function today_ddate() {
   echo return_today_hebDate();
 }
 
@@ -244,7 +284,106 @@ function return_today_ddate() {
   return get_ddate($content, $format, "now");
 }
 
-add_shortcode('today_ddate', 'return_today_ddate');
+$settings_name = "Discordian Date Function Settings";
+
+function ddatefunc_add_admin() {
+  global $settings_name;
+  add_options_page(__('Settings').': '.$settings_name, $settings_name, 'edit_themes', basename(__FILE__), 'ddatefunc_admin');
+}
+
+function ddatefunc_admin() {
+  global $settings_name;
+?>
+<div class="wrap">
+<?php
+  screen_icon();
+  echo '<h2>'.$settings_name.'</h2>';
+  if (isset($_POST['save'])) {
+    update_option('ddatefunc_string', stripslashes($_POST['textfield']));
+    if (isset($_POST['checkbox']))
+      update_option('ddatefunc_change', "1");
+    else
+      update_option('ddatefunc_change', "0");
+    echo '<div id="setting-error-settings_updated" class="updated settings-error"><p><b>'.__('Settings saved.').'</b></p></div>';
+  }
+?>
+  <form method="post">
+    <table class="form-table">
+      <tr valign="top">
+        <th scope="row">Date string:</th>
+        <td>
+          <input name="textfield" class="regular-text" type="text" value="<?php echo get_option('ddatefunc_string'); ?>" >
+        </td>
+      </tr>
+      <tr valign="top">
+        <th scope="row">Legend:</th>
+        <td>
+<b>%DY</b> - Discordian yold (example: 3180)<br>
+<b>%DS</b> - Erisian season name (example: Chaos)<br>
+<b>%DD</b> - Discordian season day (example: 5th)<br>
+<b>%DC</b> - Clear erisian day number (example: 5)<br>
+<b>%DW</b> - Discordian week day (example: Setting Orange)<br>
+<b>%GY</b> - Gregorian year (example: 2014)<br>
+<b>%GM</b> - Gregorian month (example: January)<br>
+<b>%GN</b> - Gregorian month number (example: 1)<br>
+<b>%GD</b> - Gregorian month day (example: 5)<br>
+<b>%GW</b> - Gregorian weekday (example: Friday)<br>
+<br>
+Examples<br>
+<br>
+<b>%DW, the %DD day of %DS, in the yold %DY</b><br> returns:<br><b>Setting Orange, the 5th day of Chaos, in the yold 3180</b><br>
+<br>
+<b>%DC %DS, %DY (%GN.%GN.%GY)</b><br> returns:<br><b>5 Chaos, 3180 (5.1.2014)</br>
+        </td>
+      </tr>
+      <tr valign="top">
+        <th scope="row">Convert all post and comments dates:</th>
+        <td>
+          <fieldset>
+          <legend class="screen-reader-text">
+          <span>Convert to Discordian dates</span>
+          </legend>
+          <label for="users_can_register">
+          <input name="checkbox" id="users_can_register" type="checkbox" value="1" <?php if(get_option('ddatefunc_change')==1) { echo 'checked="checked"'; } ?>>
+          </label>
+          </fieldset>
+        </td>
+      </tr>
+    </table>
+  <div class="submit">
+    <input name="save" type="submit" class="button-primary" value="<?php echo __('Save Cganges'); ?>" />
+  </div>
+  </form>
+</div>
+<?php
+}
+
+function ddatefunc_settings( $actions, $plugin_file ) {
+  if( false === strpos( $plugin_file, basename(__FILE__) ) )
+    return $actions;
+
+  $settings_link = '<a href="options-general.php?page=ddatefunc.php' .'">Settings</a>';
+  array_unshift( $actions, $settings_link );
+  return $actions;
+}
+
+function ddatefunc_deinstall() {
+  delete_option('ddatefunc_string');
+  delete_option('ddatefunc_change');
+}
+
+add_shortcode( 'today_ddate', 'return_today_ddate' );
 add_action( 'widgets_init', 'register_ddatefunc_widget' );
-add_filter( 'get_the_date','get_the_ddate_post' );
-add_filter( 'get_comment_date','get_the_ddate_comment' );
+add_option( 'ddatefunc_string', '%DD day of %DS, in the yold %DY');
+add_option( 'ddatefunc_change', '1');
+
+add_filter( 'plugin_action_links', 'ddatefunc_settings', 10, 2 );
+add_action( 'admin_menu', 'ddatefunc_add_admin' );
+
+if ( get_option('ddatefunc_change') == '1' ) {
+  add_filter( 'get_the_date','get_the_ddate_post' );
+  add_filter( 'get_comment_date','get_the_ddate_comment' );
+}
+
+if (function_exists('register_uninstall_hook'))
+  register_uninstall_hook(__FILE__, 'ddatefunc_deinstall');

readme.txt

@@ -1,21 +1,21 @@
 === Discordian Date Function ===
 Contributors: zlaxyi
 Donate link: https://is3.soundragon.su/discordian-date-function
-Tags: date, discordian, erisian, widget
+Tags: date, discordian, erisian, widget, eris, discordia, calendar
 Requires at least: 2.0
-Tested up to: 4.7.3
+Tested up to: 5.3.2
 Stable tag: trunk
-License: DWTWL 2.5
+License: DWTWL 2.55
 License URI: https://soundragon.su/license/license.html
 
-This plugin provides Discordian dates in Wordpress.
+This plugin provides Erisian (Discordian) dates in Wordpress.
 Also provides shortcode and widget which displays the current date according to the Discordian calendar, with notification of 70 holydays.
 
 == Description ==
 
-This plugin allows WordPress to easily show Erisian dates instead of the standard Gregorian dates. No theme changes are required.
+This plugin allows WordPress to easily show customizable Erisian dates instead of the standard Gregorian dates. No theme changes are required.
 
-The Discordian Date plugin provides a widget which will display the current date according to the [Discordian calendar](http://en.wikipedia.org/wiki/Discordian_calendar). This functional based on the Discordian Date plugin by Dan Johnson.
+The Discordian Date Function plugin provides a widget which will display the current date according to the [Discordian calendar](http://en.wikipedia.org/wiki/Discordian_calendar). This functional based on the Discordian Date plugin by Dan Johnson.
 
 And you can add the shortcode [today_ddate] in posts or pages for show the Discordian date of today.
 
@@ -24,6 +24,7 @@ And you can add the shortcode [today_ddate] in posts or pages for show the Disco
 1. Extract the files from archive.
 1. Upload the folder ddatefunc and its contents to the /wp-content/plugins/ directory.
 1. Activate the plugin through the 'Plugins' menu in WordPress.
+1. Press 'Settings' for customize date string.
 1. If you want to add widget: position the widget in an available area on your pages using the Widgets section of your WordPress administration control panel.
 1. Use the widget options to give the widget any title you'd like.
 1. (Optional) if you want to add the erisian date of today than you need to add <?php today_ddate() ?> where you want.
@@ -40,10 +41,25 @@ Feel free to ask any questions about this plugin at the [Discordian Date Functio
 
 == Changelog ==
 
+= 0.555 =
+*Release Date - 60th day of Chaos, 3186*
+
+* Fixed Tib's day shift according Gregorian calendar's leap year.
+* Add St. Mammes's day, fixed some other holiday strings.
+
+= 0.55 =
+*Release Date - 5th day of Discord, 3183*
+
+* Fixed names of some Whollydays.
+* Add settings page.
+* Add customizable date string.
+
 = 0.5 =
+*Release Date - 2nd day of Discord, 3183*
+
 * First public release.
 
 == Upgrade Notice ==
 
-= 0.5 =
-This version is the first public release.
+= 0.555 =
+This version is actual.