Changeset 10701

Timestamp:

12/11/10 18:09:00 (2 years ago)

Author:

mbrevda

Message:

re #4566 - merge forward

Files:

• freepbx/branches/bootstrap (modified) (1 prop)
• freepbx/branches/bootstrap/amp_conf/htdocs/admin/libraries/config.functions.php (modified) (1 diff)
• freepbx/branches/bootstrap/amp_conf/htdocs/admin/libraries/module.functions.php (modified) (3 diffs)
• freepbx/branches/bootstrap/amp_conf/htdocs/recordings/modules/phonefeatures.module (modified) (3 diffs)

freepbx/branches/bootstrap/amp_conf/htdocs/admin/libraries/config.functions.php

@@ -17 +17 @@
-  'ARI_ADMIN_PASSWORD' => array('std' , 'ari_password'),
-  'TCINTERVAL      '=> array('std' , '60'),
+        'CFRINGTIMERDEFAULT' => array('std' , '0'),
-
-  'ASTETCDIR'      => array('dir' , '/etc/asterisk'),

freepbx/branches/bootstrap/amp_conf/htdocs/admin/libraries/module.functions.php

@@ -832 +832 @@
-  }
-  
-
-+gzip (
+|tar
+ or tar+gzip (.tar, 
-    return $errors;
-  }
-  
-
-tar.gz (eg. custommodule-0.1.tar.
+|tar
+[tar|tar.gz|tgz] (eg. custommodule-0.1.t
-    return $errors;
-  } else {
@@ -853 +853 @@
-  move_uploaded_file($uploaded_file['tmp_name'], $filename);
-  
-
+
+
-  if ($exitcode != 0) {
-
+ or tar
-    return $errors;
-  }
@@ -879 +880 @@
-    return array(sprintf(_('Could not remove %s to install new version'), $amp_conf['AMPWEBROOT'].'/admin/modules/_cache/'.$modulenam));
-  }
-z
+".$tar_z_arg."
-  if ($exitcode != 0) {
-    return array(sprintf(_('Could not untar %s to %s'), $filename, $amp_conf['AMPWEBROOT'].'/admin/modules/_cache'));

freepbx/branches/bootstrap/amp_conf/htdocs/recordings/modules/phonefeatures.module

@@ -46 +46 @@
-        $this->storePhoneSetting( $args, $exten, 'do_not_disturb', 'DND', 'YES');
-        $this->storeCallScreen( $args, $exten);
+        $this->storeRingtimer($args, $exten, 'ringtimer');
+        $this->storeRingtimer($args, $exten, 'cfringtimer');
-      }
-    }
@@ -99 +101 @@
-      $dnd_cw_text.=  $this->displayPhoneControls( $exten, 'do_not_disturb', 'DND', _("Do Not Disturb"));
-      $dnd_cw_text.=  $this->displayCallScreenControls( $exten);
+      
+      $dnd_cw_text.=  $this->displayRingTimerControls($exten, 'ringtimer');
+      $dnd_cw_text.=  $this->displayRingTimerControls($exten, 'cfringtimer');
-      
-      $dnd_cw_text .= "</table>";
@@ -431 +436 @@
-  }
-
+//*****************************************************************************
+  function storeRingtimer($args, $exten, $type) {
+
+    global $astman;
+    
+    $ringtimer = (int) getArgument( $args, $type);
+    
+    if ($ringtimer > 120)
+      $ringtimer = 120;
+      
+    switch($type){
+      case 'cfringtimer':
+        if ($ringtimer < -1)
+          $ringtimer = -1;
+          
+        $astman->database_put("AMPUSER", $exten . '/cfringtimer', $ringtimer);
+        break;
+      case 'ringtimer':
+        if ($ringtimer < 0)
+          $ringtimer = 0;
+          
+        $astman->database_put("AMPUSER", $exten . '/ringtimer', $ringtimer);
+        break;
+    }
+  }
+
+//*****************************************************************************
+  function getRingTimer($exten, $type) {
+
+    global $astman;
+
+    $ringtimer = (int) $astman->database_get("AMPUSER", $exten . '/' . $type);
+
+    return $ringtimer;
+  }
+
+//*****************************************************************************
+  function displayRingTimerControls($exten, $type)
+  {
+
+    $ringtimer = $this->getRingTimer($exten, $type);
+
+    $ret = "\n<tr>";
+    if($type == 'cfringtimer')
+      $ret.= "<td><a href='#' class='info'>" . _("CallForward Ringtimer:") . "<span>" . _("Number of seconds to ring prior to going to voicemail or other fail over destinations that may be setup by an administrator on this account. The Always setting will ring the call forward destinaiton until answered or the caller hangs up. The Default setting will use the value set in Ring Time. Your setting here will be forced to Always if there is no Voicemail or alternartive fail over destination for a call to go to.") . " </span></a></td>";
+    else
+      $ret.= "<td><a href='#' class='info'>" . _("Ringtimer:") . "<span>" . _("Number of seconds to ring prior to going to voicemail or ringing other numbers that may be configured such as a Call Forward Unavailabe or an Unavailable destination that may be configured by your administrator. The Default setting will use the value set for the PBX.") . " </span></a></td>";
+    $ret .= "<td>";
+    $ret .= "<select name='$type'>";
+    $ret .=  '<option value="0" ' . (0 == $ringtimer ? 'selected' : '') . '>' . _("Default") . '</option>';
+    if($type == 'cfringtimer')
+      $ret .=  '<option value="-1" ' . (-1 == $ringtimer ? 'selected' : '') . '>' . _("Always") . '</option>';
+    for ($i=1; $i <= 120; $i++) {
+      $ret .=  '<option value="' . $i . '" ' . ($i == $ringtimer ? 'selected' : '') . '>' . $i . '</option>';
+    }
+    $ret .= "</select>";
+    $ret .= "</td>";
+    $ret .= "</tr>\n";
+    
+    return $ret;
+  }
-} // class
-?>