Changeset 3070

Show
Ignore:
Timestamp:
11/14/06 14:29:06 (7 years ago)
Author:
p_lindheimer
Message:

Merged revisions 3066 via svnmerge from
https://svn.sourceforge.net/svnroot/amportal/freepbx/trunk

........

r3066 | p_lindheimer | 2006-11-14 11:03:59 -0800 (Tue, 14 Nov 2006) | 1 line


make unavailable greeting the default for VM_DDTYPE on an upgrade or new install

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.2

    • Property svnmerge-integrated changed from /freepbx/trunk:1-2993,2995-3033,3039-3040,3064 to /freepbx/trunk:1-2993,2995-3033,3039-3040,3064,3066

  • freepbx/branches/2.2/SQL/newinstall.sql

    r3032 r3070  
    102102INSERT INTO `globals` VALUES ('VM_OPTS', ''); 
    103103INSERT INTO `globals` VALUES ('VM_GAIN', ''); 
    104 INSERT INTO `globals` VALUES ('VM_DDTYPE', ''); 
     104INSERT INTO `globals` VALUES ('VM_DDTYPE', 'u'); 
    105105INSERT INTO `globals` VALUES ('TIMEFORMAT', 'kM'); 
    106106INSERT INTO `globals` VALUES ('TONEZONE', 'us'); 

  • freepbx/branches/2.2/SQL/newinstall.sqlite.sql

    r3032 r3070  
    7676--  
    7777 
    78 INSERT INTO `globals` VALUES ('CALLFILENAME', '""'); 
    79 INSERT INTO `globals` VALUES ('DIAL_OPTIONS', 'tr'); 
    80 INSERT INTO `globals` VALUES ('TRUNK_OPTIONS', ''); 
    81 INSERT INTO `globals` VALUES ('DIAL_OUT', '9'); 
    82 INSERT INTO `globals` VALUES ('FAX', ''); 
    83 INSERT INTO `globals` VALUES ('FAX_RX', 'system'); 
    84 INSERT INTO `globals` VALUES ('FAX_RX_EMAIL', 'fax@mydomain.com'); 
    85 INSERT INTO `globals` VALUES ('FAX_RX_FROM', 'freepbx@gmail.com'); 
    86 INSERT INTO `globals` VALUES ('INCOMING', 'group-all'); 
    87 INSERT INTO `globals` VALUES ('NULL', '""'); 
    88 INSERT INTO `globals` VALUES ('OPERATOR', ''); 
    89 INSERT INTO `globals` VALUES ('OPERATOR_XTN', ''); 
    90 INSERT INTO `globals` VALUES ('PARKNOTIFY', 'SIP/200'); 
    91 INSERT INTO `globals` VALUES ('RECORDEXTEN', '""'); 
    92 INSERT INTO `globals` VALUES ('RINGTIMER', '15'); 
    93 INSERT INTO `globals` VALUES ('DIRECTORY', 'last'); 
    94 INSERT INTO `globals` VALUES ('AFTER_INCOMING', ''); 
    95 INSERT INTO `globals` VALUES ('IN_OVERRIDE', 'forcereghours'); 
    96 INSERT INTO `globals` VALUES ('REGTIME', '7:55-17:05'); 
    97 INSERT INTO `globals` VALUES ('REGDAYS', 'mon-fri'); 
    98 INSERT INTO `globals` VALUES ('DIRECTORY_OPTS', ''); 
    99 INSERT INTO `globals` VALUES ('DIALOUTIDS', '1'); 
    100 INSERT INTO `globals` VALUES ('OUT_1', 'ZAP/g0'); 
    101 INSERT INTO `globals` VALUES ('VM_PREFIX', '*'); 
    102 INSERT INTO `globals` VALUES ('VM_OPTS', ''); 
    103 INSERT INTO `globals` VALUES ('VM_GAIN', ''); 
    104 INSERT INTO `globals` VALUES ('VM_DDTYPE', ''); 
    105 INSERT INTO `globals` VALUES ('TIMEFORMAT', 'kM'); 
    106 INSERT INTO `globals` VALUES ('TONEZONE', 'us'); 
    107 INSERT INTO `globals` VALUES ('ALLOW_SIP_ANON', 'no'); 
     78INSERT INTO globals VALUES ('CALLFILENAME', '""'); 
     79INSERT INTO globals VALUES ('DIAL_OPTIONS', 'tr'); 
     80INSERT INTO globals VALUES ('TRUNK_OPTIONS', ''); 
     81INSERT INTO globals VALUES ('DIAL_OUT', '9'); 
     82INSERT INTO globals VALUES ('FAX', ''); 
     83INSERT INTO globals VALUES ('FAX_RX', 'system'); 
     84INSERT INTO globals VALUES ('FAX_RX_EMAIL', 'fax@mydomain.com'); 
     85INSERT INTO globals VALUES ('FAX_RX_FROM', 'freepbx@gmail.com'); 
     86INSERT INTO globals VALUES ('INCOMING', 'group-all'); 
     87INSERT INTO globals VALUES ('NULL', '""'); 
     88INSERT INTO globals VALUES ('OPERATOR', ''); 
     89INSERT INTO globals VALUES ('OPERATOR_XTN', ''); 
     90INSERT INTO globals VALUES ('PARKNOTIFY', 'SIP/200'); 
     91INSERT INTO globals VALUES ('RECORDEXTEN', '""'); 
     92INSERT INTO globals VALUES ('RINGTIMER', '15'); 
     93INSERT INTO globals VALUES ('DIRECTORY', 'last'); 
     94INSERT INTO globals VALUES ('AFTER_INCOMING', ''); 
     95INSERT INTO globals VALUES ('IN_OVERRIDE', 'forcereghours'); 
     96INSERT INTO globals VALUES ('REGTIME', '7:55-17:05'); 
     97INSERT INTO globals VALUES ('REGDAYS', 'mon-fri'); 
     98INSERT INTO globals VALUES ('DIRECTORY_OPTS', ''); 
     99INSERT INTO globals VALUES ('DIALOUTIDS', '1'); 
     100INSERT INTO globals VALUES ('OUT_1', 'ZAP/g0'); 
     101INSERT INTO globals VALUES ('VM_PREFIX', '*'); 
     102INSERT INTO globals VALUES ('VM_OPTS', ''); 
     103INSERT INTO globals VALUES ('VM_GAIN', ''); 
     104INSERT INTO globals VALUES ('VM_DDTYPE', 'u'); 
     105INSERT INTO globals VALUES ('TIMEFORMAT', 'kM'); 
     106INSERT INTO globals VALUES ('TONEZONE', 'us'); 
     107INSERT INTO globals VALUES ('ALLOW_SIP_ANON', 'no'); 
    108108 
    109109-- -------------------------------------------------------- 

  • freepbx/branches/2.2/upgrades/2.1beta3/tables.php

    r2079 r3070  
    66if (!is_array($asa)) { // does not exist already 
    77        // Default to '' 
    8         $sql = "INSERT INTO globals (variable, value) VALUES ('VM_DDTYPE', '') "; 
     8        $sql = "INSERT INTO globals (variable, value) VALUES ('VM_DDTYPE', 'u') "; 
    99        $result = $db->query($sql); 
    1010        if(DB::IsError($result)) {