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

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2018-04-30 09:08:09 +02:00
commit 0fa638399f
4 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Update/_1208.php
View File

@ -8,7 +8,7 @@ class _1208 {
if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
$r1 = q("ALTER TABLE poll ADD poll_author text NOT NULL"); $r1 = q("ALTER TABLE poll ADD poll_author text NOT NULL");
$r2 = q("create index \"poll_author_idx\" on poll \"poll_author\""); $r2 = q("create index \"poll_author_idx\" on poll (\"poll_author\") ");
$r = ($r1 && $r2); $r = ($r1 && $r2);
} }

2
Zotlabs/Update/_1209.php
View File

@ -8,7 +8,7 @@ class _1209 {
if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
$r1 = q("ALTER TABLE poll_elm ADD pelm_order numeric(6) NOT NULL DEFAULT '0' "); $r1 = q("ALTER TABLE poll_elm ADD pelm_order numeric(6) NOT NULL DEFAULT '0' ");
$r2 = q("create index \"pelm_order_idx\" on poll_elm \"pelm_order\""); $r2 = q("create index \"pelm_order_idx\" on poll_elm (\"pelm_order\")");
$r = ($r1 && $r2); $r = ($r1 && $r2);
} }

2
Zotlabs/Update/_1211.php
View File

@ -8,7 +8,7 @@ class _1211 {
if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
$r1 = q("ALTER TABLE channel ADD channel_active timestamp NOT NULL DEFAULT '0001-01-01 00:00:00' "); $r1 = q("ALTER TABLE channel ADD channel_active timestamp NOT NULL DEFAULT '0001-01-01 00:00:00' ");
$r2 = q("create index \"channel_active\" on channel_active \"channel_active\""); $r2 = q("create index \"channel_active\" on channel_active (\"channel_active\")");
$r = ($r1 && $r2); $r = ($r1 && $r2);
} }

36
include/network.php
View File

@ -368,27 +368,6 @@ function z_post_url($url, $params, $redirects = 0, $opts = array()) {
return($ret); return($ret);
} }
/**
* @brief Like z_post_url() but with an application/json HTTP header.
*
* Add a "Content-Type: application/json" HTTP-header to $opts and call z_post_url().
*
* @see z_post_url()
*
* @param string $url
* @param array $params
* @param number $redirects default 0
* @param array $opts (optional) curl options
* @return z_post_url()
*/
function z_post_url_json($url, $params, $redirects = 0, $opts = array()) {
$opts = array_merge($opts, array('headers' => array('Content-Type: application/json')));
return z_post_url($url,json_encode($params),$redirects,$opts);
}
function json_return_and_die($x, $content_type = 'application/json') { function json_return_and_die($x, $content_type = 'application/json') {
header("Content-type: $content_type"); header("Content-type: $content_type");
echo json_encode($x); echo json_encode($x);
@ -669,6 +648,7 @@ function parse_xml_string($s, $strict = true) {
libxml_use_internal_errors(true); libxml_use_internal_errors(true);
$x = @simplexml_load_string($s2); $x = @simplexml_load_string($s2);
if($x === false) { if($x === false) {
logger('libxml: parse: error: ' . $s2, LOGGER_DATA); logger('libxml: parse: error: ' . $s2, LOGGER_DATA);
@ -682,6 +662,16 @@ function parse_xml_string($s, $strict = true) {
return $x; return $x;
} }
function sxml2array ( $xmlObject, $out = array () )
{
foreach ( (array) $xmlObject as $index => $node )
$out[$index] = ( is_object ( $node ) ) ? sxml2array ( $node ) : $node;
return $out;
}
/** /**
* @brief Scales an external image. * @brief Scales an external image.
* *
@ -779,7 +769,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
* @brief xml2array() will convert the given XML text to an array in the XML structure. * @brief xml2array() will convert the given XML text to an array in the XML structure.
* *
* Link: http://www.bin-co.com/php/scripts/xml2array/ * Link: http://www.bin-co.com/php/scripts/xml2array/
* Portions significantly re-written by mike@macgirvin.com for Friendica * Portions significantly re-written by mike@macgirvin.com
* (namespaces, lowercase tags, get_attribute default changed, more...) * (namespaces, lowercase tags, get_attribute default changed, more...)
* *
* Examples: $array = xml2array(file_get_contents('feed.xml')); * Examples: $array = xml2array(file_get_contents('feed.xml'));
@ -1160,8 +1150,6 @@ function discover_by_webbie($webbie, $protocol = '') {
$network = null; $network = null;
// $webbie = strtolower($webbie);
$x = webfinger_rfc7033($webbie, true); $x = webfinger_rfc7033($webbie, true);
if($x && array_key_exists('links',$x) && $x['links']) { if($x && array_key_exists('links',$x) && $x['links']) {
foreach($x['links'] as $link) { foreach($x['links'] as $link) {