Projects / johnkravitz's fork of lithium_anologue

diff --git a/views/anologue/view.html.php b/views/anologue/view.html.php index 81872b0..fba9fa8 100644 --- a/views/anologue/view.html.php +++ b/views/anologue/view.html.php @@ -13,7 +13,7 @@ $avatar = 'http://' . $_SERVER['HTTP_HOST'] . $base . '/img/icons/user-anonymous-black.png'; $alternate = 'http://' . $_SERVER['HTTP_HOST'] . $base . '/img/icons/user-anonymous.png'; - //var_dump($user); + extract($user); ?> <?php echo $this->html->style('anologue.theme.default'); ?> @@ -43,9 +43,9 @@ <?php foreach ($data->messages as $key => $message) { ?> <li class="message"> <span class="meta"> - <span class="ip"><?php echo $message->ip;?></span> + <span class="ip"><?php echo $message->ip; ?></span> <time datetime="<?php echo date('c', $message->timestamp); ?>"><span data-timestamp="<?php echo $message->timestamp;?>" class="time"></span></time> - <span class="author gravatar" style="background-image:url(http://gravatar.com/avatar/<?php echo $message->email; ?>?s=20&d=<?php echo $avatar; ?>);"><?php echo !empty($message->url) ? $this->html->link($message->name, $message->url) : $this->html->escape($message->name); ?></span> + <span class="author gravatar" style="background-image:url(http://gravatar.com/avatar/<?php echo $message->email; ?>?s=20&d=<?php echo $avatar; ?>);"><?php echo !empty($message->url) ? $this->html->link($h($message->name), $message->url) : $h($message->name); ?></span> <span class="separator">: </span> </span> <div class="text markdown"> @@ -96,11 +96,11 @@ <div class="menu toolbar fieldset"> <fieldset name=""> <label for="user[name]">Name</label> - <input type="text" name="user[name]" class="text user name" placeholder="your name" title="Your name" value="<?php echo ($user['name']) ?: ''; ?>" /> + <input type="text" name="user[name]" class="text user name" placeholder="your name" title="Your name" value="<?=$name; ?>" /> <label for="user[email]">Email</label> - <input type="email" name="user[email]" class="text user email" placeholder="your email" title="Your e-mail" value="<?php echo ($user['email']) ?: ''; ?>" /> + <input type="email" name="user[email]" class="text user email" placeholder="your email" title="Your e-mail" value="<?=$email; ?>" /> <label for="user[url]">Website</label> - <input type="url" name="user[url]" class="text user url" placeholder="your website" title="Your website" value="<?php echo ($user['url']) ?: ''; ?>" /> + <input type="url" name="user[url]" class="text user url" placeholder="your website" title="Your website" value="<?=$url; ?>" /> </fieldset> <menu type="toolbar"> <span class="command icon sound <?php echo ($user['sounds'] == 'false') ? 'disabled' : ''; ?>" title="Toggle sound effects"> diff --git a/webroot/js/anologue-2.js b/webroot/js/anologue-2.js index 3af3422..52ac435 100644 --- a/webroot/js/anologue-2.js +++ b/webroot/js/anologue-2.js @@ -270,14 +270,14 @@ var anologue = { } if (viewer.email) { - background = 'style="background-image: url(http://gravatar.com/avatar/'+viewer.email+'?s=16&d='+this._config.icon+')"'; + background = 'style="background-image: url(http://gravatar.com/avatar/'+ $('<div/>').text(viewer.email).html() +'?s=16&d='+this._config.icon+')"'; } if (viewer.url) { - html = '<a href="' + viewer.url + '"' + background + '>' + viewer.name + '</a>'; + html = '<a href="' + $('<div/>').text(viewer.url).html() + '"' + background + '>' + $('<div/>').text(viewer.name).html() + '</a>'; } else { - html = '<span ' + background + '>' + viewer.name + '</span>'; + html = '<span ' + background + '>' + $('<div/>').text(viewer.name).html() + '</span>'; } - return '<li class="viewer' + away + '" data-name="' + viewer.name + '">' + html + '</li>'; + return '<li class="viewer' + away + '" data-name="' + $('<div/>').text(viewer.name).html() + '">' + html + '</li>'; }, render: function(message) {