Changeset 10179
- Timestamp:
- 07/21/10 19:23:53 (3 years ago)
- Files:
-
- modules/branches/2.9 (modified) (1 prop)
- modules/branches/2.9/core/etc/extensions.conf (modified) (1 diff)
- modules/branches/2.9/core/functions.inc.php (modified) (7 diffs)
- modules/branches/2.9/core/module.xml (modified) (2 diffs)
- modules/branches/2.9/dashboard/dashboard.css (modified) (2 diffs)
- modules/branches/2.9/dashboard/module.xml (modified) (3 diffs)
- modules/branches/2.9/dashboard/page.index.php (modified) (2 diffs)
- modules/branches/2.9/framework/module.xml (modified) (2 diffs)
- modules/branches/2.9/fw_ari/module.xml (modified) (3 diffs)
- modules/branches/2.9/fw_fop/module.xml (modified) (3 diffs)
- modules/branches/2.9/logfiles/functions.inc.php (copied) (copied from modules/branches/2.8/logfiles/functions.inc.php)
- modules/branches/2.9/logfiles/module.xml (modified) (2 diffs)
- modules/branches/2.9/logfiles/page.logfiles.php (modified) (3 diffs)
- modules/branches/2.9/pinsets/install.php (modified) (1 diff)
- modules/branches/2.9/pinsets/module.xml (modified) (3 diffs)
- modules/branches/2.9/sipstation/install.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.9
- Property svnmerge-integrated changed from /modules/branches/2.8:1-10122 to /modules/branches/2.8:1-10178
modules/branches/2.9/core/etc/extensions.conf
r10016 r10179 116 116 ; 117 117 [from-pstn-toheader] 118 exten => s,1,Goto(from-pstn,${CUT(CUT(SIP_HEADER(To),@,1),:,2)},1)118 exten => _.,1,Goto(from-pstn,${CUT(CUT(SIP_HEADER(To),@,1),:,2)},1) 119 119 ;------------------------------------------------------------------------------- 120 120 modules/branches/2.9/core/functions.inc.php
r10103 r10179 54 54 function generateConf($file) { 55 55 global $version; 56 global $amp_conf; 56 57 57 58 switch ($file) { … … 78 79 break; 79 80 case 'chan_dahdi_additional.conf': 80 if (ast_with_dahdi() ) {81 return $this->generate_zapata_additional($version, 'dahdi') ;81 if (ast_with_dahdi() && $amp_conf['ZAP2DAHDICOMPAT']) { 82 return $this->generate_zapata_additional($version, 'dahdi').$this->generate_zapata_additional($version); 82 83 } else { 83 return $this->generate_zapata_additional($version );84 return $this->generate_zapata_additional($version,'dahdi'); 84 85 } 85 86 break; … … 1406 1407 $ext->add($tcontext,$trunkprops['trunkid'],'',new ext_set('DIAL_NUMBER','${FROM_DID}')); 1407 1408 $ext->add($tcontext,$trunkprops['trunkid'],'',new ext_gosubif('$["${PREFIX_TRUNK_'.$trunkprops['trunkid'].'}" != ""]','sub-flp-'.$trunkprops['trunkid'].',s,1')); 1408 $ext->add($tcontext, $trunkprops['trunkid'], '', new ext_macro('dundi-${DIAL_TRUNK}','${OUTNUM}')); 1409 $ext->add($tcontext,$trunkprops['trunkid'],'',new ext_set('OUTNUM', '${OUTPREFIX_${DIAL_TRUNK}}${DIAL_NUMBER}')); // OUTNUM is the final dial number 1410 $ext->add($tcontext,$trunkprops['trunkid'],'',new ext_macro('dundi-${DIAL_TRUNK}','${OUTNUM}')); 1409 1411 $ext->add($tcontext,$trunkprops['trunkid'],'hangit',new ext_hangup()); 1410 1412 break; … … 1454 1456 $ext->add($tcontext,$tcustom,'',new ext_set('DIAL_NUMBER','${FROM_DID}')); 1455 1457 $ext->add($tcontext,$tcustom,'',new ext_gosubif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','sub-flp-${DIAL_TRUNK},s,1')); 1458 $ext->add($tcontext,$tcustom,'',new ext_set('OUTNUM', '${OUTPREFIX_${DIAL_TRUNK}}${DIAL_NUMBER}')); // OUTNUM is the final dial number 1456 1459 $ext->add($tcontext,$tcustom,'',new ext_dial('${EVAL(${TDIAL_STRING})}','300,${DIAL_TRUNK_OPTIONS}')); 1457 1460 $ext->add($tcontext,$tcustom,'hangit',new ext_hangup()); … … 1469 1472 $ext->add($tcontext,$texten,'',new ext_set('DIAL_NUMBER','${FROM_DID}')); 1470 1473 $ext->add($tcontext,$texten,'',new ext_gosubif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','sub-flp-${DIAL_TRUNK},s,1')); 1474 $ext->add($tcontext,$texten,'',new ext_set('OUTNUM', '${OUTPREFIX_${DIAL_TRUNK}}${DIAL_NUMBER}')); // OUTNUM is the final dial number 1471 1475 1472 1476 $ext->add($tcontext,$texten,'',new ext_dial('${TDIAL_STRING}/${OUTNUM}','300,${DIAL_TRUNK_OPTIONS}')); … … 3074 3078 //TODO: do we need to check for anything beyond auto-blkvm in this call path? 3075 3079 $ext->add($mcontext,$exten,'skiptrace', new ext_set('D_OPTIONS', '${IF($["${NODEST}"!="" & ${REGEX("(M[(]auto-blkvm[)])" ${ARG2})} != 1]?${ARG2}M(auto-blkvm):${ARG2})}')); 3076 $ext->add($mcontext,$exten,'', new ext_execif('$["${ALERT_INFO}"!=""]', 'SIPAddHeader', 'Alert-Info: ${ CUT(ALERT_INFO,:,2-)}'));3080 $ext->add($mcontext,$exten,'', new ext_execif('$["${ALERT_INFO}"!=""]', 'SIPAddHeader', 'Alert-Info: ${ALERT_INFO}')); 3077 3081 //TODO: Do I need to re-propagage anything from ${SIPADDHEADER} ? 3078 3082 $ext->add($mcontext,$exten,'', new ext_execif('$["${SIPADDHEADER}"!=""]', 'SIPAddHeader', '${SIPADDHEADER}')); … … 5987 5991 $currentcomponent->addoptlistitem('devicelist', 'sip_generic', _("Generic SIP Device")); 5988 5992 $currentcomponent->addoptlistitem('devicelist', 'iax2_generic', _("Generic IAX2 Device")); 5989 $currentcomponent->addoptlistitem('devicelist', 'zap_generic', _("Generic ZAP Device")); 5993 if (!ast_with_dahdi() || $amp_conf['ZAP2DAHDICOMPAT']) { 5994 $currentcomponent->addoptlistitem('devicelist', 'zap_generic', _("Generic ZAP Device")); 5995 } 5990 5996 if (ast_with_dahdi()) { 5991 5997 $currentcomponent->addoptlistitem('devicelist', 'dahdi_generic', _("Generic DAHDI Device")); modules/branches/2.9/core/module.xml
r10130 r10179 4 4 <category>Basic</category> 5 5 <name>Core</name> 6 <version>2.9.0alpha1. 0</version>6 <version>2.9.0alpha1.1</version> 7 7 <publisher>FreePBX</publisher> 8 8 <license>GPLv2+</license> … … 10 10 <canuninstall>no</canuninstall> 11 11 <changelog> 12 *2.9.0alpha1.1* #4443, #4444, #4460, #4414 12 13 *2.9.0alpha1.0* bump to 2.9 13 14 *2.8.0.1* #4426 modules/branches/2.9/dashboard/dashboard.css
r7286 r10179 6 6 #sysinfo-left, #sysinfo-left .infobox { 7 7 width:400px; 8 float: left; 8 9 } 10 9 11 #sysinfo-right { 10 position:absolute;12 float: left; 11 13 width:200px; 12 top:0; 13 margin-left:420px; 14 padding-left: 30px; 14 15 } 15 16 #sysinfo-right .infobox { 16 17 width:200px; 17 18 } 18 19 #sysinfo-bot{ 20 clear:both; 21 height: 0px; 22 } 19 23 /* main container for each category of items */ 20 24 .infobox { … … 26 30 background-repeat:repeat-x; 27 31 color: #333; 32 } 33 34 #procinfo.infobox { 35 margin-bottom: 0px; 28 36 } 29 37 modules/branches/2.9/dashboard/module.xml
r10060 r10179 2 2 <rawname>dashboard</rawname> 3 3 <name>System Dashboard</name> 4 <version>2.8.0. 1</version>4 <version>2.8.0.2</version> 5 5 <publisher>FreePBX</publisher> 6 6 <license>GPLv2+</license> … … 20 20 </depends> 21 21 <changelog> 22 *2.8.0.2* #4175 (better fix) 22 23 *2.8.0.1* #4175 23 24 *2.8.0.0* #4268, #4276, #4283 … … 59 60 *0.1.0* Initial release 60 61 </changelog> 61 <location>release/2.8/dashboard-2.8.0. 1.tgz</location>62 <md5sum> fc65dea8b968af43161007f56495a74b</md5sum>62 <location>release/2.8/dashboard-2.8.0.2.tgz</location> 63 <md5sum>b2c1aac5e0ec24206f89a28bb73ec85a</md5sum> 63 64 </module> modules/branches/2.9/dashboard/page.index.php
r10059 r10179 468 468 469 469 $out .= '<div id="syslog_button">'; 470 //TODO: there has got to be a better way to do the layout to avoid this hoaky dashboard_adjust_height()! 470 471 471 if ($showall) { 472 $out .= '<a href="#" onclick="changeSyslog(0);">'._('show new').'</a> <script type="text/javascript">dashboard_adjust_height(); </script>';472 $out .= '<a href="#" onclick="changeSyslog(0);">'._('show new').'</a>'; 473 473 } else { 474 $out .= '<a href="#" onclick="changeSyslog(1);">'._('show all').'</a><script type="text/javascript">dashboard_adjust_height(); </script>';474 $out .= '<a href="#" onclick="changeSyslog(1);">'._('show all').'</a>'; 475 475 } 476 476 $out .= '</div>'; … … 668 668 669 669 echo '<div style="clear:both;"></div>'; 670 671 echo '</div></div>'; // #sysinfo-right, #dashboard 672 673 // TODO: There has got to be a better way to do this simply with proper layout styles! 674 ?> 675 <script type="text/javascript"> 676 $(document).ready(function(){ 677 dashboard_adjust_height(); 678 }); 679 function dashboard_adjust_height() { 680 left = $('#sysinfo-left').css('height','').height(); 681 right = $('#sysinfo-right').height(); 682 if (right > left) { 683 $('#sysinfo-left').height(right); 684 } 685 } 686 </script> 687 <?php 688 670 echo '</div>'; // #sysinfo-right, #dashboard 671 echo '<div id="sysinfo-bot"> </div>'; 672 689 673 if($dashboard_debug && $error->ErrorsExist()) { 690 674 $fh = fopen($amp_conf['ASTLOGDIR']."/dashboard-error.log","a"); modules/branches/2.9/framework/module.xml
r10131 r10179 2 2 <rawname>framework</rawname> 3 3 <name>FreePBX Framework</name> 4 <version>2.9.0alpha1. 0</version>4 <version>2.9.0alpha1.1</version> 5 5 <publisher>FreePBX</publisher> 6 6 <license>GPLv2+</license> … … 8 8 <canuninstall>no</canuninstall> 9 9 <changelog> 10 *2.9.0alpha1.1* #4245, #4461 10 11 *2.9.0alpha1.0* bump to 2.9 11 12 *2.8.0.1* #4385 modules/branches/2.9/fw_ari/module.xml
r10102 r10179 2 2 <rawname>fw_ari</rawname> 3 3 <name>FreePBX ARI Framework</name> 4 <version>2.8.0. 3</version>4 <version>2.8.0.4</version> 5 5 <publisher>FreePBX</publisher> 6 6 <license>GPLv2+</license> … … 8 8 <canuninstall>no</canuninstall> 9 9 <changelog> 10 *2.8.0.4* #4461 10 11 *2.8.0.3* #4423 11 12 *2.8.0.2* #4402 … … 33 34 <type>setup</type> 34 35 <category>Basic</category> 35 <location>release/2.8/fw_ari-2.8.0. 3.tgz</location>36 <md5sum> fe774aa56692bd2fcfb51f254f0cdaca</md5sum>36 <location>release/2.8/fw_ari-2.8.0.4.tgz</location> 37 <md5sum>1f687e4ae05d059f29f6817cb06e0fe0</md5sum> 37 38 </module> modules/branches/2.9/fw_fop/module.xml
r10012 r10179 2 2 <rawname>fw_fop</rawname> 3 3 <name>FreePBX FOP Framework</name> 4 <version>2.8.0. 4</version>4 <version>2.8.0.5</version> 5 5 <publisher>FreePBX</publisher> 6 6 <license>GPLv2+</license> … … 8 8 <canuninstall>no</canuninstall> 9 9 <changelog> 10 *2.8.0.5* #4429 10 11 *2.8.0.4* reverting 2.8.0.3 fixed elsewhere 11 12 *2.8.0.3* #4388 … … 26 27 <type>setup</type> 27 28 <category>Basic</category> 28 <location>release/2.8/fw_fop-2.8.0. 4.tgz</location>29 <md5sum> fa0c54acddf16d5ffb721104ddca2e20</md5sum>29 <location>release/2.8/fw_fop-2.8.0.5.tgz</location> 30 <md5sum>1d1544098f13fc8f644f297299e70d4a</md5sum> 30 31 </module> modules/branches/2.9/logfiles/module.xml
r9861 r10179 2 2 <rawname>logfiles</rawname> 3 3 <name>Asterisk Logfiles</name> 4 <version>2.8.0. 0</version>4 <version>2.8.0.1</version> 5 5 <publisher>FreePBX</publisher> 6 6 <license>GPLv2+</license> 7 7 <changelog> 8 *2.8.0.1* #3978 8 9 *2.8.0.0* #4309 9 10 *2.7.0.0* localizations … … 23 24 <logfiles>Asterisk Logfiles</logfiles> 24 25 </menuitems> 25 <location>release/2.8/logfiles-2.8.0. 0.tgz</location>26 <md5sum> 05519cd03f078c5ecfde4356aed5c4c3</md5sum>26 <location>release/2.8/logfiles-2.8.0.1.tgz</location> 27 <md5sum>9c21e419a297dbeab6ffce81814daea1</md5sum> 27 28 </module> modules/branches/2.9/logfiles/page.logfiles.php
r9786 r10179 10 10 <div class="content"> 11 11 <?php 12 if(!$lines){$action='';}//promts for lines if its not set 12 if(!$lines){ 13 $action=''; 14 }//promts for lines if its not set 13 15 switch($action) { 14 16 case 'showlog': 15 $color = array(16 chr(27).'[0;33;40m' => '<span class="brown">',17 chr(27).'[0;36;40m' => '<span class="cyan">',18 chr(27).'[1;30;40m' => '<span class="black">',19 chr(27).'[1;31;40m' => '<span class="red">',20 chr(27).'[1;32;40m' => '<span class="green">',21 chr(27).'[1;33;40m' => '<span class="yellow">',22 23 24 25 17 $color = array( 18 chr(27).'[0;33;40m' => '<span class="brown">', 19 chr(27).'[0;36;40m' => '<span class="cyan">', 20 chr(27).'[1;30;40m' => '<span class="black">', 21 chr(27).'[1;31;40m' => '<span class="red">', 22 chr(27).'[1;32;40m' => '<span class="green">', 23 chr(27).'[1;33;40m' => '<span class="yellow">', 24 chr(27).'[1;34;40m' => '<span class="blue">', 25 chr(27).'[1;35;40m' => '<span class="magenta">', 26 chr(27).'[1;36;40m' => '<span class="cyan">', 27 chr(27).'[0;37;40m' => '<span class="black">',//this should really be white - but that would leave text unreadable on the white background of the page 26 28 27 chr(27).'[1;40m' => '<span class="bold">',28 chr(27).'[4;40m' => '<span class="underline">',29 chr(27).'[1;40m' => '<span class="bold">', 30 chr(27).'[4;40m' => '<span class="underline">', 29 31 30 chr(27).'[0;40m' => '</span>',31 );32 chr(27).'[0;40m' => '</span>', 33 ); 32 34 ?> 33 35 <style type="text/css"> … … 39 41 .green{color:green;} 40 42 .yellow{color:yellow;} 41 .blue{color:blue;} 42 .magenta{color:magenta;} 43 .cyan{color:cyan;} 44 .white{color:white;} 45 .bold{font-weight: bold;} 46 .underline{text-decoration:underline;} 47 .pre{font-family:"Courier New", Courier, monospace;font-size:0.85em} 43 .blue{color:blue;} 44 .magenta{color:magenta;} 45 .cyan{color:cyan;} 46 .white{color:white;} 47 .bold{font-weight: bold;} 48 .underline{text-decoration:underline;} 49 .pre{font-family:"Courier New", Courier, monospace;font-size:0.85em} 50 .app{color:cyan;} 51 .appargs{color:magenta;} 52 .context{color:blue;} 48 53 </style> 49 54 <h2> … … 61 66 if(strpos($l, 'ERROR')){$l='<span class="red">'.$l.'</span>';} 62 67 $l=str_replace(array_keys($color), $color, $l); 63 echo $l; 68 69 echo logfiles_highlight_asterisk($l); 64 70 } 65 71 echo '</div>'; modules/branches/2.9/pinsets/install.php
r9241 r10179 40 40 } 41 41 outn(_("checking if migration required..")); 42 $sql = "SELECT `used_by` FROM pinsets ";42 $sql = "SELECT `used_by` FROM pinsets WHERE used_by != ''"; 43 43 $check = $db->getRow($sql, DB_FETCHMODE_ASSOC); 44 44 if(!DB::IsError($check)) { modules/branches/2.9/pinsets/module.xml
r10089 r10179 2 2 <rawname>pinsets</rawname> 3 3 <name>PIN Sets</name> 4 <version>2.8.0. 4</version>4 <version>2.8.0.5</version> 5 5 <publisher>FreePBX</publisher> 6 6 <license>GPLv2+</license> … … 9 9 <description>Allow creation of lists of PINs (numbers for passwords) that can be used by other modules (eg, trunks).</description> 10 10 <changelog> 11 *2.8.0.5* #4431 11 12 *2.8.0.4* localization updates 12 13 *2.8.0.3* #4197 … … 32 33 <pinsets>PIN Sets</pinsets> 33 34 </menuitems> 34 <location>release/2.8/pinsets-2.8.0. 4.tgz</location>35 <md5sum> 1e443da60aa3397e1603863d83d3419d</md5sum>35 <location>release/2.8/pinsets-2.8.0.5.tgz</location> 36 <md5sum>0ad6606985a445e72a26d8f0e49f1efe</md5sum> 36 37 </module> modules/branches/2.9/sipstation/install.php
r9798 r10179 64 64 65 65 outn(_("checking for phantoms..")); 66 67 require_once($amp_conf['AMPWEBROOT'].'/admin/modules/core/functions.inc.php'); 66 68 $trunks = core_trunks_list(true); 67 69
