diff options
| -rw-r--r-- | boot.php | 4 | ||||
| -rw-r--r-- | database.sql | 1 | ||||
| -rw-r--r-- | mod/display.php | 17 | ||||
| -rw-r--r-- | update.php | 8 |
4 files changed, 18 insertions, 12 deletions
@@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'BUILD_ID' , 1001 ); +define ( 'BUILD_ID' , 1002 ); define ( 'EOL', "<br />\r\n"); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -33,7 +33,7 @@ define ( 'NAMESPACE_ACTIVITY', 'http://activitystrea.ms/spec/1.0/' ); define ( 'NAMESPACE_ACTIVITY_SCHEMA', 'http://activitystrea.ms/schema/1.0/'); define ( 'ACTIVITY_LIKE', NAMESPACE_ACTIVITY_SCHEMA . 'like' ); -define ( 'ACTIVITY_DISLIKE' NAMESPACE_DFRN . '/dislike' ); +define ( 'ACTIVITY_DISLIKE', NAMESPACE_DFRN . '/dislike' ); define ( 'ACTIVITY_OBJ_HEART', NAMESPACE_DFRN . '/heart' ); define ( 'ACTIVITY_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'make-friend' ); diff --git a/database.sql b/database.sql index 2541de76a..22a55ceb0 100644 --- a/database.sql +++ b/database.sql @@ -145,6 +145,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `uid` int(10) unsigned NOT NULL DEFAULT '0', `contact-id` int(10) unsigned NOT NULL DEFAULT '0', `type` char(255) NOT NULL, + `wall` tinyint(1) NOT NULL DEFAULT '0', `parent` int(10) unsigned NOT NULL DEFAULT '0', `parent-uri` char(255) CHARACTER SET ascii NOT NULL, `created` datetime NOT NULL, diff --git a/mod/display.php b/mod/display.php index 2125e1696..639a30eb7 100644 --- a/mod/display.php +++ b/mod/display.php @@ -75,7 +75,7 @@ function display_content(&$a) { " AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' ) AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' ) AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' ) - AND ( `deny_gid` = '' OR NOT `deny_gid` REGEXP '%s') ", + AND ( `deny_gid` = '' OR NOT `deny_gid` REGEXP '%s') ", intval($_SESSION['visitor_id']), intval($_SESSION['visitor_id']), @@ -91,17 +91,19 @@ function display_content(&$a) { FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE `id` = %d ) + AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' )) $sql_extra ORDER BY `parent` DESC, `id` ASC ", intval($a->profile['uid']), - intval($item_id) + dbesc($item_id), + dbesc($item_id) ); $cmnt_tpl = file_get_contents('view/comment_item.tpl'); $tpl = file_get_contents('view/wall_item.tpl'); + $wallwall = file_get_contents('view/wallwall_item.tpl'); $return_url = $_SESSION['return_url'] = $a->cmd; @@ -164,9 +166,6 @@ function display_content(&$a) { } } - - - $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']); $profile_link = $profile_url; @@ -187,12 +186,14 @@ function display_content(&$a) { '$ago' => relative_date($item['created']), '$location' => (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : ''), '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''), + '$owner_url' => $owner_url, + '$owner_photo' => $owner_photo, + '$owner_name' => $owner_name, '$drop' => $drop, '$comment' => $comment )); - + } } - return $o; }
\ No newline at end of file diff --git a/update.php b/update.php index e01bafb90..a39450579 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ <?php -function update_1001() { +function update_1000() { q("ALTER TABLE `item` DROP `like`, DROP `dislike` "); @@ -12,4 +12,8 @@ function update_1001() { q("ALTER TABLE `contact` ADD `duplex` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `rel` "); q("ALTER TABLE `contact` CHANGE `issued-pubkey` `issued-pubkey` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL"); q("ALTER TABLE `contact` ADD `term-date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `avatar-date`"); -}
\ No newline at end of file +} + +function update_1001() { + q("ALTER TABLE `item` ADD `wall` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `type` "); +} |