aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-12 15:31:14 -0700
committerzotlabs <mike@macgirvin.com>2016-10-12 15:31:14 -0700
commitfc7d29edd360da4b9de78ba15de458367a6b8121 (patch)
treea859e6f3fa63a62e7c54789f2bd83ee68e0afddc
parent4f7d14dfb2a73437ec37b672a711a594186f101e (diff)
downloadvolse-hubzilla-fc7d29edd360da4b9de78ba15de458367a6b8121.tar.gz
volse-hubzilla-fc7d29edd360da4b9de78ba15de458367a6b8121.tar.bz2
volse-hubzilla-fc7d29edd360da4b9de78ba15de458367a6b8121.zip
some more api work
-rw-r--r--Zotlabs/Module/Api.php16
-rw-r--r--include/api.php4
2 files changed, 10 insertions, 10 deletions
diff --git a/Zotlabs/Module/Api.php b/Zotlabs/Module/Api.php
index 4fd59acc4..0f2ca1e47 100644
--- a/Zotlabs/Module/Api.php
+++ b/Zotlabs/Module/Api.php
@@ -17,13 +17,13 @@ class Api extends \Zotlabs\Web\Controller {
function get() {
- if(\App::$cmd=='api/oauth/authorize'){
+ if(\App::$cmd === 'api/oauth/authorize'){
/*
* api/oauth/authorize interact with the user. return a standard page
*/
- \App::$page['template'] = "minimal";
+ \App::$page['template'] = 'minimal';
// get consumer/client from request token
try {
@@ -42,8 +42,8 @@ class Api extends \Zotlabs\Web\Controller {
$consumer = new OAuth1Consumer($app['client_id'], $app['pw'], $app['redirect_uri']);
- $verifier = md5($app['secret'].local_channel());
- set_config("oauth", $verifier, local_channel());
+ $verifier = md5($app['secret'] . local_channel());
+ set_config('oauth', $verifier, local_channel());
if($consumer->callback_url != null) {
@@ -78,11 +78,11 @@ class Api extends \Zotlabs\Web\Controller {
$tpl = get_markup_template('oauth_authorize.tpl');
$o = replace_macros($tpl, array(
- '$title' => t('Authorize application connection'),
- '$app' => $app,
+ '$title' => t('Authorize application connection'),
+ '$app' => $app,
'$authorize' => t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'),
- '$yes' => t('Yes'),
- '$no' => t('No'),
+ '$yes' => t('Yes'),
+ '$no' => t('No'),
));
//echo "<pre>"; var_dump($app); killme();
diff --git a/include/api.php b/include/api.php
index f711e0649..eec3e007b 100644
--- a/include/api.php
+++ b/include/api.php
@@ -229,7 +229,7 @@ require_once('include/api_zot.php');
$r = q("SELECT COUNT(id) as total FROM item
WHERE uid = %d
AND item_wall = 1 $item_normal
- AND allow_cid='' AND allow_gid='' AND deny_cid='' AND deny_gid=''
+ AND allow_cid = '' AND allow_gid = '' AND deny_cid = '' AND deny_gid = ''
AND item_private = 0 ",
intval($usr[0]['channel_id'])
);
@@ -241,7 +241,7 @@ require_once('include/api_zot.php');
else {
$r = q("SELECT COUNT(id) as total FROM item
WHERE author_xchan = '%s'
- AND allow_cid='' AND allow_gid='' AND deny_cid='' AND deny_gid=''
+ AND allow_cid = '' AND allow_gid = '' AND deny_cid = '' AND deny_gid = ''
AND item_private = 0 ",
intval($uinfo[0]['xchan_hash'])
);