Changeset 4274

Timestamp:

06/30/07 12:14:09 (1 year ago)

Author:

p_lindheimer

Message:

Merged revisions 4273 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/freepbx/branches/2.3

........

r4273 | p_lindheimer | 2007-06-30 12:12:43 -0700 (Sat, 30 Jun 2007) | 1 line

#2020: change from symlink to copy of agi-bin from modules to address error that occurs on some systems. If you do not want to copy over a modified version, you must change it to remove write access

........

Files:

• freepbx/branches/2.2 (modified) (1 prop)
• freepbx/branches/2.2/amp_conf/bin/retrieve_conf (modified) (3 diffs)

freepbx/branches/2.2/amp_conf/bin/retrieve_conf

@@ -196 +196 @@
-// **** Create symlinks array
-$symlink_dirs = array();
-$symlink_dirs['agi-bin'] = (isset($amp_conf['ASTAGIDIR']) ? $amp_conf['ASTAGIDIR'] : '/var/lib/asterisk/agi-bin');
-$symlink_dirs['sounds'] = (isset($amp_conf['ASTVARLIBDIR']) ? $amp_conf['ASTVARLIBDIR'] : '/var/lib/asterisk').'/sounds';
-$symlink_dirs['bin'] = (isset($amp_conf['AMPBIN']) ? $amp_conf['AMPBIN'] : '/var/lib/asterisk/bin');
-$symlink_dirs['etc'] = (isset($amp_conf['ASTETCDIR']) ? $amp_conf['ASTETCDIR'] : '/etc/asterisk');
+
+$cp_dirs = array();
+$cp_dirs['agi-bin'] = (isset($amp_conf['ASTAGIDIR']) ? $amp_conf['ASTAGIDIR'] : '/var/lib/asterisk/agi-bin');
-
-switch ($db_engine)
@@ -306 +308 @@
-                        // create symlinks for files in appropriate sub directories
-                        symlink_subdirs( $amp_conf['AMPWEBROOT'].'/admin/modules/'.$key );
+                        cp_subdirs( $amp_conf['AMPWEBROOT'].'/admin/modules/'.$key );
-                }
-        }
@@ -429 +432 @@
-}
-
+function cp_subdirs($moduledir) {
+        global $cp_dirs;
+
+        foreach ($cp_dirs as $subdir => $targetdir) {
+                $dir = addslash($moduledir).$subdir;
+                if (is_dir($dir)) {
+                        $d = opendir($dir);
+                        while ($file = readdir($d)) {
+                                if ($file[0] != '.') {
+                                        $sourcefile = addslash($dir).$file;
+                                        $targetfile = addslash($targetdir).$file;
+
+                                        if (file_exists($targetfile)) {
+                                                set_error_handler("report_errors");
+                                                if (is_link($targetfile)) {
+                                                        if (unlink($targetfile)) {
+                                                                freepbx_log('retrieve-conf', 'devel-debug', "$targetfile was symbolic link, unlink successful");
+                                                        } else {
+                                                                restore_error_handler();
+                                                                freepbx_log('retrieve-conf', 'error', "$targetfile is a symblolic link, failed to unlink!");
+                                                                break;
+                                                        }
+                                                }
+                                        }
+                                        // OK, now either the file is a regular file or isn't there, so proceed
+                                        //
+                                        set_error_handler("report_errors");
+                                        if (copy($sourcefile,$targetfile)) {
+                                                freepbx_log('retrieve-conf', 'devel-debug', "$targetfile successfully copied");
+                                        } else {
+                                                freepbx_log('retrieve-conf', 'error', "$targetfile failed to copy from module directory");
+                                        }
+                                        restore_error_handler();
+                                }
+                        }
+                        closedir($d);
+                }
+        }
+}
+
+function report_errors($errno, $errstr, $errfile, $errline) {
+        freepbx_log('retrieve-conf', 'error', "php reported: '".mysql_real_escape_string($errstr)."' after copy or unlink attempt!");
+}
+
+
-
-// run legacy retrieve scripts