Changeset 5834

Show
Ignore:
Timestamp:
06/26/08 08:14:28 (5 months ago)
Author:
p_lindheimer
Message:

#2757 allow spaces and other alphanumeric characters in description

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.4/queues/functions.inc.php

    r5652 r5834  
    313313        } 
    314314        $extension       = $account; 
    315         $descr         = isset($name) ? $name:''; 
    316         $grppre        = isset($prefix) ? $prefix:''; 
    317         $alertinfo     = isset($alertinfo) ? $alertinfo:''; 
     315        $descr         = isset($name) ? addslashes($name):''; 
     316        $grppre        = isset($prefix) ? addslashes($prefix):''; 
     317        $alertinfo     = isset($alertinfo) ? addslashes($alertinfo):''; 
    318318        $joinannounce  = strtolower($joinannounce) != 'none' ? $joinannounce:''; 
    319319        $ringing       = isset($_REQUEST['rtone']) ? $_REQUEST['rtone']:''; 
  • modules/branches/2.4/queues/module.xml

    r5809 r5834  
    22        <rawname>queues</rawname> 
    33        <name>Queues</name> 
    4         <version>2.4.0.7</version> 
     4        <version>2.4.0.8</version> 
    55        <type>setup</type> 
    66        <category>Inbound Call Control</category> 
     
    99        </description> 
    1010        <changelog> 
     11                *2.4.0.8* #2757 allow spaces and other alphanumeric characters in description 
    1112                *2.4.0.7* #2604, #2707, #2843 fix mal-formed html tags, typo, Russian Translation, add oldstyle module hook 
    1213                *2.4.0.6* added depends on 2.4.0 
  • modules/branches/2.4/queues/page.queues.php

    r5778 r5834  
    705705 
    706706function checkQ(theForm) { 
    707         $queuename = theForm.name.value; 
    708707        var bad = "false"; 
    709708 
     
    721720        } 
    722721 
    723         if ($queuename == "") { 
    724                 <?php echo "alert('"._("Queue name must not be blank")."')"?>; 
    725                 bad="true"; 
    726         } else if (!$queuename.match('^[a-zA-Z][a-zA-Z0-9]+$')) { 
    727                 <?php echo "alert('"._("Queue name cannot start with a number, and can only contain letters and numbers")."')"?>; 
     722                                defaultEmptyOK = false;  
     723                                if (!isAlphanumeric(theForm.name.value)) { 
     724                <?php echo "alert('"._("Queue name must not be blank and must contain only alpha-numberic characters")."')"?>; 
    728725                bad="true"; 
    729726        } 
Donate



Support
Download
Develop
Forums
News
Documentation
Paid Support
About

Paid Ads