From 4cab74c18cf237eae6c57baea2b1d4fd260fe590 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Thu, 3 Dec 2015 21:05:48 -0800
Subject: use the channel blacklist for items and mail, still todo: directory
 and stuff

---
 include/plugin.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'include/plugin.php')

diff --git a/include/plugin.php b/include/plugin.php
index 1d4caac0f..1f4d60736 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -495,6 +495,15 @@ function format_css_if_exists($source) {
 		return '<link rel="stylesheet" href="' . script_path() . '/' . $path . '" type="text/css" media="' . $source[1] . '">' . "\r\n";
 }
 
+/*
+ * This basically calculates the baseurl. We have other functions to do that, but
+ * there was an issue with script paths and mixed-content whose details are arcane 
+ * and perhaps lost in the message archives. The short answer is that we're ignoring 
+ * the URL which we are "supposed" to use, and generating script paths relative to 
+ * the URL which we are currently using; in order to ensure they are found and aren't
+ * blocked due to mixed content issues. 
+ */
+
 function script_path() {
 	if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
 		$scheme = 'https';
-- 
cgit v1.2.3


From ed5ca9e4ccb2741c33ac2c88082728066bc715fb Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Fri, 18 Dec 2015 14:55:19 -0800
Subject: use realpath to bypass symlinks and check actually directory

---
 include/plugin.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'include/plugin.php')

diff --git a/include/plugin.php b/include/plugin.php
index 1f4d60736..4a35a0170 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -636,3 +636,13 @@ function get_std_version() {
 		return STD_VERSION;
 	return '0.0.0';
 }
+
+
+function folder_exists($folder)
+{
+    // Get canonicalized absolute pathname
+    $path = realpath($folder);
+
+    // If it exist, check if it's a directory
+    return (($path !== false) && is_dir($path)) ? $path : false;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 36717e5f32a154582a2069ebc60e4fa256bb9f90 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Tue, 22 Dec 2015 19:53:00 -0800
Subject: start on refactor of plugin/theme/widget info block parsing

---
 include/plugin.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'include/plugin.php')

diff --git a/include/plugin.php b/include/plugin.php
index 4a35a0170..4da73dfd8 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -313,7 +313,6 @@ function call_hooks($name, &$data = null) {
  *   * Version: 1.2.3
  *   * Author: John <profile url>
  *   * Author: Jane <email>
- *   * Compat: Red [(version)], Friendica [(version)]
  *   *
  *\endcode
  * @param string $plugin the name of the plugin
@@ -325,8 +324,8 @@ function get_plugin_info($plugin){
 		'name' => $plugin,
 		'description' => '',
 		'author' => array(),
-		'version' => '',
-		'compat' => ''
+		'maintainer' => array(),
+		'version' => ''
 	);
 
 	if (!is_file("addon/$plugin/$plugin.php"))
@@ -342,22 +341,23 @@ function get_plugin_info($plugin){
 			if ($l != ""){
 				list($k, $v) = array_map("trim", explode(":", $l, 2));
 				$k = strtolower($k);
-				if ($k == 'author'){
+				if ($k == 'author' || $k == 'maintainer'){
 					$r = preg_match("|([^<]+)<([^>]+)>|", $v, $m);
 					if ($r) {
-						$info['author'][] = array('name' => $m[1], 'link' => $m[2]);
+						$info[$k][] = array('name' => $m[1], 'link' => $m[2]);
 					} else {
-						$info['author'][] = array('name' => $v);
+						$info[$k][] = array('name' => $v);
 					}
 				} else {
-					if (array_key_exists($k, $info)){
+//					if (array_key_exists($k, $info)){
 						$info[$k] = $v;
-					}
+//					}
 				}
 			}
 		}
 	}
 
+
 	return $info;
 }
 
-- 
cgit v1.2.3