Merge pull request #891 from dawnbreak/langlibs

Langlibs updates

3 files changed, 48 insertions, 33 deletions

diff --git a/include/feedutils.php b/include/feedutils.php
index 217da8188..62fa4849a 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1662,8 +1662,6 @@ function handle_feed($uid, $abook_id, $url) {
 /**
  * @brief Return a XML tag with author information.
  *
- * @hooks \b atom_author Possibility to add further tags to returned XML string
- *   * \e string The created XML tag as a string without closing tag
  * @param string $tag The XML tag to create
  * @param string $nick preferred username
  * @param string $name displayed name of the author
@@ -1672,7 +1670,7 @@ function handle_feed($uid, $abook_id, $url) {
  * @param int $w image width
  * @param string $type profile photo mime type
  * @param string $photo Fully qualified URL to a profile/avator photo
- * @return string
+ * @return string XML tag
  */
 function atom_author($tag, $nick, $name, $uri, $h, $w, $type, $photo) {
 	$o = '';
@@ -1695,6 +1693,11 @@ function atom_author($tag, $nick, $name, $uri, $h, $w, $type, $photo) {
 	$o .= '  <poco:preferredUsername>' . $nick . '</poco:preferredUsername>' . "\r\n";
 	$o .= '  <poco:displayName>' . $name . '</poco:displayName>' . "\r\n";
 
+	/**
+	 * @hooks atom_author
+	 *   Possibility to add further tags to returned XML string.
+	 *   * \e string The created XML tag as a string without closing tag
+	 */
 	call_hooks('atom_author', $o);
 
 	$o .= "</$tag>\r\n";
@@ -1703,17 +1706,23 @@ function atom_author($tag, $nick, $name, $uri, $h, $w, $type, $photo) {
 }
 
 
-function atom_render_author($tag,$xchan) {
+/**
+ * @brief Return an atom tag with author information from an xchan.
+ *
+ * @param string $tag
+ * @param array $xchan
+ * @return string
+ */
+function atom_render_author($tag, $xchan) {
 
-	
-	$nick = xmlify(substr($xchan['xchan_addr'],0,strpos($xchan['xchan_addr'],'@')));
+	$nick = xmlify(substr($xchan['xchan_addr'], 0, strpos($xchan['xchan_addr'], '@')));
 	$id   = xmlify($xchan['xchan_url']);
 	$name = xmlify($xchan['xchan_name']);
 	$photo = xmlify($xchan['xchan_photo_l']);
 	$type = xmlify($xchan['xchan_photo_mimetype']);
 	$w = $h = 300;
 
-	$o .= "<$tag>\r\n";
+	$o = "<$tag>\r\n";
 	$o .= "  <as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>\r\n";
 	$o .= "  <id>$id</id>\r\n";
 	$o .= "  <name>$nick</name>\r\n";
@@ -1724,13 +1733,16 @@ function atom_render_author($tag,$xchan) {
 	$o .= '  <poco:preferredUsername>' . $nick . '</poco:preferredUsername>' . "\r\n";
 	$o .= '  <poco:displayName>' . $name . '</poco:displayName>' . "\r\n";
 
+	/**
+	 * @hooks atom_render_author
+	 *   Possibility to add further tags to returned XML string.
+	 *   * \e string The created XML tag as a string without closing tag
+	 */
 	call_hooks('atom_render_author', $o);
 
 	$o .= "</$tag>\r\n";
 
 	return $o;
-
-
 }
 
 function compat_photos_list($s) {
diff --git a/include/help.php b/include/help.php
index 02c3cb8e4..0dc37e517 100644
--- a/include/help.php
+++ b/include/help.php
@@ -28,7 +28,7 @@ function get_help_content($tocpath = false) {
 	}
 
 	if($path) {
-		
+
 		$title = basename($path);
 		if(! $tocpath)
 			\App::$page['title'] = t('Help:') . ' ' . ucwords(str_replace('-',' ',notags($title)));
@@ -38,10 +38,10 @@ function get_help_content($tocpath = false) {
 		// available and so default back to the English TOC at /doc/toc.{html,bb,md}
 		// TODO: This is incompatible with the hierarchical TOC construction
 		// defined in /Zotlabs/Widget/Helpindex.php.
-		if($tocpath !== false && 
-			load_doc_file('doc/' . $path . '.md') === '' && 
-			load_doc_file('doc/' . $path . '.bb') === '' && 
-			load_doc_file('doc/' . $path . '.html') === '' 
+		if($tocpath !== false &&
+			load_doc_file('doc/' . $path . '.md') === '' &&
+			load_doc_file('doc/' . $path . '.bb') === '' &&
+			load_doc_file('doc/' . $path . '.html') === ''
 		  ) {
 			$path = $title;
 		}
@@ -120,22 +120,28 @@ function preg_callback_help_include($matches) {
 
 }
 
+/**
+ * @brief
+ *
+ * @return boolean|array
+ */
 function determine_help_language() {
-	require_once('Text/LanguageDetect.php');
 	$lang_detect = new Text_LanguageDetect();
 	// Set this mode to recognize language by the short code like "en", "ru", etc.
 	$lang_detect->setNameMode(2);
-	// If the language was specified in the URL, override the language preference 
+	// If the language was specified in the URL, override the language preference
 	// of the browser. Default to English if both of these are absent.
 	if($lang_detect->languageExists(argv(1))) {
 		$lang = argv(1);
 		$from_url = true;
 	} else {
 		$lang = \App::$language;
-		if(! isset($lang)) 
+		if(! isset($lang))
 			$lang = 'en';
+
 		$from_url = false;
 	}
+
 	return array('language' => $lang, 'from_url' => $from_url);
 }
 
@@ -145,14 +151,14 @@ function load_doc_file($s) {
 	$x = determine_help_language();
 	$lang = $x['language'];
 	$url_idx = ($x['from_url'] ? 1 : 0);
-	// The English translation is at the root of /doc/. Other languages are in 
+	// The English translation is at the root of /doc/. Other languages are in
 	// subfolders named by the language code such as "de", "es", etc.
 	if($lang !== 'en') {
-		$path .= '/' . $lang;	
+		$path .= '/' . $lang;
 	}
 
 	$b = basename($s);
-	
+
 	for($i=1+$url_idx; $i<argc()-1; $i++) {
 		$path .= '/' . argv($i);
 	}
diff --git a/include/language.php b/include/language.php
index efe9397fb..f6f266685 100644
--- a/include/language.php
+++ b/include/language.php
@@ -8,6 +8,7 @@
  * language related tasks.
  */
 
+use CommerceGuys\Intl\Language\LanguageRepository;
 
 /**
  * @brief Get the browser's submitted preferred languages.
@@ -17,7 +18,7 @@
  *
  * Get the language setting directly from system variables, bypassing get_config()
  * as database may not yet be configured.
- * 
+ *
  * If possible, we use the value from the browser.
  *
  * @return array with ordered list of preferred languages from browser
@@ -28,7 +29,7 @@ function get_browser_language() {
 
 	if (x($_SERVER, 'HTTP_ACCEPT_LANGUAGE')) {
 		// break up string into pieces (languages and q factors)
-		preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', 
+		preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i',
 			$_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);
 
 		if (count($lang_parse[1])) {
@@ -40,7 +41,7 @@ function get_browser_language() {
 				if ($val === '') $langs[$lang] = 1;
 			}
 
-			// sort list based on value	
+			// sort list based on value
 			arsort($langs, SORT_NUMERIC);
 		}
 	}
@@ -52,7 +53,7 @@ function get_browser_language() {
  * @brief Returns the best language for which also a translation exists.
  *
  * This function takes the results from get_browser_language() and compares it
- * with the available translations and returns the best fitting language for 
+ * with the available translations and returns the best fitting language for
  * which there exists a translation.
  *
  * If there is no match fall back to config['system']['language']
@@ -243,11 +244,9 @@ function string_plural_select_default($n) {
  *
  * @see http://pear.php.net/package/Text_LanguageDetect
  * @param string $s A string to examine
- * @return Language code in 2-letter ISO 639-1 (en, de, fr) format
+ * @return string Language code in 2-letter ISO 639-1 (en, de, fr) format
  */
 function detect_language($s) {
-	require_once('Text/LanguageDetect.php');
-
 	$min_length = get_config('system', 'language_detect_min_length');
 	if ($min_length === false)
 		$min_length = LANGUAGE_DETECT_MIN_LENGTH;
@@ -257,7 +256,7 @@ function detect_language($s) {
 		$min_confidence = LANGUAGE_DETECT_MIN_CONFIDENCE;
 
 	// embedded apps have long base64 strings which will trip up the detector.
-	$naked_body = preg_replace('/\[app\](.*?)\[\/app\]/','',$s);
+	$naked_body = preg_replace('/\[app\](.*?)\[\/app\]/', '', $s);
 	// strip off bbcode
 	$naked_body = preg_replace('/\[(.+?)\]/', '', $naked_body);
 	if (mb_strlen($naked_body) < intval($min_length)) {
@@ -300,11 +299,7 @@ function detect_language($s) {
  * @param string $s Language code to look up
  * @param string $l (optional) In which language to return the name
  * @return string with the language name, or $s if unrecognized
- *
- * @todo include CommerceGuys\Intl through composer like SabreDAV.
  */
-require_once(__DIR__ . '/../library/intl/vendor/autoload.php');
-use CommerceGuys\Intl\Language\LanguageRepository;
 function get_language_name($s, $l = null) {
 	// get() expects the second part to be in upper case
 	if (strpos($s, '-') !== false) $s = substr($s, 0, 2) . strtoupper(substr($s, 2));
@@ -322,6 +317,8 @@ function get_language_name($s, $l = null) {
 			$language = $languageRepository->get($s, $l);
 		} catch (CommerceGuys\Intl\Exception\UnknownLanguageException $e) {
 			return $s; // Give up
+		} catch (CommerceGuys\Intl\Exception\UnknownLocaleException $e) {
+			return $s; // Give up
 		}
 	}
 
@@ -379,7 +376,7 @@ function lang_selector() {
 	$o = replace_macros($tpl, array(
 		'$title' => t('Select an alternate language'),
 		'$langs' => array($lang_options, $selected),
-		
+
 	));
 
 	return $o;