@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -$xoopsOption['nocommon'] = 1 ; |
|
| 4 | -define('_LEGACY_PREVENT_LOAD_CORE_', true) ; |
|
| 5 | -require '../../mainfile.php' ; |
|
| 3 | +$xoopsOption['nocommon'] = 1; |
|
| 4 | +define('_LEGACY_PREVENT_LOAD_CORE_', true); |
|
| 5 | +require '../../mainfile.php'; |
|
| 6 | 6 | |
| 7 | -header('Location: '.XOOPS_URL.'/user.php') ; |
|
| 7 | +header('Location: '.XOOPS_URL.'/user.php'); |
|
@@ -1,2 +1,2 @@ |
||
| 1 | 1 | <?php |
| 2 | - $mytrustdirname = 'altsys' ; |
|
| 2 | + $mytrustdirname = 'altsys'; |
|
@@ -201,41 +201,41 @@ |
||
| 201 | 201 | } |
| 202 | 202 | } |
| 203 | 203 | switch ($block_arr[$i]->getVar('side')) { |
| 204 | - case XOOPS_SIDEBLOCK_LEFT: |
|
| 205 | - if (!isset($show_lblock)) { |
|
| 206 | - $xoopsTpl->assign('xoops_showlblock', 1); |
|
| 207 | - $show_lblock = 1; |
|
| 208 | - } |
|
| 209 | - $xoopsTpl->append('xoops_lblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight'))); |
|
| 210 | - break; |
|
| 211 | - case XOOPS_CENTERBLOCK_LEFT: |
|
| 212 | - if (!isset($show_cblock)) { |
|
| 213 | - $xoopsTpl->assign('xoops_showcblock', 1); |
|
| 214 | - $show_cblock = 1; |
|
| 215 | - } |
|
| 216 | - $xoopsTpl->append('xoops_clblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight'))); |
|
| 217 | - break; |
|
| 218 | - case XOOPS_CENTERBLOCK_RIGHT: |
|
| 219 | - if (!isset($show_cblock)) { |
|
| 220 | - $xoopsTpl->assign('xoops_showcblock', 1); |
|
| 221 | - $show_cblock = 1; |
|
| 222 | - } |
|
| 223 | - $xoopsTpl->append('xoops_crblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight'))); |
|
| 224 | - break; |
|
| 225 | - case XOOPS_CENTERBLOCK_CENTER: |
|
| 226 | - if (!isset($show_cblock)) { |
|
| 227 | - $xoopsTpl->assign('xoops_showcblock', 1); |
|
| 228 | - $show_cblock = 1; |
|
| 229 | - } |
|
| 230 | - $xoopsTpl->append('xoops_ccblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight'))); |
|
| 231 | - break; |
|
| 232 | - case XOOPS_SIDEBLOCK_RIGHT: |
|
| 233 | - if (!isset($show_rblock)) { |
|
| 234 | - $xoopsTpl->assign('xoops_showrblock', 1); |
|
| 235 | - $show_rblock = 1; |
|
| 236 | - } |
|
| 237 | - $xoopsTpl->append('xoops_rblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight'))); |
|
| 238 | - break; |
|
| 204 | + case XOOPS_SIDEBLOCK_LEFT: |
|
| 205 | + if (!isset($show_lblock)) { |
|
| 206 | + $xoopsTpl->assign('xoops_showlblock', 1); |
|
| 207 | + $show_lblock = 1; |
|
| 208 | + } |
|
| 209 | + $xoopsTpl->append('xoops_lblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight'))); |
|
| 210 | + break; |
|
| 211 | + case XOOPS_CENTERBLOCK_LEFT: |
|
| 212 | + if (!isset($show_cblock)) { |
|
| 213 | + $xoopsTpl->assign('xoops_showcblock', 1); |
|
| 214 | + $show_cblock = 1; |
|
| 215 | + } |
|
| 216 | + $xoopsTpl->append('xoops_clblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight'))); |
|
| 217 | + break; |
|
| 218 | + case XOOPS_CENTERBLOCK_RIGHT: |
|
| 219 | + if (!isset($show_cblock)) { |
|
| 220 | + $xoopsTpl->assign('xoops_showcblock', 1); |
|
| 221 | + $show_cblock = 1; |
|
| 222 | + } |
|
| 223 | + $xoopsTpl->append('xoops_crblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight'))); |
|
| 224 | + break; |
|
| 225 | + case XOOPS_CENTERBLOCK_CENTER: |
|
| 226 | + if (!isset($show_cblock)) { |
|
| 227 | + $xoopsTpl->assign('xoops_showcblock', 1); |
|
| 228 | + $show_cblock = 1; |
|
| 229 | + } |
|
| 230 | + $xoopsTpl->append('xoops_ccblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight'))); |
|
| 231 | + break; |
|
| 232 | + case XOOPS_SIDEBLOCK_RIGHT: |
|
| 233 | + if (!isset($show_rblock)) { |
|
| 234 | + $xoopsTpl->assign('xoops_showrblock', 1); |
|
| 235 | + $show_rblock = 1; |
|
| 236 | + } |
|
| 237 | + $xoopsTpl->append('xoops_rblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight'))); |
|
| 238 | + break; |
|
| 239 | 239 | } |
| 240 | 240 | unset($bcontent); |
| 241 | 241 | } |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | // This is a mimic file from header.php of 2.0.16-JP |
| 21 | 21 | |
| 22 | -require_once dirname(__DIR__).'/class/AltsysBreadcrumbs.class.php' ; |
|
| 22 | +require_once dirname(__DIR__).'/class/AltsysBreadcrumbs.class.php'; |
|
| 23 | 23 | include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php'; |
| 24 | 24 | |
| 25 | 25 | $xoopsOption['theme_use_smarty'] = 1; |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | //HACK by domifara |
| 49 | 49 | if (defined('XOOPS_CUBE_LEGACY')) { |
| 50 | 50 | $handler = xoops_getHandler('block'); |
| 51 | - $xoopsblock = $handler->create(false) ; |
|
| 51 | + $xoopsblock = $handler->create(false); |
|
| 52 | 52 | } else { |
| 53 | 53 | $xoopsblock = new XoopsBlock(); |
| 54 | 54 | } |
@@ -58,46 +58,46 @@ discard block |
||
| 58 | 58 | if (is_object($xoopsUser)) { |
| 59 | 59 | $xoopsTpl->assign(array('xoops_isuser' => true, 'xoops_userid' => $xoopsUser->getVar('uid'), 'xoops_uname' => $xoopsUser->getVar('uname'), 'xoops_isadmin' => $xoopsUserIsAdmin)); |
| 60 | 60 | if (is_object(@$xoopsModule)) { |
| 61 | - if ($xoopsModule->getVar('mid') == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && ! empty($_GET['mod'])) { |
|
| 62 | - $module_handler = xoops_getHandler('module') ; |
|
| 63 | - $target_module = $module_handler->get((int)$_GET['mod']) ; |
|
| 61 | + if ($xoopsModule->getVar('mid') == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && !empty($_GET['mod'])) { |
|
| 62 | + $module_handler = xoops_getHandler('module'); |
|
| 63 | + $target_module = $module_handler->get((int)$_GET['mod']); |
|
| 64 | 64 | } else { |
| 65 | - $target_module = $xoopsModule ; |
|
| 65 | + $target_module = $xoopsModule; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | // set page title |
| 69 | 69 | $xoopsTpl->assign(array('xoops_pagetitle' => $target_module->getVar('name'), 'xoops_modulename' => $target_module->getVar('name'), 'xoops_dirname' => $target_module->getVar('dirname'))); |
| 70 | 70 | |
| 71 | 71 | // xoops_breadcrumbs |
| 72 | - $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ; |
|
| 72 | + $breadcrumbsObj = AltsysBreadcrumbs::getInstance(); |
|
| 73 | 73 | if ($breadcrumbsObj->hasPaths()) { |
| 74 | - $xoops_breadcrumbs = $breadcrumbsObj->getXoopsBreadcrumbs() ; |
|
| 74 | + $xoops_breadcrumbs = $breadcrumbsObj->getXoopsBreadcrumbs(); |
|
| 75 | 75 | } else { |
| 76 | - $mod_url = XOOPS_URL.'/modules/'.$target_module->getVar('dirname') ; |
|
| 77 | - $mod_path = XOOPS_ROOT_PATH.'/modules/'.$target_module->getVar('dirname') ; |
|
| 78 | - $modinfo =& $target_module->getInfo() ; |
|
| 79 | - $xoops_breadcrumbs = array() ; |
|
| 80 | - if (! empty($modinfo['hasMain'])) { |
|
| 76 | + $mod_url = XOOPS_URL.'/modules/'.$target_module->getVar('dirname'); |
|
| 77 | + $mod_path = XOOPS_ROOT_PATH.'/modules/'.$target_module->getVar('dirname'); |
|
| 78 | + $modinfo = & $target_module->getInfo(); |
|
| 79 | + $xoops_breadcrumbs = array(); |
|
| 80 | + if (!empty($modinfo['hasMain'])) { |
|
| 81 | 81 | $xoops_breadcrumbs[] = array( |
| 82 | - 'url' => $mod_url.'/' , |
|
| 82 | + 'url' => $mod_url.'/', |
|
| 83 | 83 | 'name' => sprintf(_MD_A_AINTHEME_FMT_PUBLICTOP, $target_module->getVar('name')) |
| 84 | - ) ; |
|
| 84 | + ); |
|
| 85 | 85 | } |
| 86 | - if (! empty($modinfo['adminindex'])) { |
|
| 86 | + if (!empty($modinfo['adminindex'])) { |
|
| 87 | 87 | $xoops_breadcrumbs[] = array( |
| 88 | - 'url' => $mod_url.'/'.$modinfo['adminindex'] , |
|
| 88 | + 'url' => $mod_url.'/'.$modinfo['adminindex'], |
|
| 89 | 89 | 'name' => sprintf(_MD_A_AINTHEME_FMT_ADMINTOP, $target_module->getVar('name')) |
| 90 | - ) ; |
|
| 90 | + ); |
|
| 91 | 91 | } |
| 92 | - if (! empty($GLOBALS['altsysAdminPageTitle'])) { |
|
| 93 | - $xoops_breadcrumbs[] = array( 'name' => htmlspecialchars($GLOBALS['altsysAdminPageTitle'], ENT_QUOTES) ) ; |
|
| 94 | - } elseif (! empty($modinfo['adminmenu'])) { |
|
| 95 | - @include $mod_path.'/'.$modinfo['adminmenu'] ; |
|
| 92 | + if (!empty($GLOBALS['altsysAdminPageTitle'])) { |
|
| 93 | + $xoops_breadcrumbs[] = array('name' => htmlspecialchars($GLOBALS['altsysAdminPageTitle'], ENT_QUOTES)); |
|
| 94 | + } elseif (!empty($modinfo['adminmenu'])) { |
|
| 95 | + @include $mod_path.'/'.$modinfo['adminmenu']; |
|
| 96 | 96 | if (is_array(@$adminmenu)) { |
| 97 | 97 | foreach ($adminmenu as $eachmenu) { |
| 98 | 98 | if (strstr($_SERVER['REQUEST_URI'], $eachmenu['link'])) { |
| 99 | - $xoops_breadcrumbs[] = array( 'name' => $eachmenu['title'] ) ; |
|
| 100 | - break ; |
|
| 99 | + $xoops_breadcrumbs[] = array('name' => $eachmenu['title']); |
|
| 100 | + break; |
|
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | } |
@@ -106,21 +106,21 @@ discard block |
||
| 106 | 106 | |
| 107 | 107 | //$block_arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), $target_module->getVar('mid'), false, XOOPS_BLOCK_VISIBLE); |
| 108 | 108 | } else { |
| 109 | - $xoopsTpl->assign(array( 'xoops_pagetitle' => _CPHOME )) ; |
|
| 109 | + $xoopsTpl->assign(array('xoops_pagetitle' => _CPHOME)); |
|
| 110 | 110 | $xoops_breadcrumbs = array( |
| 111 | 111 | array( |
| 112 | - 'url' => XOOPS_URL.'/admin.php' , |
|
| 112 | + 'url' => XOOPS_URL.'/admin.php', |
|
| 113 | 113 | 'name' => _CPHOME |
| 114 | 114 | ) |
| 115 | - ) ; |
|
| 115 | + ); |
|
| 116 | 116 | } |
| 117 | 117 | } else { |
| 118 | - exit ; |
|
| 118 | + exit; |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | // get block_arr |
| 122 | - $db = XoopsDatabaseFactory::getDatabaseConnection() ; |
|
| 123 | - $sql = 'SELECT DISTINCT gperm_itemid FROM ' . $db->prefix('group_permission') . " WHERE gperm_name = 'block_read' AND gperm_modid = 1 AND gperm_groupid IN (" . implode(',', $xoopsUser->getGroups()) . ')'; |
|
| 122 | + $db = XoopsDatabaseFactory::getDatabaseConnection(); |
|
| 123 | + $sql = 'SELECT DISTINCT gperm_itemid FROM '.$db->prefix('group_permission')." WHERE gperm_name = 'block_read' AND gperm_modid = 1 AND gperm_groupid IN (".implode(',', $xoopsUser->getGroups()).')'; |
|
| 124 | 124 | $result = $db->query($sql); |
| 125 | 125 | |
| 126 | 126 | $blockids = array(); |
@@ -128,30 +128,30 @@ discard block |
||
| 128 | 128 | $blockids[] = (int)$blockid; |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - global $block_arr , $i ; // for piCal :-) |
|
| 132 | - $block_arr = array() ; |
|
| 131 | + global $block_arr, $i; // for piCal :-) |
|
| 132 | + $block_arr = array(); |
|
| 133 | 133 | if (!empty($blockids)) { |
| 134 | - $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid AND b.isactive=1 AND b.visible=1 AND m.module_id=' . (int)$altsysModuleId |
|
| 135 | - . ' AND b.bid IN (' . implode(',', $blockids) . ') ORDER BY b.weight,b.bid' ; |
|
| 134 | + $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid AND b.isactive=1 AND b.visible=1 AND m.module_id='.(int)$altsysModuleId |
|
| 135 | + . ' AND b.bid IN ('.implode(',', $blockids).') ORDER BY b.weight,b.bid'; |
|
| 136 | 136 | $result = $db->query($sql); |
| 137 | 137 | while ($myrow = $db->fetchArray($result)) { |
| 138 | 138 | |
| 139 | 139 | //HACK by domifara |
| 140 | 140 | if (defined('XOOPS_CUBE_LEGACY')) { |
| 141 | - $block = $handler->create(false) ; |
|
| 141 | + $block = $handler->create(false); |
|
| 142 | 142 | $block->assignVars($myrow); |
| 143 | 143 | } else { |
| 144 | - $block = new XoopsBlock($myrow) ; |
|
| 144 | + $block = new XoopsBlock($myrow); |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - $block_arr[ $myrow['bid'] ] = $block ; |
|
| 147 | + $block_arr[$myrow['bid']] = $block; |
|
| 148 | 148 | } |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | - $adminmenublock_exists = false ; |
|
| 151 | + $adminmenublock_exists = false; |
|
| 152 | 152 | foreach (array_keys($block_arr) as $i) { |
| 153 | 153 | if ($block_arr[$i]->getVar('show_func') == 'b_altsys_admin_menu_show') { |
| 154 | - $adminmenublock_exists = true ; |
|
| 154 | + $adminmenublock_exists = true; |
|
| 155 | 155 | } |
| 156 | 156 | $bcachetime = $block_arr[$i]->getVar('bcachetime'); |
| 157 | 157 | if (empty($bcachetime)) { |
@@ -232,15 +232,15 @@ discard block |
||
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | // FALLBACK inserting admin_menu_block in admin side |
| 235 | - if (! $adminmenublock_exists) { |
|
| 236 | - require_once XOOPS_ROOT_PATH.'/modules/altsys/blocks/blocks.php' ; |
|
| 237 | - $admin_menu_block = array( b_altsys_admin_menu_show(array( 'altsys' )) ) ; |
|
| 238 | - $admin_menu_block[0]['title'] = 'Admin Menu' ; |
|
| 239 | - $lblocks =& $xoopsTpl->get_template_vars('xoops_lblocks') ; |
|
| 240 | - if (! is_array($lblocks)) { |
|
| 241 | - $lblocks = array() ; |
|
| 235 | + if (!$adminmenublock_exists) { |
|
| 236 | + require_once XOOPS_ROOT_PATH.'/modules/altsys/blocks/blocks.php'; |
|
| 237 | + $admin_menu_block = array(b_altsys_admin_menu_show(array('altsys'))); |
|
| 238 | + $admin_menu_block[0]['title'] = 'Admin Menu'; |
|
| 239 | + $lblocks = & $xoopsTpl->get_template_vars('xoops_lblocks'); |
|
| 240 | + if (!is_array($lblocks)) { |
|
| 241 | + $lblocks = array(); |
|
| 242 | 242 | } |
| 243 | - $xoopsTpl->assign('xoops_lblocks', array_merge($admin_menu_block, $lblocks)) ; |
|
| 243 | + $xoopsTpl->assign('xoops_lblocks', array_merge($admin_menu_block, $lblocks)); |
|
| 244 | 244 | } |
| 245 | 245 | |
| 246 | 246 | //unset($block_arr); |
@@ -281,17 +281,17 @@ |
||
| 281 | 281 | $edits = array(); |
| 282 | 282 | foreach ($diff as $line) { |
| 283 | 283 | switch ($line[0]) { |
| 284 | - case ' ': |
|
| 285 | - $edits[] = new Text_Diff_Op_copy(array(substr($line, 1))); |
|
| 286 | - break; |
|
| 284 | + case ' ': |
|
| 285 | + $edits[] = new Text_Diff_Op_copy(array(substr($line, 1))); |
|
| 286 | + break; |
|
| 287 | 287 | |
| 288 | - case '+': |
|
| 289 | - $edits[] = new Text_Diff_Op_add(array(substr($line, 1))); |
|
| 290 | - break; |
|
| 288 | + case '+': |
|
| 289 | + $edits[] = new Text_Diff_Op_add(array(substr($line, 1))); |
|
| 290 | + break; |
|
| 291 | 291 | |
| 292 | - case '-': |
|
| 293 | - $edits[] = new Text_Diff_Op_delete(array(substr($line, 1))); |
|
| 294 | - break; |
|
| 292 | + case '-': |
|
| 293 | + $edits[] = new Text_Diff_Op_delete(array(substr($line, 1))); |
|
| 294 | + break; |
|
| 295 | 295 | } |
| 296 | 296 | } |
| 297 | 297 | |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | } |
| 466 | 466 | |
| 467 | 467 | $this->lcs = 0; |
| 468 | - $this->seq[0]= $yoff - 1; |
|
| 468 | + $this->seq[0] = $yoff - 1; |
|
| 469 | 469 | $this->in_seq = array(); |
| 470 | 470 | $ymids[0] = array(); |
| 471 | 471 | |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | } |
| 479 | 479 | } |
| 480 | 480 | |
| 481 | - $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks); |
|
| 481 | + $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks); |
|
| 482 | 482 | for (; $x < $x1; $x++) { |
| 483 | 483 | $line = $flip ? $this->yv[$x] : $this->xv[$x]; |
| 484 | 484 | if (empty($ymatches[$line])) { |
@@ -646,7 +646,7 @@ discard block |
||
| 646 | 646 | $j++; |
| 647 | 647 | } |
| 648 | 648 | |
| 649 | - while ($i < $len && ! $changed[$i]) { |
|
| 649 | + while ($i < $len && !$changed[$i]) { |
|
| 650 | 650 | assert('$j < $other_len && ! $other_changed[$j]'); |
| 651 | 651 | $i++; |
| 652 | 652 | $j++; |
@@ -5,20 +5,20 @@ |
||
| 5 | 5 | // save assigned variables for the template |
| 6 | 6 | function tplsadmin_save_tplsvars($file, $smarty) |
| 7 | 7 | { |
| 8 | - $tplsvars_file = 'tplsvars_' ; |
|
| 9 | - $tplsvars_file .= substr(md5(substr(XOOPS_DB_PASS, 0, 4)), 0, 4) . '_' ; |
|
| 8 | + $tplsvars_file = 'tplsvars_'; |
|
| 9 | + $tplsvars_file .= substr(md5(substr(XOOPS_DB_PASS, 0, 4)), 0, 4).'_'; |
|
| 10 | 10 | if (strncmp($file, 'db:', 3) === 0) { |
| 11 | - $tplsvars_file .= substr($file, 3) ; |
|
| 11 | + $tplsvars_file .= substr($file, 3); |
|
| 12 | 12 | } elseif (strncmp($file, 'file:', 5) === 0) { |
| 13 | - $tplsvars_file .= strtr(substr($file, 5), '/', '%') ; |
|
| 13 | + $tplsvars_file .= strtr(substr($file, 5), '/', '%'); |
|
| 14 | 14 | } else { |
| 15 | - $tplsvars_file .= strtr($file, '/', '%') ; |
|
| 15 | + $tplsvars_file .= strtr($file, '/', '%'); |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | if ($fw = @fopen(XOOPS_COMPILE_PATH.'/'.$tplsvars_file, 'x')) { |
| 19 | - fwrite($fw, serialize($smarty->_tpl_vars)) ; |
|
| 20 | - fclose($fw) ; |
|
| 21 | - return true ; |
|
| 19 | + fwrite($fw, serialize($smarty->_tpl_vars)); |
|
| 20 | + fclose($fw); |
|
| 21 | + return true; |
|
| 22 | 22 | } |
| 23 | - return false ; |
|
| 23 | + return false; |
|
| 24 | 24 | } |
@@ -24,10 +24,10 @@ discard block |
||
| 24 | 24 | public function _blockHeader($xbeg, $xlen, $ybeg, $ylen) |
| 25 | 25 | { |
| 26 | 26 | if ($xlen != 1) { |
| 27 | - $xbeg .= ',' . $xlen; |
|
| 27 | + $xbeg .= ','.$xlen; |
|
| 28 | 28 | } |
| 29 | 29 | if ($ylen != 1) { |
| 30 | - $ybeg .= ',' . $ylen; |
|
| 30 | + $ybeg .= ','.$ylen; |
|
| 31 | 31 | } |
| 32 | 32 | return "@@ -$xbeg +$ybeg @@"; |
| 33 | 33 | } |
@@ -44,6 +44,6 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | public function _changed($orig, $final) |
| 46 | 46 | { |
| 47 | - return $this->_deleted($orig) . $this->_added($final); |
|
| 47 | + return $this->_deleted($orig).$this->_added($final); |
|
| 48 | 48 | } |
| 49 | 49 | } |
@@ -1,21 +1,21 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -require_once XOOPS_ROOT_PATH.'/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php' ; |
|
| 4 | -require_once XOOPS_TRUST_PATH.'/libs/altsys/include/altsys_functions.php' ; |
|
| 5 | -require_once XOOPS_TRUST_PATH.'/libs/altsys/include/admin_in_theme_functions.php' ; |
|
| 3 | +require_once XOOPS_ROOT_PATH.'/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php'; |
|
| 4 | +require_once XOOPS_TRUST_PATH.'/libs/altsys/include/altsys_functions.php'; |
|
| 5 | +require_once XOOPS_TRUST_PATH.'/libs/altsys/include/admin_in_theme_functions.php'; |
|
| 6 | 6 | |
| 7 | 7 | class Legacy_AltsysAdminRenderSystem extends Legacy_AdminRenderSystem |
| 8 | 8 | { |
| 9 | 9 | public function renderTheme(&$target) |
| 10 | 10 | { |
| 11 | - global $altsysModuleConfig ; |
|
| 11 | + global $altsysModuleConfig; |
|
| 12 | 12 | |
| 13 | 13 | if (empty($altsysModuleConfig['admin_in_theme'])) { |
| 14 | - parent::renderTheme($target) ; |
|
| 14 | + parent::renderTheme($target); |
|
| 15 | 15 | } else { |
| 16 | - $attributes = $target->getAttributes() ; |
|
| 17 | - altsys_admin_in_theme_in_last($attributes['xoops_contents']) ; |
|
| 18 | - exit ; |
|
| 16 | + $attributes = $target->getAttributes(); |
|
| 17 | + altsys_admin_in_theme_in_last($attributes['xoops_contents']); |
|
| 18 | + exit; |
|
| 19 | 19 | } |
| 20 | 20 | } |
| 21 | 21 | } |
@@ -72,14 +72,14 @@ discard block |
||
| 72 | 72 | if ($this->_split_level == 'words') { |
| 73 | 73 | return implode('', $lines); |
| 74 | 74 | } else { |
| 75 | - return implode("\n", $lines) . "\n"; |
|
| 75 | + return implode("\n", $lines)."\n"; |
|
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | public function _added($lines) |
| 80 | 80 | { |
| 81 | 81 | array_walk($lines, array(&$this, '_encode')); |
| 82 | - $lines[0] = $this->_ins_prefix . $lines[0]; |
|
| 82 | + $lines[0] = $this->_ins_prefix.$lines[0]; |
|
| 83 | 83 | $lines[count($lines) - 1] .= $this->_ins_suffix; |
| 84 | 84 | return $this->_lines($lines, ' ', false); |
| 85 | 85 | } |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | public function _deleted($lines, $words = false) |
| 88 | 88 | { |
| 89 | 89 | array_walk($lines, array(&$this, '_encode')); |
| 90 | - $lines[0] = $this->_del_prefix . $lines[0]; |
|
| 90 | + $lines[0] = $this->_del_prefix.$lines[0]; |
|
| 91 | 91 | $lines[count($lines) - 1] .= $this->_del_suffix; |
| 92 | 92 | return $this->_lines($lines, ' ', false); |
| 93 | 93 | } |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | $orig[0] = substr($orig[0], 1); |
| 106 | 106 | $final[0] = substr($final[0], 1); |
| 107 | 107 | } |
| 108 | - return $prefix . $this->_deleted($orig) . $this->_added($final); |
|
| 108 | + return $prefix.$this->_deleted($orig).$this->_added($final); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | $text1 = implode("\n", $orig); |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | array('split_level' => 'words'))); |
| 126 | 126 | |
| 127 | 127 | /* Run the diff and get the output. */ |
| 128 | - return str_replace($nl, "\n", $renderer->render($diff)) . "\n"; |
|
| 128 | + return str_replace($nl, "\n", $renderer->render($diff))."\n"; |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | public function _splitOnWords($string, $newlineEscape = "\n") |
@@ -131,21 +131,21 @@ |
||
| 131 | 131 | |
| 132 | 132 | foreach ($edits as $edit) { |
| 133 | 133 | switch (strtolower(get_class($edit))) { |
| 134 | - case 'text_diff_op_copy': |
|
| 135 | - $output .= $this->_context($edit->orig); |
|
| 136 | - break; |
|
| 134 | + case 'text_diff_op_copy': |
|
| 135 | + $output .= $this->_context($edit->orig); |
|
| 136 | + break; |
|
| 137 | 137 | |
| 138 | - case 'text_diff_op_add': |
|
| 139 | - $output .= $this->_added($edit->final); |
|
| 140 | - break; |
|
| 138 | + case 'text_diff_op_add': |
|
| 139 | + $output .= $this->_added($edit->final); |
|
| 140 | + break; |
|
| 141 | 141 | |
| 142 | - case 'text_diff_op_delete': |
|
| 143 | - $output .= $this->_deleted($edit->orig); |
|
| 144 | - break; |
|
| 142 | + case 'text_diff_op_delete': |
|
| 143 | + $output .= $this->_deleted($edit->orig); |
|
| 144 | + break; |
|
| 145 | 145 | |
| 146 | - case 'text_diff_op_change': |
|
| 147 | - $output .= $this->_changed($edit->orig, $edit->final); |
|
| 148 | - break; |
|
| 146 | + case 'text_diff_op_change': |
|
| 147 | + $output .= $this->_changed($edit->orig, $edit->final); |
|
| 148 | + break; |
|
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | public function __construct($params = array()) |
| 37 | 37 | { |
| 38 | 38 | foreach ($params as $param => $value) { |
| 39 | - $v = '_' . $param; |
|
| 39 | + $v = '_'.$param; |
|
| 40 | 40 | if (isset($this->$v)) { |
| 41 | 41 | $this->$v = $value; |
| 42 | 42 | } |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | $block); |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - return $output . $this->_endDiff(); |
|
| 125 | + return $output.$this->_endDiff(); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | public function _block($xbeg, $xlen, $ybeg, $ylen, &$edits) |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - return $output . $this->_endBlock(); |
|
| 152 | + return $output.$this->_endBlock(); |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | public function _startDiff() |
@@ -165,18 +165,18 @@ discard block |
||
| 165 | 165 | public function _blockHeader($xbeg, $xlen, $ybeg, $ylen) |
| 166 | 166 | { |
| 167 | 167 | if ($xlen > 1) { |
| 168 | - $xbeg .= ',' . ($xbeg + $xlen - 1); |
|
| 168 | + $xbeg .= ','.($xbeg + $xlen - 1); |
|
| 169 | 169 | } |
| 170 | 170 | if ($ylen > 1) { |
| 171 | - $ybeg .= ',' . ($ybeg + $ylen - 1); |
|
| 171 | + $ybeg .= ','.($ybeg + $ylen - 1); |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg; |
|
| 174 | + return $xbeg.($xlen ? ($ylen ? 'c' : 'd') : 'a').$ybeg; |
|
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | public function _startBlock($header) |
| 178 | 178 | { |
| 179 | - return $header . "\n"; |
|
| 179 | + return $header."\n"; |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | public function _endBlock() |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | |
| 187 | 187 | public function _lines($lines, $prefix = ' ') |
| 188 | 188 | { |
| 189 | - return $prefix . implode("\n$prefix", $lines) . "\n"; |
|
| 189 | + return $prefix.implode("\n$prefix", $lines)."\n"; |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | public function _context($lines) |
@@ -206,6 +206,6 @@ discard block |
||
| 206 | 206 | |
| 207 | 207 | public function _changed($orig, $final) |
| 208 | 208 | { |
| 209 | - return $this->_deleted($orig) . "---\n" . $this->_added($final); |
|
| 209 | + return $this->_deleted($orig)."---\n".$this->_added($final); |
|
| 210 | 210 | } |
| 211 | 211 | } |