From 764ee785f5505c2be804a850b8e4029598d81739 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 16 Jun 2013 19:14:01 -0700 Subject: We will need a per item comment policy to be able to determine in advance if we have permission to comment on something , and we'll need to send it out with all communications. The current check is not only flawed but also a huge performance hit. Also provide the ability for an item to disable commenting completely - such as for a webpage or wherever you want to prevent comments on one item, without requiring a change to your entire permission scheme. All of this is only partially implemented at the moment but we need the structures in place on several sites in order to finish it without breaking everything. --- boot.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index d4add9cc9..c0473a23c 100755 --- a/boot.php +++ b/boot.php @@ -41,7 +41,7 @@ require_once('include/features.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1043 ); +define ( 'DB_UPDATE_VERSION', 1044 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -436,6 +436,7 @@ define ( 'ITEM_NOTSHOWN', 0x0080); // technically visible but not normal define ( 'ITEM_NSFW', 0x0100); define ( 'ITEM_RELAY', 0x0200); // used only in the communication layers, not stored define ( 'ITEM_MENTIONSME', 0x0400); +define ( 'ITEM_NOCOMMENT', 0x0800); // commenting/followups are disabled /** -- cgit v1.2.3 From 94c758080ff0b957d7d728428de5821c39a583e9 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 17 Jun 2013 16:21:03 -0700 Subject: zidify bodies of notification emails --- boot.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index c0473a23c..2f70f1d47 100755 --- a/boot.php +++ b/boot.php @@ -2061,6 +2061,8 @@ function get_my_url() { } function get_my_address() { + if(x($_SESSION,'zid_override')) + return $_SESSION['zid_override']; if(x($_SESSION,'my_address')) return $_SESSION['my_address']; return false; @@ -2098,12 +2100,12 @@ function zid_init(&$a) { } /** - * @function zid($s,$force = false) + * @function zid($s,$address = '') * Adds a zid parameter to a url * @param string $s * The url to accept the zid - * @param boolean $force - * Currently unused + * @param boolean $address + * $address to use instead of session environment * @return string * * @hooks 'zid' @@ -2113,7 +2115,7 @@ function zid_init(&$a) { */ -function zid($s,$force = false) { +function zid($s,$address = '') { if(! strlen($s) || strpos($s,'zid=')) return $s; $has_params = ((strpos($s,'?')) ? true : false); @@ -2123,9 +2125,9 @@ function zid($s,$force = false) { $achar = strpos($s,'?') ? '&' : '?'; $mine = get_my_url(); - $myaddr = get_my_address(); + $myaddr = (($address) ? $address : get_my_address()); - if($mine and ! link_compare($mine,$s)) + if($mine && $myaddr && (! link_compare($mine,$s))) $zurl = $s . (($num_slashes >= 3) ? '' : '/') . $achar . 'zid=' . urlencode($myaddr); else $zurl = $s; -- cgit v1.2.3 From c5e38598280209903fc60c9ce996e7f3c34a4533 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 17 Jun 2013 19:25:46 -0700 Subject: another try on zidified notifications - this time it actually seems to work --- boot.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 2f70f1d47..fc02f28e9 100755 --- a/boot.php +++ b/boot.php @@ -2055,6 +2055,8 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ function get_my_url() { + if(x($_SESSION,'zrl_override')) + return $_SESSION['zrl_override']; if(x($_SESSION,'my_url')) return $_SESSION['my_url']; return false; -- cgit v1.2.3 From 0b935b79dcb82bccd45bf8f68409b6cdf0fceb40 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 18 Jun 2013 20:30:20 -0700 Subject: Support arbitrary likes - "David likes Bob's bicycle" or "Nancy likes Margaret's breasts" or whatever... This is a tricky activity to construct. You will need to set the object owner to the owner of the "thing" and the object title to the name of the "thing". The thing liked can include a photo if desired. This will probably have issues working correctly in other activitystreams environments. --- boot.php | 1 + 1 file changed, 1 insertion(+) (limited to 'boot.php') diff --git a/boot.php b/boot.php index fc02f28e9..aadeb0b29 100755 --- a/boot.php +++ b/boot.php @@ -379,6 +379,7 @@ define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' ); define ( 'ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group' ); define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_ZOT . '/activity/tagterm' ); define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT . '/activity/profile' ); +define ( 'ACTIVITY_OBJ_THING', NAMESPACE_ZOT . '/activity/thing' ); /** * item weight for query ordering -- cgit v1.2.3 From 4f06905a186252327e7446b8767889dc37aff9fc Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 19 Jun 2013 18:06:14 -0700 Subject: infrastructure for future stuff --- boot.php | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index aadeb0b29..0ad093d6a 100755 --- a/boot.php +++ b/boot.php @@ -41,7 +41,7 @@ require_once('include/features.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1044 ); +define ( 'DB_UPDATE_VERSION', 1045 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -117,7 +117,7 @@ define ( 'DEFAULT_DB_ENGINE', 'MyISAM' ); define ( 'SSL_POLICY_NONE', 0 ); define ( 'SSL_POLICY_FULL', 1 ); -define ( 'SSL_POLICY_SELFSIGN', 2 ); +define ( 'SSL_POLICY_SELFSIGN', 2 ); // NOT supported in Red /** @@ -313,18 +313,24 @@ define ( 'XCHAN_FLAGS_HIDDEN', 0x0001); * Tag/term types */ -define ( 'TERM_UNKNOWN', 0 ); -define ( 'TERM_HASHTAG', 1 ); -define ( 'TERM_MENTION', 2 ); -define ( 'TERM_CATEGORY', 3 ); -define ( 'TERM_PCATEGORY', 4 ); -define ( 'TERM_FILE', 5 ); -define ( 'TERM_SAVEDSEARCH', 6 ); - - -define ( 'TERM_OBJ_POST', 1 ); -define ( 'TERM_OBJ_PHOTO', 2 ); - +define ( 'TERM_UNKNOWN', 0 ); +define ( 'TERM_HASHTAG', 1 ); +define ( 'TERM_MENTION', 2 ); +define ( 'TERM_CATEGORY', 3 ); +define ( 'TERM_PCATEGORY', 4 ); +define ( 'TERM_FILE', 5 ); +define ( 'TERM_SAVEDSEARCH', 6 ); +define ( 'TERM_HAVETHING', 7 ); +define ( 'TERM_WANTTHING', 8 ); +define ( 'TERM_LIKETHING', 9 ); +define ( 'TERM_NOLIKETHING', 10 ); + +define ( 'TERM_OBJ_POST', 1 ); +define ( 'TERM_OBJ_PHOTO', 2 ); +define ( 'TERM_OBJ_PROFILE', 3 ); +define ( 'TERM_OBJ_CHANNEL', 4 ); +define ( 'TERM_OBJ_OBJECT', 5 ); +define ( 'TERM_OBJ_THING', 6 ); /** -- cgit v1.2.3 From 3b1e5e5204d7cade3afc320cc45b1eb4efa6743c Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 19 Jun 2013 21:50:14 -0700 Subject: source code re-org, move taxonomy to separate include --- boot.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 0ad093d6a..661a77f2a 100755 --- a/boot.php +++ b/boot.php @@ -37,6 +37,8 @@ require_once('include/permissions.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/BaseObject.php'); require_once('include/features.php'); +require_once('include/taxonomy.php'); + define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); -- cgit v1.2.3 From 61601dc23d3e8305720bfc4e4e6b6dbd7b85f546 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 20 Jun 2013 18:36:02 -0700 Subject: Add site registration policy to site record. This is not yet used or stored, but potentially can be exchanged through directory mirrors to automatically create "open site" lists. --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 661a77f2a..9ff4bad7a 100755 --- a/boot.php +++ b/boot.php @@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1045 ); +define ( 'DB_UPDATE_VERSION', 1046 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3 From cdc66da52fb985c33e27b955324dd977830a1d8c Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 27 Jun 2013 19:35:59 -0700 Subject: Basic ability to create "things" --- boot.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 9ff4bad7a..7106fd18f 100755 --- a/boot.php +++ b/boot.php @@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1046 ); +define ( 'DB_UPDATE_VERSION', 1047 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -322,10 +322,7 @@ define ( 'TERM_CATEGORY', 3 ); define ( 'TERM_PCATEGORY', 4 ); define ( 'TERM_FILE', 5 ); define ( 'TERM_SAVEDSEARCH', 6 ); -define ( 'TERM_HAVETHING', 7 ); -define ( 'TERM_WANTTHING', 8 ); -define ( 'TERM_LIKETHING', 9 ); -define ( 'TERM_NOLIKETHING', 10 ); +define ( 'TERM_THING', 7 ); define ( 'TERM_OBJ_POST', 1 ); define ( 'TERM_OBJ_PHOTO', 2 ); -- cgit v1.2.3 From 72f6edd59507797ef4073aed01ca1a0d14fa8cfd Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 30 Jun 2013 00:38:02 -0700 Subject: add age to directory profile - requires updating on each birthday and that part is still missing --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 7106fd18f..db61a79ae 100755 --- a/boot.php +++ b/boot.php @@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1047 ); +define ( 'DB_UPDATE_VERSION', 1048 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3