Changeset 13163

Timestamp:

01/05/12 11:59:43 (1 year ago)

Author:

p_lindheimer

Message:

Merged revisions 13090,13103-13104,13106 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.10

........

r13090 | p_lindheimer | 2011-12-17 12:58:41 -0800 (Sat, 17 Dec 2011) | 1 line

closes #5480 remove packaged files, needs testing!

........

r13103 | p_lindheimer | 2011-12-20 16:04:33 -0800 (Tue, 20 Dec 2011) | 1 line

more tweaks re #5480

........

r13104 | p_lindheimer | 2011-12-20 16:06:11 -0800 (Tue, 20 Dec 2011) | 1 line

oops syntax error re #5480

........

r13106 | p_lindheimer | 2011-12-20 16:19:18 -0800 (Tue, 20 Dec 2011) | 1 line

more tweaks re #5480

........

Files:

• modules/branches/2.9 (modified) (2 props)
• modules/branches/2.9/framework/install.php (modified) (4 diffs)

modules/branches/2.9/framework/install.php

@@ -1 +1 @@
-<?php
-
-// HELPER FUNCTIONS:
-
@@ -73 +72 @@
- */
-
-
-
-
+
+
+
+
-
-  if (!file_exists(dirname($htdocs_source))) {
@@ -91 +91 @@
-  $agibin_dest = isset($asterisk_conf['astagidir']) ? $asterisk_conf['astagidir']:'/var/lib/asterisk/agi-bin';
-
+  $msg = _("installing files to %s..");
+
+  $out = array();
+  outn(sprintf($msg, $htdocs_dest));
-  exec("cp -rf $htdocs_source $htdocs_dest 2>&1",$out,$ret);
-  if ($ret != 0) {
-    framework_print_errors($htdocs_source, $htdocs_dest, $out);
+    out(_("done, see errors below"));
+  } else {
+    out(_("done"));
-  }
-
+
+  unset($out);
+  outn(sprintf($msg, $bin_dest));
-  exec("cp -rf $bin_source $bin_dest 2>&1",$out,$ret);
-  if ($ret != 0) {
-    framework_print_errors($bin_source, $bin_dest, $out);
+    out(_("done, see errors below"));
+  } else {
+    out(_("done"));
-  }
-
+  unset($out);
+  outn(sprintf($msg, $agibin_dest));
-  exec("cp -rf $agibin_source $agibin_dest 2>&1",$out,$ret);
-  if ($ret != 0) {
-    framework_print_errors($agibin_source, $agibin_dest, $out);
+    out(_("done, see errors below"));
+  } else {
+    out(_("done"));
-  }
-
@@ -126 +144 @@
-  }
-
+  // We now delete the files, this makes sure that if someone had an unprotected system where they have not enabled
+  // the .htaccess files or otherwise allowed direct access, that these files are not around to possibly cause problems
+  //
+  out(_("framework file install done, removing packages from module"));
+
+  $base_source = dirname(__FILE__);
+  $htdocs_source = $base_source . "/htdocs/*";
+  $bin_source = $base_source . "/bin/*";
+  $agibin_source = $base_source . "/agi-bin/*";
+
+  $rem_files[] = $base_source . '/htdocs';
+  $rem_files[] = $base_source . '/bin';
+  $rem_files[] = $base_source . '/agi-bin';
+  $rem_files[] = $base_source . '/upgrades';
+  $rem_files[] = $base_source . '/libfreepbx.install.php';
+   
+  foreach ($rem_files as $target) {
+    unset($out);
+    exec("rm -rf $target 2>&1",$out,$ret);
+    if ($ret != 0) {
+      out(sprintf(_("an error occured removing the packaged file/directory: %s"), $target));
+    } else {
+      out(sprintf(_("file/directory: %s removed successfully"), $target));
+    }
+  }
+
-?>