Changeset 10466
- Timestamp:
- 11/01/10 17:06:43 (3 years ago)
- Files:
-
- freepbx/branches/2.5 (modified) (1 prop)
- freepbx/branches/2.5/amp_conf/htdocs/admin/page.modules.php (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
freepbx/branches/2.5
- Property svnmerge-integrated changed from /freepbx/branches/2.4:1-5944 /freepbx/branches/2.6:1-7913,9512 to /freepbx/branches/2.4:1-5944 /freepbx/branches/2.6:1-7913,9512,10465
freepbx/branches/2.5/amp_conf/htdocs/admin/page.modules.php
r7808 r10466 16 16 17 17 // can't go online if external management is on 18 $online = (isset($_REQUEST['online']) && !EXTERNAL_PACKAGE_MANAGEMENT) ? $_REQUEST['online'] : false;18 $online = (isset($_REQUEST['online']) && !EXTERNAL_PACKAGE_MANAGEMENT) ? 1 : 0; 19 19 20 20 // fix php errors from undefined variable. Not sure if we can just change the reference below to use 21 21 // online since it changes values so just setting to what we decided it is here. 22 $_REQUEST['online'] = $online ? 1 : 0;23 22 24 23 $moduleaction = isset($_REQUEST['moduleaction'])?$_REQUEST['moduleaction']:false; … … 121 120 freepbx_modal_hide('moduleBox'); 122 121 if (goback) { 123 location.href = 'config.php?display=modules&type=tool&online=<?php echo ($_REQUEST['online']?1:0); ?>';122 location.href = 'config.php?display=modules&type=<?php echo $type ?>&online=<?php echo $online; ?>'; 124 123 } 125 124 } … … 145 144 if ($module_getonlinexml_error) { 146 145 echo "<div class=\"warning\"><p>".sprintf(_("Warning: Cannot connect to online repository (%s). Online modules are not available."), "mirror.freepbx.org")."</p></div><br />"; 147 $online = false;146 $online = 0; 148 147 unset($modules_online); 149 148 } else if (!is_array($modules_online)) { 150 149 echo "<div class=\"warning\"><p>".sprintf(_("Warning: Error retrieving updates from online repository (%s). Online modules are not available."), "mirror.freepbx.org")."</p></div><br />"; 151 $online = false;150 $online = 0; 152 151 unset($modules_online); 153 152 } else { … … 271 270 echo "\t<a href=\"#\" onclick=\"parent.close_module_actions(true);\" />"._("Return")."</a>"; 272 271 } else { 273 echo "\t<input type=\"button\" value=\""._("Return")."\" onclick=\"location.href = 'config.php?display=modules&type= tool&online=".($_REQUEST['online']?1:0)."';\" />";272 echo "\t<input type=\"button\" value=\""._("Return")."\" onclick=\"location.href = 'config.php?display=modules&type=$type&online=".$online."';\" />"; 274 273 echo "</div>"; 275 274 } … … 416 415 echo "<p>"._("Please select at least one action to perform by clicking on the module, and selecting an action on the \"Action\" tab.")."</p>"; 417 416 } 418 echo "\t<input type=\"button\" value=\""._("Cancel")."\" onclick=\"location.href = 'config.php?display=modules&type= tool&online=".($_REQUEST['online']?1:0)."';\" />";417 echo "\t<input type=\"button\" value=\""._("Cancel")."\" onclick=\"location.href = 'config.php?display=modules&type=$type&online=$online';\" />"; 419 418 echo "</form>"; 420 419
