X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=4b2a4a9409f4254a89f8ecb4f2230bcd9e451005;hb=b806f878740299eea54e86603840bbfd596a4bf7;hp=9b34b0884a6b47f26e2fa52b53eb080dd6056522;hpb=9ea9494a9e737589a29070cf9d81e854f879aa50;p=friendica.git

diff --git a/include/text.php b/include/text.php
index 9b34b0884a..4b2a4a9409 100644
--- a/include/text.php
+++ b/include/text.php
@@ -581,14 +581,14 @@ function get_intltext_template($s) {
 	if(! isset($lang))
 		$lang = 'en';
 
-	if(file_exists("view/$lang$engine/$s")) {
+	if(file_exists("view/lang/$lang$engine/$s")) {
 		$stamp1 = microtime(true);
-		$content = file_get_contents("view/$lang$engine/$s");
+		$content = file_get_contents("view/lang/$lang$engine/$s");
 		$a->save_timestamp($stamp1, "file");
 		return $content;
-	} elseif(file_exists("view/en$engine/$s")) {
+	} elseif(file_exists("view/lang/en$engine/$s")) {
 		$stamp1 = microtime(true);
-		$content = file_get_contents("view/en$engine/$s");
+		$content = file_get_contents("view/lang/en$engine/$s");
 		$a->save_timestamp($stamp1, "file");
 		return $content;
 	} else {
@@ -678,11 +678,13 @@ function attribute_contains($attr,$s) {
 	return false;
 }}
 
-if(! function_exists('logger')) {
+if (! function_exists('logger')) {
 /* setup int->string log level map */
 $LOGGER_LEVELS = array();
 
 /**
+ * @brief Logs the given message at the given log level
+ *
  * log levels:
  * LOGGER_NORMAL (default)
  * LOGGER_TRACE
@@ -692,46 +694,58 @@ $LOGGER_LEVELS = array();
  *
  * @global App $a
  * @global dba $db
+ * @global array $LOGGER_LEVELS
  * @param string $msg
  * @param int $level
  */
-function logger($msg,$level = 0) {
-	// turn off logger in install mode
+function logger($msg, $level = 0) {
 	global $a;
 	global $db;
 	global $LOGGER_LEVELS;
 
-	if(($a->module == 'install') || (! ($db && $db->connected))) return;
+	$debugging = get_config('system','debugging');
+	$logfile   = get_config('system','logfile');
+	$loglevel = intval(get_config('system','loglevel'));
+
+	// turn off logger in install mode
+	if (
+		$a->module == 'install'
+		|| ! ($db && $db->connected)
+		|| ! $debugging
+		|| ! $logfile
+		|| $level > $loglevel
+	) {
+		return;
+	}
 
-	if (count($LOGGER_LEVELS)==0){
-		foreach (get_defined_constants() as $k=>$v){
-			if (substr($k,0,7)=="LOGGER_")
-				$LOGGER_LEVELS[$v] = substr($k,7,7);
+	if (count($LOGGER_LEVELS) == 0) {
+		foreach (get_defined_constants() as $k => $v) {
+			if (substr($k, 0, 7) == "LOGGER_") {
+				$LOGGER_LEVELS[$v] = substr($k, 7, 7);
+			}
 		}
 	}
 
-	$debugging = get_config('system','debugging');
-	$loglevel  = intval(get_config('system','loglevel'));
-	$logfile   = get_config('system','logfile');
+	$process_id = session_id();
 
-	if((! $debugging) || (! $logfile) || ($level > $loglevel))
-		return;
+	if ($process_id == '') {
+		$process_id = get_app()->process_id;
+	}
 
 	$callers = debug_backtrace();
-	$logline =  sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n",
-				 datetime_convert(),
-				 session_id(),
-				 $LOGGER_LEVELS[$level],
-				 basename($callers[0]['file']),
-				 $callers[0]['line'],
-				 $callers[1]['function'],
-				 $msg
-				);
+	$logline = sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n",
+			datetime_convert(),
+			$process_id,
+			$LOGGER_LEVELS[$level],
+			basename($callers[0]['file']),
+			$callers[0]['line'],
+			$callers[1]['function'],
+			$msg
+		);
 
 	$stamp1 = microtime(true);
 	@file_put_contents($logfile, $logline, FILE_APPEND);
 	$a->save_timestamp($stamp1, "file");
-	return;
 }}
 
 
@@ -867,7 +881,8 @@ function contact_block() {
 		$micropro = Null;
 
 	} else {
-		$r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `micro`, `network` FROM `contact`
+		// Splitting the query in two parts makes it much faster
+		$r = q("SELECT `id` FROM `contact`
 				WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending`
 					AND NOT `hidden` AND NOT `archive`
 				AND `network` IN ('%s', '%s', '%s') ORDER BY RAND() LIMIT %d",
@@ -877,11 +892,19 @@ function contact_block() {
 				dbesc(NETWORK_DIASPORA),
 				intval($shown)
 		);
-		if(count($r)) {
-			$contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total);
-			$micropro = Array();
-			foreach($r as $rr) {
-				$micropro[] = micropro($rr,true,'mpfriend');
+		if ($r) {
+			$contacts = "";
+			foreach ($r AS $contact)
+				$contacts[] = $contact["id"];
+
+			$r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` WHERE `id` IN (%s)",
+				dbesc(implode(",", $contacts)));
+			if(count($r)) {
+				$contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total);
+				$micropro = Array();
+				foreach($r as $rr) {
+					$micropro[] = micropro($rr,true,'mpfriend');
+				}
 			}
 		}
 	}
@@ -901,20 +924,28 @@ function contact_block() {
 
 }}
 
-if(! function_exists('micropro')) {
 /**
+ * @brief Format contacts as picture links or as texxt links
  *
- * @param array $contact
- * @param boolean $redirect
- * @param string $class
- * @param boolean $textmode
- * @return string #FIXME: remove html
+ * @param array $contact Array with contacts which contains an array with
+ *	int 'id' => The ID of the contact
+ *	int 'uid' => The user ID of the user who owns this data
+ *	string 'name' => The name of the contact
+ *	string 'url' => The url to the profile page of the contact
+ *	string 'addr' => The webbie of the contact (e.g.) username@friendica.com
+ *	string 'network' => The network to which the contact belongs to
+ *	string 'thumb' => The contact picture
+ *	string 'click' => js code which is performed when clicking on the contact
+ * @param boolean $redirect If true try to use the redir url if it's possible
+ * @param string $class CSS class for the
+ * @param boolean $textmode If true display the contacts as text links
+ *	if false display the contacts as picture links
+
+ * @return string Formatted html
  */
 function micropro($contact, $redirect = false, $class = '', $textmode = false) {
 
-	if($class)
-		$class = ' ' . $class;
-
+	// Use the contact URL if no address is available
 	if ($contact["addr"] == "")
 		$contact["addr"] = $contact["url"];
 
@@ -933,26 +964,23 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
 		else
 			$url = zrl($url);
 	}
-	$click = ((x($contact,'click')) ? ' onclick="' . $contact['click'] . '" ' : '');
-	if($click)
+
+	// If there is some js available we don't need the url
+	if(x($contact,'click'))
 		$url = '';
-	if($textmode) {
-		return '<div class="contact-block-textdiv' . $class . '"><a class="contact-block-link' . $class . $sparkle
-			. (($click) ? ' fakelink' : '') . '" '
-			. (($redir) ? ' target="redir" ' : '')
-			. (($url) ? ' href="' . $url . '"' : '') . $click
-			. '" title="' . $contact['name'] . ' [' . $contact['addr'] . ']" alt="' . $contact['name']
-			. '" >'. $contact['name'] . '</a></div>' . "\r\n";
-	}
-	else {
-		return '<div class="contact-block-div' . $class . '"><a class="contact-block-link' . $class . $sparkle
-			. (($click) ? ' fakelink' : '') . '" '
-			. (($redir) ? ' target="redir" ' : '')
-			. (($url) ? ' href="' . $url . '"' : '') . $click . ' ><img class="contact-block-img' . $class . $sparkle . '" src="'
-			. proxy_url($contact['micro'], false, PROXY_SIZE_THUMB) . '" title="' . $contact['name'] . ' [' . $contact['addr'] . ']" alt="' . $contact['name']
-			. '" /></a></div>' . "\r\n";
-	}
-}}
+
+	return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),array(
+		'$click' => (($contact['click']) ? $contact['click'] : ''),
+		'$class' => $class,
+		'$url' => $url,
+		'$photo' => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB),
+		'$name' => $contact['name'],
+		'title' => $contact['name'] . ' [' . $contact['addr'] . ']',
+		'$parkle' => $sparkle,
+		'$redir' => $redir,
+
+	));
+}
 
 
 
@@ -969,7 +997,7 @@ function search($s,$id='search-box',$url='search',$save = false, $aside = true)
 	$a = get_app();
 
 	$values = array(
-			'$s' => $s,
+			'$s' => htmlspecialchars($s),
 			'$id' => $id,
 			'$action_url' => $url,
 			'$search_label' => t('Search'),
@@ -2068,7 +2096,7 @@ function formatBytes($bytes, $precision = 2) {
 
 /**
  * @brief translate and format the networkname of a contact
- * 
+ *
  * @param string $network
  *	Networkname of the contact (e.g. dfrn, rss and so on)
  * @param sting $url
@@ -2113,7 +2141,7 @@ function text_highlight($s,$lang) {
 	$s = trim(html_entity_decode($s,ENT_COMPAT));
 	$s = str_replace("    ","\t",$s);
 
-	// The highlighter library insists on an opening php tag for php code blocks. If 
+	// The highlighter library insists on an opening php tag for php code blocks. If
 	// it isn't present, nothing is highlighted. So we're going to see if it's present.
 	// If not, we'll add it, and then quietly remove it after we get the processed output back.
 
@@ -2122,7 +2150,7 @@ function text_highlight($s,$lang) {
 			$s = '<?php' . "\n" . $s;
 			$tag_added = true;
 		}
-	} 
+	}
 
 	$renderer = new Text_Highlighter_Renderer_HTML($options);
 	$hl = Text_Highlighter::factory($lang);