harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source
This commit is contained in:
redmatrix 2015-05-14 22:12:37 -07:00
commit 291f3beccf
4 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 ); define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1140 ); define ( 'DB_UPDATE_VERSION', 1141 );
/** /**
* @brief Constant with a HTML line break. * @brief Constant with a HTML line break.

23
install/update.php
View File

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1140 ); define( 'UPDATE_VERSION' , 1141 );
/** /**
* *
@ -1603,3 +1603,24 @@ function update_r1139() {
return UPDATE_FAILED; return UPDATE_FAILED;
} }
function update_r1140() {
$r = q("select * from clients where true");
$x = false;
if($r) {
foreach($r as $rr) {
$m = q("INSERT INTO xperm (xp_client, xp_channel, xp_perm) VALUES ('%s', %d, '%s') ",
dbesc($rr['client_id']),
intval($rr['uid']),
dbesc('all')
);
if(! $m)
$x = true;
}
}
if($x)
return UPDATE_FAILED;
return UPDATE_SUCCESS;
}

13
mod/settings.php
View File

@ -95,18 +95,23 @@ function settings_post(&$a) {
dbesc($name), dbesc($name),
dbesc($redirect), dbesc($redirect),
dbesc($icon), dbesc($icon),
local_channel(), intval(local_channel()),
dbesc($key)); dbesc($key));
} else { } else {
$r = q("INSERT INTO clients $r = q("INSERT INTO clients (client_id, pw, name, redirect_uri, icon, uid)
(client_id, pw, name, redirect_uri, icon, uid)
VALUES ('%s','%s','%s','%s','%s',%d)", VALUES ('%s','%s','%s','%s','%s',%d)",
dbesc($key), dbesc($key),
dbesc($secret), dbesc($secret),
dbesc($name), dbesc($name),
dbesc($redirect), dbesc($redirect),
dbesc($icon), dbesc($icon),
local_channel()); intval(local_channel())
);
$r = q("INSERT INTO xperm (xp_client, xp_channel, xp_perm) VALUES ('%s', %d, '%s') ",
dbesc($key),
intval(local_channel()),
dbesc('all')
);
} }
} }
goaway($a->get_baseurl(true)."/settings/oauth/"); goaway($a->get_baseurl(true)."/settings/oauth/");

2
version.inc
View File

@ -1 +1 @@
2015-05-13.1031 2015-05-14.1032