Changeset 10649 for freepbx/branches

Timestamp:

12/05/10 13:44:38 (2 years ago)

Author:

mbrevda

Message:

re #4566 - merge revisions to BS branch

Files:

• freepbx/branches/bootstrap (modified) (1 prop)
• freepbx/branches/bootstrap/amp_conf/bin/generate_hints.php (modified) (1 diff)
• freepbx/branches/bootstrap/amp_conf/htdocs/admin/functions.inc.php (modified) (1 diff)
• freepbx/branches/bootstrap/amp_conf/htdocs/admin/page.modules.php (modified) (6 diffs)

freepbx/branches/bootstrap/amp_conf/bin/generate_hints.php

@@ -61 +61 @@
-
-  $device_array = explode( '&', $devices );
+  $dialstring = ''; 
-  foreach ($device_array as $adevice) {
-    $dds = $astman->database_get('DEVICE',$adevice.'/dial');

freepbx/branches/bootstrap/amp_conf/htdocs/admin/functions.inc.php

@@ -155 +155 @@
-        return array('engine'=>'asterisk', 'version' => $matches[1].'.'.$matches[4], 'additional' => $matches[4], 'raw' => $verinfo);
-      } elseif (preg_match('/Asterisk SVN-trunk-r(-?(\S*))/', $verinfo, $matches)) {
-6
+8
-      } elseif (preg_match('/Asterisk SVN-.+-(\d+(\.\d+)*)-r(-?(\S*))-(.+)/', $verinfo, $matches)) {
-        return array('engine'=>'asterisk', 'version' => $matches[1], 'additional' => $matches[3], 'raw' => $verinfo);

freepbx/branches/bootstrap/amp_conf/htdocs/admin/page.modules.php

@@ -14 +14 @@
-
-$extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:'';
-$_REQUEST['module_repo']
+htmlentities($_REQUEST['module_repo'])
-$repo = "http://mirror.freepbx.org/";
-if ($module_repo == "extended") {
@@ -21 +21 @@
-
-// can't go online if external management is on
-$_REQUEST['online'] : false
+1 : 0
-
-// fix php errors from undefined variable. Not sure if we can just change the reference below to use
-// online since it changes values so just setting to what we decided it is here.
-$_REQUEST['online'] = $online ? 1 : 0;
-
-$moduleaction = isset($_REQUEST['moduleaction'])?$_REQUEST['moduleaction']:false;
@@ -126 +125 @@
-    freepbx_modal_hide('moduleBox');
-    if (goback) {
-($_REQUEST['online']?1:0)
+$online
-    }
-  }
@@ -153 +152 @@
-  if ($module_getonlinexml_error) {
-    echo "<div class=\"warning\"><p>".sprintf(_("Warning: Cannot connect to online repository (%s). Online modules are not available."), "mirror.freepbx.org")."</p></div><br />";
-false
+0
-    unset($modules_online);
-  } else if (!is_array($modules_online)) {
-    echo "<div class=\"warning\"><p>".sprintf(_("Warning: Error retrieving updates from online repository (%s). Online modules are not available."), "mirror.freepbx.org")."</p></div><br />";
-false
+0
-    unset($modules_online);
-  } else {
@@ -280 +279 @@
-      echo "\t<a href=\"#\" onclick=\"parent.close_module_actions(true);\" />"._("Return")."</a>";
-    } else {
-($_REQUEST['online']?1:0)
+$online
-    echo "</div>";
-    }
@@ -447 +446 @@
-      echo "<p>"._("Please select at least one action to perform by clicking on the module, and selecting an action on the \"Action\" tab.")."</p>";
-    }
-".($_REQUEST['online']?1:0)."
+$online
-    echo "</form>";
-