From de84f48e2fd52a3a35af26895bd70132b1e92e5e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 19 Jun 2015 12:44:11 +0200 Subject: bring some more generic-content-wrappers and fix some of them --- include/RedDAV/RedBrowser.php | 7 +-- view/tpl/blocklist.tpl | 126 ++++++++++++++++++------------------- view/tpl/cloud_directory.tpl | 2 +- view/tpl/conv_item.tpl | 2 +- view/tpl/conv_list.tpl | 2 +- view/tpl/conversation.tpl | 2 +- view/tpl/layoutlist.tpl | 130 ++++++++++++++++++++------------------- view/tpl/menulist.tpl | 70 +++++++++++---------- view/tpl/photo_album.tpl | 44 ++++++------- view/tpl/photos_recent.tpl | 28 +++++---- view/tpl/search_item.tpl | 2 +- view/tpl/webpagelist.tpl | 140 +++++++++++++++++++++--------------------- 12 files changed, 282 insertions(+), 273 deletions(-) diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php index a0330d7cc..d74bba220 100644 --- a/include/RedDAV/RedBrowser.php +++ b/include/RedDAV/RedBrowser.php @@ -247,7 +247,7 @@ class RedBrowser extends DAV\Browser\Plugin { $this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output)); } - $html .= replace_macros(get_markup_template('cloud_header.tpl'), array( + $html .= replace_macros(get_markup_template('cloud.tpl'), array( '$header' => t('Files') . ": " . $this->escapeHTML($path) . "/", '$quota' => $quota, '$total' => t('Total'), @@ -255,10 +255,7 @@ class RedBrowser extends DAV\Browser\Plugin { '$shared' => t('Shared'), '$create' => t('Create'), '$upload' => t('Upload'), - '$is_owner' => $is_owner - )); - - $html .= replace_macros(get_markup_template('cloud_directory.tpl'), array( + '$is_owner' => $is_owner, '$parentpath' => $parentpath, '$entries' => $f, '$name' => t('Name'), diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl index 85e4865ea..27dbcbf0c 100644 --- a/view/tpl/blocklist.tpl +++ b/view/tpl/blocklist.tpl @@ -1,67 +1,69 @@ -
+
+
+ {{if $editor}} +
+ +
+ {{/if}} +

{{$title}}

+
+
{{if $editor}} -
- +
+ {{$editor}}
{{/if}} -

{{$title}}

+ {{if $pages}} +
+ + + + + + + + + + + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + + + + + + + + + + {{/foreach}} + {{/foreach}} +
{{$name}}{{$blocktitle}}
+ {{if $view}} + {{$item.name}} + {{else}} + {{$item.name}} + {{/if}} + + {{$item.title}} + + {{if $edit}} + + {{/if}} + + {{if $item.bb_element}} + + {{/if}} + + {{if $edit}} + + {{/if}} +
+
+ {{/if}}
-{{if $editor}} -
- {{$editor}} -
-{{/if}} -{{if $pages}} -
- - - - - - - - - - - {{foreach $pages as $key => $items}} - {{foreach $items as $item}} - - - - - - - - - - {{/foreach}} - {{/foreach}} -
{{$name}}{{$blocktitle}}
- {{if $view}} - {{$item.name}} - {{else}} - {{$item.name}} - {{/if}} - - {{$item.title}} - - {{if $edit}} - - {{/if}} - - {{if $item.bb_element}} - - {{/if}} - - {{if $edit}} - - {{/if}} -
-
-
-{{/if}} diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index c1d03da83..0c7892c25 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,4 +1,4 @@ -
+
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index e0acc25ae..27632d770 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -4,7 +4,7 @@
- - - - - - - - - - {{foreach $pages as $key => $items}} - {{foreach $items as $item}} - - - - - - - - - - {{/foreach}} - {{/foreach}} -
{{$name}}{{$descr}}
- {{if $view}} - {{$item.title}} - {{else}} - {{$item.title}} - {{/if}} - - {{$item.descr}} - - {{if $edit}} - - {{/if}} - - {{if $item.bb_element}} - - {{/if}} - - {{if $edit}} - - {{/if}} -
+ {{if $pages}} +
+ + + + + + + + + + + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + + + + + + + + + + {{/foreach}} + {{/foreach}} +
{{$name}}{{$descr}}
+ {{if $view}} + {{$item.title}} + {{else}} + {{$item.title}} + {{/if}} + + {{$item.descr}} + + {{if $edit}} + + {{/if}} + + {{if $item.bb_element}} + + {{/if}} + + {{if $edit}} + + {{/if}} +
+
+
+ {{/if}}
-
-{{/if}} diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index 888dc6e6d..743165cc3 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -1,38 +1,40 @@ -
-
- +
+
+
+ +
+

{{$title}}

+
-

{{$title}}

-
-
-{{$create}} + {{$create}} -{{if $menus }} -
- - - - - - - - - - - - {{foreach $menus as $m }} - - - - - - - - - - - {{/foreach}} - + {{if $menus }} +
+ + + + + + + + + + + + {{foreach $menus as $m }} + + + + + + + + + + + {{/foreach}} + +
+ {{/if}}
-{{/if}} diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 5506b01f2..0ce9c36a8 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,27 +1,29 @@ -
-
- -
- {{if $album_edit.1}} - - {{/if}} - {{if $can_post}} - - {{/if}} +
+
+
+ +
+ {{if $album_edit.1}} + + {{/if}} + {{if $can_post}} + + {{/if}} +
-
-

{{$album}}

+

{{$album}}

-
-
-{{$upload_form}} -{{$album_edit.1}} -
- {{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} - {{/foreach}} -
+
+
+ {{$upload_form}} + {{$album_edit.1}} +
+ {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} +
+
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 7727abcea..15faa4a34 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,16 +1,18 @@ -
- {{if $can_post}} - - {{/if}} -

{{$title}}

-
-
-{{$upload_form}} -
- {{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} - {{/foreach}} -
+
+
+ {{if $can_post}} + + {{/if}} +

{{$title}}

+
+
+ {{$upload_form}} +
+ {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} +
+
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index d5a608c82..dee33f1b3 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -1,4 +1,4 @@ -
+
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 77fb09492..864705121 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -1,74 +1,76 @@ -
+
+
+ {{if $editor}} +
+ +
+ {{/if}} +

{{$listtitle}}

+
+
{{if $editor}} -
- +
+ {{$editor}} +
+ {{/if}} + {{if $pages}} +
+ + + + + + + + + + + + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + + + + + + + + + + + {{/foreach}} + {{/foreach}} +
{{$pagelink_txt}}{{$title_txt}}
+ {{if $view}} + {{$item.pagetitle}} + {{else}} + {{$item.pagetitle}} + {{/if}} + + {{$item.title}} + + {{if $item.lockstate=='lock'}} + + + {{/if}} + + {{if $edit}} + + {{/if}} + + {{if $item.bb_element}} + + {{/if}} + + {{if $edit}} + + {{/if}} +
{{/if}} -

{{$listtitle}}

-{{if $editor}} -
- {{$editor}} -
-{{/if}} -{{if $pages}} -
- - - - - - - - - - - - {{foreach $pages as $key => $items}} - {{foreach $items as $item}} - - - - - - - - - - - {{/foreach}} - {{/foreach}} -
{{$pagelink_txt}}{{$title_txt}}
- {{if $view}} - {{$item.pagetitle}} - {{else}} - {{$item.pagetitle}} - {{/if}} - - {{$item.title}} - - {{if $item.lockstate=='lock'}} - - - {{/if}} - - {{if $edit}} - - {{/if}} - - {{if $item.bb_element}} - - {{/if}} - - {{if $edit}} - - {{/if}} -
-
-
-{{/if}} -- cgit v1.2.3 From 1432b1e83f522f453d9777045cd710442a65d2ea Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 19 Jun 2015 12:45:18 +0200 Subject: cloud.tpl --- view/tpl/cloud.tpl | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 view/tpl/cloud.tpl diff --git a/view/tpl/cloud.tpl b/view/tpl/cloud.tpl new file mode 100644 index 000000000..d1567af9f --- /dev/null +++ b/view/tpl/cloud.tpl @@ -0,0 +1,4 @@ +
+{{include file="cloud_header.tpl"}} +{{include file="cloud_directory.tpl"}} +
-- cgit v1.2.3 From 8b563951ff9019e6a0c3a459ad5b768826a2017c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 19 Jun 2015 15:49:06 +0200 Subject: more generic-content-wrapper and some css fixes --- view/theme/redbasic/css/style.css | 14 +++++++++--- view/tpl/photo_view.tpl | 17 +++++++------- view/tpl/sharedwithme.tpl | 48 ++++++++++++++++++++------------------- 3 files changed, 44 insertions(+), 35 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 946e2d7d7..ad203867c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1889,7 +1889,6 @@ nav .dropdown-menu { color: #31708f; background-color: #d9edf7; margin-bottom: 3px; - border-radius: $radiuspx; text-align: center; } @@ -1898,7 +1897,6 @@ nav .dropdown-menu { color: #8a6d3b; background-color: #fcf8e3; margin-bottom: 3px; - border-radius: $radiuspx; text-align: center; } @@ -1907,10 +1905,20 @@ nav .dropdown-menu { color: #a94442; background-color: #f2dede; margin-bottom: 3px; - border-radius: $radiuspx; text-align: center; } +.section-content-tools-wrapper .section-content-info-wrapper, +.section-content-wrapper .section-content-info-wrapper, +.section-content-tools-wrapper .section-content-warning-wrapper, +.section-content-wrapper .section-content-warning-wrapper, +.section-content-tools-wrapper .section-content-danger-wrapper, +.section-content-wrapper .section-content-danger-wrapper { + margin-bottom: 0px; + border-radius: $radiuspx; +} + + .section-content-wrapper { padding: 7px 10px; background-color: $comment_item_colour; diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 1054d5e3a..63d5ad778 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,6 +1,5 @@
-
@@ -155,17 +154,17 @@ {{/if}}
-
-{{$comments}} + {{$comments}} -{{if $commentbox}} -
- {{$commentbox}} -
-{{/if}} + {{if $commentbox}} +
+ {{$commentbox}} +
+ {{/if}} -
+
+
{{$paginate}} diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl index cb365ed05..4ffacc241 100644 --- a/view/tpl/sharedwithme.tpl +++ b/view/tpl/sharedwithme.tpl @@ -1,24 +1,26 @@ -
-  {{$dropall}} -

{{$header}}

-
-
- - - - - - - - - {{foreach $items as $item}} - - - - - - - - {{/foreach}} -
{{$name}}
{{$item.objfilename}}{{if $item.unseen}} {{$label_new}}{{/if}}
+
+
+  {{$dropall}} +

{{$header}}

+
+
+ + + + + + + + + {{foreach $items as $item}} + + + + + + + + {{/foreach}} +
{{$name}}
{{$item.objfilename}}{{if $item.unseen}} {{$label_new}}{{/if}}
+
-- cgit v1.2.3 From 6bd90816dd76d5fbd2374f72ac302537bc1ef047 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 19 Jun 2015 16:39:03 -0700 Subject: very early attempt diaspora import from diaspora export file. Currently the json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later. --- include/Import/import_diaspora.php | 100 +++++++++++++++++ mod/import.php | 9 +- util/messages.po | 220 +++++++++++++++++++------------------ version.inc | 2 +- 4 files changed, 221 insertions(+), 110 deletions(-) create mode 100644 include/Import/import_diaspora.php diff --git a/include/Import/import_diaspora.php b/include/Import/import_diaspora.php new file mode 100644 index 000000000..c9c785385 --- /dev/null +++ b/include/Import/import_diaspora.php @@ -0,0 +1,100 @@ +get_account(); + if(! $account) + return false; + + + $c = create_identity(array( + 'name' => $data['user']['name'], + 'nickname' => $data['user']['username'], + 'account_id' => $account['account_id'], + 'permissions_role' => 'social' + )); + + + if(! $c['success']) + return; + + $channel_id = $c['channel']['channel_id']; + + // todo - add nsfw, auto follow, (and strip exif in hubzilla) + + $location = escape_tags($data['user']['profile']['location']); + if(! $location) + $location = ''; + + q("update channel set channel_location = '%s' where channel_id = %d", + dbesc($location) + ); + + + $photos = import_profile_photo($data['user']['profile']['image_url'],$c['channel']['channel_hash']); + if($photos[4]) + $photodate = NULL_DATE; + else + $photodate = $xchan['xchan_photo_date']; + + $r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s', xchan_photo_date = '%s' + where xchan_hash = '%s'", + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc($photos[3]), + dbesc($photodate), + dbesc($c['channel']['channel_hash']) + ); + + + $gender = escape_tags($data['user']['profile']['gender']); + $about = diaspora2bb($data['user']['profile']['bio']); + if($data['user']['profile']['birthday']) + $dob = datetime_convert('UTC','UTC',$data['user']['profile']['birthday'],'Y-m-d'); + else + $dob = '0000-00-00'; + + $r = q("update profile set gender = '%s', about = '%s', dob = '%s' where uid = %d", + dbesc($gender), + dbesc($about), + dbesc($dob), + intval($channel_id) + ); + + if($data['aspects']) { + foreach($data['aspects'] as $aspect) { + group_add($channel_id,escape_tags($aspect['name']),intval($aspect['contacts_visible'])); + } + } + + // now add connections and send friend requests + + + + + + + // Then add items - note this can't be done until Diaspora adds guids to exported + // items and comments + + + + + proc_run('php','include/notifier.php','location',$channel_id); + + // This will indirectly perform a refresh_all *and* update the directory + + proc_run('php', 'include/directory.php', $channel_id); + + notice( t('Import completed.') . EOL); + + change_channel($channel_id); + + goaway(z_root() . '/network' ); + +} \ No newline at end of file diff --git a/mod/import.php b/mod/import.php index 088c5cb61..4542ef7a0 100644 --- a/mod/import.php +++ b/mod/import.php @@ -84,6 +84,13 @@ function import_post(&$a) { $data = json_decode($data,true); + if(array_key_exists('user',$data) && array_key_exists('aspects',$data)) { + require_once('include/Import/import_diaspora.php'); + import_diaspora($data); + return; + } + + // logger('import: data: ' . print_r($data,true)); // print_r($data); @@ -308,7 +315,7 @@ function import_post(&$a) { dbesc($photos[2]), dbesc($photos[3]), dbesc($photodate), - dbesc($xchan_hash) + dbesc($xchan['xchan_hash']) ); } diff --git a/util/messages.po b/util/messages.po index ee32a9a8c..85b5108b2 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-06-12.1061\n" +"Project-Id-Version: 2015-06-19.1068\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-12 00:04-0700\n" +"POT-Creation-Date: 2015-06-19 00:04-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,7 +24,7 @@ msgstr "" #: ../../include/photo/photo_driver.php:687 ../../mod/profile_photo.php:143 #: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424 -#: ../../mod/photos.php:91 ../../mod/photos.php:625 +#: ../../mod/photos.php:92 ../../mod/photos.php:637 msgid "Profile Photos" msgstr "" @@ -654,7 +654,7 @@ msgstr "" #: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677 #: ../../include/conversation.php:1155 ../../mod/webpages.php:188 -#: ../../mod/events.php:653 ../../mod/photos.php:970 +#: ../../mod/events.php:653 ../../mod/photos.php:982 #: ../../mod/editwebpage.php:214 ../../mod/editpost.php:150 #: ../../mod/editblock.php:176 msgid "Preview" @@ -727,19 +727,19 @@ msgstr "" msgid "This Website Only" msgstr "" -#: ../../include/event.php:19 ../../include/bb2diaspora.php:451 +#: ../../include/event.php:19 ../../include/bb2diaspora.php:459 msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/event.php:27 ../../include/bb2diaspora.php:457 +#: ../../include/event.php:27 ../../include/bb2diaspora.php:465 msgid "Starts:" msgstr "" -#: ../../include/event.php:37 ../../include/bb2diaspora.php:465 +#: ../../include/event.php:37 ../../include/bb2diaspora.php:473 msgid "Finishes:" msgstr "" -#: ../../include/event.php:47 ../../include/bb2diaspora.php:473 +#: ../../include/event.php:47 ../../include/bb2diaspora.php:481 #: ../../include/identity.php:879 ../../mod/events.php:647 #: ../../mod/directory.php:234 msgid "Location:" @@ -754,7 +754,7 @@ msgid "Delete this item?" msgstr "" #: ../../include/js_strings.php:6 ../../include/ItemObject.php:667 -#: ../../mod/photos.php:968 ../../mod/photos.php:1086 +#: ../../mod/photos.php:980 ../../mod/photos.php:1098 msgid "Comment" msgstr "" @@ -782,7 +782,7 @@ msgstr "" msgid "Passwords do not match" msgstr "" -#: ../../include/js_strings.php:13 ../../mod/photos.php:39 +#: ../../include/js_strings.php:13 ../../mod/photos.php:40 msgid "everybody" msgstr "" @@ -821,8 +821,8 @@ msgstr "" #: ../../include/js_strings.php:22 ../../include/ItemObject.php:668 #: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:275 #: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81 -#: ../../mod/photos.php:565 ../../mod/photos.php:642 ../../mod/photos.php:929 -#: ../../mod/photos.php:969 ../../mod/photos.php:1087 ../../mod/pdledit.php:58 +#: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941 +#: ../../mod/photos.php:981 ../../mod/photos.php:1099 ../../mod/pdledit.php:58 #: ../../mod/import.php:504 ../../mod/chat.php:177 ../../mod/chat.php:211 #: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105 #: ../../mod/sources.php:104 ../../mod/sources.php:138 @@ -949,7 +949,7 @@ msgstr "" #: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019 #: ../../include/apps.php:336 ../../include/apps.php:387 -#: ../../mod/photos.php:681 ../../mod/photos.php:1119 +#: ../../mod/photos.php:693 ../../mod/photos.php:1131 msgid "Unknown" msgstr "" @@ -986,7 +986,7 @@ msgstr "" #: ../../include/RedDAV/RedBrowser.php:257 #: ../../include/RedDAV/RedBrowser.php:308 ../../mod/profile_photo.php:362 -#: ../../mod/photos.php:706 ../../mod/photos.php:1236 +#: ../../mod/photos.php:718 ../../mod/photos.php:1248 msgid "Upload" msgstr "" @@ -1011,7 +1011,7 @@ msgstr "" #: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120 #: ../../include/conversation.php:660 ../../include/apps.php:255 #: ../../mod/webpages.php:183 ../../mod/thing.php:228 ../../mod/group.php:176 -#: ../../mod/blocks.php:155 ../../mod/photos.php:1050 +#: ../../mod/blocks.php:155 ../../mod/photos.php:1062 #: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:225 #: ../../mod/admin.php:826 ../../mod/admin.php:988 ../../mod/editblock.php:113 #: ../../mod/settings.php:651 ../../mod/connedit.php:543 @@ -1288,7 +1288,7 @@ msgid "Categories" msgstr "" #: ../../include/widgets.php:91 ../../include/nav.php:163 -#: ../../mod/apps.php:34 +#: ../../mod/apps.php:36 msgid "Apps" msgstr "" @@ -1820,14 +1820,14 @@ msgid "I abstain" msgstr "" #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187 -#: ../../include/conversation.php:1677 ../../mod/photos.php:1003 -#: ../../mod/photos.php:1015 +#: ../../include/conversation.php:1677 ../../mod/photos.php:1015 +#: ../../mod/photos.php:1027 msgid "View all" msgstr "" #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396 #: ../../include/conversation.php:1701 ../../include/identity.php:1138 -#: ../../mod/photos.php:1007 +#: ../../mod/photos.php:1019 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -1835,7 +1835,7 @@ msgstr[0] "" msgstr[1] "" #: ../../include/ItemObject.php:184 ../../include/conversation.php:1704 -#: ../../mod/photos.php:1012 +#: ../../mod/photos.php:1024 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -1870,7 +1870,7 @@ msgstr "" msgid "Add Tag" msgstr "" -#: ../../include/ItemObject.php:254 ../../mod/photos.php:947 +#: ../../include/ItemObject.php:254 ../../mod/photos.php:959 msgid "I like this (toggle)" msgstr "" @@ -1878,7 +1878,7 @@ msgstr "" msgid "like" msgstr "" -#: ../../include/ItemObject.php:255 ../../mod/photos.php:948 +#: ../../include/ItemObject.php:255 ../../mod/photos.php:960 msgid "I don't like this (toggle)" msgstr "" @@ -1949,31 +1949,31 @@ msgstr "" msgid "Mark all seen" msgstr "" -#: ../../include/ItemObject.php:353 ../../mod/photos.php:1133 +#: ../../include/ItemObject.php:353 ../../mod/photos.php:1145 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../include/ItemObject.php:354 ../../mod/photos.php:1134 +#: ../../include/ItemObject.php:354 ../../mod/photos.php:1146 msgctxt "noun" msgid "Dislikes" msgstr "" #: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249 -#: ../../mod/photos.php:1139 +#: ../../mod/photos.php:1151 msgid "Close" msgstr "" #: ../../include/ItemObject.php:364 ../../include/conversation.php:737 -#: ../../include/conversation.php:1209 ../../mod/photos.php:950 +#: ../../include/conversation.php:1209 ../../mod/photos.php:962 #: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192 #: ../../mod/editpost.php:130 ../../mod/editblock.php:155 #: ../../mod/mail.php:241 ../../mod/mail.php:356 msgid "Please wait" msgstr "" -#: ../../include/ItemObject.php:665 ../../mod/photos.php:966 -#: ../../mod/photos.php:1084 +#: ../../include/ItemObject.php:665 ../../mod/photos.php:978 +#: ../../mod/photos.php:1096 msgid "This is you" msgstr "" @@ -2041,7 +2041,7 @@ msgstr "" msgid "Attachments:" msgstr "" -#: ../../include/bb2diaspora.php:453 +#: ../../include/bb2diaspora.php:461 msgid "$Projectname event notification:" msgstr "" @@ -2525,42 +2525,42 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../include/conversation.php:572 ../../mod/photos.php:984 +#: ../../include/conversation.php:572 ../../mod/photos.php:996 msgctxt "title" msgid "Likes" msgstr "" -#: ../../include/conversation.php:572 ../../mod/photos.php:984 +#: ../../include/conversation.php:572 ../../mod/photos.php:996 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:985 +#: ../../include/conversation.php:573 ../../mod/photos.php:997 msgctxt "title" msgid "Agree" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:985 +#: ../../include/conversation.php:573 ../../mod/photos.php:997 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:985 +#: ../../include/conversation.php:573 ../../mod/photos.php:997 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:986 +#: ../../include/conversation.php:574 ../../mod/photos.php:998 msgctxt "title" msgid "Attending" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:986 +#: ../../include/conversation.php:574 ../../mod/photos.php:998 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:986 +#: ../../include/conversation.php:574 ../../mod/photos.php:998 msgctxt "title" msgid "Might attend" msgstr "" @@ -2702,7 +2702,7 @@ msgid "Expires YYYY-MM-DD HH:MM" msgstr "" #: ../../include/conversation.php:1174 ../../mod/webpages.php:182 -#: ../../mod/blocks.php:154 ../../mod/photos.php:949 ../../mod/layouts.php:184 +#: ../../mod/blocks.php:154 ../../mod/photos.php:961 ../../mod/layouts.php:184 msgid "Share" msgstr "" @@ -3016,12 +3016,12 @@ msgstr "" msgid "Item not found." msgstr "" -#: ../../include/items.php:4148 ../../include/photos.php:26 -#: ../../include/attach.php:137 ../../include/attach.php:184 -#: ../../include/attach.php:247 ../../include/attach.php:261 -#: ../../include/attach.php:305 ../../include/attach.php:319 -#: ../../include/attach.php:350 ../../include/attach.php:546 -#: ../../include/attach.php:618 ../../include/chat.php:131 +#: ../../include/items.php:4148 ../../include/attach.php:137 +#: ../../include/attach.php:184 ../../include/attach.php:247 +#: ../../include/attach.php:261 ../../include/attach.php:305 +#: ../../include/attach.php:319 ../../include/attach.php:350 +#: ../../include/attach.php:546 ../../include/attach.php:618 +#: ../../include/chat.php:131 ../../include/photos.php:26 #: ../../mod/profile.php:64 ../../mod/profile.php:72 #: ../../mod/achievements.php:30 ../../mod/manage.php:6 ../../mod/item.php:206 #: ../../mod/item.php:214 ../../mod/item.php:978 ../../mod/api.php:26 @@ -3031,7 +3031,7 @@ msgstr "" #: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178 #: ../../mod/events.php:219 ../../mod/group.php:9 ../../mod/network.php:12 #: ../../mod/common.php:35 ../../mod/connections.php:169 -#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/photos.php:68 +#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/photos.php:69 #: ../../mod/pdledit.php:21 ../../mod/authtest.php:13 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87 #: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64 @@ -3082,27 +3082,6 @@ msgstr "" msgid "Connection not found." msgstr "" -#: ../../include/photos.php:94 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "" - -#: ../../include/photos.php:101 -msgid "Image file is empty." -msgstr "" - -#: ../../include/photos.php:128 ../../mod/profile_photo.php:217 -msgid "Unable to process image" -msgstr "" - -#: ../../include/photos.php:199 -msgid "Photo storage failed." -msgstr "" - -#: ../../include/photos.php:363 -msgid "Upload New Photos" -msgstr "" - #: ../../include/zot.php:666 msgid "Invalid data packet" msgstr "" @@ -3209,7 +3188,7 @@ msgid "Don't show" msgstr "" #: ../../include/acl_selectors.php:248 ../../mod/events.php:654 -#: ../../mod/photos.php:559 ../../mod/photos.php:922 ../../mod/chat.php:209 +#: ../../mod/photos.php:571 ../../mod/photos.php:934 ../../mod/chat.php:209 #: ../../mod/filestorage.php:147 msgid "Permissions" msgstr "" @@ -3885,6 +3864,27 @@ msgstr "" msgid "Room is full" msgstr "" +#: ../../include/photos.php:94 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "" + +#: ../../include/photos.php:101 +msgid "Image file is empty." +msgstr "" + +#: ../../include/photos.php:128 ../../mod/profile_photo.php:217 +msgid "Unable to process image" +msgstr "" + +#: ../../include/photos.php:199 +msgid "Photo storage failed." +msgstr "" + +#: ../../include/photos.php:363 +msgid "Upload New Photos" +msgstr "" + #: ../../mod/achievements.php:34 msgid "Some blurb about what to do when you're new here" msgstr "" @@ -3988,7 +3988,7 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/photos.php:556 ../../mod/menu.php:91 +#: ../../mod/api.php:105 ../../mod/photos.php:568 ../../mod/menu.php:91 #: ../../mod/menu.php:145 ../../mod/filestorage.php:151 #: ../../mod/filestorage.php:159 ../../mod/admin.php:430 #: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164 @@ -3998,7 +3998,7 @@ msgstr "" msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/photos.php:556 ../../mod/menu.php:91 +#: ../../mod/api.php:106 ../../mod/photos.php:568 ../../mod/menu.php:91 #: ../../mod/menu.php:145 ../../mod/filestorage.php:151 #: ../../mod/filestorage.php:159 ../../mod/admin.php:428 #: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164 @@ -4028,7 +4028,7 @@ msgstr "" msgid "Select a tag to remove: " msgstr "" -#: ../../mod/tagrm.php:133 ../../mod/photos.php:875 +#: ../../mod/tagrm.php:133 ../../mod/photos.php:887 msgid "Remove" msgstr "" @@ -4330,11 +4330,11 @@ msgstr "" msgid "Create New Event" msgstr "" -#: ../../mod/events.php:474 ../../mod/photos.php:827 +#: ../../mod/events.php:474 ../../mod/photos.php:839 msgid "Previous" msgstr "" -#: ../../mod/events.php:475 ../../mod/photos.php:836 ../../mod/setup.php:281 +#: ../../mod/events.php:475 ../../mod/photos.php:848 ../../mod/setup.php:281 msgid "Next" msgstr "" @@ -4547,6 +4547,10 @@ msgstr "" msgid "Bug reports and issues: please visit" msgstr "" +#: ../../mod/siteinfo.php:167 +msgid "$projectname issues" +msgstr "" + #: ../../mod/siteinfo.php:168 msgid "" "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" @@ -4718,148 +4722,148 @@ msgstr "" msgid "$Projectname - Guests: Username: {your email address}, Password: +++" msgstr "" -#: ../../mod/photos.php:77 +#: ../../mod/photos.php:78 msgid "Page owner information could not be retrieved." msgstr "" -#: ../../mod/photos.php:97 +#: ../../mod/photos.php:98 msgid "Album not found." msgstr "" -#: ../../mod/photos.php:119 ../../mod/photos.php:643 +#: ../../mod/photos.php:120 ../../mod/photos.php:655 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:159 ../../mod/photos.php:930 +#: ../../mod/photos.php:160 ../../mod/photos.php:942 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:429 ../../mod/search.php:13 ../../mod/display.php:13 +#: ../../mod/photos.php:441 ../../mod/search.php:13 ../../mod/display.php:13 #: ../../mod/ratings.php:82 ../../mod/directory.php:47 #: ../../mod/viewconnections.php:17 msgid "Public access denied." msgstr "" -#: ../../mod/photos.php:440 +#: ../../mod/photos.php:452 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:484 +#: ../../mod/photos.php:496 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:523 +#: ../../mod/photos.php:535 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../mod/photos.php:526 +#: ../../mod/photos.php:538 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../mod/photos.php:550 +#: ../../mod/photos.php:562 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:915 +#: ../../mod/photos.php:566 ../../mod/photos.php:648 ../../mod/photos.php:927 msgid "Enter a new album name" msgstr "" -#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:916 +#: ../../mod/photos.php:567 ../../mod/photos.php:649 ../../mod/photos.php:928 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../mod/photos.php:556 +#: ../../mod/photos.php:568 msgid "Create a status post for this upload" msgstr "" -#: ../../mod/photos.php:584 +#: ../../mod/photos.php:596 msgid "Album name could not be decoded" msgstr "" -#: ../../mod/photos.php:625 ../../mod/photos.php:1157 -#: ../../mod/photos.php:1173 +#: ../../mod/photos.php:637 ../../mod/photos.php:1169 +#: ../../mod/photos.php:1185 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:649 +#: ../../mod/photos.php:661 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:651 +#: ../../mod/photos.php:663 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:675 ../../mod/photos.php:1205 +#: ../../mod/photos.php:687 ../../mod/photos.php:1217 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:704 +#: ../../mod/photos.php:716 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:749 +#: ../../mod/photos.php:761 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:751 +#: ../../mod/photos.php:763 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:809 +#: ../../mod/photos.php:821 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:816 +#: ../../mod/photos.php:828 msgid "Private Photo" msgstr "" -#: ../../mod/photos.php:831 +#: ../../mod/photos.php:843 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:909 +#: ../../mod/photos.php:921 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:911 +#: ../../mod/photos.php:923 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:912 +#: ../../mod/photos.php:924 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:919 +#: ../../mod/photos.php:931 msgid "Caption" msgstr "" -#: ../../mod/photos.php:921 +#: ../../mod/photos.php:933 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:925 +#: ../../mod/photos.php:937 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../mod/photos.php:928 +#: ../../mod/photos.php:940 msgid "Flag as adult in album view" msgstr "" -#: ../../mod/photos.php:1120 +#: ../../mod/photos.php:1132 msgid "In This Photo:" msgstr "" -#: ../../mod/photos.php:1125 +#: ../../mod/photos.php:1137 msgid "Map" msgstr "" -#: ../../mod/photos.php:1211 +#: ../../mod/photos.php:1223 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1234 +#: ../../mod/photos.php:1246 msgid "Recent Photos" msgstr "" diff --git a/version.inc b/version.inc index 2b47a6bda..05801de0f 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-06-18.1067 +2015-06-19.1068 -- cgit v1.2.3 From e85d2c4b907ba1ba5aee658ba37c26eaaafc6ef5 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 19 Jun 2015 17:07:31 -0700 Subject: import_diaspora: add all the friends --- include/Import/import_diaspora.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/include/Import/import_diaspora.php b/include/Import/import_diaspora.php index c9c785385..060a1b38d 100644 --- a/include/Import/import_diaspora.php +++ b/include/Import/import_diaspora.php @@ -2,6 +2,7 @@ require_once('include/bb2diaspora.php'); require_once('include/group.php'); +require_once('include/follow.php'); function import_diaspora($data) { $a = get_app(); @@ -75,16 +76,24 @@ function import_diaspora($data) { // now add connections and send friend requests - - + if($data['contacts']) { + foreach($data['contacts'] as $contact) { + $result = new_contact($channel_id, $contact['person_diaspora_handle'], $c['channel']); + if($result['success']) { + if($contact['aspects']) { + foreach($contact['aspects'] as $aspect) { + group_add_member($channel_id,$aspect['name'],$result['abook']['xchan_hash']); + } + } + } + } + } // Then add items - note this can't be done until Diaspora adds guids to exported // items and comments - - proc_run('php','include/notifier.php','location',$channel_id); // This will indirectly perform a refresh_all *and* update the directory -- cgit v1.2.3 From a6b9d1595e1a33d81fed5ecff6b049c1a0e55b14 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 19 Jun 2015 17:18:01 -0700 Subject: automatically gunzip Diaspora export files if we're on a *nix system --- mod/import.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mod/import.php b/mod/import.php index 4542ef7a0..02f4133d5 100644 --- a/mod/import.php +++ b/mod/import.php @@ -38,6 +38,15 @@ function import_post(&$a) { if($src) { + + // This is OS specific and could also fail if your tmpdir isn't very large + // mostly used for Diaspora which exports gzipped files. + + if(strpos($filename,'.gz')){ + @rename($src,$src . '.gz'); + @system('gunzip ' . escapeshellarg($src . '.gz')); + } + if($filesize) { $data = @file_get_contents($src); } -- cgit v1.2.3 From 94e7a425e6fe455238379800c2a8c30bac70ce2f Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 19 Jun 2015 18:06:55 -0700 Subject: import_diaspora - a few more atypical settings --- include/Import/import_diaspora.php | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/include/Import/import_diaspora.php b/include/Import/import_diaspora.php index 060a1b38d..f81f28273 100644 --- a/include/Import/import_diaspora.php +++ b/include/Import/import_diaspora.php @@ -25,16 +25,27 @@ function import_diaspora($data) { $channel_id = $c['channel']['channel_id']; - // todo - add nsfw, auto follow, (and strip exif in hubzilla) + // todo - add auto follow settings, (and strip exif in hubzilla) $location = escape_tags($data['user']['profile']['location']); if(! $location) $location = ''; + q("update channel set channel_location = '%s' where channel_id = %d", - dbesc($location) + dbesc($location), + intval($channel_id) ); + if($data['user']['profile']['nsfw']) { + // fixme for hubzilla which doesn't use pageflags any more + q("update channel set channel_pageflags = (channel_pageflags & %d) where channel_id = %d", + intval(PAGE_ADULT), + intval($channel_id) + ); + } + + $photos = import_profile_photo($data['user']['profile']['image_url'],$c['channel']['channel_hash']); if($photos[4]) @@ -55,15 +66,20 @@ function import_diaspora($data) { $gender = escape_tags($data['user']['profile']['gender']); $about = diaspora2bb($data['user']['profile']['bio']); + $publish = intval($data['user']['profile']['searchable']); if($data['user']['profile']['birthday']) $dob = datetime_convert('UTC','UTC',$data['user']['profile']['birthday'],'Y-m-d'); else $dob = '0000-00-00'; - $r = q("update profile set gender = '%s', about = '%s', dob = '%s' where uid = %d", + // we're relying on the fact that this channel was just created and will only + // have the default profile currently + + $r = q("update profile set gender = '%s', about = '%s', dob = '%s', publish = %d where uid = %d", dbesc($gender), dbesc($about), dbesc($dob), + dbesc($publish), intval($channel_id) ); -- cgit v1.2.3 From ddbaabd62d814bb520ac800ef26d36b083e8c094 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 19 Jun 2015 18:08:10 -0700 Subject: wrong logic --- include/Import/import_diaspora.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/Import/import_diaspora.php b/include/Import/import_diaspora.php index f81f28273..9fcea918c 100644 --- a/include/Import/import_diaspora.php +++ b/include/Import/import_diaspora.php @@ -39,7 +39,7 @@ function import_diaspora($data) { if($data['user']['profile']['nsfw']) { // fixme for hubzilla which doesn't use pageflags any more - q("update channel set channel_pageflags = (channel_pageflags & %d) where channel_id = %d", + q("update channel set channel_pageflags = (channel_pageflags | %d) where channel_id = %d", intval(PAGE_ADULT), intval($channel_id) ); -- cgit v1.2.3 From ec23a94b6d7f6db1e1d34275b8143cbc947db802 Mon Sep 17 00:00:00 2001 From: Alexandre Hannud Abdo Date: Sat, 20 Jun 2015 02:21:25 -0300 Subject: Make item_store_update only affect the data we requested --- include/items.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/include/items.php b/include/items.php index 0dc6d6ed6..eb4ad1ead 100755 --- a/include/items.php +++ b/include/items.php @@ -2548,8 +2548,8 @@ function item_store_update($arr,$allow_exec = false) { $arr['deny_gid'] = ((array_key_exists('deny_gid',$arr)) ? trim($arr['deny_gid']) : $orig[0]['deny_gid']); $arr['item_private'] = ((array_key_exists('item_private',$arr)) ? intval($arr['item_private']) : $orig[0]['item_private']); - $arr['title'] = ((array_key_exists('title',$arr) && strlen($arr['title'])) ? trim($arr['title']) : ''); - $arr['body'] = ((array_key_exists('body',$arr) && strlen($arr['body'])) ? trim($arr['body']) : ''); + $arr['title'] = ((array_key_exists('title',$arr)) ? trim($arr['title']) : $orig[0]['title']); + $arr['body'] = ((array_key_exists('body',$arr)) ? trim($arr['body']) : $orig[0]['body']); $arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : $orig[0]['attach']); $arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : $orig[0]['app']); @@ -2599,12 +2599,11 @@ function item_store_update($arr,$allow_exec = false) { return $ret; } - $r = q("delete from term where oid = %d and otype = %d", - intval($orig_post_id), - intval(TERM_OBJ_POST) - ); - - if(($terms) && (is_array($terms))) { + if(is_array($terms)) { + $r = q("delete from term where oid = %d and otype = %d", + intval($orig_post_id), + intval(TERM_OBJ_POST) + ); foreach($terms as $t) { q("insert into term (uid,oid,otype,type,term,url) values(%d,%d,%d,%d,'%s','%s') ", @@ -2631,6 +2630,8 @@ function item_store_update($arr,$allow_exec = false) { return $ret; } + + function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id, $walltowall = false) { // We won't be able to sign Diaspora comments for authenticated visitors @@ -4981,4 +4982,4 @@ function asencode_person($p) { ); return $ret; -} \ No newline at end of file +} -- cgit v1.2.3 From dd950baa82ba413e234a479b71a33e895a1835ec Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 20 Jun 2015 16:21:25 -0700 Subject: import_diaspora - incorrect method for importing channel photo, and add duplicate reddress detection/correction --- include/Import/import_diaspora.php | 62 ++++++++++++++++++++++++++------------ version.inc | 2 +- 2 files changed, 43 insertions(+), 21 deletions(-) diff --git a/include/Import/import_diaspora.php b/include/Import/import_diaspora.php index 9fcea918c..dccb2d6ec 100644 --- a/include/Import/import_diaspora.php +++ b/include/Import/import_diaspora.php @@ -11,10 +11,42 @@ function import_diaspora($data) { if(! $account) return false; + $address = escape_tags($data['user']['username']); + if(! $address) { + notice( t('No username found in import file.') . EOL); + return false; + } + + $r = q("select * from channel where channel_address = '%s' limit 1", + dbesc($address) + ); + if($r) { + // try at most ten times to generate a unique address. + $x = 0; + $found_unique = false; + do { + $tmp = $address . mt_rand(1000,9999); + $r = q("select * from channel where channel_address = '%s' limit 1", + dbesc($tmp) + ); + if(! $r) { + $address = $tmp; + $found_unique = true; + break; + } + $x ++; + } while ($x < 10); + if(! $found_unique) { + logger('import_diaspora: duplicate channel address. randomisation failed.'); + notice( t('Unable to create a unique channel address. Import failed.') . EOL); + return; + } + } + $c = create_identity(array( - 'name' => $data['user']['name'], - 'nickname' => $data['user']['username'], + 'name' => escape_tags($data['user']['name']), + 'nickname' => $address, 'account_id' => $account['account_id'], 'permissions_role' => 'social' )); @@ -45,24 +77,14 @@ function import_diaspora($data) { ); } - - - $photos = import_profile_photo($data['user']['profile']['image_url'],$c['channel']['channel_hash']); - if($photos[4]) - $photodate = NULL_DATE; - else - $photodate = $xchan['xchan_photo_date']; - - $r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s', xchan_photo_date = '%s' - where xchan_hash = '%s'", - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc($photos[3]), - dbesc($photodate), - dbesc($c['channel']['channel_hash']) - ); - + if($data['user']['profile']['image_url']) { + $p = z_fetch_url($data['user']['profile']['image_url'],true); + if($p['success']) { + $rawbytes = $p['body']; + $type = guess_image_type('dummyfile',$p['header']); + import_channel_photo($rawbytes,$type,$c['channel']['channel_account_id'],$channel_id); + } + } $gender = escape_tags($data['user']['profile']['gender']); $about = diaspora2bb($data['user']['profile']['bio']); diff --git a/version.inc b/version.inc index 05801de0f..e38c8df89 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-06-19.1068 +2015-06-20.1069 -- cgit v1.2.3 From 9dfb8a3401fcca98ca647d913faa55f8c56fd350 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 20 Jun 2015 16:24:10 -0700 Subject: ensure the photo driver is included --- include/Import/import_diaspora.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/Import/import_diaspora.php b/include/Import/import_diaspora.php index dccb2d6ec..f755c39e2 100644 --- a/include/Import/import_diaspora.php +++ b/include/Import/import_diaspora.php @@ -3,6 +3,7 @@ require_once('include/bb2diaspora.php'); require_once('include/group.php'); require_once('include/follow.php'); +require_once('include/photo/photo_driver.php'); function import_diaspora($data) { $a = get_app(); -- cgit v1.2.3 From c1e0987b880c116b392d65a2b40cda2fd53debe0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 21 Jun 2015 17:53:44 +0200 Subject: do not show default in scheme selection dropdown. default.php and default.css should be symlinks. adjust doco accordingly. --- doc/Schema-development.md | 1 + doc/schema_development.bb | 1 + view/theme/redbasic/php/config.php | 6 ++++-- view/theme/redbasic/php/style.php | 1 + view/tpl/photos_upload.tpl | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/Schema-development.md b/doc/Schema-development.md index 3ac96a02b..e811bb8c3 100644 --- a/doc/Schema-development.md +++ b/doc/Schema-development.md @@ -30,6 +30,7 @@ If no personal options are set, and no schema is selected, we will first try to with the file name "default.php". This file should never be included with a theme. If it is, merge conflicts will occur as people update their code. Rather, this should be defined by administrators on a site by site basis. +default.php and default.css MUST be symlinks to existing scheme files. You schema does not need to - and should not - contain all of these values. Only the values that differ from the defaults should be listed. This gives you some very powerful options diff --git a/doc/schema_development.bb b/doc/schema_development.bb index 998111431..3d4c84e85 100644 --- a/doc/schema_development.bb +++ b/doc/schema_development.bb @@ -28,6 +28,7 @@ If no personal options are set, and no schema is selected, we will first try to with the file name "default.php". This file should never be included with a theme. If it is, merge conflicts will occur as people update their code. Rather, this should be defined by administrators on a site by site basis. +default.php and default.css MUST be symlinks to existing scheme files. You schema does not need to - and should not - contain all of these values. Only the values that differ from the defaults should be listed. This gives you some very powerful options diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 8ab31efc0..c0b2b6da9 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -84,8 +84,10 @@ function redbasic_form(&$a, $arr) { if($files) { foreach($files as $file) { $f = basename($file, ".php"); - $scheme_name = $f; - $scheme_choices[$f] = $scheme_name; + if($f != 'default') { + $scheme_name = $f; + $scheme_choices[$f] = $scheme_name; + } } } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 956c1951c..6e68d38d5 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -70,6 +70,7 @@ if (($schema) && ($schema != '---')) { // If we haven't got a schema, load the default. We shouldn't touch this - we // should leave it for admins to define for themselves. +// default.php and default.css MUST be symlinks to existing schema files. if (! $schema) { if(file_exists('view/theme/redbasic/schema/default.php')) { diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 06e3ef612..ee0bbd86b 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,4 +1,4 @@ -
+
-- cgit v1.2.3 From 5a96f3331a86b32f6ed1c44fb44f43a287611a38 Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Sun, 21 Jun 2015 23:58:19 +0200 Subject: Compatible update for .htaccess. This should hopefully work in Apache 2.2 and 2.4. --- .htaccess | 10 +++++++--- util/.htaccess | 11 ++++++++--- view/.htaccess | 10 ++++++++-- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.htaccess b/.htaccess index 39fd89e04..e9c4de14d 100644 --- a/.htaccess +++ b/.htaccess @@ -5,7 +5,13 @@ AddType audio/ogg .oga # don't allow any web access to logfiles, even after rotation/compression -Deny from all + + Require all denied + + + Order deny,allow + Deny from all + @@ -22,6 +28,4 @@ Deny from all RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteRule ^(.*)$ index.php?q=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA] - - diff --git a/util/.htaccess b/util/.htaccess index b311c14c2..333a08d40 100644 --- a/util/.htaccess +++ b/util/.htaccess @@ -1,5 +1,10 @@ Options -Indexes -# Remove the following line or modify it to run the string translator utility -Deny from all - +# Remove the following lines or modify it to run the string translator utility + + Require all denied + + + Order deny,allow + Deny from all + diff --git a/view/.htaccess b/view/.htaccess index 559a5fcc0..115be49c0 100644 --- a/view/.htaccess +++ b/view/.htaccess @@ -1,3 +1,9 @@ -Deny from all - \ No newline at end of file + + Require all denied + + + Order deny,allow + Deny from all + + -- cgit v1.2.3 From 26ff848639089658d49013e3a5beea35a95f30ee Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 22 Jun 2015 00:33:53 +0200 Subject: Revert "Compatible update for .htaccess." --- .htaccess | 10 +++------- util/.htaccess | 11 +++-------- view/.htaccess | 10 ++-------- 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/.htaccess b/.htaccess index e9c4de14d..39fd89e04 100644 --- a/.htaccess +++ b/.htaccess @@ -5,13 +5,7 @@ AddType audio/ogg .oga # don't allow any web access to logfiles, even after rotation/compression - - Require all denied - - - Order deny,allow - Deny from all - +Deny from all @@ -28,4 +22,6 @@ AddType audio/ogg .oga RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteRule ^(.*)$ index.php?q=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA] + + diff --git a/util/.htaccess b/util/.htaccess index 333a08d40..b311c14c2 100644 --- a/util/.htaccess +++ b/util/.htaccess @@ -1,10 +1,5 @@ Options -Indexes -# Remove the following lines or modify it to run the string translator utility - - Require all denied - - - Order deny,allow - Deny from all - +# Remove the following line or modify it to run the string translator utility +Deny from all + diff --git a/view/.htaccess b/view/.htaccess index 115be49c0..559a5fcc0 100644 --- a/view/.htaccess +++ b/view/.htaccess @@ -1,9 +1,3 @@ - - Require all denied - - - Order deny,allow - Deny from all - - +Deny from all + \ No newline at end of file -- cgit v1.2.3 From c3fa0a3ca73cf0935de143bd4a1cbd11ea74acb3 Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Sun, 21 Jun 2015 23:58:19 +0200 Subject: Compatible update for .htaccess. This should hopefully work in Apache 2.2 and 2.4. --- .htaccess | 11 +++++++---- util/.htaccess | 11 ++++++++--- view/.htaccess | 10 ++++++++-- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.htaccess b/.htaccess index 39fd89e04..7f3935117 100644 --- a/.htaccess +++ b/.htaccess @@ -5,7 +5,13 @@ AddType audio/ogg .oga # don't allow any web access to logfiles, even after rotation/compression -Deny from all + + Require all denied + + + Order deny,allow + Deny from all + @@ -14,7 +20,6 @@ Deny from all RewriteRule "(^|/)\.git" - [F] RewriteRule "(^|/)store" - [F] - # Rewrite current-style URLs of the form 'index.php?q=x'. # Also place auth information into REMOTE_USER for sites running # in CGI mode. @@ -22,6 +27,4 @@ Deny from all RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteRule ^(.*)$ index.php?q=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA] - - diff --git a/util/.htaccess b/util/.htaccess index b311c14c2..a0a0d72d9 100644 --- a/util/.htaccess +++ b/util/.htaccess @@ -1,5 +1,10 @@ Options -Indexes -# Remove the following line or modify it to run the string translator utility -Deny from all - +# Remove the following lines or modify it to run the string translator utility + + Require all denied + + + Order deny,allow + Deny from all + diff --git a/view/.htaccess b/view/.htaccess index 559a5fcc0..7aa6c4506 100644 --- a/view/.htaccess +++ b/view/.htaccess @@ -1,3 +1,9 @@ -Deny from all - \ No newline at end of file + + Require all denied + + + Order deny,allow + Deny from all + + -- cgit v1.2.3 From 68534fd5dc6fdc879b075c32849d6cbc8a5fc905 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 21 Jun 2015 17:30:23 -0700 Subject: some diaspora import issues uncovered during dry-run tests --- include/Import/import_diaspora.php | 10 ++++------ mod/import.php | 12 ++++++------ version.inc | 2 +- view/tpl/channel_import.tpl | 3 +++ 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/Import/import_diaspora.php b/include/Import/import_diaspora.php index f755c39e2..fca9fa4f2 100644 --- a/include/Import/import_diaspora.php +++ b/include/Import/import_diaspora.php @@ -51,7 +51,6 @@ function import_diaspora($data) { 'account_id' => $account['account_id'], 'permissions_role' => 'social' )); - if(! $c['success']) return; @@ -106,8 +105,8 @@ function import_diaspora($data) { intval($channel_id) ); - if($data['aspects']) { - foreach($data['aspects'] as $aspect) { + if($data['user']['aspects']) { + foreach($data['user']['aspects'] as $aspect) { group_add($channel_id,escape_tags($aspect['name']),intval($aspect['contacts_visible'])); } } @@ -115,8 +114,8 @@ function import_diaspora($data) { // now add connections and send friend requests - if($data['contacts']) { - foreach($data['contacts'] as $contact) { + if($data['user']['contacts']) { + foreach($data['user']['contacts'] as $contact) { $result = new_contact($channel_id, $contact['person_diaspora_handle'], $c['channel']); if($result['success']) { if($contact['aspects']) { @@ -133,7 +132,6 @@ function import_diaspora($data) { // items and comments - proc_run('php','include/notifier.php','location',$channel_id); // This will indirectly perform a refresh_all *and* update the directory diff --git a/mod/import.php b/mod/import.php index 02f4133d5..85491bc5e 100644 --- a/mod/import.php +++ b/mod/import.php @@ -93,17 +93,16 @@ function import_post(&$a) { $data = json_decode($data,true); - if(array_key_exists('user',$data) && array_key_exists('aspects',$data)) { +// logger('import: data: ' . print_r($data,true)); +// print_r($data); + + + if(array_key_exists('user',$data) && array_key_exists('version',$data)) { require_once('include/Import/import_diaspora.php'); import_diaspora($data); return; } - -// logger('import: data: ' . print_r($data,true)); - -// print_r($data); - // import channel $channel = $data['channel']; @@ -515,6 +514,7 @@ function import_content(&$a) { '$common' => t('For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media.'), '$label_import_primary' => t('Make this hub my primary location'), '$label_import_posts' => t('Import existing posts if possible'), + '$pleasewait' => t('This process may take several minutes to complete. Please submit the form only once and leave this page open until finished.'), '$email' => '', '$pass' => '', '$submit' => t('Submit') diff --git a/version.inc b/version.inc index e38c8df89..03a0995b5 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-06-20.1069 +2015-06-21.1070 diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl index f76594934..6974e4d30 100755 --- a/view/tpl/channel_import.tpl +++ b/view/tpl/channel_import.tpl @@ -36,5 +36,8 @@
+
{{$pleasewait}}
+ + -- cgit v1.2.3 From 0ad71b3efa7de4eb1f4313ffe4562ec83743bdc1 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 21 Jun 2015 19:11:07 -0700 Subject: import: Improve the descriptive text for this feature --- mod/import.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/import.php b/mod/import.php index 85491bc5e..12d44659d 100644 --- a/mod/import.php +++ b/mod/import.php @@ -505,7 +505,7 @@ function import_content(&$a) { $o = replace_macros(get_markup_template('channel_import.tpl'),array( '$title' => t('Import Channel'), - '$desc' => t('Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file. Only identity and connections/relationships will be imported. Importation of content is not yet available.'), + '$desc' => t('Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file.'), '$label_filename' => t('File to Upload'), '$choice' => t('Or provide the old server/hub details'), '$label_old_address' => t('Your old identity address (xyz@example.com)'), @@ -513,7 +513,7 @@ function import_content(&$a) { '$label_old_pass' => t('Your old login password'), '$common' => t('For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media.'), '$label_import_primary' => t('Make this hub my primary location'), - '$label_import_posts' => t('Import existing posts if possible'), + '$label_import_posts' => t('Import existing posts if possible (experimental - limited by available memory'), '$pleasewait' => t('This process may take several minutes to complete. Please submit the form only once and leave this page open until finished.'), '$email' => '', '$pass' => '', -- cgit v1.2.3