]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #2045 from annando/1511-dirfind-addr
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 8 Nov 2015 14:19:11 +0000 (15:19 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 8 Nov 2015 14:19:11 +0000 (15:19 +0100)
You can now discover previously unknown users via the dirsearch

1  2 
include/text.php

diff --combined include/text.php
index e6af5f3db7c3ff07608162cca6a08977496a09bb,efc0d8b0504dbdf357b5d85accea0a9601fd89ce..b5010864e68853b82c2f93b1e0c6f7b7941d5262
@@@ -1020,8 -1020,9 +1020,9 @@@ if(! function_exists('valid_email')) 
   */
  function valid_email($x){
  
-       if(get_config('system','disable_email_validation'))
-               return true;
+       // Removed because Fabio told me so.
+       //if(get_config('system','disable_email_validation'))
+       //      return true;
  
        if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
                return true;
@@@ -1738,6 -1739,50 +1739,6 @@@ function unamp($s) 
  }}
  
  
 -
 -
 -if(! function_exists('lang_selector')) {
 -/**
 - * get html for language selector
 - * @global string $lang
 - * @return string
 - * @template lang_selector.tpl
 - */
 -function lang_selector() {
 -      global $lang;
 -
 -      $langs = glob('view/*/strings.php');
 -
 -      $lang_options = array();
 -      $selected = "";
 -
 -      if(is_array($langs) && count($langs)) {
 -              $langs[] = '';
 -              if(! in_array('view/en/strings.php',$langs))
 -                      $langs[] = 'view/en/';
 -              asort($langs);
 -              foreach($langs as $l) {
 -                      if($l == '') {
 -                              $lang_options[""] = t('default');
 -                              continue;
 -                      }
 -                      $ll = substr($l,5);
 -                      $ll = substr($ll,0,strrpos($ll,'/'));
 -                      $selected = (($ll === $lang && (x($_SESSION, 'language'))) ? $ll : $selected);
 -                      $lang_options[$ll]=$ll;
 -              }
 -      }
 -
 -      $tpl = get_markup_template("lang_selector.tpl");
 -      $o = replace_macros($tpl, array(
 -              '$title' => t('Select an alternate language'),
 -              '$langs' => array($lang_options, $selected),
 -
 -      ));
 -      return $o;
 -}}
 -
 -
  if(! function_exists('return_bytes')) {
  /**
   * return number of bytes in size (K, M, G)