X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWatchedItem.php;h=d1c152963a15aaacf7c70d83eba563af86bb3949;hb=30a062321afb63a2a3dfc1a67a7c1e5cbd70e369;hp=b0376e3d1e2ba5e3ba83e9e782cb88b8e1cd112c;hpb=f88c771756c580442fe7ca2f84bcbb8067b77f57;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php index b0376e3d1e..d1c152963a 100644 --- a/includes/WatchedItem.php +++ b/includes/WatchedItem.php @@ -1,28 +1,30 @@ mUser =& $user; - $wl->mTitle =& $title; + $wl->mUser = $user; + $wl->mTitle = $title; $wl->id = $user->getId(); -# Patch (also) for email notification on page changes T.Gries/M.Arndt 11.09.2004 -# TG patch: here we do not consider pages and their talk pages equivalent - why should we ? -# The change results in talk-pages not automatically included in watchlists, when their parent page is included -# $wl->ns = $title->getNamespace() & ~1; + # Patch (also) for email notification on page changes T.Gries/M.Arndt 11.09.2004 + # TG patch: here we do not consider pages and their talk pages equivalent - why should we ? + # The change results in talk-pages not automatically included in watchlists, when their parent page is included + # $wl->ns = $title->getNamespace() & ~1; $wl->ns = $title->getNamespace(); $wl->ti = $title->getDBkey(); @@ -31,62 +33,65 @@ class WatchedItem { /** * Is mTitle being watched by mUser? + * @return bool */ - function isWatched() { + public function isWatched() { # Pages and their talk pages are considered equivalent for watching; # remember that talk namespaces are numbered as page namespace+1. - $fname = 'WatchedItem::isWatched'; $dbr = wfGetDB( DB_SLAVE ); $res = $dbr->select( 'watchlist', 1, array( 'wl_user' => $this->id, 'wl_namespace' => $this->ns, - 'wl_title' => $this->ti ), $fname ); + 'wl_title' => $this->ti ), __METHOD__ ); $iswatched = ($dbr->numRows( $res ) > 0) ? 1 : 0; return $iswatched; } /** - * @todo document + * Given a title and user (assumes the object is setup), add the watch to the + * database. + * @return bool (always true) */ - function addWatch() { - $fname = 'WatchedItem::addWatch'; - wfProfileIn( $fname ); + public function addWatch() { + wfProfileIn( __METHOD__ ); // Use INSERT IGNORE to avoid overwriting the notification timestamp // if there's already an entry for this page $dbw = wfGetDB( DB_MASTER ); $dbw->insert( 'watchlist', array( - 'wl_user' => $this->id, - 'wl_namespace' => ($this->ns & ~1), + 'wl_user' => $this->id, + 'wl_namespace' => MWNamespace::getSubject($this->ns), 'wl_title' => $this->ti, - 'wl_notificationtimestamp' => NULL - ), $fname, 'IGNORE' ); + 'wl_notificationtimestamp' => null + ), __METHOD__, 'IGNORE' ); // Every single watched page needs now to be listed in watchlist; // namespace:page and namespace_talk:page need separate entries: $dbw->insert( 'watchlist', array( 'wl_user' => $this->id, - 'wl_namespace' => ($this->ns | 1 ), + 'wl_namespace' => MWNamespace::getTalk($this->ns), 'wl_title' => $this->ti, - 'wl_notificationtimestamp' => NULL - ), $fname, 'IGNORE' ); + 'wl_notificationtimestamp' => null + ), __METHOD__, 'IGNORE' ); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return true; } - function removeWatch() { - $fname = 'WatchedItem::removeWatch'; - + /** + * Same as addWatch, only the opposite. + * @return bool + */ + public function removeWatch() { $success = false; $dbw = wfGetDB( DB_MASTER ); $dbw->delete( 'watchlist', array( 'wl_user' => $this->id, - 'wl_namespace' => ($this->ns & ~1), + 'wl_namespace' => MWNamespace::getSubject($this->ns), 'wl_title' => $this->ti - ), $fname + ), __METHOD__ ); if ( $dbw->affectedRows() ) { $success = true; @@ -99,9 +104,9 @@ class WatchedItem { $dbw->delete( 'watchlist', array( 'wl_user' => $this->id, - 'wl_namespace' => ($this->ns | 1), + 'wl_namespace' => MWNamespace::getTalk($this->ns), 'wl_title' => $this->ti - ), $fname + ), __METHOD__ ); if ( $dbw->affectedRows() ) { @@ -114,21 +119,18 @@ class WatchedItem { * Check if the given title already is watched by the user, and if so * add watches on a new title. To be used for page renames and such. * - * @param Title $ot Page title to duplicate entries from, if present - * @param Title $nt Page title to add watches on - * @static + * @param $ot Title: page title to duplicate entries from, if present + * @param $nt Title: page title to add watches on */ - function duplicateEntries( $ot, $nt ) { + public static function duplicateEntries( $ot, $nt ) { WatchedItem::doDuplicateEntries( $ot->getSubjectPage(), $nt->getSubjectPage() ); WatchedItem::doDuplicateEntries( $ot->getTalkPage(), $nt->getTalkPage() ); } /** - * @static - * @access private + * Handle duplicate entries. Backend for duplicateEntries(). */ - function doDuplicateEntries( $ot, $nt ) { - $fname = "WatchedItem::duplicateEntries"; + private static function doDuplicateEntries( $ot, $nt ) { $oldnamespace = $ot->getNamespace(); $newnamespace = $nt->getNamespace(); $oldtitle = $ot->getDBkey(); @@ -137,7 +139,7 @@ class WatchedItem { $dbw = wfGetDB( DB_MASTER ); $res = $dbw->select( 'watchlist', 'wl_user', array( 'wl_namespace' => $oldnamespace, 'wl_title' => $oldtitle ), - $fname, 'FOR UPDATE' + __METHOD__, 'FOR UPDATE' ); # Construct array to replace into the watchlist $values = array(); @@ -158,11 +160,7 @@ class WatchedItem { # Perform replace # Note that multi-row replace is very efficient for MySQL but may be inefficient for # some other DBMSes, mostly due to poor simulation by us - $dbw->replace( 'watchlist', array(array( 'wl_user', 'wl_namespace', 'wl_title')), $values, $fname ); + $dbw->replace( 'watchlist', array( array( 'wl_user', 'wl_namespace', 'wl_title' ) ), $values, __METHOD__ ); return true; } - - } - -?>