Changeset 4423
- Timestamp:
- 07/17/07 19:30:19 (6 years ago)
- Files:
-
- modules/branches/2.3/framework/install.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.3/framework/install.php
r4380 r4423 1 1 <?php 2 2 3 include_once( "libfreepbx.install.php") === false)|| outn(_("ERROR: libfreepbx.install.php not included with framework, version upgrades will not be executed"));3 include_once(dirname(__FILE__)."/libfreepbx.install.php") === false || outn(_("ERROR: libfreepbx.install.php not included with framework, version upgrades will not be executed")); 4 4 5 5 global $amp_conf; … … 16 16 $bin_source = dirname(__FILE__)."/bin/*"; 17 17 $agibin_source = dirname(__FILE__)."/agi-bin/*"; 18 $htdocs_panel_source = dirname(__FILE__)."/htdocs_panel/*"; 18 19 19 20 // These are required by libfreepbx.install.php library for upgrade routines … … 25 26 $bin_dest = isset($amp_conf['AMPBIN']) ? $amp_conf['AMPBIN'] : '/var/lib/asterisk/bin'; 26 27 $agibin_dest = isset($asterisk_conf['astagidir']) ? $asterisk_conf['astagidir']:'/var/lib/asterisk/agi-bin'; 28 29 // There was a past bug where FOPWEBROOT was pointing to AMPWEBROOT so if that is the case then hardcode 30 // and force to panel here. 31 // 32 $htdocs_panel_dest = $amp_conf['FOPWEBROOT']; 33 if ($htdocs_panel_dest == $amp_conf['AMPWEBROOT']) { 34 $htdocs_panel_dest .= "/panel"; 35 } 27 36 28 37 exec("cp -rf $htdocs_source $htdocs_dest 2>&1",$out,$ret); … … 41 50 } 42 51 43 if (function_exists('upgrade_all') { 52 exec("cp -rf $htdocs_panel_source $htdocs_panel_dest 2>&1",$out,$ret); 53 if ($ret != 0) { 54 framework_print_errors($htdocs_panel_source, $htdocs_panel_dest, $out); 55 } 56 57 if (function_exists('upgrade_all')) { 44 58 upgrade_all(getversion()); 45 59 }
