diff options
| author | friendica <info@friendica.com> | 2011-12-19 16:51:57 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2011-12-19 16:51:57 -0800 |
| commit | 79f3bbbf2b0e41db2653f9d0fd4eb7520ba58a25 (patch) | |
| tree | 10179ac62891cf7df0d8dafb9bbf0aec9245c74c /include | |
| parent | 7c6bc5a93d50de8e15d6158aa3dae7936097dbec (diff) | |
| download | volse-hubzilla-79f3bbbf2b0e41db2653f9d0fd4eb7520ba58a25.tar.gz volse-hubzilla-79f3bbbf2b0e41db2653f9d0fd4eb7520ba58a25.tar.bz2 volse-hubzilla-79f3bbbf2b0e41db2653f9d0fd4eb7520ba58a25.zip | |
more data checking, cleans up some infrequent php errors
Diffstat (limited to 'include')
| -rw-r--r-- | include/diaspora.php | 7 | ||||
| -rw-r--r-- | include/socgraph.php | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 7f1e4a8e3..3ab454246 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -188,6 +188,13 @@ function diaspora_msg_build($msg,$user,$contact,$prvkey,$pubkey,$public = false) logger('diaspora_msg_build: ' . $msg, LOGGER_DATA); + // without a public key nothing will work + + if(! $pubkey) { + logger('diaspora_msg_build: pubkey missing: contact id: ' . $contact['id']); + return ''; + } + $inner_aes_key = random_string(32); $b_inner_aes_key = base64_encode($inner_aes_key); $inner_iv = random_string(16); diff --git a/include/socgraph.php b/include/socgraph.php index 60bf075d3..79d7340a4 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -58,6 +58,9 @@ function poco_load($cid,$uid = 0,$url = null) { logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA); + if(! isset($j->entry)) + return; + $total = 0; foreach($j->entry as $entry) { |