Changeset 26201 for extensions/pbase2piwigo/include

Timestamp:

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

Author:

mistic100

Message:

update for 2.6

Location:

extensions/pbase2piwigo/include

Files:

• functions.inc.php (modified) (4 diffs)
• ws_functions.inc.php (modified) (10 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 @@
   }
 }
-
-?>

extensions/pbase2piwigo/include/ws_functions.inc.php

@@ -1 +1 @@
 <?php
-if (!defined('PBASE_PATH')) die('Hacking attempt!');
+defined('PBASE_PATH') or die('Hacking attempt!');
 
 function pbase_add_ws_method($arr)
@@ -14 +14 @@
       'fills' => array('default' => 'fill_name,fill_taken,fill_author,fill_comment,fill_tags'),
       ),
-    'Used by PBase2Piwigo'
+    'Used by PBase2Piwigo',
+    null,
+    array('hidden'=>true)
     );
     
@@ -25 +27 @@
       'recursive' => array('default' => true),
       ),
-    'Used by PBase2Piwigo'
+    'Used by PBase2Piwigo',
+    null,
+    array('hidden'=>true)
     );
     
@@ -35 +39 @@
       'path' => array(),
       ),
-    'Used by PBase2Piwigo'
+    'Used by PBase2Piwigo',
+    null,
+    array('hidden'=>true)
     );
 }
@@ -56 +62 @@
   include_once(PBASE_PATH.'include/functions.inc.php');
   
-  if (test_remote_download() === false)
+  if (!test_remote_download())
   {
     return new PwgError(null, l10n('No download method available'));
@@ -127 +133 @@
   else
   {
-    $category_id = ws_categories_add(array(
+    $new_cat = $service->invoke('pwg.categories.add', array(
       'name' => $category['title'].' <!--pbase-->',
       'parent' => $params['parent_id'],
       'comment' => pwg_db_real_escape_string($category['description']),
-      ), $service);
-    $category_id = $category_id['id'];
+      ));
+    $category_id = $new_cat['id'];
   }
   
@@ -140 +146 @@
     'pictures' => array(),
     'categories' => array(),
-    'message' => sprintf(l10n('Album "%s" created'), $category['title']),
+    'message' => l10n('Album "%s" created', $category['title']),
     );
     
   foreach ($category['pictures'] as &$pict)
   {
-    array_push($output['pictures'], $pict['url']);
+    $output['pictures'][] = $pict['url'];
   }
   if ($params['recursive'])
@@ -151 +157 @@
     foreach ($category['categories'] as &$cat)
     {
-      array_push($output['categories'], $cat['path']);
+      $output['categories'][] = $cat['path'];
     }
   }
@@ -231 +237 @@
       }
       
-      if ( !empty($photo['keywords']) and in_array('fill_tags', $params['fills']) )
+      if (!empty($photo['keywords']) and in_array('fill_tags', $params['fills']))
       {
         $raw_tags = implode(',', $photo['keywords']);
@@ -239 +245 @@
   }
   
-  return sprintf(l10n('Photo "%s" imported'), $photo['title']);
-}
-
-?>
+  return l10n('Photo "%s" imported', $photo['title']);
+}