You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2014/12/11 02:47:24 UTC
[1/2] incubator-usergrid git commit: URL getter & setter for local
Usergrid installation.
Repository: incubator-usergrid
Updated Branches:
refs/heads/master 5b4fe7f04 -> cad90cd3b
URL getter & setter for local Usergrid installation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/adcc3df4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/adcc3df4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/adcc3df4
Branch: refs/heads/master
Commit: adcc3df4b387cfbc86e735d25d9d929d69b61ada
Parents: 3738906
Author: Dominik Bulaj <do...@bulaj.com>
Authored: Tue Nov 25 12:41:43 2014 +0100
Committer: Dominik Bulaj <do...@bulaj.com>
Committed: Tue Nov 25 12:41:43 2014 +0100
----------------------------------------------------------------------
sdks/php/lib/vendor/Apache/Usergrid/Client.php | 33 +++++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/adcc3df4/sdks/php/lib/vendor/Apache/Usergrid/Client.php
----------------------------------------------------------------------
diff --git a/sdks/php/lib/vendor/Apache/Usergrid/Client.php b/sdks/php/lib/vendor/Apache/Usergrid/Client.php
index af9dd45..cd0120d 100755
--- a/sdks/php/lib/vendor/Apache/Usergrid/Client.php
+++ b/sdks/php/lib/vendor/Apache/Usergrid/Client.php
@@ -46,13 +46,13 @@ class Client {
private $url = 'http://api.usergrid.com';
/**
- * Organization name. Find your in the Admin Portal
+ * Organization name. Find your in the Admin Portal
* @var string
*/
private $org_name;
/**
- * App name. Find your in the Admin Portal
+ * App name. Find your in the Admin Portal
* @var string
*/
private $app_name;
@@ -777,6 +777,35 @@ class Client {
return $notification;
}
+ /**
+ * Gets URL of Usergrid endpoint
+ *
+ * @return string
+ */
+ public function getUrl()
+ {
+ return $this->url;
+ }
+
+ /**
+ * Sets Usergrid endpoint URL
+ *
+ * @param string $url
+ * @return bool
+ * @throws UGException
+ */
+ public function setUrl($url)
+ {
+ if (filter_var($url, FILTER_VALIDATE_URL) !== false) {
+ $this->url = $url;
+ return true;
+ }
+ else {
+ if ($this->use_exceptions) {
+ throw new UGException('Invalid URL');
+ }
+ }
+ }
}
[2/2] incubator-usergrid git commit: Merge remote-tracking branch
'dominikbulaj/master' into apache_usergrid/master
Posted by ro...@apache.org.
Merge remote-tracking branch 'dominikbulaj/master' into apache_usergrid/master
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/cad90cd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/cad90cd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/cad90cd3
Branch: refs/heads/master
Commit: cad90cd3b50c77a142c4964f49f8817282e967e2
Parents: 5b4fe7f adcc3df
Author: Rod Simpson <ro...@apigee.com>
Authored: Wed Dec 10 18:47:18 2014 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Wed Dec 10 18:47:18 2014 -0700
----------------------------------------------------------------------
sdks/php/lib/vendor/Apache/Usergrid/Client.php | 33 +++++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
----------------------------------------------------------------------