| Index: trunk/phase3/maintenance/Doxyfile |
| — | — | @@ -16,7 +16,7 @@ |
| 17 | 17 | PROJECT_NAME = MediaWiki |
| 18 | 18 | PROJECT_NUMBER = {{CURRENT_VERSION}} |
| 19 | 19 | OUTPUT_DIRECTORY = {{OUTPUT_DIRECTORY}} |
| 20 | | -CREATE_SUBDIRS = YES |
| | 20 | +CREATE_SUBDIRS = NO |
| 21 | 21 | OUTPUT_LANGUAGE = English |
| 22 | 22 | BRIEF_MEMBER_DESC = YES |
| 23 | 23 | REPEAT_BRIEF = YES |
| — | — | @@ -175,7 +175,7 @@ |
| 176 | 176 | HHC_LOCATION = |
| 177 | 177 | GENERATE_CHI = NO |
| 178 | 178 | BINARY_TOC = NO |
| 179 | | -TOC_EXPAND = YES |
| | 179 | +TOC_EXPAND = NO |
| 180 | 180 | DISABLE_INDEX = NO |
| 181 | 181 | ENUM_VALUES_PER_LINE = 4 |
| 182 | 182 | GENERATE_TREEVIEW = YES |
| — | — | @@ -191,8 +191,8 @@ |
| 192 | 192 | PAPER_TYPE = a4wide |
| 193 | 193 | EXTRA_PACKAGES = |
| 194 | 194 | LATEX_HEADER = |
| 195 | | -PDF_HYPERLINKS = YES |
| 196 | | -USE_PDFLATEX = YES |
| | 195 | +PDF_HYPERLINKS = NO |
| | 196 | +USE_PDFLATEX = NO |
| 197 | 197 | LATEX_BATCHMODE = NO |
| 198 | 198 | LATEX_HIDE_INDICES = NO |
| 199 | 199 | #--------------------------------------------------------------------------- |
| — | — | @@ -207,7 +207,7 @@ |
| 208 | 208 | #--------------------------------------------------------------------------- |
| 209 | 209 | # configuration options related to the man page output |
| 210 | 210 | #--------------------------------------------------------------------------- |
| 211 | | -GENERATE_MAN = NO |
| | 211 | +GENERATE_MAN = YES |
| 212 | 212 | MAN_OUTPUT = man |
| 213 | 213 | MAN_EXTENSION = .3 |
| 214 | 214 | MAN_LINKS = NO |
| Index: trunk/phase3/includes/User.php |
| — | — | @@ -461,13 +461,8 @@ |
| 462 | 462 | * addresses like this, if we allowed accounts like this to be created |
| 463 | 463 | * new users could get the old edits of these anonymous users. |
| 464 | 464 | * |
| 465 | | -<<<<<<< .mine |
| 466 | | - * @param $name \type{\string} String to match |
| 467 | | - * @return \type{\bool} True or false |
| 468 | | -======= |
| 469 | 465 | * @param $name \type{\string} |
| 470 | 466 | * @return \type{\bool} |
| 471 | | ->>>>>>> .r38752 |
| 472 | 467 | */ |
| 473 | 468 | static function isIP( $name ) { |
| 474 | 469 | return preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.(?:xxx|\d{1,3})$/',$name) || IP::isIPv6($name); |
| — | — | @@ -481,13 +476,8 @@ |
| 482 | 477 | * is longer than the maximum allowed username size or doesn't begin with |
| 483 | 478 | * a capital letter. |
| 484 | 479 | * |
| 485 | | -<<<<<<< .mine |
| 486 | | - * @param $name \type{\string} String to match |
| 487 | | - * @return \type{\bool} True or false |
| 488 | | -======= |
| 489 | 480 | * @param $name \type{\string} |
| 490 | 481 | * @return \type{\bool} |
| 491 | | ->>>>>>> .r38752 |
| 492 | 482 | */ |
| 493 | 483 | static function isValidUserName( $name ) { |
| 494 | 484 | global $wgContLang, $wgMaxNameChars; |
| — | — | @@ -540,13 +530,8 @@ |
| 541 | 531 | * If an account already exists in this form, login will be blocked |
| 542 | 532 | * by a failure to pass this function. |
| 543 | 533 | * |
| 544 | | -<<<<<<< .mine |
| 545 | | - * @param $name \type{\string} String to match |
| 546 | | - * @return \type{\bool} True or false |
| 547 | | -======= |
| 548 | 534 | * @param $name \type{\string} |
| 549 | 535 | * @return \type{\bool} |
| 550 | | ->>>>>>> .r38752 |
| 551 | 536 | */ |
| 552 | 537 | static function isUsableName( $name ) { |
| 553 | 538 | global $wgReservedUsernames; |
| — | — | @@ -577,13 +562,8 @@ |
| 578 | 563 | * rather than in isValidUserName() to avoid disrupting |
| 579 | 564 | * existing accounts. |
| 580 | 565 | * |
| 581 | | -<<<<<<< .mine |
| 582 | | - * @param $name \type{\string} String to match |
| 583 | | - * @return \type{\bool} True or false |
| 584 | | -======= |
| 585 | 566 | * @param $name \type{\string} |
| 586 | 567 | * @return \type{\bool} |
| 587 | | ->>>>>>> .r38752 |
| 588 | 568 | */ |
| 589 | 569 | static function isCreatableName( $name ) { |
| 590 | 570 | return |
| — | — | @@ -596,13 +576,8 @@ |
| 597 | 577 | /** |
| 598 | 578 | * Is the input a valid password for this user? |
| 599 | 579 | * |
| 600 | | -<<<<<<< .mine |
| 601 | 580 | * @param $password \type{\string} Desired password |
| 602 | | - * @return \type{\bool} True or false |
| 603 | | -======= |
| 604 | | - * @param $password \type{\string} Desired password |
| 605 | 581 | * @return \type{\bool} |
| 606 | | ->>>>>>> .r38752 |
| 607 | 582 | */ |
| 608 | 583 | function isValidPassword( $password ) { |
| 609 | 584 | global $wgMinimalPasswordLength, $wgContLang; |
| — | — | @@ -627,13 +602,8 @@ |
| 628 | 603 | * |
| 629 | 604 | * @todo Check for RFC 2822 compilance (bug 959) |
| 630 | 605 | * |
| 631 | | -<<<<<<< .mine |
| 632 | 606 | * @param $addr \type{\string} E-mail address |
| 633 | | - * @return \type{\bool} True or false |
| 634 | | -======= |
| 635 | | - * @param $addr \type{\string} E-mail address |
| 636 | 607 | * @return \type{\bool} |
| 637 | | ->>>>>>> .r38752 |
| 638 | 608 | */ |
| 639 | 609 | public static function isValidEmailAddr( $addr ) { |
| 640 | 610 | $result = null; |
| — | — | @@ -741,11 +711,7 @@ |
| 742 | 712 | * Return a random password. Sourced from mt_rand, so it's not particularly secure. |
| 743 | 713 | * @todo hash random numbers to improve security, like generateToken() |
| 744 | 714 | * |
| 745 | | -<<<<<<< .mine |
| 746 | | - * @return \type{\string} New random password |
| 747 | | -======= |
| 748 | 715 | * @return \type{\string} |
| 749 | | ->>>>>>> .r38752 |
| 750 | 716 | */ |
| 751 | 717 | static function randomPassword() { |
| 752 | 718 | global $wgMinimalPasswordLength; |
| — | — | @@ -1006,13 +972,8 @@ |
| 1007 | 973 | /** |
| 1008 | 974 | * Get a given default option value. |
| 1009 | 975 | * |
| 1010 | | -<<<<<<< .mine |
| 1011 | 976 | * @param $opt \type{\string} Name of option to retrieve |
| 1012 | | - * @return \type{\string} Default option value |
| 1013 | | -======= |
| 1014 | | - * @param $opt \type{\string} Name of option to retrieve |
| 1015 | 977 | * @return \type{\string} |
| 1016 | | ->>>>>>> .r38752 |
| 1017 | 978 | */ |
| 1018 | 979 | public static function getDefaultOption( $opt ) { |
| 1019 | 980 | $defOpts = self::getDefaultOptions(); |
| — | — | @@ -1025,7 +986,7 @@ |
| 1026 | 987 | |
| 1027 | 988 | /** |
| 1028 | 989 | * Get a list of user toggle names |
| 1029 | | - * @return \arrayof{\string} Array of user toggle names |
| | 990 | + * @return \arrayof{\string} |
| 1030 | 991 | */ |
| 1031 | 992 | static function getToggles() { |
| 1032 | 993 | global $wgContLang; |
| — | — | @@ -1112,13 +1073,8 @@ |
| 1113 | 1074 | /** |
| 1114 | 1075 | * Whether the given IP is in the SORBS blacklist. |
| 1115 | 1076 | * |
| 1116 | | -<<<<<<< .mine |
| 1117 | 1077 | * @param $ip \type{\string} IP to check |
| 1118 | | - * @return \type{\bool} True if blacklisted |
| 1119 | | -======= |
| 1120 | | - * @param $ip \type{\string} IP to check |
| 1121 | 1078 | * @return \type{\bool} |
| 1122 | | ->>>>>>> .r38752 |
| 1123 | 1079 | */ |
| 1124 | 1080 | function inSorbsBlacklist( $ip ) { |
| 1125 | 1081 | global $wgEnableSorbs, $wgSorbsUrl; |
| — | — | @@ -1130,15 +1086,9 @@ |
| 1131 | 1087 | /** |
| 1132 | 1088 | * Whether the given IP is in a given DNS blacklist. |
| 1133 | 1089 | * |
| 1134 | | -<<<<<<< .mine |
| 1135 | 1090 | * @param $ip \type{\string} IP to check |
| 1136 | 1091 | * @param $base \type{\string} URL of the DNS blacklist |
| 1137 | | - * @return \type{\bool} True if blacklisted |
| 1138 | | -======= |
| 1139 | | - * @param $ip \type{\string} IP to check |
| 1140 | | - * @param $base \type{\string} URL of the DNS blacklist |
| 1141 | 1092 | * @return \type{\bool} |
| 1142 | | ->>>>>>> .r38752 |
| 1143 | 1093 | */ |
| 1144 | 1094 | function inDnsBlacklist( $ip, $base ) { |
| 1145 | 1095 | wfProfileIn( __METHOD__ ); |
| — | — | @@ -1172,11 +1122,7 @@ |
| 1173 | 1123 | /** |
| 1174 | 1124 | * Is this user subject to rate limiting? |
| 1175 | 1125 | * |
| 1176 | | -<<<<<<< .mine |
| 1177 | | - * @return \type{\bool} True if rate limited |
| 1178 | | -======= |
| 1179 | 1126 | * @return \type{\bool} |
| 1180 | | ->>>>>>> .r38752 |
| 1181 | 1127 | */ |
| 1182 | 1128 | public function isPingLimitable() { |
| 1183 | 1129 | global $wgRateLimitsExcludedGroups; |
| — | — | @@ -1365,11 +1311,7 @@ |
| 1366 | 1312 | |
| 1367 | 1313 | /** |
| 1368 | 1314 | * Get the user name, or the IP of an anonymous user |
| 1369 | | -<<<<<<< .mine |
| 1370 | | - * @return \type{\string} User's name or IP address |
| 1371 | | -======= |
| 1372 | 1315 | * @return \type{\string} |
| 1373 | | ->>>>>>> .r38752 |
| 1374 | 1316 | */ |
| 1375 | 1317 | function getName() { |
| 1376 | 1318 | if ( !$this->mDataLoaded && $this->mFrom == 'name' ) { |
| — | — | @@ -1405,11 +1347,7 @@ |
| 1406 | 1348 | |
| 1407 | 1349 | /** |
| 1408 | 1350 | * Get the user's name escaped by underscores. |
| 1409 | | -<<<<<<< .mine |
| 1410 | | - * @return \type{\string} Username escaped by underscores |
| 1411 | | -======= |
| 1412 | 1351 | * @return \type{\string} |
| 1413 | | ->>>>>>> .r38752 |
| 1414 | 1352 | */ |
| 1415 | 1353 | function getTitleKey() { |
| 1416 | 1354 | return str_replace( ' ', '_', $this->getName() ); |
| — | — | @@ -1679,11 +1617,7 @@ |
| 1680 | 1618 | |
| 1681 | 1619 | /** |
| 1682 | 1620 | * Get the user's current token. |
| 1683 | | -<<<<<<< .mine |
| 1684 | | - * @return \type{\string} Token |
| 1685 | | -======= |
| 1686 | 1621 | * @return \type{\string} |
| 1687 | | ->>>>>>> .r38752 |
| 1688 | 1622 | */ |
| 1689 | 1623 | function getToken() { |
| 1690 | 1624 | $this->load(); |
| — | — | @@ -1742,11 +1676,7 @@ |
| 1743 | 1677 | /** |
| 1744 | 1678 | * Has password reminder email been sent within the last |
| 1745 | 1679 | * $wgPasswordReminderResendTime hours? |
| 1746 | | -<<<<<<< .mine |
| 1747 | | - * @return \type{\bool} True or false |
| 1748 | | -======= |
| 1749 | 1680 | * @return \type{\bool} |
| 1750 | | ->>>>>>> .r38752 |
| 1751 | 1681 | */ |
| 1752 | 1682 | function isPasswordReminderThrottled() { |
| 1753 | 1683 | global $wgPasswordReminderResendTime; |
| — | — | @@ -1760,11 +1690,7 @@ |
| 1761 | 1691 | |
| 1762 | 1692 | /** |
| 1763 | 1693 | * Get the user's e-mail address |
| 1764 | | -<<<<<<< .mine |
| 1765 | | - * @return \type{\string} User's -mail address |
| 1766 | | -======= |
| 1767 | 1694 | * @return \type{\string} |
| 1768 | | ->>>>>>> .r38752 |
| 1769 | 1695 | */ |
| 1770 | 1696 | function getEmail() { |
| 1771 | 1697 | $this->load(); |
| — | — | @@ -1794,11 +1720,7 @@ |
| 1795 | 1721 | |
| 1796 | 1722 | /** |
| 1797 | 1723 | * Get the user's real name |
| 1798 | | -<<<<<<< .mine |
| 1799 | | - * @return \type{\string} User's real name |
| 1800 | | -======= |
| 1801 | 1724 | * @return \type{\string} |
| 1802 | | ->>>>>>> .r38752 |
| 1803 | 1725 | */ |
| 1804 | 1726 | function getRealName() { |
| 1805 | 1727 | $this->load(); |
| — | — | @@ -1900,11 +1822,7 @@ |
| 1901 | 1823 | |
| 1902 | 1824 | /** |
| 1903 | 1825 | * Get the user's preferred date format. |
| 1904 | | -<<<<<<< .mine |
| 1905 | | - * @return \type{\string} User's preferred date format |
| 1906 | | -======= |
| 1907 | 1826 | * @return \type{\string} |
| 1908 | | ->>>>>>> .r38752 |
| 1909 | 1827 | */ |
| 1910 | 1828 | function getDatePreference() { |
| 1911 | 1829 | // Important migration for old data rows |
| — | — | @@ -1922,7 +1840,7 @@ |
| 1923 | 1841 | |
| 1924 | 1842 | /** |
| 1925 | 1843 | * Get the permissions this user has. |
| 1926 | | - * @return \arrayof{\string} Array of permission names |
| | 1844 | + * @return \arrayof{\string} |
| 1927 | 1845 | */ |
| 1928 | 1846 | function getRights() { |
| 1929 | 1847 | if ( is_null( $this->mRights ) ) { |
| — | — | @@ -1937,7 +1855,7 @@ |
| 1938 | 1856 | /** |
| 1939 | 1857 | * Get the list of explicit group memberships this user has. |
| 1940 | 1858 | * The implicit * and user groups are not included. |
| 1941 | | - * @return \arrayof{\string} Array of internal group names |
| | 1859 | + * @return \arrayof{\string} |
| 1942 | 1860 | */ |
| 1943 | 1861 | function getGroups() { |
| 1944 | 1862 | $this->load(); |
| — | — | @@ -1948,13 +1866,8 @@ |
| 1949 | 1867 | * Get the list of implicit group memberships this user has. |
| 1950 | 1868 | * This includes all explicit groups, plus 'user' if logged in, |
| 1951 | 1869 | * '*' for all accounts and autopromoted groups |
| 1952 | | -<<<<<<< .mine |
| 1953 | 1870 | * @param $recache \type{\bool} Whether to avoid the cache |
| 1954 | | - * @return \arrayof{\string} Array of internal group names |
| 1955 | | -======= |
| 1956 | | - * @param $recache \type{\bool} Whether to avoid the cache |
| 1957 | 1871 | * @return \arrayof{\string} |
| 1958 | | ->>>>>>> .r38752 |
| 1959 | 1872 | */ |
| 1960 | 1873 | function getEffectiveGroups( $recache = false ) { |
| 1961 | 1874 | if ( $recache || is_null( $this->mEffectiveGroups ) ) { |
| — | — | @@ -1977,11 +1890,7 @@ |
| 1978 | 1891 | |
| 1979 | 1892 | /** |
| 1980 | 1893 | * Get the user's edit count. |
| 1981 | | -<<<<<<< .mine |
| 1982 | | - * @return \type{\int} User's edit count |
| 1983 | | -======= |
| 1984 | 1894 | * @return \type{\int} |
| 1985 | | ->>>>>>> .r38752 |
| 1986 | 1895 | */ |
| 1987 | 1896 | function getEditCount() { |
| 1988 | 1897 | if ($this->mId) { |
| — | — | @@ -2045,11 +1954,7 @@ |
| 2046 | 1955 | |
| 2047 | 1956 | /** |
| 2048 | 1957 | * Get whether the user is logged in |
| 2049 | | -<<<<<<< .mine |
| 2050 | | - * @return \type{\bool} True or false |
| 2051 | | -======= |
| 2052 | 1958 | * @return \type{\bool} |
| 2053 | | ->>>>>>> .r38752 |
| 2054 | 1959 | */ |
| 2055 | 1960 | function isLoggedIn() { |
| 2056 | 1961 | return $this->getID() != 0; |
| — | — | @@ -2057,11 +1962,7 @@ |
| 2058 | 1963 | |
| 2059 | 1964 | /** |
| 2060 | 1965 | * Get whether the user is anonymous |
| 2061 | | -<<<<<<< .mine |
| 2062 | | - * @return \type{\bool} True or false |
| 2063 | | -======= |
| 2064 | 1966 | * @return \type{\bool} |
| 2065 | | ->>>>>>> .r38752 |
| 2066 | 1967 | */ |
| 2067 | 1968 | function isAnon() { |
| 2068 | 1969 | return !$this->isLoggedIn(); |
| — | — | @@ -2069,11 +1970,7 @@ |
| 2070 | 1971 | |
| 2071 | 1972 | /** |
| 2072 | 1973 | * Get whether the user is a bot |
| 2073 | | -<<<<<<< .mine |
| 2074 | | - * @return \type{\bool} True or false |
| 2075 | | -======= |
| 2076 | 1974 | * @return \type{\bool} |
| 2077 | | ->>>>>>> .r38752 |
| 2078 | 1975 | * @deprecated |
| 2079 | 1976 | */ |
| 2080 | 1977 | function isBot() { |
| — | — | @@ -2096,11 +1993,7 @@ |
| 2097 | 1994 | |
| 2098 | 1995 | /** |
| 2099 | 1996 | * Check whether to enable recent changes patrol features for this user |
| 2100 | | -<<<<<<< .mine |
| 2101 | | - * @return \type{\bool} True or false |
| 2102 | | -======= |
| 2103 | 1997 | * @return \type{\bool} |
| 2104 | | ->>>>>>> .r38752 |
| 2105 | 1998 | */ |
| 2106 | 1999 | public function useRCPatrol() { |
| 2107 | 2000 | global $wgUseRCPatrol; |
| — | — | @@ -2109,11 +2002,7 @@ |
| 2110 | 2003 | |
| 2111 | 2004 | /** |
| 2112 | 2005 | * Check whether to enable new pages patrol features for this user |
| 2113 | | -<<<<<<< .mine |
| 2114 | | - * @return \type{\bool} True or false |
| 2115 | | -======= |
| 2116 | 2006 | * @return \type{\bool} |
| 2117 | | ->>>>>>> .r38752 |
| 2118 | 2007 | */ |
| 2119 | 2008 | public function useNPPatrol() { |
| 2120 | 2009 | global $wgUseRCPatrol, $wgUseNPPatrol; |
| — | — | @@ -2122,7 +2011,7 @@ |
| 2123 | 2012 | |
| 2124 | 2013 | /** |
| 2125 | 2014 | * Get the current skin, loading it if required |
| 2126 | | - * @return \type{Skin} Current skin |
| | 2015 | + * @return \type{Skin} |
| 2127 | 2016 | * @todo FIXME : need to check the old failback system [AV] |
| 2128 | 2017 | */ |
| 2129 | 2018 | function &getSkin() { |
| — | — | @@ -2561,11 +2450,7 @@ |
| 2562 | 2451 | * which will give them a chance to modify this key based on their own |
| 2563 | 2452 | * settings. |
| 2564 | 2453 | * |
| 2565 | | -<<<<<<< .mine |
| 2566 | | - * @return \type{\string} Page rendering hash |
| 2567 | | -======= |
| 2568 | 2454 | * @return \type{\string} |
| 2569 | | ->>>>>>> .r38752 |
| 2570 | 2455 | */ |
| 2571 | 2456 | function getPageRenderingHash() { |
| 2572 | 2457 | global $wgContLang, $wgUseDynamicDates, $wgLang; |
| — | — | @@ -2600,11 +2485,7 @@ |
| 2601 | 2486 | |
| 2602 | 2487 | /** |
| 2603 | 2488 | * Get whether the user is explicitly blocked from account creation. |
| 2604 | | -<<<<<<< .mine |
| 2605 | | - * @return \type{\bool} True if blocked |
| 2606 | | -======= |
| 2607 | 2489 | * @return \type{\bool} |
| 2608 | | ->>>>>>> .r38752 |
| 2609 | 2490 | */ |
| 2610 | 2491 | function isBlockedFromCreateAccount() { |
| 2611 | 2492 | $this->getBlockedStatus(); |
| — | — | @@ -2613,11 +2494,7 @@ |
| 2614 | 2495 | |
| 2615 | 2496 | /** |
| 2616 | 2497 | * Get whether the user is blocked from using Special:Emailuser. |
| 2617 | | -<<<<<<< .mine |
| 2618 | | - * @return \type{\bool} True if blocked |
| 2619 | | -======= |
| 2620 | 2498 | * @return \type{\bool} |
| 2621 | | ->>>>>>> .r38752 |
| 2622 | 2499 | */ |
| 2623 | 2500 | function isBlockedFromEmailuser() { |
| 2624 | 2501 | $this->getBlockedStatus(); |
| — | — | @@ -2626,11 +2503,7 @@ |
| 2627 | 2504 | |
| 2628 | 2505 | /** |
| 2629 | 2506 | * Get whether the user is allowed to create an account. |
| 2630 | | -<<<<<<< .mine |
| 2631 | | - * @return \type{\bool} True if allowed |
| 2632 | | -======= |
| 2633 | 2507 | * @return \type{\bool} |
| 2634 | | ->>>>>>> .r38752 |
| 2635 | 2508 | */ |
| 2636 | 2509 | function isAllowedToCreateAccount() { |
| 2637 | 2510 | return $this->isAllowed( 'createaccount' ) && !$this->isBlockedFromCreateAccount(); |
| — | — | @@ -2646,7 +2519,7 @@ |
| 2647 | 2520 | /** |
| 2648 | 2521 | * Get this user's personal page title. |
| 2649 | 2522 | * |
| 2650 | | - * @return \type{Title} User's personal page title |
| | 2523 | + * @return \type{Title} |
| 2651 | 2524 | */ |
| 2652 | 2525 | function getUserPage() { |
| 2653 | 2526 | return Title::makeTitle( NS_USER, $this->getName() ); |
| — | — | @@ -2655,7 +2528,7 @@ |
| 2656 | 2529 | /** |
| 2657 | 2530 | * Get this user's talk page title. |
| 2658 | 2531 | * |
| 2659 | | - * @return \type{Title} User's talk page title |
| | 2532 | + * @return \type{Title} |
| 2660 | 2533 | */ |
| 2661 | 2534 | function getTalkPage() { |
| 2662 | 2535 | $title = $this->getUserPage(); |
| — | — | @@ -2664,11 +2537,7 @@ |
| 2665 | 2538 | |
| 2666 | 2539 | /** |
| 2667 | 2540 | * Get the maximum valid user ID. |
| 2668 | | -<<<<<<< .mine |
| 2669 | | - * @return \type{\int} %User ID |
| 2670 | | -======= |
| 2671 | 2541 | * @return \type{\int} |
| 2672 | | ->>>>>>> .r38752 |
| 2673 | 2542 | * @static |
| 2674 | 2543 | */ |
| 2675 | 2544 | function getMaxID() { |
| — | — | @@ -2760,11 +2629,7 @@ |
| 2761 | 2630 | /** |
| 2762 | 2631 | * Check if the given clear-text password matches the temporary password |
| 2763 | 2632 | * sent by e-mail for password reset operations. |
| 2764 | | -<<<<<<< .mine |
| 2765 | | - * @return \type{\bool} True if matches, false otherwise |
| 2766 | | -======= |
| 2767 | 2633 | * @return \type{\bool} |
| 2768 | | ->>>>>>> .r38752 |
| 2769 | 2634 | */ |
| 2770 | 2635 | function checkTemporaryPassword( $plaintext ) { |
| 2771 | 2636 | return self::comparePasswords( $this->mNewpassword, $plaintext, $this->getId() ); |
| — | — | @@ -2865,19 +2730,11 @@ |
| 2866 | 2731 | * Send an e-mail to this user's account. Does not check for |
| 2867 | 2732 | * confirmed status or validity. |
| 2868 | 2733 | * |
| 2869 | | -<<<<<<< .mine |
| 2870 | 2734 | * @param $subject \type{\string} Message subject |
| 2871 | 2735 | * @param $body \type{\string} Message body |
| 2872 | 2736 | * @param $from \type{\string} Optional From address; if unspecified, default $wgPasswordSender will be used |
| 2873 | | - * @param $replyto \type{\string} Reply-to address |
| 2874 | | - * @return \twotypes{\bool,WikiError} True on success, a WikiError object on failure |
| 2875 | | -======= |
| 2876 | | - * @param $subject \type{\string} Message subject |
| 2877 | | - * @param $body \type{\string} Message body |
| 2878 | | - * @param $from \type{\string} Optional From address; if unspecified, default $wgPasswordSender will be used |
| 2879 | 2737 | * @param $replyto \type{\string} |
| 2880 | 2738 | * @return \twotypes{\bool,WikiError} True on success, a WikiError object on failure |
| 2881 | | ->>>>>>> .r38752 |
| 2882 | 2739 | */ |
| 2883 | 2740 | function sendMail( $subject, $body, $from = null, $replyto = null ) { |
| 2884 | 2741 | if( is_null( $from ) ) { |
| — | — | @@ -2897,13 +2754,8 @@ |
| 2898 | 2755 | * @note Call saveSettings() after calling this function to commit |
| 2899 | 2756 | * this change to the database. |
| 2900 | 2757 | * |
| 2901 | | -<<<<<<< .mine |
| 2902 | 2758 | * @param[out] &$expiration \type{\mixed} Accepts the expiration time |
| 2903 | | - * @return \type{\string} New token |
| 2904 | | -======= |
| 2905 | | - * @param[out] &$expiration \type{\mixed} Accepts the expiration time |
| 2906 | 2759 | * @return \type{\string} |
| 2907 | | ->>>>>>> .r38752 |
| 2908 | 2760 | * @private |
| 2909 | 2761 | */ |
| 2910 | 2762 | function confirmationToken( &$expiration ) { |
| — | — | @@ -2920,13 +2772,8 @@ |
| 2921 | 2773 | |
| 2922 | 2774 | /** |
| 2923 | 2775 | * Return a URL the user can use to confirm their email address. |
| 2924 | | -<<<<<<< .mine |
| 2925 | 2776 | * @param $token \type{\string} Accepts the email confirmation token |
| 2926 | | - * @return \type{\string} New token URL |
| 2927 | | -======= |
| 2928 | | - * @param $token \type{\string} Accepts the email confirmation token |
| 2929 | 2777 | * @return \type{\string} |
| 2930 | | ->>>>>>> .r38752 |
| 2931 | 2778 | * @private |
| 2932 | 2779 | */ |
| 2933 | 2780 | function confirmationTokenUrl( $token ) { |
| — | — | @@ -2934,13 +2781,8 @@ |
| 2935 | 2782 | } |
| 2936 | 2783 | /** |
| 2937 | 2784 | * Return a URL the user can use to invalidate their email address. |
| 2938 | | -<<<<<<< .mine |
| 2939 | 2785 | * @param $token \type{\string} Accepts the email confirmation token |
| 2940 | | - * @return \type{\string} New token URL |
| 2941 | | -======= |
| 2942 | | - * @param $token \type{\string} Accepts the email confirmation token |
| 2943 | 2786 | * @return \type{\string} |
| 2944 | | ->>>>>>> .r38752 |
| 2945 | 2787 | * @private |
| 2946 | 2788 | */ |
| 2947 | 2789 | function invalidationTokenUrl( $token ) { |
| — | — | @@ -3007,11 +2849,7 @@ |
| 3008 | 2850 | /** |
| 3009 | 2851 | * Is this user allowed to send e-mails within limits of current |
| 3010 | 2852 | * site configuration? |
| 3011 | | -<<<<<<< .mine |
| 3012 | | - * @return \type{\bool} True if allowed |
| 3013 | | -======= |
| 3014 | 2853 | * @return \type{\bool} |
| 3015 | | ->>>>>>> .r38752 |
| 3016 | 2854 | */ |
| 3017 | 2855 | function canSendEmail() { |
| 3018 | 2856 | $canSend = $this->isEmailConfirmed(); |
| — | — | @@ -3022,11 +2860,7 @@ |
| 3023 | 2861 | /** |
| 3024 | 2862 | * Is this user allowed to receive e-mails within limits of current |
| 3025 | 2863 | * site configuration? |
| 3026 | | -<<<<<<< .mine |
| 3027 | | - * @return \type{\bool} True if allowed |
| 3028 | | -======= |
| 3029 | 2864 | * @return \type{\bool} |
| 3030 | | ->>>>>>> .r38752 |
| 3031 | 2865 | */ |
| 3032 | 2866 | function canReceiveEmail() { |
| 3033 | 2867 | return $this->isEmailConfirmed() && !$this->getOption( 'disablemail' ); |
| — | — | @@ -3040,11 +2874,7 @@ |
| 3041 | 2875 | * confirmed their address by returning a code or using a password |
| 3042 | 2876 | * sent to the address from the wiki. |
| 3043 | 2877 | * |
| 3044 | | -<<<<<<< .mine |
| 3045 | | - * @return \type{\bool} True if conffirmed |
| 3046 | | -======= |
| 3047 | 2878 | * @return \type{\bool} |
| 3048 | | ->>>>>>> .r38752 |
| 3049 | 2879 | */ |
| 3050 | 2880 | function isEmailConfirmed() { |
| 3051 | 2881 | global $wgEmailAuthentication; |
| — | — | @@ -3065,11 +2895,7 @@ |
| 3066 | 2896 | |
| 3067 | 2897 | /** |
| 3068 | 2898 | * Check whether there is an outstanding request for e-mail confirmation. |
| 3069 | | -<<<<<<< .mine |
| 3070 | | - * @return \type{\bool} True if pending |
| 3071 | | -======= |
| 3072 | 2899 | * @return \type{\bool} |
| 3073 | | ->>>>>>> .r38752 |
| 3074 | 2900 | */ |
| 3075 | 2901 | function isEmailConfirmationPending() { |
| 3076 | 2902 | global $wgEmailAuthentication; |
| — | — | @@ -3129,13 +2955,8 @@ |
| 3130 | 2956 | /** |
| 3131 | 2957 | * Get the localized descriptive name for a group, if it exists |
| 3132 | 2958 | * |
| 3133 | | -<<<<<<< .mine |
| 3134 | 2959 | * @param $group \type{\string} Internal group name |
| 3135 | | - * @return \type{\string} Localized descriptive group name |
| 3136 | | -======= |
| 3137 | | - * @param $group \type{\string} Internal group name |
| 3138 | 2960 | * @return \type{\string} |
| 3139 | | ->>>>>>> .r38752 |
| 3140 | 2961 | */ |
| 3141 | 2962 | static function getGroupName( $group ) { |
| 3142 | 2963 | global $wgMessageCache; |
| — | — | @@ -3150,13 +2971,8 @@ |
| 3151 | 2972 | /** |
| 3152 | 2973 | * Get the localized descriptive name for a member of a group, if it exists |
| 3153 | 2974 | * |
| 3154 | | -<<<<<<< .mine |
| 3155 | 2975 | * @param $group \type{\string} Internal group name |
| 3156 | | - * @return \type{\string} Localized name for group member |
| 3157 | | -======= |
| 3158 | | - * @param $group \type{\string} Internal group name |
| 3159 | 2976 | * @return \type{\string} |
| 3160 | | ->>>>>>> .r38752 |
| 3161 | 2977 | */ |
| 3162 | 2978 | static function getGroupMember( $group ) { |
| 3163 | 2979 | global $wgMessageCache; |
| — | — | @@ -3172,7 +2988,7 @@ |
| 3173 | 2989 | * Return the set of defined explicit groups. |
| 3174 | 2990 | * The implicit groups (by default *, 'user' and 'autoconfirmed') |
| 3175 | 2991 | * are not included, as they are defined automatically, not in the database. |
| 3176 | | - * @return \arrayof{\string} Array of internal group names |
| | 2992 | + * @return \arrayof{\string} |
| 3177 | 2993 | */ |
| 3178 | 2994 | static function getAllGroups() { |
| 3179 | 2995 | global $wgGroupPermissions; |
| — | — | @@ -3184,7 +3000,7 @@ |
| 3185 | 3001 | |
| 3186 | 3002 | /** |
| 3187 | 3003 | * Get a list of all available permissions. |
| 3188 | | - * @return \arrayof{\string} Array of permission names |
| | 3004 | + * @return \arrayof{\string} |
| 3189 | 3005 | */ |
| 3190 | 3006 | static function getAllRights() { |
| 3191 | 3007 | if ( self::$mAllRights === false ) { |
| — | — | @@ -3201,7 +3017,7 @@ |
| 3202 | 3018 | |
| 3203 | 3019 | /** |
| 3204 | 3020 | * Get a list of implicit groups |
| 3205 | | - * @return \arrayof{\string} Array of internal group names |
| | 3021 | + * @return \arrayof{\string} |
| 3206 | 3022 | */ |
| 3207 | 3023 | public static function getImplicitGroups() { |
| 3208 | 3024 | global $wgImplicitGroups; |
| — | — | @@ -3318,13 +3134,8 @@ |
| 3319 | 3135 | /** |
| 3320 | 3136 | * Get the description of a given right |
| 3321 | 3137 | * |
| 3322 | | -<<<<<<< .mine |
| 3323 | 3138 | * @param $right \type{\string} Right to query |
| 3324 | | - * @return \type{\string} Localized description of the right |
| 3325 | | -======= |
| 3326 | | - * @param $right \type{\string} Right to query |
| 3327 | 3139 | * @return \type{\string} |
| 3328 | | ->>>>>>> .r38752 |
| 3329 | 3140 | */ |
| 3330 | 3141 | static function getRightDescription( $right ) { |
| 3331 | 3142 | global $wgMessageCache; |
| — | — | @@ -3377,17 +3188,10 @@ |
| 3378 | 3189 | * Compare a password hash with a plain-text password. Requires the user |
| 3379 | 3190 | * ID if there's a chance that the hash is an old-style hash. |
| 3380 | 3191 | * |
| 3381 | | -<<<<<<< .mine |
| 3382 | 3192 | * @param $hash \type{\string} Password hash |
| 3383 | 3193 | * @param $password \type{\string} Plain-text password to compare |
| 3384 | 3194 | * @param $userId \type{\string} %User ID for old-style password salt |
| 3385 | | - * @return \type{\bool} True if matches, false otherwise |
| 3386 | | -======= |
| 3387 | | - * @param $hash \type{\string} Password hash |
| 3388 | | - * @param $password \type{\string} Plain-text password to compare |
| 3389 | | - * @param $userId \type{\string} %User ID for old-style password salt |
| 3390 | 3195 | * @return \type{\bool} |
| 3391 | | ->>>>>>> .r38752 |
| 3392 | 3196 | */ |
| 3393 | 3197 | static function comparePasswords( $hash, $password, $userId = false ) { |
| 3394 | 3198 | $m = false; |