Changeset 26201 for extensions/pbase2piwigo/include/functions.inc.php

Timestamp:

Dec 26, 2013, 1:22:47 PM (10 years ago)

Author:

mistic100

Message:

update for 2.6

File:

• extensions/pbase2piwigo/include/functions.inc.php (modified) (4 diffs)

extensions/pbase2piwigo/include/functions.inc.php

@@ -1 +1 @@
 <?php
-if (!defined('PBASE_PATH')) die('Hacking attempt!');
+defined('PBASE_PATH') or die('Hacking attempt!');
 
 /**
@@ -306 +306 @@
 
 /**
+ * count pictures and cats in the selected cat
+ * @param: &array tree
+ * @param: string $path
+ * @param: &int nb pictures
+ * @param: &int nb categories
+ * @param: bool recursive
+ * @return: void
+ */
+function count_pictures_cats(&$tree, $path, &$nb_pictures, &$nb_categories, $recursive=true)
+{
+  $current = &get_current_cat($tree, $path);
+  $nb_pictures+= $current['nb_pictures'];
+  $nb_categories++;
+  
+  if ( $recursive and !empty($current['categories']) )
+  {
+    foreach ($current['categories'] as $cat)
+    {
+      count_pictures_cats($tree, $cat['path'], $nb_pictures, $nb_categories, $recursive);
+    }
+  }
+}
+
+/**
  * test if a download method is available
  * @return: bool
@@ -421 +445 @@
     
     return false;
-  }
-}
-
-/**
- * count pictures and cats in the selected cat
- * @param: &array tree
- * @param: string $path
- * @param: &int nb pictures
- * @param: &int nb categories
- * @param: bool recursive
- * @return: void
- */
-function count_pictures_cats(&$tree, $path, &$nb_pictures, &$nb_categories, $recursive=true)
-{
-  $current = &get_current_cat($tree, $path);
-  $nb_pictures+= $current['nb_pictures'];
-  $nb_categories++;
-  
-  if ( $recursive and !empty($current['categories']) )
-  {
-    foreach ($current['categories'] as $cat)
-    {
-      count_pictures_cats($tree, $cat['path'], $nb_pictures, $nb_categories, $recursive);
-    }
   }
 }
@@ -516 +516 @@
   }
 }
-
-?>