Changeset 7969

Show
Ignore:
Timestamp:
08/07/09 18:20:26 (4 years ago)
Author:
p_lindheimer
Message:

Merged revisions 7967-7968 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r7967 | jjshoe | 2009-08-03 12:19:34 -0700 (Mon, 03 Aug 2009) | 2 lines


fixes #3611, fixes #3435, fixes #3317, fixes #3307
Fixed pattern matching to prevent deadly parked call loop

........

r7968 | jjshoe | 2009-08-03 12:28:18 -0700 (Mon, 03 Aug 2009) | 4 lines


fixes #3735
Don't send the actual secret in the email


Also warn if a secret is blank.

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6

    • Property svnmerge-integrated changed from /modules/branches/2.5:1-7809,7812,7854,7858-7865,7878,7886,7890,7915 to /modules/branches/2.5:1-7809,7812,7854,7858-7865,7878,7886,7890,7915,7967-7968

  • modules/branches/2.6/parking/functions.inc.php

    r7250 r7969  
    5050      // Now generate dialplan 
    5151      $ext->add($contextname, "t", '', new ext_noop('Parked Call Timed Out and Got Orphaned')); 
    52       $ext->add($contextname, "_.", '', new ext_noop('Parked Call Timed Out and Got Orphaned')); 
     52      $ext->add($contextname, "_[0-9a-zA-Z*#].", '', new ext_noop('Parked Call Timed Out and Got Orphaned')); 
    5353 
    5454      // If we have an appropriate Asterisk patch, set paraemters for Asterisk 
    …… 
    6565        if ($parkalertinfo) { 
    6666          $ext->add($contextname, "t", '', new ext_setvar('__ALERT_INFO',str_replace(';', '\;', $parkalertinfo))); 
    67           $ext->add($contextname, "_.", '', new ext_setvar('__ALERT_INFO',str_replace(';', '\;', $parkalertinfo))); 
     67          $ext->add($contextname, "_[0-9a-zA-Z*#].", '', new ext_setvar('__ALERT_INFO',str_replace(';', '\;', $parkalertinfo))); 
    6868        } 
    6969        if ($parkcid) { 
    7070          $ext->add($contextname, "t", '', new ext_setvar('CALLERID(name)', $parkcid.'${CALLERID(name)}')); 
    71           $ext->add($contextname, "_.", '', new ext_setvar('CALLERID(name)', $parkcid.'${CALLERID(name)}')); 
     71          $ext->add($contextname, "_[0-9a-zA-Z*#].", '', new ext_setvar('CALLERID(name)', $parkcid.'${CALLERID(name)}')); 
    7272        } 
    7373      } 
    …… 
    7676        $parkingannmsg = recordings_get_file($parkingannmsg_id); 
    7777        $ext->add($contextname, "t", '', new ext_playback($parkingannmsg)); 
    78         $ext->add($contextname, "_.", '', new ext_playback($parkingannmsg)); 
     78        $ext->add($contextname, "_[0-9a-zA-Z*#].", '', new ext_playback($parkingannmsg)); 
    7979      } 
    8080      // goto the destination here 
    8181      // 
    8282      $ext->add($contextname, "t", '', new ext_goto($goto)); 
    83       $ext->add($contextname, "_.", '', new ext_goto($goto)); 
     83      $ext->add($contextname, "_[0-9a-zA-Z*#].", '', new ext_goto($goto)); 
    8484 
    8585      // Asterisk 1.4 requires hints to be generated for parking 

  • modules/branches/2.6/parking/module.xml

    r7942 r7969  
    22  <rawname>parking</rawname> 
    33  <name>Parking Lot</name> 
    4   <version>2.6.0.0</version> 
     4  <version>2.6.0.1</version> 
    55  <publisher>FreePBX</publisher> 
    66  <license>GPLv2+</license> 
    …… 
    1313  </menuitems> 
    1414  <changelog> 
     15    *2.6.0.1* #3611, #3435, #3317, #3307 
    1516    *2.6.0.0* localizations, misc 
    1617    *2.5.1.3* localization fixes 

  • modules/branches/2.6/weakpasswords/functions.inc.php

    r7609 r7969  
    2929        $count = 0; 
    3030        foreach($weak as $details)  { 
    31           $extended_text .= sprintf(_("%s: %s / secret: %s => %s<br>"), $details['deviceortrunk'], $details['name'], $details['secret'], $details['message']); 
     31          $extended_text .= sprintf(_("%s: %s / %s<br>"), $details['deviceortrunk'], $details['name'], $details['message']); 
    3232          $count++; 
    3333        } 
    …… 
    6565    $reversed = strrev($secret); 
    6666    $match = "0123456789"; 
    67     if(strpos($match,$secret) || strpos($match,$reversed))  { 
     67    if($secret == '') 
     68    { 
     69      $weak[] = array("deviceortrunk" => $deviceortrunk, "name" => $name, "message" => _("Secret is empty"), "secret" => $secret); 
     70    } 
     71    else if(strpos($match,$secret) || strpos($match,$reversed))  { 
    6872      $weak[] = array("deviceortrunk" => $deviceortrunk, "name" => $name, "message" => _("Secret has sequential digits"), "secret" => $secret); 
    6973    } 

  • modules/branches/2.6/weakpasswords/module.xml

    r7956 r7969  
    22  <rawname>weakpasswords</rawname> 
    33  <name>Weak Password Detection</name> 
    4   <version>2.6.0.0</version> 
     4  <version>2.6.0.1</version> 
    55  <publisher>Schmoozecom.com</publisher> 
    66  <license>GPLv2</license> 
    …… 
    88  <category>System Administration</category> 
    99  <changelog> 
     10    *2.6.0.1* #3735 
    1011    *2.6.0.0* misc 
    1112    *2.5.0.3* #3663