@@ -12,7 +12,7 @@  | 
                                                    ||
| 12 | 12 | // Feel free to remove this, extend it, or make something more sophisticated.  | 
                                                        
| 13 | 13 | if (isset($_SERVER['HTTP_CLIENT_IP'])  | 
                                                        
| 14 | 14 | || isset($_SERVER['HTTP_X_FORWARDED_FOR'])  | 
                                                        
| 15 | - || !( in_array(@$_SERVER['REMOTE_ADDR'], [ '127.0.0.1', 'fe80::1', '::1' ]) || php_sapi_name() === 'cli-server' )  | 
                                                        |
| 15 | + || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server')  | 
                                                        |
| 16 | 16 |  ) { | 
                                                        
| 17 | 17 |      header('HTTP/1.0 403 Forbidden'); | 
                                                        
| 18 | 18 |      exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); | 
                                                        
@@ -45,7 +45,7 @@  | 
                                                    ||
| 45 | 45 | }  | 
                                                        
| 46 | 46 | |
| 47 | 47 | // Find the path, and complain if English doesn't exist.  | 
                                                        
| 48 | -        $path = $this->container->getParameter("kernel.root_dir") . '/../i18n'; | 
                                                        |
| 48 | +        $path = $this->container->getParameter("kernel.root_dir").'/../i18n'; | 
                                                        |
| 49 | 49 |          if (!file_exists("$path/en.json")) { | 
                                                        
| 50 | 50 |              throw new Exception("Language directory doesn't exist: $path"); | 
                                                        
| 51 | 51 | }  | 
                                                        
@@ -176,7 +176,7 @@  | 
                                                    ||
| 176 | 176 | |
| 177 | 177 | // Iterate over query results, loading each user id into the array  | 
                                                        
| 178 | 178 |          while ($row = $res->fetch()) { | 
                                                        
| 179 | - $adminIdArr[] = $row["user_id"] ;  | 
                                                        |
| 179 | + $adminIdArr[] = $row["user_id"];  | 
                                                        |
| 180 | 180 | }  | 
                                                        
| 181 | 181 | |
| 182 | 182 | // Set the query results to be useful in a sql statement.  | 
                                                        
@@ -111,7 +111,7 @@ discard block  | 
                                                    ||
| 111 | 111 | 'quote/all.html.twig',  | 
                                                        
| 112 | 112 | [  | 
                                                        
| 113 | 113 | 'base_dir' => realpath(  | 
                                                        
| 114 | -                    $this->getParameter('kernel.root_dir') . '/..' | 
                                                        |
| 114 | +                    $this->getParameter('kernel.root_dir').'/..' | 
                                                        |
| 115 | 115 | ),  | 
                                                        
| 116 | 116 | 'xtPage' => 'bash',  | 
                                                        
| 117 | 117 | 'quotes' => $quotes,  | 
                                                        
@@ -160,7 +160,7 @@ discard block  | 
                                                    ||
| 160 | 160 | 'quote/view.html.twig',  | 
                                                        
| 161 | 161 | [  | 
                                                        
| 162 | 162 | 'base_dir' => realpath(  | 
                                                        
| 163 | -                    $this->getParameter('kernel.root_dir') . '/..' | 
                                                        |
| 163 | +                    $this->getParameter('kernel.root_dir').'/..' | 
                                                        |
| 164 | 164 | ),  | 
                                                        
| 165 | 165 | "xtPage" => "bash",  | 
                                                        
| 166 | 166 | "text" => $text,  | 
                                                        
@@ -96,7 +96,7 @@  | 
                                                    ||
| 96 | 96 | * List top edits by this user for all pages in a particular namespace.  | 
                                                        
| 97 | 97 | * @param User $user The User.  | 
                                                        
| 98 | 98 | * @param Project $project The project.  | 
                                                        
| 99 | - * @param integer|string $namespaceId The namespace ID or 'all'  | 
                                                        |
| 99 | + * @param integer $namespaceId The namespace ID or 'all'  | 
                                                        |
| 100 | 100 | * @return \Symfony\Component\HttpFoundation\Response  | 
                                                        
| 101 | 101 | */  | 
                                                        
| 102 | 102 | protected function namespaceTopEdits(User $user, Project $project, $namespaceId)  | 
                                                        
@@ -168,11 +168,11 @@ discard block  | 
                                                    ||
| 168 | 168 | }  | 
                                                        
| 169 | 169 | |
| 170 | 170 | // Get page info about these 100 pages, so we can use their display title.  | 
                                                        
| 171 | -        $titles = array_map(function ($e) use ($namespaces) { | 
                                                        |
| 171 | +        $titles = array_map(function($e) use ($namespaces) { | 
                                                        |
| 172 | 172 | // If non-mainspace, prepend namespace to the titles.  | 
                                                        
| 173 | 173 | $ns = $e['page_namespace'];  | 
                                                        
| 174 | - $nsTitle = $ns > 0 ? $namespaces[$e['page_namespace']] . ':' : '';  | 
                                                        |
| 175 | - return $nsTitle . $e['page_title'];  | 
                                                        |
| 174 | + $nsTitle = $ns > 0 ? $namespaces[$e['page_namespace']].':' : '';  | 
                                                        |
| 175 | + return $nsTitle.$e['page_title'];  | 
                                                        |
| 176 | 176 | }, $editData);  | 
                                                        
| 177 | 177 | |
| 178 | 178 | /** @var ApiHelper $apiHelper */  | 
                                                        
@@ -188,8 +188,8 @@ discard block  | 
                                                    ||
| 188 | 188 |          foreach ($editData as $editDatum) { | 
                                                        
| 189 | 189 | // If non-mainspace, prepend namespace to the titles.  | 
                                                        
| 190 | 190 | $ns = $editDatum['page_namespace'];  | 
                                                        
| 191 | - $nsTitle = $ns > 0 ? $namespaces[$editDatum['page_namespace']] . ':' : '';  | 
                                                        |
| 192 | - $pageTitle = $nsTitle . $editDatum['page_title'];  | 
                                                        |
| 191 | + $nsTitle = $ns > 0 ? $namespaces[$editDatum['page_namespace']].':' : '';  | 
                                                        |
| 192 | + $pageTitle = $nsTitle.$editDatum['page_title'];  | 
                                                        |
| 193 | 193 | $editDatum['displaytitle'] = $displayTitles[$pageTitle];  | 
                                                        
| 194 | 194 | // $editDatum['page_title'] is retained without the namespace  | 
                                                        
| 195 | 195 | // so we can link to TopEdits for that page  | 
                                                        
@@ -249,7 +249,7 @@ discard block  | 
                                                    ||
| 249 | 249 | // Send all to the template.  | 
                                                        
| 250 | 250 |          return $this->render('topedits/result_article.html.twig', [ | 
                                                        
| 251 | 251 | 'xtPage' => 'topedits',  | 
                                                        
| 252 | - 'xtTitle' => $user->getUsername() . ' - ' . $page->getTitle(),  | 
                                                        |
| 252 | + 'xtTitle' => $user->getUsername().' - '.$page->getTitle(),  | 
                                                        |
| 253 | 253 | 'project' => $project,  | 
                                                        
| 254 | 254 | 'user' => $user,  | 
                                                        
| 255 | 255 | 'page' => $page,  | 
                                                        
@@ -251,9 +251,9 @@  | 
                                                    ||
| 251 | 251 | $conn = $this->getProjectsConnection();  | 
                                                        
| 252 | 252 | $pageTable = $this->getTableName($project->getDatabaseName(), 'page');  | 
                                                        
| 253 | 253 | $query = "SELECT page_id "  | 
                                                        
| 254 | - . " FROM $pageTable "  | 
                                                        |
| 255 | - . " WHERE page_namespace = :ns AND page_title = :title AND page_len > 0 "  | 
                                                        |
| 256 | - . " LIMIT 1";  | 
                                                        |
| 254 | + . " FROM $pageTable "  | 
                                                        |
| 255 | + . " WHERE page_namespace = :ns AND page_title = :title AND page_len > 0 "  | 
                                                        |
| 256 | + . " LIMIT 1";  | 
                                                        |
| 257 | 257 | $params = [  | 
                                                        
| 258 | 258 | 'ns' => $namespaceId,  | 
                                                        
| 259 | 259 | 'title' => $pageTitle,  | 
                                                        
@@ -146,7 +146,7 @@ discard block  | 
                                                    ||
| 146 | 146 | if ($projMetadata['dbName'] == "$project"  | 
                                                        
| 147 | 147 | || $projMetadata['url'] == "$project"  | 
                                                        
| 148 | 148 |                      || $projMetadata['url'] == "https://$project") { | 
                                                        
| 149 | - $this->log->debug(__METHOD__ . " Using cached data for $project");  | 
                                                        |
| 149 | + $this->log->debug(__METHOD__." Using cached data for $project");  | 
                                                        |
| 150 | 150 | return $projMetadata;  | 
                                                        
| 151 | 151 | }  | 
                                                        
| 152 | 152 | }  | 
                                                        
@@ -200,7 +200,7 @@ discard block  | 
                                                    ||
| 200 | 200 | }  | 
                                                        
| 201 | 201 | |
| 202 | 202 | // Redis cache  | 
                                                        
| 203 | -        $cacheKey = "projectMetadata." . preg_replace("/[^A-Za-z0-9]/", '', $projectUrl); | 
                                                        |
| 203 | +        $cacheKey = "projectMetadata.".preg_replace("/[^A-Za-z0-9]/", '', $projectUrl); | 
                                                        |
| 204 | 204 |          if ($this->cache->hasItem($cacheKey)) { | 
                                                        
| 205 | 205 | $this->metadata = $this->cache->getItem($cacheKey)->get();  | 
                                                        
| 206 | 206 | return $this->metadata;  | 
                                                        
@@ -280,7 +280,7 @@ discard block  | 
                                                    ||
| 280 | 280 |          $optedIn = $this->container->getParameter('opted_in'); | 
                                                        
| 281 | 281 | // In case there's just one given.  | 
                                                        
| 282 | 282 |          if (!is_array($optedIn)) { | 
                                                        
| 283 | - $optedIn = [ $optedIn ];  | 
                                                        |
| 283 | + $optedIn = [$optedIn];  | 
                                                        |
| 284 | 284 | }  | 
                                                        
| 285 | 285 | return $optedIn;  | 
                                                        
| 286 | 286 | }  | 
                                                        
@@ -9,7 +9,6 @@  | 
                                                    ||
| 9 | 9 | use Symfony\Bundle\FrameworkBundle\Controller\Controller;  | 
                                                        
| 10 | 10 | use Symfony\Component\HttpFoundation\Request;  | 
                                                        
| 11 | 11 | use Symfony\Component\HttpFoundation\Response;  | 
                                                        
| 12 | -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;  | 
                                                        |
| 13 | 12 | use DateTime;  | 
                                                        
| 14 | 13 | use Xtools\ProjectRepository;  | 
                                                        
| 15 | 14 | use Xtools\UserRepository;  | 
                                                        
@@ -47,9 +47,9 @@ discard block  | 
                                                    ||
| 47 | 47 |          $username = $request->query->get('username', $request->query->get('user')); | 
                                                        
| 48 | 48 | |
| 49 | 49 |          if ($projectQuery != '' && $username != '') { | 
                                                        
| 50 | -            return $this->redirectToRoute('AdminScoreResult', [ 'project' => $projectQuery, 'username' => $username ]); | 
                                                        |
| 50 | +            return $this->redirectToRoute('AdminScoreResult', ['project' => $projectQuery, 'username' => $username]); | 
                                                        |
| 51 | 51 |          } elseif ($projectQuery != '' && $project === null) { | 
                                                        
| 52 | -            return $this->redirectToRoute('AdminScoreProject', [ 'project' => $projectQuery ]); | 
                                                        |
| 52 | +            return $this->redirectToRoute('AdminScoreProject', ['project' => $projectQuery]); | 
                                                        |
| 53 | 53 | }  | 
                                                        
| 54 | 54 | |
| 55 | 55 | // Set default project so we can populate the namespace selector.  | 
                                                        
@@ -95,20 +95,20 @@ discard block  | 
                                                    ||
| 95 | 95 | $archiveTable = $projectRepo->getTableName($dbName, 'archive');  | 
                                                        
| 96 | 96 | |
| 97 | 97 | // MULTIPLIERS (to review)  | 
                                                        
| 98 | - $ACCT_AGE_MULT = 1.25; # 0 if = 365 jours  | 
                                                        |
| 99 | - $EDIT_COUNT_MULT = 1.25; # 0 if = 10 000  | 
                                                        |
| 100 | - $USER_PAGE_MULT = 0.1; # 0 if =  | 
                                                        |
| 98 | + $ACCT_AGE_MULT = 1.25; # 0 if = 365 jours  | 
                                                        |
| 99 | + $EDIT_COUNT_MULT = 1.25; # 0 if = 10 000  | 
                                                        |
| 100 | + $USER_PAGE_MULT = 0.1; # 0 if =  | 
                                                        |
| 101 | 101 | $PATROLS_MULT = 1; # 0 if =  | 
                                                        
| 102 | - $BLOCKS_MULT = 1.4; # 0 if = 10  | 
                                                        |
| 102 | + $BLOCKS_MULT = 1.4; # 0 if = 10  | 
                                                        |
| 103 | 103 | $AFD_MULT = 1.15;  | 
                                                        
| 104 | - $RECENT_ACTIVITY_MULT = 0.9; # 0 if =  | 
                                                        |
| 104 | + $RECENT_ACTIVITY_MULT = 0.9; # 0 if =  | 
                                                        |
| 105 | 105 | $AIV_MULT = 1.15;  | 
                                                        
| 106 | - $EDIT_SUMMARIES_MULT = 0.8; # 0 if =  | 
                                                        |
| 107 | - $NAMESPACES_MULT = 1.0; # 0 if =  | 
                                                        |
| 106 | + $EDIT_SUMMARIES_MULT = 0.8; # 0 if =  | 
                                                        |
| 107 | + $NAMESPACES_MULT = 1.0; # 0 if =  | 
                                                        |
| 108 | 108 | $PAGES_CREATED_LIVE_MULT = 1.4; # 0 if =  | 
                                                        
| 109 | 109 | $PAGES_CREATED_ARCHIVE_MULT = 1.4; # 0 if =  | 
                                                        
| 110 | - $RPP_MULT = 1.15; # 0 if =  | 
                                                        |
| 111 | - $USERRIGHTS_MULT = 0.75; # 0 if =  | 
                                                        |
| 110 | + $RPP_MULT = 1.15; # 0 if =  | 
                                                        |
| 111 | + $USERRIGHTS_MULT = 0.75; # 0 if =  | 
                                                        |
| 112 | 112 | |
| 113 | 113 | // Grab the connection to the replica database (which is separate from the above)  | 
                                                        
| 114 | 114 |          $conn = $this->get('doctrine')->getManager("replicas")->getConnection(); | 
                                                        
@@ -186,15 +186,15 @@ discard block  | 
                                                    ||
| 186 | 186 | $now = new DateTime();  | 
                                                        
| 187 | 187 | $date = new DateTime($value);  | 
                                                        
| 188 | 188 | $diff = $date->diff($now);  | 
                                                        
| 189 | -                $formula = 365*$diff->format("%y")+30*$diff->format("%m")+$diff->format("%d"); | 
                                                        |
| 189 | +                $formula = 365 * $diff->format("%y")+30 * $diff->format("%m")+$diff->format("%d"); | 
                                                        |
| 190 | 190 | $value = $formula-365;  | 
                                                        
| 191 | 191 | }  | 
                                                        
| 192 | 192 | |
| 193 | 193 |              if ($key == "id") { | 
                                                        
| 194 | 194 | $id = $value;  | 
                                                        
| 195 | 195 |              } else { | 
                                                        
| 196 | - $multiplierKey = strtoupper($row["source"] . "_MULT");  | 
                                                        |
| 197 | - $multiplier = ( isset($$multiplierKey) ? $$multiplierKey : 1 );  | 
                                                        |
| 196 | + $multiplierKey = strtoupper($row["source"]."_MULT");  | 
                                                        |
| 197 | + $multiplier = (isset($$multiplierKey) ? $$multiplierKey : 1);  | 
                                                        |
| 198 | 198 | $score = max(min($value * $multiplier, 100), -100);  | 
                                                        
| 199 | 199 | $master[$key]["mult"] = $multiplier;  | 
                                                        
| 200 | 200 | $master[$key]["value"] = $value;  | 
                                                        
@@ -204,8 +204,8 @@ discard block  | 
                                                    ||
| 204 | 204 | }  | 
                                                        
| 205 | 205 | |
| 206 | 206 |          if ($id == 0) { | 
                                                        
| 207 | -            $this->addFlash("notice", [ "no-result", $username ]); | 
                                                        |
| 208 | -            return $this->redirectToRoute("AdminScore", [ "project"=>$project ]); | 
                                                        |
| 207 | +            $this->addFlash("notice", ["no-result", $username]); | 
                                                        |
| 208 | +            return $this->redirectToRoute("AdminScore", ["project"=>$project]); | 
                                                        |
| 209 | 209 | }  | 
                                                        
| 210 | 210 | |
| 211 | 211 |          return $this->render('adminscore/result.html.twig', [ | 
                                                        
@@ -90,7 +90,7 @@ discard block  | 
                                                    ||
| 90 | 90 | public function loginAction()  | 
                                                        
| 91 | 91 |      { | 
                                                        
| 92 | 92 |          try { | 
                                                        
| 93 | - list( $next, $token ) = $this->getOauthClient()->initiate();  | 
                                                        |
| 93 | + list($next, $token) = $this->getOauthClient()->initiate();  | 
                                                        |
| 94 | 94 |          } catch (Exception $oauthException) { | 
                                                        
| 95 | 95 | throw $oauthException;  | 
                                                        
| 96 | 96 | // @TODO Make this work.  | 
                                                        
@@ -155,7 +155,7 @@ discard block  | 
                                                    ||
| 155 | 155 | . '/index.php?title=Special:OAuth';  | 
                                                        
| 156 | 156 | $conf = new ClientConfig($endpoint);  | 
                                                        
| 157 | 157 |          $consumerKey = $this->getParameter('oauth_key'); | 
                                                        
| 158 | -        $consumerSecret =  $this->getParameter('oauth_secret'); | 
                                                        |
| 158 | +        $consumerSecret = $this->getParameter('oauth_secret'); | 
                                                        |
| 159 | 159 | $conf->setConsumer(new Consumer($consumerKey, $consumerSecret));  | 
                                                        
| 160 | 160 | $this->oauthClient = new Client($conf);  | 
                                                        
| 161 | 161 | // Callback URL is hardcoded in the consumer registration.  | 
                                                        
@@ -12,7 +12,6 @@  | 
                                                    ||
| 12 | 12 | use Symfony\Component\HttpFoundation\Response;  | 
                                                        
| 13 | 13 | use Xtools\EditCounter;  | 
                                                        
| 14 | 14 | use Xtools\EditCounterRepository;  | 
                                                        
| 15 | -use Xtools\Page;  | 
                                                        |
| 16 | 15 | use Xtools\Project;  | 
                                                        
| 17 | 16 | use Xtools\ProjectRepository;  | 
                                                        
| 18 | 17 | use Xtools\User;  | 
                                                        
@@ -78,10 +78,10 @@ discard block  | 
                                                    ||
| 78 | 78 |          $username = $request->query->get('username', $request->query->get('user')); | 
                                                        
| 79 | 79 | |
| 80 | 80 |          if (($project || $queryProject) && $username) { | 
                                                        
| 81 | - $routeParams = [ 'project'=>($project ?: $queryProject), 'username' => $username ];  | 
                                                        |
| 81 | + $routeParams = ['project'=>($project ?: $queryProject), 'username' => $username];  | 
                                                        |
| 82 | 82 |              return $this->redirectToRoute("EditCounterResult", $routeParams); | 
                                                        
| 83 | 83 |          } elseif (!$project && $queryProject) { | 
                                                        
| 84 | -            return $this->redirectToRoute("EditCounterProject", [ 'project'=>$queryProject ]); | 
                                                        |
| 84 | +            return $this->redirectToRoute("EditCounterProject", ['project'=>$queryProject]); | 
                                                        |
| 85 | 85 | }  | 
                                                        
| 86 | 86 | |
| 87 | 87 | $project = ProjectRepository::getProject($queryProject, $this->container);  | 
                                                        
@@ -116,7 +116,7 @@ discard block  | 
                                                    ||
| 116 | 116 | }  | 
                                                        
| 117 | 117 |          $isSubRequest = $this->container->get('request_stack')->getParentRequest() !== null; | 
                                                        
| 118 | 118 |          return $this->render('editCounter/result.html.twig', [ | 
                                                        
| 119 | - 'xtTitle' => $this->user->getUsername() . ' - ' . $this->project->getTitle(),  | 
                                                        |
| 119 | + 'xtTitle' => $this->user->getUsername().' - '.$this->project->getTitle(),  | 
                                                        |
| 120 | 120 | 'xtPage' => 'ec',  | 
                                                        
| 121 | 121 |              'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..'), | 
                                                        
| 122 | 122 | 'is_sub_request' => $isSubRequest,  |