Changeset 10008

Timestamp:

06/30/10 17:59:17 (3 years ago)

Author:

p_lindheimer

Message:

fixes #4388 rename files that will be symlinked since they can end up there from install_amp

Files:

• modules/branches/2.8/fw_fop/install.php (modified) (1 diff)
• modules/branches/2.8/fw_fop/module.xml (modified) (2 diffs)

modules/branches/2.8/fw_fop/install.php

@@ -84 +84 @@
- * fw_fop install script
- */
+
-  $bin_source = dirname(__FILE__)."/bin/*";
-  $bin_dest = $amp_conf['AMPBIN'];
+
+  // These files may get installed from a tarball install. If found and not a symlink to here,
+  // then rename it for a backup copy
+  //
+  $del_array = array("retrieve_op_conf_from_mysql.php");
+  foreach ($del_array as $target) {
+    $file = $bin_dest.'/'.$target; 
+    $count=0;
+    $max_count=1000;
+    if (is_file($file) & !is_link($file)) {
+      outn(_("renaming $target so it can be symlinked.."));
+      while (is_file($file.".".$count)) {
+        $count++;
+        if ($count > $max_count) {
+          break;
+        }
+      }
+      if ($count > $max_count || !rename($file,$file.".".$count)) {
+        out(_("failed"));
+      } else {
+        out(_("ok"));
+      }
+    }
+  }
-
-  $htdocs_panel_source = dirname(__FILE__)."/htdocs_panel/*";

modules/branches/2.8/fw_fop/module.xml

@@ -2 +2 @@
-  <rawname>fw_fop</rawname>
-  <name>FreePBX FOP Framework</name>
-2
+3
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -8 +8 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
+    *2.8.0.3* #4388
-    *2.8.0.2* #4381
-    *2.8.0.1* #4269, remove uninitialized variable