Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean

4 years ago · 4b33573c20
--- a/boot.php
+++ b/boot.php
@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.1-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1207      );
 define ( 'DB_UPDATE_VERSION',      1208      );

 /**
 * @brief Constant with a HTML line break.
@ -785,60 +785,100 @@ class App {
 		return($this->scheme);
 	}

 	/**
 	 * @brief Retrieves the Friendica instance base URL
 	 *
 	 * This function assembles the base URL from multiple parts:
 	 * - Protocol is determined either by the request or a combination of
 	 * system.ssl_policy and the $ssl parameter.
 	 * - Host name is determined either by system.hostname or inferred from request
 	 * - Path is inferred from SCRIPT_NAME
 	 *
 	 * Caches the result (depending on $ssl value) for performance.
 	 *
 	 * Note: $ssl parameter value doesn't directly correlate with the resulting protocol
 	 *
 	 * @param bool $ssl Whether to append http or https under SSL_POLICY_SELFSIGN
 	 * @return string Friendica server base URL
 	 */
 	function get_baseurl($ssl = false) {

 		// Is the function called statically?
 		if (!is_object($this))
 			return(self::$a->get_baseurl($ssl));
 		if (!is_object($this)) {
 			return self::$a->get_baseurl($ssl);
 		}

 		// Arbitrary values, the resulting url protocol can be different
 		$cache_index = $ssl ? 'https' : 'http';

 		// Cached value found, nothing to process
 		if (isset($this->baseurl[$cache_index])) {
 			return $this->baseurl[$cache_index];
 		}

 		$scheme = $this->scheme;

 		if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
 			if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
 		if ((x($this->config, 'system')) && (x($this->config['system'], 'ssl_policy'))) {
 			if (intval($this->config['system']['ssl_policy']) === SSL_POLICY_FULL) {
 				$scheme = 'https';
 			}

 			//	Basically, we have $ssl = true on any links which can only be seen by a logged in user
 			//	(and also the login link). Anything seen by an outsider will have it turned off.

 			if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
 				if($ssl)
 			if ($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
 				if ($ssl) {
 					$scheme = 'https';
 				else
 				} else {
 					$scheme = 'http';
 				}
 			}
 		}

 		if (get_config('config','hostname') != "")
 			$this->hostname = get_config('config','hostname');
 		if (get_config('config', 'hostname') != '') {
 			$this->hostname = get_config('config', 'hostname');
 		}

 		$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
 		return $this->baseurl;
 		$this->baseurl[$cache_index] = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );

 		return $this->baseurl[$cache_index];
 	}

 	/**
 	 * @brief Initializes the baseurl components
 	 *
 	 * Clears the baseurl cache to prevent inconstistencies
 	 *
 	 * @param string $url
 	 */
 	function set_baseurl($url) {
 		$parsed = @parse_url($url);

 		$this->baseurl = $url;
 		$this->baseurl = [];

 		if($parsed) {
 			$this->scheme = $parsed['scheme'];

 			$hostname = $parsed['host'];
 			if(x($parsed,'port'))
 			if (x($parsed, 'port')) {
 				$hostname .= ':' . $parsed['port'];
 			if(x($parsed,'path'))
 				$this->path = trim($parsed['path'],'\\/');
 			}
 			if (x($parsed, 'path')) {
 				$this->path = trim($parsed['path'], '\\/');
 			}

 			if (file_exists(".htpreconfig.php"))
 			if (file_exists(".htpreconfig.php")) {
 				@include(".htpreconfig.php");
 			}

 			if (get_config('config','hostname') != "")
 				$this->hostname = get_config('config','hostname');
 			if (get_config('config', 'hostname') != '') {
 				$this->hostname = get_config('config', 'hostname');
 			}

 			if (!isset($this->hostname) OR ($this->hostname == ""))
 			if (!isset($this->hostname) OR ($this->hostname == '')) {
 				$this->hostname = $hostname;
 			}
 		}

 	}

 	function get_hostname() {
--- a/database.sql
+++ b/database.sql
@ -655,6 +655,8 @@ CREATE TABLE IF NOT EXISTS `notify` (
 	`seen` tinyint(1) NOT NULL DEFAULT 0,
 	`verb` varchar(255) NOT NULL DEFAULT '',
 	`otype` varchar(16) NOT NULL DEFAULT '',
 	`name_cache` tinytext,
 	`msg_name` mediumtext,
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`)
 ) DEFAULT CHARSET=utf8mb4;
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@ -1,208 +1,610 @@
 Friendica BBCode tags reference
 ========================

 * [Home](help)

 Inline
 -----


 <pre>[b]bold[/b]</pre> : <strong>bold</strong>

 <pre>[i]italic[/i]</pre> : <em>italic</em>

 <pre>[u]underlined[/u]</pre> : <u>underlined</u>

 <pre>[s]strike[/s]</pre> : <strike>strike</strike>

 <pre>[color=red]red[/color]</pre> : <span style="color:  red;">red</span>

 <pre>[url=http://www.friendica.com]Friendica[/url]</pre> : <a href="http://www.friendica.com" target="external-link">Friendica</a>

 <pre>[img]http://friendica.com/sites/default/files/friendika-32.png[/img]</pre> : <img src="http://friendica.com/sites/default/files/friendika-32.png" alt="Immagine/foto">

 <pre>[size=xx-small]small text[/size]</pre> : <span style="font-size: xx-small;">small text</span>

 <pre>[size=xx-large]big text[/size]</pre> : <span style="font-size: xx-large;">big text</span>

 <pre>[size=20]exact size[/size] (size can be any number, in pixel)</pre> :  <span style="font-size: 20px;">exact size</span>







 Block
 -----

 <pre>[code]code[/code]</pre>

 <code>code</code>

 <p style="clear:both;">&nbsp;</p>

 <pre>[code=php]function text_highlight($s,$lang)[/code]</pre>

 <code><div class="hl-main"><ol class="hl-main"><li><span class="hl-code">&nbsp;</span><span class="hl-reserved">function</span><span class="hl-code"> </span><span class="hl-identifier">text_highlight</span><span class="hl-brackets">(</span><span class="hl-var">$s</span><span class="hl-code">,</span><span class="hl-var">$lang</span><span class="hl-brackets">)</span></li></ol></div></code>

 <p style="clear:both;">&nbsp;</p>

 <pre>[quote]quote[/quote]</pre>

 <blockquote>quote</blockquote>

 <p style="clear:both;">&nbsp;</p>

 <pre>[quote=Author]Author? Me? No, no, no...[/quote]</pre>

 <strong class="author">Author wrote:</strong><blockquote>Author? Me? No, no, no...</blockquote>

 <p style="clear:both;">&nbsp;</p>

 <pre>[center]centered text[/center]</pre>

 <div style="text-align:center;">centered text</div>

 <p style="clear:both;">&nbsp;</p>

 <pre>You should not read any further if you want to be surprised.[spoiler]There is a happy end.[/spoiler]</pre>

 You should not read any further if you want to be surprised.<br />*click to open/close*

 (The text between thhe opening and the closing of the spoiler tag will be visible once the link is clicked. So *"There is a happy end."* wont be visible until the spoiler is uncovered.)

 <p style="clear:both;">&nbsp;</p>

 **Table**
 <pre>[table border=1]
 [tr] 
   [th]Tables now[/th]
 [/tr]
 [tr]
   [td]Have headers[/td]
 [/tr]
 [/table]</pre>

 <table border="1"><tbody><tr><th>Tables now</th></tr><tr><td>Have headers</td></tr></tbody></table>

 <p style="clear:both;">&nbsp;</p>

 **List**

 <pre>[list]
 [*] First list element
 [*] Second list element
 [/list]</pre>
 <ul class="listbullet" style="list-style-type: circle;">
 <li> First list element<br>
 </li>
 <li> Second list element</li>
 </ul>

 [list] is equivalent to [ul] (unordered list). 

 [ol] can be used instead of [list] to show an ordered list:

 <pre>[ol]
 [*] First list element
 [*] Second list element
 [/ol]</pre>
 <ul class="listdecimal" style="list-style-type: decimal;"><li> First list element<br></li><li> Second list element</li></ul>

 For more options on ordered lists, you can define the style of numeration on [list] argument:
 <pre>[list=1]</pre> : decimal

 <pre>[list=i]</pre> : lover case roman

 <pre>[list=I]</pre> : upper case roman

 <pre>[list=a]</pre> : lover case alphabetic

 <pre>[list=A] </pre> : upper case alphabetic




 Embed
 ------
 * [Creating posts](help/Text_editor)

 ## Inline

 <style>
 table.bbcodes {
    margin: 1em 0;
    background-color: #f9f9f9;
    border: 1px solid #aaa;
    border-collapse: collapse;
    color: #000;
    width: 100%;
 }

 table.bbcodes > tr > th,
 table.bbcodes > tr > td,
 table.bbcodes > * > tr > th,
 table.bbcodes > * > tr > td {
    border: 1px solid #aaa;
    padding: 0.2em 0.4em
 }

 table.bbcodes > tr > th,
 table.bbcodes > * > tr > th {
    background-color: #f2f2f2;
    text-align: center
 }
 </style>

 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[b]bold[/b]</td>
  <td><strong>bold</strong></td>
 </tr>
 <tr>
  <td>[i]italic[/i]</td>
  <td><em>italic</em></td>
 </tr>
 <tr>
  <td>[u]underlined[/u]</td>
  <td><u>underlined</u></td>
 </tr>
 <tr>
  <td>[s]strike[/s]</td>
  <td><strike>strike</strike></td>
 </tr>
 <tr>
  <td>[o]overline[/o]</td>
  <td><span class="overline">overline</span></td>
 </tr>
 <tr>
  <td>[color=red]red[/color]</td>
  <td><span style="color:  red;">red</span></td>
 </tr>
 <tr>
  <td>[url=http://www.friendica.com]Friendica[/url]</td>
  <td><a href="http://www.friendica.com" target="external-link">Friendica</a></td>
 </tr>
 <tr>
  <td>[img]http://friendica.com/sites/default/files/friendika-32.png[/img]</td>
  <td><img src="http://friendica.com/sites/default/files/friendika-32.png" alt="Immagine/foto"></td>
 </tr>
 <tr>
  <td>[img=64x32]http://friendica.com/sites/default/files/friendika-32.png[/img]<br>
 <br>Note: provided height is simply discarded.</td>
  <td><img src="http://friendica.com/sites/default/files/friendika-32.png" style="width: 64px;"></td>
 </tr>
 <tr>
  <td>[size=xx-small]small text[/size]</td>
  <td><span style="font-size: xx-small;">small text</span></td>
 </tr>
 <tr>
  <td>[size=xx-large]big text[/size]</td>
  <td><span style="font-size: xx-large;">big text</span></td>
 </tr>
 <tr>
  <td>[size=20]exact size[/size] (size can be any number, in pixel)</td>
  <td><span style="font-size: 20px;">exact size</span></td>
 </tr>
 <tr>
  <td>[font=serif]Serif font[/font]</td>
  <td><span style="font-family: serif;">Serif font</span></td>
 </tr>
 </table>

 ### Links

 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[url]http://friendica.com[/url]</td>
  <td><a href="http://friendica.com">http://friendica.com</a></td>
 </tr>
 <tr>
  <td>[url=http://friendica.com]Friendica[/url]</td>
  <td><a href="http://friendica.com">Friendica</a></td>
 </tr>
 <tr>
  <td>[bookmark]http://friendica.com[/bookmark]<br><br>
 #^[url]http://friendica.com[/url]</td>
  <td><span class="oembed link"><h4>Friendica: <a href="http://friendica.com" rel="oembed"></a><a href="http://friendica.com" target="_blank">http://friendica.com</a></h4></span></td>
 </tr>
 <tr>
  <td>[bookmark=http://friendica.com]Bookmark[/bookmark]<br><br>
 #^[url=http://friendica.com]Bookmark[/url]<br><br>
 #[url=http://friendica.com]^[/url][url=http://friendica.com]Bookmark[/url]</td>
  <td><span class="oembed link"><h4>Friendica: <a href="http://friendica.com" rel="oembed"></a><a href="http://friendica.com" target="_blank">Bookmark</a></h4></span></td>
 </tr>
 <tr>
  <td>[url=/posts/f16d77b0630f0134740c0cc47a0ea02a]Diaspora post with GUID[/url]</td>
  <td><a href="/display/f16d77b0630f0134740c0cc47a0ea02a" target="_blank">Diaspora post with GUID</a></td>
 </tr>
 <tr>
  <td>#Friendica</td>
  <td>#<a href="/search?tag=Friendica">Friendica</a></td>
 </tr>
 <tr>
  <td>@Mention</td>
  <td>@<a href="javascript:void(0)">Mention</a></td>
 </tr>
 <tr>
  <td>acct:account@friendica.host.com (WebFinger)</td>
  <td><a href="/acctlink?addr=account@friendica.host.com" target="extlink">acct:account@friendica.host.com</a></td>
 </tr>
 <tr>
  <td>[mail]user@mail.example.com[/mail]</td>
  <td><a href="mailto:user@mail.example.com">user@mail.example.com</a></td>
 </tr>
 <tr>
  <td>[mail=user@mail.example.com]Send an email to User[/mail]</td>
  <td><a href="mailto:user@mail.example.com">Send an email to User</a></td>
 </tr>
 </table>

 ## Blocks

 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[p]A paragraph of text[/p]</td>
  <td><p>A paragraph of text</p></td>
 </tr>
 <tr>
  <td>Inline [code]code[/code] in a paragraph</td>
  <td>Inline <key>code</key> in a paragraph</td>
 </tr>
 <tr>
  <td>[code]Multi<br>line<br>code[/code]</td>
  <td><code>Multi
 line
 code</code></td>
 </tr>
 <tr>
  <td>[code=php]function text_highlight($s,$lang)[/code]</td>
  <td><code><div class="hl-main"><ol class="hl-main"><li><span class="hl-code">&nbsp;</span><span class="hl-reserved">function</span><span class="hl-code"> </span><span class="hl-identifier">text_highlight</span><span class="hl-brackets">(</span><span class="hl-var">$s</span><span class="hl-code">,</span><span class="hl-var">$lang</span><span class="hl-brackets">)</span></li></ol></div></code></td>
 </tr>
 <tr>
  <td>[quote]quote[/quote]</td>
  <td><blockquote>quote</blockquote></td>
 </tr>
 <tr>
  <td>[quote=Author]Author? Me? No, no, no...[/quote]</td>
  <td><strong class="author">Author wrote:</strong><blockquote>Author? Me? No, no, no...</blockquote></td>
 </tr>
 <tr>
  <td>[center]Centered text[/center]</td>
  <td><div style="text-align:center;">Centered text</div></td>
 </tr>
 <tr>
  <td>You should not read any further if you want to be surprised.[spoiler]There is a happy end.[/spoiler]</td>
  <td>
    <div class="wall-item-container">
      You should not read any further if you want to be surprised.<br>
      <span id="spoiler-wrap-0716e642" class="spoiler-wrap fakelink" onclick="openClose('spoiler-0716e642');">Click to open/close</span>
      <blockquote class="spoiler" id="spoiler-0716e642" style="display: none;">There is a happy end.</blockquote>
      <div class="body-attach"><div class="clear"></div></div>
    </div>
  </td>
 </tr>
 <tr>
  <td>[spoiler=Author]Spoiler quote[/spoiler]</td>
  <td>
    <div class="wall-item-container">
      <strong class="spoiler">Author wrote:</strong><br>
      <span id="spoiler-wrap-a893765a" class="spoiler-wrap fakelink" onclick="openClose('spoiler-a893765a');">Click to open/close</span>
      <blockquote class="spoiler" id="spoiler-a893765a" style="display: none;">Spoiler quote</blockquote>
      <div class="body-attach"><div class="clear"></div></div>
    </div>
  </td>
 </tr>
 <tr>
  <td>[hr] (horizontal line)</td>
  <td><hr></td>
 </tr>
 </table>

 ### Titles

 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[h1]Title 1[/h1]</td>
  <td><h1>Title 1</h1></td>
 </tr>
 <tr>
  <td>[h2]Title 2[/h2]</td>
  <td><h2>Title 2</h2></td>
 </tr>
 <tr>
  <td>[h3]Title 3[/h3]</td>
  <td><h3>Title 3</h3></td>
 </tr>
 <tr>
  <td>[h4]Title 4[/h4]</td>
  <td><h4>Title 4</h4></td>
 </tr>
 <tr>
  <td>[h5]Title 5[/h5]</td>
  <td><h5>Title 5</h5></td>
 </tr>
 <tr>
  <td>[h6]Title 6[/h6]</td>
  <td><h6>Title 6</h6></td>
 </tr>
 </table>

 ### Tables

 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[table]<br>
 &nbsp;&nbsp;[tr]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[th]Header 1[/th]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[th]Header 2[/th]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[th]Header 2[/th]<br>
 &nbsp;&nbsp;[/tr]<br>
 &nbsp;&nbsp;[tr]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 1[/td]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 2[/td]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 3[/td]<br>
 &nbsp;&nbsp;[/tr]<br>
 &nbsp;&nbsp;[tr]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 4[/td]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 5[/td]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 6[/td]<br>
 &nbsp;&nbsp;[/tr]<br>
 [/table]</td>
  <td>
 	<table>
      <tbody>
        <tr>
          <th>Header 1</th>
          <th>Header 2</th>
          <th>Header 3</th>
        </tr>
        <tr>
          <td>Cell 1</td>
          <td>Cell 2</td>
          <td>Cell 3</td>
        </tr>
        <tr>
          <td>Cell 4</td>
          <td>Cell 5</td>
          <td>Cell 6</td>
        </tr>
      </tbody>
    </table>
  </td>
 </tr>
 <tr>
  <td>[table border=0]</td>
  <td>
 	<table border="0">
      <tbody>
        <tr>
          <th>Header 1</th>
          <th>Header 2</th>
          <th>Header 3</th>
        </tr>
        <tr>
          <td>Cell 1</td>
          <td>Cell 2</td>
          <td>Cell 3</td>
        </tr>
        <tr>
          <td>Cell 4</td>
          <td>Cell 5</td>
          <td>Cell 6</td>
        </tr>
      </tbody>
    </table>
  </td>
 </tr>
 <tr>
  <td>[table border=1]</td>
  <td>
 	<table border="1">
      <tbody>
        <tr>
          <th>Header 1</th>
          <th>Header 2</th>
          <th>Header 3</th>
        </tr>
        <tr>
          <td>Cell 1</td>
          <td>Cell 2</td>
          <td>Cell 3</td>
        </tr>
        <tr>
          <td>Cell 4</td>
          <td>Cell 5</td>
          <td>Cell 6</td>
        </tr>
      </tbody>
    </table>
  </td>
 </tr>
 </table>

 ### Lists

 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[ul]<br>
 &nbsp;&nbsp;[li] First list element<br>
 &nbsp;&nbsp;[li] Second list element<br>
 [/ul]<br>
 [list]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/list]</td>
  <td>
 	<ul class="listbullet" style="list-style-type: circle;">
 		<li>First list element</li>
 		<li>Second list element</li>
 	</ul>
  </td>
 </tr>
 <tr>
  <td>[ol]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/ol]<br>
 [list=1]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/list]</td>
  <td>
    <ul class="listdecimal" style="list-style-type: decimal;">
      <li> First list element</li>
      <li> Second list element</li>
    </ul>
  </td>
 </tr>
 <tr>
  <td>[list=]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/list]</td>
  <td>
    <ul class="listnone" style="list-style-type: none;">
      <li> First list element</li>
      <li> Second list element</li>
    </ul>
  </td>
 </tr>
 <tr>
  <td>[list=i]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/list]</td>
  <td>
    <ul class="listlowerroman" style="list-style-type: lower-roman;">
      <li> First list element</li>
      <li> Second list element</li>
    </ul>
  </td>
 </tr>
 <tr>
  <td>[list=I]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/list]</td>
  <td>
    <ul class="listupperroman" style="list-style-type: upper-roman;">
      <li> First list element</li>
      <li> Second list element</li>
    </ul>
  </td>
 </tr>
 <tr>
  <td>[list=a]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/list]</td>
  <td>
    <ul class="listloweralpha" style="list-style-type: lower-alpha;">
      <li> First list element</li>
      <li> Second list element</li>
    </ul>
  </td>
 </tr>
 <tr>
  <td>[list=A]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/list]</td>
  <td>
    <ul class="listupperalpha" style="list-style-type: upper-alpha;">
      <li> First list element</li>
      <li> Second list element</li>
    </ul>
  </td>
 </tr>
 </table>

 ## Embed

 You can embed video, audio and more in a message.

 <pre>[video]url[/video]</pre>
 <pre>[audio]url[/audio]</pre>

 Where *url* can be an url to youtube, vimeo, soundcloud, or other sites wich supports oembed or opengraph specifications.
 *url* can be also full url to an ogg  file. HTML5 tag will be used to show it.

 <pre>[url]*url*[/url]</pre>

 If *url* supports oembed or opengraph specifications the embedded object will be shown (eg, documents from scribd).
 Page title with a link to *url* will be shown.

 Map
 ---

 <pre>[map]address[/map]</pre>
 <pre>[map=lat,long]</pre>

 You can embed maps from coordinates or addresses. 
 This require "openstreetmap" addon version 1.3 or newer.

 -----------------------------------------------------------

 Abstract for longer posts
 -------------------------

 If you want to spread your post to several third party networks you can have the problem that these networks have (for example) a length limitation. 
 (Like on Twitter)

 Friendica is using a semi intelligent mechanism to generate a fitting abstract. 
 But it can be interesting to define an own abstract that will only be displayed on the external network. 
 This is done with the [abstract]-element. 
 Example:

 <pre>[abstract]Totally interesting! A must-see! Please click the link![/abstract]
 I want to tell you a really boring story that you really never wanted 
 to hear.</pre>

 Twitter would display the text "Totally interesting! A must-see! Please click the link!". 
 On Friendica you would only see the text after "I want to tell you a really ..."
 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[video]url[/video]</td>
  <td>Where *url* can be an url to youtube, vimeo, soundcloud, or other sites wich supports oembed or opengraph specifications.</td>
 </tr>
 <tr>
  <td>[video]Video file url[/video]
 [audio]Audio file url[/audio]</td>
  <td>Full URL to an ogg/ogv/oga/ogm/webm/mp4/mp3 file. An HTML5 player will be used to show it.</td>
 </tr>
 <tr>
  <td>[youtube]Youtube URL[/youtube]</td>
  <td>Youtube video OEmbed display. May not embed an actual player.</td>
 </tr>
 <tr>
  <td>[youtube]Youtube video ID[/youtube]</td>
  <td>Youtube player iframe embed.</td>
 </tr>
 <tr>
  <td>[vimeo]Vimeo URL[/vimeo]</td>
  <td>Vimeo video OEmbed display. May not embed an actual player.</td>
 </tr>
 <tr>
  <td>[vimeo]Vimeo video ID[/vimeo]</td>
  <td>Vimeo player iframe embed.</td>
 </tr>
 <tr>
  <td>[iframe]URL[/iframe]</td>
  <td>General embed, iframe size is limited by the theme size for video players.</td>
 </tr>
 <tr>
  <td>[url]*url*[/url]</td>
  <td>If *url* supports oembed or opengraph specifications the embedded object will be shown (eg, documents from scribd).
 Page title with a link to *url* will be shown.</td>
 </tr>
 </table>

 ## Map

 This require "openstreetmap" addon version 1.3 or newer. If the addon isn't activated,
 the raw coordinates are shown instead.

 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[map]address[/map]</td>
  <td>Embeds a map centered on this address.</td>
 </tr>
 <tr>
  <td>[map=lat,long]</td>
  <td>Embeds a map centered on those coordinates.</td>
 </tr>
 <tr>
  <td>[map]</td>
  <td>Embeds a map centered on the post's location.</td>
 </tr>
 </table>

 ## Abstract for longer posts

 If you want to spread your post to several third party networks you can have the problem that these networks have a length limitation like on Twitter.

 Friendica is using a semi intelligent mechanism to generate a fitting abstract.
 But it can be interesting to define a custom abstract that will only be displayed on the external network.
 This is done with the [abstract]-element.
 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[abstract]Totally interesting! A must-see! Please click the link![/abstract]<br>
 I want to tell you a really boring story that you really never wanted to hear.</td>
  <td>Twitter would display the text <blockquote>Totally interesting! A must-see! Please click the link!</blockquote>
 On Friendica you would only see the text after <blockquote>I want to tell you a really ...</blockquote></td>
 </tr>
 </table>

 It is even possible to define abstracts for separate networks:

 <pre>
 [abstract]Hi friends Here are my newest pictures![abstract]
 [abstract=twit]Hi my dear Twitter followers. Do you want to see my new 
 pictures?[abstract]
 [abstract=apdn]Helly my dear followers on ADN. I made sone new pictures 
 that I wanted to share with you.[abstract]
 Today I was in the woods and took some real cool pictures ...
 </pre>

 For Twitter and App.net the system will use the defined abstracts.
 For other networks (e.g. when you are using the "statusnet" connector that is used to post to GNU Social) the general abstract element will be used.
 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>
 [abstract]Hi friends Here are my newest pictures![/abstract]<br>
 [abstract=twit]Hi my dear Twitter followers. Do you want to see my new
 pictures?[/abstract]<br>
 [abstract=apdn]Helly my dear followers on ADN. I made sone new pictures
 that I wanted to share with you.[/abstract]<br>
 Today I was in the woods and took some real cool pictures ...</td>
  <td>For Twitter and App.net the system will use the defined abstracts.<br>
 For other networks (e.g. when you are using the "statusnet" connector that is used to post to GNU Social) the general abstract element will be used.</td>
 </tr>
 </table>

 If you use (for example) the "buffer" connector to post to Facebook or Google+ you can use this element to define an abstract for a longer blogpost that you don't want to post completely to these networks.

 Networks like Facebook or Google+ aren't length limited. 
 For this reason the [abstract] element isn't used. 
 Networks like Facebook or Google+ aren't length limited.
 For this reason the [abstract] element isn't used.
 Instead you have to name the explicit network:

 <pre>
 [abstract]These days I had a strange encounter ...[abstract]
 [abstract=goog]Helly my dear Google+ followers. You have to read my 
 newest blog post![abstract]
 [abstract=face]Hello my Facebook friends. These days happened something 
 really cool.[abstract]
 While taking pictures in the woods I had a really strange encounter ... </pre>

 The [abstract] element isn't working with the native OStatus connection or with connectors where we post the HTML. 
 (Like Tumblr, Wordpress or Pump.io)

 Special
 -------

 If you need to put literal bbcode in a message, [noparse], [nobb] or [pre] are used to escape bbcode:

 <pre>[noparse][b]bold[/b][/noparse]</pre> : [b]bold[/b]
 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>
 [abstract]These days I had a strange encounter...[/abstract]<br>
 [abstract=goog]Helly my dear Google+ followers. You have to read my newest blog post![/abstract]<br>
 [abstract=face]Hello my Facebook friends. These days happened something really cool.[/abstract]<br>
 While taking pictures in the woods I had a really strange encounter...</td>
  <td>Google and Facebook will show the respective abstracts while the other networks will show the default one.<br>
 <br>Meanwhile, Friendica won't show any of the abstracts.</td>
 </tr>
 </table>

 The [abstract] element isn't working with the native OStatus connection or with connectors where we post the HTML like Tumblr, Wordpress or Pump.io.

 ## Special

 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>If you need to put literal bbcode in a message, [noparse], [nobb] or [pre] are used to escape bbcode:
    <ul>
      <li>[noparse][b]bold[/b][/noparse]</li>
      <li>[nobb][b]bold[/b][/nobb]</li>
      <li>[pre][b]bold[/b][/pre]</li>
    </ul>
  </td>
  <td>[b]bold[/b]</td>
 </tr>
 <tr>
  <td>[nosmile] is used to disable smilies on a post by post basis<br>
    <br>
    [nosmile] ;-) :-O
  </td>
  <td>;-) :-O</td>
 </tr>
 <tr>
  <td>Custom inline styles<br>
 <br>
 [style=text-shadow: 0 0 4px #CC0000;]You can change all the CSS properties of this block.[/style]</td>
  <td><span style="text-shadow: 0 0 4px #cc0000;;">You can change all the CSS properties of this block.</span></td>
 </tr>
 <tr>
  <td>Custom class block<br>
 <br>
 [class=custom]If the class exists, this block will have the custom class style applied.[/class]</td>
  <td><pre>&lt;span class="custom"&gt;If the class exists,<br> this block will have the custom class<br> style applied.&lt;/span&gt;</pre></td>
 </tr>
 </table>
--- a/doc/database/db_notify.md
+++ b/doc/database/db_notify.md
@ -1,22 +1,24 @@
 Table notify
 ============

 | Field  | Description                       | Type         | Null | Key | Default             | Extra           |
 | ------ | --------------------------------- | ------------ | ---- | --- | ------------------- | --------------- |
 | id     | sequential ID                     | int(11)      | NO   | PRI | NULL                | auto_increment  |
 | hash   |                                   | varchar(64)  | NO   |     |                     |                 |
 | type   |                                   | int(11)      | NO   |     | 0                   |                 |
 | name   |                                   | varchar(255) | NO   |     |                     |                 |
 | url    |                                   | varchar(255) | NO   |     |                     |                 |
 | photo  |                                   | varchar(255) | NO   |     |                     |                 |
 | date   |                                   | datetime     | NO   |     | 0000-00-00 00:00:00 |                 |
 | msg    |                                   | mediumtext   | NO   |     | NULL                |                 |
 | uid    | user.id of the owner of this data | int(11)      | NO   | MUL | 0                   |                 |
 | link   |                                   | varchar(255) | NO   |     |                     |                 |
 | parent |                                   | int(11)      | NO   |     | 0                   |                 |
 | seen   |                                   | tinyint(1)   | NO   |     | 0                   |                 |
 | verb   |                                   | varchar(255) | NO   |     |                     |                 |
 | otype  |                                   | varchar(16)  | NO   |     |                     |                 |
 | iid    | item.id                           | int(11)      | NO   |     | 0                   |                 |
 | Field      | Description                       | Type         | Null | Key | Default             | Extra           |
 | ---------- | --------------------------------- | ------------ | ---- | --- | ------------------- | --------------- |
 | id         | sequential ID                     | int(11)      | NO   | PRI | NULL                | auto_increment  |
 | hash       |                                   | varchar(64)  | NO   |     |                     |                 |
 | type       |                                   | int(11)      | NO   |     | 0                   |                 |
 | name       |                                   | varchar(255) | NO   |     |                     |                 |
 | url        |                                   | varchar(255) | NO   |     |                     |                 |
 | photo      |                                   | varchar(255) | NO   |     |                     |                 |
 | date       |                                   | datetime     | NO   |     | 0000-00-00 00:00:00 |                 |
 | msg        |                                   | mediumtext   | YES  |     | NULL                |                 |
 | uid        | user.id of the owner of this data | int(11)      | NO   | MUL | 0                   |                 |
 | link       |                                   | varchar(255) | NO   |     |                     |                 |
 | iid        | item.id                           | int(11)      | NO   |     | 0                   |                 |
 | parent     |                                   | int(11)      | NO   |     | 0                   |                 |
 | seen       |                                   | tinyint(1)   | NO   |     | 0                   |                 |
 | verb       |                                   | varchar(255) | NO   |     |                     |                 |
 | otype      |                                   | varchar(16)  | NO   |     |                     |                 |
 | name_cache | Cached bbcode parsing of name     | tinytext     | YES  |     | NULL                |                 |
 | msg_cache  | Cached bbcode parsing of msg      | mediumtext   | YES  |     | NULL                |                 |

 Return to [database documentation](help/database)
--- a/include/Photo.php
+++ b/include/Photo.php
--- a/include/Probe.php
+++ b/include/Probe.php
@ -217,7 +217,6 @@ class Probe {
 		if ($cache) {
 			$result = Cache::get("probe_url:".$network.":".$uri);
 			if (!is_null($result)) {
 				$result = unserialize($result);
 				return $result;
 			}
 		}
@ -257,7 +256,7 @@ class Probe {

 		// Only store into the cache if the value seems to be valid
 		if (!in_array($data['network'], array(NETWORK_PHANTOM, NETWORK_MAIL))) {
 			Cache::set("probe_url:".$network.":".$uri,serialize($data), CACHE_DAY);
 			Cache::set("probe_url:".$network.":".$uri, $data, CACHE_DAY);

 			/// @todo temporary fix - we need a real contact update function that updates only changing fields
 			/// The biggest problem is the avatar picture that could have a reduced image size.
--- a/include/bbcode.php
+++ b/include/bbcode.php
@ -146,7 +146,7 @@ function cleancss($input) {
 		if (($char >= "a") and ($char <= "z"))
 			$cleaned .= $char;

 		if (!(strpos(" #;:0123456789-_", $char) === false))
 		if (!(strpos(" #;:0123456789-_.%", $char) === false))
 			$cleaned .= $char;
 	}

@ -892,8 +892,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 	// we may need to restrict this further if it picks up too many strays
 	// link acct:user@host to a webfinger profile redirector

 	$Text = preg_replace('/acct:(.*?)@(.*?)([ ,])/', '<a href="' . $a->get_baseurl() . '/acctlink?addr=' . "$1@$2"
 		. '" target="extlink" >acct:' . "$1@$2$3" . '</a>',$Text);
 	$Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . $a->get_baseurl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>',$Text);

 	// Perform MAIL Search
 	$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);
--- a/include/cache.php
+++ b/include/cache.php
@ -99,8 +99,8 @@ class Cache {
 			dbesc($key)
 		);

 		if (count($r)) {
 			return $r[0]['v'];
 		if (dbm::is_result($r)) {
 			return unserialize($r[0]['v']);
 		}

 		return null;
@ -108,7 +108,9 @@ class Cache {

 	/**
 	 * @brief Put data in the cache according to the key
 	 *
 	 * 
 	 * The input $value can have multiple formats.
 	 * 
 	 * @param string $key The key to the cached data
 	 * @param mixed $valie The value that is about to be stored
 	 * @param integer $duration The cache lifespan
@ -126,7 +128,7 @@ class Cache {
 		/// @todo store the cache data in the same way like the config data
 		q("REPLACE INTO `cache` (`k`,`v`,`expire_mode`,`updated`) VALUES ('%s','%s',%d,'%s')",
 				dbesc($key),
 				dbesc($value),
 				dbesc(serialize($value)),
 				intval($duration),
 				dbesc(datetime_convert()));
 	}
--- a/include/cron.php
+++ b/include/cron.php
@ -11,6 +11,7 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
 }

 require_once("boot.php");
 require_once("include/photos.php");


 function cron_run(&$argv, &$argc){
@ -155,8 +156,9 @@ function cron_run(&$argv, &$argc){
 */
 function cron_update_photo_albums() {
 	$r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND NOT `account_removed`");
 	if (!dbm::is_result($r))
 	if (!dbm::is_result($r)) {
 		return;
 	}

 	foreach ($r AS $user) {
 		photo_albums($user['uid'], true);
--- a/include/datetime.php
+++ b/include/datetime.php
@ -325,15 +325,15 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
 * Results relative to current timezone.
 * Limited to range of timestamps.
 *
 * @param string $posted_date
 * @param string $posted_date MySQL-formatted date string (YYYY-MM-DD HH:MM:SS)
 * @param string $format (optional) Parsed with sprintf()
 *    <tt>%1$d %2$s ago</tt>, e.g. 22 hours ago, 1 minute ago
 * 
 *
 * @return string with relative date
 */
 function relative_date($posted_date,$format = null) {
 function relative_date($posted_date, $format = null) {

 	$localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date);
 	$localtime = $posted_date . ' UTC';

 	$abs = strtotime($localtime);

@ -347,13 +347,6 @@ function relative_date($posted_date,$format = null) {
 		return t('less than a second ago');
 	}

 	/*
 	$time_append = '';
 	if ($etime >= 86400) {
 		$time_append = ' ('.$localtime.')';
 	}
 	*/

 	$a = array( 12 * 30 * 24 * 60 * 60  =>  array( t('year'),   t('years')),
 				30 * 24 * 60 * 60       =>  array( t('month'),  t('months')),
 				7  * 24 * 60 * 60       =>  array( t('week'),   t('weeks')),
@ -368,10 +361,11 @@ function relative_date($posted_date,$format = null) {
 		if ($d >= 1) {
 			$r = round($d);
 			// translators - e.g. 22 hours ago, 1 minute ago
 			if(! $format)
 			if (!$format) {
 				$format = t('%1$d %2$s ago');
 			}

 			return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1]));
 			return sprintf($format, $r, (($r == 1) ? $str[0] : $str[1]));
 		}
 	}
 }
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@ -1039,6 +1039,8 @@ function db_definition($charset) {
 					"seen" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"verb" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"otype" => array("type" => "varchar(16)", "not null" => "1", "default" => ""),
 					"name_cache" => array("type" => "tinytext"),
 					"msg_cache" => array("type" => "mediumtext")
 					),
 			"indexes" => array(
 					"PRIMARY" => array("id"),
--- a/include/enotify.php
+++ b/include/enotify.php
@ -418,6 +418,7 @@ function notification($params) {
 		$datarray = array();
 		$datarray['hash']  = $hash;
 		$datarray['name']  = $params['source_name'];
 		$datarray['name_cache'] = strip_tags(bbcode($params['source_name']));
 		$datarray['url']   = $params['source_link'];
 		$datarray['photo'] = $params['source_photo'];
 		$datarray['date']  = datetime_convert();
@ -439,8 +440,8 @@ function notification($params) {

 		// create notification entry in DB

 		$r = q("INSERT INTO `notify` (`hash`, `name`, `url`, `photo`, `date`, `uid`, `link`, `iid`, `parent`, `type`, `verb`, `otype`)
 			values('%s', '%s', '%s', '%s', '%s', %d, '%s', %d, %d, %d, '%s', '%s')",
 		$r = q("INSERT INTO `notify` (`hash`, `name`, `url`, `photo`, `date`, `uid`, `link`, `iid`, `parent`, `type`, `verb`, `otype`, `name_cache`)
 			values('%s', '%s', '%s', '%s', '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s')",
 			dbesc($datarray['hash']),
 			dbesc($datarray['name']),
 			dbesc($datarray['url']),
@ -452,7 +453,8 @@ function notification($params) {
 			intval($datarray['parent']),
 			intval($datarray['type']),
 			dbesc($datarray['verb']),
 			dbesc($datarray['otype'])
 			dbesc($datarray['otype']),
 			dbesc($datarray["name_cache"])
 		);

 		$r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' AND `uid` = %d LIMIT 1",
@ -494,8 +496,10 @@ function notification($params) {

 		$itemlink = $a->get_baseurl().'/notify/view/'.$notify_id;
 		$msg = replace_macros($epreamble, array('$itemlink' => $itemlink));
 		$r = q("UPDATE `notify` SET `msg` = '%s' WHERE `id` = %d AND `uid` = %d",
 		$msg_cache = format_notification_message($datarray['name_cache'], strip_tags(bbcode($msg)));
 		$r = q("UPDATE `notify` SET `msg` = '%s', `msg_cache` = '%s' WHERE `id` = %d AND `uid` = %d",
 			dbesc($msg),
 			dbesc($msg_cache),
 			intval($notify_id),
 			intval($params['uid'])
 		);
@ -778,4 +782,27 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 	if (isset($params["type"]))
 		notification($params);
 }
 ?>

 /**
 * @brief Formats a notification message with the notification author
 *
 * Replace the name with {0} but ensure to make that only once. The {0} is used
 * later and prints the name in bold.
 *
 * @param string $name
 * @param string $message
 * @return string Formatted message
 */
 function format_notification_message($name, $message) {
 	if ($name != '') {
 		$pos = strpos($message, $name);
 	} else {
 		$pos = false;
 	}

 	if ($pos !== false) {
 		$message = substr_replace($message, '{0}', $pos, strlen($name));
 	}

 	return $message;
 }
--- a/include/gprobe.php
+++ b/include/gprobe.php
@ -12,11 +12,11 @@ function gprobe_run(&$argv, &$argc){
 	}

 	if(is_null($db)) {
 	    @include(".htconfig.php");
    	require_once("include/dba.php");
 	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
    	unset($db_host, $db_user, $db_pass, $db_data);
  	};
 		@include(".htconfig.php");
 		require_once("include/dba.php");
 		$db = new dba($db_host, $db_user, $db_pass, $db_data);
 		unset($db_host, $db_user, $db_pass, $db_data);
 	};

 	require_once('include/session.php');
 	require_once('include/datetime.php');
@ -39,14 +39,13 @@ function gprobe_run(&$argv, &$argc){

 	logger("gprobe start for ".normalise_link($url), LOGGER_DEBUG);

 	if (!count($r)) {
 	if (!dbm::is_result($r)) {

 		// Is it a DDoS attempt?
 		$urlparts = parse_url($url);

 		$result = Cache::get("gprobe:".$urlparts["host"]);
 		if (!is_null($result)) {
 			$result = unserialize($result);
 			if (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
 				logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG);
 				return;
@ -56,7 +55,7 @@ function gprobe_run(&$argv, &$argc){
 		$arr = probe_url($url);

 		if (is_null($result))
 			Cache::set("gprobe:".$urlparts["host"],serialize($arr));
 			Cache::set("gprobe:".$urlparts["host"], $arr);

 		if (!in_array($arr["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))
 			update_gcontact($arr);
@ -65,7 +64,7 @@ function gprobe_run(&$argv, &$argc){
 			dbesc(normalise_link($url))
 		);
 	}
 	if(count($r)) {
 	if(dbm::is_result($r)) {
 		// Check for accessibility and do a poco discovery
 		if (poco_last_updated($r[0]['url'], true) AND ($r[0]["network"] == NETWORK_DFRN))
 			poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
@ -76,6 +75,6 @@ function gprobe_run(&$argv, &$argc){
 }

 if (array_search(__file__,get_included_files())===0){
  gprobe_run($_SERVER["argv"],$_SERVER["argc"]);
  killme();
 	gprobe_run($_SERVER["argv"],$_SERVER["argc"]);
 	killme();
 }
--- a/include/oembed.php
+++ b/include/oembed.php
@ -6,7 +6,15 @@ function oembed_replacecb($matches){
 	return $s;
 }


 /**
 * @brief Get data from an URL to embed its content.
 * 
 * @param string $embedurl The URL from which the data should be fetched.
 * @param bool $no_rich_type If set to true rich type content won't be fetched.
 * 
 * @return bool|object Returns object with embed content or false if no embedable
 *	 content exists
 */
 function oembed_fetch_url($embedurl, $no_rich_type = false){
 	$embedurl = trim($embedurl, "'");
 	$embedurl = trim($embedurl, '"');
@ -16,11 +24,11 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 	$r = q("SELECT * FROM `oembed` WHERE `url` = '%s'",
 		dbesc(normalise_link($embedurl)));

 	if ($r)
 	if (dbm::is_result($r)) {
 		$txt = $r[0]["content"];
 	else
 	} else {
 		$txt = Cache::get($a->videowidth . $embedurl);

 	}
 	// These media files should now be caught in bbcode.php
 	// left here as a fallback in case this is called from another source

@ -28,27 +36,27 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 	$ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION);


 	if(is_null($txt)){
 	if (is_null($txt)) {
 		$txt = "";

 		if (!in_array($ext, $noexts)){
 			// try oembed autodiscovery
 			$redirects = 0;
 			$html_text = fetch_url($embedurl, false, $redirects, 15, "text/*"); /**/
 			if($html_text){
 			$html_text = fetch_url($embedurl, false, $redirects, 15, "text/*");
 			if ($html_text) {
 				$dom = @DOMDocument::loadHTML($html_text);
 				if ($dom){
 				if ($dom) {
 					$xpath = new DOMXPath($dom);
 					$attr = "oembed";
 					$xattr = oe_build_xpath("class","oembed");
 					$entries = $xpath->query("//link[@type='application/json+oembed']");
 					foreach($entries as $e){
 					foreach ($entries as $e) {
 						$href = $e->getAttributeNode("href")->nodeValue;
 						$txt = fetch_url($href . '&maxwidth=' . $a->videowidth);
 						break;
 					}
 					$entries = $xpath->query("//link[@type='text/json+oembed']");
 					foreach($entries as $e){
 					foreach ($entries as $e) {
 						$href = $e->getAttributeNode("href")->nodeValue;
 						$txt = fetch_url($href . '&maxwidth=' . $a->videowidth);
 						break;
@ -57,7 +65,7 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 			}
 		}

 		if ($txt==false || $txt==""){
 		if ($txt==false || $txt=="") {
 			$embedly = get_config("system", "embedly");
 			if ($embedly != "") {
 				// try embedly service
@ -70,30 +78,33 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){

 		$txt=trim($txt);

 		if ($txt[0]!="{")
 		if ($txt[0]!="{") {
 			$txt='{"type":"error"}';
 		else {	//save in cache
 		} else {	//save in cache
 			$j = json_decode($txt);
 			if ($j->type != "error")
 			if ($j->type != "error") {
 				q("INSERT INTO `oembed` (`url`, `content`, `created`) VALUES ('%s', '%s', '%s')
 					ON DUPLICATE KEY UPDATE `content` = '%s', `created` = '%s'",
 					dbesc(normalise_link($embedurl)),
 					dbesc($txt), dbesc(datetime_convert()),
 					dbesc($txt), dbesc(datetime_convert()));
 			}

 			Cache::set($a->videowidth.$embedurl,$txt, CACHE_DAY);
 			Cache::set($a->videowidth.$embedurl, $txt, CACHE_DAY);
 		}
 	}

 	$j = json_decode($txt);

 	if (!is_object($j))
 	if (!is_object($j)) {
 		return false;
 	}

 	// Always embed the SSL version
 	if (isset($j->html))
 	if (isset($j->html)) {
 		$j->html = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"),
 			array("https://www.youtube.com/", "https://player.vimeo.com/"), $j->html);
 	}

 	$j->embedurl = $embedurl;

@ -109,16 +120,18 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 			//$j->height = $data["images"][0]["height"];
 		}

 		if (isset($data["title"]))
 		        $j->title = $data["title"];
 		if (isset($data["title"])) {
 			$j->title = $data["title"];
 		}

 		if (isset($data["text"]))
 	        	$j->description = $data["text"];
 		if (isset($data["text"])) {
 			$j->description = $data["text"];
 		}

 		if (is_array($data["images"])) {
 		        $j->thumbnail_url = $data["images"][0]["src"];
 		        $j->thumbnail_width = $data["images"][0]["width"];
 	        	$j->thumbnail_height = $data["images"][0]["height"];
 			$j->thumbnail_url = $data["images"][0]["src"];
 			$j->thumbnail_width = $data["images"][0]["width"];
 			$j->thumbnail_height = $data["images"][0]["height"];
 		}
 	}

--- a/include/photos.php
+++ b/include/photos.php
@ -25,3 +25,34 @@ function gps2Num($coordPart) {

 	return floatval($parts[0]) / floatval($parts[1]);
 }

 /**
 * @brief Fetch the photo albums that are available for a viewer
 *
 * The query in this function is cost intensive, so it is cached.
 *
 * @param int $uid User id of the photos
 * @param bool $update Update the cache
 *
 * @return array Returns array of the photo albums
 */
 function photo_albums($uid, $update = false) {
 	$sql_extra = permissions_sql($uid);

 	$key = "photo_albums:".$uid.":".local_user().":".remote_user();
 	$albums = Cache::get($key);
 	if (is_null($albums) OR $update) {
 		/// @todo This query needs to be renewed. It is really slow
 		// At this time we just store the data in the cache
 		$albums = qu("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`
 			FROM `photo` USE INDEX (`uid_album_created`)
 			WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra
 			GROUP BY `album` ORDER BY `created` DESC",
 			intval($uid),
 			dbesc('Contact Photos'),
 			dbesc(t('Contact Photos'))
 		);
 		Cache::set($key, $albums, CACHE_DAY);
 	}
 	return $albums;
 }
--- a/include/session.php
+++ b/include/session.php
@ -40,6 +40,19 @@ function ref_session_read($id) {
 	return '';
 }

 /**
 * @brief Standard PHP session write callback
 *
 * This callback updates the DB-stored session data and/or the expiration depending
 * on the case. Uses the $session_expire global for existing session, 5 minutes
 * for newly created session.
 *
 * @global bool $session_exists Whether a session with the given id already exists
 * @global int $session_expire Session expiration delay in seconds
 * @param string $id Session ID with format: [a-z0-9]{26}
 * @param string $data Serialized session data
 * @return boolean Returns false if parameters are missing, true otherwise
 */
 function ref_session_write($id, $data) {
 	global $session_exists, $session_expire;

@ -66,10 +79,11 @@ function ref_session_write($id, $data) {
 				SET `expire` = '%s'
 				WHERE `expire` != '%s' AND `sid` = '%s'",
 				dbesc($expire), dbesc($expire), dbesc($id));
 	} else
 	} else {
 		$r = q("INSERT INTO `session`
 				SET `sid` = '%s', `expire` = '%s', `data` = '%s'",
 				dbesc($id), dbesc($default_expire), dbesc($data));
 	}

 	return true;
 }