Merge develop into 1404_reworked_autocomplete

Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css

diff --cc .gitignore
index b300f579e299ab2526462792c2ac1bf03a338c83,b300f579e299ab2526462792c2ac1bf03a338c83..5b7e09b507ee0ba1801abacaaa618a287ccd1ae1
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -12,7 -12,7 +12,7 @@@ addo
  *~\r
  robots.txt\r
  \r
--#ignore documentation, it should be newly built\r
++#ignore documentation, it should be newly built \r
  doc/html\r
  \r
  #ignore reports, should be generted with every build\r
@@@ -23,7 -23,7 +23,7 @@@ report
  .buildpath\r
  .externalToolBuilders\r
  .settings\r
--#ignore OSX .DS_Store files\r
++#ignore OSX .DS_Store files \r
  .DS_Store\r
  \r
  /nbproject/private/\r

diff --cc include/Smilies.php
index 193f3b555ddd2986f7e3adf009928678eba0f57c,0000000000000000000000000000000000000000..9cb2d6f2b5093ba704afa125220d51b8d149b41d
mode 100644,000000..100644
--- 1/include/Smilies.php
--- /dev/null
+++ b/include/Smilies.php
@@@ -1,179 -1,0 +1,180 @@@
-  * @file include/smilies.php
 +<?php
 +
 +/**
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;/3" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;\\3" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-p" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="o_O" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-embarassed.gif" alt=":-[" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-cool.gif" alt="8-)" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/beer_mug.gif" alt=":beer" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/like.gif" alt=":like" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
-                       '<a href="http://friendica.com">~friendica <img class="smiley" src="' . app::get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
-                       '<a href="http://redmatrix.me/">red<img class="smiley" src="' . app::get_baseurl() . '/images/rm-16.png" alt="red" />matrix</a>',
-                       '<a href="http://redmatrix.me/">red<img class="smiley" src="' . app::get_baseurl() . '/images/rm-16.png" alt="red" />matrix</a>'
++ * @file include/Smilies.php
++ * @brief This file contains the Smilies class which contains functions to handle smiles
 + */
 +
 +/**
 + * This class contains functions to handle smiles
 + */
 +
 +class Smilies {
 +
 +      /**
 +       * @brief Function to list all smilies
 +       * 
 +       * Get an array of all smilies, both internal and from addons.
 +       * 
 +       * @return array
 +       *      'texts' => smilie shortcut
 +       *      'icons' => icon in html
 +       * 
 +       * @hook smilie ('texts' => smilies texts array, 'icons' => smilies html array)
 +       */
 +      public static function get_list() {
 +
 +              $texts =  array(
 +                      '&lt;3',
 +                      '&lt;/3',
 +                      '&lt;\\3',
 +                      ':-)',
 +                      ';-)',
 +                      ':-(',
 +                      ':-P',
 +                      ':-p',
 +                      ':-"',
 +                      ':-&quot;',
 +                      ':-x',
 +                      ':-X',
 +                      ':-D',
 +                      '8-|',
 +                      '8-O',
 +                      ':-O',
 +                      '\\o/',
 +                      'o.O',
 +                      'O.o',
 +                      'o_O',
 +                      'O_o',
 +                      ":'(",
 +                      ":-!",
 +                      ":-/",
 +                      ":-[",
 +                      "8-)",
 +                      ':beer',
 +                      ':homebrew',
 +                      ':coffee',
 +                      ':facepalm',
 +                      ':like',
 +                      ':dislike',
 +                      '~friendica',
 +                      'red#',
 +                      'red#matrix'
 +
 +              );
 +
 +              $icons = array(
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" title="&lt;3" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;/3" title="&lt;/3" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;\\3" title="&lt;\\3" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-smile.gif" alt=":-)" title=":-)" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-wink.gif" alt=";-)" title=";-)" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-frown.gif" alt=":-(" title=":-(" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" title=":-P" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-p" title=":-P" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" title=":-x" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" title=":-X" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" title=":-D"  />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" title="8-|" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" title="8-O" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" title="8-O" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" title="\\o/" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" title="o.O" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" title="O.o" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="o_O" title="o_O" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" title="O_o" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" title=":\'("/>',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" title=":-!" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" title=":-/" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-embarassed.gif" alt=":-[" title=":-[" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-cool.gif" alt="8-)" title="8-)" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/beer_mug.gif" alt=":beer" title=":beer" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" title=":homebrew" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/coffee.gif" alt=":coffee" title=":coffee" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" title=":facepalm" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/like.gif" alt=":like" title=":like" />',
++              '<img class="smiley" src="' . app::get_baseurl() . '/images/dislike.gif" alt=":dislike" title=":dislike" />',
++              '<a href="http://friendica.com">~friendica <img class="smiley" src="' . app::get_baseurl() . '/images/friendica-16.png" alt="~friendica" title="~friendica" /></a>',
++              '<a href="http://redmatrix.me/">red<img class="smiley" src="' . app::get_baseurl() . '/images/rm-16.png" alt="red#" title="red#" />matrix</a>',
++              '<a href="http://redmatrix.me/">red<img class="smiley" src="' . app::get_baseurl() . '/images/rm-16.png" alt="red#matrix" title="red#matrix" />matrix</a>'
 +              );
 +
 +              $params = array('texts' => $texts, 'icons' => $icons);
 +              call_hooks('smilie', $params);
 +
 +              return $params;
 +
 +      }
 +
 +      /**
 +       * @brief Replaces text emoticons with graphical images
 +       *
 +       * It is expected that this function will be called using HTML text.
 +       * We will escape text between HTML pre and code blocks from being
 +       * processed.
 +       *
 +       * At a higher level, the bbcode [nosmile] tag can be used to prevent this
 +       * function from being executed by the prepare_text() routine when preparing
 +       * bbcode source for HTML display
 +       *
 +       * @param string $s
 +       * @param boolean $sample
 +       * 
 +       * @return string
 +       */
 +      public static function replace($s, $sample = false) {
 +              if(intval(get_config('system','no_smilies'))
 +                      || (local_user() && intval(get_pconfig(local_user(),'system','no_smilies'))))
 +                      return $s;
 +
 +              $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','self::encode',$s);
 +              $s = preg_replace_callback('/<code>(.*?)<\/code>/ism','self::encode',$s);
 +
 +              $params = self::get_list();
 +              $params['string'] = $s;
 +
 +              if($sample) {
 +                      $s = '<div class="smiley-sample">';
 +                      for($x = 0; $x < count($params['texts']); $x ++) {
 +                              $s .= '<dl><dt>' . $params['texts'][$x] . '</dt><dd>' . $params['icons'][$x] . '</dd></dl>';
 +                      }
 +              }
 +              else {
 +                      $params['string'] = preg_replace_callback('/&lt;(3+)/','self::preg_heart',$params['string']);
 +                      $s = str_replace($params['texts'],$params['icons'],$params['string']);
 +              }
 +
 +              $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','self::decode',$s);
 +              $s = preg_replace_callback('/<code>(.*?)<\/code>/ism','self::decode',$s);
 +
 +              return $s;
 +      }
 +
 +      private function encode($m) {
 +              return(str_replace($m[1],base64url_encode($m[1]),$m[0]));
 +      }
 +
 +      private function decode($m) {
 +              return(str_replace($m[1],base64url_decode($m[1]),$m[0]));
 +      }
 +
 +
 +      /**
 +       * @brief expand <3333 to the correct number of hearts
 +       *
 +       * @param string $x
 +       * @return string
 +       */
 +      private function preg_heart($x) {
 +              if(strlen($x[1]) == 1)
 +                      return $x[0];
 +              $t = '';
 +              for($cnt = 0; $cnt < strlen($x[1]); $cnt ++)
 +                      $t .= '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" />';
 +              $r =  str_replace($x[0],$t,$x[0]);
 +              return $r;
 +      }
 +
 +}

diff --cc include/nav.php
Simple merge

diff --cc include/network.php
Simple merge

diff --cc include/text.php
Simple merge

diff --cc js/main.js
Simple merge

diff --cc view/global.css
Simple merge

diff --cc view/templates/head.tpl
index afb7c1df27aaf5bcb37f95b1231f095f3c3bcb93,fdf9a7716e0572c35bfc68c3cee7ff532ec4dd54..31555aae2b8b10f15b98e9f4f490d6d16040edee
--- 1/view/templates/head.tpl
--- 2/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@@ -28,21 -28,20 +28,21 @@@
  <!--[if IE]>
  <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
  <![endif]-->
- <script type="text/javascript" src="{{$baseurl}}/js/modernizr.js" ></script>
- <script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
- <!-- <script type="text/javascript" src="{{$baseurl}}/js/jquery-migrate.js" ></script>-->
- <script type="text/javascript" src="{{$baseurl}}/js/jquery-migrate.js" ></script>
- <script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
- <script type="text/javascript" src="{{$baseurl}}/library/jquery-textcomplete/jquery.textcomplete.js" ></script>
- <script type="text/javascript" src="{{$baseurl}}/js/autocomplete.js" ></script>
- <script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>
- <script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
- <script type="text/javascript" src="{{$baseurl}}/library/datetimepicker/jquery.datetimepicker.js"></script>
- <script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
- <script type="text/javascript" src="{{$baseurl}}/library/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
- <script type="text/javascript" src="{{$baseurl}}/js/acl.js" ></script>
- <script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.js" ></script>
- <script type="text/javascript" src="{{$baseurl}}/js/main.js" ></script>
+ <script type="text/javascript" src="js/modernizr.js" ></script>
+ <script type="text/javascript" src="js/jquery.js" ></script>
+ <!-- <script type="text/javascript" src="js/jquery-migrate.js" ></script>-->
+ <script type="text/javascript" src="js/jquery-migrate.js" ></script>
+ <script type="text/javascript" src="js/jquery.textinputs.js" ></script>
 -<script type="text/javascript" src="js/fk.autocomplete.js" ></script>
++<script type="text/javascript" src="library/jquery-textcomplete/jquery.textcomplete.js" ></script>
++<script type="text/javascript" src="js/autocomplete.js" ></script>
+ <script type="text/javascript" src="library/colorbox/jquery.colorbox-min.js"></script>
+ <script type="text/javascript" src="library/jgrowl/jquery.jgrowl_minimized.js"></script>
+ <script type="text/javascript" src="library/datetimepicker/jquery.datetimepicker.js"></script>
+ <script type="text/javascript" src="library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
+ <script type="text/javascript" src="library/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
+ <script type="text/javascript" src="js/acl.js" ></script>
+ <script type="text/javascript" src="js/webtoolkit.base64.js" ></script>
+ <script type="text/javascript" src="js/main.js" ></script>
  <script>
  
        var updateInterval = {{$update_interval}};

diff --cc view/templates/jot-header.tpl
index 84ce88a88122c2be89260d6ec42f24e9735e5542,b06f6032c30ea338f909fde7975da9309b01f30a..d12293f04c7743a1896b13687b60c45fc27b2cf2
--- 1/view/templates/jot-header.tpl
--- 2/view/templates/jot-header.tpl
+++ b/view/templates/jot-header.tpl
@@@ -12,12 -23,9 +23,9 @@@ function initEditor(cb)
                if(plaintext == 'none') {
                        $("#profile-jot-text-loading").hide();
                        $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
 -                      $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
 +                      $("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
                        editor = true;
-                       $("a#jot-perms-icon").colorbox({
-                               'inline' : true,
-                               'transition' : 'elastic'
-                       });
+                       $("a#jot-perms-icon").colorbox(colorbox_options);
                        $(".jothidden").show();
                        if (typeof cb!="undefined") cb();
                        return;

diff --cc view/theme/duepuntozero/style.css
Simple merge

diff --cc view/theme/frost-mobile/js/main.js
Simple merge

diff --cc view/theme/frost-mobile/style.css
Simple merge

diff --cc view/theme/frost/style.css
Simple merge

diff --cc view/theme/quattro/dark/style.css
Simple merge

diff --cc view/theme/quattro/green/style.css
Simple merge

diff --cc view/theme/quattro/lilac/style.css
Simple merge

diff --cc view/theme/quattro/quattro.less
Simple merge

diff --cc view/theme/smoothly/style.css
Simple merge

diff --cc view/theme/vier/style.css
Simple merge