Changeset 7342

Timestamp:

01/06/09 13:58:59 (1 year ago)

Author:

p_lindheimer

Message:

Merged revisions 7177,7179-7185,7191-7201,7204-7211,7213-7221,7223-7226,7228-7249,7252-7260,7262-7272,7279-7285,7289-7291,7294-7295,7297-7312,7317-7320,7322-7331,7333-7340 via svnmerge from
http://svn.freepbx.org/modules/branches/2.6

........

r7177 | p_lindheimer | 2008-10-29 10:51:38 -0700 (Wed, 29 Oct 2008) | 1 line

Auto Check-in of any outstanding patches

........

r7196 | mickecarlsson | 2008-10-30 23:25:31 -0700 (Thu, 30 Oct 2008) | 1 line

Fixed type in code fro fw_fop

........

r7228 | mickecarlsson | 2008-11-05 09:14:56 -0800 (Wed, 05 Nov 2008) | 1 line

Changed some enclosed text string with proper enclosures so that localization with apostrophe will work

........

r7255 | lazytt | 2008-11-12 07:57:37 -0800 (Wed, 12 Nov 2008) | 1 line

ref #3358

........

r7300 | mickecarlsson | 2008-11-23 01:15:27 -0800 (Sun, 23 Nov 2008) | 1 line

Fixes #3409, dashboard display wrong statistics and color when disk storage is above 1Tb

........

r7301 | mickecarlsson | 2008-11-23 06:11:19 -0800 (Sun, 23 Nov 2008) | 1 line

Enclosed text strings for translation. Updated .pot file and swedish language

........

r7302 | mickecarlsson | 2008-11-23 06:26:47 -0800 (Sun, 23 Nov 2008) | 1 line

Enclosed text string for translation in core

........

r7306 | mickecarlsson | 2008-12-01 08:45:04 -0800 (Mon, 01 Dec 2008) | 1 line

Closes #932 adds permit/deny to sip and iax devices

........

r7307 | mickecarlsson | 2008-12-01 09:00:09 -0800 (Mon, 01 Dec 2008) | 1 line

Adds default 0.0.0.0/0.0.0.0 in deny and permit for sip and iax devices

........

r7308 | mickecarlsson | 2008-12-03 22:20:02 -0800 (Wed, 03 Dec 2008) | 1 line

Fixes #3426, sets code to follow tool tip. Thank you ryand

........

r7310 | mickecarlsson | 2008-12-06 06:07:17 -0800 (Sat, 06 Dec 2008) | 1 line

Closes #3224 removes hard coded database name

........

r7317 | mickecarlsson | 2008-12-15 10:55:17 -0800 (Mon, 15 Dec 2008) | 1 line

Closes #3443 adding check for uppercase file extensions

........

r7320 | ethans | 2008-12-17 16:31:52 -0800 (Wed, 17 Dec 2008) | 3 lines

Adds hook support into IVR page

........

r7322 | mickecarlsson | 2008-12-17 22:08:41 -0800 (Wed, 17 Dec 2008) | 1 line

Closes 3448 adding check for server side DND in normal paging

........

r7340 | mickecarlsson | 2008-12-30 14:22:14 -0800 (Tue, 30 Dec 2008) | 1 line

Closes #3448 finally fixes the DND in paging. Thank you jjshoe

........

Files:

• modules/branches/2.5 (modified) (1 prop)
• modules/branches/2.5/backup/bin/ampbackup.pl (modified) (3 diffs)
• modules/branches/2.5/backup/i18n/backup.pot (modified) (8 diffs)
• modules/branches/2.5/backup/i18n/sv_SE/LC_MESSAGES/backup.mo (modified) (previous)
• modules/branches/2.5/backup/i18n/sv_SE/LC_MESSAGES/backup.po (modified) (8 diffs)
• modules/branches/2.5/backup/schedule_functions.php (modified) (6 diffs)
• modules/branches/2.5/core/functions.inc.php (modified) (10 diffs)
• modules/branches/2.5/core/page.general.php (modified) (1 diff)
• modules/branches/2.5/dashboard/page.index.php (modified) (1 diff)
• modules/branches/2.5/ivr/page.ivr.php (modified) (2 diffs)
• modules/branches/2.5/music/page.music.php (modified) (4 diffs)
• modules/branches/2.5/paging/functions.inc.php (modified) (1 diff)

modules/branches/2.5/backup/bin/ampbackup.pl

@@ -63 +63 @@
-$User_Preferences{"ASTETCDIR"} = "/etc/asterisk";
-
+$User_Preferences{"CDRDBNAME"} = "asteriskcdrdb";
+
-$User_Preferences{"AMPPROVROOT"} = "";
-$User_Preferences{"AMPPROVEXCLUDE"} = "";
@@ -114 +116 @@
-# the WEB ROOT directory 
-$webroot = $User_Preferences{"AMPWEBROOT"};
-
-
+
+
+
+
-#
-$provroot = $User_Preferences{"AMPPROVROOT"};
@@ -209 +213 @@
-        if ( $Backup_CDR eq "yes" ){
-                system ("/bin/tar -Pcz -f /tmp/ampbackups.$Stamp/cdr.tar.gz $webroot/admin/cdr");
-asteriskcdrdb
+$cdrdatabase
-        }
-        if ( $Backup_FOP eq "yes" ){

modules/branches/2.5/backup/i18n/backup.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-09-27 15:00+02
+11-23 14:54+01
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -58 +58 @@
-msgstr ""
-
+#: schedule_functions.php:21 schedule_functions.php:46
+msgid "Are you sure you want to delete this File Set?"
+msgstr ""
+
-#: schedule_functions.php:22
-msgid "DELETE ALL THE DATA IN THIS SET"
@@ -74 +78 @@
-msgstr ""
-
+#: schedule_functions.php:51
+msgid ""
+"Are you sure you want to restore this COMPLETE file set?\\nDoing so will "
+"permanently over-write all FreePBX and Asterisk files\\nYou will lose all "
+"Your Call Detail Records and any Voicemail that was recorded between the "
+"BACKUP DATE and NOW!"
+msgstr ""
+
-#: schedule_functions.php:52
-msgid "Restore Entire Backup Set"
@@ -82 +94 @@
-msgstr ""
-
+#: schedule_functions.php:58
+msgid ""
+"Are you sure you want to Restore this file set?\\nDoing so will permanently "
+"delete any new voicemail you have in your mailbox\\nsince this backup on"
+msgstr ""
+
-#: schedule_functions.php:59
-msgid "Restore VoiceMail Files"
@@ -90 +108 @@
-"Restore your Voicemail files from this backup set.  NOTE! This will delete "
-"any voicemail currently in the voicemail boxes."
+msgstr ""
+
+#: schedule_functions.php:67
+msgid ""
+"Are you sure you want to Restore this file set?\\nNOTE! This will OVERWRITE "
+"any voicerecordings currently on the system. It will NOT delete new files "
+"not currently in the backup set"
-msgstr ""
-
@@ -103 +128 @@
-msgstr ""
-
+#: schedule_functions.php:74
+msgid ""
+"Are you sure you want to Restore this File Set?\\nDoing so will Permanently "
+"Over-Write all FreePBX and Asterisk Files!"
+msgstr ""
+
-#: schedule_functions.php:75
-msgid "Restore System Configuration"
@@ -114 +145 @@
-msgstr ""
-
+#: schedule_functions.php:79
+msgid ""
+"Are you sure you want to Restore the Operator Panel Files?\\nDoing so will "
+"Permanently Over-Write all Operator Panel Files!"
+msgstr ""
+
-#: schedule_functions.php:80
-msgid "Restore Operator Panel"
@@ -123 +160 @@
-"any Operator Panel Changes you have made since this backup... ALL Itemes "
-"will be reset to what they were at the time of this backup set.."
+msgstr ""
+
+#: schedule_functions.php:87
+msgid ""
+"Are you sure you want to Restore the CALL DETAIL FILES?\\nDoing so will "
+"Permanently DELETE all CALL RECORDS!"
-msgstr ""
-

modules/branches/2.5/backup/i18n/sv_SE/LC_MESSAGES/backup.po

@@ -8 +8 @@
-"Project-Id-Version: FreePBX backup\n"
-"Report-Msgid-Bugs-To: \n"
-09-27 15:00+02
-09-27 15:10
+11-23 14:54+01
+11-23 15:09
-"Last-Translator: Mikael Carlsson <mickecamino@gmail.com>\n"
-"Language-Team: \n"
@@ -64 +64 @@
-msgstr "SystemåterstÀllning"
-
+#: schedule_functions.php:21
+#: schedule_functions.php:46
+msgid "Are you sure you want to delete this File Set?"
+msgstr "Är du sÀker pÃ¥ att du vill ta bort denna sÀkerhetskopia?"
+
-#: schedule_functions.php:22
-msgid "DELETE ALL THE DATA IN THIS SET"
@@ -80 +85 @@
-msgstr "Ta bort denna sÀkerhetskopia"
-
+#: schedule_functions.php:51
+msgid ""
+"Are you sure you want to restore this COMPLETE file set?\\n"
+"Doing so will permanently over-write all FreePBX and Asterisk files\\n"
+"You will lose all Your Call Detail Records and any Voicemail that was recorded between the BACKUP DATE and NOW!"
+msgstr ""
+"Är du sÀker pÃ¥ att du vill Ã¥terstÀlla denna FULLSTÄNDIGA sÀkerhetskopia?\\n"
+"Detta kommmer permanent skriva över alla filer för FreePBX och Asterisk\\n"
+"Du kommer att förlora alla samtalsloggar och röstmeddelande som har registrerats från det att sÀkerhetskopian togs och nu!"
+
-#: schedule_functions.php:52
-msgid "Restore Entire Backup Set"
@@ -90 +105 @@
-terstÀll din kompletta sÀkerhetskopia och skriv över alla filer. NOTERA! Detta kommer att Ã¥terstÀlla ditt system till samma status det hade vid tiden för denna sÀkerhetskopia. ALLT KOMMER ATT SKRIVAS ÖVER!!"
-
+#: schedule_functions.php:58
+msgid ""
+"Are you sure you want to Restore this file set?\\n"
+"Doing so will permanently delete any new voicemail you have in your mailbox\\n"
+"since this backup on"
+msgstr ""
+"Är du sÀker pÃ¥ att du vill Ã¥terstÀlla denna sÀkerhetskopia?\\n"
+"Detta kommer att permanent ta bort alla nya röstbesked som finns i röstbrevlådorna\\n"
+"sedan denna sÀkerhestkopia togs den"
+
-#: schedule_functions.php:59
-msgid "Restore VoiceMail Files"
@@ -100 +125 @@
-terstÀll dina röstbrevlådor från denna kopia. NOTERA! Detta tar bort allt innehåll som nu finns i röstbrevlådorna."
-
+#: schedule_functions.php:67
+msgid ""
+"Are you sure you want to Restore this file set?\\n"
+"NOTE! This will OVERWRITE any voicerecordings currently on the system. It will NOT delete new files not currently in the backup set"
+msgstr ""
+"Är du sÀker pÃ¥ att du vill Ã¥terstÀlla denna sÀkerhetskopia?\\n"
+"OBS! Detta kommer att skriva över de röstbesked som finns i systemet. Nyare filer Àn de som finns i sÀkerhetskopian kommer INTE att skrivas över."
+
-#: schedule_functions.php:68
-msgid "Restore System Recordings Files"
@@ -110 +143 @@
-terstÀller dina systeminspelningar inklusive filerna för AutoAttendent . NOTERA! Detta kommer att SKRIVA ÖVER alla systeminspelningar i systemet, men kommer INTE att ta bort nya filer som inte finns i denna sÀkerhetskopia."
-
+#: schedule_functions.php:74
+msgid ""
+"Are you sure you want to Restore this File Set?\\n"
+"Doing so will Permanently Over-Write all FreePBX and Asterisk Files!"
+msgstr ""
+"Är du sÀker pÃ¥ att du vill Ã¥terstÀlla denna sÀkerhetskopia?\\n"
+"Detta kommer att skriva över alla filer för FreePBX och Asterisk!"
+
-#: schedule_functions.php:75
-msgid "Restore System Configuration"
@@ -120 +161 @@
-terstÀller din systemkonfiguration frÃ¥n denna sÀkerhetskopia. NOTERA! Detta kommer att SKRIVA ÖVER alla förÀndringar i ditt system du gjort efter denna sÀkerhetskopia... ALLT kommer att Ã¥terstÀllas till den status systemet hade vid tiden för denna sÀkerhetskopia."
-
+#: schedule_functions.php:79
+msgid ""
+"Are you sure you want to Restore the Operator Panel Files?\\n"
+"Doing so will Permanently Over-Write all Operator Panel Files!"
+msgstr ""
+"Är du sÀker pÃ¥ att du vill Ã¥terstÀlla Operatörspanelen?\\n"
+"Detta kommer permanent skriva över alla förÀndringar gjorda efter denna sÀkerhestkopia!"
+
-#: schedule_functions.php:80
-msgid "Restore Operator Panel"
@@ -129 +178 @@
-msgstr "Ã
-terstÀller operatörspanelen frÃ¥n denna sÀkerhetskopia. NOTERA! Detta kommer att SKRIVA ÖVER alla förÀndringar som skett i operatörspanelen sedan sÀkerhetskopian togs... ALLT kommer att Ã¥terstÀllas till den status operatörspanelen hade vid tiden för denna sÀkerhetskopia."
+
+#: schedule_functions.php:87
+msgid ""
+"Are you sure you want to Restore the CALL DETAIL FILES?\\n"
+"Doing so will Permanently DELETE all CALL RECORDS!"
+msgstr ""
+"Är du sÀker pÃ¥ att du vill Ã¥terstÀlla all samtalslogg?\\n"
+"Detta kommer att permanent ta bort alla loggar sedan datumen för sÀkerhetskopian!"
-
-#: schedule_functions.php:88

modules/branches/2.5/backup/schedule_functions.php

@@ -19 +19 @@
-                if (is_dir($dir)) {
-                        if (($file!=".") && ($file!="..") && ($file!="")){
-Are you sure you want to delete this File Set?
+"._("Are you sure you want to delete this File Set?")."
-                                echo _("DELETE ALL THE DATA IN THIS SET"); echo "<span>"; echo _("Delete this backup set and all data associated with this backup set..");echo "</span></a><br></li>";
-                                echo "<br>";
@@ -44 +44 @@
-                        }
-                } else if (substr($dir, -6)=="tar.gz" ){
-Are you sure you want to delete this File Set?
+"._("Are you sure you want to delete this File Set?")."
-                        echo _("Delete File Set"); echo "<span>"; echo _("Delete this backup set."); echo "</span></a><br></li>";
-                        echo "<br>";
-                        $tar_string="tar tfz \"$dir\" | cut -d'/' -f4";
-                        exec($tar_string,$restore_files,$error);
-Are you sure you want to restore this COMPLETE file set?\n Doing so will permanently over-write all FreePBX and Asterisk files\n You will lose all Your Call Detail Records and any Voicemail that was recorded between the BACKUP DATE and NOW.
+"._("Are you sure you want to restore this COMPLETE file set?\\nDoing so will permanently over-write all FreePBX and Asterisk files\\nYou will lose all Your Call Detail Records and any Voicemail that was recorded between the BACKUP DATE and NOW!")."
-                        echo _("Restore Entire Backup Set"); 
-                        echo "<span>"; 
@@ -56 +56 @@
-                        echo "<br>";
-                        if (array_search('voicemail.tar.gz',$restore_files)){
-                               echo "<li><a class=\"info\" href=\"javascript:decision('Are you sure you want to Restore this file set?\n Doing so will permanently delete any new voicemail you have in your mailbox\n since this backup on $file?
+                               echo "<li><a class=\"info\" href=\"javascript:decision('"._("Are you sure you want to Restore this file set?\\nDoing so will permanently delete any new voicemail you have in your mailbox\\nsince this backup on")." $file!
-                                echo _("Restore VoiceMail Files");
-                                echo "<span>"; 
@@ -65 +65 @@
-
-                        if (array_search('recordings.tar.gz',$restore_files)){
-                               echo "<li><a class=\"info\" href=\"config.php?type=$type&display=$display&action=restored&dir=$dir&filetype=Recordings&file=$file
+                               echo "<li><a class=\"info\" href=\"javascript:decision('"._("Are you sure you want to Restore this file set?\\nNOTE! This will OVERWRITE any voicerecordings currently on the system. It will NOT delete new files not currently in the backup set")."','config.php?type=$type&display=$display&action=restored&dir=$dir&filetype=Recordings&file=$file')
-                                echo _("Restore System Recordings Files"); 
-                                echo "<span>"; 
@@ -72 +72 @@
-                        }
-                        if (array_search('configurations.tar.gz',$restore_files)){
-Are you sure you want to Restore this File Set\n Doing so will Permanently Over-Write all AMP and Asterisk Files?
+"._("Are you sure you want to Restore this File Set?\\nDoing so will Permanently Over-Write all FreePBX and Asterisk Files!")."
-                                echo _("Restore System Configuration"); echo "<span>"; echo _("Restore your system configuration from this backup set.  NOTE! This will OVERWRITE any System changes you have made since this backup... ALL Itemes will be reset to what they were at the time of this backup set.."); echo "</span></a><br></li>";
-                                echo "<br>";
-                        }
-                        if (array_search('fop.tar.gz',$restore_files)){
-Are you sure you want to Restore the Operator Panel Files\n Doing so will Permanently Over-Write all Operator Panel Files?
+"._("Are you sure you want to Restore the Operator Panel Files?\\nDoing so will Permanently Over-Write all Operator Panel Files!")."
-                                echo _("Restore Operator Panel"); 
-                                echo "<span>"; 
@@ -85 +85 @@
-                        }
-                        if (array_search('cdr.tar.gz',$restore_files)){
-Are you sure you want to Restore the CALL DETAIL FILES\n Doing so will Permanently DELETE  all CALL RECORDS.?
+"._("Are you sure you want to Restore the CALL DETAIL FILES?\\nDoing so will Permanently DELETE all CALL RECORDS!")."
-                                echo _("Restore Call Detail Report"); 
-                                echo "<span>"; 

modules/branches/2.5/core/functions.inc.php

@@ -212 +212 @@
-                        }
-
-
+and 'deny' 
-                        //
-                        $results2 = array();
@@ -218 +218 @@
-                                $options = explode("&", $element['data']);
-                                foreach ($options as $option) {
-$element['keyword'] == 'disallow' && $option == 'all'
+($element['keyword'] == 'disallow' && $option == 'all') | ($element['keyword'] == 'deny')
-                                                array_unshift($results2,array('keyword'=>$element['keyword'],'data'=>$option));
-                                        } else {
@@ -475 +475 @@
-        //static destinations
-        $extens = array();
-'Terminate Call'
+_("Terminate Call")
-        $extens[] = array('destination' => 'app-blackhole,hangup,1', 'description' => _("Hangup"), 'category' => $category);
-        $extens[] = array('destination' => 'app-blackhole,congestion,1', 'description' => _("Congestion"), 'category' => $category);
@@ -2381 +2381 @@
-                        array($account,'callgroup',(isset($_REQUEST['callgroup']))?$_REQUEST['callgroup']:''),
-                        array($account,'pickupgroup',(isset($_REQUEST['pickupgroup']))?$_REQUEST['pickupgroup']:''),
+                        array($account,'deny',(isset($_REQUEST['deny']))?$_REQUEST['deny']:''),
+                        array($account,'permit',(isset($_REQUEST['permit']))?$_REQUEST['permit']:''),                   
-                        array($account,'disallow',(isset($_REQUEST['disallow']))?$_REQUEST['disallow']:''),
-                        array($account,'allow',(isset($_REQUEST['allow']))?$_REQUEST['allow']:'')
@@ -2457 +2459 @@
-                        array($account,'port',($_REQUEST['port'])?$_REQUEST['port']:'4569'),
-                        array($account,'qualify',($_REQUEST['qualify'])?$_REQUEST['qualify']:'yes'),
+                        array($account,'deny',(isset($_REQUEST['deny']))?$_REQUEST['deny']:''),
+                        array($account,'permit',(isset($_REQUEST['permit']))?$_REQUEST['permit']:''),                   
-                        array($account,'disallow',($_REQUEST['disallow'])?$_REQUEST['disallow']:''),
-                        array($account,'allow',($_REQUEST['allow'])?$_REQUEST['allow']:''),
@@ -3043 +3047 @@
-        }
-        if (trim($did) == '') {
-'Invalid DID, must be a non-blank DID'
+"Invalid DID, must be a non-blank DID"
-                return false;
-        }
@@ -4406 +4410 @@
-                                        $device_icon = ($device_item['devicetype'] == 'fixed') ? 'images/telephone_key.png' : 'images/telephone_edit.png';
-                                        $device_label  = ' ';
-'Edit:'
+"Edit:"
-                                        $device_label .= ' '.$device_item['id'].' '.$device_item['description'];
-
@@ -4587 +4591 @@
-                $tmparr['accountcode'] = array('value' => '', 'level' => 1);
-                $tmparr['mailbox'] = array('value' => '', 'level' => 1);
+                $tmparr['deny'] = array('value' => '0.0.0.0/0.0.0.0', 'level' => 1);
+                $tmparr['permit'] = array('value' => '0.0.0.0/0.0.0.0', 'level' => 1);
-                $currentcomponent->addgeneralarrayitem('devtechs', 'iax2', $tmparr);
-                unset($tmparr);
@@ -4608 +4614 @@
-                $tmparr['accountcode'] = array('value' => '', 'level' => 1);
-                $tmparr['mailbox'] = array('value' => '', 'level' => 1);
+                $tmparr['deny'] = array('value' => '0.0.0.0/0.0.0.0', 'level' => 1);
+                $tmparr['permit'] = array('value' => '0.0.0.0/0.0.0.0', 'level' => 1);
-                $currentcomponent->addgeneralarrayitem('devtechs', 'sip', $tmparr);
-                unset($tmparr);
@@ -4695 +4703 @@
-                                if ($deviceInfo['device_user'] != 'none') {
-                                        $editURL = $_SERVER['PHP_SELF'].'?type=setup&display=users&skip=0&extdisplay='.$deviceInfo['user'];
-'Edit Default User: %s'),$deviceInfo['user']) : sprintf(_('Edit Fixed User: %s'
+"Edit Default User: %s"),$deviceInfo['user']) : sprintf(_("Edit Fixed User: %s"
-                                        $label = '<span><img width="16" height="16" border="0" title="'.$tlabel.'" alt="" src="images/user_edit.png"/>&nbsp;'.$tlabel.'</span>';
-                                        $currentcomponent->addguielem('_top', new gui_link('edit_user', $label, $editURL, true, false), 0);

modules/branches/2.5/core/page.general.php

@@ -137 +137 @@
-        </td><td align="right">
-        <select name="RECORDING_STATE" tabindex="<?php echo ++$tabindex;?>">
-ENABLED"  <?php  echo ($RECORDING_STATE == 'EN
-DISABLED"   <?php  echo ($RECORDING_STATE == 'DIS
+DISABLED"  <?php  echo ($RECORDING_STATE == 'DIS
+ENABLED"   <?php  echo ($RECORDING_STATE == 'EN
-        </select>
-        </td></tr>

modules/branches/2.5/dashboard/page.index.php

@@ -202 +202 @@
-        $out .= "<h4>"._("Disks")."</h4>";
-        foreach ($sysinfo->filesystems() as $fs) {
-), number_format($fs["size"]/1024/1024,2
+,".",""), number_format($fs["size"]/1024/1024,2,".",""
-        }
-        

modules/branches/2.5/ivr/page.ivr.php

@@ -286 +286 @@
-
-                <tr><td colspan=2><hr /></td></tr>
-
+
+
-                        <input name="increase" type="submit" value="<?php echo _("Increase Options")?>">
-                        &nbsp;
@@ -320 +321 @@
-                echo "<input type='hidden' name='nbroptions' value=$nbroptions />\n";
-        } 
+
+        global $module_hook;
+        echo $module_hook->hookHtml;
-?>
-        <input name="increase" type="submit" value="<?php echo _("Increase Options")?>">

modules/branches/2.5/music/page.music.php

@@ -157 +157 @@
-        $pattern = '';
-        $handle=opendir($path_to_dir) ;
-wav
+MP3','wav','WAV
-        
-        //generate the pattern to look for.
@@ -205 +205 @@
-
-                        // If we are dealing with an MP3, we need to decode it to a wav file
-
+| strpos($origmohfile,'.MP3') 
-                                $mpg123cmd = "mpg123 -w \"".substr($origmohfile,0,strrpos($origmohfile,".")).".wav\" \"".$origmohfile."\" 2>&1 ";
-                                exec($mpg123cmd, $output, $returncode);
@@ -211 +211 @@
-                        $newmohfile = $path_to_dir."/wav_".$newname.".wav";
-                        //asdf
-substr($origmohfile,0,strrpos($origmohfile,".")).".wav
+$origmohfile."
-                        $soxcmd .= " -r 8000 -c 1 \"".$newmohfile."\"";
-                        if($volume){
@@ -260 +260 @@
-                // so we have two "original" files to delete
-                //
-
+| strpos($origmohfile,'.MP3') 
-                        $rmcmd="rm -f \"". substr($origmohfile,0,strrpos($origmohfile,".")).".wav\"";
-                        exec($rmcmd);

modules/branches/2.5/paging/functions.inc.php

@@ -286 +286 @@
-                        $ext->add($extpaging, "_PAGE.", 'AVAIL', new ext_chanisavail('${DB(DEVICE/${EXTEN:4}/dial)}', 'js'));
-                        $ext->add($extpaging, "_PAGE.", 'SKIPCHECK', new ext_noop('Seems to be available (state = ${AVAILSTATUS}'));
+                        $ext->add($extpaging, "_PAGE.", '', new ext_gotoif('$["${DB(DND/${DB(DEVICE/${EXTEN:4}/user)})}" = "YES"]', 'skipself'));                       
-                                
-                        $ext->add($extpaging, "_PAGE.", '', new ext_macro('autoanswer','${EXTEN:4}'));