Index: /freepbx/tags/2.8.0beta2/amp_conf/htdocs/admin/modules/framework/module.xml
===================================================================
--- /freepbx/tags/2.8.0beta2/amp_conf/htdocs/admin/modules/framework/module.xml (revision 9725)
+++ /freepbx/tags/2.8.0beta2/amp_conf/htdocs/admin/modules/framework/module.xml (revision 9725)
@@ -0,0 +1,70 @@
+
+ framework
+ FreePBX Framework
+ 2.8.0beta2.0
+ FreePBX
+ GPLv2+
+ no
+ no
+
+ *2.8.0beta2.0* #4247, #4264, #4242, #4086, #4183, #4292
+ *2.8.0beta1.3* #4164, #4163, #4106, #4172, #3981, #3914, #3552, #3708, #4134, #4127, #4207, #4188, #4223 Security Vulnerability
+ *2.8.0beta1.2* #4164
+ *2.8.0beta1.1* #4071, #4152, #4158, misc CSS changes
+ *2.8.0beta1.0* bumping to beta
+ *2.8.0.0alpha2.1* #4109, #3375, jquery update to 1.4.2
+ *2.8.0.0alpha2.0* #4110, #4138, #4135, #1798, #4143, #4144
+ *2.8.0.0alpha1.0* #2181, #4110, #3375, #4109, #4123, #4121, #4125, #4126, add jquery.toggleval.js to FreePBX
+ *2.7.0.0* localizations
+ *2.7.0RC1.2* #4068
+ *2.7.0RC1.1* #4057
+ *2.7.0RC1.0* #2839, #3980, #3992, #4024, #4051, #3575
+ *2.7.0beta1.0* #3707, #4007, #3940, #3929, #3974
+ *2.6.0.1* #3971, #3977, #3900, #3987
+ *2.6.0.0* #3885, #3878, #3295, #3883, #3903, #3889
+ *2.6.0RC2.1* #3870
+ *2.6.0RC2.0* #3854
+ *2.6.0RC1.1* #3807, #3843, #3856, #3857
+ *2.6.0RC1.0* #3850, #3837, #3858, #3861, #3678
+ *2.6.0beta2.2* #3840, misc warning fixes
+ *2.6.0beta2.1* #2880, #3291, #3835
+ *2.6.0beta2.0* #3075, #3780, #3559, #3606, #3599, #3642, #3608, #3581, #3266, #3562, #3639, #3305
+ *2.6.0beta1.4* added param to featurecode class function
+ *2.6.0beta1.3* rename moduleauthor to modulepublisher class in css, update CHANGES
+ *2.6.0beta1.2* add sql() def to migration table
+ *2.6.0beta1.1* add trunk migration code to tables.php
+ *2.6.0beta1.0* renamed to beta1
+ *2.6.0beta0.2* packed js library updated
+ *2.6.0beta0.1* changed to pull from 2.6 branch
+ *2.6.0beta0.0* #1957, #3673, #1380, #3680, #3694, #3696, #3698
+ *2.6.0alpha1.2* fix bug introduced from #3660
+ *2.6.0alpha1.1* Friendly Warning re: #3660
+ *2.6.0alpha1.0* Security Vulnerability: #3660; #3324, #3327, #3368, #3380, #3224, #3462, #3446, #3469, #3588, #3592, r7324, #3271, #3449, #3556, #3641, #3513, #3525, #3658, #3490, #3582, #3570, #3264
+ *2.5.1.0* #3271, #3309, localization fixes
+ *2.5.0.1* #2792, #3223, #3225, #3235, #3234, #3242, #3246, #3247, #3248, #3221
+ *2.5.0.0* #3176, #3191, #3204, #3209 - fixes SECURITY VULNERABILITY in CDR Reporting
+ *2.5.0rc3.0* #3145, #3151, #3154, #3155, #3156, #3164, #3166, #3165, #3077, #3170 (DAHDI Support)
+ *2.5.0rc2.4* #3131, #3137 several changes to better cache module data and boost performance of page loads
+ *2.5.0rc2.3* #2750, #3128, #3124, #3134, #3131
+ *2.5.0rc2.2* #3107, #3093, #3090, #3113, $3117
+ *2.5.0rc2.1* #3104 fix some urlencoding/decoding re: #3102 changes
+ *2.5.0rc2.0* #3067, #3086, #3082, #3102
+ *2.5.0rc1.1* published wrong, including rc1.0 additions
+ *2.5.0rc1.0* #2913, #3052 delay_answer schema and CSS fix
+ *2.5.0beta1.2* #3014, #3030, #2992, #3026, #3027
+ *2.5.0beta1.1* #2635, #2792 CDR Reporting pie chart errors, and fix bug introduced by #2963
+ *2.5.0beta1.0* #2854, #2978, #2980, #2981, #2982, #2963, #2985
+ *2.5.0alpha1.2* #2957 fix fatal failure in retrieve_conf from change to splice
+ *2.5.0alpha1.1* #2941, #2924, #1539, #2950, #2944, #2945, #2699, #2686, #2946, #2606, #2772, #2565, #1679
+ *2.5.0alpha1.0* #1628, #1715, #1843, #2497, #2604, #2606, #2609, #2686, #2701, #2703, #2739, #2766, #2777, #2782, #2784, #2793, #2798, #2799, #2809, #2818, #2829, #2843, #2845, #2855, #2862, #2881, #2890, #2891, #2897, #2903, #2910, #2911, #2921, #2924
+ *2.4.0.1* #2843, #2701, #2818, #2784, #2604, #2766, #2798, #2809, #2799, #2685, #2676
+ *2.4.0.0* CHANGELOG TRUNCATED See SVN Repository
+
+
+ This module provides a facility to install bug fixes to the framework code that is not otherwise housed in a module
+
+ setup
+ Basic
+ release/2.8/framework-2.8.0beta2.0.tgz
+ a64bcc3a9678e5f27f9b4cb6e1992a3c
+
Index: /freepbx/tags/2.8.0beta2/amp_conf/htdocs/admin/modules/framework/install.php
===================================================================
--- /freepbx/tags/2.8.0beta2/amp_conf/htdocs/admin/modules/framework/install.php (revision 9488)
+++ /freepbx/tags/2.8.0beta2/amp_conf/htdocs/admin/modules/framework/install.php (revision 9488)
@@ -0,0 +1,112 @@
+'cp -rf' from src: '$src' to dst: '$dst'...details follow
";
+ foreach ($errors as $error) {
+ echo "$error
";
+ }
+}
+
+if (! function_exists('out')) {
+ function out($text) {
+ echo $text."
";
+ }
+}
+
+if (! function_exists('outn')) {
+ function outn($text) {
+ echo $text;
+ }
+}
+
+if (! function_exists('error')) {
+ function error($text) {
+ echo "[ERROR] ".$text."
";
+ }
+}
+
+if (! function_exists('fatal')) {
+ function fatal($text) {
+ echo "[FATAL] ".$text."
";
+ exit(1);
+ }
+}
+
+if (! function_exists('debug')) {
+ function debug($text) {
+ global $debug;
+
+ if ($debug) echo "[DEBUG-preDB] ".$text."
";
+ }
+}
+
+include dirname(__FILE__)."/libfreepbx.install.php";
+
+global $amp_conf;
+global $asterisk_conf;
+
+$debug = false;
+$dryrun = false;
+
+/** verison_compare that works with freePBX version numbers
+ * included here because there are some older versions of functions.inc.php that do not have
+ * it included as it was added during 2.3.0beta1
+ */
+if (!function_exists('version_compare_freepbx')) {
+ function version_compare_freepbx($version1, $version2, $op = null) {
+ $version1 = str_replace("rc","RC", strtolower($version1));
+ $version2 = str_replace("rc","RC", strtolower($version2));
+ if (!is_null($op)) {
+ return version_compare($version1, $version2, $op);
+ } else {
+ return version_compare($version1, $version2);
+ }
+ }
+}
+
+/*
+ * Framework install script
+ */
+
+ $htdocs_source = dirname(__FILE__)."/htdocs/*";
+ $bin_source = dirname(__FILE__)."/bin/*";
+ $agibin_source = dirname(__FILE__)."/agi-bin/*";
+
+ if (!file_exists(dirname($htdocs_source))) {
+ out(sprintf(_("No directory %s, install script not needed"),dirname($htdocs_source)));
+ return true;
+ }
+
+ // These are required by libfreepbx.install.php library for upgrade routines
+ //
+ define("UPGRADE_DIR", dirname(__FILE__)."/upgrades/");
+ define("MODULE_DIR", $amp_conf['AMPWEBROOT'].'/modules/');
+
+ $htdocs_dest = $amp_conf['AMPWEBROOT'];
+ $bin_dest = isset($amp_conf['AMPBIN']) ? $amp_conf['AMPBIN'] : '/var/lib/asterisk/bin';
+ $agibin_dest = isset($asterisk_conf['astagidir']) ? $asterisk_conf['astagidir']:'/var/lib/asterisk/agi-bin';
+
+ exec("cp -rf $htdocs_source $htdocs_dest 2>&1",$out,$ret);
+ if ($ret != 0) {
+ framework_print_errors($htdocs_source, $htdocs_dest, $out);
+ }
+
+ exec("cp -rf $bin_source $bin_dest 2>&1",$out,$ret);
+ if ($ret != 0) {
+ framework_print_errors($bin_source, $bin_dest, $out);
+ }
+
+ exec("cp -rf $agibin_source $agibin_dest 2>&1",$out,$ret);
+ if ($ret != 0) {
+ framework_print_errors($agibin_source, $agibin_dest, $out);
+ }
+
+ if (function_exists('upgrade_all')) {
+ upgrade_all(getversion());
+ } else {
+ echo ("[ERROR] Function: 'upgrade_all' not present, libfreepbx.install.php seems not to be installed
");
+ }
+
+?>