Index: /modules/branches/2.10/paging/functions.inc.php
===================================================================
--- /modules/branches/2.10/paging/functions.inc.php (revision 12965)
+++ /modules/branches/2.10/paging/functions.inc.php (revision 12969)
@@ -11,8 +11,5 @@
 
 function paging_get_config($engine) {
-	global $db;
-	global $ext; 
-	global $chan_dahdi;
-  global $version;
+	global $db, $ext, $chan_dahdi, $version, $amp_conf;
 	switch($engine) {
 		case "asterisk":
@@ -38,5 +35,5 @@
 			$callinfo  = 'Call-Info: <uri>\;answer-after=0';
 			$sipuri    = 'intercom=true';
-			//$doptions = 'A(beep)';
+			$doptions = '';//'A(beep)';
 			$vxml_url = '';
 			$dtime = '5';
Index: /modules/branches/2.10/timeconditions/functions.inc.php
===================================================================
--- /modules/branches/2.10/timeconditions/functions.inc.php (revision 12543)
+++ /modules/branches/2.10/timeconditions/functions.inc.php (revision 12969)
@@ -666,7 +666,7 @@
 //these are the users time selections for the current timegroup
 function timeconditions_timegroups_get_times($timegroup, $convert=false) {
-	global $db;
-	global $version;
-
+	global $db, $version;
+	$tmparray = array();
+	
   if ($convert && (!isset($version) || $version == '')) {
     $engineinfo = engine_getinfo();
Index: /modules/branches/2.10/iaxsettings/functions.inc.php
===================================================================
--- /modules/branches/2.10/iaxsettings/functions.inc.php (revision 12698)
+++ /modules/branches/2.10/iaxsettings/functions.inc.php (revision 12969)
@@ -153,5 +153,5 @@
         unset($codecs);
 
-        if ($interim_settings['videosupport'] == 'yes') {
+        if (isset($interim_settings['videosupport']) && $interim_settings['videosupport'] == 'yes') {
           asort($video_codecs);
           foreach ($video_codecs as $codec => $enabled) {
@@ -165,41 +165,46 @@
         /* next figure out what we need to write out (deal with things like nat combos, etc. */
 
-        $jitterbuffer = $interim_settings['jitterbuffer'];
-        if (is_array($interim_settings)) foreach ($interim_settings as $key => $value) {
-          switch ($key) {
-            case 'videosupport':
-            break;
-
-            case 'maxjitterbuffer':
-            case 'maxjitterinterps':
-            case 'resyncthreshold':
-            case 'forcejitterbuffer':
-              if ($jitterbuffer == 'yes' && $value != '') {
-                $iax_settings[] = array($key, $value);
-              }
-            break;
-
-            case 'bandwidth':
-              if ($value != 'unset') {
-                $iax_settings[] = array($key, $value);
-              }
-            break;
-
-            case 'iax_language':
-              if ($value != '') {
-                $iax_settings[] = array('language', $value);
-              }
-            break;
-
-            default:
-              $iax_settings[] = array($key, $value);
-            }
-          }
-          unset($interim_settings);
-          if (is_array($iax_settings)) foreach ($iax_settings as $entry) {
+        $jitterbuffer = isset($interim_settings['jitterbuffer']) && $interim_settings['jitterbuffer'] 
+						? $interim_settings['jitterbuffer'] : '';
+        if (isset($interim_settings) && is_array($interim_settings)){
+			 foreach ($interim_settings as $key => $value) {
+	          switch ($key) {
+	            case 'videosupport':
+	            break;
+
+	            case 'maxjitterbuffer':
+	            case 'maxjitterinterps':
+	            case 'resyncthreshold':
+	            case 'forcejitterbuffer':
+	              if ($jitterbuffer == 'yes' && $value != '') {
+	                $iax_settings[] = array($key, $value);
+	              }
+	            break;
+
+	            case 'bandwidth':
+	              if ($value != 'unset') {
+	                $iax_settings[] = array($key, $value);
+	              }
+	            break;
+
+	            case 'iax_language':
+	              if ($value != '') {
+	                $iax_settings[] = array('language', $value);
+	              }
+	            break;
+
+	            default:
+	              $iax_settings[] = array($key, $value);
+	            }
+	          }
+		}
+        unset($interim_settings);
+          if (isset($iax_settings) && is_array($iax_settings)){
+			foreach ($iax_settings as $entry) {
             if ($entry[1] != '') {
               $core_conf->addIaxGeneral($entry[0],$entry[1]);
             }
           }
+		} 
       }
     break;
Index: /modules/branches/2.10/backup/page.backup.php
===================================================================
--- /modules/branches/2.10/backup/page.backup.php (revision 12956)
+++ /modules/branches/2.10/backup/page.backup.php (revision 12969)
@@ -62,5 +62,5 @@
 		}
 
-		ob_start();
+		ob_start($amp_conf['buffering_callback']);
 		header('Content-Type: text/event-stream');
 		header('Cache-Control: no-cache');
Index: /modules/branches/2.10/core/functions.inc.php
===================================================================
--- /modules/branches/2.10/core/functions.inc.php (revision 12967)
+++ /modules/branches/2.10/core/functions.inc.php (revision 12969)
@@ -769,5 +769,6 @@
 		} else {
 		  $display = 'trunks';
-		  return array('description' => sprintf(_('Trunk: %s (%s)'),$thisexten['name'],$thisexten['tech']),
+			$name = isset($thisexten['name']) && $thisexten['name'] ? $thisexten['name'] : '';
+		  return array('description' => sprintf(_('Trunk: %s (%s)'),$name,$thisexten['tech']),
 		              'edit_url' => "config.php?type=setup&display=$display&extdisplay=OUT_".urlencode($exten),
 							    );
Index: /modules/branches/2.10/ivr/functions.inc.php
===================================================================
--- /modules/branches/2.10/ivr/functions.inc.php (revision 12535)
+++ /modules/branches/2.10/ivr/functions.inc.php (revision 12969)
@@ -39,4 +39,5 @@
 			//draw a list of ivrs included by any queues
 			$queues = queues_list(true);
+			$qivr = array();
 			foreach ($queues as $q) {
 				$thisq = queues_get($q[0]);
@@ -637,5 +638,5 @@
 		} else {
 			//$type = isset($active_modules['ivr']['type'])?$active_modules['ivr']['type']:'setup';
-			return array('description' => sprintf(_("IVR: %s"), ($result['name'] ? $result['name'] : $result['id'])),
+			return array('description' => sprintf(_("IVR: %s"), ($thisexten['name'] ? $thisexten['name'] : $thisexten['id'])),
 			             'edit_url' => 'config.php?display=ivr&action=edit&id='.urlencode($exten),
 								  );
Index: /modules/branches/2.10/queues/functions.inc.php
===================================================================
--- /modules/branches/2.10/queues/functions.inc.php (revision 12515)
+++ /modules/branches/2.10/queues/functions.inc.php (revision 12969)
@@ -434,5 +434,5 @@
 					$options = 't';
 					if ($ast_ge_18) {
-						if ($q['answered_elsewhere'] == '1'){
+						if (isset($q['answered_elsewhere']) && $q['answered_elsewhere'] == '1'){
 							$options .= 'C';
 						}
@@ -562,5 +562,5 @@
 					// Add routing vector to direct which context call should go
 					//
-					$agent_context = $q['use_queue_context'] ? $queue_context : 'from-internal';
+					$agent_context = isset($q['use_queue_context']) && $q['use_queue_context'] && isset($queue_context) ? $queue_context : 'from-internal';
 					switch ($q['use_queue_context']) {
 						case 1: