Random indentation and code formatting updates. No functional changes.

[lhc/web/wiklou.git] / includes / Categoryfinder.php

diff --git a/includes/Categoryfinder.php b/includes/Categoryfinder.php
index 325630d..5ac8a9b 100644 (file)
--- a/includes/Categoryfinder.php
+++ b/includes/Categoryfinder.php
@@ -22,7 +22,6 @@
  *
  */
 class Categoryfinder {
-
        var $articles = array(); # The original article IDs passed to the seed function
        var $deadend = array(); # Array of DBKEY category names for categories that don't have a page
        var $parents = array(); # Array of [ID => array()]
@@ -53,7 +52,7 @@ class Categoryfinder {
                $this->targets = array();
                foreach ( $categories as $c ) {
                        $ct = Title::makeTitleSafe( NS_CATEGORY, $c );
-                       if( $ct ) {
+                       if ( $ct ) {
                                $c = $ct->getDBkey();
                                $this->targets[$c] = $c;
                        }
@@ -73,6 +72,7 @@ class Categoryfinder {
 
                # Now check if this applies to the individual articles
                $ret = array();
+
                foreach ( $this->articles as $article ) {
                        $conds = $this->targets;
                        if ( $this->check( $article, $conds ) ) {
@@ -92,14 +92,20 @@ class Categoryfinder {
         */
        function check( $id , &$conds, $path = array() ) {
                // Check for loops and stop!
-               if( in_array( $id, $path ) )
+               if ( in_array( $id, $path ) ) {
                        return false;
+               }
+
                $path[] = $id;
 
                # Shortcut (runtime paranoia): No contitions=all matched
-               if ( count( $conds ) == 0 ) return true;
+               if ( count( $conds ) == 0 ) {
+                       return true;
+               }
 
-               if ( !isset( $this->parents[$id] ) ) return false;
+               if ( !isset( $this->parents[$id] ) ) {
+                       return false;
+               }
 
                # iterate through the parents
                foreach ( $this->parents[$id] as $p ) {
@@ -127,7 +133,7 @@ class Categoryfinder {
                                # No sub-parent
                                continue ;
                        }
-                       $done = $this->check( $this->name2id[$pname], $conds,$path );
+                       $done = $this->check( $this->name2id[$pname], $conds, $path );
                        if ( $done || count( $conds ) == 0 ) {
                                # Subparents have done it!
                                return true;
@@ -143,10 +149,10 @@ class Categoryfinder {
                # Find all parents of the article currently in $this->next
                $layer = array();
                $res = $this->dbr->select(
-                               /* FROM   */ 'categorylinks',
-                               /* SELECT */ '*',
-                               /* WHERE  */ array( 'cl_from' => $this->next ),
-                               __METHOD__ . "-1"
+                       /* FROM   */ 'categorylinks',
+                       /* SELECT */ '*',
+                       /* WHERE  */ array( 'cl_from' => $this->next ),
+                       __METHOD__ . "-1"
                );
                while ( $o = $this->dbr->fetchObject( $res ) ) {
                        $k = $o->cl_to ;
@@ -159,6 +165,7 @@ class Categoryfinder {
 
                        # Ignore those we already have
                        if ( in_array ( $k , $this->deadend ) ) continue;
+
                        if ( isset ( $this->name2id[$k] ) ) continue;
 
                        # Hey, new category!
@@ -170,10 +177,10 @@ class Categoryfinder {
                # Find the IDs of all category pages in $layer, if they exist
                if ( count ( $layer ) > 0 ) {
                        $res = $this->dbr->select(
-                                       /* FROM   */ 'page',
-                                       /* SELECT */ array( 'page_id', 'page_title' ),
-                                       /* WHERE  */ array( 'page_namespace' => NS_CATEGORY , 'page_title' => $layer ),
-                                       __METHOD__ . "-2"
+                               /* FROM   */ 'page',
+                               /* SELECT */ array( 'page_id', 'page_title' ),
+                               /* WHERE  */ array( 'page_namespace' => NS_CATEGORY , 'page_title' => $layer ),
+                               __METHOD__ . "-2"
                        );
                        while ( $o = $this->dbr->fetchObject( $res ) ) {
                                $id = $o->page_id;
@@ -190,4 +197,4 @@ class Categoryfinder {
                }
        }
 
-} # END OF CLASS "Categoryfinder"
+}