From ea64e421cb529637a6aa7fad7b0b881b3c224fad Mon Sep 17 00:00:00 2001 From: patdenice Date: Sat, 11 Dec 2010 21:08:43 +0000 Subject: feature 2057: use $get_data parameter to send GET data. git-svn-id: http://piwigo.org/svn/trunk@8083 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/languages.class.php | 32 +++++++++++++++++++---------- admin/include/plugins.class.php | 42 ++++++++++++++++++++++++++++----------- admin/include/themes.class.php | 42 +++++++++++++++++++++++++++------------ admin/site_manager.php | 8 +++++--- 4 files changed, 85 insertions(+), 39 deletions(-) (limited to 'admin') diff --git a/admin/include/languages.class.php b/admin/include/languages.class.php index 88b37da36..d9537bbdd 100644 --- a/admin/include/languages.class.php +++ b/admin/include/languages.class.php @@ -196,13 +196,16 @@ UPDATE '.USER_INFOS_TABLE.' { global $user; - $pem_category_id = 8; + $get_data = array( + 'category_id' => 8, + 'format' => 'php', + ); // Retrieve PEM versions $version = PHPWG_VERSION; $versions_to_check = array(); - $url = PEM_URL . '/api/get_version_list.php?category_id='.$pem_category_id.'&format=php'; - if (fetchRemote($url, $result) and $pem_versions = @unserialize($result)) + $url = PEM_URL . '/api/get_version_list.php'; + if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result)) { if (!preg_match('/^\d+\.\d+\.\d+/', $version)) { @@ -223,11 +226,15 @@ UPDATE '.USER_INFOS_TABLE.' } // Retrieve PEM languages infos - $url = PEM_URL . '/api/get_revision_list.php?category_id='.$pem_category_id.'&format=php&last_revision_only=true'; - $url .= '&version=' . implode(',', $versions_to_check); - $url .= '&lang='.$user['language']; - - if (fetchRemote($url, $result)) + $url = PEM_URL . '/api/get_revision_list.php'; + $get_data = array_merge($get_data, array( + 'last_revision_only' => 'true', + 'version' => implode(',', $versions_to_check), + 'lang' => $user['language'], + ) + ); + + if (fetchRemote($url, $result, $get_data)) { $pem_languages = @unserialize($result); if (!is_array($pem_languages)) @@ -258,10 +265,13 @@ UPDATE '.USER_INFOS_TABLE.' { if ($archive = tempnam( PHPWG_ROOT_PATH.'language', 'zip')) { - $url = PEM_URL . '/download.php?rid=' . $revision; - $url .= '&origin=piwigo_' . $action; + $url = PEM_URL . '/download.php'; + $get_data = array( + 'rid' => $revision, + 'origin' => 'piwigo_'.$action, + ); - if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle)) + if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle, $get_data)) { fclose($handle); include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php'); diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php index 2de666c04..5b620da62 100644 --- a/admin/include/plugins.class.php +++ b/admin/include/plugins.class.php @@ -290,11 +290,16 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\''; { global $user; + $get_data = array( + 'category_id' => 12, + 'format' => 'php', + ); + // Retrieve PEM versions $version = PHPWG_VERSION; $versions_to_check = array(); - $url = PEM_URL . '/api/get_version_list.php?category_id=12&format=php'; - if (fetchRemote($url, $result) and $pem_versions = @unserialize($result)) + $url = PEM_URL . '/api/get_version_list.php'; + if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result)) { if (!preg_match('/^\d+\.\d+\.\d+/', $version)) { @@ -325,17 +330,27 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\''; } // Retrieve PEM plugins infos - $url = PEM_URL . '/api/get_revision_list.php?category_id=12&format=php&last_revision_only=true'; - $url .= '&version=' . implode(',', $versions_to_check); - $url .= '&lang=' . substr($user['language'], 0, 2); - $url .= '&get_nb_downloads=true'; + $url = PEM_URL . '/api/get_revision_list.php'; + $get_data = array_merge($get_data, array( + 'last_revision_only' => 'true', + 'version' => implode(',', $versions_to_check), + 'lang' => substr($user['language'], 0, 2), + 'get_nb_downloads' => 'true', + ) + ); if (!empty($plugins_to_check)) { - $url .= $new ? '&extension_exclude=' : '&extension_include='; - $url .= implode(',', $plugins_to_check); + if ($new) + { + $get_data['extension_exclude'] = implode(',', $plugins_to_check); + } + else + { + $get_data['extension_include'] = implode(',', $plugins_to_check); + } } - if (fetchRemote($url, $result)) + if (fetchRemote($url, $result, $get_data)) { $pem_plugins = @unserialize($result); if (!is_array($pem_plugins)) @@ -386,10 +401,13 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\''; { if ($archive = tempnam( PHPWG_PLUGINS_PATH, 'zip')) { - $url = PEM_URL . '/download.php?rid=' . $revision; - $url .= '&origin=piwigo_' . $action; + $url = PEM_URL . '/download.php'; + $get_data = array( + 'rid' => $revision, + 'origin' => 'piwigo_'.$action, + ); - if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle)) + if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle, $get_data)) { fclose($handle); include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php'); diff --git a/admin/include/themes.class.php b/admin/include/themes.class.php index 7601f6d60..f372ef5de 100644 --- a/admin/include/themes.class.php +++ b/admin/include/themes.class.php @@ -447,13 +447,16 @@ SELECT { global $user; - $pem_category_id = 10; + $get_data = array( + 'category_id' => 10, + 'format' => 'php', + ); // Retrieve PEM versions $version = PHPWG_VERSION; $versions_to_check = array(); - $url = PEM_URL . '/api/get_version_list.php?category_id='.$pem_category_id.'&format=php'; - if (fetchRemote($url, $result) and $pem_versions = @unserialize($result)) + $url = PEM_URL . '/api/get_version_list.php'; + if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result)) { if (!preg_match('/^\d+\.\d+\.\d+/', $version)) { @@ -484,17 +487,27 @@ SELECT } // Retrieve PEM themes infos - $url = PEM_URL . '/api/get_revision_list.php?category_id='.$pem_category_id.'&format=php&last_revision_only=true'; - $url .= '&version=' . implode(',', $versions_to_check); - $url .= '&lang=' . substr($user['language'], 0, 2); - $url .= '&get_nb_downloads=true'; + $url = PEM_URL . '/api/get_revision_list.php'; + $get_data = array_merge($get_data, array( + 'last_revision_only' => 'true', + 'version' => implode(',', $versions_to_check), + 'lang' => substr($user['language'], 0, 2), + 'get_nb_downloads' => 'true', + ) + ); if (!empty($themes_to_check)) { - $url .= $new ? '&extension_exclude=' : '&extension_include='; - $url .= implode(',', $themes_to_check); + if ($new) + { + $get_data['extension_exclude'] = implode(',', $themes_to_check); + } + else + { + $get_data['extension_include'] = implode(',', $themes_to_check); + } } - if (fetchRemote($url, $result)) + if (fetchRemote($url, $result, $get_data)) { $pem_themes = @unserialize($result); if (!is_array($pem_themes)) @@ -546,10 +559,13 @@ SELECT { if ($archive = tempnam( PHPWG_THEMES_PATH, 'zip')) { - $url = PEM_URL . '/download.php?rid=' . $revision; - $url .= '&origin=piwigo_' . $action; + $url = PEM_URL . '/download.php'; + $get_data = array( + 'rid' => $revision, + 'origin' => 'piwigo_'.$action, + ); - if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle)) + if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle, $get_data)) { fclose($handle); include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php'); diff --git a/admin/site_manager.php b/admin/site_manager.php index cb3a69318..b125f6181 100644 --- a/admin/site_manager.php +++ b/admin/site_manager.php @@ -116,9 +116,11 @@ SELECT COUNT(id) AS count if ( ! isset($_POST['no_check']) ) { $clf_url = $url.'create_listing_file.php'; - $clf_url.= '?action=test'; - $clf_url.= '&version='.PHPWG_VERSION; - if (fetchRemote($clf_url, $result)) + $get_data = array( + 'action' => 'test', + 'version' => PHPWG_VERSION, + ); + if (fetchRemote($clf_url, $result, $get_data)) { $lines = explode("\r\n", $result); $first_line = strip_tags($lines[0]); -- cgit v1.2.3