Show
Ignore:
Timestamp:
02/21/12 19:59:04 (1 year ago)
Author:
p_lindheimer
Message:

fixes #5135 make polling default on and fixes #5168 get rid of undefined for booleans and create default options for all settings, for now just booleans and pollfreq are set but feel free to suggest other defaults as well as changes to what was chosen.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.10/voicemail/functions.inc.php

    r13091 r13545  
    969969            $vmconf["general"][$key] = isset($args[$id])?$args[$id]:$vmconf["general"][$key]; 
    970970            /* Bad to have empty fields in vmconf. */ 
    971             if (empty($vmconf["general"][$key])) { 
     971            /* also make sure no boolean undefined fields left in there */ 
     972            if (empty($vmconf["general"][$key]) || $vmconf["general"][$key] == 'undefined' && $gen_settings[$key]['type'] == 'flag') { 
    972973              unset($vmconf["general"][$key]); 
    973974            } 

  • modules/branches/2.10/voicemail/page.voicemail.php

    r13091 r13545  
    9090/* Settings options */ 
    9191$dlen = 800;  /* default max length on text entry */ 
    92 $gen_settings = array(    "adsifdn"       => array("ver" => 1.2, "len" => 4, "type" => "char"), 
    93         "adsisec"       => array("ver" => 1.2, "len" => 4, "type" => "char"), 
    94         "adsiver"       => array("ver" => 1.2, "len" => $dlen, "type" => "num"), 
    95         "attach"      => array("ver" => 1.2, "len" => $dlen, "type" => "flag"), 
    96         "authpassword"      => array("ver" => 1.4, "len" => $dlen, "type" => "char"), 
    97               "authuser"      => array("ver" => 1.4, "len" => $dlen, "type" => "char"), 
    98         "backupdeleted"     => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    99         "callback"      => array("ver" => 1.2, "len" => 80, "type" => "char"), 
    100         "charset"       => array("ver" => 1.2, "len" => 32, "type" => "char"), 
    101               "cidinternalcontexts"     => array("ver" => 1.2, "len" => 640, "type" => "char"), 
    102         "dialout"       => array("ver" => 1.2, "len" => 80, "type" => "char"), 
    103         "emailbody"       => array("ver" => 1.2, "len" => $dlen, "type" => "char"), 
    104         "emaildateformat"     => array("ver" => 1.2, "len" => 32, "type" => "char"), 
    105         "emailsubject"                  => array("ver" => 1.2, "len" => $dlen, "type" => "char"), 
    106         "envelope"                      => array("ver" => 1.2, "len" => $dlen, "type" => "flag"), 
    107         "exitcontext"                   => array("ver" => 1.2, "len" => 80, "type" => "char"), 
    108         "expungeonhangup"               => array("ver" => 1.2, "len" => $dlen, "type" => "char"), 
    109         "externnotify"                  => array("ver" => 1.2, "len" => 160, "type" => "char"), 
    110         "externpass"                    => array("ver" => 1.2, "len" => 128, "type" => "char"), 
    111         "externpassnotify"              => array("ver" => 1.6, "len" => 128, "type" => "char"), 
    112         "forcegreetings"                => array("ver" => 1.2, "len" => $dlen, "type" => "flag"), 
    113         "forcename"                     => array("ver" => 1.2, "len" => $dlen, "type" => "flag"), 
    114         "format"                        => array("ver" => 1.2, "len" => 80, "type" => "char"), 
    115         "fromstring"                    => array("ver" => 1.2, "len" => 100, "type" => "char"), 
    116         "greetingsfolder"               => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    117         "imapclosetimeout"              => array("ver" => 1.4, "len" => $dlen, "type" => "char"), 
    118         "imapflags"                     => array("ver" => 1.4, "len" => $dlen, "type" => "char"), 
    119         "imapfolder"                    => array("ver" => 1.4, "len" => $dlen, "type" => "char"), 
    120         "imapgreetings"                 => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    121         "imapopentimeout"               => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    122         "imapparentfolder"              => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    123         "imapport"                      => array("ver" => 1.4, "len" => $dlen, "type" => "char"), 
    124         "imapreadtimeout"               => array("ver" => 1.4, "len" => $dlen, "type" => "char"), 
    125         "imapserver"                    => array("ver" => 1.4, "len" => $dlen, "type" => "char"), 
    126         "imapwritetimeout"              => array("ver" => 1.4, "len" => $dlen, "type" => "char"), 
    127         "listen-control-forward-key"    => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    128         "listen-control-pause-key"      => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    129         "listen-control-restart-key"    => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    130         "listen-control-reverse-key"    => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    131         "listen-control-stop-key"       => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    132         "mailcmd"                       => array("ver" => 1.2, "len" => $dlen, "type" => "char"), 
    133         "maxgreet"                      => array("ver" => 1.2, "len" => $dlen, "type" => "num"), 
    134         "maxlogins"                     => array("ver" => 1.2, "len" => $dlen, "type" => "num"), 
    135         "maxmessage"      => array("ver" => 1.2, "len" => $dlen, "type" => "num"), 
    136         "maxmsg"                        => array("ver" => 1.2, "len" => $dlen, "type" => "num"), 
    137         "maxsecs"                       => array("ver" => 1.6, "len" => $dlen, "type" => "num"), 
    138         "maxsilence"                    => array("ver" => 1.2, "len" => $dlen, "type" => "num"), 
    139         "minsecs"                       => array("ver" => 1.6, "len" => $dlen, "type" => "num"), 
    140         "moveheard"                     => array("ver" => 1.6, "len" => 0, "type" => "flag"), 
    141         "nextaftercmd"                  => array("ver" => 1.2, "len" => 0, "type" => "flag"), 
    142         "obdcstorage"                   => array("ver" => 1.2, "len" => $dlen, "type" => "char"), 
    143         "odbctable"                     => array("ver" => 1.2, "len" => $dlen, "type" => "char"), 
    144         "operator"                      => array("ver" => 1.2, "len" => $dlen, "type" => "flag"), 
    145         "pagerbody"                     => array("ver" => 1.2, "len" => $dlen, "type" => "char"), 
    146         "pagerfromstring"               => array("ver" => 1.2, "len" => 100, "type" => "char"), 
    147         "pagersubject"                  => array("ver" => 1.2, "len" => $dlen, "type" => "char"), 
    148         "pbxskip"                       => array("ver" => 1.2, "len" => 0, "type" => "flag"), 
    149         "pollfreq"                      => array("ver" => 1.6, "len" => $dlen, "type" => "num"), 
    150         "pollmailboxes"                 => array("ver" => 1.6, "len" => 0, "type" => "flag"), 
    151         "review"                        => array("ver" => 1.2, "len" => $dlen, "type" => "flag"), 
    152         "saycid"                        => array("ver" => 1.2, "len" => $dlen, "type" => "flag"), 
    153         "sayduration"                   => array("ver" => 1.2, "len" => $dlen, "type" => "flag"), 
    154         "saydurationm"                  => array("ver" => 1.2, "len" => $dlen, "type" => "num"), 
    155         "searchcontexts"                => array("ver" => 1.2, "len" => 0, "type" => "flag"), 
    156         "sendvoicemail"                 => array("ver" => 1.2, "len" => 0, "type" => "flag"), 
    157         "serveremail"                   => array("ver" => 1.2, "len" => 80, "type" => "char"), 
    158         "silencethreshold"              => array("ver" => 1.2, "len" => $dlen, "type" => "num"), 
    159         "skipms"                        => array("ver" => 1.2, "len" => $dlen, "type" => "num"), 
    160         "smdienable"                    => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    161         "smdiport"                      => array("ver" => 1.4, "len" => $dlen, "type" => "char"), 
    162         "tempgreetwarn"                 => array("ver" => 1.4, "len" => $dlen, "type" => "flag"), 
    163         "usedirectory"                  => array("ver" => 1.4, "len" => 0, "type" => "flag"), 
    164         "userscontext"                  => array("ver" => 1.4, "len" => $dlen, "type" => "char"), 
    165         "vm-mismatch"                   => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    166         "vm-newpassword"                => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    167         "vm-passchanged"                => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    168         "vm-password"                   => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    169         "vm-reenterpassword"            => array("ver" => 1.6, "len" => $dlen, "type" => "char"), 
    170         "volgain"       => array("ver" => 1.4, "len" => $dlen, "type" => "num")   ); 
     92$gen_settings = array(    "adsifdn"       => array("ver" => 1.2, "len" => 4, "type" => "char", "default" => ""), 
     93        "adsisec"       => array("ver" => 1.2, "len" => 4, "type" => "char", "default" => ""), 
     94        "adsiver"       => array("ver" => 1.2, "len" => $dlen, "type" => "num", "default" => ""), 
     95        "attach"      => array("ver" => 1.2, "len" => $dlen, "type" => "flag", "default" => "yes"), 
     96        "authpassword"      => array("ver" => 1.4, "len" => $dlen, "type" => "char", "default" => ""), 
     97              "authuser"      => array("ver" => 1.4, "len" => $dlen, "type" => "char", "default" => ""), 
     98        "backupdeleted"     => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     99        "callback"      => array("ver" => 1.2, "len" => 80, "type" => "char", "default" => ""), 
     100        "charset"       => array("ver" => 1.2, "len" => 32, "type" => "char", "default" => ""), 
     101              "cidinternalcontexts"     => array("ver" => 1.2, "len" => 640, "type" => "char", "default" => ""), 
     102        "dialout"       => array("ver" => 1.2, "len" => 80, "type" => "char", "default" => ""), 
     103        "emailbody"       => array("ver" => 1.2, "len" => $dlen, "type" => "char", "default" => ""), 
     104        "emaildateformat"     => array("ver" => 1.2, "len" => 32, "type" => "char", "default" => ""), 
     105        "emailsubject"                  => array("ver" => 1.2, "len" => $dlen, "type" => "char", "default" => ""), 
     106        "envelope"                      => array("ver" => 1.2, "len" => $dlen, "type" => "flag", "default" => "yes"), 
     107        "exitcontext"                   => array("ver" => 1.2, "len" => 80, "type" => "char", "default" => ""), 
     108        "expungeonhangup"               => array("ver" => 1.2, "len" => $dlen, "type" => "char", "default" => ""), 
     109        "externnotify"                  => array("ver" => 1.2, "len" => 160, "type" => "char", "default" => ""), 
     110        "externpass"                    => array("ver" => 1.2, "len" => 128, "type" => "char", "default" => ""), 
     111        "externpassnotify"              => array("ver" => 1.6, "len" => 128, "type" => "char", "default" => ""), 
     112        "forcegreetings"                => array("ver" => 1.2, "len" => $dlen, "type" => "flag", "default" => "no"), 
     113        "forcename"                     => array("ver" => 1.2, "len" => $dlen, "type" => "flag", "default" => "yes"), 
     114        "format"                        => array("ver" => 1.2, "len" => 80, "type" => "char", "default" => ""), 
     115        "fromstring"                    => array("ver" => 1.2, "len" => 100, "type" => "char", "default" => ""), 
     116        "greetingsfolder"               => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     117        "imapclosetimeout"              => array("ver" => 1.4, "len" => $dlen, "type" => "char", "default" => ""), 
     118        "imapflags"                     => array("ver" => 1.4, "len" => $dlen, "type" => "char", "default" => ""), 
     119        "imapfolder"                    => array("ver" => 1.4, "len" => $dlen, "type" => "char", "default" => ""), 
     120        "imapgreetings"                 => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     121        "imapopentimeout"               => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     122        "imapparentfolder"              => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     123        "imapport"                      => array("ver" => 1.4, "len" => $dlen, "type" => "char", "default" => ""), 
     124        "imapreadtimeout"               => array("ver" => 1.4, "len" => $dlen, "type" => "char", "default" => ""), 
     125        "imapserver"                    => array("ver" => 1.4, "len" => $dlen, "type" => "char", "default" => ""), 
     126        "imapwritetimeout"              => array("ver" => 1.4, "len" => $dlen, "type" => "char", "default" => ""), 
     127        "listen-control-forward-key"    => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     128        "listen-control-pause-key"      => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     129        "listen-control-restart-key"    => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     130        "listen-control-reverse-key"    => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     131        "listen-control-stop-key"       => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     132        "mailcmd"                       => array("ver" => 1.2, "len" => $dlen, "type" => "char", "default" => ""), 
     133        "maxgreet"                      => array("ver" => 1.2, "len" => $dlen, "type" => "num", "default" => ""), 
     134        "maxlogins"                     => array("ver" => 1.2, "len" => $dlen, "type" => "num", "default" => ""), 
     135        "maxmessage"      => array("ver" => 1.2, "len" => $dlen, "type" => "num", "default" => ""), 
     136        "maxmsg"                        => array("ver" => 1.2, "len" => $dlen, "type" => "num", "default" => ""), 
     137        "maxsecs"                       => array("ver" => 1.6, "len" => $dlen, "type" => "num", "default" => ""), 
     138        "maxsilence"                    => array("ver" => 1.2, "len" => $dlen, "type" => "num", "default" => ""), 
     139        "minsecs"                       => array("ver" => 1.6, "len" => $dlen, "type" => "num", "default" => ""), 
     140        "moveheard"                     => array("ver" => 1.6, "len" => 0, "type" => "flag", "default" => "no"), 
     141        "nextaftercmd"                  => array("ver" => 1.2, "len" => 0, "type" => "flag", "default" => "no"), 
     142        "obdcstorage"                   => array("ver" => 1.2, "len" => $dlen, "type" => "char", "default" => ""), 
     143        "odbctable"                     => array("ver" => 1.2, "len" => $dlen, "type" => "char", "default" => ""), 
     144        "operator"                      => array("ver" => 1.2, "len" => $dlen, "type" => "flag", "default" => "yes"), 
     145        "pagerbody"                     => array("ver" => 1.2, "len" => $dlen, "type" => "char", "default" => ""), 
     146        "pagerfromstring"               => array("ver" => 1.2, "len" => 100, "type" => "char", "default" => ""), 
     147        "pagersubject"                  => array("ver" => 1.2, "len" => $dlen, "type" => "char", "default" => ""), 
     148        "pbxskip"                       => array("ver" => 1.2, "len" => 0, "type" => "flag", "default" => "no"), 
     149        "pollfreq"                      => array("ver" => 1.6, "len" => $dlen, "type" => "num", "default" => "30"), 
     150        "pollmailboxes"                 => array("ver" => 1.6, "len" => 0, "type" => "flag", "default" => "yes"), 
     151        "review"                        => array("ver" => 1.2, "len" => $dlen, "type" => "flag", "default" => "no"), 
     152        "saycid"                        => array("ver" => 1.2, "len" => $dlen, "type" => "flag", "default" => "no"), 
     153        "sayduration"                   => array("ver" => 1.2, "len" => $dlen, "type" => "flag", "default" => "yes"), 
     154        "saydurationm"                  => array("ver" => 1.2, "len" => $dlen, "type" => "num", "default" => ""), 
     155        "searchcontexts"                => array("ver" => 1.2, "len" => 0, "type" => "flag", "default" => "no"), 
     156        "sendvoicemail"                 => array("ver" => 1.2, "len" => 0, "type" => "flag", "default" => "yes"), 
     157        "serveremail"                   => array("ver" => 1.2, "len" => 80, "type" => "char", "default" => ""), 
     158        "silencethreshold"              => array("ver" => 1.2, "len" => $dlen, "type" => "num", "default" => ""), 
     159        "skipms"                        => array("ver" => 1.2, "len" => $dlen, "type" => "num", "default" => ""), 
     160        "smdienable"                    => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     161        "smdiport"                      => array("ver" => 1.4, "len" => $dlen, "type" => "char", "default" => ""), 
     162        "tempgreetwarn"                 => array("ver" => 1.4, "len" => $dlen, "type" => "flag", "default" => "yes"), 
     163        "usedirectory"                  => array("ver" => 1.4, "len" => 0, "type" => "flag", "default" => "yes"), 
     164        "userscontext"                  => array("ver" => 1.4, "len" => $dlen, "type" => "char", "default" => ""), 
     165        "vm-mismatch"                   => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     166        "vm-newpassword"                => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     167        "vm-passchanged"                => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     168        "vm-password"                   => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     169        "vm-reenterpassword"            => array("ver" => 1.6, "len" => $dlen, "type" => "char", "default" => ""), 
     170        "volgain"       => array("ver" => 1.4, "len" => $dlen, "type" => "num", "default" => "")  ); 
    171171 
    172172$acct_settings = array(   "attach"      => array("ver" => 1.2, "len" => 0,  "type" => "flag"), 
    …… 
    540540    $output .= $acct_title_links . $display_name_row; 
    541541 
    542  
    543542    foreach ($display_settings as $key => $descrip) { 
    544543      $tooltip = isset($display_tips[$key])?$display_tips[$key]:""; 
    …… 
    546545      $id = $id_prefix . "__" . $key; 
    547546      if (isset($settings[$key]) || ($version >= $descrip["ver"])) { 
    548         $val = isset($settings[$key])?$settings[$key]:""; 
     547        $val = isset($settings[$key])?$settings[$key]:$descrip["default"]; 
    549548        unset($settings[$key]); 
    550549        $opt_name = ($action == "bsettings")?$opt_headings[$key]:$key; 
    …… 
    571570          $output .= "<td>&nbsp;&nbsp;&nbsp;&nbsp;<input type='radio' name='$id' id='$id' tabindex='1' value='yes' $yes_selected />" . _("yes"); 
    572571          $output .= "<input type='radio' name='$id' id='$id' tabindex='1' value='no' $no_selected />" . _("no"); 
    573           $output .= "<input type='radio' name='$id' id='$id' tabindex='1' value='undefined' $undef_selected /><a href='#' class='info'>" . _("undefined") . "<span>" . _("Selecting \"undefined\" will remove this option from the user's Voicemail configuration entry. (System default will be used.)") . "</span></a></td></tr>"; 
     572          $output .= "</td></tr>"; 
    574573        } else { 
    575574          $text_type = ($key == "pwd" || $key == "authpassword")?"password":"text";