added location tagging

diff --git a/database.sql b/database.sql
index 1809f4703bdc421c99e8195a0d546fc3c3cc9001..af1ec630f2ba5bafdf8f9d8789d2d3daf9b5419f 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -331,6 +331,7 @@ CREATE TABLE IF NOT EXISTS `user` (
   `nickname` char(255) NOT NULL,
   `email` char(255) NOT NULL,
   `timezone` char(128) NOT NULL,
+  `default-location` char(255) NOT NULL,
   `theme` char(255) NOT NULL,
   `pubkey` text NOT NULL,
   `prvkey` text NOT NULL,

diff --git a/images/globe.gif b/images/globe.gif
new file mode 100644 (file)
index 0000000..3f17c5d
Binary files /dev/null and b/images/globe.gif differ

diff --git a/include/items.php b/include/items.php
index 74809583c3d3c3ba421643ce7d68b01fe6f8e1ec..aeb89892ea7b0bd805d2d98c7ddaf2a1b5c375b0 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -120,7 +120,8 @@ function get_feed_for(&$a,$dfrn_id,$owner_id,$last_update) {
                                        '$title' => xmlify($item['title']),
                                        '$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
                                        '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
-                                       '$content' =>xmlify($item['body']),
+                                       '$location' => xmlify($item['location']),
+                                       '$content' => xmlify($item['body']),
                                        '$comment_allow' => (($item['last-child'] && strlen($contact['dfrn-id'])) ? 1 : 0)
                                ));
                        }
@@ -174,6 +175,11 @@ function get_atom_elements($item) {
        if($rawcreated)
                $res['created'] = unxmlify($rawcreated[0]['data']);
 
+       $rawlocation = $item->get_item_tags('http://activitystrea.ms/spec/1.0/', 'place');
+       if($rawlocation)
+               $res['location'] = unxmlify($rawlocation[0]['data']);
+
+
        $rawedited = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'updated');
        if($rawedited)
                $res['edited'] = unxmlify($rawcreated[0]['data']);
@@ -204,6 +210,7 @@ function post_remote($a,$arr) {
        $arr['created'] = datetime_convert('UTC','UTC',$arr['created'],'Y-m-d H:i:s');
        $arr['edited'] = datetime_convert('UTC','UTC',$arr['edited'],'Y-m-d H:i:s');
        $arr['title'] = notags(trim($arr['title']));
+       $arr['location'] = notags(trim($arr['location']));
        $arr['body'] = escape_tags(trim($arr['body']));
        $arr['last-child'] = intval($arr['last-child']);
        $arr['visible'] = 1;
@@ -213,7 +220,7 @@ function post_remote($a,$arr) {
        $parent_id = 0;
 
        dbesc_array($arr);
-//dbg(3);
+
        $r = q("INSERT INTO `item` (`" 
                        . implode("`, `", array_keys($arr)) 
                        . "`) VALUES ('" 

diff --git a/include/notifier.php b/include/notifier.php
index ff18dd9b4fe0eccd0012497b16d363815ff23655..d00ef54f435e87a8b8cee31d0bb1f4c3b5bd23f3 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -176,7 +176,7 @@
                                                        $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
                                                '$updated' => xmlify(datetime_convert('UTC', 'UTC', 
                                                        $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
-                                               '$content' =>xmlify($item['body']),
+                                               '$content' => xmlify($item['body']),
                                                '$parent_id' => xmlify($item['parent-uri']),
                                                '$comment_allow' => 0
                                        ));
@@ -209,6 +209,7 @@
                                                                                $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
                                                                        '$updated' => xmlify(datetime_convert('UTC', 'UTC', 
                                                                                $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
+                                                                       '$location' => xmlify($item['location']),
                                                                        '$content' =>xmlify($item['body']),
                                                                        '$comment_allow' => (($item['last-child'] && strlen($contact['dfrn-id'])) ? 1 : 0)
                                                                ));

diff --git a/mod/item.php b/mod/item.php
index c658a871d59d5344d79ea5425d7f67651e165806..5b81f13eeb55257daca551a0ee16699406475194 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -72,6 +72,7 @@ function item_post(&$a) {
 
        $title = notags(trim($_POST['title']));
        $body = escape_tags(trim($_POST['body']));
+       $location = notags(trim($_POST['location']));
 
        if(! strlen($body)) {
                notice( t('Empty post discarded.') . EOL );
@@ -142,8 +143,8 @@ function item_post(&$a) {
 
        $r = q("INSERT INTO `item` (`uid`,`type`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
                `author-name`, `author-link`, `author-avatar`, `created`,
-               `edited`, `uri`, `title`, `body`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
-               VALUES( %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+               `edited`, `uri`, `title`, `body`, `location`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
+               VALUES( %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
                intval($profile_uid),
                dbesc($post_type),
                intval($contact_id),
@@ -158,6 +159,7 @@ function item_post(&$a) {
                dbesc($uri),
                dbesc($title),
                dbesc($body),
+               dbesc($location),
                dbesc($str_contact_allow),
                dbesc($str_group_allow),
                dbesc($str_contact_deny),

diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
index fc2816ef97a5a292c415c60d5093e002bb83fe0b..b77b146463220f913fd1c018f152800b64f0ce04 100644 (file)
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
@@ -2,7 +2,8 @@
 <feed xmlns="http://www.w3.org/2005/Atom"
       xmlns:thr="http://purl.org/syndication/thread/1.0"
       xmlns:at="http://purl.org/atompub/tombstones/1.0"
-      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" >
+      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
+      xmlns:as="http://activitystrea.ms/spec/1.0/" >
 
   <id>$feed_id</id>
   <title>$feed_title</title>

diff --git a/view/atom_item.tpl b/view/atom_item.tpl
index 16581fc89777f4d2dae52804c835346384d0b0dc..99b18e05f7e38de2f22b0768fa8c3f5f6c46738a 100644 (file)
--- a/view/atom_item.tpl
+++ b/view/atom_item.tpl
@@ -15,5 +15,6 @@
                <published>$published</published>
                <updated>$updated</updated>
                <content>$content</content>
+               <as:place>$location</as:place>
                <dfrn:comment-allow>$comment_allow</dfrn:comment-allow>
        </entry>

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index b13a324bba4406cb7557ea21bcdcc70647932720..39f8adc6eff8b48224ce4bfe4d20b221326efd89 100644 (file)
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -80,6 +80,14 @@ tinyMCE.init({
                }
        }
 
+       function jotGetLocation() {
+               reply = prompt("Where are you right now?");
+               if(reply && reply.length) {
+                       $('#jot-location').val(reply);
+               }
+       }
+
+
        function linkdropper(event) {
                var linkFound = event.dataTransfer.types.contains("text/uri-list");
                if(linkFound)

diff --git a/view/jot.tpl b/view/jot.tpl
index 481ab125b746748e6452cc4216617295f159222c..5ceb795037c31d4ee23aa85555333ff378783567 100644 (file)
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -9,6 +9,7 @@
 <input type="hidden" name="type" value="wall" />
 <input type="hidden" name="profile_uid" value="$profile_uid" />
 <input type="hidden" name="return" value="$return_path" />
+<input type="hidden" name="location" id="jot-location" value="" />
 
 <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
 
@@ -24,6 +25,9 @@
        <div id="profile-youtube-wrapper" style="display: $visitor;" >
                <img id="profile-video" src="images/youtube_icon.gif" alt="Insert YouTube video" title="Insert YouTube video" onclick="jotGetVideo();" />
        </div> 
+       <div id="profile-location-wrapper" style="display: $visitor;" >
+               <img id="profile-location" src="images/globe.gif" alt="Set your location" title="Set your lcoation" onclick="jotGetLocation();" />
+       </div> 
        <div id="profile-rotator-wrapper" style="display: $visitor;" >
                <img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
        </div> 

diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 872fb1f6151fc3a89e62fc4a50683a5060f96d1e..57d2888f48d0a5b827a89d00fc2a7056e9acad5f 100644 (file)
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -720,10 +720,14 @@ input#dfrn-url {
        float: left;
        margin-left: 20px;
 }
+#profile-location-wrapper {
+       float: left;
+       margin-left: 20px;
+}
 
 #profile-jot-perms {
        float: left;
-       margin-left: 250px;
+       margin-left: 200px;
 }
 
 #profile-jot-perms-end {