Changeset 6492

Timestamp:

08/27/08 22:37:13 (3 months ago)

Author:

p_lindheimer

Message:

Merged revisions 6458-6459,6461-6490 via svnmerge from
http://svn.freepbx.org/freepbx/branches/2.5

........

r6462 | p_lindheimer | 2008-08-24 20:37:24 -0700 (Sun, 24 Aug 2008) | 1 line

Creating release 2.5.0rc2

........

r6474 | p_lindheimer | 2008-08-25 12:06:13 -0700 (Mon, 25 Aug 2008) | 1 line

fixes #3104 - looks like some of the code paths do extra urlencodes/decodes - this looks like it does it

........

r6477 | p_lindheimer | 2008-08-25 15:26:43 -0700 (Mon, 25 Aug 2008) | 1 line

fixes #3107 don't include module specific css/js files twice in some circumstances

........

r6478 | sasargen | 2008-08-26 05:30:34 -0700 (Tue, 26 Aug 2008) | 1 line

fixes #3104 - removes manual urlencode of checkbox values because they are form fields and are automatically urlencoded by the browser when the form is submitted

........

r6483 | p_lindheimer | 2008-08-26 12:15:04 -0700 (Tue, 26 Aug 2008) | 1 line

closes #3093 reset the execution time limit to the system configured limit before each module download and install so downloading many modules at once does not result in a timeout failure, this still counts on a reasonable php.ini setting for any given installation of which the default is typically adeqaute

........

r6484 | p_lindheimer | 2008-08-26 19:06:13 -0700 (Tue, 26 Aug 2008) | 1 line

closes #3113 and ref #3090 - puts error in notification panel if magic_quotes_gpc is enabled

........

r6486 | p_lindheimer | 2008-08-27 11:40:19 -0700 (Wed, 27 Aug 2008) | 1 line

improve the symlink failure message to provide feedback on what can be done to resolve the issue

........

r6490 | p_lindheimer | 2008-08-27 22:29:03 -0700 (Wed, 27 Aug 2008) | 1 line

updated CHANGES

........

Files:

• freepbx/trunk (modified) (1 prop)
• freepbx/trunk/CHANGES (modified) (1 diff)
• freepbx/trunk/amp_conf/bin/retrieve_conf (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/common/db_connect.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/freepbx.php (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/modules/callmonitor.module (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/modules/voicemail.module (modified) (1 diff)
• freepbx/trunk/upgrades/2.5.0rc2.md5 (copied) (copied from freepbx/branches/2.5/upgrades/2.5.0rc2.md5)

freepbx/trunk/CHANGES

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- WARNING: The separation of directdid and other incoming routes has been removed.
- this has resulted in the obsoletion of the following API call:

freepbx/trunk/amp_conf/bin/retrieve_conf

@@ -576 +576 @@
-        }
-        if ($error_modules) {
-
+. If the target file exists, the symlink will not occur and you should rename the target file to allow the automatic sym link to occur and remove this error, unless this is an intentional customization.
-        } else {
-                $nt->delete('retrieve_conf', 'SYMLINK');

freepbx/trunk/amp_conf/htdocs/admin/common/db_connect.php

@@ -94 +94 @@
-}
-
+// send error if magic_quotes_gpc is enabled on this system as much of the code base assumes not
+//
+if(get_magic_quotes_gpc()) {
+        $nt->add_error('core', 'MQGPC', _("Magic Quotes GPC"), _("You have magic_quotes_gpc enabled in your php.ini, http or .htaccess file which will cause errors in some modules. FreePBX expects this to be off and runs under that assumption"));
+} else {
+        $nt->delete('core', 'MQGPC');
+}

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

@@ -2672 +2672 @@
-function module_download($modulename, $force = false, $progress_callback = null, $override_svn = false, $override_xml = false) { 
-        global $amp_conf;
+
+        if ($time_limit = ini_get('max_execution_time')) {
+                set_time_limit($time_limit);
+        }
-        
-        // size of download blocks to fread()
@@ -2927 +2931 @@
- */
-function module_install($modulename, $force = false) {
+        global $db, $amp_conf;
+
+        if ($time_limit = ini_get('max_execution_time')) {
+                set_time_limit($time_limit);
+        }
+
-        $modules = module_getinfo($modulename);
-        global $db, $amp_conf;
-        
-        // make sure we have a directory, to begin with

freepbx/trunk/amp_conf/htdocs/admin/views/freepbx.php

@@ -76 +76 @@
-                        echo "\t".'<link href="'.$_SERVER['PHP_SELF'].'?handler=file&amp;module='.$module_name.'&amp;file='.$module_name.'.css" rel="stylesheet" type="text/css">'."\n";
-                }
-
+($module_page != $module_name) && 
-                        echo "\t".'<link href="'.$_SERVER['PHP_SELF'].'?handler=file&amp;module='.$module_name.'&amp;file='.$module_page.'.css" rel="stylesheet" type="text/css">'."\n";
-                }
@@ -82 +82 @@
-                        echo "\t".'<script type="text/javascript" src="'.$_SERVER['PHP_SELF'].'?handler=file&amp;module='.$module_name.'&amp;file='.$module_name.'.js"></script>'."\n";
-                }
-
+($module_page != $module_name) && 
-                        echo "\t".'<script type="text/javascript" src="'.$_SERVER['PHP_SELF'].'?handler=file&amp;module='.$module_name.'&amp;file='.$module_page.'.js"></script>'."\n";
-                }

freepbx/trunk/amp_conf/htdocs/recordings/modules/callmonitor.module

@@ -208 +208 @@
-      // recording file
-      $recording = $recordings[$value['uniqueid'] . $value['calldate']];
-
+
+
-
-      // date and time
@@ -217 +218 @@
-      // recording delete checkbox
-      if ($CALLMONITOR_ALLOW_DELETE) {
-recording
+file
-      }
-

freepbx/trunk/amp_conf/htdocs/recordings/modules/voicemail.module

@@ -408 +408 @@
-        }
-
-urlencode($crypt->encrypt($file,$ARI_CRYPT_PASSWORD)
+$crypt->encrypt($file,$ARI_CRYPT_PASSWORD
-
-        $tableText .= "