clean up w3c validation and layout for priv mail and lang selector

diff --git a/include/text.php b/include/text.php
index 701c1e41b6352c887df78f499c98c44018742b2b..bc711e6da55d76188f134233dc720a92977d2930 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -865,7 +865,7 @@ function lang_selector() {
        global $lang;
        $o = '<div id="lang-select-icon" class="icon language" title="' . t('Select an alternate language') . '" onclick="openClose(\'language-selector\');" ></div>';
        $o .= '<div id="language-selector" style="display: none;" >';
-       $o .= '<form action="" method="post" ><select name="system_language" onchange="this.form.submit();" >';
+       $o .= '<form action="#" method="post" ><select name="system_language" onchange="this.form.submit();" >';
        $langs = glob('view/*/strings.php');
        if(is_array($langs) && count($langs)) {
                $langs[] = '';
@@ -880,7 +880,7 @@ function lang_selector() {
                        }
                        $ll = substr($l,5);
                        $ll = substr($ll,0,strrpos($ll,'/'));
-                       $selected = (($ll === $lang) ? ' selected="selected" ' : '');
+                       $selected = (($ll === $lang && (x($_SESSION['language']))) ? ' selected="selected" ' : '');
                        $o .= '<option value="' . $ll . '"' . $selected . '>' . $ll . '</option>';
                }
        }

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 07de641604d6fb9304c44ae2244e4028d5395c3a..53179eaf1033d843a5281c3de20a7cae151b3cd6 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -451,9 +451,12 @@ function dfrn_notify_post(&$a) {
 
                if($is_reply) {
 
-                       // was the top-level post for this reply written by somebody on this site? Specifically, the recipient? 
+                       // was the top-level post for this reply written by somebody on this site? 
+                       // Specifically, the recipient? 
 
-                       $r = q("select `item`.`id` from `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` where `contact`.`self` = 1 AND `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1",
+                       $r = q("select `item`.`id` from `item` 
+                               LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` 
+                               WHERE `contact`.`self` = 1 AND `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1",
                                dbesc($parent_uri),
                                intval($importer['importer_uid'])
                        );

diff --git a/mod/item.php b/mod/item.php
index b8c0683aaca90144b5844d27374584109bf161e0..08c5e68b84f98032476b7d885288aa23952bcb69 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -703,7 +703,7 @@ function item_post(&$a) {
                                else
                                $signed_text = $datarray['guid'] . ';' . $parent_item['guid'] . ';' . $signed_body . ';' . $myaddr;
 
-                               $authorsig = base64_encode(rsa_sign($signed_text,$a->user['prvkey'],'sha'));
+                               $authorsig = base64_encode(rsa_sign($signed_text,$a->user['prvkey'],'sha256'));
 
                                q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
                                        intval($post_id),

diff --git a/view/mail_head.tpl b/view/mail_head.tpl
index 5cc65b9ad85738e38d00f1c1ad704113c9cf3038..2aeb3006e0a2bf684ef13de27882fedbea46c9cf 100644 (file)
--- a/view/mail_head.tpl
+++ b/view/mail_head.tpl
@@ -5,5 +5,6 @@
 <li><a href="message" class="button message-link-inbox">$inbox</a></li>
 <li><a href="message/sent" class="button message-link-outbox">$outbox</a></li>
 <li><a href="message/new" class="button message-link-new">$new</a></li>
-<ul>
+</ul>
 </div>
+<div class="message-links-end"></div>

diff --git a/view/mail_list.tpl b/view/mail_list.tpl
index 77673c7924d2fa3c5fe09565c8bb1eb3a3aeec94..8c95e1250e3183cfc60401742e360900ebb0a6cc 100644 (file)
--- a/view/mail_list.tpl
+++ b/view/mail_list.tpl
@@ -7,7 +7,7 @@
                <div class="mail-list-date">$date</div>
                <div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
        <div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
-               <a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="icon drophide mail-list-               delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
+               <a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="icon drophide mail-list-delete delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
        </div>
 </div>
 </div>

diff --git a/view/prv_message.tpl b/view/prv_message.tpl
index ead360deb567347e4d9c7a10f74ea5738bb7ff68..25bf93b99ca3f1074905e722830e5f0634d53cde 100644 (file)
--- a/view/prv_message.tpl
+++ b/view/prv_message.tpl
@@ -19,7 +19,7 @@ $select
 <div id="prvmail-submit-wrapper" >
        <input type="submit" id="prvmail-submit" name="submit" value="Submit" />
        <div id="prvmail-upload-wrapper" >
-               <div id="prvmail-upload"class="icon border camera" title="$upload" /></div>
+               <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
        </div> 
        <div id="prvmail-link-wrapper" >
                <div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
@@ -29,6 +29,5 @@ $select
        </div> 
 </div>
 <div id="prvmail-end"></div>
-</div>
 </form>
 </div>

diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
index efc95bde1f386e0f64f9f72f50582c2f43c240fb..9191d7ac3e8db23273430188f77951abc8fa7886 100644 (file)
--- a/view/theme/duepuntozero/nav.tpl
+++ b/view/theme/duepuntozero/nav.tpl
@@ -35,7 +35,7 @@
        <span id="intro-update" class="nav-ajax-left"></span>
        {{ endif }}
        {{ if $nav.messages }}
-       <a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0 $sel.messages" title="$nav.messages.3" >$nav.messages.1</a>
+       <a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
        <span id="mail-update" class="nav-ajax-left"></span>
        {{ endif }}
 

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 4769da8afcb00f8d93ddc3f8f0f7e0e885effa48..bdd324c94d110896d36796a2e1da91050842d531 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1805,6 +1805,9 @@ a.mail-list-link {
        margin-right: 30px;
        margin-top: 15px;
 }
+.mail-conv-break {
+       clear: both;
+}
 
 .mail-conv-delete-icon {
        border: none;
@@ -1823,7 +1826,7 @@ a.mail-list-link {
        padding: 3px 5px;
 }
 
-.message-links ul ul {
+.message-links-end {
        clear: both;
 }