Changeset 112419 in spip-zone

Timestamp:

Nov 14, 2018, 4:17:30 PM (2 years ago)

Author:

cedric@…

Message:

optimisations rapidite : eviter de recalculer N fois les informations liees d'un subscriber si on actualise les N segments d'une meme liste

Location:

_plugins_/mailsubscribers/trunk

Files:

• inc/mailsubscribinglists.php (modified) (4 diffs)
• paquet.xml (modified) (1 diff)

_plugins_/mailsubscribers/trunk/inc/mailsubscribinglists.php

@@ -75 +75 @@
                                 or in_array($id_segment, $update_needed)
                           or (isset($segment['auto_update']) and $segment['auto_update'])){
-                                mailsubscribers_actualise_segment($id_mailsubscriber, $id_mailsubscribinglist, $id_segment);
+                                mailsubscribers_actualise_segment($id_mailsubscriber, $id_mailsubscribinglist, $id_segment, $segments[$id_mailsubscribinglist]);
                         }
                 }
@@ -87 +87 @@
  * @param $id_mailsubscribinglist
  * @param $id_segment
+ * @param array $segments
  */
-function mailsubscribers_actualise_segment($id_mailsubscriber, $id_mailsubscribinglist, $id_segment){
-        static $segments = array();
-        if (!isset($segments[$id_mailsubscribinglist])) {
-                if ($segments[$id_mailsubscribinglist] = sql_getfetsel('segments','spip_mailsubscribinglists','id_mailsubscribinglist='.intval($id_mailsubscribinglist))){
-                        $segments[$id_mailsubscribinglist] = unserialize($segments[$id_mailsubscribinglist]);
+function mailsubscribers_actualise_segment($id_mailsubscriber, $id_mailsubscribinglist, $id_segment, $segments = null){
+        if (is_null($segments)) {
+                if ($segments = sql_getfetsel('segments','spip_mailsubscribinglists','id_mailsubscribinglist='.intval($id_mailsubscribinglist))){
+                        $segments = unserialize($segments);
                 }
         }
 
-        if (isset($segments[$id_mailsubscribinglist][$id_segment])){
-                $need = mailsubscribers_teste_segment($id_mailsubscriber,$segments[$id_mailsubscribinglist][$id_segment]);
+        if ($segments and isset($segments[$id_segment])){
+                $need = mailsubscribers_teste_segment($id_mailsubscriber,$segments[$id_segment]);
                 $where = 'id_mailsubscriber='.intval($id_mailsubscriber).' AND id_mailsubscribinglist='.intval($id_mailsubscribinglist).' AND id_segment=';
                 $is = sql_countsel('spip_mailsubscriptions', $where . intval($id_segment));
@@ -119 +119 @@
  */
 function mailsubscribers_teste_segment($id_mailsubscriber, $segment){
+        static $informations_liees = array();
         static $declaration;
         if (is_null($declaration)){
@@ -129 +130 @@
         if (!$declaration) return false;
 
-        $email = sql_getfetsel('email','spip_mailsubscribers','id_mailsubscriber='.intval($id_mailsubscriber));
-        $infos = mailsubscriber_recuperer_informations_liees($id_mailsubscriber, $email);
+        if (!isset($informations_liees[$id_mailsubscriber])) {
+                $email = sql_getfetsel('email','spip_mailsubscribers','id_mailsubscriber='.intval($id_mailsubscriber));
+                $informations_liees[$id_mailsubscriber] = mailsubscriber_recuperer_informations_liees($id_mailsubscriber, $email);
+        }
+        $infos = &$informations_liees[$id_mailsubscriber];
 
         foreach($segment as $k=>$v){

_plugins_/mailsubscribers/trunk/paquet.xml

@@ -2 +2 @@
         prefix="mailsubscribers"
         categorie="communication"
-        version="2.9.4"
+        version="2.9.5"
         etat="stable"
         compatibilite="[3.0.0;3.2.*]"