Changeset 10468
- Timestamp:
- 11/01/10 17:10:18 (3 years ago)
- Files:
-
- freepbx/branches/2.3 (modified) (1 prop)
- freepbx/branches/2.3/amp_conf/htdocs/admin/page.modules.php (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
freepbx/branches/2.3
- Property svnmerge-integrated changed from /freepbx/branches/2.2:1-4145,4434,4437 /freepbx/branches/2.4:1-5454,5492,5517,5648,5656,5710,5828,6057,6564,6700,9514 to /freepbx/branches/2.2:1-4145,4434,4437 /freepbx/branches/2.4:1-5454,5492,5517,5648,5656,5710,5828,6057,6564,6700,9514,10467
freepbx/branches/2.3/amp_conf/htdocs/admin/page.modules.php
r5724 r10468 16 16 $extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:''; 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 // fix php errors from undefined variable. Not sure if we can just change the reference below to use 20 20 // online since it changes values so just setting to what we decided it is here. 21 $_REQUEST['online'] = $online ? 1 : 0;22 21 $moduleaction = isset($_REQUEST['moduleaction'])?$_REQUEST['moduleaction']:false; 23 22 /* … … 139 138 freepbx_modal_hide('moduleBox'); 140 139 if (goback) { 141 location.href = 'config.php?display=modules&type=tool&online=<?php echo ($_REQUEST['online']?1:0); ?>';140 location.href = 'config.php?display=modules&type=<?php echo $type ?>&online=<?php echo $online; ?>'; 142 141 } 143 142 } … … 165 164 if ($module_getonlinexml_error) { 166 165 echo "<div class=\"warning\"><p>".sprintf(_("Warning: Cannot connect to online repository (%s). Online modules are not available."), "mirror.freepbx.org")."</p></div><br />"; 167 $online = false;166 $online = 0; 168 167 unset($modules_online); 169 168 } else if (!is_array($modules_online)) { 170 169 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 />"; 171 $online = false;170 $online = 0; 172 171 unset($modules_online); 173 172 } else { … … 374 373 echo "\t<a href=\"#\" onclick=\"parent.close_module_actions(true);\" />"._("Return")."</a>"; 375 374 } else { 376 echo "\t<input type=\"button\" value=\""._("Return")."\" onclick=\"location.href = 'config.php?display=modules&type= tool&online=".($_REQUEST['online']?1:0)."';\" />";375 echo "\t<input type=\"button\" value=\""._("Return")."\" onclick=\"location.href = 'config.php?display=modules&type=$type&online=".$online."';\" />"; 377 376 echo "</div>"; 378 377 } … … 509 508 echo "<p>"._("Please select at least one action to perform by clicking on the module, and selecting an action on the \"Action\" tab.")."</p>"; 510 509 } 511 echo "\t<input type=\"button\" value=\""._("Cancel")."\" onclick=\"location.href = 'config.php?display=modules&type= tool&online=".($_REQUEST['online']?1:0)."';\" />";510 echo "\t<input type=\"button\" value=\""._("Cancel")."\" onclick=\"location.href = 'config.php?display=modules&type=$type&online=$online';\" />"; 512 511 echo "</form>"; 513 512
