Browse Source

mongo commit

pull/1/head
Mike Macgirvin 11 years ago
parent
commit
e0e2a032cf
9 changed files with 61 additions and 20 deletions
  1. +14
    -1
      include/main.js
  2. +16
    -2
      mod/item.php
  3. +2
    -2
      mod/notifications.php
  4. +3
    -5
      mod/profile.php
  5. +2
    -0
      update.sql
  6. +6
    -4
      view/comment_item.tpl
  7. +1
    -0
      view/head.tpl
  8. +14
    -4
      view/style.css
  9. +3
    -2
      view/wall_item.tpl

+ 14
- 1
include/main.js View File

@ -16,5 +16,18 @@
document.getElementById(theID).style.display = "none"
}
function commentOpen(obj,id) {
if(obj.value == 'Comment') {
obj.value = '';
obj.className = "comment-edit-text-full";
openMenu("comment-edit-submit-wrapper-" + id);
}
}
function commentClose(obj,id) {
if(obj.value == '') {
obj.value = 'Comment';
obj.className="comment-edit-text-empty";
closeMenu("comment-edit-submit-wrapper-" + id);
}
}

+ 16
- 2
mod/item.php View File

@ -11,11 +11,18 @@ function item_post(&$a) {
$uid = $_SESSION['uid'];
$parent = ((x($_POST,'parent')) ? intval($_POST['parent']) : 0);
$profile_uid = ((x($_POST,'profile_uid')) ? intval($_POST['profile_uid']) : 0);
if(! can_write_wall($a,$profile_uid)) {
notice("Permission denied." . EOL) ;
return;
}
$body = escape_tags(trim($_POST['body']));
if(! strlen($body)) {
notice("Empty post discarded." . EOL );
goaway($a->get_baseurl() . "/profile/$profile_uid");
}
if((x($_SESSION,'visitor_id')) && (intval($_SESSION['visitor_id'])))
$contact_id = $_SESSION['visitor_id'];
else {
@ -53,9 +60,16 @@ function item_post(&$a) {
dbesc($hash));
if(count($r)) {
$post_id = $r[0]['id'];
if(! $parent)
if($parent) {
$r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent` = %d ",
intval($parent)
);
}
else {
$parent = $post_id;
$r = q("UPDATE `item` SET `parent` = %d, `visible` = 1
}
$r = q("UPDATE `item` SET `parent` = %d, `last-child` = 1, `visible` = 1
WHERE `id` = %d LIMIT 1",
intval($parent),
intval($post_id));


+ 2
- 2
mod/notifications.php View File

@ -65,12 +65,12 @@ function notifications_content(&$a) {
'$hide_url' => ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ),
'$hide_text' => ((strlen($sql_extra)) ? 'Show Ignored Requests' : 'Hide Ignored Requests')
));
dbg(2);
$r = q("SELECT `intro`.`id` AS `intro-id`, `intro`.*, `contact`.*
FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
intval($_SESSION['uid']));
dbg(0);
if(($r !== false) && (count($r))) {


+ 3
- 5
mod/profile.php View File

@ -98,6 +98,7 @@ function profile_content(&$a) {
require_once("include/bbcode.php");
require_once('include/security.php');
$a->page['htmlhead'] .= '<script type="text/javascript" src="include/jquery.js" ></script>';
$groups = array();
$tab = 'posts';
@ -143,8 +144,6 @@ function profile_content(&$a) {
}
dbg(2);
// TODO
// Alter registration and settings
// and profile to update contact table when names and photos change.
@ -216,11 +215,10 @@ dbg(2);
$tpl = file_get_contents('view/wall_item.tpl');
if(count($r)) {
for($x = 0; $x < count($r); $x ++) {
$rr = $r[$x];
foreach($r as $rr) {
$comment = '';
if(can_write_wall($a,$a->profile['profile_uid'])) {
if((($x + 1) < count($r)) && ($r[$x+1]['parent'] != $rr['parent'])) {
if($rr['last-child']) {
$comment = replace_macros($template,array(
'$id' => $rr['item_id'],
'$parent' => $rr['parent'],


+ 2
- 0
update.sql View File

@ -1,2 +1,4 @@
ALTER TABLE `item` CHANGE `allow_uid` `allow_cid` MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ,
CHANGE `deny_uid` `deny_cid` MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ;
ALTER TABLE `item` CHANGE `last-child` `last-child` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '1';

+ 6
- 4
view/comment_item.tpl View File

@ -1,16 +1,18 @@
<div class="comment-edit" id="comment-edit-$id" onclick="openClose('comment-edit-wrapper-$id');" >Comments</div>
<div class="comment-edit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" >
<input type="hidden" name="type" value="jot" />
<input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="parent" value="$parent" />
<textarea rows="2" cols="24" id="comment-edit-text-$id" name="body" onFocus="this.rows=5; this.cols=40; openMenu('comment-edit-submit-$id');" onBlur="this.rows=2; this.cols=24; closeMenu('comment-edit-submit-$id'); this.value='';"></textarea>
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >Comment</textarea>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-$id" style="display: none;" >
<input type="submit" id="comment-edit-submit" name="submit" value="Submit" />
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
<input type="submit" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="Submit" />
</div>
<div id="comment-edit-end"></div>
</form>
</div>

+ 1
- 0
view/head.tpl View File

@ -5,4 +5,5 @@
<!--[if IE]>
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
<script type="text/javascript" src="$baseurl/include/main.js" ></script>

+ 14
- 4
view/style.css View File

@ -442,11 +442,9 @@ input#dfrn-url {
border: none;
}
.comment-edit {
font-size: 0.8em;
cursor: pointer;
color: #3172BD;
.comment-edit-wrapper {
margin-top: 15px;
margin-left: 100px;
}
@ -756,4 +754,16 @@ input#dfrn-url {
#profile-tabs-end {
clear: both;
}
.comment-edit-text-empty {
color: gray;
height: 30px;
width: 175px;
}
.comment-edit-text-full {
color: black;
height: 150px;
width: 350px;
}

+ 3
- 2
view/wall_item.tpl View File

@ -8,10 +8,11 @@
<span class="wall-item-body" id="wall-item-body-$id" >$body</span>
<div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
<div class="wall-item-comment-separator"></div>
$comment
</div>
<div class="wall-item-wrapper-end"></div>
<div class="wall-item-comment-separator"></div>
$comment
</div>
<div class="wall-item-$indentoutside-wrapper-end" ></div>

Loading…
Cancel
Save