set update frequency to twice daily for 'feed' contacts, unable to set update frequen...

diff --git a/mod/contacts.php b/mod/contacts.php
index 83f73140bdf603203a8e5aaafb315c840a3a1fb1..177ca99734033bee7c1d280e4ffd6cc73471661b 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -53,9 +53,9 @@ function contacts_post(&$a) {
                        return;
                }
        }
+logger('contact_edit ' . print_r($_POST,true));
 
-
-       $priority = intval($_POST['priority']);
+       $priority = intval($_POST['poll']);
        if($priority == (-1))
                
        if($priority > 5 || $priority < 0)
@@ -252,7 +252,7 @@ function contacts_content(&$a) {
                        '$contact_id' => $r[0]['id'],
                        '$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ),
                        '$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ),
-                       '$insecure' => (($r[0]['network'] === 'dfrn') ? '' : load_view_file('view/insecure_net.tpl')),
+                       '$insecure' => (($r[0]['network'] === 'stat') ? load_view_file('view/insecure_net.tpl') : ''),
                        '$info' => $r[0]['info'],
                        '$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''),
                        '$ignored' => (($r[0]['readonly']) ? '<div id="ignore-message">' . t('Currently ignored') . '</div>' : ''),

diff --git a/mod/follow.php b/mod/follow.php
index 946794c87778634d3a5480896c6e39930ffbbe2d..b4e50fa451c9f9df4e2785ef9a525e0d23ccf20d 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -48,7 +48,8 @@ function follow_post(&$a) {
                }
        }
 
-       $network = 'stat';
+       $network  = 'stat';
+       $priority = 0;
 
        if($hcard) {
                $vcard = scrape_vcard($hcard);
@@ -110,6 +111,7 @@ function follow_post(&$a) {
                        if((! $vcard['photo']) && strlen($email))
                                $vcard['photo'] = gravatar_img($email);
                        $network = 'feed';
+                       $priority = 2;
                }
        }
 
@@ -150,7 +152,7 @@ function follow_post(&$a) {
        }
        else {
                // create contact record 
-               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, 
+               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`,
                        `blocked`, `readonly`, `pending` )
                        VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 0 ) ",
                        intval(local_user()),
@@ -162,7 +164,8 @@ function follow_post(&$a) {
                        dbesc($vcard['nick']),
                        dbesc($vcard['photo']),
                        dbesc($network),
-                       intval(REL_FAN)
+                       intval(REL_FAN),
+                       intval($priority)
                );
        }
 

diff --git a/view/de/contact_edit.tpl b/view/de/contact_edit.tpl
index 8455db30cf23dd7e3ab28866ee9581928b3a77bc..fcd3f2d66f746414e6ca9d6655e525e2e0667ed2 100644 (file)
--- a/view/de/contact_edit.tpl
+++ b/view/de/contact_edit.tpl
@@ -23,6 +23,10 @@
                        <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>
+
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+
                <div id="contact-edit-poll-wrapper">
                        <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>
@@ -35,8 +39,6 @@ $insecure
 $blocked
 $ignored
 
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
 
 <div id="contact-edit-info-wrapper">
 <h4>Kontaktinformation / Notizen</h4>

diff --git a/view/en/contact_edit.tpl b/view/en/contact_edit.tpl
index 79a7651c1c754aa9d8695472526da0889a0115e9..ea546b784258cc51842e2c046b64840df532e208 100644 (file)
--- a/view/en/contact_edit.tpl
+++ b/view/en/contact_edit.tpl
@@ -23,6 +23,10 @@
                        <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>
+
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+
                <div id="contact-edit-poll-wrapper">
                        <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>
@@ -35,9 +39,6 @@ $insecure
 $blocked
 $ignored
 
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
 <div id="contact-edit-info-wrapper">
 <h4>Contact Information / Notes</h4>
 <textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>

diff --git a/view/fr/contact_edit.tpl b/view/fr/contact_edit.tpl
index 79a7651c1c754aa9d8695472526da0889a0115e9..c7d2d59752abc7b34de7af940f8b7747ffc3ec63 100644 (file)
--- a/view/fr/contact_edit.tpl
+++ b/view/fr/contact_edit.tpl
@@ -23,6 +23,11 @@
                        <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>
+
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+
+
                <div id="contact-edit-poll-wrapper">
                        <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>
@@ -35,8 +40,6 @@ $insecure
 $blocked
 $ignored
 
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
 
 <div id="contact-edit-info-wrapper">
 <h4>Contact Information / Notes</h4>

diff --git a/view/it/contact_edit.tpl b/view/it/contact_edit.tpl
index 4432f496aebb9ca93a69f28d2a1f8035c9102be8..d4217ba8c874098ac500d92803f4fb59d31af64d 100644 (file)
--- a/view/it/contact_edit.tpl
+++ b/view/it/contact_edit.tpl
@@ -23,6 +23,10 @@
                        <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>
+
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+
                <div id="contact-edit-poll-wrapper">
                        <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>
@@ -35,8 +39,6 @@ $insecure
 $blocked
 $ignored
 
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
 
 <div id="contact-edit-info-wrapper">
 <h4>Informazioni di contatto / Note</h4>