aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-31 20:58:05 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-31 20:58:05 -0700
commit039f56f390c69ad0aedadcca3d611fea0d9eebf9 (patch)
tree757f0ce289961e3efa2441a9a625872aa34b3815
parentb4cbb3aeb1b7b383966bd8ca36d8a2f2fa608f0b (diff)
downloadvolse-hubzilla-039f56f390c69ad0aedadcca3d611fea0d9eebf9.tar.gz
volse-hubzilla-039f56f390c69ad0aedadcca3d611fea0d9eebf9.tar.bz2
volse-hubzilla-039f56f390c69ad0aedadcca3d611fea0d9eebf9.zip
mostly doc tweaks, some import/export work
-rw-r--r--doc/to_do_code.bb1
-rw-r--r--doc/to_do_doco.bb23
-rw-r--r--include/identity.php2
-rw-r--r--mod/import.php21
-rwxr-xr-xmod/like.php4
5 files changed, 23 insertions, 28 deletions
diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb
index 7fb6da858..94421bab0 100644
--- a/doc/to_do_code.bb
+++ b/doc/to_do_code.bb
@@ -14,6 +14,7 @@ We need much more than this, but here are areas where developers can help. Pleas
[li]provide a way for xchans with a certain network type to upgrade (unknown to rss, rss to statusnet, friendica-over-diaspora to friendica, for instance) based on new knowledge and/or redmatrix ability[/li]
[li](done - HZ) If DAV folders exist, add an option to the Settings page to set a default folder for attachment uploads.[/li]
[li]Integrate the &quot;open site&quot; list with the register page[/li]
+[li]Support comments and member notes on documentation pages (to achieve an effect similar to php.net)[/li]
[li]implement oembed provider interface[/li]
[li]refactor the oembed client interface so that we can safely sandbox remote content[/li]
[li]Many modern social apps now have both a profile photo and a "cover photo". Add support for this. [/li]
diff --git a/doc/to_do_doco.bb b/doc/to_do_doco.bb
deleted file mode 100644
index d0f595b3e..000000000
--- a/doc/to_do_doco.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-[b]Documentation To-Do List[/b]
-
-[b]Documentation we need to write[/b]
-
- Database schema detailed descriptions
-
- Complete plugin hook documentation
-
- API documentation
-
- Function and code documentation (doxygen)
-
- New Member guide
-
- &quot;Extra Feature&quot; reference, description of each
-
- Detailed Personal Settings Documentation
-
- Administration Guide (post-install)
-
- Administration Guide (pre-install)
-
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
diff --git a/include/identity.php b/include/identity.php
index 89589802f..cc2a37cc7 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -565,7 +565,7 @@ function identity_basic_export($channel_id, $items = false) {
if(! $items)
return $ret;
- $r = q("select likes.*, item.mid from likes left join item on likes.iid = item.id where likes.channel_id = %d",
+ $r = q("select * from likes where channel_id = %d",
intval($channel_id)
);
diff --git a/mod/import.php b/mod/import.php
index bf1f0ca2e..fb04a021a 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -447,7 +447,7 @@ function import_post(&$a) {
-// FIXME - ensure we have an xchan if somebody is trying to pull a fast one
+ // FIXME - ensure we have an xchan if somebody is trying to pull a fast one
if($completed < 8) {
$friends = 0;
@@ -556,6 +556,23 @@ function import_post(&$a) {
ref_session_write(session_id(), serialize($_SESSION));
}
+
+ $objs = $data['obj'];
+ if($objs) {
+ foreach($objs as $obj) {
+ unset($obj['obj_id']);
+ $obj['channel'] = $channel['channel_id'];
+
+ dbesc_array($obj);
+ $r = dbq("INSERT INTO obj (`"
+ . implode("`, `", array_keys($obj))
+ . "`) VALUES ('"
+ . implode("', '", array_values($obj))
+ . "')" );
+ }
+ }
+
+
$saved_notification_flags = notifications_off($channel['channel_id']);
if($import_posts && array_key_exists('item',$data) && $data['item']) {
@@ -614,7 +631,7 @@ function import_post(&$a) {
-// FIXME - ensure we have a self entry if somebody is trying to pull a fast one
+ // FIXME - ensure we have a self entry if somebody is trying to pull a fast one
// send out refresh requests
// notify old server that it may no longer be primary.
diff --git a/mod/like.php b/mod/like.php
index 9077adbda..2992319af 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -486,9 +486,9 @@ function like_content(&$a) {
dbesc($ch[0]['channel_hash']),
intval($post_id),
dbesc($activity),
- dbesc(($tgttype)?$tgttype:$objtype),
+ dbesc(($tgttype)? $tgttype : $objtype),
dbesc($obj_id),
- dbesc(json_encode(($target)?$target:$object))
+ dbesc(($target) ? $target : $object)
);
};