Changeset 1749023

Timestamp:

10/19/2017 06:56:34 AM (7 years ago)

Author:

ekamiya

Message:

ver.1.0.3; code changes for performance.

Location:

simple-schedule-notice/trunk

Files:

• readme.txt (modified) (1 diff)
• simple-schedule-notice.php (modified) (9 diffs)

simple-schedule-notice/trunk/readme.txt

@@ -4 +4 @@
 Tags: reminder,notice,notification,schedule,mail
 Requires at least:
-Tested up to: 4.8.1
+Tested up to: 4.8.2
 Stable tag: trunk
 License: GPLv2 or later

simple-schedule-notice/trunk/simple-schedule-notice.php

@@ -17 +17 @@
   var $module_title, $menu_title;
   var $sys_timezone, $wp_timezone, $msg, $system_error;
+  var $actionhooks;
 
   //constructor
@@ -26 +27 @@
     register_deactivation_hook( __FILE__, array($this, 'simschntc_deactivation' ) );
     //setup events
-    foreach ( $this->actionhooks() as $hook => $action ) {
-      add_action( $hook, array($this, $action ) );
+    $this->actionhooks = array(
+      cActionHook           => 'simschntc_process_event',
+      cActionHook_immediate => 'simschntc_process_event',
+      cActionHook_test      => 'simschntc_process_testevent'
+    );
+    foreach ( $this->actionhooks as $hook => $action ) {
+      add_action( $hook, array( $this, $action ));
     }
     //omit appending posttype on mail title
@@ -266 +272 @@
               <?php
               $shedcnt = 0;
-              foreach ( array_keys( $this->actionhooks() ) as $hook ) {
+              foreach ( array_keys( $this->actionhooks ) as $hook ) {
                 $shcdinfo = wp_next_scheduled( $hook );
                 if ( $shcdinfo ) {
@@ -480 +486 @@
     $maillist     = array();
     if ( !$post_meta_info[ 'suppress_default1' ] ) {
-      $this->array_add( $maillist, $base_info[ 'default_mailaddr1' ] );
+      $this->array_append( $maillist, $base_info[ 'default_mailaddr1' ] );
     }
     if ( !$post_meta_info[ 'suppress_default2' ] ) {
-      $this->array_add( $maillist, $base_info[ 'default_mailaddr2' ] );
-    }
-    $this->array_add( $maillist, $post_meta_info[ 'mailaddr1' ] );
-    $this->array_add( $maillist, $post_meta_info[ 'mailaddr2' ] );
+      $this->array_append( $maillist, $base_info[ 'default_mailaddr2' ] );
+    }
+    $this->array_append( $maillist, $post_meta_info[ 'mailaddr1' ] );
+    $this->array_append( $maillist, $post_meta_info[ 'mailaddr2' ] );
     // vv... seems Array doesnt work. ...vv
     //$result = wp_mail($maillist, ($testmode ? __( 'テスト送信：', cPluginID ) : '').$post_title, $post_content);
@@ -653 +659 @@
 //  or $default value if array value is not defined.
 // if the type of $default is boolean, either 'true', 'on' or 'yes' returns TRUE.
+    $ret = $default;
     if ( isset( $array[ $key ] ) ) {
       $ret = $array[ $key ];
@@ -695 +702 @@
           break;
       }
-    } else {
-      $ret = $default;
     }
     return $ret;
@@ -705 +710 @@
   }
 
-  private function array_add( &$arr, $newmember ) {
-    // Add new member to the array, if $newmember is not empty.
+  private function array_append( &$arr, $memb ) {
+    // Add new member to the array, if $memb is not empty.
     // Returns nothing.
-    if ( !empty( $newmember ) ) {
-      $arr[] = $newmember;
+    if ( ! empty( $memb ) ) {
+      if ( is_array( $memb )) {
+        foreach ( $memb as $elem ) {
+          $arr[] = $elem;
+        }
+      } else {
+        $arr[] = $memb;
+      }
     }
   }
@@ -823 +834 @@
       wp_clear_scheduled_hook( $hook );
     } else {
-      foreach ( array_keys( $this->actionhooks() ) as $hook ) {
+      foreach ( array_keys( $this->actionhooks ) as $hook ) {
         $shcdinfo = wp_next_scheduled( $hook );
         if ( $shcdinfo ) {
@@ -858 +869 @@
   }
 
-  private function actionhooks() {
-    //Returns event hook list
-    return array(
-      cActionHook           => 'simschntc_process_event',
-      cActionHook_immediate => 'simschntc_process_event',
-      cActionHook_test      => 'simschntc_process_testevent'
-    );
-  }
-
   private function cycledef() {
     return array(