diff --git a/modules/exif_gps/controllers/admin_exif_gps.php b/modules/exif_gps/controllers/admin_exif_gps.php index d089ea45..ba5d7639 100644 --- a/modules/exif_gps/controllers/admin_exif_gps.php +++ b/modules/exif_gps/controllers/admin_exif_gps.php @@ -33,9 +33,12 @@ class Admin_EXIF_GPS_Controller extends Admin_Controller { // Prevent Cross Site Request Forgery access::verify_csrf(); + // Make sure the user filled out the form properly. $form = $this->_get_admin_form(); if ($form->validate()) { Kohana_Log::add("error",print_r($form,1)); + + // Save settings to Gallery's database. module::set_var("exif_gps", "googlemap_api_key", $form->google_api_key->value); module::set_var("exif_gps", "sidebar_zoom", $form->Sidebar->sidebar_default_zoom->value); module::set_var("exif_gps", "sidebar_mapformat", $form->Sidebar->sidebar_mapformat->value); @@ -64,7 +67,7 @@ class Admin_EXIF_GPS_Controller extends Admin_Controller { ->value(module::get_var("exif_gps", "googlemap_api_key")) ->rules("required"); - // Create a group for sidebar settings + // Create a group for sidebar settings $gps_sidebar = $form->group("Sidebar") ->label(t("Sidebar Settings")); $gps_sidebar->input("sidebar_default_zoom") @@ -82,9 +85,9 @@ class Admin_EXIF_GPS_Controller extends Admin_Controller { ->selected(module::get_var("exif_gps", "sidebar_maptype")); // Add a save button to the form. - $form->submit("SaveLinks")->value(t("Save")); + $form->submit("SaveSettings")->value(t("Save")); // Return the newly generated form. return $form; } -} \ No newline at end of file +} diff --git a/modules/exif_gps/helpers/exif_gps.php b/modules/exif_gps/helpers/exif_gps.php index c72fb7e2..6c143508 100644 --- a/modules/exif_gps/helpers/exif_gps.php +++ b/modules/exif_gps/helpers/exif_gps.php @@ -74,4 +74,4 @@ class exif_gps_Core { } return self::$exif_keys; } -} \ No newline at end of file +} diff --git a/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php b/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php index 57e1f903..d5b497dc 100644 --- a/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php +++ b/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php @@ -19,4 +19,4 @@ google.setOnLoadCallback(initialize); - + diff --git a/modules/exif_gps/views/exif_gps_map.html.php b/modules/exif_gps/views/exif_gps_map.html.php index 2f0fde13..bd1b01aa 100644 --- a/modules/exif_gps/views/exif_gps_map.html.php +++ b/modules/exif_gps/views/exif_gps_map.html.php @@ -10,7 +10,7 @@ mapTypeId: google.maps.MapTypeId.ROADMAP }; var map = new google.maps.Map(document.getElementById("map_canvas"), myOptions); - var glatlngbounds = new google.maps.LatLngBounds( ); + var glatlngbounds = new google.maps.LatLngBounds( ); // This is so we can auto center the map. where("item_id", "=", $item->id)->find(); ?> diff --git a/modules/exif_gps/views/exif_gps_static_sidebar.html.php b/modules/exif_gps/views/exif_gps_static_sidebar.html.php index 73e38bb0..11d80c74 100644 --- a/modules/exif_gps/views/exif_gps_static_sidebar.html.php +++ b/modules/exif_gps/views/exif_gps_static_sidebar.html.php @@ -1,3 +1,2 @@ &size=205x214&maptype=&markers=color:red|color:red|,&sensor=false"> -