Changeset 505

Timestamp:

Mar 23, 2015 10:06:42 PM (9 years ago)

Author:

anonymous

Message:

Added hyperlinkTxt(). Fixed setParam() to apply some settings during runtime.

Location:

trunk/lib

Files:

• App.inc.php (modified) (2 diffs)
• Utilities.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -131 +131 @@
         'error_reporting' => E_ALL,
 
-        // Don't display errors by default; it is preferable to log them to a file.
+        // Don't display errors by default; it is preferable to log them to a file. For CLI scripts, set this to the string 'stderr'.
         'display_errors' => false,
 
@@ -224 +224 @@
             // Merge new parameters with old overriding only those passed.
             $this->_params = array_merge($this->_params, $param);
+
+            if ($this->running) {
+                // Params that require processing if changed during runtime.
+                foreach ($param as $key => $val) {
+                    switch ($key) {
+                    case 'session_name':
+                        session_name($val);
+                        break;
+
+                    case 'session_use_cookies':
+                        ini_set('session.use_cookies', $val);
+                        break;
+
+                    case 'error_reporting':
+                        ini_set('error_reporting', $val);
+                        break;
+
+                    case 'display_errors':
+                        ini_set('display_errors', $val);
+                        break;
+
+                    case 'log_errors':
+                        ini_set('log_errors', true);
+                        break;
+
+                    case 'log_directory':
+                        if (is_dir($val) && is_writable($val)) {
+                            ini_set('error_log', $val . '/' . $this->getParam('php_error_log'));
+                        }
+                        break;
+                    }
+                }
+            }
         }
     }

trunk/lib/Utilities.inc.php

@@ -135 +135 @@
 
 /**
- * Returns text with appropriate html translations.
+ * Returns text with appropriate html translations (a smart wrapper for htmlspecialchars()).
  *
  * @param  string $text             Text to clean.
@@ -208 +208 @@
 
     return preg_replace($search, $replace, $text);
+}
+
+/*
+* Finds all URLs in text and hyperlinks them.
+*
+* @access   public
+* @param    string  $text   Text to search for URLs.
+* @param    mixed   $length Number of characters to truncate URL, or NULL to disable truncating.
+* @param    string  $delim  Delimiter to append, indicate truncation.
+* @return   string          Same input text, but URLs hyperlinked.
+* @author   Quinn Comendant <quinn@strangecode.com>
+* @version  1.0
+* @since    22 Mar 2015 23:29:04
+*/
+function hyperlinkTxt($text, $length=null, $delim='
')
+{
+    return preg_replace_callback(
+        // Inspired by @stephenhay's regex from https://mathiasbynens.be/demo/url-regex
+        // Here we capture the full URL into the first match and only the first X characters into the second match.
+        sprintf('@\b(?<!")(?<!\')(?<!=)(((?:https?|s?ftps?)://[^\s/$.?#].[^\s]{0,%s})[^\s]*)@iS', $length),
+        // Use an anonymous function to decide when to append the delim.
+        // Also encode special chars with oTxt().
+        function ($m) use ($length, $delim) {
+            if (is_null($length) || $m[1] == $m[2]) {
+                // If not truncating, or URL was not truncated.
+                return sprintf('<a href="%s">%s</a>', oTxt($m[1]), oTxt($m[1]));
+            } else {
+                // Truncated URL.
+                return sprintf('<a href="%s">%s%s</a>', oTxt($m[1]), oTxt(trim($m[2])), $delim);
+            }
+        },
+        $text
+    );
 }