Changeset 11528 for freepbx/branches

Timestamp:

02/21/11 14:47:30 (2 years ago)

Author:

p_lindheimer

Message:

closes #4846 adds notification for amportal.conf and no dynamic hints, also adds method to notification class and freepbx_settings

Files:

• freepbx/branches/2.9/amp_conf/bin/retrieve_conf (modified) (1 diff)
• freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/freepbx_conf.class.php (modified) (1 diff)
• freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/notifications.class.php (modified) (1 diff)
• freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/view.functions.php (modified) (2 diffs)

freepbx/branches/2.9/amp_conf/bin/retrieve_conf

@@ -669 +669 @@
-// Now we write on amportal.conf if it is writable, which allows legacy applications in the
-// eco-system to take advantage of the settings.
+// we write out the error message here instead of in freepbx_settings so that we don't hit the db every single page load
-//
-if ($freepbx_conf->amportal_canwrite()) {
-  file_put_contents('/etc/amportal.conf',$freepbx_conf->amportal_generate(true));
+  $nt->delete('framework', 'AMPORTAL_NO_WRITE');
+} elseif (!$nt->exists('framework', 'AMPORTAL_NO_WRITE')) {
+  $nt->add_error('framework', 'AMPORTAL_NO_WRITE', _("amportal.conf not writeable"), _("Your amportal.conf file is not writeable. FreePBX is running in a crippled mode until changed. You can run 'amportal chown' from the Linux command line to rectify this."),true);
+}
+
+// Let's move some more of our checks to retrieve_conf so that we are not constantly checking these on page loads
+//
+
+// Warn about default Manager Interface Password
+//
+if ($amp_conf['AMPMGRPASS'] == $freepbx_conf->get_conf_default_setting('AMPMGRPASS')) {
+  if (!$nt->exists('core', 'AMPMGRPASS')) {
+    $nt->add_warning('core', 'AMPMGRPASS', _("Default Asterisk Manager Password Used"), _("You are using the default Asterisk Manager password that is widely known, you should set a secure password"));
+  }
+} else {
+  $nt->delete('core', 'AMPMGRPASS');
+}
+  
+// Warn about default ARI Admin Password
+//
+if ($amp_conf['ARI_ADMIN_PASSWORD'] == $freepbx_conf->get_conf_default_setting('ARI_ADMIN_PASSWORD')) {
+  if (!$nt->exists('ari', 'ARI_ADMIN_PASSWORD')) {
+    $nt->add_warning('ari', 'ARI_ADMIN_PASSWORD', _("Default ARI Admin password Used"), _("You are using the default ARI Admin password that is widely known, you should change to a new password. Do this in Advanced Settings"));
+  }
+} else {
+  $nt->delete('ari', 'ARI_ADMIN_PASSWORD');
+}
+  
+// Warn about default Database Password
+//
+if ($amp_conf['AMPDBPASS'] == $freepbx_conf->get_conf_default_setting('AMPDBPASS')) {
+  if (!$nt->exists('core', 'AMPDBPASS')) {
+    $nt->add_warning('core', 'AMPDBPASS', _("Default SQL Password Used"), _("You are using the default SQL password that is widely known, you should set a secure password"));
+  }
+} else {
+  $nt->delete('core', 'AMPDBPASS');
+}
+
+// Warn if in deviceanduser mode and not using DYNAMICHINTS
+//
+if ($amp_conf['AMPEXTENSIONS'] == 'deviceanduser' && !$amp_conf['DYNAMICHINTS']) {
+  if (!$nt->exists('framework', 'NO_DYNAMICHINTS')) {
+    $nt->add_warning('framework', 'NO_DYNAMICHINTS', _("Device & User Hints Issue"), _("You are set to Device and User mode but are not set to 'Dynamically Generate Hints' which can result in improper phone state behavior. This can be changed on the Advanced Settings page, check the tooltip for specific configuration details."));
+  }
+} else {
+  $nt->delete('framework', 'NO_DYNAMICHINTS');
-}
-

freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/freepbx_conf.class.php

@@ -536 +536 @@
-  }
-
+  /** Get's the default value of a configuration setting from the database store.
+   *
+   * @param string  The setting to fetch.
+   * @return mixed  returns the default of the setting, or boolean false if the
+   *                setting does not exist. Since configuration booleans are
+   *                returned as '0' and '1', they can be differentiated by a
+   *                true boolean false (use === operator) if a setting does
+   *                not exist.
+   */
+  function get_conf_default_setting($keyword) {
+    if (isset($this->db_conf_store[$keyword])) {
+      return $this->db_conf_store[$keyword]['defaultval'];
+    } else {
+      return false;
+    }
+  }
+
-  /** Reset all conf settings specified int the passed in array to their defaults.
-   *

freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/notifications.class.php

@@ -26 +26 @@
-  }
-
+  function exists($module, $id) {
+    $count = sql("SELECT count(*) FROM notifications WHERE `module` = '$module' AND `id` = '$id'", 'getOne');
+    return ($count);
+  }
-
-  function add_critical($module, $id, $display_text, $extended_text="", $link="", $reset=true, $candelete=false) {

freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/view.functions.php

@@ -4 +4 @@
-  global $amp_conf;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-  
-  // Check and increase php memory_limit if needed and if allowed on the system
@@ -47 +32 @@
-    $nt->delete('core', 'MQGPC');
-  }
+
-}
-