Merge pull request #89 from fermionic/20121225-simplify-smarty-includes

[friendica-addons.git] / openstreetmap / openstreetmap.php

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index ebe6097850103fb1de4d616799f6b0b145307c78..cb9abcd7df691117f281210dbbdf782b5582ea00 100755 (executable)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: OpenStreetMap
- * Description: Use OpenStreetMap for displaying locations.
+ * Description: Use OpenStreetMap for displaying locations.  After activation the post location just beneath your avatar in your posts will link to openstreetmap.
  * Version: 1.1
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  * Author: Klaus Weidenbach
@@ -29,7 +29,11 @@ function openstreetmap_location($a, &$item) {
         * Get the configuration variables from the .htconfig file.
         */
        $tmsserver = get_config('openstreetmap','tmsserver');
+       if(! $tmsserver)
+               $tmsserver = 'http://openstreetmap.org';
        $zoom = get_config('openstreetmap','zoom');
+       if(! $zoom)
+               $zoom = 17;
 
        $location = '';
        $coord = '';
@@ -54,11 +58,18 @@ function openstreetmap_location($a, &$item) {
 
 
 function openstreetmap_plugin_admin (&$a, &$o) {
-       $t = file_get_contents( dirname(__file__)."/admin.tpl");
+       $t = get_markup_template( "admin.tpl", "addon/openstreetmap/" );
+       $tmsserver = get_config('openstreetmap','tmsserver');
+       if(! $tmsserver)
+               $tmsserver = 'http://openstreetmap.org';
+       $zoom = get_config('openstreetmap','zoom');
+       if(! $zoom)
+               $zoom = 17;
+
        $o = replace_macros( $t, array(
                '$submit' => t('Submit'),
-               '$tmsserver' => array('tmsserver', t('Tile Server URL'), get_config('openstreetmap','tmsserver' ), t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>')),
-               '$zoom' => array('zoom', t('Default zoom'), get_config('openstreetmap','zoom' ), t('The default zoom level. (1:world, 18:highest)')),
+               '$tmsserver' => array('tmsserver', t('Tile Server URL'), $tmsserver, t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>')),
+               '$zoom' => array('zoom', t('Default zoom'), $zoom, t('The default zoom level. (1:world, 18:highest)')),
        ));
 }
 function openstreetmap_plugin_admin_post (&$a) {