pull some template strings

diff --git a/include/auth.php b/include/auth.php
index 5d7ac436b1771b5cb4ee50f6b4638e09a5f06a4b..0a21a276ad6b83610a4c559a394c14d9a3feef92 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -69,7 +69,16 @@ else {
 
        if(x($_POST,'password'))
                $encrypted = hash('whirlpool',trim($_POST['password']));
-
+       else {
+               if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
+                       require_once('library/openid.php');
+                       $openid = new LightOpenID;
+                       $openid->identity = trim($_POST['login-name']);
+                       $a = get_app();
+                       $openid->returnUrl = $a->get_baseurl() . '/openid'; 
+                       goaway($openid->authUrl());     
+               }
+       }
        if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
 
                // process login request

diff --git a/mod/contacts.php b/mod/contacts.php
index c33c69fa86d0b024777a707a8cc887a73c389cf6..9c84c48104ce018fc16c682e362e105b7d2d23f0 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -198,7 +198,14 @@ function contacts_content(&$a) {
                }
 
                $o .= replace_macros($tpl,array(
+                       '$header' => t('Contact Editor'),
+                       '$visit' => t('Visit $name's profile'),
+                       '$blockunblock' => t('Block/Unblock contact'),
+                       '$ignorecont' => t('Ignore contact'),
+                       '$delete' => t('Delete contact'),
                        '$poll_interval' => contact_poll_interval($r[0]['priority']),
+                       '$lastupdtext' => t('Last updated: '),
+                       '$updpub' => t('Update public posts: '),
                        '$last_update' => (($r[0]['last-update'] == '0000-00-00 00:00:00') 
                                ? t('Never') 
                                : datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')),
@@ -235,6 +242,7 @@ function contacts_content(&$a) {
 
        $tpl = load_view_file("view/contacts-top.tpl");
        $o .= replace_macros($tpl,array(
+               '$header' => t('Contacts'),
                '$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ),
                '$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')),
                '$search' => $search,

diff --git a/view/contacts-top.tpl b/view/contacts-top.tpl
new file mode 100644 (file)
index 0000000..3249800
--- /dev/null
+++ b/view/contacts-top.tpl
@@ -0,0 +1,17 @@
+<h1>$header</h1>
+
+$finding
+
+<div id="contacts-search-wrapper">
+<form id="contacts-search-form" action="$cmd" method="get" >
+<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
+<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
+</form>
+</div>
+<div id="contacts-search-end"></div>
+
+
+
+<div id="contacts-main" >
+<a href="$hide_url" id="contacts-show-hide-link">$hide_text</a>
+</div>

diff --git a/view/en/contact_edit.tpl b/view/en/contact_edit.tpl
index 96abf0028164c682ef0787c19c787b2d3b155311..a5c8dc4abbc6b769923f73049bbcfa8cbe5b9c9e 100644 (file)
--- a/view/en/contact_edit.tpl
+++ b/view/en/contact_edit.tpl
@@ -1,5 +1,5 @@
 
-<h2>Contact Editor</h2>
+<h2>$header</h2>
 
 <div id="contact-edit-banner-name">$name</div>
 
@@ -9,23 +9,23 @@
        <div id="contact-edit-photo-wrapper" >
                <img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
                <div id="contact-edit-photo" >
-                       <a href="$url" title="Visit $name's profile" /><img src="$photo" $sparkle alt="$name" /></a>
+                       <a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
                </div>
                <div id="contact-edit-photo-end" ></div>
        </div>
        <div id="contact-edit-nav-wrapper" >
 
                <div id="contact-edit-links" >
-                       <a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="Block/Unblock contact" title="$block_text"/></a>
-                       <a href="contacts/$contact_id/ignore" id="contact-edit-ignore-link" ><img src="images/no.gif" alt="Ignore contact" title="$ignore_text"/></a>
+                       <a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="$blockunblock" title="$block_text"/></a>
+                       <a href="contacts/$contact_id/ignore" id="contact-edit-ignore-link" ><img src="images/no.gif" alt="$ignorecont" title="$ignore_text"/></a>
                </div>
                <div id="contact-drop-links" >
-                       <a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="Delete contact" title="Delete contact" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
+                       <a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
                </div>
                <div id="contact-edit-nav-end"></div>
                <div id="contact-edit-poll-wrapper">
-                       <div id="contact-edit-last-update-text">Last updated: <span id="contact-edit-last-updated">$last_update</span</div>
-                       <div id="contact-edit-poll-text">Update public posts: </div>
+                       <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
+                       <div id="contact-edit-poll-text">$updpub</div>
                        $poll_interval
                </div>
        </div>

diff --git a/view/en/contact_self.tpl b/view/en/contact_self.tpl
deleted file mode 100644 (file)
index 7f5467b..0000000
--- a/view/en/contact_self.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<img src="$thumb" alt="$name" >
-
-<p>$name</p>
-<p>
-This is you.
-</p>
-
-<hr />
\ No newline at end of file

diff --git a/view/en/contacts-top.tpl b/view/en/contacts-top.tpl
deleted file mode 100644 (file)
index 2e56fa2..0000000
--- a/view/en/contacts-top.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<h1>Contacts</h1>
-
-$finding
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="$cmd" method="get" >
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-
-
-<div id="contacts-main" >
-<a href="$hide_url" id="contacts-show-hide-link">$hide_text</a>
-</div>