Changeset 2870

Timestamp:

01/12/11 17:30:28 (13 years ago)

Author:

Tomtom33

Message:

Watch out #3

Location:

plugins/myGmaps/branches

Files:

• inc/lib.my.gmaps.ui.php (modified) (5 diffs)
• js/_map.js (modified) (3 diffs)
• js/myGmaps.js (modified) (4 diffs)
• map.php (modified) (10 diffs)
• maps.php (modified) (1 diff)

plugins/myGmaps/branches/inc/lib.my.gmaps.ui.php

@@ -3 +3 @@
 class adminMyGmapsList extends adminGenericList
 {
-     public function display($page,$nb_per_page,$enclose_block='')
+     public function display($page,$nb_per_page,$p_url,$enclose_block='')
      {
           if ($this->rs->isEmpty())
@@ -38 +38 @@
                while ($this->rs->fetch())
                {
-                    echo $this->postLine();
+                    echo $this->postLine($p_url);
                }
 
@@ -47 +47 @@
      }
 
-     private function postLine()
+     private function postLine($p_url)
      {
           if ($this->core->auth->check('categories',$this->core->blog->id)) {
@@ -54 +54 @@
                $cat_link = '%2$s';
           }
-          $p_url    = 'plugin.php?p='.basename(dirname(__FILE__));
           $img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
           switch ($this->rs->post_status) {
@@ -80 +79 @@
           '<td class="nowrap">'.
           form::checkbox(array('entries[]'),$this->rs->post_id,'','','',!$this->rs->isEditable()).'</td>'.
-          '<td class="maximal"><a href="'.$p_url.'&amp;do=edit&amp;id='.$this->rs->post_id.'">'.
+          '<td class="maximal"><a href="'.$p_url.'&amp;go=map&amp;id='.$this->rs->post_id.'">'.
           html::escapeHTML($this->rs->post_title).'</a></td>'.
           '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->post_dt).'</td>'.

plugins/myGmaps/branches/js/_map.js

@@ -49 +49 @@
           myGmaps.scrollwheel = $('input[name=scrollwheel]').val() == '1' ? true : false;
      }
+     if ($('input[name=map_type]').val() != '') {
+          myGmaps.type = $('input[name=map_type]').val();
+     }
+     if ($('input[name=elt_type]').val() != '') {
+          myGmaps.elt_type = $('input[name=elt_type]').val();
+     }
+     if (myGmaps.elt_type == 'polyline') {
+          myGmaps.options[myGmaps.elt_type].strokeWeight = $('input[name=stroke_weight]').val();
+          myGmaps.options[myGmaps.elt_type].strokeOpacity = $('input[name=stroke_opacity]').val();
+          myGmaps.options[myGmaps.elt_type].strokeColor = $('input[name=stroke_color]').val();
+     }
+     if (myGmaps.elt_type == 'polygon') {
+          myGmaps.options[myGmaps.elt_type].strokeWeight = $('input[name=stroke_weight]').val();
+          myGmaps.options[myGmaps.elt_type].strokeOpacity = $('input[name=stroke_opacity]').val();
+          myGmaps.options[myGmaps.elt_type].strokeColor = $('input[name=stroke_color]').val();
+          myGmaps.options[myGmaps.elt_type].strokeWeight = $('input[name=stroke_weight]').val();
+     }
+     
      myGmaps.init();
-     myGmaps.updDetails();
+     myGmaps.loadData();
      
      // Events
@@ -57 +75 @@
      $('li#none,li#marker,li#polyline,li#polygon').click(function() {
           myGmaps.startDraw($(this).attr('id'));
+          
      });
      $('input[name=reset]').click(function () {
@@ -72 +91 @@
      });
      $('#entry-form').submit(function () {
-          var post_maps = $('#post_maps').val();
-          if (post_maps == '') {
-               $('#post_maps').val('none');
-          }
           var content = $("textarea[name=post_content]").val();
           if (content == '') {
                $("textarea[name=post_content]").val('Pas de description');
           }
-          setConfig(); return false;
-          var center = map.getCenter().lat()+','+map.getCenter().lng();
-          var zoom = map.getZoom();
-          var map_type = map.getMapTypeId();
-          var elt_type = type == 'hand' ? 'none' : type;
-          
-          $('input[name=center]').val(center);
-          $('input[name=zoom]').val(zoom);
-          $('input[name=map_type]').val(map_type);
-          $('input[name=elt_type]').val(elt_type);
-          
-          var list = [];
-          var icon = '';
-          for (i in markers) {
-               if (is_url(markers[i])) {
-                    list.push(markers[i]);
-               }
-               else {
-                    list.push(markers[i].getPosition().lat() + "|" + markers[i].getPosition().lng() + "|" + icon);
-               }
-          }
-          $('#post_excerpt').val(list.join('\n'));
+          myGmaps.setMapPoints();
           return true;
      });

plugins/myGmaps/branches/js/myGmaps.js

@@ -21 +21 @@
           polygon: null
      },
+     options: {
+          polyline: {
+               strokeColor: '#000000',
+               strokeWeight: 3,
+               strokeOpacity: 0.5
+          },
+          polygon: {
+               fillColor: '#5555FF',
+               strokeColor: '#000000',
+               strokeWeight: 3,
+               strokeOpacity: 0.5
+          }
+     },
      infowindow: null,
      msg: {},
@@ -34 +47 @@
           myGmaps.path.polygon = new google.maps.MVCArray;
           // Init objects
-          myGmaps.objects.polyline = new google.maps.Polyline({
-               strokeColor: '#000000',
-               strokeWeight: 3,
-               strokeOpacity: 0.5
-          });
-          myGmaps.objects.polygon = new google.maps.Polygon({
-               fillColor: '#5555FF',
-               strokeColor: '#000000',
-               strokeWeight: 3,
-               strokeOpacity: 0.5
-          });
+          myGmaps.objects.polyline = new google.maps.Polyline(myGmaps.options.polyline);
+          myGmaps.objects.polygon = new google.maps.Polygon(myGmaps.options.polygon);
           myGmaps.objects.polyline.setPath(new google.maps.MVCArray([myGmaps.path.polyline]));
           myGmaps.objects.polygon.setPath(new google.maps.MVCArray([myGmaps.path.polygon]));
@@ -72 +76 @@
      
      loadData: function() {
-          var list = $('input[name=post_excerpt]').val().split("\n");
+          var list = $('textarea[name=post_excerpt]').val().split("\n");
+          myGmaps.elt_type = $('input[name=elt_type]').val();
           for (var i = 0; i < list.length; i++) {
                if (list[i].length > 0) {
@@ -366 +371 @@
      },
      
+     setMapPoints: function() {
+          var type = '';
+          var icon = '';
+          var stroke_weight = '';
+          var stroke_opacity = '';
+          var stroke_color = '';
+          var fill_color = '';
+          var list = [];
+          var points = [];
+          
+           if (myGmaps.path.polyline.length > 0) {
+               type = 'polyline';
+               list = myGmaps.markers;
+               stroke_weight = myGmaps.objects.polyline.strokeWeight;
+               stroke_opacity = myGmaps.objects.polyline.strokeOpacity;
+               stroke_color = myGmaps.objects.polyline.strokeColor;
+          }
+          else if (myGmaps.path.polygon.length > 0) {
+               type = 'polygon';
+               list = myGmaps.markers;
+               stroke_weight = myGmaps.objects.polygon.strokeWeight;
+               stroke_opacity = myGmaps.objects.polygon.strokeOpacity;
+               stroke_color = myGmaps.objects.polygon.strokeColor;
+               fill_color = myGmaps.objects.polygon.fillColor;
+          }
+          else if (myGmaps.markers.length > 0) {
+               type = 'marker';
+               list = myGmaps.markers;
+          }
+          else if (myGmaps.kmls.length > 0) {
+               type = 'kml';
+               list = myGmaps.kmls;
+          }
+          else {
+               type = 'none';
+          }
+          
+          for (i in list) {
+               if (myGmaps.is_url(list[i].url)) {
+                    points.push(list[i].url);
+               }
+               else {
+                    points.push(list[i].getPosition().lat() + "|" + list[i].getPosition().lng() + "|" + icon);
+               }
+          }
+          
+          $('input[name=elt_type]').val(type);
+          $('input[name=stroke_weight]').val(stroke_weight);
+          $('input[name=stroke_opacity]').val(stroke_opacity);
+          $('input[name=stroke_color]').val(stroke_color);
+          $('input[name=fill_color]').val(fill_color);
+          $('textarea[name=post_excerpt]').val(points.join("\n"));
+     },
+     
      select: function(id) {
           $('li#none').removeClass('selected');

plugins/myGmaps/branches/map.php

@@ -15 +15 @@
 $post_dt = '';
 $post_type = 'map';
-$post_maps = 'none';
 $post_format = $core->auth->getOption('post_format');
 $post_password = '';
@@ -31 +30 @@
 $post_open_tb = '';
 $post_meta = array();
+$post_meta = array(
+     'center' => $core->blog->settings->myGmaps->center,
+     'zoom' => $core->blog->settings->myGmaps->center,
+     'map_type' => $core->blog->settings->myGmaps->map_type,
+     'elt_type' => 'none',
+     'stroke_weight' => '',
+     'stroke_opacity' => '',
+     'stroke_color' => '',
+     'fill_color' => ''
+);
 
 $post_media = array();
@@ -108 +117 @@
           $post_dt = date('Y-m-d H:i',strtotime($post->post_dt));
           $post_type = $post->post_type;
-          $post_maps = $post->post_maps;
           $post_format = $post->post_format;
           $post_password = $post->post_password;
@@ -179 +187 @@
      $post_open_tb = !empty($_POST['post_open_tb']);
      $post_selected = !empty($_POST['post_selected']);
-     $post_lang = $_POST['post_lang'];
+     $post_lang = $core->auth->getInfo('user_lang');
      $post_password = !empty($_POST['post_password']) ? $_POST['post_password'] : null;
      
@@ -234 +242 @@
                $core->callBehavior('adminAfterPostUpdate',$cur,$post_id);
                
-               if (isset($_POST['post_maps'])) {
-                    $tags = $_POST['post_maps'];
-                    $myGmaps_center = $_POST['myGmaps_center'];
-                    $myGmaps_zoom = $_POST['myGmaps_zoom'];
-                    $myGmaps_type = $_POST['myGmaps_type'];
-                    $meta =& $GLOBALS['core']->meta;
-                    $meta->delPostMeta($post_id,'map');
-                    $meta->delPostMeta($post_id,'map_options');
-                    
-                    foreach ($meta->splitMetaValues($tags) as $tag) {
-                         $meta->setPostMeta($post_id,'map',$tag);
-                    }
-                    $map_options = $myGmaps_center.','.$myGmaps_zoom.','.$myGmaps_type;
-                    $meta->setPostMeta($post_id,'map_options',$map_options);
+               foreach ($post_meta as $k => $v) {
+                    $core->meta->delPostMeta($post_id,$k);
+                    $core->meta->setPostMeta($post_id,$k,(array_key_exists($k,$_POST) ? $_POST[$k] : $v));
                }
-               http::redirect(''.$p_url.'&do=edit&id='.$post_id.'&upd=1');
+               http::redirect(''.$p_url.'&go=map&id='.$post_id.'&upd=1');
           }
           catch (Exception $e)
@@ -270 +267 @@
                $core->callBehavior('adminAfterPostCreate',$cur,$return_id);
                
-               if (isset($_POST['post_maps'])) {
-                    $tags = $_POST['post_maps'];
-                    $myGmaps_center = $_POST['myGmaps_center'];
-                    $myGmaps_zoom = $_POST['myGmaps_zoom'];
-                    $myGmaps_type = $_POST['myGmaps_type'];
-                    $meta =& $GLOBALS['core']->meta;
-                    
-                    foreach ($meta->splitMetaValues($tags) as $tag) {
-                         $meta->setPostMeta($return_id,'map',$tag);
-                    }
-                    $map_options = $myGmaps_center.','.$myGmaps_zoom.','.$myGmaps_type;
-                    $meta->setPostMeta($return_id,'map_options',$map_options);
+               foreach ($post_meta as $k => $v) {
+                    $core->meta->setPostMeta($return_id,$k,(array_key_exists($k,$_POST) ? $_POST[$k] : $v));
                }
-               
-               http::redirect(''.$p_url.'&do=edit&id='.$return_id.'&crea=1');
+               http::redirect(''.$p_url.'&go=map&id='.$return_id.'&crea=1');
           }
           catch (Exception $e)
@@ -299 +285 @@
           $core->callBehavior('adminBeforePostDelete',$post_id);
           $core->blog->delPost($post_id);
-          http::redirect($p_url.'&do=list');
+          http::redirect($p_url.'&go=maps');
      } catch (Exception $e) {
           $core->error->add($e->getMessage());
@@ -381 +367 @@
      echo
      '<div id="edit-entry">'.
-     '<form action="'.$p_url.'&amp;do=edit" method="post" id="entry-form">'.
+     '<form action="'.$p_url.'&amp;go=map" method="post" id="entry-form">'.
      '<div id="entry-sidebar">';
      
@@ -410 +396 @@
      form::field('post_title',20,255,html::escapeHTML($post_title),'maximal',2).
      '</label></p>';
-     
-     $meta =& $GLOBALS['core']->meta;
-     
-     if(isset($post)) {
-          echo form::hidden('post_maps',$meta->getMetaStr($post->post_meta,'map')).'</p>';
-     } else {
-          echo form::hidden('post_maps','').'</p>';
-     }
      
      echo
@@ -460 +438 @@
      '</p>';
      
-     $metas = array(
-          'elt_type' => array_key_exists('elt_type',$post_meta) ? $post_meta['elt_type'] : 'none',
-          'stroke_weight' => array_key_exists('stroke_weight',$post_meta) ? $post_meta['stroke_weight'] : '',
-          'stroke_opacity' => array_key_exists('stroke_opacity',$post_meta) ? $post_meta['stroke_opacity'] : '',
-          'stroke_color' => array_key_exists('stroke_color',$post_meta) ? $post_meta['stroke_color'] : '',
-          'fill_color' => array_key_exists('fill_color',$post_meta) ? $post_meta['fill_color'] : ''
-     );
-     foreach ($metas as $k => $v) {
-          echo form::hidden($k,$v);
-     }
-     
-     echo
-     form::hidden('center',$core->blog->settings->myGmaps->center).
-     form::hidden('zoom',$core->blog->settings->myGmaps->zoom).
-     form::hidden('map_type',$core->blog->settings->myGmaps->map_type).
-     form::hidden('scrollwheel',$core->blog->settings->myGmaps->scrollwheel);
-     
-     echo
-     '<p>'.
+     echo '<p>';
+     foreach ($post_meta as $k => $v) {
+          echo form::hidden($k,$v[0]);
+     }
+     echo
+     form::hidden('scrollwheel',$core->blog->settings->myGmaps->scrollwheel).
      ($post_id ? form::hidden('id',$post_id) : '').
      '<input type="submit" value="'.__('save').' (s)" tabindex="4" '.

plugins/myGmaps/branches/maps.php

@@ -277 +277 @@
      
      # Show posts
-     $post_list->display($page,$nb_per_page,
+     $post_list->display($page,$nb_per_page,$p_url,
      '<form action="'.$p_url.'" method="post" id="form-entries">'.