From e9cc06dc1198c98b7634ad79f2436947d7f94477 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 24 Jun 2015 21:12:20 +0200 Subject: [PATCH 1/5] directory: only provide connect button if we are not already connected --- view/tpl/direntry.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 3450ad36d..98ec25e23 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -8,7 +8,9 @@ {{if $entry.ignlink}} {{$entry.ignore_label}} {{/if}} + {{if $entry.connect}} {{$entry.conn_label}} + {{/if}}

{{if $entry.public_forum}} {{/if}}{{$entry.name}}{{if $entry.online}} {{/if}}

From 002be8f9ce13a370e03d44352df8b33d17348dec Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 26 Jun 2015 16:37:55 -0700 Subject: [PATCH 2/5] project updates --- doc/roadmap.bb | 4 +- doc/to_do_code.bb | 1 + util/messages.po | 419 ++++++++++++++++++++++++---------------------- version.inc | 2 +- 4 files changed, 223 insertions(+), 203 deletions(-) diff --git a/doc/roadmap.bb b/doc/roadmap.bb index b4788fda1..be8fc47f5 100644 --- a/doc/roadmap.bb +++ b/doc/roadmap.bb @@ -4,7 +4,9 @@ Roadmap for $Projectname V3 Crypto Convert E2EE to dynamic loading (on demand) using jQuery.getScript() [or other methods] to only load encryption libs when you require them. This should also support multiple encryption libraries (e.g. SJCL, others) triggered from the choice of algorithm and remain pluggable. - + +Diaspora + Convert core Diaspora federation code into a plugin. This presents a number of challenges since it touches and special cases a lot of core functionality. Subscriptions and business models Build enough into core(/addons) to generate income (or at least try and cover costs) out of the box diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb index 73acdc7bb..4e6f655e2 100644 --- a/doc/to_do_code.bb +++ b/doc/to_do_code.bb @@ -4,6 +4,7 @@ We need much more than this, but here are areas where developers can help. Pleas [li]Documentation - see Red Documentation Project To-Do List[/li] [li]Include TOS link in registration/verification email[/li] +[li]forum widget with unread counts[/li] [li]Create bug tracker module[/li] [li]translation plugins - moses or apertium[/li] [li]Infinite scroll improvements (i.e. embedded page links) see http://scrollsample.appspot.com/items diff --git a/util/messages.po b/util/messages.po index 85b5108b2..c6c95dd42 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-06-19.1068\n" +"Project-Id-Version: 2015-06-26.1075\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-19 00:04-0700\n" +"POT-Creation-Date: 2015-06-26 00:05-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -386,7 +386,7 @@ msgid "Collection" msgstr "" #: ../../include/menu.php:107 ../../include/page_widgets.php:8 -#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:269 +#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:266 #: ../../include/ItemObject.php:100 ../../include/apps.php:254 #: ../../mod/webpages.php:181 ../../mod/thing.php:227 #: ../../mod/connections.php:382 ../../mod/connections.php:395 @@ -404,23 +404,23 @@ msgstr "" msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/diaspora.php:2458 +#: ../../include/diaspora.php:2476 msgid "Please choose" msgstr "" -#: ../../include/diaspora.php:2460 +#: ../../include/diaspora.php:2478 msgid "Agree" msgstr "" -#: ../../include/diaspora.php:2462 +#: ../../include/diaspora.php:2480 msgid "Disagree" msgstr "" -#: ../../include/diaspora.php:2464 +#: ../../include/diaspora.php:2482 msgid "Abstain" msgstr "" -#: ../../include/diaspora.php:2486 ../../include/diaspora.php:2497 +#: ../../include/diaspora.php:2504 ../../include/diaspora.php:2515 #: ../../include/enotify.php:59 ../../mod/p.php:46 msgid "$projectname" msgstr "" @@ -434,6 +434,18 @@ msgstr "" msgid "commented on %s's post" msgstr "" +#: ../../include/Import/import_diaspora.php:17 +msgid "No username found in import file." +msgstr "" + +#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:142 +msgid "Unable to create a unique channel address. Import failed." +msgstr "" + +#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:490 +msgid "Import completed." +msgstr "" + #: ../../include/group.php:26 msgid "" "A deleted group with this name was revived. Existing item permissions " @@ -740,8 +752,8 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:47 ../../include/bb2diaspora.php:481 -#: ../../include/identity.php:879 ../../mod/events.php:647 -#: ../../mod/directory.php:234 +#: ../../include/identity.php:879 ../../mod/directory.php:296 +#: ../../mod/events.php:647 msgid "Location:" msgstr "" @@ -823,7 +835,7 @@ msgstr "" #: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81 #: ../../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/import.php:520 ../../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 #: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108 @@ -837,7 +849,7 @@ msgstr "" #: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:679 #: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/poll.php:68 #: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256 -#: ../../view/theme/redbasic/php/config.php:97 +#: ../../view/theme/redbasic/php/config.php:99 msgid "Submit" msgstr "" @@ -923,7 +935,7 @@ msgid "timeago.numbers" msgstr "" #: ../../include/RedDAV/RedBrowser.php:107 -#: ../../include/RedDAV/RedBrowser.php:268 +#: ../../include/RedDAV/RedBrowser.php:265 msgid "parent" msgstr "" @@ -978,37 +990,37 @@ msgid "Shared" msgstr "" #: ../../include/RedDAV/RedBrowser.php:256 -#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/webpages.php:180 +#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/webpages.php:180 #: ../../mod/blocks.php:152 ../../mod/menu.php:109 #: ../../mod/new_channel.php:121 ../../mod/layouts.php:175 msgid "Create" msgstr "" #: ../../include/RedDAV/RedBrowser.php:257 -#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/profile_photo.php:362 +#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362 #: ../../mod/photos.php:718 ../../mod/photos.php:1248 msgid "Upload" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/admin.php:994 +#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/admin.php:994 #: ../../mod/settings.php:590 ../../mod/settings.php:616 #: ../../mod/sharedwithme.php:95 msgid "Name" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:265 +#: ../../include/RedDAV/RedBrowser.php:262 msgid "Type" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:266 ../../mod/sharedwithme.php:97 +#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97 msgid "Size" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:267 ../../mod/sharedwithme.php:98 +#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98 msgid "Last Modified" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120 +#: ../../include/RedDAV/RedBrowser.php:267 ../../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:1062 @@ -1018,11 +1030,11 @@ msgstr "" msgid "Delete" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:305 +#: ../../include/RedDAV/RedBrowser.php:302 msgid "Create new folder" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:307 +#: ../../include/RedDAV/RedBrowser.php:304 msgid "Upload file" msgstr "" @@ -1310,8 +1322,8 @@ msgstr "" #: ../../include/widgets.php:136 ../../include/widgets.php:175 #: ../../include/Contact.php:107 ../../include/conversation.php:945 -#: ../../include/identity.php:828 ../../mod/match.php:64 -#: ../../mod/directory.php:302 ../../mod/suggest.php:52 +#: ../../include/identity.php:828 ../../mod/directory.php:310 +#: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" msgstr "" @@ -2176,7 +2188,6 @@ msgid "Search site content" msgstr "" #: ../../include/nav.php:168 ../../include/apps.php:141 -#: ../../mod/directory.php:366 msgid "Directory" msgstr "" @@ -3009,27 +3020,27 @@ msgstr "" msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4075 ../../mod/thing.php:74 +#: ../../include/items.php:4076 ../../mod/thing.php:74 #: ../../mod/display.php:36 ../../mod/filestorage.php:27 #: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:1025 #: ../../mod/admin.php:1225 msgid "Item not found." msgstr "" -#: ../../include/items.php:4148 ../../include/attach.php:137 +#: ../../include/items.php:4149 ../../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 +#: ../../mod/achievements.php:30 ../../mod/manage.php:6 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/webpages.php:69 ../../mod/thing.php:241 #: ../../mod/thing.php:256 ../../mod/thing.php:290 #: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277 #: ../../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/events.php:219 ../../mod/group.php:9 ../../mod/item.php:206 +#: ../../mod/item.php:214 ../../mod/item.php:978 ../../mod/network.php:12 #: ../../mod/common.php:35 ../../mod/connections.php:169 #: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/photos.php:69 #: ../../mod/pdledit.php:21 ../../mod/authtest.php:13 @@ -3059,26 +3070,26 @@ msgstr "" msgid "Permission denied." msgstr "" -#: ../../include/items.php:4550 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4551 ../../mod/group.php:38 ../../mod/group.php:140 #: ../../mod/bulksetclose.php:51 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4566 +#: ../../include/items.php:4567 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4573 +#: ../../include/items.php:4574 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4583 +#: ../../include/items.php:4584 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4585 +#: ../../include/items.php:4586 msgid "Connection not found." msgstr "" @@ -3142,12 +3153,12 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413 -#: ../../mod/directory.php:362 ../../mod/directory.php:367 +#: ../../include/contact_widgets.php:26 ../../mod/directory.php:373 +#: ../../mod/directory.php:378 ../../mod/connections.php:413 msgid "Find" msgstr "" -#: ../../include/contact_widgets.php:27 ../../mod/directory.php:366 +#: ../../include/contact_widgets.php:27 ../../mod/directory.php:377 #: ../../mod/suggest.php:60 msgid "Channel Suggestions" msgstr "" @@ -3405,7 +3416,7 @@ msgstr "" msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1163 +#: ../../include/identity.php:1163 ../../mod/directory.php:291 msgid "Age:" msgstr "" @@ -3418,7 +3429,8 @@ msgstr "" msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1179 ../../mod/profiles.php:693 +#: ../../include/identity.php:1179 ../../mod/directory.php:307 +#: ../../mod/profiles.php:693 msgid "Hometown:" msgstr "" @@ -3434,7 +3446,7 @@ msgstr "" msgid "Religion:" msgstr "" -#: ../../include/identity.php:1187 +#: ../../include/identity.php:1187 ../../mod/directory.php:309 msgid "About:" msgstr "" @@ -3928,34 +3940,73 @@ msgstr "" msgid "Delegated Channels" msgstr "" -#: ../../mod/item.php:174 -msgid "Unable to locate original post." +#: ../../mod/directory.php:48 ../../mod/photos.php:441 ../../mod/search.php:13 +#: ../../mod/display.php:13 ../../mod/ratings.php:82 +#: ../../mod/viewconnections.php:17 +msgid "Public access denied." msgstr "" -#: ../../mod/item.php:440 -msgid "Empty post discarded." -msgstr "" - -#: ../../mod/item.php:480 -msgid "Executable content type not permitted to this channel." -msgstr "" - -#: ../../mod/item.php:901 -msgid "System error. Post not saved." -msgstr "" - -#: ../../mod/item.php:1119 -msgid "Unable to obtain post information from database." -msgstr "" - -#: ../../mod/item.php:1126 +#: ../../mod/directory.php:227 #, php-format -msgid "You have reached your limit of %1$.0f top level posts." +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/directory.php:238 +msgid "Gender: " msgstr "" -#: ../../mod/item.php:1133 -#, php-format -msgid "You have reached your limit of %1$.0f webpages." +#: ../../mod/directory.php:240 +msgid "Status: " +msgstr "" + +#: ../../mod/directory.php:242 +msgid "Homepage: " +msgstr "" + +#: ../../mod/directory.php:302 ../../mod/events.php:645 +msgid "Description:" +msgstr "" + +#: ../../mod/directory.php:311 +msgid "Public Forum:" +msgstr "" + +#: ../../mod/directory.php:314 +msgid "Keywords: " +msgstr "" + +#: ../../mod/directory.php:317 +msgid "Don't suggest" +msgstr "" + +#: ../../mod/directory.php:319 +msgid "Common connections:" +msgstr "" + +#: ../../mod/directory.php:368 +msgid "Global Directory" +msgstr "" + +#: ../../mod/directory.php:368 +msgid "Local Directory" +msgstr "" + +#: ../../mod/directory.php:374 +msgid "Finding:" +msgstr "" + +#: ../../mod/directory.php:379 +msgid "next page" +msgstr "" + +#: ../../mod/directory.php:379 +msgid "previous page" +msgstr "" + +#: ../../mod/directory.php:395 +msgid "No entries (some entries may be hidden)." msgstr "" #: ../../mod/xchan.php:6 @@ -3993,8 +4044,8 @@ msgstr "" #: ../../mod/filestorage.php:159 ../../mod/admin.php:430 #: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164 #: ../../mod/mitem.php:234 ../../mod/mitem.php:235 ../../mod/removeme.php:60 -#: ../../view/theme/redbasic/php/config.php:102 -#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1554 +#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554 msgid "Yes" msgstr "" @@ -4003,8 +4054,8 @@ msgstr "" #: ../../mod/filestorage.php:159 ../../mod/admin.php:428 #: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164 #: ../../mod/mitem.php:234 ../../mod/mitem.php:235 ../../mod/removeme.php:60 -#: ../../view/theme/redbasic/php/config.php:102 -#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1554 +#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554 msgid "No" msgstr "" @@ -4225,7 +4276,7 @@ msgstr "" msgid "Channel not found." msgstr "" -#: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:106 +#: ../../mod/block.php:75 ../../mod/display.php:106 ../../mod/help.php:79 #: ../../mod/page.php:89 ../../index.php:230 msgid "Page not found." msgstr "" @@ -4384,10 +4435,6 @@ msgid "" "global holidays." msgstr "" -#: ../../mod/events.php:645 -msgid "Description:" -msgstr "" - #: ../../mod/events.php:649 msgid "Title:" msgstr "" @@ -4560,12 +4607,34 @@ msgstr "" msgid "Site Administrators" msgstr "" -#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61 -msgid "Help:" +#: ../../mod/item.php:174 +msgid "Unable to locate original post." msgstr "" -#: ../../mod/help.php:76 ../../index.php:227 -msgid "Not Found" +#: ../../mod/item.php:440 +msgid "Empty post discarded." +msgstr "" + +#: ../../mod/item.php:480 +msgid "Executable content type not permitted to this channel." +msgstr "" + +#: ../../mod/item.php:901 +msgid "System error. Post not saved." +msgstr "" + +#: ../../mod/item.php:1119 +msgid "Unable to obtain post information from database." +msgstr "" + +#: ../../mod/item.php:1126 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." +msgstr "" + +#: ../../mod/item.php:1133 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." msgstr "" #: ../../mod/network.php:91 @@ -4738,12 +4807,6 @@ msgstr "" msgid "Delete Photo" msgstr "" -#: ../../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:452 msgid "No photos selected" msgstr "" @@ -4966,76 +5029,67 @@ msgstr "" msgid "Your service plan only allows %d channels." msgstr "" -#: ../../mod/import.php:51 +#: ../../mod/import.php:60 msgid "Nothing to import." msgstr "" -#: ../../mod/import.php:75 +#: ../../mod/import.php:84 msgid "Unable to download data from old server" msgstr "" -#: ../../mod/import.php:81 +#: ../../mod/import.php:90 msgid "Imported file is empty." msgstr "" -#: ../../mod/import.php:106 +#: ../../mod/import.php:121 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/import.php:127 -msgid "Unable to create a unique channel address. Import failed." -msgstr "" - -#: ../../mod/import.php:147 +#: ../../mod/import.php:162 msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/import.php:157 +#: ../../mod/import.php:172 msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:475 -msgid "Import completed." -msgstr "" - -#: ../../mod/import.php:487 +#: ../../mod/import.php:502 msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/import.php:492 +#: ../../mod/import.php:507 msgid "Import Channel" msgstr "" -#: ../../mod/import.php:493 +#: ../../mod/import.php:508 msgid "" "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." +"provide an export file." msgstr "" -#: ../../mod/import.php:494 +#: ../../mod/import.php:509 msgid "File to Upload" msgstr "" -#: ../../mod/import.php:495 +#: ../../mod/import.php:510 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:496 +#: ../../mod/import.php:511 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:497 +#: ../../mod/import.php:512 msgid "Your old login email address" msgstr "" -#: ../../mod/import.php:498 +#: ../../mod/import.php:513 msgid "Your old login password" msgstr "" -#: ../../mod/import.php:499 +#: ../../mod/import.php:514 msgid "" "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 " @@ -5043,12 +5097,19 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../mod/import.php:500 +#: ../../mod/import.php:515 msgid "Make this hub my primary location" msgstr "" -#: ../../mod/import.php:501 -msgid "Import existing posts if possible" +#: ../../mod/import.php:516 +msgid "" +"Import existing posts if possible (experimental - limited by available memory" +msgstr "" + +#: ../../mod/import.php:517 +msgid "" +"This process may take several minutes to complete. Please submit the form " +"only once and leave this page open until finished." msgstr "" #: ../../mod/editlayout.php:76 ../../mod/editwebpage.php:77 @@ -5848,7 +5909,7 @@ msgstr "" msgid "This is your default profile." msgstr "" -#: ../../mod/profiles.php:728 ../../mod/directory.php:218 +#: ../../mod/profiles.php:728 msgid "Age: " msgstr "" @@ -6303,62 +6364,6 @@ msgstr "" msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../mod/directory.php:224 -#, php-format -msgid "%d rating" -msgid_plural "%d ratings" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/directory.php:236 -msgid "Gender: " -msgstr "" - -#: ../../mod/directory.php:238 -msgid "Status: " -msgstr "" - -#: ../../mod/directory.php:240 -msgid "Homepage: " -msgstr "" - -#: ../../mod/directory.php:243 -msgid "Hometown: " -msgstr "" - -#: ../../mod/directory.php:245 -msgid "About: " -msgstr "" - -#: ../../mod/directory.php:303 -msgid "Public Forum:" -msgstr "" - -#: ../../mod/directory.php:306 -msgid "Keywords: " -msgstr "" - -#: ../../mod/directory.php:311 -#, php-format -msgid "Common connections: %s" -msgstr "" - -#: ../../mod/directory.php:363 -msgid "Finding:" -msgstr "" - -#: ../../mod/directory.php:368 -msgid "next page" -msgstr "" - -#: ../../mod/directory.php:368 -msgid "previous page" -msgstr "" - -#: ../../mod/directory.php:385 -msgid "No entries (some entries may be hidden)." -msgstr "" - #: ../../mod/uexport.php:33 ../../mod/uexport.php:34 msgid "Export Channel" msgstr "" @@ -7315,6 +7320,18 @@ msgstr "" msgid "Remove Account" msgstr "" +#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61 +msgid "Help:" +msgstr "" + +#: ../../mod/help.php:76 ../../index.php:227 +msgid "Not Found" +msgstr "" + +#: ../../mod/help.php:100 +msgid "$Projectname Documentation" +msgstr "" + #: ../../mod/update_channel.php:43 ../../mod/update_display.php:25 #: ../../mod/update_network.php:23 ../../mod/update_search.php:46 #: ../../mod/update_home.php:21 ../../mod/update_public.php:21 @@ -8752,7 +8769,7 @@ msgid "Monospace" msgstr "" #: ../../view/theme/apw/php/config.php:259 -#: ../../view/theme/redbasic/php/config.php:100 +#: ../../view/theme/redbasic/php/config.php:102 msgid "Theme settings" msgstr "" @@ -8761,7 +8778,7 @@ msgid "Set scheme" msgstr "" #: ../../view/theme/apw/php/config.php:261 -#: ../../view/theme/redbasic/php/config.php:122 +#: ../../view/theme/redbasic/php/config.php:124 msgid "Set font-size for posts and comments" msgstr "" @@ -8885,127 +8902,127 @@ msgstr "" msgid "Light (Red Matrix default)" msgstr "" -#: ../../view/theme/redbasic/php/config.php:101 +#: ../../view/theme/redbasic/php/config.php:103 msgid "Select scheme" msgstr "" -#: ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Narrow navbar" msgstr "" -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:105 msgid "Navigation bar background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Navigation bar gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Navigation bar gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Navigation active button gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Navigation active button gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Navigation bar border color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Navigation bar icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Navigation bar active icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:113 msgid "link color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Set font-color for banner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:115 msgid "Set the background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:116 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:117 msgid "Set the background color of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:118 msgid "Set the background color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:119 msgid "Set the border color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:120 msgid "Set the indent for comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:119 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Set the basic color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:120 +#: ../../view/theme/redbasic/php/config.php:122 msgid "Set the hover color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:123 msgid "Set font-size for the entire application" msgstr "" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:123 msgid "Example: 14px" msgstr "" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:125 msgid "Set font-color for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:124 +#: ../../view/theme/redbasic/php/config.php:126 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:125 +#: ../../view/theme/redbasic/php/config.php:127 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:126 +#: ../../view/theme/redbasic/php/config.php:128 msgid "Set maximum width of content region in pixel" msgstr "" -#: ../../view/theme/redbasic/php/config.php:126 +#: ../../view/theme/redbasic/php/config.php:128 msgid "Leave empty for default width" msgstr "" -#: ../../view/theme/redbasic/php/config.php:127 +#: ../../view/theme/redbasic/php/config.php:129 msgid "Center page content" msgstr "" -#: ../../view/theme/redbasic/php/config.php:128 +#: ../../view/theme/redbasic/php/config.php:130 msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../view/theme/redbasic/php/config.php:129 +#: ../../view/theme/redbasic/php/config.php:131 msgid "Set size of conversation author photo" msgstr "" -#: ../../view/theme/redbasic/php/config.php:130 +#: ../../view/theme/redbasic/php/config.php:132 msgid "Set size of followup author photos" msgstr "" diff --git a/version.inc b/version.inc index df3ed0059..f98eedbce 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-06-23.1072 +2015-06-26.1075 From 22b9e97ae2e46513c7a43cb27e7230bc5c40b9d4 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 27 Jun 2015 22:27:17 +0200 Subject: [PATCH 3/5] css fixes --- view/css/mod_directory.css | 2 ++ view/theme/redbasic/css/style.css | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css index d3831e589..8e55ac3be 100644 --- a/view/css/mod_directory.css +++ b/view/css/mod_directory.css @@ -10,11 +10,13 @@ .contact-photo-wrapper { display: table-cell; + table-layout: fixed; vertical-align: top; } .contact-info { display: table-cell; + table-layout: fixed; vertical-align: top; padding-left: 10px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ad203867c..aaf4fdd2b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1326,6 +1326,7 @@ header { .contactname { padding-top: 2px; font-weight: bold; + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: block; @@ -1408,7 +1409,6 @@ header { .acl-list-item p { font-size: $font_size; margin: 0px; - overflow: ellipsis; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -1870,6 +1870,9 @@ nav .dropdown-menu { .section-subtitle-wrapper h3 { margin-top: 0px; margin-bottom: 0px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .section-subtitle-wrapper { @@ -2000,6 +2003,7 @@ nav .badge.mail-update:hover { .dropdown-menu { font-size: $body_font_size; border-radius: $radiuspx; + max-width: 100%; } .dropdown-menu img { From 7fafcbb6ef1a3f33fdb86c34c37a87495127da3f Mon Sep 17 00:00:00 2001 From: Alexandre Hannud Abdo Date: Sat, 27 Jun 2015 18:10:18 -0300 Subject: [PATCH 4/5] simply 'post' is a better default term than 'status' --- mod/tagger.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/tagger.php b/mod/tagger.php index aafad58cf..f411bd6d5 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -48,7 +48,7 @@ function tagger_content(&$a) { break; default: $targettype = ACTIVITY_OBJ_NOTE; - $post_type = t('status'); + $post_type = t('post'); if($item['mid'] != $item['parent_mid']) $post_type = t('comment'); break; @@ -133,4 +133,4 @@ function tagger_content(&$a) { killme(); -} \ No newline at end of file +} From de13497333c9b68e3fa2d73c9a0284da7797f405 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 28 Jun 2015 21:16:56 -0700 Subject: [PATCH 5/5] no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool. --- boot.php | 2 +- doc/to_do_code.bb | 2 +- include/items.php | 65 +++++++++++++++++++++++++++++-- include/zot.php | 45 ++++++++++++++------- install/schema_mysql.sql | 2 + install/schema_postgres.sql | 2 + install/update.php | 12 +++++- mod/connedit.php | 12 +++++- version.inc | 2 +- view/theme/redbasic/css/style.css | 1 + view/tpl/abook_edit.tpl | 8 +++- 11 files changed, 128 insertions(+), 25 deletions(-) diff --git a/boot.php b/boot.php index 03f65db2f..bd99eb774 100755 --- a/boot.php +++ b/boot.php @@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME', 'redmatrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1143 ); +define ( 'DB_UPDATE_VERSION', 1144 ); /** * @brief Constant with a HTML line break. diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb index 4e6f655e2..3a54a5357 100644 --- a/doc/to_do_code.bb +++ b/doc/to_do_code.bb @@ -4,7 +4,7 @@ We need much more than this, but here are areas where developers can help. Pleas [li]Documentation - see Red Documentation Project To-Do List[/li] [li]Include TOS link in registration/verification email[/li] -[li]forum widget with unread counts[/li] +[li]forum widget with unread counts (requires the DB schema changes from v3/hubzilla to be viable)[/li] [li]Create bug tracker module[/li] [li]translation plugins - moses or apertium[/li] [li]Infinite scroll improvements (i.e. embedded page links) see http://scrollsample.appspot.com/items diff --git a/include/items.php b/include/items.php index 229512ead..cef303d2e 100755 --- a/include/items.php +++ b/include/items.php @@ -3284,8 +3284,7 @@ function check_item_source($uid, $item) { $text = prepare_text($item['body'],$item['mimetype']); $text = html2plain($text); - /** @BUG $items is undefined, should this be $item? */ - $tags = ((count($items['term'])) ? $items['term'] : false); + $tags = ((count($item['term'])) ? $item['term'] : false); $words = explode("\n",$r[0]['src_patt']); if($words) { @@ -3295,7 +3294,9 @@ function check_item_source($uid, $item) { if(($t['type'] == TERM_HASHTAG) && ((substr($t,1) === substr($word,1)) || (substr($word,1) === '*'))) return true; } - if(stristr($text,$word) !== false) + elseif((strpos($word,'/') === 0) && preg_match($word,$body)) + return true; + elseif(stristr($text,$word) !== false) return true; } } @@ -3303,6 +3304,64 @@ function check_item_source($uid, $item) { return false; } +function post_is_importable($item,$abook) { + + if(! $abook) + return true; + if(! $item) + return false; + + if((! $abook['abook_incl']) && (! $abook['abook_excl'])) + return true; + + require_once('include/html2plain.php'); + $text = prepare_text($item['body'],$item['mimetype']); + $text = html2plain($text); + + $tags = ((count($item['term'])) ? $item['term'] : false); + + // exclude always has priority + + $exclude = (($abook['abook_excl']) ? explode("\n",$abook['abook_excl']) : null); + + if($exclude) { + foreach($exclude as $word) { + $word = trim($word); + if(substr($word,0,1) === '#' && $tags) { + foreach($tags as $t) + if(($t['type'] == TERM_HASHTAG) && ((substr($t,1) === substr($word,1)) || (substr($word,1) === '*'))) + return false; + } + elseif((strpos($word,'/') === 0) && preg_match($word,$body)) + return false; + elseif(stristr($text,$word) !== false) + return false; + } + } + + $include = (($abook['abook_incl']) ? explode("\n",$abook['abook_incl']) : null); + + if($include) { + foreach($include as $word) { + $word = trim($word); + if(substr($word,0,1) === '#' && $tags) { + foreach($tags as $t) + if(($t['type'] == TERM_HASHTAG) && ((substr($t,1) === substr($word,1)) || (substr($word,1) === '*'))) + return true; + } + elseif((strpos($word,'/') === 0) && preg_match($word,$body)) + return true; + elseif(stristr($text,$word) !== false) + return true; + } + } + else { + return true; + } + + return false; +} + function mail_store($arr) { diff --git a/include/zot.php b/include/zot.php index 02ac1301b..66156b4e0 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1654,6 +1654,12 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ } } + $ab = q("select abook.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and (abook_flags & %d) = 0", + intval($channel['channel_id']), + intval(ABOOK_FLAG_SELF) + ); + $abook = (($ab) ? $ab[0] : null); + if($arr['item_restrict'] & ITEM_DELETED) { // remove_community_tag is a no-op if this isn't a community tag activity @@ -1693,10 +1699,15 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ elseif($arr['edited'] > $r[0]['edited']) { $arr['id'] = $r[0]['id']; $arr['uid'] = $channel['channel_id']; - update_imported_item($sender,$arr,$channel['channel_id']); - $result[] = array($d['hash'],'updated',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); - if(! $relay) - add_source_route($item_id,$sender['hash']); + if(($arr['mid'] == $arr['parent_mid']) && (! post_is_importable($arr,$abook))) { + $result[] = array($d['hash'],'update ignored',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); + } + else { + update_imported_item($sender,$arr,$channel['channel_id']); + $result[] = array($d['hash'],'updated',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); + if(! $relay) + add_source_route($item_id,$sender['hash']); + } } else { $result[] = array($d['hash'],'update ignored',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); @@ -1715,18 +1726,24 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ if(check_item_source($arr['uid'], $arr)) call_hooks('post_local', $arr); - - $item_result = item_store($arr); + $item_id = 0; - if($item_result['success']) { - $item_id = $item_result['item_id']; - $parr = array('item_id' => $item_id,'item' => $arr,'sender' => $sender,'channel' => $channel); - call_hooks('activity_received',$parr); - // don't add a source route if it's a relay or later recipients will get a route mismatch - if(! $relay) - add_source_route($item_id,$sender['hash']); + + if(($arr['mid'] == $arr['parent_mid']) && (! post_is_importable($arr,$abook))) { + $result[] = array($d['hash'],'post ignored',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); + } + else { + $item_result = item_store($arr); + if($item_result['success']) { + $item_id = $item_result['item_id']; + $parr = array('item_id' => $item_id,'item' => $arr,'sender' => $sender,'channel' => $channel); + call_hooks('activity_received',$parr); + // don't add a source route if it's a relay or later recipients will get a route mismatch + if(! $relay) + add_source_route($item_id,$sender['hash']); + } + $result[] = array($d['hash'],(($item_id) ? 'posted' : 'storage failed:' . $item_result['message']),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); } - $result[] = array($d['hash'],(($item_id) ? 'posted' : 'storage failed:' . $item_result['message']),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); } if($relay && $item_id) { diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 8aca3dff4..4d0da366f 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -20,6 +20,8 @@ CREATE TABLE IF NOT EXISTS `abook` ( `abook_dob` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `abook_flags` int(11) NOT NULL DEFAULT '0', `abook_profile` char(64) NOT NULL DEFAULT '', + `abook_incl` TEXT NOT NULL DEFAULT '', + `abook_excl` TEXT NOT NULL DEFAULT '', PRIMARY KEY (`abook_id`), KEY `abook_account` (`abook_account`), KEY `abook_channel` (`abook_channel`), diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index a68c7d12b..a58e5a2ae 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -14,6 +14,8 @@ CREATE TABLE "abook" ( "abook_dob" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', "abook_flags" bigint NOT NULL DEFAULT '0', "abook_profile" char(64) NOT NULL DEFAULT '', + "abook_incl" TEXT NOT NULL DEFAULT '', + "abook_excl" TEXT NOT NULL DEFAULT '', PRIMARY KEY ("abook_id") ); create index "abook_account" on abook ("abook_account"); diff --git a/install/update.php b/install/update.php index 62c976218..fb49e9a16 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ t('Slide to adjust your degree of friendship'), '$lbl_rating' => t('Rating (this information is public)'), '$lbl_rating_txt' => t('Optionally explain your rating (this information is public)'), - '$rating_txt' => $rating_text, + '$incl' => array('abook_incl',t('Only import posts with this text'), $contact['abook_incl'],t('words one per line or #tags or /patterns/, leave blank to import all posts')), + '$excl' => array('abook_excl',t('Do not import posts with this text'), $contact['abook_excl'],t('words one per line or #tags or /patterns/, leave blank to import all posts')), + '$rating_text' => array('rating_text', t('Optionally explain your rating (this information is public)'),$rating_text,''), '$rating' => $rating, '$rating_val' => $rating_val, '$slide' => $slide, diff --git a/version.inc b/version.inc index f98eedbce..b06ac504d 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-06-26.1075 +2015-06-28.1077 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ad203867c..e53cc7ee1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2277,3 +2277,4 @@ nav .badge.mail-update:hover { .channels_ckbx, .pending_ckbx, .users_ckbx { margin-top: -5px !important; } + diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index fb02ff8ed..10692856e 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -50,6 +50,9 @@ {{/if}} + {{include file="field_textarea.tpl" field=$incl}} + {{include file="field_textarea.tpl" field=$excl}} + {{if $rating}}

{{$lbl_rating}}

@@ -58,6 +61,8 @@ {{/if}} + + {{/if}} @@ -75,8 +80,7 @@ {{if $rating}} {{if $notself}} -

{{$lbl_rating_txt}}

- + {{include file="field_textarea.tpl" field=$rating_text}} {{/if}} {{/if}}