Changeset 5837

Timestamp:

06/27/08 14:46:05 (2 months ago)

Author:

p_lindheimer

Message:

Merged revisions 5836 via svnmerge from
http://svn.freepbx.org/freepbx/trunk

........

r5836 | p_lindheimer | 2008-06-27 14:44:53 -0700 (Fri, 27 Jun 2008) | 1 line

SYMLINK notification should print all file errors it finds, warning banner in auto-generated conf files needs an option to not print it as some conf files do not use the ';' syntax

........

Files:

• freepbx/branches/2.4 (modified) (1 prop)
• freepbx/branches/2.4/amp_conf/bin/retrieve_conf (modified) (5 diffs)

freepbx/branches/2.4/amp_conf/bin/retrieve_conf

@@ -453 +453 @@
-                                foreach(${$classname}->get_filename() as $modconf) {
-                                        freepbx_log('retrieve_conf', 'devel-debug', 'generateConf from '.$classname.'->'.$modconf.'');
-
+
+
+
+
+
-                                }
-                        } else {
-                                freepbx_log('retrieve_conf', 'devel-debug', 'generateConf from '.$classname);
-
+
+
+
+
+
-                        }
-                }
@@ -464 +472 @@
-
-
-
+,$use_warning_banner=true
-        global $asterisk_conf;
-        freepbx_log('retrieve_conf', 'devel-debug', 'Writing '.$filename);
-        if (isset($filename) && !empty($filename)) {
-                if ($fd = fopen(addslash($asterisk_conf['astetcdir']).$filename, "w")) {
-
+
+
+
-                        fwrite($fd, $contents);
-                        fclose($fd);
@@ -507 +517 @@
-        $nt = notifications::create($db);
-
+        $error_modules = '';
-        foreach ($symlink_dirs as $subdir => $targetdir) {
-                $dir = addslash($moduledir).$subdir;
@@ -518 +529 @@
-                                                if (!is_link($dest)) {
-                                                        freepbx_log('retrieve-conf', 'error', $dest.' already exists, and is not a symlink!');
-nt->add_error('retrieve_conf', 'SYMLINK', _("symlink from modules failed"), sprintf(_("retrieve_conf failed to sym link the %s file from modules"),$dest))
+error_modules .= "<br />&nbsp;&nbsp;&nbsp;".$dest
-                                                        $symlink_errors = true;
-                                                } else if (readlink($dest) != $src) {
-                                                        // TODO : is this the proper handling? should we just overwrite..?
-                                                        freepbx_log('retrieve-conf', 'error', $dest.' already exists, and is linked to something else!');
-nt->add_error('retrieve_conf', 'SYMLINK', _("symlink from modules failed"), sprintf(_("retrieve_conf failed to sym link the %s file from modules"),$dest))
+error_modules .= "<br />&nbsp;&nbsp;&nbsp;".$dest
-                                                        $symlink_errors = true;
-                                                } else {
@@ -544 +555 @@
-                }
-        }
-
+
+
+
-                $nt->delete('retrieve_conf', 'SYMLINK');
-        }