mirror of
https://github.com/friendica/friendica
synced 2024-12-23 14:00:15 +00:00
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server
This commit is contained in:
commit
88a69b93d5
5 changed files with 341 additions and 255 deletions
|
@ -123,6 +123,8 @@ function cron_run(&$argv, &$argc){
|
||||||
|
|
||||||
update_contact_birthdays();
|
update_contact_birthdays();
|
||||||
|
|
||||||
|
proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server");
|
||||||
|
|
||||||
proc_run(PRIORITY_LOW, "include/discover_poco.php", "suggestions");
|
proc_run(PRIORITY_LOW, "include/discover_poco.php", "suggestions");
|
||||||
|
|
||||||
set_config('system','last_expire_day',$d2);
|
set_config('system','last_expire_day',$d2);
|
||||||
|
|
|
@ -35,6 +35,7 @@ function discover_poco_run(&$argv, &$argc){
|
||||||
- checkcontact: Updates gcontact entries
|
- checkcontact: Updates gcontact entries
|
||||||
- suggestions: Discover other servers for their contacts.
|
- suggestions: Discover other servers for their contacts.
|
||||||
- server <poco url>: Searches for the poco server list. "poco url" is base64 encoded.
|
- server <poco url>: Searches for the poco server list. "poco url" is base64 encoded.
|
||||||
|
- update_server: Frequently check the first 250 servers for vitality.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if(($argc > 2) && ($argv[1] == "dirsearch")) {
|
if(($argc > 2) && ($argv[1] == "dirsearch")) {
|
||||||
|
@ -46,6 +47,8 @@ function discover_poco_run(&$argv, &$argc){
|
||||||
$mode = 3;
|
$mode = 3;
|
||||||
} elseif(($argc == 3) && ($argv[1] == "server")) {
|
} elseif(($argc == 3) && ($argv[1] == "server")) {
|
||||||
$mode = 4;
|
$mode = 4;
|
||||||
|
} elseif(($argc == 2) && ($argv[1] == "update_server")) {
|
||||||
|
$mode = 5;
|
||||||
} elseif ($argc == 1) {
|
} elseif ($argc == 1) {
|
||||||
$search = "";
|
$search = "";
|
||||||
$mode = 0;
|
$mode = 0;
|
||||||
|
@ -64,7 +67,9 @@ function discover_poco_run(&$argv, &$argc){
|
||||||
|
|
||||||
logger('start '.$search);
|
logger('start '.$search);
|
||||||
|
|
||||||
if ($mode == 4) {
|
if ($mode == 5) {
|
||||||
|
update_server();
|
||||||
|
} elseif ($mode == 4) {
|
||||||
$server_url = base64_decode($argv[2]);
|
$server_url = base64_decode($argv[2]);
|
||||||
if ($server_url == "") {
|
if ($server_url == "") {
|
||||||
return;
|
return;
|
||||||
|
@ -102,6 +107,33 @@ function discover_poco_run(&$argv, &$argc){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Updates the first 250 servers
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
function update_server() {
|
||||||
|
$r = q("SELECT `url`, `created`, `last_failure`, `last_contact` FROM `gserver` ORDER BY rand()");
|
||||||
|
|
||||||
|
if (!dbm::is_result($r)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$updated = 0;
|
||||||
|
|
||||||
|
foreach ($r AS $server) {
|
||||||
|
if (!poco_do_update($server["created"], "", $server["last_failure"], $server["last_contact"])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
logger('Update server status for server '.$server["url"], LOGGER_DEBUG);
|
||||||
|
|
||||||
|
proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($server["url"]));
|
||||||
|
|
||||||
|
if (++$updated > 250) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function discover_users() {
|
function discover_users() {
|
||||||
logger("Discover users", LOGGER_DEBUG);
|
logger("Discover users", LOGGER_DEBUG);
|
||||||
|
|
||||||
|
|
|
@ -72,8 +72,9 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
$ch = @curl_init($url);
|
$ch = @curl_init($url);
|
||||||
if(($redirects > 8) || (! $ch))
|
if(($redirects > 8) || (! $ch)) {
|
||||||
return false;
|
return $ret;
|
||||||
|
}
|
||||||
|
|
||||||
@curl_setopt($ch, CURLOPT_HEADER, true);
|
@curl_setopt($ch, CURLOPT_HEADER, true);
|
||||||
|
|
||||||
|
|
330
mod/admin.php
330
mod/admin.php
|
@ -27,7 +27,7 @@ require_once("include/text.php");
|
||||||
function admin_post(App $a) {
|
function admin_post(App $a) {
|
||||||
|
|
||||||
|
|
||||||
if(!is_site_admin()) {
|
if (!is_site_admin()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ function admin_post(App $a) {
|
||||||
|
|
||||||
// urls
|
// urls
|
||||||
if ($a->argc > 1) {
|
if ($a->argc > 1) {
|
||||||
switch ($a->argv[1]){
|
switch ($a->argv[1]) {
|
||||||
case 'site':
|
case 'site':
|
||||||
admin_page_site_post($a);
|
admin_page_site_post($a);
|
||||||
break;
|
break;
|
||||||
|
@ -47,10 +47,10 @@ function admin_post(App $a) {
|
||||||
admin_page_users_post($a);
|
admin_page_users_post($a);
|
||||||
break;
|
break;
|
||||||
case 'plugins':
|
case 'plugins':
|
||||||
if($a->argc > 2 &&
|
if ($a->argc > 2 &&
|
||||||
is_file("addon/".$a->argv[2]."/".$a->argv[2].".php")) {
|
is_file("addon/".$a->argv[2]."/".$a->argv[2].".php")) {
|
||||||
@include_once("addon/".$a->argv[2]."/".$a->argv[2].".php");
|
@include_once("addon/".$a->argv[2]."/".$a->argv[2].".php");
|
||||||
if(function_exists($a->argv[2].'_plugin_admin_post')) {
|
if (function_exists($a->argv[2].'_plugin_admin_post')) {
|
||||||
$func = $a->argv[2].'_plugin_admin_post';
|
$func = $a->argv[2].'_plugin_admin_post';
|
||||||
$func($a);
|
$func($a);
|
||||||
}
|
}
|
||||||
|
@ -59,14 +59,16 @@ function admin_post(App $a) {
|
||||||
return; // NOTREACHED
|
return; // NOTREACHED
|
||||||
break;
|
break;
|
||||||
case 'themes':
|
case 'themes':
|
||||||
if($a->argc < 2) {
|
if ($a->argc < 2) {
|
||||||
if(is_ajax()) return;
|
if (is_ajax()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
goaway('admin/');
|
goaway('admin/');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$theme = $a->argv[2];
|
$theme = $a->argv[2];
|
||||||
if(is_file("view/theme/$theme/config.php")){
|
if (is_file("view/theme/$theme/config.php")) {
|
||||||
function __call_theme_admin_post(App $a, $theme) {
|
function __call_theme_admin_post(App $a, $theme) {
|
||||||
$orig_theme = $a->theme;
|
$orig_theme = $a->theme;
|
||||||
$orig_page = $a->page;
|
$orig_page = $a->page;
|
||||||
|
@ -77,8 +79,10 @@ function admin_post(App $a) {
|
||||||
|
|
||||||
|
|
||||||
$init = $theme."_init";
|
$init = $theme."_init";
|
||||||
if(function_exists($init)) $init($a);
|
if (function_exists($init)) {
|
||||||
if(function_exists("theme_admin_post")) {
|
$init($a);
|
||||||
|
}
|
||||||
|
if (function_exists("theme_admin_post")) {
|
||||||
$admin_form = theme_admin_post($a);
|
$admin_form = theme_admin_post($a);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -90,8 +94,9 @@ function admin_post(App $a) {
|
||||||
__call_theme_admin_post($a, $theme);
|
__call_theme_admin_post($a, $theme);
|
||||||
}
|
}
|
||||||
info(t('Theme settings updated.'));
|
info(t('Theme settings updated.'));
|
||||||
if(is_ajax()) return;
|
if (is_ajax()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
goaway('admin/themes/'.$theme);
|
goaway('admin/themes/'.$theme);
|
||||||
return;
|
return;
|
||||||
break;
|
break;
|
||||||
|
@ -130,7 +135,7 @@ function admin_post(App $a) {
|
||||||
*/
|
*/
|
||||||
function admin_content(App $a) {
|
function admin_content(App $a) {
|
||||||
|
|
||||||
if(!is_site_admin()) {
|
if (!is_site_admin()) {
|
||||||
return login(false);
|
return login(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -168,7 +173,7 @@ function admin_content(App $a) {
|
||||||
|
|
||||||
$r = q("SELECT `name` FROM `addon` WHERE `plugin_admin` = 1 ORDER BY `name`");
|
$r = q("SELECT `name` FROM `addon` WHERE `plugin_admin` = 1 ORDER BY `name`");
|
||||||
$aside_tools['plugins_admin']=array();
|
$aside_tools['plugins_admin']=array();
|
||||||
foreach ($r as $h){
|
foreach ($r as $h) {
|
||||||
$plugin =$h['name'];
|
$plugin =$h['name'];
|
||||||
$aside_tools['plugins_admin'][] = array("admin/plugins/".$plugin, $plugin, "plugin");
|
$aside_tools['plugins_admin'][] = array("admin/plugins/".$plugin, $plugin, "plugin");
|
||||||
// temp plugins with admin
|
// temp plugins with admin
|
||||||
|
@ -199,8 +204,8 @@ function admin_content(App $a) {
|
||||||
*/
|
*/
|
||||||
$o = '';
|
$o = '';
|
||||||
// urls
|
// urls
|
||||||
if($a->argc > 1) {
|
if ($a->argc > 1) {
|
||||||
switch ($a->argv[1]){
|
switch ($a->argv[1]) {
|
||||||
case 'site':
|
case 'site':
|
||||||
$o = admin_page_site($a);
|
$o = admin_page_site($a);
|
||||||
break;
|
break;
|
||||||
|
@ -238,7 +243,7 @@ function admin_content(App $a) {
|
||||||
$o = admin_page_summary($a);
|
$o = admin_page_summary($a);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_ajax()) {
|
if (is_ajax()) {
|
||||||
echo $o;
|
echo $o;
|
||||||
killme();
|
killme();
|
||||||
return '';
|
return '';
|
||||||
|
@ -310,19 +315,21 @@ function admin_page_federation(App $a) {
|
||||||
// in the DB the Diaspora versions have the format x.x.x.x-xx the last
|
// in the DB the Diaspora versions have the format x.x.x.x-xx the last
|
||||||
// part (-xx) should be removed to clean up the versions from the "head
|
// part (-xx) should be removed to clean up the versions from the "head
|
||||||
// commit" information and combined into a single entry for x.x.x.x
|
// commit" information and combined into a single entry for x.x.x.x
|
||||||
if($p=='Diaspora') {
|
if ($p == 'Diaspora') {
|
||||||
$newV = array();
|
$newV = array();
|
||||||
$newVv = array();
|
$newVv = array();
|
||||||
foreach($v as $vv) {
|
foreach ($v as $vv) {
|
||||||
$newVC = $vv['total'];
|
$newVC = $vv['total'];
|
||||||
$newVV = $vv['version'];
|
$newVV = $vv['version'];
|
||||||
$posDash = strpos($newVV, '-');
|
$posDash = strpos($newVV, '-');
|
||||||
if($posDash)
|
if ($posDash) {
|
||||||
$newVV = substr($newVV, 0, $posDash);
|
$newVV = substr($newVV, 0, $posDash);
|
||||||
if(isset($newV[$newVV]))
|
}
|
||||||
|
if (isset($newV[$newVV])) {
|
||||||
$newV[$newVV] += $newVC;
|
$newV[$newVV] += $newVC;
|
||||||
else
|
} else {
|
||||||
$newV[$newVV] = $newVC;
|
$newV[$newVV] = $newVC;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
foreach ($newV as $key => $value) {
|
foreach ($newV as $key => $value) {
|
||||||
array_push($newVv, array('total'=>$value, 'version'=>$key));
|
array_push($newVv, array('total'=>$value, 'version'=>$key));
|
||||||
|
@ -333,7 +340,7 @@ function admin_page_federation(App $a) {
|
||||||
// early friendica versions have the format x.x.xxxx where xxxx is the
|
// early friendica versions have the format x.x.xxxx where xxxx is the
|
||||||
// DB version stamp; those should be operated out and versions be
|
// DB version stamp; those should be operated out and versions be
|
||||||
// conbined
|
// conbined
|
||||||
if($p=='Friendi%%a') {
|
if ($p == 'Friendi%%a') {
|
||||||
$newV = array();
|
$newV = array();
|
||||||
$newVv = array();
|
$newVv = array();
|
||||||
foreach ($v as $vv) {
|
foreach ($v as $vv) {
|
||||||
|
@ -341,12 +348,14 @@ function admin_page_federation(App $a) {
|
||||||
$newVV = $vv['version'];
|
$newVV = $vv['version'];
|
||||||
$lastDot = strrpos($newVV,'.');
|
$lastDot = strrpos($newVV,'.');
|
||||||
$len = strlen($newVV)-1;
|
$len = strlen($newVV)-1;
|
||||||
if(($lastDot == $len-4) && (!strrpos($newVV,'-rc')==$len-3))
|
if (($lastDot == $len-4) && (!strrpos($newVV,'-rc') == $len-3)) {
|
||||||
$newVV = substr($newVV, 0, $lastDot);
|
$newVV = substr($newVV, 0, $lastDot);
|
||||||
if(isset($newV[$newVV]))
|
}
|
||||||
|
if (isset($newV[$newVV])) {
|
||||||
$newV[$newVV] += $newVC;
|
$newV[$newVV] += $newVC;
|
||||||
else
|
} else {
|
||||||
$newV[$newVV] = $newVC;
|
$newV[$newVV] = $newVC;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
foreach ($newV as $key => $value) {
|
foreach ($newV as $key => $value) {
|
||||||
array_push($newVv, array('total'=>$value, 'version'=>$key));
|
array_push($newVv, array('total'=>$value, 'version'=>$key));
|
||||||
|
@ -455,7 +464,10 @@ function admin_page_summary(App $a) {
|
||||||
);
|
);
|
||||||
|
|
||||||
$users=0;
|
$users=0;
|
||||||
foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+= $u['count']; }
|
foreach ($r as $u) {
|
||||||
|
$accounts[$u['page-flags']][1] = $u['count'];
|
||||||
|
$users+= $u['count'];
|
||||||
|
}
|
||||||
|
|
||||||
logger('accounts: '.print_r($accounts,true),LOGGER_DATA);
|
logger('accounts: '.print_r($accounts,true),LOGGER_DATA);
|
||||||
|
|
||||||
|
@ -506,19 +518,19 @@ function admin_page_summary(App $a) {
|
||||||
* @param App $a
|
* @param App $a
|
||||||
*/
|
*/
|
||||||
function admin_page_site_post(App $a) {
|
function admin_page_site_post(App $a) {
|
||||||
if(!x($_POST,"page_site")) {
|
if (!x($_POST,"page_site")) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
|
check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
|
||||||
|
|
||||||
// relocate
|
// relocate
|
||||||
if(x($_POST,'relocate') && x($_POST,'relocate_url') && $_POST['relocate_url']!="") {
|
if (x($_POST,'relocate') && x($_POST,'relocate_url') && $_POST['relocate_url'] != "") {
|
||||||
$new_url = $_POST['relocate_url'];
|
$new_url = $_POST['relocate_url'];
|
||||||
$new_url = rtrim($new_url,"/");
|
$new_url = rtrim($new_url,"/");
|
||||||
|
|
||||||
$parsed = @parse_url($new_url);
|
$parsed = @parse_url($new_url);
|
||||||
if(!$parsed || (!x($parsed,'host') || !x($parsed,'scheme'))) {
|
if (!$parsed || (!x($parsed,'host') || !x($parsed,'scheme'))) {
|
||||||
notice(t("Can not parse base url. Must have at least <scheme>://<domain>"));
|
notice(t("Can not parse base url. Must have at least <scheme>://<domain>"));
|
||||||
goaway('admin/site');
|
goaway('admin/site');
|
||||||
}
|
}
|
||||||
|
@ -551,7 +563,7 @@ function admin_page_site_post(App $a) {
|
||||||
|
|
||||||
$q = sprintf("UPDATE %s SET %s;", $table_name, $upds);
|
$q = sprintf("UPDATE %s SET %s;", $table_name, $upds);
|
||||||
$r = q($q);
|
$r = q($q);
|
||||||
if(!$r) {
|
if (!$r) {
|
||||||
notice("Failed updating '$table_name': ".$db->error);
|
notice("Failed updating '$table_name': ".$db->error);
|
||||||
goaway('admin/site');
|
goaway('admin/site');
|
||||||
}
|
}
|
||||||
|
@ -669,14 +681,14 @@ function admin_page_site_post(App $a) {
|
||||||
$worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False);
|
$worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False);
|
||||||
$worker_frontend = ((x($_POST,'worker_frontend')) ? True : False);
|
$worker_frontend = ((x($_POST,'worker_frontend')) ? True : False);
|
||||||
|
|
||||||
if($a->get_path() != "")
|
if ($a->get_path() != "") {
|
||||||
$diaspora_enabled = false;
|
$diaspora_enabled = false;
|
||||||
|
}
|
||||||
if(!$thread_allow)
|
if (!$thread_allow) {
|
||||||
$ostatus_disabled = true;
|
$ostatus_disabled = true;
|
||||||
|
}
|
||||||
if($ssl_policy != intval(get_config('system','ssl_policy'))) {
|
if ($ssl_policy != intval(get_config('system','ssl_policy'))) {
|
||||||
if($ssl_policy == SSL_POLICY_FULL) {
|
if ($ssl_policy == SSL_POLICY_FULL) {
|
||||||
q("UPDATE `contact` SET
|
q("UPDATE `contact` SET
|
||||||
`url` = REPLACE(`url` , 'http:' , 'https:'),
|
`url` = REPLACE(`url` , 'http:' , 'https:'),
|
||||||
`photo` = REPLACE(`photo` , 'http:' , 'https:'),
|
`photo` = REPLACE(`photo` , 'http:' , 'https:'),
|
||||||
|
@ -694,8 +706,7 @@ function admin_page_site_post(App $a) {
|
||||||
`thumb` = REPLACE(`thumb` , 'http:' , 'https:')
|
`thumb` = REPLACE(`thumb` , 'http:' , 'https:')
|
||||||
WHERE 1 "
|
WHERE 1 "
|
||||||
);
|
);
|
||||||
}
|
} elseif ($ssl_policy == SSL_POLICY_SELFSIGN) {
|
||||||
elseif($ssl_policy == SSL_POLICY_SELFSIGN) {
|
|
||||||
q("UPDATE `contact` SET
|
q("UPDATE `contact` SET
|
||||||
`url` = REPLACE(`url` , 'https:' , 'http:'),
|
`url` = REPLACE(`url` , 'https:' , 'http:'),
|
||||||
`photo` = REPLACE(`photo` , 'https:' , 'http:'),
|
`photo` = REPLACE(`photo` , 'https:' , 'http:'),
|
||||||
|
@ -735,7 +746,7 @@ function admin_page_site_post(App $a) {
|
||||||
set_config('system','shortcut_icon',$shortcut_icon);
|
set_config('system','shortcut_icon',$shortcut_icon);
|
||||||
set_config('system','touch_icon',$touch_icon);
|
set_config('system','touch_icon',$touch_icon);
|
||||||
|
|
||||||
if($banner=="") {
|
if ($banner == "") {
|
||||||
// don't know why, but del_config doesn't work...
|
// don't know why, but del_config doesn't work...
|
||||||
q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
|
q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
|
||||||
dbesc("system"),
|
dbesc("system"),
|
||||||
|
@ -745,7 +756,7 @@ function admin_page_site_post(App $a) {
|
||||||
set_config('system','banner', $banner);
|
set_config('system','banner', $banner);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($info=="") {
|
if ($info == "") {
|
||||||
del_config('config','info');
|
del_config('config','info');
|
||||||
} else {
|
} else {
|
||||||
set_config('config','info',$info);
|
set_config('config','info',$info);
|
||||||
|
@ -753,12 +764,12 @@ function admin_page_site_post(App $a) {
|
||||||
set_config('system','language', $language);
|
set_config('system','language', $language);
|
||||||
set_config('system','theme', $theme);
|
set_config('system','theme', $theme);
|
||||||
|
|
||||||
if($theme_mobile === '---') {
|
if ($theme_mobile === '---') {
|
||||||
del_config('system','mobile-theme');
|
del_config('system','mobile-theme');
|
||||||
} else {
|
} else {
|
||||||
set_config('system','mobile-theme', $theme_mobile);
|
set_config('system','mobile-theme', $theme_mobile);
|
||||||
}
|
}
|
||||||
if($singleuser === '---') {
|
if ($singleuser === '---') {
|
||||||
del_config('system','singleuser');
|
del_config('system','singleuser');
|
||||||
} else {
|
} else {
|
||||||
set_config('system','singleuser', $singleuser);
|
set_config('system','singleuser', $singleuser);
|
||||||
|
@ -817,7 +828,7 @@ function admin_page_site_post(App $a) {
|
||||||
set_config('system','worker_fastlane', $worker_fastlane);
|
set_config('system','worker_fastlane', $worker_fastlane);
|
||||||
set_config('system','frontend_worker', $worker_frontend);
|
set_config('system','frontend_worker', $worker_frontend);
|
||||||
|
|
||||||
if($rino==2 and !function_exists('mcrypt_create_iv')) {
|
if (($rino == 2) and !function_exists('mcrypt_create_iv')) {
|
||||||
notice(t("RINO2 needs mcrypt php extension to work."));
|
notice(t("RINO2 needs mcrypt php extension to work."));
|
||||||
} else {
|
} else {
|
||||||
set_config('system','rino_encrypt', $rino);
|
set_config('system','rino_encrypt', $rino);
|
||||||
|
@ -845,7 +856,7 @@ function admin_page_site(App $a) {
|
||||||
/* Installed langs */
|
/* Installed langs */
|
||||||
$lang_choices = get_available_languages();
|
$lang_choices = get_available_languages();
|
||||||
|
|
||||||
if(strlen(get_config('system','directory_submit_url')) AND
|
if (strlen(get_config('system','directory_submit_url')) AND
|
||||||
!strlen(get_config('system','directory'))) {
|
!strlen(get_config('system','directory'))) {
|
||||||
set_config('system','directory', dirname(get_config('system','directory_submit_url')));
|
set_config('system','directory', dirname(get_config('system','directory_submit_url')));
|
||||||
del_config('system','directory_submit_url');
|
del_config('system','directory_submit_url');
|
||||||
|
@ -856,12 +867,12 @@ function admin_page_site(App $a) {
|
||||||
$theme_choices_mobile = array();
|
$theme_choices_mobile = array();
|
||||||
$theme_choices_mobile["---"] = t("No special theme for mobile devices");
|
$theme_choices_mobile["---"] = t("No special theme for mobile devices");
|
||||||
$files = glob('view/theme/*');
|
$files = glob('view/theme/*');
|
||||||
if($files) {
|
if ($files) {
|
||||||
|
|
||||||
$allowed_theme_list = Config::get('system', 'allowed_themes');
|
$allowed_theme_list = Config::get('system', 'allowed_themes');
|
||||||
|
|
||||||
foreach($files as $file) {
|
foreach ($files as $file) {
|
||||||
if(intval(file_exists($file.'/unsupported')))
|
if (intval(file_exists($file.'/unsupported')))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
$f = basename($file);
|
$f = basename($file);
|
||||||
|
@ -873,7 +884,7 @@ function admin_page_site(App $a) {
|
||||||
|
|
||||||
$theme_name = ((file_exists($file.'/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
|
$theme_name = ((file_exists($file.'/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
|
||||||
|
|
||||||
if(file_exists($file.'/mobile')) {
|
if (file_exists($file.'/mobile')) {
|
||||||
$theme_choices_mobile[$f] = $theme_name;
|
$theme_choices_mobile[$f] = $theme_name;
|
||||||
} else {
|
} else {
|
||||||
$theme_choices[$f] = $theme_name;
|
$theme_choices[$f] = $theme_name;
|
||||||
|
@ -922,8 +933,9 @@ function admin_page_site(App $a) {
|
||||||
|
|
||||||
/* Banner */
|
/* Banner */
|
||||||
$banner = get_config('system','banner');
|
$banner = get_config('system','banner');
|
||||||
if($banner == false)
|
if ($banner == false) {
|
||||||
$banner = '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
|
$banner = '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
|
||||||
|
}
|
||||||
$banner = htmlspecialchars($banner);
|
$banner = htmlspecialchars($banner);
|
||||||
$info = get_config('config','info');
|
$info = get_config('config','info');
|
||||||
$info = htmlspecialchars($info);
|
$info = htmlspecialchars($info);
|
||||||
|
@ -948,9 +960,9 @@ function admin_page_site(App $a) {
|
||||||
SSL_POLICY_SELFSIGN => t("Self-signed certificate, use SSL for local links only (discouraged)")
|
SSL_POLICY_SELFSIGN => t("Self-signed certificate, use SSL for local links only (discouraged)")
|
||||||
);
|
);
|
||||||
|
|
||||||
if($a->config['hostname'] == "")
|
if ($a->config['hostname'] == "") {
|
||||||
$a->config['hostname'] = $a->get_hostname();
|
$a->config['hostname'] = $a->get_hostname();
|
||||||
|
}
|
||||||
$diaspora_able = ($a->get_path() == "");
|
$diaspora_able = ($a->get_path() == "");
|
||||||
|
|
||||||
$optimize_max_tablesize = Config::get('system','optimize_max_tablesize', 100);
|
$optimize_max_tablesize = Config::get('system','optimize_max_tablesize', 100);
|
||||||
|
@ -1088,42 +1100,45 @@ function admin_page_dbsync(App $a) {
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
||||||
if($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
|
if ($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
|
||||||
set_config('database', 'update_'.intval($a->argv[3]), 'success');
|
set_config('database', 'update_'.intval($a->argv[3]), 'success');
|
||||||
$curr = get_config('system','build');
|
$curr = get_config('system','build');
|
||||||
if(intval($curr) == intval($a->argv[3]))
|
if (intval($curr) == intval($a->argv[3])) {
|
||||||
set_config('system','build',intval($curr) + 1);
|
set_config('system','build',intval($curr) + 1);
|
||||||
|
}
|
||||||
info(t('Update has been marked successful').EOL);
|
info(t('Update has been marked successful').EOL);
|
||||||
goaway('admin/dbsync');
|
goaway('admin/dbsync');
|
||||||
}
|
}
|
||||||
|
|
||||||
if(($a->argc > 2) AND (intval($a->argv[2]) OR ($a->argv[2] === 'check'))) {
|
if (($a->argc > 2) AND (intval($a->argv[2]) OR ($a->argv[2] === 'check'))) {
|
||||||
require_once("include/dbstructure.php");
|
require_once("include/dbstructure.php");
|
||||||
$retval = update_structure(false, true);
|
$retval = update_structure(false, true);
|
||||||
if(!$retval) {
|
if (!$retval) {
|
||||||
$o .= sprintf(t("Database structure update %s was successfully applied."), DB_UPDATE_VERSION)."<br />";
|
$o .= sprintf(t("Database structure update %s was successfully applied."), DB_UPDATE_VERSION)."<br />";
|
||||||
set_config('database', 'dbupdate_'.DB_UPDATE_VERSION, 'success');
|
set_config('database', 'dbupdate_'.DB_UPDATE_VERSION, 'success');
|
||||||
} else
|
} else {
|
||||||
$o .= sprintf(t("Executing of database structure update %s failed with error: %s"),
|
$o .= sprintf(t("Executing of database structure update %s failed with error: %s"),
|
||||||
DB_UPDATE_VERSION, $retval)."<br />";
|
DB_UPDATE_VERSION, $retval)."<br />";
|
||||||
if($a->argv[2] === 'check')
|
}
|
||||||
|
if ($a->argv[2] === 'check') {
|
||||||
return $o;
|
return $o;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($a->argc > 2 && intval($a->argv[2])) {
|
if ($a->argc > 2 && intval($a->argv[2])) {
|
||||||
require_once('update.php');
|
require_once('update.php');
|
||||||
$func = 'update_'.intval($a->argv[2]);
|
$func = 'update_'.intval($a->argv[2]);
|
||||||
if(function_exists($func)) {
|
if (function_exists($func)) {
|
||||||
$retval = $func();
|
$retval = $func();
|
||||||
if($retval === UPDATE_FAILED) {
|
if ($retval === UPDATE_FAILED) {
|
||||||
$o .= sprintf(t("Executing %s failed with error: %s"), $func, $retval);
|
$o .= sprintf(t("Executing %s failed with error: %s"), $func, $retval);
|
||||||
}
|
}
|
||||||
elseif($retval === UPDATE_SUCCESS) {
|
elseif ($retval === UPDATE_SUCCESS) {
|
||||||
$o .= sprintf(t('Update %s was successfully applied.', $func));
|
$o .= sprintf(t('Update %s was successfully applied.', $func));
|
||||||
set_config('database',$func, 'success');
|
set_config('database',$func, 'success');
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
$o .= sprintf(t('Update %s did not return a status. Unknown if it succeeded.'), $func);
|
$o .= sprintf(t('Update %s did not return a status. Unknown if it succeeded.'), $func);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
$o .= sprintf(t('There was no additional update function %s that needed to be called.'), $func)."<br />";
|
$o .= sprintf(t('There was no additional update function %s that needed to be called.'), $func)."<br />";
|
||||||
set_config('database',$func, 'success');
|
set_config('database',$func, 'success');
|
||||||
|
@ -1136,8 +1151,9 @@ function admin_page_dbsync(App $a) {
|
||||||
if (dbm::is_result($r)) {
|
if (dbm::is_result($r)) {
|
||||||
foreach ($r as $rr) {
|
foreach ($r as $rr) {
|
||||||
$upd = intval(substr($rr['k'],7));
|
$upd = intval(substr($rr['k'],7));
|
||||||
if($upd < 1139 || $rr['v'] === 'success')
|
if ($upd < 1139 || $rr['v'] === 'success') {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
$failed[] = $upd;
|
$failed[] = $upd;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1177,7 +1193,7 @@ function admin_page_users_post(App $a) {
|
||||||
|
|
||||||
check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
|
check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
|
||||||
|
|
||||||
if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) {
|
if (!($nu_name === "") && !($nu_email === "") && !($nu_nickname === "")) {
|
||||||
require_once('include/user.php');
|
require_once('include/user.php');
|
||||||
|
|
||||||
$result = create_user(array('username'=>$nu_name, 'email'=>$nu_email,
|
$result = create_user(array('username'=>$nu_name, 'email'=>$nu_email,
|
||||||
|
@ -1228,31 +1244,31 @@ function admin_page_users_post(App $a) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(x($_POST,'page_users_block')) {
|
if (x($_POST,'page_users_block')) {
|
||||||
foreach($users as $uid){
|
foreach ($users as $uid) {
|
||||||
q("UPDATE `user` SET `blocked` = 1-`blocked` WHERE `uid` = %s",
|
q("UPDATE `user` SET `blocked` = 1-`blocked` WHERE `uid` = %s",
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
notice(sprintf(tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)), count($users)));
|
notice(sprintf(tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)), count($users)));
|
||||||
}
|
}
|
||||||
if(x($_POST,'page_users_delete')) {
|
if (x($_POST,'page_users_delete')) {
|
||||||
require_once("include/Contact.php");
|
require_once("include/Contact.php");
|
||||||
foreach($users as $uid){
|
foreach ($users as $uid) {
|
||||||
user_remove($uid);
|
user_remove($uid);
|
||||||
}
|
}
|
||||||
notice(sprintf(tt("%s user deleted", "%s users deleted", count($users)), count($users)));
|
notice(sprintf(tt("%s user deleted", "%s users deleted", count($users)), count($users)));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(x($_POST,'page_users_approve')) {
|
if (x($_POST,'page_users_approve')) {
|
||||||
require_once("mod/regmod.php");
|
require_once("mod/regmod.php");
|
||||||
foreach($pending as $hash){
|
foreach ($pending as $hash) {
|
||||||
user_allow($hash);
|
user_allow($hash);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(x($_POST,'page_users_deny')) {
|
if (x($_POST,'page_users_deny')) {
|
||||||
require_once("mod/regmod.php");
|
require_once("mod/regmod.php");
|
||||||
foreach($pending as $hash){
|
foreach ($pending as $hash) {
|
||||||
user_deny($hash);
|
user_deny($hash);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1273,31 +1289,31 @@ function admin_page_users_post(App $a) {
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function admin_page_users(App $a) {
|
function admin_page_users(App $a) {
|
||||||
if($a->argc>2) {
|
if ($a->argc>2) {
|
||||||
$uid = $a->argv[3];
|
$uid = $a->argv[3];
|
||||||
$user = q("SELECT `username`, `blocked` FROM `user` WHERE `uid` = %d", intval($uid));
|
$user = q("SELECT `username`, `blocked` FROM `user` WHERE `uid` = %d", intval($uid));
|
||||||
if(count($user)==0) {
|
if (count($user) == 0) {
|
||||||
notice('User not found'.EOL);
|
notice('User not found'.EOL);
|
||||||
goaway('admin/users');
|
goaway('admin/users');
|
||||||
return ''; // NOTREACHED
|
return ''; // NOTREACHED
|
||||||
}
|
}
|
||||||
switch($a->argv[2]){
|
switch($a->argv[2]) {
|
||||||
case "delete":{
|
case "delete":
|
||||||
check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
|
check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
|
||||||
// delete user
|
// delete user
|
||||||
require_once("include/Contact.php");
|
require_once("include/Contact.php");
|
||||||
user_remove($uid);
|
user_remove($uid);
|
||||||
|
|
||||||
notice(sprintf(t("User '%s' deleted"), $user[0]['username']).EOL);
|
notice(sprintf(t("User '%s' deleted"), $user[0]['username']).EOL);
|
||||||
}; break;
|
break;
|
||||||
case "block":{
|
case "block":
|
||||||
check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
|
check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
|
||||||
q("UPDATE `user` SET `blocked` = %d WHERE `uid` = %s",
|
q("UPDATE `user` SET `blocked` = %d WHERE `uid` = %s",
|
||||||
intval(1-$user[0]['blocked']),
|
intval(1-$user[0]['blocked']),
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
notice(sprintf(($user[0]['blocked']?t("User '%s' unblocked"):t("User '%s' blocked")) , $user[0]['username']).EOL);
|
notice(sprintf(($user[0]['blocked']?t("User '%s' unblocked"):t("User '%s' blocked")) , $user[0]['username']).EOL);
|
||||||
}; break;
|
break;
|
||||||
}
|
}
|
||||||
goaway('admin/users');
|
goaway('admin/users');
|
||||||
return ''; // NOTREACHED
|
return ''; // NOTREACHED
|
||||||
|
@ -1313,7 +1329,7 @@ function admin_page_users(App $a) {
|
||||||
|
|
||||||
/* get users */
|
/* get users */
|
||||||
$total = qu("SELECT COUNT(*) AS `total` FROM `user` WHERE 1");
|
$total = qu("SELECT COUNT(*) AS `total` FROM `user` WHERE 1");
|
||||||
if(count($total)) {
|
if (count($total)) {
|
||||||
$a->set_pager_total($total[0]['total']);
|
$a->set_pager_total($total[0]['total']);
|
||||||
$a->set_pager_itemspage(100);
|
$a->set_pager_itemspage(100);
|
||||||
}
|
}
|
||||||
|
@ -1330,22 +1346,22 @@ function admin_page_users(App $a) {
|
||||||
|
|
||||||
$order = "contact.name";
|
$order = "contact.name";
|
||||||
$order_direction = "+";
|
$order_direction = "+";
|
||||||
if (x($_GET,'o')){
|
if (x($_GET,'o')) {
|
||||||
$new_order = $_GET['o'];
|
$new_order = $_GET['o'];
|
||||||
if ($new_order[0]==="-") {
|
if ($new_order[0] === "-") {
|
||||||
$order_direction = "-";
|
$order_direction = "-";
|
||||||
$new_order = substr($new_order,1);
|
$new_order = substr($new_order,1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (in_array($new_order, $valid_orders)){
|
if (in_array($new_order, $valid_orders)) {
|
||||||
$order = $new_order;
|
$order = $new_order;
|
||||||
}
|
}
|
||||||
if (x($_GET,'d')){
|
if (x($_GET,'d')) {
|
||||||
$new_direction = $_GET['d'];
|
$new_direction = $_GET['d'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$sql_order = "`".str_replace('.','`.`',$order)."`";
|
$sql_order = "`".str_replace('.','`.`',$order)."`";
|
||||||
$sql_order_direction = ($order_direction==="+")?"ASC":"DESC";
|
$sql_order_direction = ($order_direction === "+")?"ASC":"DESC";
|
||||||
|
|
||||||
$users = qu("SELECT `user`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`account_expired`, `contact`.`last-item` AS `lastitem_date`
|
$users = qu("SELECT `user`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`account_expired`, `contact`.`last-item` AS `lastitem_date`
|
||||||
FROM `user`
|
FROM `user`
|
||||||
|
@ -1359,7 +1375,7 @@ function admin_page_users(App $a) {
|
||||||
//echo "<pre>$users"; killme();
|
//echo "<pre>$users"; killme();
|
||||||
|
|
||||||
$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
|
$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
|
||||||
$_setup_users = function ($e) use ($adminlist){
|
$_setup_users = function ($e) use ($adminlist) {
|
||||||
$accounts = array(
|
$accounts = array(
|
||||||
t('Normal Account'),
|
t('Normal Account'),
|
||||||
t('Soapbox Account'),
|
t('Soapbox Account'),
|
||||||
|
@ -1385,22 +1401,21 @@ function admin_page_users(App $a) {
|
||||||
$tmp_users = array();
|
$tmp_users = array();
|
||||||
$deleted = array();
|
$deleted = array();
|
||||||
|
|
||||||
while(count($users)) {
|
while (count($users)) {
|
||||||
$new_user = array();
|
$new_user = array();
|
||||||
foreach(array_pop($users) as $k => $v) {
|
foreach (array_pop($users) as $k => $v) {
|
||||||
$k = str_replace('-','_',$k);
|
$k = str_replace('-','_',$k);
|
||||||
$new_user[$k] = $v;
|
$new_user[$k] = $v;
|
||||||
}
|
}
|
||||||
if($new_user['deleted']) {
|
if ($new_user['deleted']) {
|
||||||
array_push($deleted, $new_user);
|
array_push($deleted, $new_user);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
array_push($tmp_users, $new_user);
|
array_push($tmp_users, $new_user);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//Reversing the two array, and moving $tmp_users to $users
|
//Reversing the two array, and moving $tmp_users to $users
|
||||||
array_reverse($deleted);
|
array_reverse($deleted);
|
||||||
while(count($tmp_users)) {
|
while (count($tmp_users)) {
|
||||||
array_push($users, array_pop($tmp_users));
|
array_push($users, array_pop($tmp_users));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1477,19 +1492,19 @@ function admin_page_plugins(App $a) {
|
||||||
/*
|
/*
|
||||||
* Single plugin
|
* Single plugin
|
||||||
*/
|
*/
|
||||||
if($a->argc == 3) {
|
if ($a->argc == 3) {
|
||||||
$plugin = $a->argv[2];
|
$plugin = $a->argv[2];
|
||||||
if(!is_file("addon/$plugin/$plugin.php")) {
|
if (!is_file("addon/$plugin/$plugin.php")) {
|
||||||
notice(t("Item not found."));
|
notice(t("Item not found."));
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
if(x($_GET,"a") && $_GET['a']=="t") {
|
if (x($_GET,"a") && $_GET['a']=="t") {
|
||||||
check_form_security_token_redirectOnErr('/admin/plugins', 'admin_themes', 't');
|
check_form_security_token_redirectOnErr('/admin/plugins', 'admin_themes', 't');
|
||||||
|
|
||||||
// Toggle plugin status
|
// Toggle plugin status
|
||||||
$idx = array_search($plugin, $a->plugins);
|
$idx = array_search($plugin, $a->plugins);
|
||||||
if($idx !== false) {
|
if ($idx !== false) {
|
||||||
unset($a->plugins[$idx]);
|
unset($a->plugins[$idx]);
|
||||||
uninstall_plugin($plugin);
|
uninstall_plugin($plugin);
|
||||||
info(sprintf(t("Plugin %s disabled."), $plugin));
|
info(sprintf(t("Plugin %s disabled."), $plugin));
|
||||||
|
@ -1506,22 +1521,22 @@ function admin_page_plugins(App $a) {
|
||||||
// display plugin details
|
// display plugin details
|
||||||
require_once('library/markdown.php');
|
require_once('library/markdown.php');
|
||||||
|
|
||||||
if(in_array($plugin, $a->plugins)) {
|
if (in_array($plugin, $a->plugins)) {
|
||||||
$status="on"; $action= t("Disable");
|
$status="on"; $action= t("Disable");
|
||||||
} else {
|
} else {
|
||||||
$status="off"; $action= t("Enable");
|
$status="off"; $action= t("Enable");
|
||||||
}
|
}
|
||||||
|
|
||||||
$readme=Null;
|
$readme=Null;
|
||||||
if(is_file("addon/$plugin/README.md")) {
|
if (is_file("addon/$plugin/README.md")) {
|
||||||
$readme = file_get_contents("addon/$plugin/README.md");
|
$readme = file_get_contents("addon/$plugin/README.md");
|
||||||
$readme = Markdown($readme);
|
$readme = Markdown($readme);
|
||||||
} elseif(is_file("addon/$plugin/README")) {
|
} elseif (is_file("addon/$plugin/README")) {
|
||||||
$readme = "<pre>". file_get_contents("addon/$plugin/README") ."</pre>";
|
$readme = "<pre>". file_get_contents("addon/$plugin/README") ."</pre>";
|
||||||
}
|
}
|
||||||
|
|
||||||
$admin_form="";
|
$admin_form="";
|
||||||
if(is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)) {
|
if (is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)) {
|
||||||
@require_once("addon/$plugin/$plugin.php");
|
@require_once("addon/$plugin/$plugin.php");
|
||||||
$func = $plugin.'_plugin_admin';
|
$func = $plugin.'_plugin_admin';
|
||||||
$func($a, $admin_form);
|
$func($a, $admin_form);
|
||||||
|
@ -1613,8 +1628,8 @@ function admin_page_plugins(App $a) {
|
||||||
*/
|
*/
|
||||||
function toggle_theme(&$themes,$th,&$result) {
|
function toggle_theme(&$themes,$th,&$result) {
|
||||||
for($x = 0; $x < count($themes); $x ++) {
|
for($x = 0; $x < count($themes); $x ++) {
|
||||||
if($themes[$x]['name'] === $th) {
|
if ($themes[$x]['name'] === $th) {
|
||||||
if($themes[$x]['allowed']) {
|
if ($themes[$x]['allowed']) {
|
||||||
$themes[$x]['allowed'] = 0;
|
$themes[$x]['allowed'] = 0;
|
||||||
$result = 0;
|
$result = 0;
|
||||||
}
|
}
|
||||||
|
@ -1633,8 +1648,8 @@ function toggle_theme(&$themes,$th,&$result) {
|
||||||
*/
|
*/
|
||||||
function theme_status($themes,$th) {
|
function theme_status($themes,$th) {
|
||||||
for($x = 0; $x < count($themes); $x ++) {
|
for($x = 0; $x < count($themes); $x ++) {
|
||||||
if($themes[$x]['name'] === $th) {
|
if ($themes[$x]['name'] === $th) {
|
||||||
if($themes[$x]['allowed']) {
|
if ($themes[$x]['allowed']) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -1652,11 +1667,12 @@ function theme_status($themes,$th) {
|
||||||
*/
|
*/
|
||||||
function rebuild_theme_table($themes) {
|
function rebuild_theme_table($themes) {
|
||||||
$o = '';
|
$o = '';
|
||||||
if(count($themes)) {
|
if (count($themes)) {
|
||||||
foreach($themes as $th) {
|
foreach ($themes as $th) {
|
||||||
if($th['allowed']) {
|
if ($th['allowed']) {
|
||||||
if(strlen($o))
|
if (strlen($o)) {
|
||||||
$o .= ',';
|
$o .= ',';
|
||||||
|
}
|
||||||
$o .= $th['name'];
|
$o .= $th['name'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1686,15 +1702,18 @@ function admin_page_themes(App $a) {
|
||||||
$allowed_themes_str = get_config('system','allowed_themes');
|
$allowed_themes_str = get_config('system','allowed_themes');
|
||||||
$allowed_themes_raw = explode(',',$allowed_themes_str);
|
$allowed_themes_raw = explode(',',$allowed_themes_str);
|
||||||
$allowed_themes = array();
|
$allowed_themes = array();
|
||||||
if(count($allowed_themes_raw))
|
if (count($allowed_themes_raw)) {
|
||||||
foreach($allowed_themes_raw as $x)
|
foreach ($allowed_themes_raw as $x) {
|
||||||
if(strlen(trim($x)))
|
if (strlen(trim($x))) {
|
||||||
$allowed_themes[] = trim($x);
|
$allowed_themes[] = trim($x);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$themes = array();
|
$themes = array();
|
||||||
$files = glob('view/theme/*');
|
$files = glob('view/theme/*');
|
||||||
if($files) {
|
if ($files) {
|
||||||
foreach($files as $file) {
|
foreach ($files as $file) {
|
||||||
$f = basename($file);
|
$f = basename($file);
|
||||||
|
|
||||||
// Is there a style file?
|
// Is there a style file?
|
||||||
|
@ -1709,12 +1728,13 @@ function admin_page_themes(App $a) {
|
||||||
$is_supported = 1-(intval(file_exists($file.'/unsupported')));
|
$is_supported = 1-(intval(file_exists($file.'/unsupported')));
|
||||||
$is_allowed = intval(in_array($f,$allowed_themes));
|
$is_allowed = intval(in_array($f,$allowed_themes));
|
||||||
|
|
||||||
if($is_allowed OR $is_supported OR get_config("system", "show_unsupported_themes"))
|
if ($is_allowed OR $is_supported OR get_config("system", "show_unsupported_themes")) {
|
||||||
$themes[] = array('name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed);
|
$themes[] = array('name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! count($themes)) {
|
if (! count($themes)) {
|
||||||
notice(t('No themes found.'));
|
notice(t('No themes found.'));
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
@ -1723,25 +1743,24 @@ function admin_page_themes(App $a) {
|
||||||
* Single theme
|
* Single theme
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if($a->argc == 3) {
|
if ($a->argc == 3) {
|
||||||
$theme = $a->argv[2];
|
$theme = $a->argv[2];
|
||||||
if(! is_dir("view/theme/$theme")) {
|
if (! is_dir("view/theme/$theme")) {
|
||||||
notice(t("Item not found."));
|
notice(t("Item not found."));
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
if(x($_GET,"a") && $_GET['a']=="t") {
|
if (x($_GET,"a") && $_GET['a']=="t") {
|
||||||
check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't');
|
check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't');
|
||||||
|
|
||||||
// Toggle theme status
|
// Toggle theme status
|
||||||
|
|
||||||
toggle_theme($themes,$theme,$result);
|
toggle_theme($themes,$theme,$result);
|
||||||
$s = rebuild_theme_table($themes);
|
$s = rebuild_theme_table($themes);
|
||||||
if($result) {
|
if ($result) {
|
||||||
install_theme($theme);
|
install_theme($theme);
|
||||||
info(sprintf('Theme %s enabled.',$theme));
|
info(sprintf('Theme %s enabled.',$theme));
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
uninstall_theme($theme);
|
uninstall_theme($theme);
|
||||||
info(sprintf('Theme %s disabled.',$theme));
|
info(sprintf('Theme %s disabled.',$theme));
|
||||||
}
|
}
|
||||||
|
@ -1754,22 +1773,22 @@ function admin_page_themes(App $a) {
|
||||||
// display theme details
|
// display theme details
|
||||||
require_once('library/markdown.php');
|
require_once('library/markdown.php');
|
||||||
|
|
||||||
if(theme_status($themes,$theme)) {
|
if (theme_status($themes,$theme)) {
|
||||||
$status="on"; $action= t("Disable");
|
$status="on"; $action= t("Disable");
|
||||||
} else {
|
} else {
|
||||||
$status="off"; $action= t("Enable");
|
$status="off"; $action= t("Enable");
|
||||||
}
|
}
|
||||||
|
|
||||||
$readme=Null;
|
$readme = Null;
|
||||||
if(is_file("view/theme/$theme/README.md")) {
|
if (is_file("view/theme/$theme/README.md")) {
|
||||||
$readme = file_get_contents("view/theme/$theme/README.md");
|
$readme = file_get_contents("view/theme/$theme/README.md");
|
||||||
$readme = Markdown($readme);
|
$readme = Markdown($readme);
|
||||||
} elseif(is_file("view/theme/$theme/README")) {
|
} elseif (is_file("view/theme/$theme/README")) {
|
||||||
$readme = "<pre>". file_get_contents("view/theme/$theme/README") ."</pre>";
|
$readme = "<pre>". file_get_contents("view/theme/$theme/README") ."</pre>";
|
||||||
}
|
}
|
||||||
|
|
||||||
$admin_form="";
|
$admin_form = "";
|
||||||
if(is_file("view/theme/$theme/config.php")) {
|
if (is_file("view/theme/$theme/config.php")) {
|
||||||
function __get_theme_admin_form(App $a, $theme) {
|
function __get_theme_admin_form(App $a, $theme) {
|
||||||
$orig_theme = $a->theme;
|
$orig_theme = $a->theme;
|
||||||
$orig_page = $a->page;
|
$orig_page = $a->page;
|
||||||
|
@ -1780,8 +1799,10 @@ function admin_page_themes(App $a) {
|
||||||
|
|
||||||
|
|
||||||
$init = $theme."_init";
|
$init = $theme."_init";
|
||||||
if(function_exists($init)) $init($a);
|
if (function_exists($init)) {
|
||||||
if(function_exists("theme_admin")) {
|
$init($a);
|
||||||
|
}
|
||||||
|
if (function_exists("theme_admin")) {
|
||||||
$admin_form = theme_admin($a);
|
$admin_form = theme_admin($a);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1794,9 +1815,9 @@ function admin_page_themes(App $a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$screenshot = array(get_theme_screenshot($theme), t('Screenshot'));
|
$screenshot = array(get_theme_screenshot($theme), t('Screenshot'));
|
||||||
if(! stristr($screenshot[0],$theme))
|
if (! stristr($screenshot[0],$theme)) {
|
||||||
$screenshot = null;
|
$screenshot = null;
|
||||||
|
}
|
||||||
|
|
||||||
$t = get_markup_template("admin_plugins_details.tpl");
|
$t = get_markup_template("admin_plugins_details.tpl");
|
||||||
return replace_macros($t, array(
|
return replace_macros($t, array(
|
||||||
|
@ -1842,7 +1863,7 @@ function admin_page_themes(App $a) {
|
||||||
|
|
||||||
$xthemes = array();
|
$xthemes = array();
|
||||||
if ($themes) {
|
if ($themes) {
|
||||||
foreach($themes as $th) {
|
foreach ($themes as $th) {
|
||||||
$xthemes[] = array($th['name'],(($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
|
$xthemes[] = array($th['name'],(($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1967,25 +1988,25 @@ function admin_page_viewlogs(App $a) {
|
||||||
$f = get_config('system','logfile');
|
$f = get_config('system','logfile');
|
||||||
$data = '';
|
$data = '';
|
||||||
|
|
||||||
if(!file_exists($f)) {
|
if (!file_exists($f)) {
|
||||||
$data = t("Error trying to open <strong>$f</strong> log file.\r\n<br/>Check to see if file $f exist and is readable.");
|
$data = t("Error trying to open <strong>$f</strong> log file.\r\n<br/>Check to see if file $f exist and is readable.");
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
$fp = fopen($f, 'r');
|
$fp = fopen($f, 'r');
|
||||||
if(!$fp) {
|
if (!$fp) {
|
||||||
$data = t("Couldn't open <strong>$f</strong> log file.\r\n<br/>Check to see if file $f is readable.");
|
$data = t("Couldn't open <strong>$f</strong> log file.\r\n<br/>Check to see if file $f is readable.");
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
$fstat = fstat($fp);
|
$fstat = fstat($fp);
|
||||||
$size = $fstat['size'];
|
$size = $fstat['size'];
|
||||||
if($size != 0) {
|
if ($size != 0) {
|
||||||
if($size > 5000000 || $size < 0)
|
if ($size > 5000000 || $size < 0) {
|
||||||
$size = 5000000;
|
$size = 5000000;
|
||||||
|
}
|
||||||
$seek = fseek($fp,0-$size,SEEK_END);
|
$seek = fseek($fp,0-$size,SEEK_END);
|
||||||
if($seek === 0) {
|
if ($seek === 0) {
|
||||||
$data = escape_tags(fread($fp,$size));
|
$data = escape_tags(fread($fp,$size));
|
||||||
while(! feof($fp))
|
while (! feof($fp)) {
|
||||||
$data .= escape_tags(fread($fp,4096));
|
$data .= escape_tags(fread($fp,4096));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fclose($fp);
|
fclose($fp);
|
||||||
|
@ -2013,22 +2034,24 @@ function admin_page_features_post(App $a) {
|
||||||
$arr = array();
|
$arr = array();
|
||||||
$features = get_features(false);
|
$features = get_features(false);
|
||||||
|
|
||||||
foreach($features as $fname => $fdata) {
|
foreach ($features as $fname => $fdata) {
|
||||||
foreach(array_slice($fdata,1) as $f) {
|
foreach (array_slice($fdata,1) as $f) {
|
||||||
$feature = $f[0];
|
$feature = $f[0];
|
||||||
$feature_state = 'feature_'.$feature;
|
$feature_state = 'feature_'.$feature;
|
||||||
$featurelock = 'featurelock_'.$feature;
|
$featurelock = 'featurelock_'.$feature;
|
||||||
|
|
||||||
if(x($_POST[$feature_state]))
|
if (x($_POST[$feature_state])) {
|
||||||
$val = intval($_POST['feature_'.$feature]);
|
$val = intval($_POST['feature_'.$feature]);
|
||||||
else
|
} else {
|
||||||
$val = 0;
|
$val = 0;
|
||||||
|
}
|
||||||
set_config('feature',$feature,$val);
|
set_config('feature',$feature,$val);
|
||||||
|
|
||||||
if(x($_POST[$featurelock]))
|
if (x($_POST[$featurelock])) {
|
||||||
set_config('feature_lock',$feature,$val);
|
set_config('feature_lock',$feature,$val);
|
||||||
else
|
} else {
|
||||||
del_config('feature_lock',$feature);
|
del_config('feature_lock',$feature);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2052,18 +2075,19 @@ function admin_page_features_post(App $a) {
|
||||||
*/
|
*/
|
||||||
function admin_page_features(App $a) {
|
function admin_page_features(App $a) {
|
||||||
|
|
||||||
if((argc() > 1) && (argv(1) === 'features')) {
|
if ((argc() > 1) && (argv(1) === 'features')) {
|
||||||
$arr = array();
|
$arr = array();
|
||||||
$features = get_features(false);
|
$features = get_features(false);
|
||||||
|
|
||||||
foreach($features as $fname => $fdata) {
|
foreach ($features as $fname => $fdata) {
|
||||||
$arr[$fname] = array();
|
$arr[$fname] = array();
|
||||||
$arr[$fname][0] = $fdata[0];
|
$arr[$fname][0] = $fdata[0];
|
||||||
foreach(array_slice($fdata,1) as $f) {
|
foreach (array_slice($fdata,1) as $f) {
|
||||||
|
|
||||||
$set = get_config('feature',$f[0]);
|
$set = get_config('feature',$f[0]);
|
||||||
if($set === false)
|
if ($set === false) {
|
||||||
$set = $f[3];
|
$set = $f[3];
|
||||||
|
}
|
||||||
$arr[$fname][1][] = array(
|
$arr[$fname][1][] = array(
|
||||||
array('feature_' .$f[0],$f[1],$set,$f[2],array(t('Off'),t('On'))),
|
array('feature_' .$f[0],$f[1],$set,$f[2],array(t('Off'),t('On'))),
|
||||||
array('featurelock_' .$f[0],sprintf(t('Lock feature %s'),$f[1]),(($f[4] !== false) ? "1" : ''),'',array(t('Off'),t('On')))
|
array('featurelock_' .$f[0],sprintf(t('Lock feature %s'),$f[1]),(($f[4] !== false) ? "1" : ''),'',array(t('Off'),t('On')))
|
||||||
|
|
225
mod/poco.php
225
mod/poco.php
|
@ -7,14 +7,14 @@ function poco_init(App $a) {
|
||||||
|
|
||||||
$system_mode = false;
|
$system_mode = false;
|
||||||
|
|
||||||
if(intval(get_config('system','block_public')) || (get_config('system','block_local_dir')))
|
if (intval(get_config('system','block_public')) || (get_config('system','block_local_dir'))) {
|
||||||
http_status_exit(401);
|
http_status_exit(401);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($a->argc > 1) {
|
||||||
if($a->argc > 1) {
|
|
||||||
$user = notags(trim($a->argv[1]));
|
$user = notags(trim($a->argv[1]));
|
||||||
}
|
}
|
||||||
if(! x($user)) {
|
if (! x($user)) {
|
||||||
$c = q("SELECT * FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1");
|
$c = q("SELECT * FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1");
|
||||||
if (! dbm::is_result($c)) {
|
if (! dbm::is_result($c)) {
|
||||||
http_status_exit(401);
|
http_status_exit(401);
|
||||||
|
@ -27,48 +27,55 @@ function poco_init(App $a) {
|
||||||
$justme = false;
|
$justme = false;
|
||||||
$global = false;
|
$global = false;
|
||||||
|
|
||||||
if($a->argc > 1 && $a->argv[1] === '@server') {
|
if ($a->argc > 1 && $a->argv[1] === '@server') {
|
||||||
|
// List of all servers that this server knows
|
||||||
$ret = poco_serverlist();
|
$ret = poco_serverlist();
|
||||||
header('Content-type: application/json');
|
header('Content-type: application/json');
|
||||||
echo json_encode($ret);
|
echo json_encode($ret);
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
if($a->argc > 1 && $a->argv[1] === '@global') {
|
if ($a->argc > 1 && $a->argv[1] === '@global') {
|
||||||
|
// List of all profiles that this server recently had data from
|
||||||
$global = true;
|
$global = true;
|
||||||
$update_limit = date("Y-m-d H:i:s", time() - 30 * 86400);
|
$update_limit = date("Y-m-d H:i:s", time() - 30 * 86400);
|
||||||
}
|
}
|
||||||
if($a->argc > 2 && $a->argv[2] === '@me')
|
if ($a->argc > 2 && $a->argv[2] === '@me') {
|
||||||
$justme = true;
|
$justme = true;
|
||||||
if($a->argc > 3 && $a->argv[3] === '@all')
|
}
|
||||||
|
if ($a->argc > 3 && $a->argv[3] === '@all') {
|
||||||
$justme = false;
|
$justme = false;
|
||||||
if($a->argc > 3 && $a->argv[3] === '@self')
|
}
|
||||||
|
if ($a->argc > 3 && $a->argv[3] === '@self') {
|
||||||
$justme = true;
|
$justme = true;
|
||||||
if($a->argc > 4 && intval($a->argv[4]) && $justme == false)
|
}
|
||||||
|
if ($a->argc > 4 && intval($a->argv[4]) && $justme == false) {
|
||||||
$cid = intval($a->argv[4]);
|
$cid = intval($a->argv[4]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$system_mode AND !$global) {
|
||||||
if(!$system_mode AND !$global) {
|
|
||||||
$r = q("SELECT `user`.*,`profile`.`hide-friends` from user left join profile on `user`.`uid` = `profile`.`uid`
|
$r = q("SELECT `user`.*,`profile`.`hide-friends` from user left join profile on `user`.`uid` = `profile`.`uid`
|
||||||
where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1",
|
where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1",
|
||||||
dbesc($user)
|
dbesc($user)
|
||||||
);
|
);
|
||||||
if(! dbm::is_result($r) || $r[0]['hidewall'] || $r[0]['hide-friends'])
|
if (! dbm::is_result($r) || $r[0]['hidewall'] || $r[0]['hide-friends']) {
|
||||||
http_status_exit(404);
|
http_status_exit(404);
|
||||||
|
}
|
||||||
|
|
||||||
$user = $r[0];
|
$user = $r[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
if($justme)
|
if ($justme) {
|
||||||
$sql_extra = " AND `contact`.`self` = 1 ";
|
$sql_extra = " AND `contact`.`self` = 1 ";
|
||||||
|
}
|
||||||
// else
|
// else
|
||||||
// $sql_extra = " AND `contact`.`self` = 0 ";
|
// $sql_extra = " AND `contact`.`self` = 0 ";
|
||||||
|
|
||||||
if($cid)
|
if ($cid) {
|
||||||
$sql_extra = sprintf(" AND `contact`.`id` = %d ",intval($cid));
|
$sql_extra = sprintf(" AND `contact`.`id` = %d ",intval($cid));
|
||||||
|
}
|
||||||
if(x($_GET,'updatedSince'))
|
if (x($_GET,'updatedSince')) {
|
||||||
$update_limit = date("Y-m-d H:i:s",strtotime($_GET['updatedSince']));
|
$update_limit = date("Y-m-d H:i:s",strtotime($_GET['updatedSince']));
|
||||||
|
}
|
||||||
if ($global) {
|
if ($global) {
|
||||||
$r = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure` AND NOT `hide` AND `network` IN ('%s', '%s', '%s')",
|
$r = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure` AND NOT `hide` AND `network` IN ('%s', '%s', '%s')",
|
||||||
dbesc($update_limit),
|
dbesc($update_limit),
|
||||||
|
@ -76,7 +83,7 @@ function poco_init(App $a) {
|
||||||
dbesc(NETWORK_DIASPORA),
|
dbesc(NETWORK_DIASPORA),
|
||||||
dbesc(NETWORK_OSTATUS)
|
dbesc(NETWORK_OSTATUS)
|
||||||
);
|
);
|
||||||
} elseif($system_mode) {
|
} elseif ($system_mode) {
|
||||||
$r = q("SELECT count(*) AS `total` FROM `contact` WHERE `self` = 1
|
$r = q("SELECT count(*) AS `total` FROM `contact` WHERE `self` = 1
|
||||||
AND `uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) ");
|
AND `uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) ");
|
||||||
} else {
|
} else {
|
||||||
|
@ -90,14 +97,15 @@ function poco_init(App $a) {
|
||||||
dbesc(NETWORK_STATUSNET)
|
dbesc(NETWORK_STATUSNET)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (dbm::is_result($r))
|
if (dbm::is_result($r)) {
|
||||||
$totalResults = intval($r[0]['total']);
|
$totalResults = intval($r[0]['total']);
|
||||||
else
|
} else {
|
||||||
$totalResults = 0;
|
$totalResults = 0;
|
||||||
|
}
|
||||||
$startIndex = intval($_GET['startIndex']);
|
$startIndex = intval($_GET['startIndex']);
|
||||||
if(! $startIndex)
|
if (! $startIndex) {
|
||||||
$startIndex = 0;
|
$startIndex = 0;
|
||||||
|
}
|
||||||
$itemsPerPage = ((x($_GET,'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
|
$itemsPerPage = ((x($_GET,'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
|
||||||
|
|
||||||
if ($global) {
|
if ($global) {
|
||||||
|
@ -111,7 +119,7 @@ function poco_init(App $a) {
|
||||||
intval($startIndex),
|
intval($startIndex),
|
||||||
intval($itemsPerPage)
|
intval($itemsPerPage)
|
||||||
);
|
);
|
||||||
} elseif($system_mode) {
|
} elseif ($system_mode) {
|
||||||
logger("Start system mode query", LOGGER_DEBUG);
|
logger("Start system mode query", LOGGER_DEBUG);
|
||||||
$r = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`,
|
$r = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`,
|
||||||
`profile`.`gender` AS `pgender`, `profile`.`address` AS `paddress`, `profile`.`region` AS `pregion`,
|
`profile`.`gender` AS `pgender`, `profile`.`address` AS `paddress`, `profile`.`region` AS `pregion`,
|
||||||
|
@ -140,13 +148,15 @@ function poco_init(App $a) {
|
||||||
logger("Query done", LOGGER_DEBUG);
|
logger("Query done", LOGGER_DEBUG);
|
||||||
|
|
||||||
$ret = array();
|
$ret = array();
|
||||||
if(x($_GET,'sorted'))
|
if (x($_GET,'sorted')) {
|
||||||
$ret['sorted'] = false;
|
$ret['sorted'] = false;
|
||||||
if(x($_GET,'filtered'))
|
}
|
||||||
|
if (x($_GET,'filtered')) {
|
||||||
$ret['filtered'] = false;
|
$ret['filtered'] = false;
|
||||||
if(x($_GET,'updatedSince') AND !$global)
|
}
|
||||||
|
if (x($_GET,'updatedSince') AND !$global) {
|
||||||
$ret['updatedSince'] = false;
|
$ret['updatedSince'] = false;
|
||||||
|
}
|
||||||
$ret['startIndex'] = (int) $startIndex;
|
$ret['startIndex'] = (int) $startIndex;
|
||||||
$ret['itemsPerPage'] = (int) $itemsPerPage;
|
$ret['itemsPerPage'] = (int) $itemsPerPage;
|
||||||
$ret['totalResults'] = (int) $totalResults;
|
$ret['totalResults'] = (int) $totalResults;
|
||||||
|
@ -170,58 +180,61 @@ function poco_init(App $a) {
|
||||||
'generation' => false
|
'generation' => false
|
||||||
);
|
);
|
||||||
|
|
||||||
if((! x($_GET,'fields')) || ($_GET['fields'] === '@all'))
|
if ((! x($_GET,'fields')) || ($_GET['fields'] === '@all')) {
|
||||||
foreach($fields_ret as $k => $v)
|
foreach ($fields_ret as $k => $v) {
|
||||||
$fields_ret[$k] = true;
|
$fields_ret[$k] = true;
|
||||||
else {
|
}
|
||||||
|
} else {
|
||||||
$fields_req = explode(',',$_GET['fields']);
|
$fields_req = explode(',',$_GET['fields']);
|
||||||
foreach($fields_req as $f)
|
foreach ($fields_req as $f) {
|
||||||
$fields_ret[trim($f)] = true;
|
$fields_ret[trim($f)] = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_array($r)) {
|
if (is_array($r)) {
|
||||||
if (dbm::is_result($r)) {
|
if (dbm::is_result($r)) {
|
||||||
foreach ($r as $rr) {
|
foreach ($r as $rr) {
|
||||||
if (!isset($rr['generation'])) {
|
if (!isset($rr['generation'])) {
|
||||||
if ($global)
|
if ($global) {
|
||||||
$rr['generation'] = 3;
|
$rr['generation'] = 3;
|
||||||
elseif ($system_mode)
|
} elseif ($system_mode) {
|
||||||
$rr['generation'] = 1;
|
$rr['generation'] = 1;
|
||||||
else
|
} else {
|
||||||
$rr['generation'] = 2;
|
$rr['generation'] = 2;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($rr['about'] == "") AND isset($rr['pabout']))
|
if (($rr['about'] == "") AND isset($rr['pabout'])) {
|
||||||
$rr['about'] = $rr['pabout'];
|
$rr['about'] = $rr['pabout'];
|
||||||
|
}
|
||||||
if ($rr['location'] == "") {
|
if ($rr['location'] == "") {
|
||||||
if (isset($rr['plocation']))
|
if (isset($rr['plocation'])) {
|
||||||
$rr['location'] = $rr['plocation'];
|
$rr['location'] = $rr['plocation'];
|
||||||
|
}
|
||||||
if (isset($rr['pregion']) AND ($rr['pregion'] != "")) {
|
if (isset($rr['pregion']) AND ($rr['pregion'] != "")) {
|
||||||
if ($rr['location'] != "")
|
if ($rr['location'] != "") {
|
||||||
$rr['location'] .= ", ";
|
$rr['location'] .= ", ";
|
||||||
|
}
|
||||||
$rr['location'] .= $rr['pregion'];
|
$rr['location'] .= $rr['pregion'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($rr['pcountry']) AND ($rr['pcountry'] != "")) {
|
if (isset($rr['pcountry']) AND ($rr['pcountry'] != "")) {
|
||||||
if ($rr['location'] != "")
|
if ($rr['location'] != "") {
|
||||||
$rr['location'] .= ", ";
|
$rr['location'] .= ", ";
|
||||||
|
}
|
||||||
$rr['location'] .= $rr['pcountry'];
|
$rr['location'] .= $rr['pcountry'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($rr['gender'] == "") AND isset($rr['pgender']))
|
if (($rr['gender'] == "") AND isset($rr['pgender'])) {
|
||||||
$rr['gender'] = $rr['pgender'];
|
$rr['gender'] = $rr['pgender'];
|
||||||
|
}
|
||||||
if (($rr['keywords'] == "") AND isset($rr['pub_keywords']))
|
if (($rr['keywords'] == "") AND isset($rr['pub_keywords'])) {
|
||||||
$rr['keywords'] = $rr['pub_keywords'];
|
$rr['keywords'] = $rr['pub_keywords'];
|
||||||
|
}
|
||||||
if (isset($rr['account-type']))
|
if (isset($rr['account-type'])) {
|
||||||
$rr['contact-type'] = $rr['account-type'];
|
$rr['contact-type'] = $rr['account-type'];
|
||||||
|
}
|
||||||
$about = Cache::get("about:".$rr['updated'].":".$rr['nurl']);
|
$about = Cache::get("about:".$rr['updated'].":".$rr['nurl']);
|
||||||
if (is_null($about)) {
|
if (is_null($about)) {
|
||||||
$about = bbcode($rr['about'], false, false);
|
$about = bbcode($rr['about'], false, false);
|
||||||
|
@ -236,108 +249,122 @@ function poco_init(App $a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$entry = array();
|
$entry = array();
|
||||||
if($fields_ret['id'])
|
if ($fields_ret['id']) {
|
||||||
$entry['id'] = (int)$rr['id'];
|
$entry['id'] = (int)$rr['id'];
|
||||||
if($fields_ret['displayName'])
|
|
||||||
$entry['displayName'] = $rr['name'];
|
|
||||||
if($fields_ret['aboutMe'])
|
|
||||||
$entry['aboutMe'] = $about;
|
|
||||||
if($fields_ret['currentLocation'])
|
|
||||||
$entry['currentLocation'] = $rr['location'];
|
|
||||||
if($fields_ret['gender'])
|
|
||||||
$entry['gender'] = $rr['gender'];
|
|
||||||
if($fields_ret['generation'])
|
|
||||||
$entry['generation'] = (int)$rr['generation'];
|
|
||||||
if($fields_ret['urls']) {
|
|
||||||
$entry['urls'] = array(array('value' => $rr['url'], 'type' => 'profile'));
|
|
||||||
if($rr['addr'] && ($rr['network'] !== NETWORK_MAIL))
|
|
||||||
$entry['urls'][] = array('value' => 'acct:' . $rr['addr'], 'type' => 'webfinger');
|
|
||||||
}
|
}
|
||||||
if($fields_ret['preferredUsername'])
|
if ($fields_ret['displayName']) {
|
||||||
|
$entry['displayName'] = $rr['name'];
|
||||||
|
}
|
||||||
|
if ($fields_ret['aboutMe']) {
|
||||||
|
$entry['aboutMe'] = $about;
|
||||||
|
}
|
||||||
|
if ($fields_ret['currentLocation']) {
|
||||||
|
$entry['currentLocation'] = $rr['location'];
|
||||||
|
}
|
||||||
|
if ($fields_ret['gender']) {
|
||||||
|
$entry['gender'] = $rr['gender'];
|
||||||
|
}
|
||||||
|
if ($fields_ret['generation']) {
|
||||||
|
$entry['generation'] = (int)$rr['generation'];
|
||||||
|
}
|
||||||
|
if ($fields_ret['urls']) {
|
||||||
|
$entry['urls'] = array(array('value' => $rr['url'], 'type' => 'profile'));
|
||||||
|
if ($rr['addr'] && ($rr['network'] !== NETWORK_MAIL)) {
|
||||||
|
$entry['urls'][] = array('value' => 'acct:' . $rr['addr'], 'type' => 'webfinger');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($fields_ret['preferredUsername']) {
|
||||||
$entry['preferredUsername'] = $rr['nick'];
|
$entry['preferredUsername'] = $rr['nick'];
|
||||||
if($fields_ret['updated']) {
|
}
|
||||||
|
if ($fields_ret['updated']) {
|
||||||
if (!$global) {
|
if (!$global) {
|
||||||
$entry['updated'] = $rr['success_update'];
|
$entry['updated'] = $rr['success_update'];
|
||||||
|
|
||||||
if ($rr['name-date'] > $entry['updated'])
|
if ($rr['name-date'] > $entry['updated']) {
|
||||||
$entry['updated'] = $rr['name-date'];
|
$entry['updated'] = $rr['name-date'];
|
||||||
|
}
|
||||||
if ($rr['uri-date'] > $entry['updated'])
|
if ($rr['uri-date'] > $entry['updated']) {
|
||||||
$entry['updated'] = $rr['uri-date'];
|
$entry['updated'] = $rr['uri-date'];
|
||||||
|
}
|
||||||
if ($rr['avatar-date'] > $entry['updated'])
|
if ($rr['avatar-date'] > $entry['updated']) {
|
||||||
$entry['updated'] = $rr['avatar-date'];
|
$entry['updated'] = $rr['avatar-date'];
|
||||||
} else
|
}
|
||||||
|
} else {
|
||||||
$entry['updated'] = $rr['updated'];
|
$entry['updated'] = $rr['updated'];
|
||||||
|
}
|
||||||
$entry['updated'] = date("c", strtotime($entry['updated']));
|
$entry['updated'] = date("c", strtotime($entry['updated']));
|
||||||
}
|
}
|
||||||
if($fields_ret['photos'])
|
if ($fields_ret['photos']) {
|
||||||
$entry['photos'] = array(array('value' => $rr['photo'], 'type' => 'profile'));
|
$entry['photos'] = array(array('value' => $rr['photo'], 'type' => 'profile'));
|
||||||
if($fields_ret['network']) {
|
|
||||||
$entry['network'] = $rr['network'];
|
|
||||||
if ($entry['network'] == NETWORK_STATUSNET)
|
|
||||||
$entry['network'] = NETWORK_OSTATUS;
|
|
||||||
if (($entry['network'] == "") AND ($rr['self']))
|
|
||||||
$entry['network'] = NETWORK_DFRN;
|
|
||||||
}
|
}
|
||||||
if($fields_ret['tags']) {
|
if ($fields_ret['network']) {
|
||||||
|
$entry['network'] = $rr['network'];
|
||||||
|
if ($entry['network'] == NETWORK_STATUSNET) {
|
||||||
|
$entry['network'] = NETWORK_OSTATUS;
|
||||||
|
}
|
||||||
|
if (($entry['network'] == "") AND ($rr['self'])) {
|
||||||
|
$entry['network'] = NETWORK_DFRN;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($fields_ret['tags']) {
|
||||||
$tags = str_replace(","," ",$rr['keywords']);
|
$tags = str_replace(","," ",$rr['keywords']);
|
||||||
$tags = explode(" ", $tags);
|
$tags = explode(" ", $tags);
|
||||||
|
|
||||||
$cleaned = array();
|
$cleaned = array();
|
||||||
foreach ($tags as $tag) {
|
foreach ($tags as $tag) {
|
||||||
$tag = trim(strtolower($tag));
|
$tag = trim(strtolower($tag));
|
||||||
if ($tag != "")
|
if ($tag != "") {
|
||||||
$cleaned[] = $tag;
|
$cleaned[] = $tag;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$entry['tags'] = array($cleaned);
|
$entry['tags'] = array($cleaned);
|
||||||
}
|
}
|
||||||
if($fields_ret['address']) {
|
if ($fields_ret['address']) {
|
||||||
$entry['address'] = array();
|
$entry['address'] = array();
|
||||||
|
|
||||||
// Deactivated. It just reveals too much data. (Although its from the default profile)
|
// Deactivated. It just reveals too much data. (Although its from the default profile)
|
||||||
//if (isset($rr['paddress']))
|
//if (isset($rr['paddress']))
|
||||||
// $entry['address']['streetAddress'] = $rr['paddress'];
|
// $entry['address']['streetAddress'] = $rr['paddress'];
|
||||||
|
|
||||||
if (isset($rr['plocation']))
|
if (isset($rr['plocation'])) {
|
||||||
$entry['address']['locality'] = $rr['plocation'];
|
$entry['address']['locality'] = $rr['plocation'];
|
||||||
|
}
|
||||||
if (isset($rr['pregion']))
|
if (isset($rr['pregion'])) {
|
||||||
$entry['address']['region'] = $rr['pregion'];
|
$entry['address']['region'] = $rr['pregion'];
|
||||||
|
}
|
||||||
// See above
|
// See above
|
||||||
//if (isset($rr['ppostalcode']))
|
//if (isset($rr['ppostalcode']))
|
||||||
// $entry['address']['postalCode'] = $rr['ppostalcode'];
|
// $entry['address']['postalCode'] = $rr['ppostalcode'];
|
||||||
|
|
||||||
if (isset($rr['pcountry']))
|
if (isset($rr['pcountry'])) {
|
||||||
$entry['address']['country'] = $rr['pcountry'];
|
$entry['address']['country'] = $rr['pcountry'];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($fields_ret['contactType'])
|
if ($fields_ret['contactType']) {
|
||||||
$entry['contactType'] = intval($rr['contact-type']);
|
$entry['contactType'] = intval($rr['contact-type']);
|
||||||
|
}
|
||||||
$ret['entry'][] = $entry;
|
$ret['entry'][] = $entry;
|
||||||
}
|
}
|
||||||
} else
|
} else {
|
||||||
$ret['entry'][] = array();
|
$ret['entry'][] = array();
|
||||||
} else
|
}
|
||||||
|
} else {
|
||||||
http_status_exit(500);
|
http_status_exit(500);
|
||||||
|
}
|
||||||
logger("End of poco", LOGGER_DEBUG);
|
logger("End of poco", LOGGER_DEBUG);
|
||||||
|
|
||||||
if($format === 'xml') {
|
if ($format === 'xml') {
|
||||||
header('Content-type: text/xml');
|
header('Content-type: text/xml');
|
||||||
echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret)));
|
echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret)));
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
if($format === 'json') {
|
if ($format === 'json') {
|
||||||
header('Content-type: application/json');
|
header('Content-type: application/json');
|
||||||
echo json_encode($ret);
|
echo json_encode($ret);
|
||||||
killme();
|
killme();
|
||||||
} else
|
} else {
|
||||||
http_status_exit(500);
|
http_status_exit(500);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue