enwikipedia-acc / waca

includes/Helpers/SearchHelpers/SearchHelperBase.php

Spacing +10 added lines, -10 removed lines

@@ -84,8 +84,8 @@ 
     {
         $this->whereClause .= $whereClauseSection;
 
-        $countQuery = 'SELECT /* SearchHelper */ COUNT(*) FROM ' . $this->table . ' origin ';
-        $countQuery .= $this->joinClause . $this->whereClause;
+        $countQuery = 'SELECT /* SearchHelper */ COUNT(*) FROM '.$this->table.' origin ';
+        $countQuery .= $this->joinClause.$this->whereClause;
 
         $query = $this->buildQuery(array('*'));
         $query .= $this->applyOrder();
@@ -147,7 +147,7 @@ 
                 throw new ApplicationLogicException('Cannot apply distinct to column fetch already using group by');
             }
 
-            $this->groupByClause = ' GROUP BY origin.' . $column;
+            $this->groupByClause = ' GROUP BY origin.'.$column;
         }
 
         $statement = $this->getData(array($column));
@@ -176,8 +176,8 @@ 
      */
     public function getRecordCount(&$count)
     {
-        $query = 'SELECT /* SearchHelper */ COUNT(*) FROM ' . $this->table . ' origin ';
-        $query .= $this->joinClause . $this->whereClause;
+        $query = 'SELECT /* SearchHelper */ COUNT(*) FROM '.$this->table.' origin ';
+        $query .= $this->joinClause.$this->whereClause;
 
         $statement = $this->database->prepare($query);
         $statement->execute($this->parameterList);
@@ -224,7 +224,7 @@ 
     private function applyOrder()
     {
         if ($this->orderBy !== null) {
-            return ' ORDER BY ' . $this->orderBy;
+            return ' ORDER BY '.$this->orderBy;
         }
 
         return '';
@@ -257,11 +257,11 @@ 
     {
         $colData = array();
         foreach ($columns as $c) {
-            $colData[] = 'origin.' . $c;
+            $colData[] = 'origin.'.$c;
         }
 
-        $query = "SELECT {$this->modifiersClause} /* SearchHelper */ " . implode(', ', $colData) . ' FROM ' . $this->table . ' origin ';
-        $query .= $this->joinClause . $this->whereClause . $this->groupByClause;
+        $query = "SELECT {$this->modifiersClause} /* SearchHelper */ ".implode(', ', $colData).' FROM '.$this->table.' origin ';
+        $query .= $this->joinClause.$this->whereClause.$this->groupByClause;
 
         return $query;
     }
@@ -282,7 +282,7 @@ 
         // You can't use IN() with parameters directly, so let's munge something together.
         // Let's create a string of question marks, which will do as positional parameters.
         $valueCount = count($values);
-        $inSection = str_repeat('?,', $valueCount - 1) . '?';
+        $inSection = str_repeat('?,', $valueCount - 1).'?';
 
         $this->whereClause .= " AND {$column} IN ({$inSection})";
         $this->parameterList = array_merge($this->parameterList, $values);

includes/Helpers/LogHelper.php

Indentation +2 added lines, -2 removed lines

@@ -347,7 +347,7 @@ 
     {
         $userIds = array();
 
-	    foreach ($logs as $logEntry) {
+        foreach ($logs as $logEntry) {
             if (!$logEntry instanceof Log) {
                 // if this happens, we've done something wrong with passing back the log data.
                 throw new Exception('Log entry is not an instance of a Log, this should never happen.');
@@ -368,7 +368,7 @@ 
 
         $logData = array();
 
-	    foreach ($logs as $logEntry) {
+        foreach ($logs as $logEntry) {
             $objectDescription = self::getObjectDescription($logEntry->getObjectId(), $logEntry->getObjectType(),
                 $database, $configuration);
 

includes/Exceptions/AccessDeniedException.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         $currentUser = User::getCurrent($database);
         $this->assign('currentUser', $currentUser);
 
-        if($this->securityManager !== null) {
+        if ($this->securityManager !== null) {
             $this->setupNavMenuAccess($currentUser);
         }