stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-23 07:15:50 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve the PHPdoc for map()

Browse Source 
We now expect to either get query parameters from the Gallery2 url so
we can pick off g2_itemId, or we'll get the rewrite url in the path
query param.
This commit is contained in:
Bharat Mediratta
2010-01-01 21:56:29 -08:00
parent 161366e51d
commit 80e35affcb
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/g2_import/controllers/g2.php
+14 -7
View File
@@ -21,16 +21,23 @@ class G2_Controller extends Admin_Controller {
/**
* Redirect Gallery 2 urls to their appropriate matching Gallery 3 url.
*
* Inputs look like this:
* /g2/map?url=v/Family/Wedding/IMG_3.jpg.html
* /g2/map?id=1931
* We use mod_rewrite to create this path, so Gallery2 urls like this:
* /gallery2/v/Family/Wedding.jpg.html
* /gallery2/main.php?g2_view=core.ShowItem&g2_itemId=1234
*
* Show up here like this:
* /g2/map?path=v/Family/Wedding.jpg.html
* /g2/map?g2_view=core.ShowItem&g2_itemId=1931
*/
public function map() {
$input = Input::instance();
if ($g2_id = $input->get("id")) {
$where = array("g2_id", "=", $g2_id);
} else if ($g2_url = $input->get("url")) {
$where = array("g2_url", "=", $g2_url);
$path = $input->get("path");
$id = $input->get("g2_itemId");
if ($id) {
$where = array("g2_id", "=", $id);
} else if ($path) {
$where = array("g2_url", "=", $path);
} else {
throw new Kohana_404_Exception();
}