Changeset 5512

Timestamp:

12/16/07 13:22:04 (6 years ago)

Author:

p_lindheimer

Message:

oops pushed out some bogus changes, revertting r5511

Files:

• modules/branches/2.4/core/functions.inc.php (modified) (5 diffs)
• modules/branches/2.4/framework/module.xml (modified) (2 diffs)
• modules/branches/2.4/parking/functions.inc.php (modified) (1 diff)
• modules/branches/2.4/publish.pl (modified) (1 diff)

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

@@ -2 +2 @@
-
-class core_conf {
-  $_sip_general    = array():
-  $_iax_general    = array():
-  $_featuremap     = array():
-  $_applicationmap = array():
-  // return an array of filenames to write
+  // files named like pinset_N
-  function get_filename() {
-    $files = array(
@@ -14 +11 @@
-      'iax_registrations.conf',
-      'zapata_additional.conf',
-      'sip_general_additional.conf',
-      'iax_general_additional.conf',
-      'features_applicationmap_additional.conf',
-      'features_featuremap_additional.conf',
-      );
-    /*
-    if (isset($this->_sip_general) && is_array($this->_sip_general)) {
-      $files[] = 'sip_general_additional.conf';
@@ -26 +18 @@
-      $files[] = 'iax_general_additional.conf';
-    }
-    */
-    return $files;
-  }
@@ -56 +47 @@
-        return $this->generate_zapata_additional($version);
-        break;
-      case 'features_applicationmap_additional.conf':
-        return $this->generate_applicationmap_additional($version);
-        break;
-      case 'features_featuremap_additional.conf':
-        return $this->generate_featuremap_additional($version);
-        break;
-    }
-  }
@@ -89 +74 @@
-    if (isset($this->_iax_general) && is_array($this->_iax_general)) {
-      foreach ($this->_iax_general as $values) {
-        $output .= $values['key']."=".$values['value']."\n";
-      }
-    }
-    return $output;
-  }
-
-  function addFeatureMap($key, $value) {
-    $this->_featuremap[] = array('key' => $key, 'value' => $value);
-  }
-
-  function generate_featuremap_additional($ast_version) {
-    $output = '';
-
-    if (isset($this->_featuremap) && is_array($this->_featuremap)) {
-      foreach ($this->_featuremap as $values) {
-        $output .= $values['key']."=".$values['value']."\n";
-      }
-    }
-    return $output;
-  }
-
-  function addApplicationMap($key, $value) {
-    $this->_applicationmap[] = array('key' => $key, 'value' => $value);
-  }
-
-  function generate_application_additional($ast_version) {
-    $output = '';
-
-    if (isset($this->_applicationmap) && is_array($this->_applicationmap)) {
-      foreach ($this->_applicationmap as $values) {
-        $output .= $values['key']."=".$values['value']."\n";
-      }

modules/branches/2.4/framework/module.xml

@@ -2 +2 @@
-  <rawname>framework</rawname>
-  <name>FreePBX Framework</name>
-2
+1
-  <candisable>no</candisable>
-  <canuninstall>no</canuninstall>
-  <changelog>
-    *2.4.0beta1.2* republish to correct publishing problem some files not getting included
-    *2.4.0beta1.1* #2544 (Asterisk 11543) create #include files or Asterisk will fail, #2554 extenssion class addtions
-    *2.4.0beta1.0* #2477, #2517, #2319, #2523, #2475, #1858, #2419, #2484, #2334, #2134, #2431, #2453, Extension/Destination Registry support/APIs
@@ -45 +44 @@
-  <type>setup</type>
-  <category>Basic</category>
-2
-2f31beb503793e6fed396813100f6a61
+1
+42133a095591f5eb2c2e04523907a7f9
-</module>

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

@@ -106 +106 @@
-          $ext->add($parkhints, $slot, '', new ext_parkedcall($slot));
-        }
-      } else {
-        $parking_conf->addSetting('parkhints','yes');
-      }
-    }

modules/branches/2.4/publish.pl

@@ -8 +8 @@
-$checkphp = 1;
-$rver = "2.4";
-branches/2.4
+trunk
-$framework = "framework";
-