Changeset 11434

Timestamp:

02/17/11 20:23:31 (2 years ago)

Author:

p_lindheimer

Message:

closes #4224 adds feature code to pickup next available (though Asterisk is broken with this) and other changes to get connected call working and various other tweaks

Files:

• modules/branches/2.9/parking/functions.inc.php (modified) (5 diffs)
• modules/branches/2.9/parking/install.php (modified) (2 diffs)
• modules/branches/2.9/parking/module.xml (modified) (2 diffs)

modules/branches/2.9/parking/functions.inc.php

@@ -33 +33 @@
-    $parkingcontext = isset($results['parkingcontext'])?$results['parkingcontext']:'parkedcalls';
-    $parkalertinfo  = isset($results['parkalertinfo'])?$results['parkalertinfo']:'';
-$results['parkcid']
+trim($results['parkcid'])
-    $parkingannmsg_id   = isset($results['parkingannmsg_id'])?$results['parkingannmsg_id']:'';
-    $goto   = isset($results['goto'])?$results['goto']:'';
@@ -43 +43 @@
-
-    if ($parkingenabled) {
-
-
-
+
-      $core_conf->addFeatureGeneral('parkext',$parkext);
-      $core_conf->addFeatureGeneral('parkpos',$parkpos1."-".$parkpos2);
-      $core_conf->addFeatureGeneral('context',$parkingcontext);
+
+      if (!$ast_ge_18) {
+        $ext->addInclude('from-internal-additional', $parkingcontext);
+      }
-
-      if ($parkingtime) {
@@ -98 +100 @@
-        $core_conf->addFeatureGeneral('comebacktoorigin','no');
-
-        $core_conf->addFeatureGeneral('parkinghints',$parkinghints);
-        $core_conf->addFeatureGeneral('parkedplay',isset($results['parkedplay']) ? $results['parkedplay'] : 'both');
-        $core_conf->addFeatureGeneral('parkedcalltransfers',isset($results['parkedcalltransfers']) ? $results['parkedcalltransfers'] : 'caller');
@@ -115 +116 @@
-         }
-        if ($parkcid) {
-set('CALLERID(name)', $parkcid.
+execif('$["${CALLERID(name):0:' .strlen($parkcid). '}" != "' .$parkcid. '"]','Set','CALLERID(name)=' .$parkcid. 
-        }
-        if ($parkingannmsg_id != '') {
@@ -137 +138 @@
-      }
-
-
-
-TODO: parkinghints = yes 1.6.2+
+
+
+need to generate their hints anyhow.
-      //
-ast_lt_162 && $parkinghints == 'yes'
+parkinghints == 'yes' || $ast_ge_18
-        $parkhints = 'park-hints';
-
+
+
+
-        for ($slot = $parkpos1; $slot <= $parkpos2; $slot++) {
-
-
+
+
+
+
+
+
+
+
+
+
-        }
+
+        $fcc = new featurecode('parking', 'parkedcall');
+        $pc_code = $fcc->getCodeActive();
+        unset($fcc);
+
+        if ($pc_code != '') {
+          if ($ast_ge_18) {
+            $ext->add($parkhints, $pc_code, '', new ext_macro('parked-call',''));
+          } else {
+            $ext->add($parkhints, $pc_code, '', new ext_parkedcall());
+          }
+          if ($parkinghints == 'yes') {
+            $hv = rtrim($hv_all,'&');
+            $ext->addHint($parkhints, $pc_code, $hv);
+          }
+        }
+        $pc = 'macro-parked-call';
+        $exten = 's';
+        $ext->add($pc, $exten, '', new ext_set('CCSS_SETUP','TRUE'));
+        $ext->add($pc, $exten, '', new ext_macro('user-callerid'));
+        $ext->add($pc, $exten, '', new ext_gotoif('$["${ARG1}" = "" | ${DIALPLAN_EXISTS(parkedcalls,${ARG1},1)} = 1]','parkedcall'));
+        $ext->add($pc, $exten, '', new ext_resetcdr(''));
+        $ext->add($pc, $exten, '', new ext_nocdr(''));
+        $ext->add($pc, $exten, '', new ext_wait('1'));
+        $ext->add($pc, $exten, '', new ext_noop_trace('User: ${CALLERID(all)} tried to pickup non-existent Parked Call Slot ${ARG1}'));
+        $ext->add($pc, $exten, '', new ext_playback('pbx-invalidpark'));
+        $ext->add($pc, $exten, '', new ext_wait('1'));
+        $ext->add($pc, $exten, '', new ext_hangup(''));
+        $ext->add($pc, $exten, 'parkedcall', new ext_noop_trace('User: ${CALLERID(all)} picking up Parked Call Slot ${ARG1}'));
+        $ext->add($pc, $exten, 'parkedcall', new ext_parkedcall('${ARG1}'));
-      }
-    break;

modules/branches/2.9/parking/install.php

@@ -2 +2 @@
-global $db;
-global $amp_conf;
+//for translation only
+if (false) {
+_("Pickup ParkedCall Any");
+}
+
+$fcc = new featurecode('parking', 'parkedcall');
+$fcc->setDescription('Pickup ParkedCall Any');
+$fcc->setDefault('*85');
+$fcc->setProvideDest();
+$fcc->update();
+unset($fcc);
-
-$sql = "
@@ -99 +110 @@
-$set['type'] = CONF_TYPE_BOOL;
-$freepbx_conf->define_conf_setting('PARKINGPATCH',$set,true);
+

modules/branches/2.9/parking/module.xml

@@ -3 +3 @@
-  <repo>standard</repo>
-  <name>Parking Lot</name>
-1
+2
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -14 +14 @@
-  </menuitems>
-  <changelog>
+    *2.9.0.2* #4224
-    *2.9.0.1* #4740
-    *2.9.0.0* #4655