Move fetching groups, photosets, galleries to afg_libs.php

ronakg · May 12, 2014 · 592b3bf · 592b3bf
1 parent d3a03e5
commit 592b3bf
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 65 deletions.
diff --git a/afg_add_galleries.php b/afg_add_galleries.php
@@ -11,40 +11,8 @@ function afg_add_gallery() {
     $photosets_map = array();
     $groups_map = array();
     $galleries_map = array();
-    $rsp_obj = $pf->photosets_getList($user_id);
-    if (!$pf->error_code) {
-        foreach($rsp_obj['photoset'] as $photoset) {
-            $photosets_map[$photoset['id']] = $photoset['title']['_content'];
-        }
-    }
-
-    $rsp_obj = $pf->galleries_getList($user_id);
-    if (!$pf->error_code) {
-        foreach($rsp_obj['galleries']['gallery'] as $gallery) {
-            $galleries_map[$gallery['id']] = $gallery['title']['_content'];
-        }
-    }
-
-    if (get_option('afg_flickr_token')) {
-        $rsp_obj = $pf->groups_pools_getGroups();
-        if (!$pf->error_code) {
-            foreach($rsp_obj['group'] as $group) {
-                $groups_map[$group['nsid']] = $group['name'];
-            }
-        }
-    }
-    else {
-        $rsp_obj = $pf->people_getPublicGroups($user_id);
-        if (!$pf->error_code) {
-            foreach($rsp_obj as $group) {
-                $groups_map[$group['nsid']] = $group['name'];
-            }
-        }
-    }
 
-    asort($photosets_map);
-    asort($groups_map);
-    asort($galleries_map);
+    afg_get_sets_groups_galleries($photosets_map, $groups_map, $galleries_map, $user_id);
     ?>
 
    <div class='wrap'>

diff --git a/afg_edit_galleries.php b/afg_edit_galleries.php
@@ -15,7 +15,6 @@
         }
     }
 
-
     $gallery = array(
         'name' => stripslashes($_POST['afg_edit_gallery_name']),
         'gallery_descr' => stripslashes($_POST['afg_edit_gallery_descr']),
@@ -104,39 +103,10 @@ function afg_edit_galleries() {
     }
 
     $photosets_map = array();
-    $rsp_obj = $pf->photosets_getList($user_id);
-    if (!$pf->error_code) {
-        foreach($rsp_obj['photoset'] as $photoset) {
-            $photosets_map[$photoset['id']] = $photoset['title']['_content'];
-        }
-    }
-
-    $galleries_map = array();
-    $rsp_obj = $pf->galleries_getList($user_id);
-    if (!$pf->error_code) {
-        foreach($rsp_obj['galleries']['gallery'] as $gallery) {
-            $galleries_map[$gallery['id']] = $gallery['title']['_content'];
-        }
-    }
-
     $groups_map = array();
-    if (get_option('afg_flickr_token')) {
-        $rsp_obj = $pf->groups_pools_getGroups();
-        if (!$pf->error_code) {
-            foreach($rsp_obj['group'] as $group) {
-                $groups_map[$group['nsid']] = $group['name'];
-            }
-        }
-    }
-    else {
-        $rsp_obj = $pf->people_getPublicGroups($user_id, true);
-        if (!$pf->error_code) {
-            foreach($rsp_obj as $group) {
-                $groups_map[$group['nsid']] = $group['name'];
-            }
-        }
-    }
+    $galleries_map = array();
 
+    afg_get_sets_groups_galleries($photosets_map, $groups_map, $galleries_map, $user_id);
 ?>
    <div class='wrap'>
    <h2><a href='http://www.ronakg.com/projects/awesome-flickr-gallery-wordpress-plugin/'><img src="<?php

diff --git a/afg_libs.php b/afg_libs.php
@@ -110,6 +110,45 @@
     'White' => 'Black',
 );
 
+function afg_get_sets_groups_galleries (&$photosets_map, &$groups_map, &$galleries_map, $user_id) {
+    global $pf;
+
+    $rsp_obj = $pf->photosets_getList($user_id);
+    if (!$pf->error_code) {
+        foreach($rsp_obj['photoset'] as $photoset) {
+            $photosets_map[$photoset['id']] = $photoset['title']['_content'];
+        }
+    }
+
+    $rsp_obj = $pf->galleries_getList($user_id);
+    if (!$pf->error_code) {
+        foreach($rsp_obj['galleries']['gallery'] as $gallery) {
+            $galleries_map[$gallery['id']] = $gallery['title']['_content'];
+        }
+    }
+
+    if (get_option('afg_flickr_token')) {
+        $rsp_obj = $pf->groups_pools_getGroups();
+        if (!$pf->error_code) {
+            foreach($rsp_obj['group'] as $group) {
+                $groups_map[$group['nsid']] = $group['name'];
+            }
+        }
+    }
+    else {
+        $rsp_obj = $pf->people_getPublicGroups($user_id);
+        if (!$pf->error_code) {
+            foreach($rsp_obj as $group) {
+                $groups_map[$group['nsid']] = $group['name'];
+            }
+        }
+    }
+
+    asort($photosets_map);
+    asort($groups_map);
+    asort($galleries_map);
+}
+
 function afg_get_cur_url() {
     $isHTTPS = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on");
     $port = (isset($_SERVER["SERVER_PORT"]) && ((!$isHTTPS && $_SERVER["SERVER_PORT"] != "80") || ($isHTTPS && $_SERVER["SERVER_PORT"] != "443")));