X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FFeedUtils.php;h=22cb52beba36f823a0551a1ea709957e0806b16f;hb=9e6e407dc97626412e4531de254daac75498d0ba;hp=82c6e4a0ea6fc72a4fc6f6f7859ab9c2c204538a;hpb=2b69c9525bcf75ad0ea203d4256cfef9e3d6fd40;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php index 82c6e4a0ea..22cb52beba 100644 --- a/includes/FeedUtils.php +++ b/includes/FeedUtils.php @@ -33,13 +33,13 @@ class FeedUtils { * If the feed should be purged; $timekey and $key will be removed from * $messageMemc * - * @param $timekey String: cache key of the timestamp of the last item - * @param $key String: cache key of feed's content + * @param string $timekey cache key of the timestamp of the last item + * @param string $key cache key of feed's content */ public static function checkPurge( $timekey, $key ) { global $wgRequest, $wgUser, $messageMemc; $purge = $wgRequest->getVal( 'action' ) === 'purge'; - if ( $purge && $wgUser->isAllowed('purge') ) { + if ( $purge && $wgUser->isAllowed( 'purge' ) ) { $messageMemc->delete( $timekey ); $messageMemc->delete( $key ); } @@ -48,7 +48,7 @@ class FeedUtils { /** * Check whether feeds can be used and that $type is a valid feed type * - * @param $type String: feed type, as requested by the user + * @param string $type feed type, as requested by the user * @return Boolean */ public static function checkFeedOutput( $type ) { @@ -59,7 +59,7 @@ class FeedUtils { return false; } - if( !isset( $wgFeedClasses[$type] ) ) { + if ( !isset( $wgFeedClasses[$type] ) ) { $wgOut->addWikiMsg( 'feed-invalid' ); return false; } @@ -77,15 +77,15 @@ class FeedUtils { $titleObj = Title::makeTitle( $row->rc_namespace, $row->rc_title ); $timestamp = wfTimestamp( TS_MW, $row->rc_timestamp ); $actiontext = ''; - if( $row->rc_type == RC_LOG ) { + if ( $row->rc_type == RC_LOG ) { $rcRow = (array)$row; // newFromRow() only accepts arrays for RC rows $actiontext = LogFormatter::newFromRow( $rcRow )->getActionText(); } return self::formatDiffRow( $titleObj, $row->rc_last_oldid, $row->rc_this_oldid, $timestamp, - ($row->rc_deleted & Revision::DELETED_COMMENT) - ? wfMessage('rev-deleted-comment')->escaped() + $row->rc_deleted & Revision::DELETED_COMMENT + ? wfMessage( 'rev-deleted-comment' )->escaped() : $row->rc_comment, $actiontext ); @@ -98,15 +98,15 @@ class FeedUtils { * @param $oldid Integer: old revision's id * @param $newid Integer: new revision's id * @param $timestamp Integer: new revision's timestamp - * @param $comment String: new revision's comment - * @param $actiontext String: text of the action; in case of log event + * @param string $comment new revision's comment + * @param string $actiontext text of the action; in case of log event * @return String */ - public static function formatDiffRow( $title, $oldid, $newid, $timestamp, $comment, $actiontext='' ) { + public static function formatDiffRow( $title, $oldid, $newid, $timestamp, $comment, $actiontext = '' ) { global $wgFeedDiffCutoff, $wgLang; wfProfileIn( __METHOD__ ); - # log enties + // log entries $completeText = '

' . implode( ' ', array_filter( array( @@ -115,19 +115,19 @@ class FeedUtils { // NOTE: Check permissions for anonymous users, not current user. // No "privileged" version should end up in the cache. - // Most feed readers will not log in anway. + // Most feed readers will not log in anyway. $anon = new User(); $accErrors = $title->getUserPermissionsErrors( 'read', $anon, true ); // Can't diff special pages, unreadable pages or pages with no new revision // to compare against: just return the text. - if( $title->getNamespace() < 0 || $accErrors || !$newid ) { + if ( $title->getNamespace() < 0 || $accErrors || !$newid ) { wfProfileOut( __METHOD__ ); return $completeText; } - if( $oldid ) { - wfProfileIn( __METHOD__."-dodiff" ); + if ( $oldid ) { + wfProfileIn( __METHOD__ . "-dodiff" ); #$diffText = $de->getDiff( wfMessage( 'revisionasof', # $wgLang->timeanddate( $timestamp ), @@ -168,10 +168,10 @@ class FeedUtils { $diffText = UtfNormal::cleanUp( $diffText ); $diffText = self::applyDiffStyle( $diffText ); } - wfProfileOut( __METHOD__."-dodiff" ); + wfProfileOut( __METHOD__ . "-dodiff" ); } else { $rev = Revision::newFromId( $newid ); - if( $wgFeedDiffCutoff <= 0 || is_null( $rev ) ) { + if ( $wgFeedDiffCutoff <= 0 || is_null( $rev ) ) { $newContent = ContentHandler::getForTitle( $title )->makeEmptyContent(); } else { $newContent = $rev->getContent(); @@ -220,10 +220,11 @@ class FeedUtils { * @return string */ protected static function getDiffLink( Title $title, $newid, $oldid = null ) { - $queryParameters = ($oldid == null) - ? "diff={$newid}" - : "diff={$newid}&oldid={$oldid}" ; - $diffUrl = $title->getFullUrl( $queryParameters ); + $queryParameters = array( 'diff' => $newid ); + if ( $oldid != null ) { + $queryParameters['oldid'] = $oldid; + } + $diffUrl = $title->getFullURL( $queryParameters ); $diffLink = Html::element( 'a', array( 'href' => $diffUrl ), wfMessage( 'showdiff' )->inContentLanguage()->text() ); @@ -236,21 +237,21 @@ class FeedUtils { * Might be 'cleaner' to use DOM or XSLT or something, * but *gack* it's a pain in the ass. * - * @param $text String: diff's HTML output + * @param string $text diff's HTML output * @return String: modified HTML */ public static function applyDiffStyle( $text ) { $styles = array( 'diff' => 'background-color: white; color:black;', - 'diff-otitle' => 'background-color: white; color:black;', - 'diff-ntitle' => 'background-color: white; color:black;', - 'diff-addedline' => 'background: #cfc; color:black; font-size: smaller;', - 'diff-deletedline' => 'background: #ffa; color:black; font-size: smaller;', - 'diff-context' => 'background: #eee; color:black; font-size: smaller;', - 'diffchange' => 'color: red; font-weight: bold; text-decoration: none;', + 'diff-otitle' => 'background-color: white; color:black; text-align: center;', + 'diff-ntitle' => 'background-color: white; color:black; text-align: center;', + 'diff-addedline' => 'color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;', + 'diff-deletedline' => 'color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;', + 'diff-context' => 'background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;', + 'diffchange' => 'font-weight: bold; text-decoration: none;', ); - foreach( $styles as $class => $style ) { + foreach ( $styles as $class => $style ) { $text = preg_replace( "/(<[^>]+)class=(['\"])$class\\2([^>]*>)/", "\\1style=\"$style\"\\3", $text ); }