mambax7 /
waiting
| Conditions | 9 |
| Paths | 1 |
| Total Lines | 63 |
| Code Lines | 46 |
| Lines | 0 |
| Ratio | 0 % |
| Changes | 1 | ||
| Bugs | 0 | Features | 0 |
Small methods make your code easier to understand, in particular if combined with a good name. Besides, if your method is small, finding a good name is usually much easier.
For example, if you find yourself adding comments to a method's body, this is usually a good sign to extract the commented part to a new method, and use the comment as a starting point when coming up with a good name for this new method.
Commonly applied refactorings include:
If many parameters/temporary variables are present:
| 1 | <?php |
||
| 32 | function xoops_module_update_waiting($module, $version) |
||
| 33 | { |
||
| 34 | return true; // force return - following code is really only needed for XOOPS < 2.3 |
||
| 35 | // Keep Block option values when update (by nobunobu) |
||
| 36 | $mid = $module->mid(); |
||
| 37 | if ($mid) { |
||
| 38 | $configHandler = xoops_getHandler('config'); |
||
| 39 | $waitingModuleConfig = $configHandler->getConfigsByCat(0, $mid); |
||
| 40 | |||
| 41 | $count = count($waitingModuleConfig['blocks']); |
||
| 42 | |||
| 43 | /** @var \XoopsBlockHandler $blockHandler */ |
||
| 44 | $blockHandler = xoops_getHandler('block'); |
||
| 45 | $criteria = new \CriteriaCompo(); |
||
| 46 | $criteria->add(new \Criteria('mid', $mid)); |
||
| 47 | $criteria->add(new \Criteria('block_type', 'D')); |
||
| 48 | $criteria->add(new \Criteria('func_num', $count, '>')); |
||
| 49 | $blockObjs = $blockHandler->getAll($criteria); |
||
| 50 | |||
| 51 | foreach ($blockObjs as $blockObj) { |
||
| 52 | $local_msgs[] = "Non Defined Block <b>{$fblock['name']}</b> will be deleted"; |
||
| 53 | $success = $blockHandler->delete($blockObj); // remove the invalid block |
||
| 54 | } |
||
| 55 | |||
| 56 | $fieldsArray = ['func_num', 'name', 'options']; |
||
| 57 | $criteria = new \CriteriaCompo(); |
||
| 58 | $criteria->add(new \Criteria('mid', $mid)); |
||
| 59 | // $criteria->add(new \Criteria('func_num', $i)); |
||
| 60 | $criteria->add(new \Criteria('show_func'), addslashes($waitingModuleConfig['blocks'][$i]['show_func'])); |
||
| 61 | $criteria->add(new \Criteria('func_file', addslashes($waitingModuleConfig['blocks'][$i]['file']))); |
||
| 62 | $fblockObjs = $blockHandler->getObjects($criteria); |
||
| 63 | foreach ($fblockObjs as $fblockObj) { |
||
| 64 | if (!empty($fblockObj->options())) { |
||
| 65 | $old_vals = explode('|', $fblockObj->getVar('options')); |
||
| 66 | $def_vals = explode('|', $modversion['blocks'][$fblockObj->getVar('func_num')]['options']); |
||
| 67 | if (count($old_vals) == count($def_vals)) { |
||
| 68 | $modversion['blocks'][$fblock->getVar('func_num')]['options'] = $fblockObj->getVar('options'); |
||
| 69 | $local_msgs[] = "Option's values of the block <b>" . $fblockObj->getVar('name') . '</b> will be kept. (value = <b>' . $fblockObj->getVar('options') . '</b>)'; |
||
| 70 | } elseif (count($old_vals) < count($def_vals)) { |
||
| 71 | $def_vals = array_merge($old_vals, $def_vals); //merges prev. values with new - older are preserved |
||
| 72 | $modversion['blocks'][$fblockObj->getVar('func_num')]['options'] = implode('|', $def_vals); |
||
| 73 | $local_msgs[] = "Option's values of the block " |
||
| 74 | . '<b>' |
||
| 75 | . $fblockObj->getVar('name') |
||
| 76 | . '</b> ' |
||
| 77 | . 'will be kept and new option(s) are added. (value = ' |
||
| 78 | . '<b>' |
||
| 79 | . $waitingModuleConfig['blocks'][$fblockObj->getVar('options')] |
||
| 80 | . '</b>)'; |
||
| 81 | } else { |
||
| 82 | $local_msgs[] = "Option's values of the block " . '<b>' . $fblockObj->getVar('name') . '</b> ' . 'will be reset to the default, because of some decrease of options. (value = ' . '<b>' . $waitingModuleConfig['blocks'][$fblockObj->getVar('func_num')]['options'] . '</b>)'; |
||
| 83 | } |
||
| 84 | } |
||
| 85 | } |
||
| 86 | } |
||
| 87 | |||
| 88 | global $msgs, $myblocksadmin_parsed_updateblock; |
||
| 89 | if (!empty($msgs) && empty($myblocksadmin_parsed_updateblock)) { |
||
| 90 | $msgs = array_merge($msgs, $local_msgs); |
||
| 91 | $myblocksadmin_parsed_updateblock = true; |
||
| 92 | } |
||
| 93 | |||
| 94 | return true; //@todo: for now force success - eventually send 'actual' results |
||
| 95 | } |
||
| 96 |
Loading history...
This check looks for parameters that have been defined for a function or method, but which are not used in the method body.