Changeset 5723

Timestamp:

02/24/08 08:46:56 (4 years ago)

Author:

p_lindheimer

Message:

Merged revisions 5454-5487,5489-5722 via svnmerge from
http://svn.freepbx.org/freepbx/branches/2.4

........

r5454 | p_lindheimer | 2007-12-11 10:52:27 -0800 (Tue, 11 Dec 2007) | 1 line

create 2.4 branch from trunk

........

r5455 | p_lindheimer | 2007-12-11 11:24:37 -0800 (Tue, 11 Dec 2007) | 1 line

add customappsreg module as part of standard build

........

r5456 | p_lindheimer | 2007-12-11 11:26:01 -0800 (Tue, 11 Dec 2007) | 1 line

Creating release 2.4.0beta1

........

r5473 | p_lindheimer | 2007-12-11 15:47:26 -0800 (Tue, 11 Dec 2007) | 1 line

fix install_amp so that it does not change the state of modules to enabled automatically when it is checking them

........

r5474 | p_lindheimer | 2007-12-11 16:03:52 -0800 (Tue, 11 Dec 2007) | 1 line

check for version_compare_freepbx in case functions.inc.php is included in an install_amp upgrade

........

r5480 | p_lindheimer | 2007-12-11 17:56:58 -0800 (Tue, 11 Dec 2007) | 1 line

we need to enable after installing the modules since the previous change

........

r5492 | p_lindheimer | 2007-12-14 13:48:39 -0800 (Fri, 14 Dec 2007) | 1 line

Create empty #include files for to address Asterisk 1.4 change: http://bugs.digium.com/view.php?id=11543

........

r5497 | p_lindheimer | 2007-12-14 14:45:05 -0800 (Fri, 14 Dec 2007) | 2 lines

Blocked revisions 5002,5004,5020,5028,5035-5037,5043,5077,5096,5101-5102,5108,5118,5123,5133-5134,5152,5154,5216,5236,5248,5295,5489 via svnmerge

........

r5504 | p_lindheimer | 2007-12-15 20:57:14 -0800 (Sat, 15 Dec 2007) | 1 line

#2554 execif to work with 1.6, adds SetCallerPres?, AddQueueMemeber?, RemoveQueueMember?, UserEvent?, MacroExit? and ParkedCall? to extensions class

........

r5510 | p_lindheimer | 2007-12-16 10:08:32 -0800 (Sun, 16 Dec 2007) | 1 line

reminder to change execif when Asterisk trunk fixed

........

r5515 | p_lindheimer | 2007-12-16 11:54:38 -0800 (Sun, 16 Dec 2007) | 1 line

add tooltip to module admin online update to provide informaiton of what is trasmitted

........

r5517 | p_lindheimer | 2007-12-16 12:07:58 -0800 (Sun, 16 Dec 2007) | 1 line

add tooltip to CHeck for updates online link to provide information of what needs to be trasmitted when checking for updates

........

r5520 | p_lindheimer | 2007-12-16 12:21:55 -0800 (Sun, 16 Dec 2007) | 1 line

formatting fix

........

r5522 | p_lindheimer | 2007-12-16 13:14:09 -0800 (Sun, 16 Dec 2007) | 1 line

oops, r5521 should have been svn mv not svn cp but deleting now has same effect

........

r5525 | p_lindheimer | 2007-12-16 13:22:18 -0800 (Sun, 16 Dec 2007) | 1 line

add default to userevent to remove warning

........

r5526 | p_lindheimer | 2007-12-16 13:26:53 -0800 (Sun, 16 Dec 2007) | 1 line

#2539 module.xml field to medium blob, and add beta2 upgrade script including migrating features.conf to core

........

r5533 | p_lindheimer | 2007-12-16 14:43:31 -0800 (Sun, 16 Dec 2007) | 1 line

Creating release 2.4.0beta2

........

r5555 | pnlarsson | 2007-12-26 15:17:10 -0800 (Wed, 26 Dec 2007) | 1 line

The ExecIf? issue has been resolved in http://svn.digium.com/view/asterisk?view=rev&rev=94814

........

r5564 | p_lindheimer | 2008-01-10 10:47:27 -0800 (Thu, 10 Jan 2008) | 1 line

add addSwitch to extensions class, similar to addInclude to introduce the Asterisk switch statement

........

r5570 | pnlarsson | 2008-01-12 08:37:41 -0800 (Sat, 12 Jan 2008) | 1 line

Fixes #2578, setting language in asterisk trunk/1.6

........

r5578 | p_lindheimer | 2008-01-12 14:09:37 -0800 (Sat, 12 Jan 2008) | 1 line

dumb spacing change

........

r5596 | p_lindheimer | 2008-01-14 16:21:33 -0800 (Mon, 14 Jan 2008) | 1 line

all contexts don't need to have custom in the string, this is very outdated

........

r5612 | pnlarsson | 2008-01-20 07:25:15 -0800 (Sun, 20 Jan 2008) | 1 line

Disabeling the check for asterisk version higher than 1.5 - to be able to install freepbx on the latest 1.6 beta

........

r5623 | p_lindheimer | 2008-01-27 09:52:58 -0800 (Sun, 27 Jan 2008) | 1 line

put asterisk version checking back in but allow 1.6 and below

........

r5624 | p_lindheimer | 2008-01-27 09:54:26 -0800 (Sun, 27 Jan 2008) | 1 line

reformat and add userfield=1 to have userfield saved to MySQL CDR

........

r5628 | p_lindheimer | 2008-01-27 10:52:07 -0800 (Sun, 27 Jan 2008) | 1 line

make 2.4.0rc1 upgrade directory

........

r5630 | p_lindheimer | 2008-01-27 11:30:13 -0800 (Sun, 27 Jan 2008) | 1 line

DUNDi and 1.6 support comment in CHANGES

........

r5631 | p_lindheimer | 2008-01-27 11:31:57 -0800 (Sun, 27 Jan 2008) | 1 line

Creating release 2.4.0rc1

........

r5642 | p_lindheimer | 2008-01-30 22:46:41 -0800 (Wed, 30 Jan 2008) | 1 line

#2659 Queues FOP information gone and #668 added back in along with Conferences and Parking

........

r5646 | pnlarsson | 2008-02-02 16:09:00 -0800 (Sat, 02 Feb 2008) | 1 line

#2599, adding support for detecting asterisk svn team branches

........

r5648 | p_lindheimer | 2008-02-07 08:52:14 -0800 (Thu, 07 Feb 2008) | 1 line

#2625 fixing spelling error tansmit to transmit

........

r5656 | p_lindheimer | 2008-02-08 07:42:18 -0800 (Fri, 08 Feb 2008) | 1 line

wrap update info in urlencode()

........

r5660 | p_lindheimer | 2008-02-09 13:25:57 -0800 (Sat, 09 Feb 2008) | 1 line

create 2.4.0 upgrade directory to bump version information

........

r5687 | p_lindheimer | 2008-02-09 15:37:15 -0800 (Sat, 09 Feb 2008) | 1 line

Creating release 2.4.0

........

r5701 | p_lindheimer | 2008-02-10 19:50:46 -0800 (Sun, 10 Feb 2008) | 1 line

module_xml needs to be mediumblob to handle larger xml files

........

r5704 | p_lindheimer | 2008-02-11 21:18:49 -0800 (Mon, 11 Feb 2008) | 1 line

#2676 webroot missing from GetOpt?

........

r5710 | p_lindheimer | 2008-02-18 08:51:20 -0800 (Mon, 18 Feb 2008) | 1 line

#2685 - pipe stderr to stdout when running retrieve conf so error messages encountered are included in the output display

........

Files:

• freepbx/trunk (modified) (2 props)
• freepbx/trunk/CHANGES (modified) (1 diff)
• freepbx/trunk/SQL/newinstall.sql (modified) (1 diff)
• freepbx/trunk/SQL/newinstall.sqlite3.sql (modified) (1 diff)
• freepbx/trunk/amp_conf/astetc/cdr_mysql.conf (modified) (1 diff)
• freepbx/trunk/amp_conf/astetc/extensions_custom.conf.sample (modified) (1 diff)
• freepbx/trunk/amp_conf/astetc/features.conf (deleted)
• freepbx/trunk/amp_conf/bin/retrieve_conf (modified) (1 diff)
• freepbx/trunk/amp_conf/bin/retrieve_op_conf_from_mysql.pl (modified) (4 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/extensions.class.php (modified) (7 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php (modified) (5 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/page.modules.php (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs_panel/op_buttons.cfg (modified) (7 diffs)
• freepbx/trunk/buildtools/generate-release.sh (modified) (2 diffs)
• freepbx/trunk/install_amp (modified) (6 diffs)
• freepbx/trunk/upgrades/2.3.0rc1/removefiles.php (deleted)
• freepbx/trunk/upgrades/2.3.0rc1/tables.php (deleted)
• freepbx/trunk/upgrades/2.4.0 (copied) (copied from freepbx/branches/2.4/upgrades/2.4.0)
• freepbx/trunk/upgrades/2.4.0.md5 (copied) (copied from freepbx/branches/2.4/upgrades/2.4.0.md5)
• freepbx/trunk/upgrades/2.4.0beta1.md5 (copied) (copied from freepbx/branches/2.4/upgrades/2.4.0beta1.md5)
• freepbx/trunk/upgrades/2.4.0beta2 (copied) (copied from freepbx/branches/2.4/upgrades/2.4.0beta2)
• freepbx/trunk/upgrades/2.4.0beta2.md5 (copied) (copied from freepbx/branches/2.4/upgrades/2.4.0beta2.md5)
• freepbx/trunk/upgrades/2.4.0beta2/core_migrate.php (copied) (copied from freepbx/branches/2.4/upgrades/2.4.0beta2/core_migrate.php)
• freepbx/trunk/upgrades/2.4.0beta2/tables.php (copied) (copied from freepbx/branches/2.4/upgrades/2.4.0beta2/tables.php)
• freepbx/trunk/upgrades/2.4.0rc1 (copied) (copied from freepbx/branches/2.4/upgrades/2.4.0rc1)
• freepbx/trunk/upgrades/2.4.0rc1.md5 (copied) (copied from freepbx/branches/2.4/upgrades/2.4.0rc1.md5)
• freepbx/trunk/upgrades/2.4.0rc1/core_migrate.php (copied) (copied from freepbx/branches/2.4/upgrades/2.4.0rc1/core_migrate.php)
• freepbx/trunk/upgrades/2.4.0rc1/tables.php (copied) (copied from freepbx/branches/2.4/upgrades/2.4.0rc1/tables.php)

freepbx/trunk/CHANGES

@@ -88 +88 @@
-- Queues and the SIP, IAX2 and ZAP conf file generation has been replaced with proper queues_conf
-  and core_conf classes
+
+- Added partial support for DUNDi via a DUNDi trunk, dundi.conf configuration is still manual
+
+- Support Asterisk 1.6 to the extent that it can be supported as it is in beta at the time of
+  2.4 release. But we will try to keep on top of 1.6 issues.
-
-- Misc other bug fixes and some feature requests that can be obtained through the SVN log.

freepbx/trunk/SQL/newinstall.sql

@@ -332 +332 @@
-  `id` varchar(20) NOT NULL default 'xml',
-  `time` int(11) NOT NULL default '0',
-
+medium
-  PRIMARY KEY  (`id`)
-);

freepbx/trunk/SQL/newinstall.sqlite3.sql

@@ -328 +328 @@
-  `id` varchar(20) NOT NULL default 'xml',
-  `time` int(11) NOT NULL default '0',
-
+medium
-  PRIMARY KEY  (`id`)
-);

freepbx/trunk/amp_conf/astetc/cdr_mysql.conf

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

freepbx/trunk/amp_conf/astetc/extensions_custom.conf.sample

@@ -2 +2 @@
-; extensions_custom.conf should be used to include customizations
-; to AMP's Asterisk dialplan.
-
-; All custom context should contain the string 'custom' in it's name 
-
-; Extensions in AMP have access to the 'from-internal' context.

freepbx/trunk/amp_conf/bin/retrieve_conf

@@ -707 +707 @@
-}
-
+/* As of Asterisk 1.4.16 or there abouts, a missing #include file will make the reload fail. So
+   we need to make sure that we have such for everything that is in our configs. We will simply
+   look for the #include statements and touch the files vs. trying to inventory everything we may
+   need and then forgetting something.
+*/
+
+exec("grep '#include' ".$amp_conf['ASTETCDIR']."/*.conf | sed 's/;.*//; s/#include//'",$output,$retcode);
+if ($retcode != 0) {
+  error("Error code $retcode: trying to search for missing #include files");
+}
+
+foreach($output as $file) {
+  if (trim($file) == '') {
+    continue;
+  }
+  $parse1 = explode(':',$file);
+  $parse2 = explode(';',$parse1[1]);
+  $rawfile = trim($parse2[0]);
+  if ($rawfile == '') {
+    continue;
+  }
+
+  $target = ($rawfile[0] == '/') ? $rawfile : $amp_conf['ASTETCDIR']."/$rawfile";
+
+  if (!file_exists($target)) {
+    exec("touch $target", $output, $retcode);
+    error("Error code $retcode: trying to create empty file $target");
+  }
+}
+
+
-// **** Set reload flag for AMP admin
-needreload();

freepbx/trunk/amp_conf/bin/retrieve_op_conf_from_mysql.pl

@@ -29 +29 @@
-######## STYLE INFO #########
-$extenpos="2-40";
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-# Remove or add Zap trunks as needed
@@ -226 +234 @@
-#Next, populate queues
-@queues=(); 
-extensions
-extensions where application='Queue' and flags <> 1
+queues_config
+queues_config
-    $result = $dbh->selectall_arrayref($statement);
-    @resultSet = @{$result};
@@ -236 +244 @@
-  }
-
+
+## SME server chnges
+
+#Next, populate conferences
+@conferences=();
+  if(table_exists($dbh,"meetme")) {
+    $statement = "SELECT exten,description FROM meetme ORDER BY exten";
+    $result = $dbh->selectall_arrayref($statement);
+                @resultSet = @{$result};
+                if ( $#resultSet == -1 ) {
+                        print "Notice: no Conferences defined\n";
+                }
+                push(@conferences, @{ $result });
+        }
+
+
+#Next, populate parkings
+@parkings=();
+  if(table_exists($dbh,"parkinglot")) {
+    $statement = "SELECT keyword,data FROM parkinglot";
+    $result = $dbh->selectall_arrayref($statement);
+                @resultSet = @{$result};
+                if ( $#resultSet == -1 ) {
+                        print "Notice: no Parkings defined\n";
+                }
+                push(@parkings, @{ $result });
+  }
+
+## End of changes
-#Next, populate trunks (sip and iax)
-@trunklist=();
@@ -353 +390 @@
-  
-  
+  ## SME server changes
+  
+    
+        ### Write Parkings lots
+  $btn=0;
+  my $parken ;
+  my $extpark ;
+  my $parkcontext ;
+  my $numberlots ;
+  foreach my $row ( @parkings ) {
+    if (@{$row}[0] eq "parkingenabled") {
+      $parken = @{$row}[1] ;
+    }
+    if (@{$row}[0] eq "parkext") {
+      $extpark = @{$row}[1] ;
+    }
+    if (@{$row}[0] eq "parkingcontext") {
+      $parkcontext = @{$row}[1] ;
+    }
+    if (@{$row}[0] eq "numslots") {
+      $numberlots = @{$row}[1] ;
+    }
+  }
+  if ($parken eq "s") {
+    for (my $i = 0 ; $i < $numberlots && $i < 5 ; $i++ ) {
+      $btn=get_next_btn($parkingpos,$btn);
+      $parknum = $extpark + $i ;
+      $icon='1';
+      print EXTEN "[PARK$parknum]\nPosition=$btn\nLabel=\"Parked ($parknum)\"\nExtension=$parknum\nContext=$parkcontext\nIcon=$icon\nPanel_Context=$panelcontext\n";
+    }
+  }
+  
+  ## End of chagnes
-  ### Write conferences (meetme)
-

freepbx/trunk/amp_conf/htdocs/admin/extensions.class.php

@@ -94 +94 @@
-  function addInclude($section, $incsection) {
-    $this->_includes[$section][] = $incsection;
+  }
+
+  function addSwitch($section, $incsection) {
+    $this->_switches[$section][] = $incsection;
-  }
-
@@ -187 +191 @@
-          foreach ($this->_includes[$section] as $include) {
-            $output .= "include => ".$include."\n";
+          }
+        }
+        if (isset($this->_switches[$section])) {
+          foreach ($this->_switches[$section] as $include) {
+            $output .= "switch => ".$include."\n";
-          }
-        }
@@ -516 +525 @@
-}
-
+class ext_parkedcall extends extension {
+  function output() {
+    return "ParkedCall(".$this->data.")";
+  }
+}
+
+
-class ext_resetcdr extends extension {
-  function output() {
@@ -574 +590 @@
-}
-
+//      The app_false argument only works with asterisk 1.6
+//
-class ext_execif {
-  var $expr;
-
-
-
-
+
+
+
+
+
+
-    $this->expr = $expr;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-}
@@ -593 +624 @@
-  function output() {
-    return "Set(CALLERID(name)=".$this->data.")";
+  }
+}
+
+class ext_setcallerpres extends extension {
+  function output() {
+    return "SetCallerPres({$this->data})";
-  }
-}
@@ -627 +664 @@
-    else
-      return "Queue(".$this->queuename.",".$this->options.",".$this->optionalurl.",".$this->announceoverride.")";
+  }
+}
+
+class ext_addqueuemember extends extension {
+  var $queue;
+  var $channel;
+  
+  function ext_addqueuemember($queue, $channel){
+    $this->queue = $queue;
+    $this->channel = $channel;
+  }
+  
+  function output() {
+    return "AddQueueMember({$this->queue},{$this->channel})";
+  }
+}
+
+class ext_removequeuemember extends extension {
+  var $queue;
+  var $channel;
+  
+  function ext_removequeuemember($queue, $channel){
+    $this->queue = $queue;
+    $this->channel = $channel;
+  }
+  
+  function output() {
+    return "RemoveQueueMember({$this->queue},{$this->channel})";
+  }
+}
+
+class ext_userevent extends extension {
+  var $eventname;
+  var $body;
+  
+  function ext_userevent($eventname, $body=""){
+    $this->eventname = $eventname;
+    $this->body = $body;
+  }
+  
+  function output() {
+    if ($this->body == '')
+      return "UserEvent({$this->eventname})";
+    else
+      return "UserEvent({$this->eventname},{$this->body})";
+  }
+}
+
+class ext_macroexit extends extension {
+  function output() {
+    return "MacroExit()";
-  }
-}
@@ -1037 +1125 @@
-  }
-}
+
+class ext_setlanguage extends extension {
+  function output() {
+    global $version;
+
+    if (version_compare($version, "1.4", "ge")) {
+      return "Set(CHANNEL(language)={$this->data})";
+    } else {
+      return "Set(LANGUAGE()={$this->data})";
+    }
+  }
+}
+
-
-/* example usage

freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php

@@ -1029 +1029 @@
-      } elseif (preg_match('/Asterisk SVN-trunk-r(-?(\S*))/', $verinfo, $matches)) {
-        return array('engine'=>'asterisk', 'version' => '1.6', 'additional' => $matches[1]);
+      } elseif (preg_match('/Asterisk SVN-.+-(\d+(\.\d+)*)-r(-?(\S*))-(.+)/', $verinfo, $matches)) {
+        return array('engine'=>'asterisk', 'version' => $matches[1], 'additional' => $matches[3]);
-      }
-
@@ -1038 +1040 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1154 +1158 @@
-  }
-  
-
+ 2>&1
-  //exec($retrieve.'&>'.$asterisk_conf['astlogdir'].'/freepbx-retrieve.log', $output, $exit_val);
-  exec($retrieve, $output, $exit_val);
@@ -3315 +3319 @@
-  // Now we have the id and know if this is a firstime install so we can get the announcement
-  //
-$installid
+urlencode($installid)
-
-  if (trim($type) != "") {
-$type
+urlencode($type)
-  }
-  if ($firstinstall) {
@@ -3325 +3329 @@
-  $engver=engine_getinfo();
-  if ($engver['engine'] == 'asterisk') {
-$engver['version']
+urlencode($engver['version'])
-  }
-

freepbx/trunk/amp_conf/htdocs/admin/page.modules.php

@@ -517 +517 @@
-    echo "<a href='config.php?display=modules&amp;type=tool'>"._("Manage local modules")."</a>\n";
-    if (!EXTERNAL_PACKAGE_MANAGEMENT) {
-href='config.php?display=modules&amp;type=tool&amp;online=1'>"._("Check for updates online")."
+class='info' href='config.php?display=modules&amp;type=tool&amp;online=1'>"._("Check for updates online")."<span>"._("Checking for updates will transmit your FreePBX and Asterisk version numbers along with a unique but random identifier. This is used to provide proper update information and track version usage to focus development and maintenance efforts. No private information is transmitted.")."</span>
-    }
-        
@@ -576 +576 @@
-    } else {
-      if (!EXTERNAL_PACKAGE_MANAGEMENT) {
-href='config.php?display=modules&amp;type=tool&amp;online=1'>"._("Check for updates online")."
+class='info' href='config.php?display=modules&amp;type=tool&amp;online=1'>"._("Check for updates online")."<span>"._("Checking for updates will transmit your FreePBX and Asterisk version numbers along with a unique but random identifier. This is used to provide proper update information and track version usage to focus development and maintenance efforts. No private information is transmitted.")."</span>
-      }
-      echo " | <a href='config.php?display=modules&amp;type=tool&amp;extdisplay=upload'>"._("Upload module")."</a><br />\n";

freepbx/trunk/amp_conf/htdocs_panel/op_buttons.cfg

@@ -4 +4 @@
-include => op_buttons_custom.cfg
-
-q
+Q
-[rectangle]
-x=492
-y=32
-244
-278
+491
+111
-line_width=0
-line_color=ff1010
@@ -18 +18 @@
-layer=bottom
-
-parked
+Conferences
-[rectangle]
-736
-32
-247
-278
+492
+144
+491
+111
-line_width=0
-ffff10
-ffff10
+006666
+006666
-fade_color2=a01000
-rnd_border=2
@@ -32 +32 @@
-layer=bottom
-
-trunks
+Parking
-[rectangle]
-x=492
-312
+256
-width=491
-283
+84
-line_width=0
-10
-10
-10ff00
+ff
+ff
+CC9933
-rnd_border=2
-alpha=20
-layer=bottom
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-[rectangle]
-x=-1
@@ -55 +70 @@
-line_color=1010ff
-fade_color1=1010ff
-1010ff
+99CCCC
-rnd_border=2
-alpha=10
@@ -62 +77 @@
-[LEGEND]
-x=500
-15
+42
-text=Trunks
-font_size=18
@@ -69 +84 @@
-
-[LEGEND]
-745
-32
-Parking Lot
+500
+144
+Conferences
-font_size=18
-
+
+
+
+
+
+
+
+
+
-use_embed_fonts=1
-
@@ -91 +114 @@
-font_family=Arial
-use_embed_fonts=1
-
-[PARK71]
-Position=62
-extension=70
-Label="Parked (71)"
-Icon=1
-
-[PARK72]
-Position=63
-extension=70
-Label="Parked (72)"
-Icon=1
-
-[PARK73]
-Position=64
-extension=70
-Label="Parked (73)"
-Icon=1
-
-[PARK74]
-Position=65
-extension=70
-Label="Parked (74)"
-Icon=1
-
-[PARK75]
-Position=66
-extension=70
-Label="Parked (75)"
-Icon=1
-
-[PARK76]
-Position=67
-extension=70
-Label="Parked (76)"
-Icon=1
-
-[PARK77]
-Position=68
-extension=70
-Label="Parked (77)"
-Icon=1
-
-[PARK78]
-Position=69
-extension=70
-Label="Parked (78)"
-Icon=1
-
-[PARK79]
-Position=70
-extension=70
-Label="Parked (79)"
-Icon=1
-

freepbx/trunk/buildtools/generate-release.sh

@@ -11 +11 @@
-framework_url=${module_url}/framework
-dashboard_url=${module_url}/dashboard
+customappsreg_url=${module_url}/customappsreg
-voicemail_url=${module_url}/voicemail
-recordings_url=${module_url}/recordings
@@ -68 +69 @@
-svn cp -m "Automatic packaging of framework with $ver"        $framework_url        http://svn.freepbx.org/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/
-svn cp -m "Automatic packaging of dashboard with $ver"        $dashboard_url        http://svn.freepbx.org/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/
+svn cp -m "Automatic packaging of customappsreg with $ver"    $customappsreg_url    http://svn.freepbx.org/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/
-svn cp -m "Automatic packaging of voicemail with $ver"        $voicemail_url        http://svn.freepbx.org/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/
-svn cp -m "Automatic packaging of recordings with $ver"       $recordings_url       http://svn.freepbx.org/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/

freepbx/trunk/install_amp

@@ -88 +88 @@
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -455 +463 @@
-      if ($up_module != 'framework') {
-        system($amp_conf['AMPBIN']."/module_admin --no-warnings -f install $up_module");
+        system($amp_conf['AMPBIN']."/module_admin --no-warnings -f enable $up_module");
-        out("installed");
-      } else {
@@ -493 +502 @@
-  // If we didn't return above, then we found the package as part of the install
-  // tarball and want to update the version info since this might be overwriting
-d
+
-  //
-  $sql = "SELECT version FROM modules WHERE modulename = '$module'";
@@ -502 +511 @@
-  $sql = "";
-  if (count($result) == 0) {
-
+
+
-  } else if ($result[0] != $version) {
-
+
+
+
+
+
+
+
+
+
+
-  }
-  if ($sql) {
@@ -550 +569 @@
-// **** Parse out command-line options
-$shortopts = "h?u:p:";
-
+webroot=","
-
-$args = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), $shortopts, $longopts);
@@ -838 +857 @@
-    fatal("Asterisk 1.2 or 1.4 is required for this version of FreePBX. Detected version is: ".$matches[1]);
-  }
-
-
-
+
+
+
+
-} elseif (preg_match('/^Asterisk SVN.+/', $verinfo)) {
-  out("FAIL");