Merge branch 'master' of github.com:Fotolia/Fotolia-API

slaanesh · slaanesh · commit c49a9764cd0e · 2013-06-01T12:30:34.000+02:00
diff --git a/README.html b/README.html
@@ -713,11 +713,11 @@ <h3 id="_php">PHP</h3>
 <span style="color: #000000">00024:</span>
 <span style="color: #000000">00025:</span> <span style="font-style: italic"><span style="color: #9A1900">// loggin in and retrieving user data</span></span>
 <span style="color: #000000">00026:</span> <span style="color: #009900">$api</span><span style="color: #990000">-&gt;</span><span style="font-weight: bold"><span style="color: #000000">loginUser</span></span><span style="color: #990000">(</span><span style="color: #FF0000">'your_login'</span><span style="color: #990000">,</span> <span style="color: #FF0000">'your_password'</span><span style="color: #990000">);</span>
-<span style="color: #000000">00027:</span> <span style="font-weight: bold"><span style="color: #000000">print_r</span></span><span style="color: #990000">(</span>api<span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #000000">getUserData</span></span><span style="color: #990000">());</span>
+<span style="color: #000000">00027:</span> <span style="font-weight: bold"><span style="color: #000000">print_r</span></span><span style="color: #990000">(</span>$api<span style="color: #990000">-&gt;</span><span style="font-weight: bold"><span style="color: #000000">getUserData</span></span><span style="color: #990000">());</span>
 <span style="color: #000000">00028:</span>
 <span style="color: #000000">00029:</span> <span style="font-style: italic"><span style="color: #9A1900">// purchasing and downloading a file</span></span>
-<span style="color: #000000">00030:</span> <span style="color: #009900">$dl_data</span> <span style="color: #990000">=</span> <span style="color: #009900">$api</span><span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #000000">getMedia</span></span><span style="color: #990000">(</span><span style="color: #993399">35957426</span><span style="color: #990000">,</span> <span style="color: #FF0000">'XS'</span><span style="color: #990000">);</span>
-<span style="color: #000000">00031:</span> <span style="color: #009900">$api</span><span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #000000">downloadMedia</span></span><span style="color: #990000">(</span><span style="color: #009900">$dl_data</span><span style="color: #990000">[</span><span style="color: #FF0000">'url'</span><span style="color: #990000">],</span> <span style="color: #FF0000">'/tmp/'</span> <span style="color: #990000">+</span> <span style="color: #009900">$dl_data</span><span style="color: #990000">[</span><span style="color: #FF0000">'name'</span><span style="color: #990000">]);</span></tt></pre></div></div>
+<span style="color: #000000">00030:</span> <span style="color: #009900">$dl_data</span> <span style="color: #990000">=</span> <span style="color: #009900">$api</span><span style="color: #990000">-&gt;</span><span style="font-weight: bold"><span style="color: #000000">getMedia</span></span><span style="color: #990000">(</span><span style="color: #993399">35957426</span><span style="color: #990000">,</span> <span style="color: #FF0000">'XS'</span><span style="color: #990000">);</span>
+<span style="color: #000000">00031:</span> <span style="color: #009900">$api</span><span style="color: #990000">-&gt;</span><span style="font-weight: bold"><span style="color: #000000">downloadMedia</span></span><span style="color: #990000">(</span><span style="color: #009900">$dl_data</span><span style="color: #990000">[</span><span style="color: #FF0000">'url'</span><span style="color: #990000">],</span> <span style="color: #FF0000">'/tmp/'</span> <span style="color: #990000">+</span> <span style="color: #009900">$dl_data</span><span style="color: #990000">[</span><span style="color: #FF0000">'name'</span><span style="color: #990000">]);</span></tt></pre></div></div>
 </div>
 <div class="sect2">
 <h3 id="_python">Python</h3>
diff --git a/php/fotolia-api.php b/php/fotolia-api.php
@@ -201,6 +201,22 @@ public function getGalleries($language_id = Fotolia_Api::LANGUAGE_ID_EN_US)
                              ));
     }
 
+    /**
+     * This method returns public seasonal galleries for a defined language
+     *
+     * @param  int    $language_id
+     * @return array
+     */
+    public function getSeasonalGalleries($language_id = Fotolia_Api::LANGUAGE_ID_EN_US, $thumbnail_size = 110, $theme_id = null)
+    {
+        return $this->_api('getSeasonalGalleries',
+                              array(
+                                  'language_id' => $language_id,
+                                  'thumbnail_size' => $thumbnail_size,
+                                  'theme_id' => $theme_id
+                              ));
+    }
+
     /**
      * This method returns Fotolia list of countries.
      *
@@ -944,6 +960,7 @@ protected function _getNamespace($method)
             case 'getCategories2':
             case 'getTags':
             case 'getGalleries':
+            case 'getSeasonalGalleries':
             case 'getCountries':
                 return 'search';
 
diff --git a/python/fotolia_api/rest.py b/python/fotolia_api/rest.py
@@ -113,6 +113,21 @@ def get_galleries(self, language_id = fotolia_api.LANGUAGE_ID_EN_US):
 
         return self._api('getGalleries', params)
 
+    def get_seasonal_galleries(self, language_id = fotolia_api.LANGUAGE_ID_EN_US, thumbnail_size = fotolia_api.THUMB_SIZE_SMALL, theme_id = None):
+        """
+        This method returns public galleries for a defined language
+        """
+
+        params = {
+            'language_id': language_id,
+            'thumbnail_size': thumbnail_size
+            }
+
+        if theme_id != None:
+            params['theme_id'] = theme_id
+
+        return self._api('getSeasonalGalleries', params)
+
     def get_countries(self, language_id = fotolia_api.LANGUAGE_ID_EN_US):
         """
         This method returns Fotolia list of countries
@@ -735,6 +750,7 @@ def _get_namespace(self, method):
                 method == 'getCategories2' or \
                 method == 'getTags' or \
                 method == 'getGalleries' or \
+                method == 'getSeasonalGalleries' or \
                 method == 'getCountries':
             return 'search'
 
