evolution-cms /
evolution
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 3 | 3 | die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
|
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes |
| 7 | 7 | |
| 8 | -if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
|
|
| 8 | +if ($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
|
|
| 9 | 9 | // seems to be a new install - send the user to the configuration page |
| 10 | 10 | exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
|
| 11 | 11 | } |
@@ -16,50 +16,50 @@ discard block |
||
| 16 | 16 | $_SESSION['nrnewmessages'] = 0; |
| 17 | 17 | |
| 18 | 18 | // setup message info |
| 19 | -if($modx->hasPermission('messages')) {
|
|
| 20 | - include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php'); |
|
| 19 | +if ($modx->hasPermission('messages')) {
|
|
| 20 | + include_once(MODX_MANAGER_PATH.'includes/messageCount.inc.php'); |
|
| 21 | 21 | $_SESSION['nrtotalmessages'] = $nrtotalmessages; |
| 22 | 22 | $_SESSION['nrnewmessages'] = $nrnewmessages; |
| 23 | 23 | |
| 24 | 24 | $msg = array(); |
| 25 | 25 | $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
|
| 26 | - $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : ''; |
|
| 26 | + $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">'.$_SESSION['nrnewmessages'].'</span>)' : ''; |
|
| 27 | 27 | $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold"> <a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
|
| 28 | - $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0'; |
|
| 28 | + $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">'.$_SESSION['nrnewmessages'].'</span>' : '0'; |
|
| 29 | 29 | $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages); |
| 30 | 30 | $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
|
| 31 | 31 | $ph['MessageInfo'] = implode("\n", $msg);
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | // setup icons |
| 35 | -if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
|
|
| 35 | +if ($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
|
|
| 36 | 36 | $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]'; |
| 37 | 37 | $ph['SecurityIcon'] = wrapIcon($icon, 75); |
| 38 | 38 | } |
| 39 | -if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
|
|
| 39 | +if ($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
|
|
| 40 | 40 | $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]'; |
| 41 | 41 | $ph['WebUserIcon'] = wrapIcon($icon, 99); |
| 42 | 42 | } |
| 43 | -if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
|
|
| 43 | +if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
|
|
| 44 | 44 | $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]'; |
| 45 | 45 | $ph['ModulesIcon'] = wrapIcon($icon, 106); |
| 46 | 46 | } |
| 47 | -if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
|
|
| 47 | +if ($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
|
|
| 48 | 48 | $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]'; |
| 49 | 49 | $ph['ResourcesIcon'] = wrapIcon($icon, 76); |
| 50 | 50 | } |
| 51 | -if($modx->hasPermission('bk_manager')) {
|
|
| 51 | +if ($modx->hasPermission('bk_manager')) {
|
|
| 52 | 52 | $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]'; |
| 53 | 53 | $ph['BackupIcon'] = wrapIcon($icon, 93); |
| 54 | 54 | } |
| 55 | -if($modx->hasPermission('help')) {
|
|
| 55 | +if ($modx->hasPermission('help')) {
|
|
| 56 | 56 | $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]'; |
| 57 | 57 | $ph['HelpIcon'] = wrapIcon($icon, 9); |
| 58 | 58 | } |
| 59 | 59 | // do some config checks |
| 60 | -if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
|
|
| 61 | - include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php'); |
|
| 62 | - if($config_check_results != $_lang['configcheck_ok']) {
|
|
| 60 | +if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
|
|
| 61 | + include_once(MODX_MANAGER_PATH.'includes/config_check.inc.php'); |
|
| 62 | + if ($config_check_results != $_lang['configcheck_ok']) {
|
|
| 63 | 63 | $ph['config_check_results'] = $config_check_results; |
| 64 | 64 | $ph['config_display'] = 'block'; |
| 65 | 65 | } else {
|
@@ -70,8 +70,8 @@ discard block |
||
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | // Check logout-reminder |
| 73 | -if(isset($_SESSION['show_logout_reminder'])) {
|
|
| 74 | - switch($_SESSION['show_logout_reminder']['type']) {
|
|
| 73 | +if (isset($_SESSION['show_logout_reminder'])) {
|
|
| 74 | + switch ($_SESSION['show_logout_reminder']['type']) {
|
|
| 75 | 75 | case 'logout_reminder': |
| 76 | 76 | $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly'); |
| 77 | 77 | $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
|
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | </tr> |
| 126 | 126 | </table>'; |
| 127 | 127 | |
| 128 | -$nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>'; |
|
| 128 | +$nrnewmessages = '<span class="text-danger">'.$_SESSION['nrnewmessages'].'</span>'; |
|
| 129 | 129 | |
| 130 | 130 | $ph['UserInfo'] = $modx->parseText($tpl, array( |
| 131 | 131 | 'username' => $modx->getLoginUserName(), |
@@ -140,10 +140,10 @@ discard block |
||
| 140 | 140 | $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'"; |
| 141 | 141 | $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
|
| 142 | 142 | |
| 143 | -if($modx->db->getRecordCount($rs) < 1) {
|
|
| 143 | +if ($modx->db->getRecordCount($rs) < 1) {
|
|
| 144 | 144 | $html = '<p>[%no_active_users_found%]</p>'; |
| 145 | 145 | } else {
|
| 146 | - include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php'); |
|
| 146 | + include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php'); |
|
| 147 | 147 | $now = $_SERVER['REQUEST_TIME'] + $server_offset_time; |
| 148 | 148 | $ph['now'] = strftime('%H:%M:%S', $now);
|
| 149 | 149 | $timetocheck = ($now - (60 * 20)); //+$server_offset_time; |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | $userList = array(); |
| 169 | 169 | $userCount = array(); |
| 170 | 170 | // Create userlist with session-count first before output |
| 171 | - while($activeusers = $modx->db->getRow($rs)) {
|
|
| 171 | + while ($activeusers = $modx->db->getRow($rs)) {
|
|
| 172 | 172 | $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1; |
| 173 | 173 | |
| 174 | 174 | $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : ''; |
@@ -186,9 +186,9 @@ discard block |
||
| 186 | 186 | $currentaction |
| 187 | 187 | ); |
| 188 | 188 | } |
| 189 | - foreach($userList as $params) {
|
|
| 189 | + foreach ($userList as $params) {
|
|
| 190 | 190 | $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : ''; |
| 191 | - $html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);
|
|
| 191 | + $html .= "\n\t\t".vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);
|
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | $html .= ' |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | $ph['OnlineInfo'] = $html; |
| 201 | 201 | |
| 202 | 202 | // include rss feeds for important forum topics |
| 203 | -include_once(MODX_MANAGER_PATH . 'includes/rss.inc.php'); |
|
| 203 | +include_once(MODX_MANAGER_PATH.'includes/rss.inc.php'); |
|
| 204 | 204 | $ph['modx_security_notices_content'] = $feedData['modx_security_notices_content']; |
| 205 | 205 | $ph['modx_news_content'] = $feedData['modx_news_content']; |
| 206 | 206 | |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | |
| 232 | 232 | // invoke event OnManagerWelcomePrerender |
| 233 | 233 | $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
|
| 234 | -if(is_array($evtOut)) {
|
|
| 234 | +if (is_array($evtOut)) {
|
|
| 235 | 235 | $output = implode('', $evtOut);
|
| 236 | 236 | $ph['OnManagerWelcomePrerender'] = $output; |
| 237 | 237 | } |
@@ -365,57 +365,57 @@ discard block |
||
| 365 | 365 | |
| 366 | 366 | // invoke OnManagerWelcomeHome event |
| 367 | 367 | $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
|
| 368 | -if(is_array($sitewidgets)) {
|
|
| 368 | +if (is_array($sitewidgets)) {
|
|
| 369 | 369 | $newwidgets = array(); |
| 370 | - foreach($sitewidgets as $widget){
|
|
| 370 | + foreach ($sitewidgets as $widget) {
|
|
| 371 | 371 | $newwidgets = array_merge($newwidgets, unserialize($widget)); |
| 372 | 372 | } |
| 373 | 373 | $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets; |
| 374 | 374 | } |
| 375 | 375 | |
| 376 | -usort($widgets, function ($a, $b) {
|
|
| 376 | +usort($widgets, function($a, $b){
|
|
| 377 | 377 | return $a['menuindex'] - $b['menuindex']; |
| 378 | 378 | }); |
| 379 | 379 | |
| 380 | 380 | $tpl = getTplWidget(); |
| 381 | 381 | $output = ''; |
| 382 | -foreach($widgets as $widget) {
|
|
| 383 | - if ($widget['hide'] != '1'){
|
|
| 382 | +foreach ($widgets as $widget) {
|
|
| 383 | + if ($widget['hide'] != '1') {
|
|
| 384 | 384 | $output .= $modx->parseText($tpl, $widget); |
| 385 | 385 | } |
| 386 | 386 | } |
| 387 | 387 | $ph['widgets'] = $output; |
| 388 | 388 | |
| 389 | 389 | // load template |
| 390 | -if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
|
|
| 391 | - $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'; |
|
| 390 | +if (!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
|
|
| 391 | + $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH.'media/style/common/welcome.tpl'; |
|
| 392 | 392 | } |
| 393 | 393 | |
| 394 | 394 | $target = $modx->config['manager_welcome_tpl']; |
| 395 | 395 | $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
|
| 396 | 396 | $target = $modx->mergeSettingsContent($target); |
| 397 | 397 | |
| 398 | -if(substr($target, 0, 1) === '@') {
|
|
| 399 | - if(substr($target, 0, 6) === '@CHUNK') {
|
|
| 398 | +if (substr($target, 0, 1) === '@') {
|
|
| 399 | + if (substr($target, 0, 6) === '@CHUNK') {
|
|
| 400 | 400 | $content = $modx->getChunk(trim(substr($target, 7))); |
| 401 | - } elseif(substr($target, 0, 5) === '@FILE') {
|
|
| 401 | + } elseif (substr($target, 0, 5) === '@FILE') {
|
|
| 402 | 402 | $content = file_get_contents(trim(substr($target, 6))); |
| 403 | 403 | } else {
|
| 404 | 404 | $content = ''; |
| 405 | 405 | } |
| 406 | 406 | } else {
|
| 407 | 407 | $chunk = $modx->getChunk($target); |
| 408 | - if($chunk !== false && !empty($chunk)) {
|
|
| 408 | + if ($chunk !== false && !empty($chunk)) {
|
|
| 409 | 409 | $content = $chunk; |
| 410 | - } elseif(is_file(MODX_BASE_PATH . $target)) {
|
|
| 411 | - $content = file_get_contents(MODX_BASE_PATH . $target); |
|
| 412 | - } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
|
|
| 413 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl'); |
|
| 414 | - } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible |
|
| 410 | + } elseif (is_file(MODX_BASE_PATH.$target)) {
|
|
| 411 | + $content = file_get_contents(MODX_BASE_PATH.$target); |
|
| 412 | + } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl')) {
|
|
| 413 | + $content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl'); |
|
| 414 | + } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html')) // ClipperCMS compatible |
|
| 415 | 415 | {
|
| 416 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html'); |
|
| 416 | + $content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html'); |
|
| 417 | 417 | } else {
|
| 418 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'); |
|
| 418 | + $content = file_get_contents(MODX_MANAGER_PATH.'media/style/common/welcome.tpl'); |
|
| 419 | 419 | } |
| 420 | 420 | } |
| 421 | 421 | |
@@ -423,7 +423,7 @@ discard block |
||
| 423 | 423 | $content = $modx->mergeConditionalTagsContent($content); |
| 424 | 424 | $content = $modx->mergeSettingsContent($content); |
| 425 | 425 | $content = $modx->parseText($content, $ph); |
| 426 | -if(strpos($content, '[+') !== false) {
|
|
| 426 | +if (strpos($content, '[+') !== false) {
|
|
| 427 | 427 | $modx->toPlaceholders($ph); |
| 428 | 428 | $content = $modx->mergePlaceholderContent($content); |
| 429 | 429 | } |
@@ -432,7 +432,7 @@ discard block |
||
| 432 | 432 | $content = $modx->parseText($content, $_style, '[&', '&]'); |
| 433 | 433 | $content = $modx->cleanUpMODXTags($content); //cleanup |
| 434 | 434 | |
| 435 | -if($js = $modx->getRegisteredClientScripts()) {
|
|
| 435 | +if ($js = $modx->getRegisteredClientScripts()) {
|
|
| 436 | 436 | $content .= $js; |
| 437 | 437 | } |
| 438 | 438 | |
@@ -442,7 +442,7 @@ discard block |
||
| 442 | 442 | // <a href="javascript:;" class="setting"><i class="fa fa-cog"></i></a> |
| 443 | 443 | // <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a> |
| 444 | 444 | //</span> |
| 445 | -function getTplWidget() { // recent document info
|
|
| 445 | +function getTplWidget(){ // recent document info
|
|
| 446 | 446 | return ' |
| 447 | 447 | <div class="[+cols+]" id="[+id+]"> |
| 448 | 448 | <div class="card"[+cardAttr+]> |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | '; |
| 454 | 454 | } |
| 455 | 455 | |
| 456 | -function getRecentInfo() { // recent document info
|
|
| 456 | +function getRecentInfo(){ // recent document info
|
|
| 457 | 457 | global $modx; |
| 458 | 458 | |
| 459 | 459 | $modx->addSnippet('recentInfoList', 'getRecentInfoList');
|
@@ -479,12 +479,12 @@ discard block |
||
| 479 | 479 | return $html; |
| 480 | 480 | } |
| 481 | 481 | |
| 482 | -function getRecentInfoList() {
|
|
| 482 | +function getRecentInfoList(){
|
|
| 483 | 483 | global $modx; |
| 484 | 484 | |
| 485 | 485 | $rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);
|
| 486 | 486 | |
| 487 | - if($modx->db->getRecordCount($rs) < 1) {
|
|
| 487 | + if ($modx->db->getRecordCount($rs) < 1) {
|
|
| 488 | 488 | return '<tr><td>[%no_activity_message%]</td></tr>'; |
| 489 | 489 | } |
| 490 | 490 | |
@@ -494,20 +494,20 @@ discard block |
||
| 494 | 494 | $btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> '; |
| 495 | 495 | |
| 496 | 496 | $output = array(); |
| 497 | - while($ph = $modx->db->getRow($rs)) {
|
|
| 497 | + while ($ph = $modx->db->getRow($rs)) {
|
|
| 498 | 498 | $docid = $ph['id']; |
| 499 | 499 | $_ = $modx->getUserInfo($ph['editedby']); |
| 500 | 500 | $ph['username'] = $_['username']; |
| 501 | 501 | |
| 502 | - if($ph['deleted'] == 1) {
|
|
| 502 | + if ($ph['deleted'] == 1) {
|
|
| 503 | 503 | $ph['status'] = 'deleted text-danger'; |
| 504 | - } elseif($ph['published'] == 0) {
|
|
| 504 | + } elseif ($ph['published'] == 0) {
|
|
| 505 | 505 | $ph['status'] = 'unpublished font-italic text-muted'; |
| 506 | 506 | } else {
|
| 507 | 507 | $ph['status'] = 'published'; |
| 508 | 508 | } |
| 509 | 509 | |
| 510 | - if($modx->hasPermission('edit_document')) {
|
|
| 510 | + if ($modx->hasPermission('edit_document')) {
|
|
| 511 | 511 | $ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);
|
| 512 | 512 | } else {
|
| 513 | 513 | $ph['edit_btn'] = ''; |
@@ -522,8 +522,8 @@ discard block |
||
| 522 | 522 | $preview_disabled |
| 523 | 523 | ), $btntpl['preview_btn']); |
| 524 | 524 | |
| 525 | - if($modx->hasPermission('delete_document')) {
|
|
| 526 | - if($ph['deleted'] == 0) {
|
|
| 525 | + if ($modx->hasPermission('delete_document')) {
|
|
| 526 | + if ($ph['deleted'] == 0) {
|
|
| 527 | 527 | $delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> '; |
| 528 | 528 | } else {
|
| 529 | 529 | $delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> '; |
@@ -533,11 +533,11 @@ discard block |
||
| 533 | 533 | $ph['delete_btn'] = ''; |
| 534 | 534 | } |
| 535 | 535 | |
| 536 | - if($ph['deleted'] == 1 && $ph['published'] == 0) {
|
|
| 536 | + if ($ph['deleted'] == 1 && $ph['published'] == 0) {
|
|
| 537 | 537 | $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> '; |
| 538 | - } elseif($ph['deleted'] == 1 && $ph['published'] == 1) {
|
|
| 538 | + } elseif ($ph['deleted'] == 1 && $ph['published'] == 1) {
|
|
| 539 | 539 | $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> '; |
| 540 | - } elseif($ph['deleted'] == 0 && $ph['published'] == 0) {
|
|
| 540 | + } elseif ($ph['deleted'] == 0 && $ph['published'] == 0) {
|
|
| 541 | 541 | $publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> '; |
| 542 | 542 | } else {
|
| 543 | 543 | $publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> '; |
@@ -546,16 +546,16 @@ discard block |
||
| 546 | 546 | |
| 547 | 547 | $ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');
|
| 548 | 548 | |
| 549 | - if($ph['longtitle'] == '') {
|
|
| 549 | + if ($ph['longtitle'] == '') {
|
|
| 550 | 550 | $ph['longtitle'] = '(<i>[%not_set%]</i>)'; |
| 551 | 551 | } |
| 552 | - if($ph['description'] == '') {
|
|
| 552 | + if ($ph['description'] == '') {
|
|
| 553 | 553 | $ph['description'] = '(<i>[%not_set%]</i>)'; |
| 554 | 554 | } |
| 555 | - if($ph['introtext'] == '') {
|
|
| 555 | + if ($ph['introtext'] == '') {
|
|
| 556 | 556 | $ph['introtext'] = '(<i>[%not_set%]</i>)'; |
| 557 | 557 | } |
| 558 | - if($ph['alias'] == '') {
|
|
| 558 | + if ($ph['alias'] == '') {
|
|
| 559 | 559 | $ph['alias'] = '(<i>[%not_set%]</i>)'; |
| 560 | 560 | } |
| 561 | 561 | |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | return implode("\n", $output);
|
| 565 | 565 | } |
| 566 | 566 | |
| 567 | -function getRecentInfoRowTpl() {
|
|
| 567 | +function getRecentInfoRowTpl(){
|
|
| 568 | 568 | $tpl = ' |
| 569 | 569 | <tr> |
| 570 | 570 | <td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td> |
@@ -593,11 +593,11 @@ discard block |
||
| 593 | 593 | } |
| 594 | 594 | |
| 595 | 595 | // setup icons |
| 596 | -function wrapIcon($i, $action) {
|
|
| 596 | +function wrapIcon($i, $action){
|
|
| 597 | 597 | return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);
|
| 598 | 598 | } |
| 599 | 599 | |
| 600 | -function getStartUpScript() {
|
|
| 600 | +function getStartUpScript(){
|
|
| 601 | 601 | $script = ' |
| 602 | 602 | <script type="text/javascript"> |
| 603 | 603 | function hideConfigCheckWarning(key) {
|
@@ -1,17 +1,17 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | -if(!$modx->hasPermission('edit_template') && $modx->manager->action == '301') { |
|
| 5 | +if (!$modx->hasPermission('edit_template') && $modx->manager->action == '301') { |
|
| 6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 7 | 7 | } |
| 8 | -if(!$modx->hasPermission('new_template') && $modx->manager->action == '300') { |
|
| 8 | +if (!$modx->hasPermission('new_template') && $modx->manager->action == '300') { |
|
| 9 | 9 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 10 | 10 | } |
| 11 | 11 | |
| 12 | -$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; |
|
| 13 | -$origin = isset($_REQUEST['or']) ? (int)$_REQUEST['or'] : 76; |
|
| 14 | -$originId = isset($_REQUEST['oid']) ? (int)$_REQUEST['oid'] : NULL; |
|
| 12 | +$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0; |
|
| 13 | +$origin = isset($_REQUEST['or']) ? (int) $_REQUEST['or'] : 76; |
|
| 14 | +$originId = isset($_REQUEST['oid']) ? (int) $_REQUEST['oid'] : NULL; |
|
| 15 | 15 | |
| 16 | 16 | $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars'); |
| 17 | 17 | $tbl_site_templates = $modx->getFullTableName('site_templates'); |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | $tbl_documentgroup_names = $modx->getFullTableName('documentgroup_names'); |
| 20 | 20 | |
| 21 | 21 | // check to see the snippet editor isn't locked |
| 22 | -if($lockedEl = $modx->elementIsLocked(2, $id)) { |
|
| 22 | +if ($lockedEl = $modx->elementIsLocked(2, $id)) { |
|
| 23 | 23 | $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['tmplvar'])); |
| 24 | 24 | } |
| 25 | 25 | // end check for lock |
@@ -29,25 +29,25 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | global $content; |
| 31 | 31 | $content = array(); |
| 32 | -if(isset($_GET['id'])) { |
|
| 32 | +if (isset($_GET['id'])) { |
|
| 33 | 33 | $rs = $modx->db->select('*', $tbl_site_tmplvars, "id='{$id}'"); |
| 34 | 34 | $content = $modx->db->getRow($rs); |
| 35 | - if(!$content) { |
|
| 36 | - header("Location: " . MODX_SITE_URL . "index.php?id={$site_start}"); |
|
| 35 | + if (!$content) { |
|
| 36 | + header("Location: ".MODX_SITE_URL."index.php?id={$site_start}"); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | $_SESSION['itemname'] = $content['caption']; |
| 40 | - if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) { |
|
| 40 | + if ($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) { |
|
| 41 | 41 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 42 | 42 | } |
| 43 | -} else if(isset($_REQUEST['itemname'])) { |
|
| 43 | +} else if (isset($_REQUEST['itemname'])) { |
|
| 44 | 44 | $content['name'] = $_REQUEST['itemname']; |
| 45 | 45 | } else { |
| 46 | 46 | $_SESSION['itemname'] = $_lang["new_tmplvars"]; |
| 47 | - $content['category'] = (int)$_REQUEST['catid']; |
|
| 47 | + $content['category'] = (int) $_REQUEST['catid']; |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | -if($modx->manager->hasFormValues()) { |
|
| 50 | +if ($modx->manager->hasFormValues()) { |
|
| 51 | 51 | $modx->manager->loadFormValues(); |
| 52 | 52 | } |
| 53 | 53 | |
@@ -56,12 +56,12 @@ discard block |
||
| 56 | 56 | // Add lock-element JS-Script |
| 57 | 57 | $lockElementId = $id; |
| 58 | 58 | $lockElementType = 2; |
| 59 | -require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php'); |
|
| 59 | +require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php'); |
|
| 60 | 60 | |
| 61 | 61 | // get available RichText Editors |
| 62 | 62 | $RTEditors = ''; |
| 63 | 63 | $evtOut = $modx->invokeEvent('OnRichTextEditorRegister', array('forfrontend' => 1)); |
| 64 | -if(is_array($evtOut)) { |
|
| 64 | +if (is_array($evtOut)) { |
|
| 65 | 65 | $RTEditors = implode(',', $evtOut); |
| 66 | 66 | } |
| 67 | 67 | |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | }, |
| 108 | 108 | cancel: function() { |
| 109 | 109 | documentDirty = false; |
| 110 | - document.location.href = 'index.php?a=<?= $origin ?><?=(empty($originId) ? '' : '&id=' . $originId) ?>'; |
|
| 110 | + document.location.href = 'index.php?a=<?= $origin ?><?=(empty($originId) ? '' : '&id='.$originId) ?>'; |
|
| 111 | 111 | } |
| 112 | 112 | }; |
| 113 | 113 | |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | <?php |
| 280 | 280 | // invoke OnTVFormPrerender event |
| 281 | 281 | $evtOut = $modx->invokeEvent('OnTVFormPrerender', array('id' => $id)); |
| 282 | - if(is_array($evtOut)) { |
|
| 282 | + if (is_array($evtOut)) { |
|
| 283 | 283 | echo implode("", $evtOut); |
| 284 | 284 | } |
| 285 | 285 | ?> |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | <input type="hidden" name="params" value="<?= $modx->htmlspecialchars($content['display_params']) ?>"> |
| 292 | 292 | |
| 293 | 293 | <h1> |
| 294 | - <i class="fa fa-list-alt"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_tmplvars']) ?><i class="fa fa-question-circle help"></i> |
|
| 294 | + <i class="fa fa-list-alt"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_tmplvars']) ?><i class="fa fa-question-circle help"></i> |
|
| 295 | 295 | </h1> |
| 296 | 296 | |
| 297 | 297 | <?= $_style['actionbuttons']['dynamic']['element'] ?> |
@@ -314,8 +314,8 @@ discard block |
||
| 314 | 314 | <div class="col-md-9 col-lg-10"> |
| 315 | 315 | <div class="form-control-name clearfix"> |
| 316 | 316 | <input name="name" type="text" maxlength="50" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" /> |
| 317 | - <?php if($modx->hasPermission('save_role')): ?> |
|
| 318 | - <label class="custom-control" title="<?= $_lang['lock_tmplvars'] . "\n" . $_lang['lock_tmplvars_msg'] ?>" tooltip> |
|
| 317 | + <?php if ($modx->hasPermission('save_role')): ?> |
|
| 318 | + <label class="custom-control" title="<?= $_lang['lock_tmplvars']."\n".$_lang['lock_tmplvars_msg'] ?>" tooltip> |
|
| 319 | 319 | <input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> /> |
| 320 | 320 | <i class="fa fa-lock"></i> |
| 321 | 321 | </label> |
@@ -343,9 +343,9 @@ discard block |
||
| 343 | 343 | <select name="categoryid" class="form-control" onChange="documentDirty=true;"> |
| 344 | 344 | <option> </option> |
| 345 | 345 | <?php |
| 346 | - include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php'); |
|
| 347 | - foreach(getCategories() as $n => $v) { |
|
| 348 | - echo "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>"; |
|
| 346 | + include_once(MODX_MANAGER_PATH.'includes/categories.inc.php'); |
|
| 347 | + foreach (getCategories() as $n => $v) { |
|
| 348 | + echo "<option value='".$v['id']."'".($content["category"] == $v["id"] ? " selected='selected'" : "").">".$modx->htmlspecialchars($v["category"])."</option>"; |
|
| 349 | 349 | } |
| 350 | 350 | ?> |
| 351 | 351 | </select> |
@@ -383,11 +383,11 @@ discard block |
||
| 383 | 383 | <optgroup label="Custom Type"> |
| 384 | 384 | <option value="custom_tv" <?= ($content['type'] == 'custom_tv' ? "selected='selected'" : "") ?>>Custom Input</option> |
| 385 | 385 | <?php |
| 386 | - $custom_tvs = scandir(MODX_BASE_PATH . 'assets/tvs'); |
|
| 387 | - foreach($custom_tvs as $ctv) { |
|
| 388 | - if(strpos($ctv, '.') !== 0 && $ctv != 'index.html') { |
|
| 389 | - $selected = ($content['type'] == 'custom_tv:' . $ctv ? "selected='selected'" : ""); |
|
| 390 | - echo '<option value="custom_tv:' . $ctv . '" ' . $selected . '>' . $ctv . '</option>'; |
|
| 386 | + $custom_tvs = scandir(MODX_BASE_PATH.'assets/tvs'); |
|
| 387 | + foreach ($custom_tvs as $ctv) { |
|
| 388 | + if (strpos($ctv, '.') !== 0 && $ctv != 'index.html') { |
|
| 389 | + $selected = ($content['type'] == 'custom_tv:'.$ctv ? "selected='selected'" : ""); |
|
| 390 | + echo '<option value="custom_tv:'.$ctv.'" '.$selected.'>'.$ctv.'</option>'; |
|
| 391 | 391 | } |
| 392 | 392 | } |
| 393 | 393 | ?> |
@@ -462,36 +462,36 @@ discard block |
||
| 462 | 462 | $tplList = '<ul>'; |
| 463 | 463 | $preCat = ''; |
| 464 | 464 | $insideUl = 0; |
| 465 | - while($row = $modx->db->getRow($rs)) { |
|
| 465 | + while ($row = $modx->db->getRow($rs)) { |
|
| 466 | 466 | $row['category'] = stripslashes($row['category']); //pixelchutes |
| 467 | - if($preCat !== $row['category']) { |
|
| 467 | + if ($preCat !== $row['category']) { |
|
| 468 | 468 | $tplList .= $insideUl ? '</ul>' : ''; |
| 469 | - $tplList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>'; |
|
| 469 | + $tplList .= '<li><strong>'.$row['category'].($row['catid'] != '' ? ' <small>('.$row['catid'].')</small>' : '').'</strong><ul>'; |
|
| 470 | 470 | $insideUl = 1; |
| 471 | 471 | } |
| 472 | 472 | |
| 473 | - if($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) { |
|
| 473 | + if ($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) { |
|
| 474 | 474 | $checked = true; |
| 475 | - } elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) { |
|
| 475 | + } elseif (isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) { |
|
| 476 | 476 | $checked = true; |
| 477 | - } elseif($id == 0 && is_array($_POST['template'])) { |
|
| 477 | + } elseif ($id == 0 && is_array($_POST['template'])) { |
|
| 478 | 478 | $checked = in_array($row['id'], $_POST['template']); |
| 479 | 479 | } else { |
| 480 | 480 | $checked = $row['tmplvarid']; |
| 481 | 481 | } |
| 482 | 482 | $selectable = !$row['selectable'] ? ' class="disabled"' : ''; |
| 483 | 483 | $checked = $checked ? ' checked="checked"' : ''; |
| 484 | - $tplId = ' <small>(' . $row['id'] . ')</small>'; |
|
| 485 | - $desc = !empty($row['tpldescription']) ? ' - ' . $row['tpldescription'] : ''; |
|
| 484 | + $tplId = ' <small>('.$row['id'].')</small>'; |
|
| 485 | + $desc = !empty($row['tpldescription']) ? ' - '.$row['tpldescription'] : ''; |
|
| 486 | 486 | |
| 487 | 487 | $tplInfo = array(); |
| 488 | - if($row['tpllocked']) { |
|
| 488 | + if ($row['tpllocked']) { |
|
| 489 | 489 | $tplInfo[] = $_lang['locked']; |
| 490 | 490 | } |
| 491 | - if($row['id'] == $modx->config['default_template']) { |
|
| 491 | + if ($row['id'] == $modx->config['default_template']) { |
|
| 492 | 492 | $tplInfo[] = $_lang['defaulttemplate_title']; |
| 493 | 493 | } |
| 494 | - $tplInfo = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : ''; |
|
| 494 | + $tplInfo = !empty($tplInfo) ? ' <em>('.implode(', ', $tplInfo).')</em>' : ''; |
|
| 495 | 495 | |
| 496 | 496 | $tplList .= sprintf('<li><label%s><input name="template[]" value="%s" type="checkbox" %s onchange="documentDirty=true;"> %s%s%s%s</label></li>', $selectable, $row['id'], $checked, $row['templatename'], $tplId, $desc, $tplInfo); |
| 497 | 497 | $tplList .= '</li>'; |
@@ -506,13 +506,13 @@ discard block |
||
| 506 | 506 | |
| 507 | 507 | <!-- Access Permissions --> |
| 508 | 508 | <?php |
| 509 | - if($use_udperms == 1) { |
|
| 509 | + if ($use_udperms == 1) { |
|
| 510 | 510 | // fetch permissions for the variable |
| 511 | 511 | $rs = $modx->db->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'"); |
| 512 | 512 | $groupsarray = $modx->db->getColumn('documentgroup', $rs); |
| 513 | 513 | |
| 514 | 514 | ?> |
| 515 | - <?php if($modx->hasPermission('access_permissions')) { ?> |
|
| 515 | + <?php if ($modx->hasPermission('access_permissions')) { ?> |
|
| 516 | 516 | <script type="text/javascript"> |
| 517 | 517 | function makePublic(b) { |
| 518 | 518 | var notPublic = false; |
@@ -541,26 +541,26 @@ discard block |
||
| 541 | 541 | <?php |
| 542 | 542 | $chk = ''; |
| 543 | 543 | $rs = $modx->db->select('name, id', $tbl_documentgroup_names); |
| 544 | - if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) { |
|
| 544 | + if (empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) { |
|
| 545 | 545 | $groupsarray = $_POST['docgroups']; |
| 546 | 546 | } |
| 547 | - while($row = $modx->db->getRow($rs)) { |
|
| 547 | + while ($row = $modx->db->getRow($rs)) { |
|
| 548 | 548 | $checked = in_array($row['id'], $groupsarray); |
| 549 | - if($modx->hasPermission('access_permissions')) { |
|
| 550 | - if($checked) { |
|
| 549 | + if ($modx->hasPermission('access_permissions')) { |
|
| 550 | + if ($checked) { |
|
| 551 | 551 | $notPublic = true; |
| 552 | 552 | } |
| 553 | - $chks .= "<li><label><input type='checkbox' name='docgroups[]' value='" . $row['id'] . "' " . ($checked ? "checked='checked'" : '') . " onclick=\"makePublic(false)\" /> " . $row['name'] . "</label></li>"; |
|
| 553 | + $chks .= "<li><label><input type='checkbox' name='docgroups[]' value='".$row['id']."' ".($checked ? "checked='checked'" : '')." onclick=\"makePublic(false)\" /> ".$row['name']."</label></li>"; |
|
| 554 | 554 | } else { |
| 555 | - if($checked) { |
|
| 556 | - echo "<input type='hidden' name='docgroups[]' value='" . $row['id'] . "' />"; |
|
| 555 | + if ($checked) { |
|
| 556 | + echo "<input type='hidden' name='docgroups[]' value='".$row['id']."' />"; |
|
| 557 | 557 | } |
| 558 | 558 | } |
| 559 | 559 | } |
| 560 | - if($modx->hasPermission('access_permissions')) { |
|
| 561 | - $chks = "<li><label><input type='checkbox' name='chkalldocs' " . (!$notPublic ? "checked='checked'" : '') . " onclick=\"makePublic(true)\" /> <span class='warning'>" . $_lang['all_doc_groups'] . "</span></label></li>" . $chks; |
|
| 560 | + if ($modx->hasPermission('access_permissions')) { |
|
| 561 | + $chks = "<li><label><input type='checkbox' name='chkalldocs' ".(!$notPublic ? "checked='checked'" : '')." onclick=\"makePublic(true)\" /> <span class='warning'>".$_lang['all_doc_groups']."</span></label></li>".$chks; |
|
| 562 | 562 | } |
| 563 | - echo '<ul>' . $chks . '</ul>'; |
|
| 563 | + echo '<ul>'.$chks.'</ul>'; |
|
| 564 | 564 | ?> |
| 565 | 565 | <?php } ?> |
| 566 | 566 | <?php } ?> |
@@ -573,7 +573,7 @@ discard block |
||
| 573 | 573 | <?php |
| 574 | 574 | // invoke OnTVFormRender event |
| 575 | 575 | $evtOut = $modx->invokeEvent('OnTVFormRender', array('id' => $id)); |
| 576 | - if(is_array($evtOut)) { |
|
| 576 | + if (is_array($evtOut)) { |
|
| 577 | 577 | echo implode('', $evtOut); |
| 578 | 578 | } |
| 579 | 579 | ?> |
@@ -1,13 +1,13 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | -if(!$modx->hasPermission('delete_snippet')) { |
|
| 5 | +if (!$modx->hasPermission('delete_snippet')) { |
|
| 6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 7 | 7 | } |
| 8 | 8 | |
| 9 | -$id = isset($_GET['id'])? (int)$_GET['id'] : 0; |
|
| 10 | -if($id==0) { |
|
| 9 | +$id = isset($_GET['id']) ? (int) $_GET['id'] : 0; |
|
| 10 | +if ($id == 0) { |
|
| 11 | 11 | $modx->webAlertAndQuit($_lang["error_no_id"]); |
| 12 | 12 | } |
| 13 | 13 | |
@@ -34,5 +34,5 @@ discard block |
||
| 34 | 34 | $modx->clearCache('full'); |
| 35 | 35 | |
| 36 | 36 | // finished emptying cache - redirect |
| 37 | -$header="Location: index.php?a=76&r=2"; |
|
| 37 | +$header = "Location: index.php?a=76&r=2"; |
|
| 38 | 38 | header($header); |
@@ -65,26 +65,26 @@ |
||
| 65 | 65 | $_['macintosh'] = 'Western European (Mac) - macintosh'; |
| 66 | 66 | $_['Windows-1252'] = 'Western European (Windows) - Windows-1252'; |
| 67 | 67 | |
| 68 | -if($modx_charset == 'euc-jp') $_['euc-jp'] = 'Japanese (EUC) - euc-jp'; |
|
| 69 | -elseif($modx_charset == 'shift_jis') $_['shift_jis'] = 'Japanese (Shift-JIS) - shift_jis'; |
|
| 70 | -elseif($modx_charset == 'iso-2022-jp') $_['iso-2022-jp'] = 'Japanese (JIS-Allow 1 byte Kana - SO/SI) - iso-2022-jp'; |
|
| 71 | -elseif($modx_charset == 'csISO2022JP') $_['csISO2022JP'] = 'Japanese (JIS-Allow 1 byte Kana) - csISO2022JP'; |
|
| 72 | -elseif($modx_charset == 'EUC-CN') $_['EUC-CN'] = 'Chinese Simplified (EUC) - EUC-CN'; |
|
| 73 | -elseif($modx_charset == 'hz-gb-2312') $_['hz-gb-2312'] = 'Chinese Simplified (HZ) - hz-gb-2312'; |
|
| 74 | -elseif($modx_charset == 'x-mac-chinesesimp') $_['x-mac-chinesesimp'] = 'Chinese Simplified (Mac) - x-mac-chinesesimp'; |
|
| 75 | -elseif($modx_charset == 'x-Chinese-CNS') $_['x-Chinese-CNS'] = 'Chinese Traditional (CNS) - x-Chinese-CNS'; |
|
| 76 | -elseif($modx_charset == 'x-Chinese-Eten') $_['x-Chinese-Eten'] = 'Chinese Traditional (Eten) - x-Chinese-Eten'; |
|
| 77 | -elseif($modx_charset == 'x-mac-chinesetrad') $_['x-mac-chinesetrad'] = 'Chinese Traditional (Mac) - x-mac-chinesetrad'; |
|
| 78 | -elseif($modx_charset == 'ks_c_5601-1987') $_['ks_c_5601-1987'] = 'Korean - ks_c_5601-1987'; |
|
| 79 | -elseif($modx_charset == 'euc-kr') $_['euc-kr'] = 'Korean (EUC) - euc-kr'; |
|
| 80 | -elseif($modx_charset == 'iso-2022-kr') $_['iso-2022-kr'] = 'Korean (ISO) - iso-2022-kr'; |
|
| 81 | -elseif($modx_charset == 'Johab') $_['Johab'] = 'Korean (Johab) - Johab'; |
|
| 82 | -elseif($modx_charset == 'x-mac-korean') $_['x-mac-korean'] = 'Korean (Mac) - x-mac-korean'; |
|
| 68 | +if ($modx_charset == 'euc-jp') $_['euc-jp'] = 'Japanese (EUC) - euc-jp'; |
|
| 69 | +elseif ($modx_charset == 'shift_jis') $_['shift_jis'] = 'Japanese (Shift-JIS) - shift_jis'; |
|
| 70 | +elseif ($modx_charset == 'iso-2022-jp') $_['iso-2022-jp'] = 'Japanese (JIS-Allow 1 byte Kana - SO/SI) - iso-2022-jp'; |
|
| 71 | +elseif ($modx_charset == 'csISO2022JP') $_['csISO2022JP'] = 'Japanese (JIS-Allow 1 byte Kana) - csISO2022JP'; |
|
| 72 | +elseif ($modx_charset == 'EUC-CN') $_['EUC-CN'] = 'Chinese Simplified (EUC) - EUC-CN'; |
|
| 73 | +elseif ($modx_charset == 'hz-gb-2312') $_['hz-gb-2312'] = 'Chinese Simplified (HZ) - hz-gb-2312'; |
|
| 74 | +elseif ($modx_charset == 'x-mac-chinesesimp') $_['x-mac-chinesesimp'] = 'Chinese Simplified (Mac) - x-mac-chinesesimp'; |
|
| 75 | +elseif ($modx_charset == 'x-Chinese-CNS') $_['x-Chinese-CNS'] = 'Chinese Traditional (CNS) - x-Chinese-CNS'; |
|
| 76 | +elseif ($modx_charset == 'x-Chinese-Eten') $_['x-Chinese-Eten'] = 'Chinese Traditional (Eten) - x-Chinese-Eten'; |
|
| 77 | +elseif ($modx_charset == 'x-mac-chinesetrad') $_['x-mac-chinesetrad'] = 'Chinese Traditional (Mac) - x-mac-chinesetrad'; |
|
| 78 | +elseif ($modx_charset == 'ks_c_5601-1987') $_['ks_c_5601-1987'] = 'Korean - ks_c_5601-1987'; |
|
| 79 | +elseif ($modx_charset == 'euc-kr') $_['euc-kr'] = 'Korean (EUC) - euc-kr'; |
|
| 80 | +elseif ($modx_charset == 'iso-2022-kr') $_['iso-2022-kr'] = 'Korean (ISO) - iso-2022-kr'; |
|
| 81 | +elseif ($modx_charset == 'Johab') $_['Johab'] = 'Korean (Johab) - Johab'; |
|
| 82 | +elseif ($modx_charset == 'x-mac-korean') $_['x-mac-korean'] = 'Korean (Mac) - x-mac-korean'; |
|
| 83 | 83 | |
| 84 | 84 | $tpl = '<option value="%s" %s>%s</option>'; |
| 85 | 85 | $options = array(); |
| 86 | -foreach($_ as $value=>$label) { |
|
| 87 | - $selected = $value===$modx_charset ? 'selected' : ''; |
|
| 86 | +foreach ($_ as $value=>$label) { |
|
| 87 | + $selected = $value === $modx_charset ? 'selected' : ''; |
|
| 88 | 88 | $options[] = sprintf($tpl, $value, $selected, $label); |
| 89 | 89 | } |
| 90 | 90 | echo implode("\n", $options); |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | define('RSS', 'RSS'); |
| 24 | 24 | define('ATOM', 'Atom'); |
| 25 | 25 | |
| 26 | -require_once (MAGPIE_DIR . 'rss_utils.inc'); |
|
| 26 | +require_once (MAGPIE_DIR.'rss_utils.inc'); |
|
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * Hybrid parser, and object, takes RSS as a string and returns a simple object. |
@@ -31,19 +31,19 @@ discard block |
||
| 31 | 31 | * see: rss_fetch.inc for a simpler interface with integrated caching support |
| 32 | 32 | * |
| 33 | 33 | */ |
| 34 | -class MagpieRSS { |
|
| 34 | +class MagpieRSS{ |
|
| 35 | 35 | var $parser; |
| 36 | 36 | |
| 37 | - var $current_item = array(); // item currently being parsed |
|
| 38 | - var $items = array(); // collection of parsed items |
|
| 39 | - var $channel = array(); // hash of channel fields |
|
| 37 | + var $current_item = array(); // item currently being parsed |
|
| 38 | + var $items = array(); // collection of parsed items |
|
| 39 | + var $channel = array(); // hash of channel fields |
|
| 40 | 40 | var $textinput = array(); |
| 41 | 41 | var $image = array(); |
| 42 | 42 | var $feed_type; |
| 43 | 43 | var $feed_version; |
| 44 | - var $encoding = ''; // output encoding of parsed rss |
|
| 44 | + var $encoding = ''; // output encoding of parsed rss |
|
| 45 | 45 | |
| 46 | - var $_source_encoding = ''; // only set if we have to parse xml prolog |
|
| 46 | + var $_source_encoding = ''; // only set if we have to parse xml prolog |
|
| 47 | 47 | |
| 48 | 48 | var $ERROR = ""; |
| 49 | 49 | var $WARNING = ""; |
@@ -91,15 +91,15 @@ discard block |
||
| 91 | 91 | * source encoding. (caveat emptor) |
| 92 | 92 | * |
| 93 | 93 | */ |
| 94 | - function __construct($source, $output_encoding='ISO-8859-1', |
|
| 95 | - $input_encoding=null, $detect_encoding=true) |
|
| 94 | + function __construct($source, $output_encoding = 'ISO-8859-1', |
|
| 95 | + $input_encoding = null, $detect_encoding = true) |
|
| 96 | 96 | { |
| 97 | 97 | # if PHP xml isn't compiled in, die |
| 98 | 98 | # |
| 99 | 99 | if (!function_exists('xml_parser_create')) { |
| 100 | - $this->error( "Failed to load PHP's XML Extension. " . |
|
| 100 | + $this->error("Failed to load PHP's XML Extension. ". |
|
| 101 | 101 | "http://www.php.net/manual/en/ref.xml.php", |
| 102 | - E_USER_ERROR ); |
|
| 102 | + E_USER_ERROR); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | list($parser, $source) = $this->create_parser($source, |
@@ -107,9 +107,9 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | |
| 109 | 109 | if (!is_resource($parser)) { |
| 110 | - $this->error( "Failed to create an instance of PHP's XML parser. " . |
|
| 110 | + $this->error("Failed to create an instance of PHP's XML parser. ". |
|
| 111 | 111 | "http://www.php.net/manual/en/ref.xml.php", |
| 112 | - E_USER_ERROR ); |
|
| 112 | + E_USER_ERROR); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | |
@@ -118,57 +118,57 @@ discard block |
||
| 118 | 118 | # pass in parser, and a reference to this object |
| 119 | 119 | # setup handlers |
| 120 | 120 | # |
| 121 | - xml_set_object( $this->parser, $this ); |
|
| 121 | + xml_set_object($this->parser, $this); |
|
| 122 | 122 | xml_set_element_handler($this->parser, |
| 123 | - 'feed_start_element', 'feed_end_element' ); |
|
| 123 | + 'feed_start_element', 'feed_end_element'); |
|
| 124 | 124 | |
| 125 | - xml_set_character_data_handler( $this->parser, 'feed_cdata' ); |
|
| 125 | + xml_set_character_data_handler($this->parser, 'feed_cdata'); |
|
| 126 | 126 | |
| 127 | - $status = xml_parse( $this->parser, $source ); |
|
| 127 | + $status = xml_parse($this->parser, $source); |
|
| 128 | 128 | |
| 129 | - if (! $status ) { |
|
| 130 | - $errorcode = xml_get_error_code( $this->parser ); |
|
| 131 | - if ( $errorcode != XML_ERROR_NONE ) { |
|
| 132 | - $xml_error = xml_error_string( $errorcode ); |
|
| 129 | + if (!$status) { |
|
| 130 | + $errorcode = xml_get_error_code($this->parser); |
|
| 131 | + if ($errorcode != XML_ERROR_NONE) { |
|
| 132 | + $xml_error = xml_error_string($errorcode); |
|
| 133 | 133 | $error_line = xml_get_current_line_number($this->parser); |
| 134 | 134 | $error_col = xml_get_current_column_number($this->parser); |
| 135 | 135 | $errormsg = "$xml_error at line $error_line, column $error_col"; |
| 136 | 136 | |
| 137 | - $this->error( $errormsg ); |
|
| 137 | + $this->error($errormsg); |
|
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - xml_parser_free( $this->parser ); |
|
| 141 | + xml_parser_free($this->parser); |
|
| 142 | 142 | |
| 143 | 143 | $this->normalize(); |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | - function feed_start_element($p, $element, &$attrs) { |
|
| 146 | + function feed_start_element($p, $element, &$attrs){ |
|
| 147 | 147 | $el = $element = strtolower($element); |
| 148 | 148 | $attrs = array_change_key_case($attrs, CASE_LOWER); |
| 149 | 149 | |
| 150 | 150 | // check for a namespace, and split if found |
| 151 | 151 | $ns = false; |
| 152 | - if ( strpos( $element, ':' ) ) { |
|
| 153 | - list($ns, $el) = explode( ':', $element, 2); |
|
| 152 | + if (strpos($element, ':')) { |
|
| 153 | + list($ns, $el) = explode(':', $element, 2); |
|
| 154 | 154 | } |
| 155 | - if ( $ns and $ns != 'rdf' ) { |
|
| 155 | + if ($ns and $ns != 'rdf') { |
|
| 156 | 156 | $this->current_namespace = $ns; |
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | # if feed type isn't set, then this is first element of feed |
| 160 | 160 | # identify feed from root element |
| 161 | 161 | # |
| 162 | - if (!isset($this->feed_type) ) { |
|
| 163 | - if ( $el == 'rdf' ) { |
|
| 162 | + if (!isset($this->feed_type)) { |
|
| 163 | + if ($el == 'rdf') { |
|
| 164 | 164 | $this->feed_type = RSS; |
| 165 | 165 | $this->feed_version = '1.0'; |
| 166 | 166 | } |
| 167 | - elseif ( $el == 'rss' ) { |
|
| 167 | + elseif ($el == 'rss') { |
|
| 168 | 168 | $this->feed_type = RSS; |
| 169 | 169 | $this->feed_version = $attrs['version']; |
| 170 | 170 | } |
| 171 | - elseif ( $el == 'feed' ) { |
|
| 171 | + elseif ($el == 'feed') { |
|
| 172 | 172 | $this->feed_type = ATOM; |
| 173 | 173 | $this->feed_version = $attrs['version']; |
| 174 | 174 | $this->inchannel = true; |
@@ -176,14 +176,14 @@ discard block |
||
| 176 | 176 | return; |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | - if ( $el == 'channel' ) |
|
| 179 | + if ($el == 'channel') |
|
| 180 | 180 | { |
| 181 | 181 | $this->inchannel = true; |
| 182 | 182 | } |
| 183 | - elseif ($el == 'item' or $el == 'entry' ) |
|
| 183 | + elseif ($el == 'item' or $el == 'entry') |
|
| 184 | 184 | { |
| 185 | 185 | $this->initem = true; |
| 186 | - if ( isset($attrs['rdf:about']) ) { |
|
| 186 | + if (isset($attrs['rdf:about'])) { |
|
| 187 | 187 | $this->current_item['about'] = $attrs['rdf:about']; |
| 188 | 188 | } |
| 189 | 189 | } |
@@ -207,10 +207,10 @@ discard block |
||
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | # handle atom content constructs |
| 210 | - elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) ) |
|
| 210 | + elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS)) |
|
| 211 | 211 | { |
| 212 | 212 | // avoid clashing w/ RSS mod_content |
| 213 | - if ($el == 'content' ) { |
|
| 213 | + if ($el == 'content') { |
|
| 214 | 214 | $el = 'atom_content'; |
| 215 | 215 | } |
| 216 | 216 | |
@@ -220,31 +220,31 @@ discard block |
||
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | // if inside an Atom content construct (e.g. content or summary) field treat tags as text |
| 223 | - elseif ($this->feed_type == ATOM and $this->incontent ) |
|
| 223 | + elseif ($this->feed_type == ATOM and $this->incontent) |
|
| 224 | 224 | { |
| 225 | 225 | // if tags are inlined, then flatten |
| 226 | 226 | $attrs_str = implode(' ', |
| 227 | 227 | array_map('map_attrs', |
| 228 | 228 | array_keys($attrs), |
| 229 | - array_values($attrs) ) ); |
|
| 229 | + array_values($attrs))); |
|
| 230 | 230 | |
| 231 | - $this->append_content( "<$element $attrs_str>" ); |
|
| 231 | + $this->append_content("<$element $attrs_str>"); |
|
| 232 | 232 | |
| 233 | - array_unshift( $this->stack, $el ); |
|
| 233 | + array_unshift($this->stack, $el); |
|
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | // Atom support many links per containging element. |
| 237 | 237 | // Magpie treats link elements of type rel='alternate' |
| 238 | 238 | // as being equivalent to RSS's simple link element. |
| 239 | 239 | // |
| 240 | - elseif ($this->feed_type == ATOM and $el == 'link' ) |
|
| 240 | + elseif ($this->feed_type == ATOM and $el == 'link') |
|
| 241 | 241 | { |
| 242 | - if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) |
|
| 242 | + if (isset($attrs['rel']) and $attrs['rel'] == 'alternate') |
|
| 243 | 243 | { |
| 244 | 244 | $link_el = 'link'; |
| 245 | 245 | } |
| 246 | 246 | else { |
| 247 | - $link_el = 'link_' . $attrs['rel']; |
|
| 247 | + $link_el = 'link_'.$attrs['rel']; |
|
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | $this->append($link_el, $attrs['href']); |
@@ -257,10 +257,10 @@ discard block |
||
| 257 | 257 | |
| 258 | 258 | |
| 259 | 259 | |
| 260 | - function feed_cdata ($p, $text) { |
|
| 260 | + function feed_cdata($p, $text){ |
|
| 261 | 261 | if ($this->feed_type == ATOM and $this->incontent) |
| 262 | 262 | { |
| 263 | - $this->append_content( $text ); |
|
| 263 | + $this->append_content($text); |
|
| 264 | 264 | } |
| 265 | 265 | else { |
| 266 | 266 | $current_el = implode('_', array_reverse($this->stack)); |
@@ -268,35 +268,35 @@ discard block |
||
| 268 | 268 | } |
| 269 | 269 | } |
| 270 | 270 | |
| 271 | - function feed_end_element ($p, $el) { |
|
| 271 | + function feed_end_element($p, $el){ |
|
| 272 | 272 | $el = strtolower($el); |
| 273 | 273 | |
| 274 | - if ( $el == 'item' or $el == 'entry' ) |
|
| 274 | + if ($el == 'item' or $el == 'entry') |
|
| 275 | 275 | { |
| 276 | 276 | $this->items[] = $this->current_item; |
| 277 | 277 | $this->current_item = array(); |
| 278 | 278 | $this->initem = false; |
| 279 | 279 | } |
| 280 | - elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) |
|
| 280 | + elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput') |
|
| 281 | 281 | { |
| 282 | 282 | $this->intextinput = false; |
| 283 | 283 | } |
| 284 | - elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) |
|
| 284 | + elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image') |
|
| 285 | 285 | { |
| 286 | 286 | $this->inimage = false; |
| 287 | 287 | } |
| 288 | - elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) ) |
|
| 288 | + elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS)) |
|
| 289 | 289 | { |
| 290 | 290 | $this->incontent = false; |
| 291 | 291 | } |
| 292 | - elseif ($el == 'channel' or $el == 'feed' ) |
|
| 292 | + elseif ($el == 'channel' or $el == 'feed') |
|
| 293 | 293 | { |
| 294 | 294 | $this->inchannel = false; |
| 295 | 295 | } |
| 296 | - elseif ($this->feed_type == ATOM and $this->incontent ) { |
|
| 296 | + elseif ($this->feed_type == ATOM and $this->incontent) { |
|
| 297 | 297 | // balance tags properly |
| 298 | 298 | // note: i don't think this is actually neccessary |
| 299 | - if ( $this->stack[0] == $el ) |
|
| 299 | + if ($this->stack[0] == $el) |
|
| 300 | 300 | { |
| 301 | 301 | $this->append_content("</$el>"); |
| 302 | 302 | } |
@@ -304,91 +304,91 @@ discard block |
||
| 304 | 304 | $this->append_content("<$el />"); |
| 305 | 305 | } |
| 306 | 306 | |
| 307 | - array_shift( $this->stack ); |
|
| 307 | + array_shift($this->stack); |
|
| 308 | 308 | } |
| 309 | 309 | else { |
| 310 | - array_shift( $this->stack ); |
|
| 310 | + array_shift($this->stack); |
|
| 311 | 311 | } |
| 312 | 312 | |
| 313 | 313 | $this->current_namespace = false; |
| 314 | 314 | } |
| 315 | 315 | |
| 316 | - function concat (&$str1, $str2="") { |
|
| 317 | - if (!isset($str1) ) { |
|
| 318 | - $str1=""; |
|
| 316 | + function concat(&$str1, $str2 = ""){ |
|
| 317 | + if (!isset($str1)) { |
|
| 318 | + $str1 = ""; |
|
| 319 | 319 | } |
| 320 | 320 | $str1 .= $str2; |
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | |
| 324 | 324 | |
| 325 | - function append_content($text) { |
|
| 326 | - if ( $this->initem ) { |
|
| 327 | - $this->concat( $this->current_item[ $this->incontent ], $text ); |
|
| 325 | + function append_content($text){ |
|
| 326 | + if ($this->initem) { |
|
| 327 | + $this->concat($this->current_item[$this->incontent], $text); |
|
| 328 | 328 | } |
| 329 | - elseif ( $this->inchannel ) { |
|
| 330 | - $this->concat( $this->channel[ $this->incontent ], $text ); |
|
| 329 | + elseif ($this->inchannel) { |
|
| 330 | + $this->concat($this->channel[$this->incontent], $text); |
|
| 331 | 331 | } |
| 332 | 332 | } |
| 333 | 333 | |
| 334 | 334 | // smart append - field and namespace aware |
| 335 | - function append($el, $text) { |
|
| 335 | + function append($el, $text){ |
|
| 336 | 336 | if (!$el) { |
| 337 | 337 | return; |
| 338 | 338 | } |
| 339 | - if ( $this->current_namespace ) |
|
| 339 | + if ($this->current_namespace) |
|
| 340 | 340 | { |
| 341 | - if ( $this->initem ) { |
|
| 341 | + if ($this->initem) { |
|
| 342 | 342 | $this->concat( |
| 343 | - $this->current_item[ $this->current_namespace ][ $el ], $text); |
|
| 343 | + $this->current_item[$this->current_namespace][$el], $text); |
|
| 344 | 344 | } |
| 345 | 345 | elseif ($this->inchannel) { |
| 346 | 346 | $this->concat( |
| 347 | - $this->channel[ $this->current_namespace][ $el ], $text ); |
|
| 347 | + $this->channel[$this->current_namespace][$el], $text ); |
|
| 348 | 348 | } |
| 349 | 349 | elseif ($this->intextinput) { |
| 350 | 350 | $this->concat( |
| 351 | - $this->textinput[ $this->current_namespace][ $el ], $text ); |
|
| 351 | + $this->textinput[$this->current_namespace][$el], $text ); |
|
| 352 | 352 | } |
| 353 | 353 | elseif ($this->inimage) { |
| 354 | 354 | $this->concat( |
| 355 | - $this->image[ $this->current_namespace ][ $el ], $text ); |
|
| 355 | + $this->image[$this->current_namespace][$el], $text ); |
|
| 356 | 356 | } |
| 357 | 357 | } |
| 358 | 358 | else { |
| 359 | - if ( $this->initem ) { |
|
| 359 | + if ($this->initem) { |
|
| 360 | 360 | $this->concat( |
| 361 | - $this->current_item[ $el ], $text); |
|
| 361 | + $this->current_item[$el], $text); |
|
| 362 | 362 | } |
| 363 | 363 | elseif ($this->intextinput) { |
| 364 | 364 | $this->concat( |
| 365 | - $this->textinput[ $el ], $text ); |
|
| 365 | + $this->textinput[$el], $text ); |
|
| 366 | 366 | } |
| 367 | 367 | elseif ($this->inimage) { |
| 368 | 368 | $this->concat( |
| 369 | - $this->image[ $el ], $text ); |
|
| 369 | + $this->image[$el], $text ); |
|
| 370 | 370 | } |
| 371 | 371 | elseif ($this->inchannel) { |
| 372 | 372 | $this->concat( |
| 373 | - $this->channel[ $el ], $text ); |
|
| 373 | + $this->channel[$el], $text ); |
|
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | } |
| 377 | 377 | } |
| 378 | 378 | |
| 379 | - function normalize () { |
|
| 379 | + function normalize(){ |
|
| 380 | 380 | // if atom populate rss fields |
| 381 | - if ( $this->is_atom() ) { |
|
| 381 | + if ($this->is_atom()) { |
|
| 382 | 382 | $this->channel['description'] = $this->channel['tagline']; |
| 383 | - for ( $i = 0; $i < count($this->items); $i++) { |
|
| 383 | + for ($i = 0; $i < count($this->items); $i++) { |
|
| 384 | 384 | $item = $this->items[$i]; |
| 385 | - if ( isset($item['summary']) ) |
|
| 385 | + if (isset($item['summary'])) |
|
| 386 | 386 | $item['description'] = $item['summary']; |
| 387 | - if ( isset($item['atom_content'])) |
|
| 387 | + if (isset($item['atom_content'])) |
|
| 388 | 388 | $item['content']['encoded'] = $item['atom_content']; |
| 389 | 389 | |
| 390 | - $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified']; |
|
| 391 | - if ( $atom_date ) { |
|
| 390 | + $atom_date = (isset($item['issued'])) ? $item['issued'] : $item['modified']; |
|
| 391 | + if ($atom_date) { |
|
| 392 | 392 | $epoch = @parse_w3cdtf($atom_date); |
| 393 | 393 | if ($epoch and $epoch > 0) { |
| 394 | 394 | $item['date_timestamp'] = $epoch; |
@@ -398,22 +398,22 @@ discard block |
||
| 398 | 398 | $this->items[$i] = $item; |
| 399 | 399 | } |
| 400 | 400 | } |
| 401 | - elseif ( $this->is_rss() ) { |
|
| 401 | + elseif ($this->is_rss()) { |
|
| 402 | 402 | $this->channel['tagline'] = $this->channel['description']; |
| 403 | - for ( $i = 0; $i < count($this->items); $i++) { |
|
| 403 | + for ($i = 0; $i < count($this->items); $i++) { |
|
| 404 | 404 | $item = $this->items[$i]; |
| 405 | - if ( isset($item['description'])) |
|
| 405 | + if (isset($item['description'])) |
|
| 406 | 406 | $item['summary'] = $item['description']; |
| 407 | - if ( isset($item['content']['encoded'] ) ) |
|
| 407 | + if (isset($item['content']['encoded'])) |
|
| 408 | 408 | $item['atom_content'] = $item['content']['encoded']; |
| 409 | 409 | |
| 410 | - if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) { |
|
| 410 | + if ($this->is_rss() == '1.0' and isset($item['dc']['date'])) { |
|
| 411 | 411 | $epoch = @parse_w3cdtf($item['dc']['date']); |
| 412 | 412 | if ($epoch and $epoch > 0) { |
| 413 | 413 | $item['date_timestamp'] = $epoch; |
| 414 | 414 | } |
| 415 | 415 | } |
| 416 | - elseif ( isset($item['pubdate']) ) { |
|
| 416 | + elseif (isset($item['pubdate'])) { |
|
| 417 | 417 | $epoch = @strtotime($item['pubdate']); |
| 418 | 418 | if ($epoch > 0) { |
| 419 | 419 | $item['date_timestamp'] = $epoch; |
@@ -426,8 +426,8 @@ discard block |
||
| 426 | 426 | } |
| 427 | 427 | |
| 428 | 428 | |
| 429 | - function is_rss () { |
|
| 430 | - if ( $this->feed_type == RSS ) { |
|
| 429 | + function is_rss(){ |
|
| 430 | + if ($this->feed_type == RSS) { |
|
| 431 | 431 | return $this->feed_version; |
| 432 | 432 | } |
| 433 | 433 | else { |
@@ -435,8 +435,8 @@ discard block |
||
| 435 | 435 | } |
| 436 | 436 | } |
| 437 | 437 | |
| 438 | - function is_atom() { |
|
| 439 | - if ( $this->feed_type == ATOM ) { |
|
| 438 | + function is_atom(){ |
|
| 439 | + if ($this->feed_type == ATOM) { |
|
| 440 | 440 | return $this->feed_version; |
| 441 | 441 | } |
| 442 | 442 | else { |
@@ -448,8 +448,8 @@ discard block |
||
| 448 | 448 | * return XML parser, and possibly re-encoded source |
| 449 | 449 | * |
| 450 | 450 | */ |
| 451 | - function create_parser($source, $out_enc, $in_enc, $detect) { |
|
| 452 | - if ( substr(phpversion(),0,1) == 5) { |
|
| 451 | + function create_parser($source, $out_enc, $in_enc, $detect){ |
|
| 452 | + if (substr(phpversion(), 0, 1) == 5) { |
|
| 453 | 453 | $parser = $this->php5_create_parser($in_enc, $detect); |
| 454 | 454 | } |
| 455 | 455 | else { |
@@ -472,9 +472,9 @@ discard block |
||
| 472 | 472 | * All hail libxml2! |
| 473 | 473 | * |
| 474 | 474 | */ |
| 475 | - function php5_create_parser($in_enc, $detect) { |
|
| 475 | + function php5_create_parser($in_enc, $detect){ |
|
| 476 | 476 | // by default php5 does a fine job of detecting input encodings |
| 477 | - if(!$detect && $in_enc) { |
|
| 477 | + if (!$detect && $in_enc) { |
|
| 478 | 478 | return xml_parser_create($in_enc); |
| 479 | 479 | } |
| 480 | 480 | else { |
@@ -497,8 +497,8 @@ discard block |
||
| 497 | 497 | * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss |
| 498 | 498 | * |
| 499 | 499 | */ |
| 500 | - function php4_create_parser($source, $in_enc, $detect) { |
|
| 501 | - if ( !$detect ) { |
|
| 500 | + function php4_create_parser($source, $in_enc, $detect){ |
|
| 501 | + if (!$detect) { |
|
| 502 | 502 | return array(xml_parser_create($in_enc), $source); |
| 503 | 503 | } |
| 504 | 504 | |
@@ -522,8 +522,8 @@ discard block |
||
| 522 | 522 | // cast the XML to a known encoding |
| 523 | 523 | // @see http://php.net/iconv |
| 524 | 524 | |
| 525 | - if (function_exists('iconv')) { |
|
| 526 | - $encoded_source = iconv($in_enc,'UTF-8', $source); |
|
| 525 | + if (function_exists('iconv')) { |
|
| 526 | + $encoded_source = iconv($in_enc, 'UTF-8', $source); |
|
| 527 | 527 | if ($encoded_source) { |
| 528 | 528 | return array(xml_parser_create('UTF-8'), $encoded_source); |
| 529 | 529 | } |
@@ -531,24 +531,24 @@ discard block |
||
| 531 | 531 | |
| 532 | 532 | // iconv didn't work, try mb_convert_encoding |
| 533 | 533 | // @see http://php.net/mbstring |
| 534 | - if(function_exists('mb_convert_encoding')) { |
|
| 535 | - $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc ); |
|
| 534 | + if (function_exists('mb_convert_encoding')) { |
|
| 535 | + $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc); |
|
| 536 | 536 | if ($encoded_source) { |
| 537 | 537 | return array(xml_parser_create('UTF-8'), $encoded_source); |
| 538 | 538 | } |
| 539 | 539 | } |
| 540 | 540 | |
| 541 | 541 | // else |
| 542 | - $this->error("Feed is in an unsupported character encoding. ($in_enc) " . |
|
| 542 | + $this->error("Feed is in an unsupported character encoding. ($in_enc) ". |
|
| 543 | 543 | "You may see strange artifacts, and mangled characters.", |
| 544 | 544 | E_USER_NOTICE); |
| 545 | 545 | |
| 546 | 546 | return array(xml_parser_create(), $source); |
| 547 | 547 | } |
| 548 | 548 | |
| 549 | - function known_encoding($enc) { |
|
| 549 | + function known_encoding($enc){ |
|
| 550 | 550 | $enc = strtoupper($enc); |
| 551 | - if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) { |
|
| 551 | + if (in_array($enc, $this->_KNOWN_ENCODINGS)) { |
|
| 552 | 552 | return $enc; |
| 553 | 553 | } |
| 554 | 554 | else { |
@@ -556,20 +556,20 @@ discard block |
||
| 556 | 556 | } |
| 557 | 557 | } |
| 558 | 558 | |
| 559 | - function error ($errormsg, $lvl=E_USER_WARNING) { |
|
| 559 | + function error($errormsg, $lvl = E_USER_WARNING){ |
|
| 560 | 560 | // append PHP's error message if track_errors enabled |
| 561 | - if ( isset($php_errormsg) ) { |
|
| 561 | + if (isset($php_errormsg)) { |
|
| 562 | 562 | $errormsg .= " ($php_errormsg)"; |
| 563 | 563 | } |
| 564 | - if ( MAGPIE_DEBUG ) { |
|
| 565 | - trigger_error( $errormsg, $lvl); |
|
| 564 | + if (MAGPIE_DEBUG) { |
|
| 565 | + trigger_error($errormsg, $lvl); |
|
| 566 | 566 | } |
| 567 | 567 | else { |
| 568 | - error_log( $errormsg, 0); |
|
| 568 | + error_log($errormsg, 0); |
|
| 569 | 569 | } |
| 570 | 570 | |
| 571 | - $notices = E_USER_NOTICE|E_NOTICE; |
|
| 572 | - if ( $lvl&$notices ) { |
|
| 571 | + $notices = E_USER_NOTICE | E_NOTICE; |
|
| 572 | + if ($lvl & $notices) { |
|
| 573 | 573 | $this->WARNING = $errormsg; |
| 574 | 574 | } else { |
| 575 | 575 | $this->ERROR = $errormsg; |
@@ -579,7 +579,7 @@ discard block |
||
| 579 | 579 | |
| 580 | 580 | } // end class RSS |
| 581 | 581 | |
| 582 | -function map_attrs($k, $v) { |
|
| 582 | +function map_attrs($k, $v){ |
|
| 583 | 583 | return "$k=\"$v\""; |
| 584 | 584 | } |
| 585 | 585 | |
@@ -591,19 +591,19 @@ discard block |
||
| 591 | 591 | define('CASE_LOWER', 0); |
| 592 | 592 | |
| 593 | 593 | |
| 594 | - function array_change_key_case($array, $case=CASE_LOWER) { |
|
| 594 | + function array_change_key_case($array, $case = CASE_LOWER){ |
|
| 595 | 595 | $output = array(); |
| 596 | - switch($case){ |
|
| 596 | + switch ($case) { |
|
| 597 | 597 | case CASE_LOWER: |
| 598 | - $cmd='strtolower'; |
|
| 598 | + $cmd = 'strtolower'; |
|
| 599 | 599 | break; |
| 600 | 600 | case CASE_UPPER: |
| 601 | - $cmd='strtoupper'; |
|
| 601 | + $cmd = 'strtoupper'; |
|
| 602 | 602 | break; |
| 603 | 603 | default: |
| 604 | 604 | $cmd = ''; |
| 605 | 605 | } |
| 606 | - foreach($array as $key=>$value) { |
|
| 606 | + foreach ($array as $key=>$value) { |
|
| 607 | 607 | $output[empty($cmd) ? $key : $cmd($key)] = $value; |
| 608 | 608 | } |
| 609 | 609 | return $output; |
@@ -16,27 +16,27 @@ discard block |
||
| 16 | 16 | * |
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | -class RSSCache { |
|
| 20 | - var $BASE_CACHE = './cache'; // where the cache files are stored |
|
| 21 | - var $MAX_AGE = 3600; // when are files stale, default one hour |
|
| 22 | - var $ERROR = ""; // accumulate error messages |
|
| 19 | +class RSSCache{ |
|
| 20 | + var $BASE_CACHE = './cache'; // where the cache files are stored |
|
| 21 | + var $MAX_AGE = 3600; // when are files stale, default one hour |
|
| 22 | + var $ERROR = ""; // accumulate error messages |
|
| 23 | 23 | |
| 24 | - function __construct($base='', $age='') { |
|
| 25 | - if ( $base ) { |
|
| 24 | + function __construct($base = '', $age = ''){ |
|
| 25 | + if ($base) { |
|
| 26 | 26 | $this->BASE_CACHE = $base; |
| 27 | 27 | } |
| 28 | - if ( $age ) { |
|
| 28 | + if ($age) { |
|
| 29 | 29 | $this->MAX_AGE = $age; |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | // attempt to make the cache directory |
| 33 | - if ( ! file_exists( $this->BASE_CACHE ) ) { |
|
| 34 | - $status = @mkdir( $this->BASE_CACHE, 0755 ); |
|
| 33 | + if (!file_exists($this->BASE_CACHE)) { |
|
| 34 | + $status = @mkdir($this->BASE_CACHE, 0755); |
|
| 35 | 35 | |
| 36 | 36 | // if make failed |
| 37 | - if ( ! $status ) { |
|
| 37 | + if (!$status) { |
|
| 38 | 38 | $this->error( |
| 39 | - "Cache couldn't make dir '" . $this->BASE_CACHE . "'." |
|
| 39 | + "Cache couldn't make dir '".$this->BASE_CACHE."'." |
|
| 40 | 40 | ); |
| 41 | 41 | } |
| 42 | 42 | } |
@@ -48,12 +48,12 @@ discard block |
||
| 48 | 48 | Input: url from wich the rss file was fetched |
| 49 | 49 | Output: true on sucess |
| 50 | 50 | \*=======================================================================*/ |
| 51 | - function set ($url, $rss) { |
|
| 51 | + function set($url, $rss){ |
|
| 52 | 52 | $this->ERROR = ""; |
| 53 | - $cache_file = $this->file_name( $url ); |
|
| 54 | - $fp = @fopen( $cache_file, 'w' ); |
|
| 53 | + $cache_file = $this->file_name($url); |
|
| 54 | + $fp = @fopen($cache_file, 'w'); |
|
| 55 | 55 | |
| 56 | - if ( ! $fp ) { |
|
| 56 | + if (!$fp) { |
|
| 57 | 57 | $this->error( |
| 58 | 58 | "Cache unable to open file for writing: $cache_file" |
| 59 | 59 | ); |
@@ -61,9 +61,9 @@ discard block |
||
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | |
| 64 | - $data = $this->serialize( $rss ); |
|
| 65 | - fwrite( $fp, $data ); |
|
| 66 | - fclose( $fp ); |
|
| 64 | + $data = $this->serialize($rss); |
|
| 65 | + fwrite($fp, $data); |
|
| 66 | + fclose($fp); |
|
| 67 | 67 | |
| 68 | 68 | return $cache_file; |
| 69 | 69 | } |
@@ -74,11 +74,11 @@ discard block |
||
| 74 | 74 | Input: url from wich the rss file was fetched |
| 75 | 75 | Output: cached object on HIT, false on MISS |
| 76 | 76 | \*=======================================================================*/ |
| 77 | - function get ($url) { |
|
| 77 | + function get($url){ |
|
| 78 | 78 | $this->ERROR = ""; |
| 79 | - $cache_file = $this->file_name( $url ); |
|
| 79 | + $cache_file = $this->file_name($url); |
|
| 80 | 80 | |
| 81 | - if ( ! file_exists( $cache_file ) ) { |
|
| 81 | + if (!file_exists($cache_file)) { |
|
| 82 | 82 | $this->debug( |
| 83 | 83 | "Cache doesn't contain: $url (cache file: $cache_file)" |
| 84 | 84 | ); |
@@ -86,16 +86,16 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | $fp = @fopen($cache_file, 'r'); |
| 89 | - if ( ! $fp ) { |
|
| 89 | + if (!$fp) { |
|
| 90 | 90 | $this->error( |
| 91 | 91 | "Failed to open cache file for reading: $cache_file" |
| 92 | 92 | ); |
| 93 | 93 | return 0; |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - if ($filesize = filesize($cache_file) ) { |
|
| 97 | - $data = fread( $fp, filesize($cache_file) ); |
|
| 98 | - $rss = $this->unserialize( $data ); |
|
| 96 | + if ($filesize = filesize($cache_file)) { |
|
| 97 | + $data = fread($fp, filesize($cache_file)); |
|
| 98 | + $rss = $this->unserialize($data); |
|
| 99 | 99 | |
| 100 | 100 | return $rss; |
| 101 | 101 | } |
@@ -110,16 +110,16 @@ discard block |
||
| 110 | 110 | Input: url from wich the rss file was fetched |
| 111 | 111 | Output: cached object on HIT, false on MISS |
| 112 | 112 | \*=======================================================================*/ |
| 113 | - function check_cache ( $url ) { |
|
| 113 | + function check_cache($url){ |
|
| 114 | 114 | $this->ERROR = ""; |
| 115 | - $filename = $this->file_name( $url ); |
|
| 115 | + $filename = $this->file_name($url); |
|
| 116 | 116 | |
| 117 | - if ( file_exists( $filename ) ) { |
|
| 117 | + if (file_exists($filename)) { |
|
| 118 | 118 | // find how long ago the file was added to the cache |
| 119 | 119 | // and whether that is longer then MAX_AGE |
| 120 | - $mtime = filemtime( $filename ); |
|
| 120 | + $mtime = filemtime($filename); |
|
| 121 | 121 | $age = time() - $mtime; |
| 122 | - if ( $this->MAX_AGE > $age ) { |
|
| 122 | + if ($this->MAX_AGE > $age) { |
|
| 123 | 123 | // object exists and is current |
| 124 | 124 | return 'HIT'; |
| 125 | 125 | } |
@@ -134,10 +134,10 @@ discard block |
||
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - function cache_age( $cache_key ) { |
|
| 138 | - $filename = $this->file_name( $url ); |
|
| 139 | - if ( file_exists( $filename ) ) { |
|
| 140 | - $mtime = filemtime( $filename ); |
|
| 137 | + function cache_age($cache_key){ |
|
| 138 | + $filename = $this->file_name($url); |
|
| 139 | + if (file_exists($filename)) { |
|
| 140 | + $mtime = filemtime($filename); |
|
| 141 | 141 | $age = time() - $mtime; |
| 142 | 142 | return $age; |
| 143 | 143 | } |
@@ -149,15 +149,15 @@ discard block |
||
| 149 | 149 | /*=======================================================================*\ |
| 150 | 150 | Function: serialize |
| 151 | 151 | \*=======================================================================*/ |
| 152 | - function serialize ( $rss ) { |
|
| 153 | - return serialize( $rss ); |
|
| 152 | + function serialize($rss){ |
|
| 153 | + return serialize($rss); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | /*=======================================================================*\ |
| 157 | 157 | Function: unserialize |
| 158 | 158 | \*=======================================================================*/ |
| 159 | - function unserialize ( $data ) { |
|
| 160 | - return unserialize( $data ); |
|
| 159 | + function unserialize($data){ |
|
| 160 | + return unserialize($data); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | /*=======================================================================*\ |
@@ -166,31 +166,31 @@ discard block |
||
| 166 | 166 | Input: url from wich the rss file was fetched |
| 167 | 167 | Output: a file name |
| 168 | 168 | \*=======================================================================*/ |
| 169 | - function file_name ($url) { |
|
| 170 | - $filename = md5( $url ); |
|
| 171 | - return implode( DIRECTORY_SEPARATOR, array( $this->BASE_CACHE, $filename ) ); |
|
| 169 | + function file_name($url){ |
|
| 170 | + $filename = md5($url); |
|
| 171 | + return implode(DIRECTORY_SEPARATOR, array($this->BASE_CACHE, $filename)); |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | /*=======================================================================*\ |
| 175 | 175 | Function: error |
| 176 | 176 | Purpose: register error |
| 177 | 177 | \*=======================================================================*/ |
| 178 | - function error ($errormsg, $lvl=E_USER_WARNING) { |
|
| 178 | + function error($errormsg, $lvl = E_USER_WARNING){ |
|
| 179 | 179 | // append PHP's error message if track_errors enabled |
| 180 | - if ( isset($php_errormsg) ) { |
|
| 180 | + if (isset($php_errormsg)) { |
|
| 181 | 181 | $errormsg .= " ($php_errormsg)"; |
| 182 | 182 | } |
| 183 | 183 | $this->ERROR = $errormsg; |
| 184 | - if ( MAGPIE_DEBUG ) { |
|
| 185 | - trigger_error( $errormsg, $lvl); |
|
| 184 | + if (MAGPIE_DEBUG) { |
|
| 185 | + trigger_error($errormsg, $lvl); |
|
| 186 | 186 | } |
| 187 | 187 | else { |
| 188 | - error_log( $errormsg, 0); |
|
| 188 | + error_log($errormsg, 0); |
|
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | - function debug ($debugmsg, $lvl=E_USER_NOTICE) { |
|
| 193 | - if ( MAGPIE_DEBUG ) { |
|
| 192 | + function debug($debugmsg, $lvl = E_USER_NOTICE){ |
|
| 193 | + if (MAGPIE_DEBUG) { |
|
| 194 | 194 | $this->error("MagpieRSS [debug] $debugmsg", $lvl); |
| 195 | 195 | } |
| 196 | 196 | } |
@@ -1,12 +1,12 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.'); |
| 4 | 4 | } |
| 5 | 5 | if (!$modx->hasPermission('save_plugin')) { |
| 6 | 6 | $modx->webAlertAndQuit($_lang['error_no_privileges']); |
| 7 | 7 | } |
| 8 | 8 | |
| 9 | -$id = (int)$_POST['id']; |
|
| 9 | +$id = (int) $_POST['id']; |
|
| 10 | 10 | $name = $modx->db->escape(trim($_POST['name'])); |
| 11 | 11 | $description = $modx->db->escape($_POST['description']); |
| 12 | 12 | $locked = $_POST['locked'] == 'on' ? '1' : '0'; |
@@ -20,11 +20,11 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | //Kyle Jaebker - added category support |
| 22 | 22 | if (empty($_POST['newcategory']) && $_POST['categoryid'] > 0) { |
| 23 | - $categoryid = (int)$_POST['categoryid']; |
|
| 23 | + $categoryid = (int) $_POST['categoryid']; |
|
| 24 | 24 | } elseif (empty($_POST['newcategory']) && $_POST['categoryid'] <= 0) { |
| 25 | 25 | $categoryid = 0; |
| 26 | 26 | } else { |
| 27 | - include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php'); |
|
| 27 | + include_once(MODX_MANAGER_PATH.'includes/categories.inc.php'); |
|
| 28 | 28 | $categoryid = getCategory($_POST['newcategory']); |
| 29 | 29 | } |
| 30 | 30 | |
@@ -40,12 +40,12 @@ discard block |
||
| 40 | 40 | $moduleguid = isset($parsed['guid']) ? $parsed['guid'] : $moduleguid; |
| 41 | 41 | |
| 42 | 42 | $description = isset($parsed['description']) ? $parsed['description'] : $description; |
| 43 | - $version = isset($parsed['version']) ? '<b>' . $parsed['version'] . '</b> ' : ''; |
|
| 43 | + $version = isset($parsed['version']) ? '<b>'.$parsed['version'].'</b> ' : ''; |
|
| 44 | 44 | if ($version) { |
| 45 | - $description = $version . trim(preg_replace('/(<b>.+?)+(<\/b>)/i', '', $description)); |
|
| 45 | + $description = $version.trim(preg_replace('/(<b>.+?)+(<\/b>)/i', '', $description)); |
|
| 46 | 46 | } |
| 47 | 47 | if (isset($parsed['modx_category'])) { |
| 48 | - include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php'); |
|
| 48 | + include_once(MODX_MANAGER_PATH.'includes/categories.inc.php'); |
|
| 49 | 49 | $categoryid = getCategory($parsed['modx_category']); |
| 50 | 50 | } |
| 51 | 51 | } |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | // finished emptying cache - redirect |
| 104 | 104 | if ($_POST['stay'] != '') { |
| 105 | 105 | $a = ($_POST['stay'] == '2') ? "102&id=$newid" : '101'; |
| 106 | - $header = 'Location: index.php?a=' . $a . '&r=2&stay=' . $_POST['stay']; |
|
| 106 | + $header = 'Location: index.php?a='.$a.'&r=2&stay='.$_POST['stay']; |
|
| 107 | 107 | header($header); |
| 108 | 108 | } else { |
| 109 | 109 | $header = 'Location: index.php?a=76&r=2'; |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | // finished emptying cache - redirect |
| 159 | 159 | if ($_POST['stay'] != '') { |
| 160 | 160 | $a = ($_POST['stay'] == '2') ? "102&id=$id" : '101'; |
| 161 | - $header = 'Location: index.php?a=' . $a . '&r=2&stay=' . $_POST['stay']; |
|
| 161 | + $header = 'Location: index.php?a='.$a.'&r=2&stay='.$_POST['stay']; |
|
| 162 | 162 | header($header); |
| 163 | 163 | } else { |
| 164 | 164 | $modx->unlockElement(5, $id); |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | // save selected system events |
| 178 | 178 | $formEventList = array(); |
| 179 | 179 | foreach ($sysevents as $evtId) { |
| 180 | - if(!preg_match('@^[1-9][0-9]*$@',$evtId)) $evtId = getEventIdByName($evtId); |
|
| 180 | + if (!preg_match('@^[1-9][0-9]*$@', $evtId)) $evtId = getEventIdByName($evtId); |
|
| 181 | 181 | if ($mode == '101') { |
| 182 | 182 | $rs = $modx->db->select('max(priority) as priority', '[+prefix+]site_plugin_events', "evtid='{$evtId}'"); |
| 183 | 183 | } else { |
@@ -202,13 +202,13 @@ discard block |
||
| 202 | 202 | $rs = $modx->db->select('*', '[+prefix+]site_plugin_events', sprintf("pluginid='%s'", $id)); |
| 203 | 203 | $dbEventList = array(); |
| 204 | 204 | $del = array(); |
| 205 | - while($row = $modx->db->getRow($rs)) { |
|
| 206 | - if(!in_array($row['evtid'], $evtids)) $del[] = $row['evtid']; |
|
| 205 | + while ($row = $modx->db->getRow($rs)) { |
|
| 206 | + if (!in_array($row['evtid'], $evtids)) $del[] = $row['evtid']; |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | - if(empty($del)) return; |
|
| 209 | + if (empty($del)) return; |
|
| 210 | 210 | |
| 211 | - foreach($del as $delid) { |
|
| 211 | + foreach ($del as $delid) { |
|
| 212 | 212 | $modx->db->delete('[+prefix+]site_plugin_events', sprintf("evtid='%s' AND pluginid='%s'", $delid, $id)); |
| 213 | 213 | } |
| 214 | 214 | } |
@@ -216,9 +216,9 @@ discard block |
||
| 216 | 216 | function getEventIdByName($name) |
| 217 | 217 | { |
| 218 | 218 | global $modx; |
| 219 | - static $eventIds=array(); |
|
| 219 | + static $eventIds = array(); |
|
| 220 | 220 | |
| 221 | - if(isset($eventIds[$name])) return $eventIds[$name]; |
|
| 221 | + if (isset($eventIds[$name])) return $eventIds[$name]; |
|
| 222 | 222 | |
| 223 | 223 | $rs = $modx->db->select('id, name', '[+prefix+]system_eventnames'); |
| 224 | 224 | while ($row = $modx->db->getRow($rs)) { |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | $modx->getSettings(); |
| 6 | 6 | $modx->invokeEvent('OnWebPageInit'); |
| 7 | 7 | |
| 8 | -$vword = new VeriWord(148,60); |
|
| 8 | +$vword = new VeriWord(148, 60); |
|
| 9 | 9 | $vword->output_image(); |
| 10 | 10 | $vword->destroy_image(); |
| 11 | 11 | |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | ## see sample.php for test and usage |
| 42 | 42 | ## sample URL: http://www.program-ruti.org/veriword/ |
| 43 | 43 | #### |
| 44 | -class VeriWord { |
|
| 44 | +class VeriWord{ |
|
| 45 | 45 | |
| 46 | 46 | /* path to font directory*/ |
| 47 | 47 | public $dir_font = "ttf/"; |
@@ -52,44 +52,44 @@ discard block |
||
| 52 | 52 | public $im_height = 0; |
| 53 | 53 | public $im; |
| 54 | 54 | |
| 55 | - public function __construct($w=200, $h=80) { |
|
| 55 | + public function __construct($w = 200, $h = 80){ |
|
| 56 | 56 | /* create session to set word for verification */ |
| 57 | 57 | $this->set_veriword(); |
| 58 | - $this->dir_font = dirname(__FILE__) . '/' . $this->dir_font; |
|
| 58 | + $this->dir_font = dirname(__FILE__).'/'.$this->dir_font; |
|
| 59 | 59 | $this->im_width = $w; |
| 60 | 60 | $this->im_height = $h; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - public function set_veriword() { |
|
| 63 | + public function set_veriword(){ |
|
| 64 | 64 | /* create session variable for verification, |
| 65 | 65 | you may change the session variable name */ |
| 66 | 66 | $this->word = $this->pick_word(); |
| 67 | 67 | $_SESSION['veriword'] = $this->word; |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - public function output_image() { |
|
| 70 | + public function output_image(){ |
|
| 71 | 71 | /* output the image as jpeg */ |
| 72 | 72 | $this->draw_image(); |
| 73 | 73 | header("Content-type: image/jpeg"); |
| 74 | 74 | imagejpeg($this->im); |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public function pick_word() { |
|
| 77 | + public function pick_word(){ |
|
| 78 | 78 | global $modx; |
| 79 | 79 | // set default words |
| 80 | - $words="MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote"; |
|
| 80 | + $words = "MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote"; |
|
| 81 | 81 | $words = $modx->config['captcha_words'] ? $modx->config['captcha_words'] : $words; |
| 82 | 82 | $arr_words = array_filter(array_map('trim', explode(',', $words))); |
| 83 | 83 | |
| 84 | 84 | /* pick one randomly for text verification */ |
| 85 | - return (string) $arr_words[array_rand($arr_words)].rand(10,999); |
|
| 85 | + return (string) $arr_words[array_rand($arr_words)].rand(10, 999); |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - public function draw_text() { |
|
| 88 | + public function draw_text(){ |
|
| 89 | 89 | $dir = dir($this->dir_font); |
| 90 | 90 | $fontstmp = array(); |
| 91 | 91 | while (false !== ($file = $dir->read())) { |
| 92 | - if(substr($file, -4) == '.ttf') { |
|
| 92 | + if (substr($file, -4) == '.ttf') { |
|
| 93 | 93 | $fontstmp[] = $this->dir_font.$file; |
| 94 | 94 | } |
| 95 | 95 | } |
@@ -97,35 +97,35 @@ discard block |
||
| 97 | 97 | $text_font = (string) $fontstmp[array_rand($fontstmp)]; |
| 98 | 98 | |
| 99 | 99 | /* angle for text inclination */ |
| 100 | - $text_angle = rand(-9,9); |
|
| 100 | + $text_angle = rand(-9, 9); |
|
| 101 | 101 | /* initial text size */ |
| 102 | 102 | $text_size = 30; |
| 103 | 103 | /* calculate text width and height */ |
| 104 | - $box = imagettfbbox ( $text_size, $text_angle, $text_font, $this->word); |
|
| 105 | - $text_width = $box[2]-$box[0]; //text width |
|
| 106 | - $text_height= $box[5]-$box[3]; //text height |
|
| 104 | + $box = imagettfbbox($text_size, $text_angle, $text_font, $this->word); |
|
| 105 | + $text_width = $box[2] - $box[0]; //text width |
|
| 106 | + $text_height = $box[5] - $box[3]; //text height |
|
| 107 | 107 | |
| 108 | 108 | /* adjust text size */ |
| 109 | - $text_size = round((20 * $this->im_width)/$text_width); |
|
| 109 | + $text_size = round((20 * $this->im_width) / $text_width); |
|
| 110 | 110 | |
| 111 | 111 | /* recalculate text width and height */ |
| 112 | - $box = imagettfbbox ( $text_size, $text_angle, $text_font, $this->word); |
|
| 113 | - $text_width = $box[2]-$box[0]; //text width |
|
| 114 | - $text_height= $box[5]-$box[3]; //text height |
|
| 112 | + $box = imagettfbbox($text_size, $text_angle, $text_font, $this->word); |
|
| 113 | + $text_width = $box[2] - $box[0]; //text width |
|
| 114 | + $text_height = $box[5] - $box[3]; //text height |
|
| 115 | 115 | |
| 116 | 116 | /* calculate center position of text */ |
| 117 | - $text_x = ($this->im_width - $text_width)/2; |
|
| 118 | - $text_y = ($this->im_height - $text_height)/2; |
|
| 117 | + $text_x = ($this->im_width - $text_width) / 2; |
|
| 118 | + $text_y = ($this->im_height - $text_height) / 2; |
|
| 119 | 119 | |
| 120 | 120 | /* create canvas for text drawing */ |
| 121 | - $im_text = imagecreate ($this->im_width, $this->im_height); |
|
| 122 | - $bg_color = imagecolorallocate ($im_text, 255, 255, 255); |
|
| 121 | + $im_text = imagecreate($this->im_width, $this->im_height); |
|
| 122 | + $bg_color = imagecolorallocate($im_text, 255, 255, 255); |
|
| 123 | 123 | |
| 124 | 124 | /* pick color for text */ |
| 125 | - $text_color = imagecolorallocate ($im_text, 0, 51, 153); |
|
| 125 | + $text_color = imagecolorallocate($im_text, 0, 51, 153); |
|
| 126 | 126 | |
| 127 | 127 | /* draw text into canvas */ |
| 128 | - imagettftext ( $im_text, |
|
| 128 | + imagettftext($im_text, |
|
| 129 | 129 | $text_size, |
| 130 | 130 | $text_angle, |
| 131 | 131 | $text_x, |
@@ -140,19 +140,19 @@ discard block |
||
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | |
| 143 | - public function draw_image() { |
|
| 143 | + public function draw_image(){ |
|
| 144 | 144 | |
| 145 | 145 | /* pick one background image randomly from image directory */ |
| 146 | - $img_file = $this->dir_noise."noise".rand(1,4).".jpg"; |
|
| 146 | + $img_file = $this->dir_noise."noise".rand(1, 4).".jpg"; |
|
| 147 | 147 | |
| 148 | 148 | /* create "noise" background image from your image stock*/ |
| 149 | - $noise_img = @imagecreatefromjpeg ($img_file); |
|
| 149 | + $noise_img = @imagecreatefromjpeg($img_file); |
|
| 150 | 150 | $noise_width = imagesx($noise_img); |
| 151 | 151 | $noise_height = imagesy($noise_img); |
| 152 | 152 | |
| 153 | 153 | /* resize the background image to fit the size of image output */ |
| 154 | - $this->im = imagecreatetruecolor($this->im_width,$this->im_height); |
|
| 155 | - imagecopyresampled ($this->im, |
|
| 154 | + $this->im = imagecreatetruecolor($this->im_width, $this->im_height); |
|
| 155 | + imagecopyresampled($this->im, |
|
| 156 | 156 | $noise_img, |
| 157 | 157 | 0, 0, 0, 0, |
| 158 | 158 | $this->im_width, |
@@ -161,17 +161,17 @@ discard block |
||
| 161 | 161 | $noise_height); |
| 162 | 162 | |
| 163 | 163 | /* put text image into background image */ |
| 164 | - imagecopymerge ( $this->im, |
|
| 164 | + imagecopymerge($this->im, |
|
| 165 | 165 | $this->draw_text(), |
| 166 | 166 | 0, 0, 0, 0, |
| 167 | 167 | $this->im_width, |
| 168 | 168 | $this->im_height, |
| 169 | - 70 ); |
|
| 169 | + 70); |
|
| 170 | 170 | |
| 171 | 171 | return $this->im; |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - public function destroy_image() { |
|
| 174 | + public function destroy_image(){ |
|
| 175 | 175 | |
| 176 | 176 | imagedestroy($this->im); |
| 177 | 177 | |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! function_exists('install_sessionCheck')) { |
|
| 2 | +if (!function_exists('install_sessionCheck')) { |
|
| 3 | 3 | function install_sessionCheck() |
| 4 | 4 | { |
| 5 | 5 | global $_lang; |
@@ -21,8 +21,8 @@ discard block |
||
| 21 | 21 | </head> |
| 22 | 22 | <body> |
| 23 | 23 | <div class="install"> |
| 24 | - <p>' . $_lang["session_problem"] . '</p> |
|
| 25 | - <p><a href="./">' . $_lang["session_problem_try_again"] . '</a></p> |
|
| 24 | + <p>' . $_lang["session_problem"].'</p> |
|
| 25 | + <p><a href="./">' . $_lang["session_problem_try_again"].'</a></p> |
|
| 26 | 26 | </div> |
| 27 | 27 | </body> |
| 28 | 28 | </html>'; |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | } |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | -if( ! function_exists('parse')) { |
|
| 35 | +if (!function_exists('parse')) { |
|
| 36 | 36 | /** |
| 37 | 37 | * @param string $src |
| 38 | 38 | * @param array $ph |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | function parse($src, $ph, $left = '[+', $right = '+]') |
| 44 | 44 | { |
| 45 | 45 | foreach ($ph as $k => $v) { |
| 46 | - $k = $left . $k . $right; |
|
| 46 | + $k = $left.$k.$right; |
|
| 47 | 47 | $src = str_replace($k, $v, $src); |
| 48 | 48 | } |
| 49 | 49 | |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | -if( ! function_exists('ph')) { |
|
| 54 | +if (!function_exists('ph')) { |
|
| 55 | 55 | /** |
| 56 | 56 | * @return array |
| 57 | 57 | */ |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $ph['textdir'] = $modx_textdir ? ' id="rtl"' : ''; |
| 71 | 71 | $ph['help_link'] = $installmode == 0 ? $_lang['help_link_new'] : $_lang['help_link_upd']; |
| 72 | 72 | $ph['version'] = $moduleVersion; |
| 73 | - $ph['release_date'] = ($modx_textdir ? '‏' : '') . $modx_release_date; |
|
| 73 | + $ph['release_date'] = ($modx_textdir ? '‏' : '').$modx_release_date; |
|
| 74 | 74 | $ph['footer1'] = $_lang['modx_footer1']; |
| 75 | 75 | $ph['footer2'] = $_lang['modx_footer2']; |
| 76 | 76 | $ph['current_year'] = date('Y'); |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | } |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | -if( ! function_exists('get_installmode')) { |
|
| 82 | +if (!function_exists('get_installmode')) { |
|
| 83 | 83 | /** |
| 84 | 84 | * @return int |
| 85 | 85 | */ |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | } |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | -if( ! function_exists('getLangs')) { |
|
| 144 | +if (!function_exists('getLangs')) { |
|
| 145 | 145 | /** |
| 146 | 146 | * @param string $install_language |
| 147 | 147 | * @return string |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | $langs = array(); |
| 158 | - if ($handle = opendir("../" . MGR_DIR . "/includes/lang")) { |
|
| 158 | + if ($handle = opendir("../".MGR_DIR."/includes/lang")) { |
|
| 159 | 159 | while (false !== ($file = readdir($handle))) { |
| 160 | 160 | if (strpos($file, '.inc.') !== false) { |
| 161 | 161 | $langs[] = $file; |
