Merge remote-tracking branch 'upstream/dev' into dev

4 files changed, 3 insertions, 90 deletions

diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index 5cbf45daa..e01c3b49a 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -173,7 +173,7 @@ class Ping extends \Zotlabs\Web\Controller {
 					);
 					break;
 				case 'all_events':
-					$r = q("update event set `dimissed` = 1 where `dismissed` = 0 and uid = %d AND dtstart < '%s' AND dtstart > '%s' ",
+					$r = q("update event set `dismissed` = 1 where `dismissed` = 0 and uid = %d AND dtstart < '%s' AND dtstart > '%s' ",
 						intval(local_channel()),
 						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
 						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
diff --git a/Zotlabs/Module/Ratingsearch.php b/Zotlabs/Module/Ratingsearch.php
index b595e16b1..dcbfd6a9b 100644
--- a/Zotlabs/Module/Ratingsearch.php
+++ b/Zotlabs/Module/Ratingsearch.php
@@ -58,7 +58,8 @@ class Ratingsearch extends \Zotlabs\Web\Controller {
 		$ret['success'] = true;
 	
 		$r = q("select * from xlink left join xchan on xlink_xchan = xchan_hash 
-			where xlink_link = '%s' and xlink_rating != 0 and xlink_static = 1 and xchan_orphan = 0 and xchan_deleted = 0 
+			where xlink_link = '%s' and xlink_rating != 0 and xlink_static = 1 
+			and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 
 			order by xchan_name asc",
 			dbesc($target)
 		);
diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php
index 26b0c46a6..9252d1f1d 100644
--- a/Zotlabs/Module/Rmagic.php
+++ b/Zotlabs/Module/Rmagic.php
@@ -2,7 +2,6 @@
 namespace Zotlabs\Module;
 
 
-
 class Rmagic extends \Zotlabs\Web\Controller {
 
 	function init() {
@@ -32,18 +31,6 @@ class Rmagic extends \Zotlabs\Web\Controller {
 			$arr = array('address' => $address);
 			call_hooks('reverse_magic_auth', $arr);		
 	
-			try {
-				require_once('library/openid/openid.php');
-				$openid = new \LightOpenID(z_root());
-				$openid->identity = $address;
-				$openid->returnUrl = z_root() . '/openid'; 
-				$openid->required = array('namePerson/friendly', 'namePerson');
-				$openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
-				goaway($openid->authUrl());
-			} catch (\Exception $e) {
-				notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'. t('The error message was:').' '.$e->getMessage());
-			}
-	
 			// if they're still here...
 			notice( t('Authentication failed.') . EOL);		
 			return;
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index 0d1d4e791..93c55bd4c 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -70,81 +70,6 @@ class Browser extends DAV\Browser\Plugin {
 	}
 
 	/**
-	 * Extend from parent to add our own listeners
-	 */
-	function initialize(DAV\Server $server) {
-		parent::initialize($server);
-		if ($this->enablePost) {
-			$this->server->on('onBrowserPostAction', [$this, 'cloudPostAction']);
-		}
-	}
-
-	/**
-	 * Handles POST requests for tree operations.
-	 *
-	 * @param string $uri
-	 * @param string $action
-	 * @param array $postVars
-	 * @return boolean false will stop other events in the beforeMethod chain to execute
-	 */
-	function cloudPostAction($uri, $action, $postVars) {
-		switch ($postVars['sabreAction']) {
-			case 'mkcol' :
-				if (isset($postVars['name']) && trim($postVars['name'])) {
-					// Using basename() because we won't allow slashes
-					list(, $folderName) = \Sabre\HTTP\URLUtil::splitPath(trim($postVars['name']));
-
-					if (isset($postVars['resourceType'])) {
-						$resourceType = explode(',', $postVars['resourceType']);
-					} else {
-						$resourceType = ['{DAV:}collection'];
-					}
-
-					$properties = [];
-					foreach ($postVars as $varName => $varValue) {
-						// Any _POST variable in clark notation is treated
-						// like a property.
-						if ($varName[0] === '{') {
-							// PHP will convert any dots to underscores.
-							// This leaves us with no way to differentiate
-							// the two.
-							// Therefore we replace the string *DOT* with a
-							// real dot. * is not allowed in uris so we
-							// should be good.
-							$varName = str_replace('*DOT*', '.', $varName);
-							$properties[$varName] = $varValue;
-						}
-					}
-
-					$mkCol = new DAV\MkCol(
-						$resourceType,
-						$properties
-					);
-					$this->server->createCollection($uri . '/' . $folderName, $mkCol);
-				}
-				break;
-
-			case 'put' :
-
-				if ($_FILES)
-					$file = current($_FILES);
-				else
-					break;
-
-				for ($i = 0; $i < count($file['name']); $i++) {
-					list(, $newName) = \Sabre\HTTP\URLUtil::splitPath(trim($file['name'][$i]));
-
-					if (is_uploaded_file($file['tmp_name'][$i])) {
-						$this->server->createFile($uri . '/' . $newName, fopen($file['tmp_name'][$i], 'r'));
-					}
-				}
-				break;
-
-		}
-		return false;
-	}
-
-	/**
 	 * @brief Creates the directory listing for the given path.
 	 *
 	 * @param string $path which should be displayed