Changeset 1820003

Timestamp:

02/11/2018 03:19:24 PM (8 years ago)

Author:

poisl

Message:

fixed uninstallation
don't calculate statistics, if they don't exist

Location:

event-scheduler/trunk

Files:

• public/class-event_scheduler-public.php (modified) (1 diff)
• public/partials/event_scheduler-public-event-statistics-display.php (modified) (2 diffs)
• uninstall.php (modified) (1 diff)

event-scheduler/trunk/public/class-event_scheduler-public.php

@@ -305 +305 @@
 
         $oldestEventYear = $div->getOldestEventYear();
-        $currentYear = date("Y");
-
-        $index = 0;
-        $statistics = array();
-
-        for ($i = $currentYear; $i >= $oldestEventYear; $i--) {
-            $year = $i;
-
-            $statistics[$index]['year'] = $year;
-
-            $statistics[$index]['activeEvents'] = count($div->findEventsOfYearByActive($year, '1'));
-            $statistics[$index]['inactiveEvents'] = count($div->findEventsOfYearByActive($year, '0'));
-
-            $averageAccepts = $div->calculateAverageAcceptsPerEventByYear($year, '1');
-            $statistics[$index]['averageAccepts'] = $averageAccepts[0]->average;
-            $statistics[$index]['minimumAccepts'] = $averageAccepts[0]->minimum;
-            $statistics[$index]['maximumAccepts'] = $averageAccepts[0]->maximum;
-
-            $averageCancels = $div->calculateAverageAcceptsPerEventByYear($year, '0');
-            $statistics[$index]['averageCancels'] = $averageCancels[0]->average;
-            $statistics[$index]['minimumCancels'] = $averageCancels[0]->minimum;
-            $statistics[$index]['maximumCancels'] = $averageCancels[0]->maximum;
-
-            $tops = $div->topParticipantsByYear($year);
-            for ($j = 0; $j <= count($tops) - 1; $j++) {
-                $statistics[$index]['tops'][$j]['participantId'] = $tops[$j]->participantId;
-                $statistics[$index]['tops'][$j]['eventsAccepted'] = $tops[$j]->eventsAccepted;
+
+        // Only make calculation if an event exists
+        if (!empty($oldestEventYear)) {
+            $currentYear = date("Y");
+
+            $index = 0;
+            $statistics = array();
+
+            for ($i = $currentYear; $i >= $oldestEventYear; $i--) {
+                $year = $i;
+
+                $statistics[$index]['year'] = $year;
+
+                $statistics[$index]['activeEvents'] = count($div->findEventsOfYearByActive($year, '1'));
+                $statistics[$index]['inactiveEvents'] = count($div->findEventsOfYearByActive($year, '0'));
+
+                $averageAccepts = $div->calculateAverageAcceptsPerEventByYear($year, '1');
+                $statistics[$index]['averageAccepts'] = $averageAccepts[0]->average;
+                $statistics[$index]['minimumAccepts'] = $averageAccepts[0]->minimum;
+                $statistics[$index]['maximumAccepts'] = $averageAccepts[0]->maximum;
+
+                $averageCancels = $div->calculateAverageAcceptsPerEventByYear($year, '0');
+                $statistics[$index]['averageCancels'] = $averageCancels[0]->average;
+                $statistics[$index]['minimumCancels'] = $averageCancels[0]->minimum;
+                $statistics[$index]['maximumCancels'] = $averageCancels[0]->maximum;
+
+                $tops = $div->topParticipantsByYear($year);
+                for ($j = 0; $j <= count($tops) - 1; $j++) {
+                    $statistics[$index]['tops'][$j]['participantId'] = $tops[$j]->participantId;
+                    $statistics[$index]['tops'][$j]['eventsAccepted'] = $tops[$j]->eventsAccepted;
+                }
+                $index++;
             }
-            $index++;
         }
 

event-scheduler/trunk/public/partials/event_scheduler-public-event-statistics-display.php

@@ -1 +1 @@
 <?php if (is_user_logged_in()) : ?>
 
+    <?php if ($statistics): ?>
     <table>
         <tr>
@@ -39 +40 @@
     </table>
 
+    <?php elseif (!$statistics) : ?>
+        <?php _e('No events existing.', 'event_scheduler');?></div>
+    <?php endif; ?>
+
 <?php else : ?>
     <div class="attention"><?php _e('Event Scheduler can only be used by active members.', 'event_scheduler');?></div>

event-scheduler/trunk/uninstall.php

@@ -43 +43 @@
 
 /*Remove any other options your plug-in installed and clear any plug-in cron jobs */
-$options = delete_option($this->plugin_name);
+$options = delete_option('event_scheduler');
 
 if (wp_next_scheduled('event_scheduler_mail_notification')) {