Merge remote-tracking branch 'upstream/master' into retriever

Conflicts:
	retriever/view/help.tpl

altpager/view/admin.tpl

@@ -1,3 +0,0 @@
-{{ inc field_radio.tpl with $field=$global }}{{ endinc }}
-{{ inc field_radio.tpl with $field=$individual }}{{ endinc }}
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

altpager/view/admin.tpl.old

@@ -1,3 +0,0 @@
-{{ inc field_radio.tpl with $field=$global }}{{ endinc }}
-{{ inc field_radio.tpl with $field=$individual }}{{ endinc }}
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

blackout/view/admin.tpl

@@ -1,11 +0,0 @@
-{{ inc field_input.tpl with $field=$startdate }}{{ endinc }}
-{{ inc field_input.tpl with $field=$enddate }}{{ endinc }}
-{{ inc field_input.tpl with $field=$rurl }}{{ endinc }}
-
-<div style="border: 2px solid #f00; padding: 10px; margin:
-10px;font-size: 1.2em;"><strong>Note</strong>: The redirect will be active from the moment you
-press the submit button. Users currently logged in will <strong>not</strong> be
-thrown out but can't login again after logging out should the blackout is
-still in place.</div>
-
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

communityhome/view/communityhome.tpl

@@ -1,70 +0,0 @@
-<script>
-	$(function(){
-		$("#tab_1 a").click(function(e){
-			$("#login_standard").show();
-			$("#login_openid").hide();
-			$("#tab_1").addClass("active");
-			$("#tab_2").removeClass("active");
-			e.preventDefault();
-			return false;
-		});
-		$("#tab_2 a").click(function(e){
-			$("#login_openid").show();
-			$("#login_standard").hide();
-			$("#tab_2").addClass("active");
-			$("#tab_1").removeClass("active");
-			e.preventDefault();
-			return false;
-			
-		});
-		
-	});
-</script>
-{{ if $noOid }}
-	<h3>$login_title</h3>
-{{ else }}
-<ul class="tabs">
-	<li id="tab_1" class="tab button active"><a href="#">$tab_1</a></li>
-	<li id="tab_2" class="tab button"><a href="#">$tab_2</a></li>
-</ul>
-{{ endif }}
-$login_form
-
-
-{{ if $lastusers_title }}
-<h3>$lastusers_title</h3>
-<div class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-{{ if $photos_title }}
-<h3>$photos_title</h3>
-<div class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-
-{{ if $like_title }}
-<h3>$like_title</h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}

communityhome/view/directory_item.tpl

@@ -1,10 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile_link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt_text" title="$alt_text" />
-			</a>
-		</div>
-	</div>
-</div>

defaultfeatures/view/admin.tpl

@@ -1,9 +0,0 @@
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-{{ for $features as $f }}
-<h3 class="settings-heading">$f.0</h3>
-
-{{ for $f.1 as $fcat }}
-	{{ inc field_yesno.tpl with $field=$fcat }}{{endinc}}
-{{ endfor }}
-{{ endfor }}
-<div class="submit"><input type="submit" name="defaultfeatures-submit" value="$submit" /></div>

forumdirectory/view/forumdirectory_item.tpl

@@ -1,42 +0,0 @@
-
-<div class="forumdirectory-item" id="forumdirectory-item-$id" >
-	<div class="forumdirectory-photo-wrapper" id="forumdirectory-photo-wrapper-$id" > 
-		<div class="forumdirectory-photo" id="forumdirectory-photo-$id" >
-			<a href="$profile_link" class="forumdirectory-profile-link" id="forumdirectory-profile-link-$id" >
-				<img class="forumdirectory-photo-img photo" src="$photo" alt="$alt_text" title="$alt_text" />
-			</a>
-		</div>
-	</div>
-	<div class="forumdirectory-profile-wrapper" id="forumdirectory-profile-wrapper-$id" >
-		<div class="contact-name" id="forumdirectory-name-$id">$name</div>
-		<div class="page-type">$page_type</div>
-		{{ if $pdesc }}<div class="forumdirectory-profile-title">$profile.pdesc</div>{{ endif }}
-    	<div class="forumdirectory-detailcolumns-wrapper" id="forumdirectory-detailcolumns-wrapper-$id">
-        	<div class="forumdirectory-detailscolumn-wrapper" id="forumdirectory-detailscolumn1-wrapper-$id">	
-			{{ if $location }}
-			    <dl class="location"><dt class="location-label">$location</dt>
-				<dd class="adr">
-					{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-					<span class="city-state-zip">
-						<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-						<span class="region">$profile.region</span>
-						<span class="postal-code">$profile.postal-code</span>
-					</span>
-					{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-				</dd>
-				</dl>
-			{{ endif }}
-
-			{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-			</div>	
-			<div class="forumdirectory-detailscolumn-wrapper" id="forumdirectory-detailscolumn2-wrapper-$id">	
-				{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-				{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-			</div>
-		</div>
-	  	<div class="forumdirectory-copy-wrapper" id="forumdirectory-copy-wrapper-$id" >
-			{{ if $about }}<dl class="forumdirectory-copy"><dt class="forumdirectory-copy-label">$about</dt><dd class="forumdirectory-copy-data">$profile.about</dd></dl>{{ endif }}
-  		</div>
-	</div>
-</div>

gravatar/view/admin.tpl

@@ -1,3 +0,0 @@
-{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }}
-{{ inc field_select.tpl with $field=$rating }}{{ endinc }}
-<div class="submit"><input type="submit" value="$submit" /></div>

impressum/view/admin.tpl

@@ -1,7 +0,0 @@
-{{ inc field_input.tpl with $field=$owner }}{{ endinc }}
-{{ inc field_input.tpl with $field=$ownerprofile }}{{ endinc }}
-{{ inc field_textarea.tpl with $field=$postal }}{{ endinc }}
-{{ inc field_textarea.tpl with $field=$notes }}{{ endinc }}
-{{ inc field_input.tpl with $field=$email }}{{ endinc }}
-{{ inc field_textarea.tpl with $field=$footer_text }}{{ endinc }}
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

libravatar/view/admin.tpl

@@ -1,2 +0,0 @@
-{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }}
-<div class="submit"><input type="submit" value="$submit" /></div>

mailstream/view/admin.tpl

@@ -1,3 +0,0 @@
-{{ inc field_input.tpl with $field=$frommail }}{{ endinc }}
-<div class="submit"><input type="submit" name="page_site" value="$submit"></div>
-

mailstream/view/mail.tpl

@@ -1,5 +0,0 @@
-<div class="mailstream-item-body">$item.body</div>
-{{ if $item.plink }}
-<div>$upstream: <a class="mailstream-item-plink" href="$item.plink">$item.plink</a><div>
-<div>$local: <a class="mailstream-item-url" href="$item.url">$item.url</a></div>
-{{ endif }}

mailstream/view/settings.tpl

@@ -1,6 +0,0 @@
-<div class="settings-block">
-  <h3>$title</h3>
-{{ inc field_input.tpl with $field=$address }}{{ endinc }}
-{{ inc field_checkbox.tpl with $field=$enabled }}{{ endinc }}
-  <input type="submit" value="$submit">
-</div>

mathjax/view/admin.tpl

@@ -1,2 +0,0 @@
-{{ inc field_input.tpl with $field=$baseurl }}{{endinc }}
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

openstreetmap/view/admin.tpl

@@ -1,3 +0,0 @@
-{{ inc field_input.tpl with $field=$tmsserver }}{{ endinc }}
-{{ inc field_input.tpl with $field=$zoom }}{{ endinc }}
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

piwik/view/admin.tpl

@@ -1,5 +0,0 @@
-{{ inc field_input.tpl with $field=$baseurl }}{{ endinc }}
-{{ inc field_input.tpl with $field=$siteid }}{{ endinc }}
-{{ inc field_checkbox.tpl with $field=$optout }}{{ endinc }}
-{{ inc field_checkbox.tpl with $field=$async }}{{ endinc }}
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

remote_permissions/view/admin.tpl

@@ -1,3 +0,0 @@
-{{ inc field_radio.tpl with $field=$global }}{{ endinc }}
-{{ inc field_radio.tpl with $field=$individual }}{{ endinc }}
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

remote_permissions/view/settings.tpl

@@ -1,8 +0,0 @@
-	<div class="settings-block">
-	<h3>$remote_perms_title</h3>
-	<div id="remote-perms-wrapper">
-	<label id="remote-perms-label" for="remote-perms">$remote_perms_label</label>
-	<input id="remote-perms-input" type="checkbox" name="remote-perms" value="1" $checked />
-	</div><div class="clear"></div>
-	<div class="settings-submit-wrapper" ><input type="submit" name="remote-perms-submit" class="settings-submit" value="$submit" /></div></div>
-

retriever/templates/help.tpl

@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h2>Retriever Plugin Help</h2>
 <p>
 This plugin replaces the short excerpts you normally get in RSS feeds

retriever/view/extract.tpl

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:template match="text()"/>
-
-  <xsl:template match="$include">
-    <xsl:copy>
-      <xsl:apply-templates select="node()|@*" mode="remove"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="node()|@*" mode="remove">
-    <xsl:copy>
-      <xsl:apply-templates select="node()|@*" mode="remove"/>
-    </xsl:copy>
-  </xsl:template>
-
-{{ if $exclude }}
-  <xsl:template match="$exclude" mode="remove"/>
-{{ endif }}
-
-  <!-- attempt to replace relative URLs with absolute URLs -->
-  <!-- http://stackoverflow.com/questions/3824631/replace-href-value-in-anchor-tags-of-html-using-xslt -->
-
-  <xsl:template match="*/@src[starts-with(.,'.')]" mode="remove">
-    <xsl:attribute name="src">
-      <xsl:value-of select="concat('$dirurl',.)"/>
-    </xsl:attribute>
-  </xsl:template>
-  <xsl:template match="*/@src[starts-with(.,'/')]" mode="remove">
-    <xsl:attribute name="src">
-      <xsl:value-of select="concat('$rooturl',.)"/>
-    </xsl:attribute>
-  </xsl:template>
-
-</xsl:stylesheet>

retriever/view/rule-config.tpl

@@ -1,111 +0,0 @@
-<div class="settings-block">
-  <script language="javascript">
-function retriever_add_row(id)
-{
-    var tbody = document.getElementById(id);
-    var last = tbody.rows[tbody.childElementCount - 1];
-    var count = +last.id.replace(id + '-', '');
-    count++;
-    var row = document.createElement('tr');
-    row.id = id + '-' + count;
-    var cell1 = document.createElement('td');
-    var inptag = document.createElement('input');
-    inptag.name = row.id + '-element';
-    cell1.appendChild(inptag);
-    row.appendChild(cell1);
-    var cell2 = document.createElement('td');
-    var inpatt = document.createElement('input');
-    inpatt.name = row.id + '-attribute';
-    cell2.appendChild(inpatt);
-    row.appendChild(cell2);
-    var cell3 = document.createElement('td');
-    var inpval = document.createElement('input');
-    inpval.name = row.id + '-value';
-    cell3.appendChild(inpval);
-    row.appendChild(cell3);
-    var cell4 = document.createElement('td');
-    var butrem = document.createElement('input');
-    butrem.id = row.id + '-rem';
-    butrem.type = 'button';
-    butrem.onclick = function(){retriever_remove_row(id, count)};
-    butrem.value = '$remove_t';
-    cell4.appendChild(butrem);
-    row.appendChild(cell4);
-    tbody.appendChild(row);
-}
-
-function retriever_remove_row(id, number)
-{
-    var tbody = document.getElementById(id);
-    var row = document.getElementById(id + '-' + number);
-    tbody.removeChild(row);
-}
-  </script>
-  <h2>$title</h2>
-  <p><a href="$help">Get Help</a></p>
-  <form method="post">
-    <input type="hidden" name="id" value="$id">
-{{ inc field_checkbox.tpl with $field=$enable }}{{ endinc }}
-{{ inc field_input.tpl with $field=$pattern }}{{ endinc }}
-{{ inc field_input.tpl with $field=$replace }}{{ endinc }}
-{{ inc field_checkbox.tpl with $field=$images }}{{ endinc }}
-{{ inc field_input.tpl with $field=$retrospective }}{{ endinc }}
-    <h3>$include_t:</h3>
-    <div>
-      <table>
-        <thead>
-          <tr><th>$tag_t</th><th>$attribute_t</th><th>$value_t</th></tr>
-        </thead>
-        <tbody id="retriever-include">
-{{ if $include }}
-  {{ for $include as $k=>$m }}
-          <tr id="retriever-include-$k">
-            <td><input name="retriever-include-$k-element" value="$m.element"></td>
-            <td><input name="retriever-include-$k-attribute" value="$m.attribute"></td>
-            <td><input name="retriever-include-$k-value" value="$m.value"></td>
-            <td><input id="retrieve-include-$k-rem" type="button" onclick="retriever_remove_row('retriever-include', $k)" value="$remove_t"></td>
-          </tr>
-  {{ endfor }}
-{{ else }}
-          <tr id="retriever-include-0">
-            <td><input name="retriever-include-0-element"></td>
-            <td><input name="retriever-include-0-attribute"></td>
-            <td><input name="retriever-include-0-value"></td>
-            <td><input id="retrieve-include-0-rem" type="button" onclick="retriever_remove_row('retriever-include', 0)" value="$remove_t"></td>
-          </tr>
-{{ endif }}
-        </tbody>
-      </table>
-      <input type="button" onclick="retriever_add_row('retriever-include')" value="$add_t">
-    </div>
-    <h3>$exclude_t:</h3>
-    <div>
-      <table>
-        <thead>
-          <tr><th>Tag</th><th>Attribute</th><th>Value</th></tr>
-        </thead>
-        <tbody id="retriever-exclude">
-{{ if $exclude }}
-  {{ for $exclude as $k=>$r }}
-          <tr id="retriever-exclude-$k">
-            <td><input name="retriever-exclude-$k-element" value="$r.element"></td>
-            <td><input name="retriever-exclude-$k-attribute" value="$r.attribute"></td>
-            <td><input name="retriever-exclude-$k-value" value="$r.value"></td>
-            <td><input id="retrieve-exclude-$k-rem" type="button" onclick="retriever_remove_row('retriever-exclude', $k)" value="$remove_t"></td>
-          </tr>
-  {{ endfor }}
-{{ else }}
-          <tr id="retriever-exclude-0">
-            <td><input name="retriever-exclude-0-element"></td>
-            <td><input name="retriever-exclude-0-attribute"></td>
-            <td><input name="retriever-exclude-0-value"></td>
-            <td><input id="retrieve-exclude-0-rem" type="button" onclick="retriever_remove_row('retriever-exclude', 0)" value="$remove_t"></td>
-          </tr>
-{{ endif }}
-        </tbody>
-      </table>
-      <input type="button" onclick="retriever_add_row('retriever-exclude')" value="$add_t">
-    </div>
-    <input type="submit" size="70" value="$submit">
-  </form>
-</div>

retriever/view/settings.tpl

@@ -1,17 +0,0 @@
-<div class="settings-block">
-  <h3>$title</h3>
-  <p>
-    <a href="$help">Get Help</a>
-  </p>
-  <table>
-    <tbody>
-      <tr>
-        <td>$all_photos_t:</td>
-        <td><input class="checkbox" type="checkbox" name="all_photos" $all_photos></td>
-      </tr>
-      <tr>
-        <td colspan="2"><input type="submit" value="$submit"></td>
-      </tr>
-    </tbody>
-  </table>
-</div>

retriever/view/smarty3/help.tpl

@@ -1,153 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h2>Retriever Plugin Help</h2>
-<p>
-This plugin replaces the short excerpts you normally get in RSS feeds
-with the full content of the article from the source website.  You
-specify which part of the page you're interested in with a set of
-rules.  When each item arrives, the plugin downloads the full page
-from the website, extracts content using the rules, and replaces the
-original article.
-</p>
-<p>
-There's a few reasons you may want to do this.  The source website
-might be slow or overloaded.  The source website might be
-untrustworthy, in which case using Friendica to scrub the HTML is a
-good idea.  You might be on a LAN that blacklists certain websites.
-It also works neatly with the mailstream plugin, allowing you to read
-a news stream comfortably without needing continuous Internet
-connectivity.
-</p>
-<p>
-However, setting up retriever can be quite tricky since it depends on
-the internal design of the website.  This was designed to make life
-easy for the website's developers, not for you.  You'll need to have
-some familiarity with HTML, and be willing to adapt when the website
-suddenly changes everything without notice.
-</p>
-<h3>Configuring Retriever for a feed</h3>
-<p>
-To set up retriever for an RSS feed, go to the "Contacts" page and
-find your feed.  Then click on the drop-down menu on the contact.
-Select "Retriever" to get to the retriever configuration.
-</p>
-<p>
-The "Include" configuration section specifies parts of the page to
-include in the article.  Each row has three components:
-</p>
-<ul>
-<li>An HTML tag (e.g. "div", "span", "p")</li>
-<li>An attribute (usually "class" or "id")</li>
-<li>A value for the attribute</li>
-</ul>
-<p>
-A simple case is when the article is wrapped in a "div" element:
-</p>
-<pre>
-    ...
-    &lt;div class="main-content"&gt;
-      &lt;h2&gt;Man Bites Dog&lt;/h2&gt;
-      &lt;img src="mbd.jpg"&gt;
-      &lt;p&gt;
-        Residents of the sleepy community of Nowheresville were
-        shocked yesterday by the sight of creepy local weirdo Jim
-        McOddman assaulting innocent local dog Snufflekins with his
-        false teeth.
-      &lt;/p&gt;
-      ...
-    &lt;/div&gt;
-    ...
-</pre>
-<p>
-You then specify the tag "div", attribute "class", and value
-"main-content".  Everything else in the page, such as navigation
-panels and menus and footers and so on, will be discarded.  If there
-is more than one section of the page you want to include, specify each
-one on a separate row.  If the matching section contains some sections
-you want to remove, specify those in the "Exclude" section in the same
-way.
-</p>
-<p>
-Once you've got a configuration that you think will work, you can try
-it out on some existing articles.  Type a number into the
-"Retrospectively Apply" box and click "Submit".  After a while
-(exactly how long depends on your system's cron configuration) the new
-articles should be available.
-</p>
-<h3>Techniques</h3>
-<p>
-You can leave the attribute and value blank to include all the
-corresponding elements with the specified tag name.  You can also use
-a tag name of "*", which will match any element type with the
-specified attribute regardless of the tag.
-</p>
-<p>
-Note that the "class" attribute is a special case.  Many web page
-templates will put multiple different classes in the same element,
-separated by spaces.  If you specify an attribute of "class" it will
-match an element if any of its classes matches the specified value.
-For example:
-</p>
-<pre>
-    &lt;div class="article breaking-news"&gt;
-</pre>
-<p>
-In this case you can specify a value of "article", or "breaking-news".
-You can also specify "article breaking-news", but that won't match if
-the website suddenly changes to "breaking-news article", so that's not
-recommended.
-</p>
-<p>
-One useful trick you can try is using the website's "print" pages.
-Many news sites have print versions of all their articles.  These are
-usually drastically simplified compared to the live website page.
-Sometimes this is a good way to get the whole article when it's
-normally split across multiple pages.
-</p>
-<p>
-Hopefully the URL for the print page is a predictable variant of the
-normal article URL.  For example, an article URL like:
-</p>
-<pre>
-    http://www.newssite.com/article-8636.html
-</pre>
-<p>
-...might have a print version at:
-</p>
-<pre>
-    http://www.newssite.com/print/article-8636.html
-</pre>
-<p>
-To change the URL used to retrieve the page, use the "URL Pattern" and
-"URL Replace" fields.  The pattern is a regular expression matching
-part of the URL to replace.  In this case, you might use a pattern of
-"/article" and a replace string of "/print/article".  A common pattern
-is simply "$", used to add the replace string to the end of the URL.
-</p>
-<h3>Background Processing</h3>
-<p>
-Note that retrieving and processing the articles can take some time,
-so it's done in the background.  Incoming articles will be marked as
-invisible while they're in the process of being downloaded.  If a URL
-fails, the plugin will keep trying at progressively longer intervals
-for up to a month, in case the website is temporarily overloaded or
-the network is down.
-</p>
-<h3>Retrieving Images</h3>
-<p>
-Retriever can also optionally download images and store them in the
-local Friendica instance.  Just check the "Download Images" box.  You
-can also download images in every item from your network, whether it's
-an RSS feed or not.  Go to the "Settings" page and
-click <a href="{{$config}}">"Plugin settings"</a>.  Then check the "All
-Photos" box in the "Retriever Settings" section and click "Submit".
-</p>
-<h2>Configure Feeds:</h2>
-<div>
-{{foreach $feeds as $feed}}
-{{include file="contact_template.tpl" contact=$feed}}
-{{/foreach}}
-</div>

statusnet/statusnet.php

@@ -656,7 +656,7 @@ function statusnet_post_hook(&$a,&$b) {
 	                // ok, all the links we want to send out are save, now strip 
         	        // away the remaining bbcode
 			//$msg = strip_tags(bbcode($tmp, false, false));
-			$msg = bbcode($tmp, false, false);
+			$msg = bbcode($tmp, false, false, true);
 			$msg = str_replace(array('<br>','<br />'),"\n",$msg);
 			$msg = strip_tags($msg);
 

statusnet/view/admin.tpl

@@ -1,17 +0,0 @@
-{{ for $sites as $s }}
-	{{ inc field_input.tpl with $field=$s.sitename }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$s.apiurl }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$s.secret }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$s.key }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$s.applicationname }}{{ endinc }}
-	{{ if $s.delete }}
-		{{ inc field_checkbox.tpl with $field=$s.delete }}{{ endinc }}
-		<hr>
-	{{ else }}
-		<p>Fill this form to add a new site</p>
-	{{ endif }}
-	
-{{ endfor }}
-
-
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

superblock/lang/C/messages.po

@@ -0,0 +1,51 @@
+# ADDON blockem
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: blockem.php:51
+msgid "\"Blockem\" Settings"
+msgstr ""
+
+#: blockem.php:53
+msgid "Comma separated profile URLS to block"
+msgstr ""
+
+#: blockem.php:57
+msgid "Submit"
+msgstr ""
+
+#: blockem.php:70
+msgid "BLOCKEM Settings saved."
+msgstr ""
+
+#: blockem.php:105
+#, php-format
+msgid "Blocked %s - Click to open/close"
+msgstr ""
+
+#: blockem.php:160
+msgid "Unblock Author"
+msgstr ""
+
+#: blockem.php:162
+msgid "Block Author"
+msgstr ""
+
+#: blockem.php:194
+msgid "blockem settings updated"
+msgstr ""

superblock/lang/ca/strings.php

@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "Configuració de \"Bloqueig\"";
+$a->strings["Comma separated profile URLS to block"] = "URLS dels perfils a bloquejar, separats per comes";
+$a->strings["Submit"] = "Enviar";
+$a->strings["BLOCKEM Settings saved."] = "Guardada la configuració de BLOQUEIG.";
+$a->strings["Blocked %s - Click to open/close"] = "Bloquejar %s - Clica per obrir/tancar";
+$a->strings["Unblock Author"] = "Desbloquejar Autor";
+$a->strings["Block Author"] = "Bloquejar Autor";
+$a->strings["blockem settings updated"] = "Actualitzar la Configuració de bloqueig";

superblock/lang/cs/strings.php

@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "\"Blockem\" Nastavení";
+$a->strings["Comma separated profile URLS to block"] = "Čárkou oddělené URL adresy profilů určených k ignorování";
+$a->strings["Submit"] = "Odeslat";
+$a->strings["BLOCKEM Settings saved."] = "BLOCKEM nastavení uloženo.";
+$a->strings["Blocked %s - Click to open/close"] = "Blokován %s - Klikněte pro otevření/zavření";
+$a->strings["Unblock Author"] = "Odblokovat autora";
+$a->strings["Block Author"] = "Zablokovat autora";
+$a->strings["blockem settings updated"] = "blockem nastavení aktualizováno";

superblock/lang/de/strings.php

@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "\"Blockem\"-Einstellungen";
+$a->strings["Comma separated profile URLS to block"] = "Profil-URLs, die blockiert werden sollen (durch Kommas getrennt)";
+$a->strings["Submit"] = "Senden";
+$a->strings["BLOCKEM Settings saved."] = "BLOCKEM-Einstellungen gesichert.";
+$a->strings["Blocked %s - Click to open/close"] = "%s blockiert - Zum Öffnen/Schließen klicken";
+$a->strings["Unblock Author"] = "Autor freischalten";
+$a->strings["Block Author"] = "Autor blockieren";
+$a->strings["blockem settings updated"] = "blockem Einstellungen aktualisiert";

superblock/lang/eo/strings.php

@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "\"Blockem\" Agordoj";
+$a->strings["Comma separated profile URLS to block"] = "Blokotaj URL adresoj, disigita per komo";
+$a->strings["Submit"] = "Sendi";
+$a->strings["BLOCKEM Settings saved."] = "Konservis Agordojn de BLOCKEM.";
+$a->strings["Blocked %s - Click to open/close"] = "%s blokita - Klaku por malfermi/fermi";
+$a->strings["Unblock Author"] = "Malbloki Aŭtoron";
+$a->strings["Block Author"] = "Bloki Aŭtoron";
+$a->strings["blockem settings updated"] = "Ĝisdatigis la blockem agordojn";

superblock/lang/es/strings.php

@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "Configuración de \"Blockem\"";
+$a->strings["Comma separated profile URLS to block"] = "Direcciones separadas por coma de los perfiles a bloquear";
+$a->strings["Submit"] = "Envíar";
+$a->strings["BLOCKEM Settings saved."] = "Configuracion Blockem guardada.";
+$a->strings["Blocked %s - Click to open/close"] = "%s bloqueado. Pulsa aquí para mostrar/ocultar";
+$a->strings["Unblock Author"] = "Desbloquear Autor";
+$a->strings["Block Author"] = "Bloquear Autor";
+$a->strings["blockem settings updated"] = "Configuración de Blockem actualizada";

superblock/lang/fr/strings.php

@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "Réglages de Blockem";
+$a->strings["Comma separated profile URLS to block"] = "Liste d'URLS de profils à bloquer, séparés par des virgules";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["BLOCKEM Settings saved."] = "Réglages Blockem sauvés.";
+$a->strings["Blocked %s - Click to open/close"] = "Bloqué %s - Cliquez pour ouvrir/fermer";
+$a->strings["Unblock Author"] = "Débloquer l'auteur";
+$a->strings["Block Author"] = "Bloquer l'auteur";
+$a->strings["blockem settings updated"] = "Réglages blockem sauvés";

superblock/lang/is/strings.php

@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "\"Blockem\" stillingar";
+$a->strings["Comma separated profile URLS to block"] = "Banna lista af forsíðum (komma á milli)";
+$a->strings["Submit"] = "Senda inn";
+$a->strings["BLOCKEM Settings saved."] = "BLOCKEM stillingar vistaðar.";
+$a->strings["Blocked %s - Click to open/close"] = "%s sett í straff - Smella til að taka úr/setja á";
+$a->strings["Unblock Author"] = "Leyfa notanda";
+$a->strings["Block Author"] = "Banna notanda";
+$a->strings["blockem settings updated"] = "";

superblock/lang/it/strings.php

@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "Impostazioni \"Blockem\"";
+$a->strings["Comma separated profile URLS to block"] = "Lista, separata da virgola, di indirizzi da bloccare";
+$a->strings["Submit"] = "Invia";
+$a->strings["BLOCKEM Settings saved."] = "Impostazioni salvate.";
+$a->strings["Blocked %s - Click to open/close"] = "%s bloccato - Clicca per aprire/chiudere";
+$a->strings["Unblock Author"] = "Sblocca autore";
+$a->strings["Block Author"] = "Blocca autore";
+$a->strings["blockem settings updated"] = "Impostazioni 'blockem' aggiornate.";

superblock/lang/nb-no/strings.php

@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "";
+$a->strings["Comma separated profile URLS to block"] = "";
+$a->strings["Submit"] = "Lagre";
+$a->strings["BLOCKEM Settings saved."] = "";
+$a->strings["Blocked %s - Click to open/close"] = "";
+$a->strings["Unblock Author"] = "";
+$a->strings["Block Author"] = "";
+$a->strings["blockem settings updated"] = "";

superblock/lang/pl/strings.php

@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "";
+$a->strings["Comma separated profile URLS to block"] = "";
+$a->strings["Submit"] = "Potwierdź";
+$a->strings["BLOCKEM Settings saved."] = "";
+$a->strings["Blocked %s - Click to open/close"] = "";
+$a->strings["Unblock Author"] = "Odblokuj autora";
+$a->strings["Block Author"] = "Zablokuj autora";
+$a->strings["blockem settings updated"] = "";

superblock/lang/pt-br/strings.php

@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "Configurações \"Blockem\"";
+$a->strings["Comma separated profile URLS to block"] = "URLS de perfis separados por vírgulas a serem bloqueados";
+$a->strings["Submit"] = "Enviar";
+$a->strings["BLOCKEM Settings saved."] = "Configurações BLOCKEM armazenadas.";
+$a->strings["Blocked %s - Click to open/close"] = "Bloqueado %s - Clique para abrir/fechar";
+$a->strings["Unblock Author"] = "Desbloqueie Autor";
+$a->strings["Block Author"] = "Bloqueie Autor";
+$a->strings["blockem settings updated"] = "configurações blockem atualizadas";

superblock/lang/ru/strings.php

@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "\"Blockem\" настройки";
+$a->strings["Comma separated profile URLS to block"] = "URLS, которые заблокировать (список через запятую)";
+$a->strings["Submit"] = "Подтвердить";
+$a->strings["BLOCKEM Settings saved."] = "BLOCKEM-Настройки сохранены.";
+$a->strings["Blocked %s - Click to open/close"] = "Заблокированные %s - Нажмите, чтобы открыть/закрыть";
+$a->strings["Unblock Author"] = "";
+$a->strings["Block Author"] = "Блокировать Автора";
+$a->strings["blockem settings updated"] = "\"Blockem\" настройки обновлены";

superblock/lang/sv/strings.php

@@ -0,0 +1,3 @@
+<?php
+
+$a->strings["Submit"] = "Spara";

superblock/lang/zh-cn/strings.php

@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "「Blockem」配置";
+$a->strings["Comma separated profile URLS to block"] = "逗号分简介URL为栏";
+$a->strings["Submit"] = "提交";
+$a->strings["BLOCKEM Settings saved."] = "「Blockem」配置保存了。";
+$a->strings["Blocked %s - Click to open/close"] = "%s拦了－点击为开关";
+$a->strings["Unblock Author"] = "不拦作家";
+$a->strings["Block Author"] = "拦作家";
+$a->strings["blockem settings updated"] = "blockem设置更新了";

superblock/superblock.css

@@ -0,0 +1,18 @@
+
+#superblock-label {
+	float: left;
+	width: 300px;
+	margin-top: 10px;
+}
+
+#superblock-words {
+	float: left;
+	margin-top: 10px;
+	width: 400px;
+	height: 150px;
+}
+
+#superblock-submit {
+	margin-top: 15px;
+}
+

superblock/superblock.php

@@ -0,0 +1,133 @@
+<?php
+
+
+/**
+ * Name: superblock
+ * Description: block people
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ * 
+ */
+
+function superblock_install() {
+
+	register_hook('plugin_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings');
+	register_hook('plugin_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post');
+	register_hook('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start');
+	register_hook('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu');
+}
+
+
+function superblock_uninstall() {
+
+	unregister_hook('plugin_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings');
+	unregister_hook('plugin_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post');
+	unregister_hook('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start');
+	unregister_hook('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu');
+
+}
+
+
+
+
+
+function superblock_addon_settings(&$a,&$s) {
+
+	if(! local_user())
+		return;
+
+    /* Add our stylesheet to the page so we can make our settings look nice */
+
+    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/superblock/superblock.css' . '" media="all" />' . "\r\n";
+
+
+	$words = get_pconfig(local_user(),'system','blocked');
+	if(! $words)
+		$words = '';
+
+    $s .= '<div class="settings-block">';
+    $s .= '<h3>' . t('"Superblock" Settings') . '</h3>';
+    $s .= '<div id="superblock-wrapper">';
+    $s .= '<label id="superblock-label" for="superblock-words">' . t('Comma separated profile URLS to block') . ' </label>';
+    $s .= '<textarea id="superblock-words" type="text" name="superblock-words" >' . htmlspecialchars($words) . '</textarea>';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="superblock-submit" name="superblock-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+
+	return;
+
+}
+
+function superblock_addon_settings_post(&$a,&$b) {
+
+	if(! local_user())
+		return;
+
+	if($_POST['superblock-submit']) {
+		set_pconfig(local_user(),'system','blocked',trim($_POST['superblock-words']));
+		info( t('SUPERBLOCK Settings saved.') . EOL);
+	}
+}
+
+function superblock_conversation_start(&$a,&$b) {
+
+	if(! local_user())
+		return;
+
+	$words = get_pconfig(local_user(),'system','blocked');
+	if($words) {
+		$a->data['superblock'] = explode(',',$words);
+	}
+	$a->page['htmlhead'] .= <<< EOT
+
+<script>
+function superblockBlock(author) {
+	$.get('superblock?block=' +author, function(data) {
+		location.reload(true);
+	});
+}
+</script>
+
+EOT;
+
+}
+
+function superblock_item_photo_menu(&$a,&$b) {
+
+	if((! local_user()) || ($b['item']['self']))
+		return;
+
+	$blocked = false;
+	$author = $b['item']['author-link'];
+	if(is_array($a->data['superblock'])) {
+		foreach($a->data['superblock'] as $bloke) {
+			if(link_compare($bloke,$author)) {
+				$blocked = true;
+				break;
+			}
+		}
+	}
+
+	$b['menu'][ t('Block Completely')] = 'javascript:superblockBlock(\'' . $author . '\'); return false;';
+}
+
+function superblock_module() {}
+
+
+function superblock_init(&$a) {
+
+	if(! local_user())
+		return;
+
+	$words = get_pconfig(local_user(),'system','blocked');
+
+	if(array_key_exists('block',$_GET) && $_GET['block']) {
+		if(strlen($words))
+			$words .= ',';
+		$words .= trim($_GET['block']);
+	}
+
+	set_pconfig(local_user(),'system','blocked',$words);
+	info( t('superblock settings updated') . EOL );
+	killme();
+}

twitter/twitter.php

@@ -286,7 +286,7 @@ function twitter_shortenmsg($b) {
 	require_once("include/bbcode.php");
 	require_once("include/html2plain.php");
 
-	$max_char = 140;
+	$max_char = 130;
 
 	// Looking for the first image
 	$image = '';
@@ -512,7 +512,7 @@ function twitter_post_hook(&$a,&$b) {
 	                // ok, all the links we want to send out are save, now strip 
 	                // away the remaining bbcode
 			//$msg = strip_tags(bbcode($tmp, false, false));
-			$msg = bbcode($tmp, false, false);
+			$msg = bbcode($tmp, false, false, true);
 			$msg = str_replace(array('<br>','<br />'),"\n",$msg);
 			$msg = strip_tags($msg);
 

twitter/view/admin.tpl

@@ -1,4 +0,0 @@
-{{ inc field_input.tpl with $field=$consumerkey }}{{ endinc }}
-{{ inc field_input.tpl with $field=$consumersecret }}{{ endinc }}
-{{ inc field_input.tpl with $field=$applicationname }}{{ endinc }}
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

uhremotestorage/view/settings.tpl

@@ -1,9 +0,0 @@
-<div class="settings-block">
-	<h3>$title</h3>
-	<p>$desc</p>
-	{{ inc field_input.tpl with $field=$url }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$auth }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$api }}{{ endinc }}
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>	
-
-</div>

widgets/view/settings.tpl

@@ -1,19 +0,0 @@
-<div class="settings-block">
-	<h3 class="settings-heading">$title</h3>
-	<div class='field noedit'>
-		<label>$label</label>
-		<tt>$key</tt>
-	</div>
-	
-	<div class="settings-submit-wrapper">
-		<input type="submit" value="$submit" class="settings-submit" name="widgets-submit" />
-	</div>
-	
-	<h4>$widgets_h</h4>
-	<ul>
-		{{ for $widgets as $w }}
-			<li><a href="$baseurl/widgets/$w.0/?k=$key&p=1">$w.1</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>

widgets/view/widget_like.tpl

@@ -1,3 +0,0 @@
-<style>body {font-size: 0.8em; margin: 0px; padding: 0px;}</style>
-<span class='f9k_like' title="$strlike">$like <img src="$baseurl/images/like.gif" alt="like"/></span> 
-<span class='f9k_dislike' title="$strdislike">$dislike <img src="$baseurl/images/dislike.gif" alt="dislike"/></span>