Php72update

eventcalendar3/admin.php

@@ -24,7 +24,7 @@ class ec3_Version
 {
   var $part; ///< Array of version parts.
 
-  function ec3_Version($str)
+  function __construct($str)
   {
     $s=preg_replace('/([-a-z]+)([0-9]+)/','\1.\2',$str);
     $v=explode('.',$s);

eventcalendar3/calendar-basic.php

@@ -41,7 +41,7 @@ class ec3_CalendarDay
   var $_events;
   var $_events_allday;
 
-  function ec3_CalendarDay($date)
+  function __construct($date)
   {
     $this->date = $date;
     $this->_posts = array();
@@ -129,7 +129,7 @@ class ec3_BasicCalendar
   var $dateobj;
 
   /** $month_date is a string of the form "YYYY-MM..." */
-  function ec3_BasicCalendar($options=false,$month_date=false)
+  function __construct($options=false,$month_date=false)
   {
     // Set options from the $options array, if it's been provided.
     // Otherwise set the defaults from the old, global WP options.
@@ -288,7 +288,7 @@ function generate()
 
       while(True)
       {
-        $this->dateobj = clone($curr_dateobj);
+        $this->dateobj = cloneDateObj($curr_dateobj);
         if($col>6)
         {
           $monthstr .= $this->wrap_week($weekstr,$curr_dateobj);

eventcalendar3/calendar-big.php

@@ -22,10 +22,10 @@
 /** Renders a big calendar. */
 class ec3_BigCalendar extends ec3_SidebarCalendar
 {
-  function ec3_BigCalendar($options=false,$datetime=0)
+  function __construct($options=false,$datetime=0)
   {
     // Initialise the parent class.
-    $this->ec3_SidebarCalendar($options,$datetime);
+    ec3_SidebarCalendar::__construct($options,$datetime);
   }
 
   /** dayobj - ec3_CalendarDay object, may be empty. */

eventcalendar3/calendar-sidebar.php

@@ -34,7 +34,7 @@ class ec3_SidebarCalendar extends ec3_BasicCalendar
   var $disable_popups;
 
 
-  function ec3_SidebarCalendar($options=false,$datetime=false)
+  function __construct($options=false,$datetime=false)
   {
     // Set appearance options from the $options array, if it's been provided.
     // Otherwise set the defaults from the old, global WP options.
@@ -67,7 +67,7 @@ function ec3_SidebarCalendar($options=false,$datetime=false)
     // END OPTIONS
 
     // Initialise the parent class.
-    $this->ec3_BasicCalendar($options,$datetime);
+    ec3_BasicCalendar::__construct($options,$datetime);
   }
 
 

eventcalendar3/clone.php

@@ -2,7 +2,7 @@
 
 /** Compatibility function for PHP4.
  *  Don't include this file if you are using PHP5. */
-function clone($object)
+function cloneDateObj($object)
 {
   return $object;
 }

eventcalendar3/date.php

@@ -28,7 +28,7 @@ class ec3_Date
   var $_unixdate      =0;
   var $_days_in_month =0;
 
-  function ec3_Date($year_num=0,$month_num=0,$day_num=0)
+  function __construct($year_num=0,$month_num=0,$day_num=0)
   {
     global $ec3;
     if($year_num>0)

eventcalendar3/feed-ec3xml.php

@@ -23,9 +23,9 @@ class ec3_ec3xml extends ec3_BasicCalendar
 {
   var $details = array();
 
-  function ec3_ec3xml($options=false,$datetime=0)
+  function __construct($options=false,$datetime=0)
   {
-    $this->ec3_BasicCalendar($options,$datetime);
+    ec3_BasicCalendar::__construct($options,$datetime);
   }
 
   function wrap_month($monthstr)

eventcalendar3/multiwidget.php

@@ -79,7 +79,7 @@ function control_form($instance)
    *   - width
    *   - height
    */
-  function MultiWidget(
+  function __construct(
       $id_base,
       $name,
       $widget_options = array(),

eventcalendar3/options.php

@@ -71,7 +71,7 @@ class ec3_Options
   /** Local timezone. */
   var $tz;
 
-  function ec3_Options()
+  function __construct()
   {
     global $table_prefix,$wp_version;
 
@@ -82,23 +82,6 @@ function ec3_Options()
     $this->myfiles=get_option('siteurl').'/wp-content/plugins/'.$mydir;
     $this->schedule=$table_prefix.$this->schedule; // table name
 
-    // wp_version < 2.0
-    if(ereg('^1[.]',$wp_version))
-    {
-      $this->wp_user_nicename='user_nickname';
-      $this->wp_have_dbx=false;
-    }
-    // wp_version < 2.1
-    if(ereg('^(1[.]|2[.]0)',$wp_version))
-    {
-      $this->wp_in_category='category-';
-    }
-    // wp_version < 2.3
-    if(ereg('^(1[.]|2[.][012])',$wp_version))
-    {
-      $this->wp_have_categories=true;
-    }
-
     $this->read_event_category();
     $this->read_show_event_box();
     $this->read_advanced();

eventcalendar3/template-functions-new.php

@@ -411,7 +411,7 @@ class ec3_EventIterator
   /** Parameters are andices into the $ec3->events array.
    *  'begin' points to the first event.
    *  'limit' is one higher than the last event. */
-  function ec3_EventIterator($begin=0, $limit=-1)
+  function __construct($begin=0, $limit=-1)
   {
     global $ec3;
     $this->_begin = $begin;

eventcalendar3/tz.php

@@ -32,20 +32,6 @@ function ec3_tz_pop($tz)
     date_default_timezone_set($tz);
   }
 
-elseif(ini_get('safe_mode')):
-
-  // PHP4 safe mode.
-  function ec3_tz_push($tz)
-  {
-    return $tz;
-  }
-  function ec3_tz_pop($tz)
-  {
-    // do nothing
-  }
-  $ec3->tz_disabled=true;
-  $ec3->tz=getenv('TZ');
-
 else:
 
   // PHP4 safe mode OFF 

eventcalendar3/upgrade-posts.php

@@ -4,9 +4,9 @@
  *  Otherwise it can be safely ignored. */
 function ec3_upgrade_posts()
 {
-  if(!function_exists('__ngettext'))
+  if(!function_exists('_ngettext'))
   {
-    function __ngettext($single,$plural,$number,$domain='default')
+    function _ngettext($single,$plural,$number,$domain='default')
     {
       if($number==1) return __($single,$domain);
       else           return __($plural,$domain);
@@ -18,7 +18,7 @@ function __ngettext($single,$plural,$number,$domain='default')
   $ec3->advanced=false;
   $changed = ec3_upgrade_posts_apply();
 
-  $query =& new WP_Query();
+  $query = new WP_Query();
   $query->query( 'nopaging=1&cat=' . $ec3->event_category );
 
   $format = 'Y-m-d H:i:s';
@@ -30,7 +30,7 @@ function __ngettext($single,$plural,$number,$domain='default')
 
    <div id="message" class="updated fade"><p><strong>
    <?php
-     $msg = __ngettext('Post upgraded.','%d posts upgraded.',$changed,'ec3');
+     $msg = _ngettext('Post upgraded.','%d posts upgraded.',$changed,'ec3');
      echo sprintf($msg,$changed);
    ?>
    </strong></p></div>

eventcalendar3/widget-list.php

@@ -23,9 +23,9 @@
 
 class ec3_EventListWidget extends MultiWidget
 {
-  function ec3_EventListWidget()
+  function __construct()
   {
-    $this->MultiWidget(
+    MultiWidget::__construct(
         'ec3-event-list', // id_base
         __('Upcoming Events','ec3'), // name
         array('description' =>