Fixed issue #9447: Token sending email is unusuable with a lot of token

LimeSurvey · Jan 29, 2015 · 651cc9c · 651cc9c
1 parent 27dd87f
commit 651cc9c
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 1 deletion.
diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
@@ -376,6 +376,8 @@
 // If used, the appearance (font size, justification, etc.) may be adjusted by editing td.questionHelpBefore and $helpBeforeBorderBottom of quexml.
 $config['quexmlshowprintablehelp'] = false;
 
+$config['minlengthshortimplode'] = 20; // Min length required to use short_implode instead of standard implode
+
 // CAS Settings
 /**
 * Please note that CAS functionality is very basic and you have to modify the client to your needs.

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -5630,6 +5630,54 @@ function isNumericInt($mStr)
 }
 
 
+/**
+* Implode and sort content array for very long arrays
+*
+* @param string $sDelimeter
+* @param array $aArray
+* @return string String showing array content
+*/
+function short_implode($sDelimeter, $aArray)
+{
+    if (sizeof($aArray) < Yii::app()->getConfig('minlengthshortimplode'))
+    {
+        sort($aArray);
+        return implode($sDelimeter, $aArray);
+    }
+    else
+    {
+        sort($aArray);
+        $iIndexA = 0;
+        $iIndexB = 1;
+        while ($iIndexA < sizeof($aArray))
+        {
+            if ($iIndexA == 0)
+            {
+                $sResult = $aArray[$iIndexA];
+            }
+            else
+            {
+                $sResult = $sResult.', '.$aArray[$iIndexA];
+            }
+            $iIndexB = $iIndexA+1;
+            if ($iIndexB < sizeof($aArray))
+            {
+                while ($iIndexB < sizeof($aArray) && $aArray[$iIndexB] - 1 == $aArray[$iIndexB-1])
+                {
+                    $iIndexB++;
+                }
+                if ($iIndexA < $iIndexB - 1)
+                {
+                    $sResult = $sResult.'-'.$aArray[$iIndexB-1];
+                }
+            }
+            $iIndexA = $iIndexB;
+        }
+        return $sResult;
+    }
+}
+
+
 /**
 * Include Keypad headers
 */

diff --git a/application/views/admin/token/email.php b/application/views/admin/token/email.php
@@ -83,6 +83,13 @@
                     </ul></div>
                 <?php } ?>
 
+            <?php
+            if (count($tokenids)>0)
+            { ?>
+                <p>
+                    <label><?php $clang->eT("Send invitation email to token ID(s):"); ?></label>
+                <?php echo short_implode(", ", (array) $tokenids); ?></p>
+            <?php } ?>
             <p>
                 <label for='bypassbademails'><?php $clang->eT("Bypass token with failing email addresses"); ?>:</label>
                 <?php echo CHtml::dropDownList('bypassbademails', 'Y',array("Y"=>gT("Yes"),"N"=>gT("No"))); ?>

diff --git a/application/views/admin/token/remind.php b/application/views/admin/token/remind.php
@@ -68,7 +68,7 @@
     { ?>
         <li>
             <label><?php $clang->eT("Send reminder to token ID(s):"); ?></label>
-        <?php echo implode(", ", (array) $tokenids); ?></li>
+        <?php echo short_implode(", ", (array) $tokenids); ?></li>
     <?php } ?>
     <li><label for='bypassbademails'>
             <?php $clang->eT("Bypass token with failing email addresses"); ?>:</label>