diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/connedit.php | 2 | ||||
| -rw-r--r-- | mod/dirsearch.php | 4 | ||||
| -rw-r--r-- | mod/editpost.php | 2 | ||||
| -rw-r--r-- | mod/item.php | 1 | ||||
| -rw-r--r-- | mod/photos.php | 4 | ||||
| -rw-r--r-- | mod/pubsites.php | 4 | ||||
| -rw-r--r-- | mod/zfinger.php | 1 |
7 files changed, 6 insertions, 12 deletions
diff --git a/mod/connedit.php b/mod/connedit.php index 6170d05a8..65eba885a 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -190,7 +190,7 @@ function connedit_post(&$a) { } } - $abook_pending = (($new_friend) ? 0 : $orig_record[0]['abook_pending']; + $abook_pending = (($new_friend) ? 0 : $orig_record[0]['abook_pending']); $r = q("UPDATE abook SET abook_profile = '%s', abook_my_perms = %d , abook_closeness = %d, abook_pending = %d, abook_incl = '%s', abook_excl = '%s' diff --git a/mod/dirsearch.php b/mod/dirsearch.php index ec730b28d..937564a79 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -436,9 +436,9 @@ function list_public_sites() { $register = 'closed'; if(strpos($rr['site_url'],'https://') !== false) - $ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location']); + $ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location'], 'project' => $rr['site_project']); else - $insecure[] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location']); + $insecure[] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location'], 'project' => $rr['site_project']); } if($insecure) { $ret['sites'] = array_merge($ret['sites'],$insecure); diff --git a/mod/editpost.php b/mod/editpost.php index d4dc35ef8..1bee16ee7 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -129,7 +129,7 @@ function editpost_content(&$a) { '$consensus' => intval($itm[0]['item_consensus']), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), - '$ptyp' => $itm[0]['type'], + '$ptyp' => $itm[0]['obj_type'], '$content' => undo_post_tagging($itm[0]['body']), '$post_id' => $post_id, '$parent' => (($itm[0]['parent'] != $itm[0]['id']) ? $itm[0]['parent'] : ''), diff --git a/mod/item.php b/mod/item.php index 7488e709b..32c417c56 100644 --- a/mod/item.php +++ b/mod/item.php @@ -107,7 +107,6 @@ function item_post(&$a) { $layout_mid = ((x($_REQUEST,'layout_mid')) ? escape_tags($_REQUEST['layout_mid']): ''); $plink = ((x($_REQUEST,'permalink')) ? escape_tags($_REQUEST['permalink']) : ''); $obj_type = ((x($_REQUEST,'obj_type')) ? escape_tags($_REQUEST['obj_type']) : ACTIVITY_OBJ_NOTE); - // allow API to bulk load a bunch of imported items with sending out a bunch of posts. $nopush = ((x($_REQUEST,'nopush')) ? intval($_REQUEST['nopush']) : 0); diff --git a/mod/photos.php b/mod/photos.php index 0442a5d24..7cd972d8d 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -184,16 +184,13 @@ function photos_post(&$a) { if($r) { - /* this happens in attach_delete q("DELETE FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s'", intval($page_owner_uid), dbesc($r[0]['resource_id']) ); - */ attach_delete($page_owner_uid, $r[0]['resource_id'], 1 ); - /* this happens in attach_delete $i = q("SELECT * FROM `item` WHERE `resource_id` = '%s' AND resource_type = 'photo' and `uid` = %d LIMIT 1", dbesc($r[0]['resource_id']), intval($page_owner_uid) @@ -202,7 +199,6 @@ function photos_post(&$a) { drop_item($i[0]['id'],true,DROPITEM_PHASE1); $url = $a->get_baseurl(); } - */ } goaway($a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']); diff --git a/mod/pubsites.php b/mod/pubsites.php index 62990c70c..726c681fa 100644 --- a/mod/pubsites.php +++ b/mod/pubsites.php @@ -23,12 +23,12 @@ function pubsites_content(&$a) { $j = json_decode($ret['body'],true); if($j) { $rate_meta = ((local_channel()) ? '<td>' . t('Rate this hub') . '</td>' : ''); - $o .= '<table border="1"><tr><td>' . t('Site URL') . '</td><td>' . t('Access Type') . '</td><td>' . t('Registration Policy') . '</td><td>' . t('Location') . '</td><td>' . t('View hub ratings') . '</td>' . $rate_meta . '</tr>'; + $o .= '<table border="1"><tr><td>' . t('Site URL') . '</td><td>' . t('Access Type') . '</td><td>' . t('Registration Policy') . '</td><td>' . t('Location') . '</td><td>' . t('Project') . '</td><td>' . t('View hub ratings') . '</td>' . $rate_meta . '</tr>'; if($j['sites']) { foreach($j['sites'] as $jj) { $host = strtolower(substr($jj['url'],strpos($jj['url'],'://')+3)); $rate_links = ((local_channel()) ? '<td><a href="rate?f=&target=' . $host . '" class="btn-btn-default"><i class="icon-check"></i> ' . t('Rate') . '</a></td>' : ''); - $o .= '<tr><td>' . '<a href="'. (($jj['sellpage']) ? $jj['sellpage'] : $jj['url'] . '/register' ) . '" >' . $jj['url'] . '</a>' . '</td><td>' . $jj['access'] . '</td><td>' . $jj['register'] . '</td><td>' . $jj['location'] . '</td><td><a href="ratings/' . $host . '" class="btn-btn-default"><i class="icon-eye-open"></i> ' . t('View ratings') . '</a></td>' . $rate_links . '</tr>'; + $o .= '<tr><td>' . '<a href="'. (($jj['sellpage']) ? $jj['sellpage'] : $jj['url'] . '/register' ) . '" >' . $jj['url'] . '</a>' . '</td><td>' . $jj['access'] . '</td><td>' . $jj['register'] . '</td><td>' . $jj['location'] . '</td><td>' . $jj['project'] . '</td><td><a href="ratings/' . $host . '" class="btn-btn-default"><i class="icon-eye-open"></i> ' . t('View ratings') . '</a></td>' . $rate_links . '</tr>'; } } diff --git a/mod/zfinger.php b/mod/zfinger.php index fb3333280..fff7c9e1b 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -9,5 +9,4 @@ function zfinger_init(&$a) { $x = zotinfo($_REQUEST); json_return_and_die($x); - } |