Merge pull request #750 from zered/deleted_user_disp

Deleted user display in admin page

diff --git a/include/tags.php b/include/tags.php
index a06504fbe3631929f2b896c3302e6ccf78859620..e5bc29cd4f5db6bb13662e4c1a6f35db8dde2935 100644 (file)
--- a/include/tags.php
+++ b/include/tags.php
@@ -83,7 +83,7 @@ function create_tags_from_item($itemid) {
                        if(ctype_digit(substr(trim($tag),1)))
                                continue;
                        // try to ignore html hex escapes, e.g. #x2317
-                       if((substr(trim($tag),1,1) == 'x' || substr(trim($tag),1,1) == 'X') && ctype_digit(substr(trim($tag,2))))
+                       if((substr(trim($tag),1,1) == 'x' || substr(trim($tag),1,1) == 'X') && ctype_digit(substr(trim($tag),2)))
                                continue;
                        $type = TERM_HASHTAG;
                        $term = substr($tag, 1);

diff --git a/mod/tagger.php b/mod/tagger.php
index 6ae0cebf718ef40774c70e2865aff3e77ce72328..e502353420ad59dc3acfc39216185bf12e6f57ca 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -151,13 +151,27 @@ EOT;
                );
        }                       
 
-       if((! $blocktags) && (! stristr($item['tag'], ']' . $term . '[' ))) {
-               q("update item set tag = '%s' where id = %d limit 1",
+       $term_objtype = (($item['resource-id']) ? TERM_OBJ_PHOTO : TERM_OBJ_POST );
+        $t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
+                intval($item['id']),
+                dbesc($term)
+        );
+       if((! $blocktags) && $t[0]['tcount']==0 ) {
+               /*q("update item set tag = '%s' where id = %d limit 1",
                        dbesc($item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
                        intval($item['id'])
+               );*/
+
+               q("INSERT INTO term (oid, otype, type, term, url, uid) VALUE (%d, %d, %d, '%s', '%s', %d)",
+                  intval($item['id']),
+                  $term_objtype,
+                  TERM_HASHTAG,
+                  dbesc($term),
+                  dbesc($a->get_baseurl() . '/search?tag=' . $term),
+                  intval($owner_uid)
                );
        }
-
+       
        // if the original post is on this site, update it.
 
        $r = q("select `tag`,`id`,`uid` from item where `origin` = 1 AND `uri` = '%s' LIMIT 1",
@@ -167,12 +181,27 @@ EOT;
                $x = q("SELECT `blocktags` FROM `user` WHERE `uid` = %d limit 1",
                        intval($r[0]['uid'])
                );
-               if(count($x) && !$x[0]['blocktags'] && (! stristr($r[0]['tag'], ']' . $term . '['))) {
+               $t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
+                       intval($r[0]['id']),
+                       dbesc($term)
+               );
+               if(count($x) && !$x[0]['blocktags'] && $t[0]['tcount']==0){
+                       q("INSERT INTO term (oid, otype, type, term, url, uid) VALUE (%d, %d, %d, '%s', '%s', %d)",
+                          intval($r[0]['id']),
+                          $term_objtype,
+                          TERM_HASHTAG,
+                          dbesc($term),
+                          dbesc($a->get_baseurl() . '/search?tag=' . $term),
+                          intval($owner_uid)
+                       );
+               }
+
+               /*if(count($x) && !$x[0]['blocktags'] && (! stristr($r[0]['tag'], ']' . $term . '['))) {
                        q("update item set tag = '%s' where id = %d limit 1",
                                dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
                                intval($r[0]['id'])
                        );
-               }
+               }*/
 
        }
                
@@ -188,4 +217,4 @@ EOT;
        return; // NOTREACHED
 
 
-}
\ No newline at end of file
+}

diff --git a/view/nl/messages.po b/view/nl/messages.po
index 845570b76708bb8fbc354d781552d9429a72956c..5fe471a3a542a7ef3e365371ac2015199b1168ac 100644 (file)
--- a/view/nl/messages.po
+++ b/view/nl/messages.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
 "POT-Creation-Date: 2013-06-26 00:01-0700\n"
-"PO-Revision-Date: 2013-07-30 21:37+0000\n"
-"Last-Translator: jeroenpraat <>\n"
+"PO-Revision-Date: 2013-08-03 15:34+0000\n"
+"Last-Translator: gertc <gcauwenberg@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/friendica/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -784,7 +784,7 @@ msgstr "Alle netwerken"
 
 #: ../../include/contact_widgets.php:103 ../../include/features.php:59
 msgid "Saved Folders"
-msgstr ""
+msgstr "Bewaarde Mappen"
 
 #: ../../include/contact_widgets.php:106 ../../include/contact_widgets.php:138
 msgid "Everything"
@@ -1164,7 +1164,7 @@ msgstr ""
 
 #: ../../include/features.php:59
 msgid "Ability to file posts under folders"
-msgstr ""
+msgstr "Mogelijkheid om berichten in mappen te bewaren"
 
 #: ../../include/features.php:60
 msgid "Dislike Posts"
@@ -1201,7 +1201,7 @@ msgstr "vorige"
 
 #: ../../include/text.php:302
 msgid "first"
-msgstr "eertse"
+msgstr "eerste"
 
 #: ../../include/text.php:334
 msgid "last"
@@ -1829,7 +1829,7 @@ msgstr ""
 #: ../../include/enotify.php:47
 #, php-format
 msgid "%1$s sent you %2$s."
-msgstr ""
+msgstr "%1$s stuurde jou %2$s."
 
 #: ../../include/enotify.php:47
 msgid "a private message"
@@ -1838,7 +1838,7 @@ msgstr "een prive bericht"
 #: ../../include/enotify.php:48
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
-msgstr ""
+msgstr "Bezoek %s om je privé-berichten te bekijken en/of te beantwoorden."
 
 #: ../../include/enotify.php:90
 #, php-format
@@ -1870,7 +1870,7 @@ msgstr "%s gaf een reactie op een bericht/conversatie die jij volgt."
 #: ../../include/enotify.php:178
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
-msgstr ""
+msgstr "Bezoek %s om de conversatie te bekijken en/of te beantwoorden."
 
 #: ../../include/enotify.php:126
 #, php-format
@@ -3230,7 +3230,7 @@ msgstr ""
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
-msgstr ""
+msgstr "Maximum systeembelasting voordat aflever- en poll-processen uitgesteld worden - standaard 50."
 
 #: ../../mod/admin.php:545
 msgid "Use MySQL full text engine"
@@ -3311,7 +3311,7 @@ msgstr ""
 
 #: ../../mod/admin.php:609
 msgid "Attempt to execute this update step automatically"
-msgstr ""
+msgstr "Probeer deze stap automatisch uit te voeren"
 
 #: ../../mod/admin.php:634
 #, php-format

diff --git a/view/nl/strings.php b/view/nl/strings.php
index 5dd6089e9ff6ed77ff15e425052a90e11e2f1c69..0ea02a3951f6f56db1bd25a56bee230304aa2340 100644 (file)
--- a/view/nl/strings.php
+++ b/view/nl/strings.php
@@ -186,7 +186,7 @@ $a->strings["Random Profile"] = "Willekeurig Profiel";
 $a->strings["Invite Friends"] = "Vrienden uitnodigen";
 $a->strings["Networks"] = "Netwerken";
 $a->strings["All Networks"] = "Alle netwerken";
-$a->strings["Saved Folders"] = "";
+$a->strings["Saved Folders"] = "Bewaarde Mappen";
 $a->strings["Everything"] = "Alles";
 $a->strings["Categories"] = "Categorieën";
 $a->strings["%d contact in common"] = array(
@@ -269,7 +269,7 @@ $a->strings["Tagging"] = "";
 $a->strings["Ability to tag existing posts"] = "";
 $a->strings["Post Categories"] = "";
 $a->strings["Add categories to your posts"] = "";
-$a->strings["Ability to file posts under folders"] = "";
+$a->strings["Ability to file posts under folders"] = "Mogelijkheid om berichten in mappen te bewaren";
 $a->strings["Dislike Posts"] = "";
 $a->strings["Ability to dislike posts/comments"] = "";
 $a->strings["Star Posts"] = "";
@@ -278,7 +278,7 @@ $a->strings["Cannot locate DNS info for database server '%s'"] = "";
 $a->strings["newer"] = "nieuwere berichten";
 $a->strings["older"] = "oudere berichten";
 $a->strings["prev"] = "vorige";
-$a->strings["first"] = "eertse";
+$a->strings["first"] = "eerste";
 $a->strings["last"] = "laatste";
 $a->strings["next"] = "volgende";
 $a->strings["No contacts"] = "Geen contacten";
@@ -428,15 +428,15 @@ $a->strings["%s Administrator"] = "%s Beheerder";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Friendica:Notify] New mail received at %s"] = "";
 $a->strings["%1\$s sent you a new private message at %2\$s."] = "";
-$a->strings["%1\$s sent you %2\$s."] = "";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s stuurde jou %2\$s.";
 $a->strings["a private message"] = "een prive bericht";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bezoek %s om je privé-berichten te bekijken en/of te beantwoorden.";
 $a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s gaf een reactie op [url=%2\$s]a %3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s gaf een reactie op [url=%2\$s]%3\$s's %4\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s gaf een reactie op [url=%2\$s]jouw %3\$s[/url]";
 $a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "";
 $a->strings["%s commented on an item/conversation you have been following."] = "%s gaf een reactie op een bericht/conversatie die jij volgt.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bezoek %s om de conversatie te bekijken en/of te beantwoorden.";
 $a->strings["[Friendica:Notify] %s posted to your profile wall"] = "";
 $a->strings["%1\$s posted to your profile wall at %2\$s"] = "";
 $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "";
@@ -745,7 +745,7 @@ $a->strings["Delay background delivery processes by this many seconds to reduce
 $a->strings["Poll interval"] = "Poll-interval";
 $a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "";
 $a->strings["Maximum Load Average"] = "";
-$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximum systeembelasting voordat aflever- en poll-processen uitgesteld worden - standaard 50.";
 $a->strings["Use MySQL full text engine"] = "Gebruik de tekst-zoekfunctie van MySQL";
 $a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "Activeert de zoekmotor. Dit maakt zoeken sneller, maar het kan alleen zoeken naar teksten van minstens vier letters.";
 $a->strings["Path to item cache"] = "";
@@ -763,7 +763,7 @@ $a->strings["No failed updates."] = "Geen misluke wijzigingen";
 $a->strings["Failed Updates"] = "Misluke wijzigingen";
 $a->strings["This does not include updates prior to 1139, which did not return a status."] = "Dit is zonder de wijzigingen voor 1139, welke geen status teruggaven.";
 $a->strings["Mark success (if update was manually applied)"] = "";
-$a->strings["Attempt to execute this update step automatically"] = "";
+$a->strings["Attempt to execute this update step automatically"] = "Probeer deze stap automatisch uit te voeren";
 $a->strings["%s user blocked/unblocked"] = array(
        0 => "%s gebruiker geblokkeerd/niet geblokkeerd",
        1 => "%s gebruikers geblokkeerd/niet geblokkeerd",