Merge branch 'develop' into improvement/frio-action-links-to-buttons
This commit is contained in:
Hypolite Petovan
commit
077c4cadf1
280
include/dba.php
280
include/dba.php
|
|
@ -1,17 +1,5 @@
|
|||
<?php
|
||||
require_once("dbm.php");
|
||||
|
||||
# if PDO is avaible for mysql, use the new database abstraction
|
||||
# TODO: PDO is disabled for release 3.3. We need to investigate why
|
||||
# the update from 3.2 fails with pdo
|
||||
/*
|
||||
if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
|
||||
require_once("library/dddbl2/dddbl.php");
|
||||
require_once("include/dba_pdo.php");
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
require_once('include/datetime.php');
|
||||
|
||||
/**
|
||||
|
|
@ -24,13 +12,12 @@ require_once('include/datetime.php');
|
|||
*
|
||||
*/
|
||||
|
||||
if (! class_exists('dba')) {
|
||||
class dba {
|
||||
|
||||
private $debug = 0;
|
||||
private $db;
|
||||
private $result;
|
||||
public $mysqli = true;
|
||||
private $driver;
|
||||
public $connected = false;
|
||||
public $error = false;
|
||||
|
||||
|
|
@ -53,7 +40,7 @@ class dba {
|
|||
if ($install) {
|
||||
if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
|
||||
if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
|
||||
$this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
|
||||
$this->error = sprintf(t('Cannot locate DNS info for database server \'%s\''), $server);
|
||||
$this->connected = false;
|
||||
$this->db = null;
|
||||
return;
|
||||
|
|
@ -61,37 +48,52 @@ class dba {
|
|||
}
|
||||
}
|
||||
|
||||
if (class_exists('mysqli')) {
|
||||
$this->db = @new mysqli($server,$user,$pass,$db);
|
||||
if (! mysqli_connect_errno()) {
|
||||
if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
|
||||
$this->driver = 'pdo';
|
||||
$connect = "mysql:host=".$server.";dbname=".$db;
|
||||
if (isset($a->config["system"]["db_charset"])) {
|
||||
$connect .= ";charset=".$a->config["system"]["db_charset"];
|
||||
}
|
||||
$this->db = @new PDO($connect, $user, $pass);
|
||||
if (!$this->db->errorCode()) {
|
||||
$this->connected = true;
|
||||
}
|
||||
} elseif (class_exists('mysqli')) {
|
||||
$this->driver = 'mysqli';
|
||||
$this->db = @new mysqli($server,$user,$pass,$db);
|
||||
if (!mysqli_connect_errno()) {
|
||||
$this->connected = true;
|
||||
|
||||
if (isset($a->config["system"]["db_charset"])) {
|
||||
$this->db->set_charset($a->config["system"]["db_charset"]);
|
||||
}
|
||||
} else {
|
||||
$this->mysqli = false;
|
||||
}
|
||||
} elseif (function_exists('mysql_connect')) {
|
||||
$this->driver = 'mysql';
|
||||
$this->db = mysql_connect($server,$user,$pass);
|
||||
if ($this->db && mysql_select_db($db,$this->db)) {
|
||||
$this->connected = true;
|
||||
}
|
||||
if (isset($a->config["system"]["db_charset"]))
|
||||
|
||||
if (isset($a->config["system"]["db_charset"])) {
|
||||
mysql_set_charset($a->config["system"]["db_charset"], $this->db);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// No suitable SQL driver was found.
|
||||
if (!$install) {
|
||||
system_unavailable();
|
||||
}
|
||||
}
|
||||
|
||||
if (!$this->connected) {
|
||||
$this->db = null;
|
||||
if (!$install) {
|
||||
system_unavailable();
|
||||
}
|
||||
}
|
||||
|
||||
$a->save_timestamp($stamp1, "network");
|
||||
}
|
||||
|
||||
public function getdb() {
|
||||
return $this->db;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Returns the MySQL server version string
|
||||
*
|
||||
|
|
@ -101,12 +103,18 @@ class dba {
|
|||
* @return string
|
||||
*/
|
||||
public function server_info() {
|
||||
if ($this->mysqli) {
|
||||
$return = $this->db->server_info;
|
||||
} else {
|
||||
$return = mysql_get_server_info($this->db);
|
||||
switch ($this->driver) {
|
||||
case 'pdo':
|
||||
$version = $this->db->getAttribute(PDO::ATTR_SERVER_VERSION);
|
||||
break;
|
||||
case 'mysqli':
|
||||
$version = $this->db->server_info;
|
||||
break;
|
||||
case 'mysql':
|
||||
$version = mysql_get_server_info($this->db);
|
||||
break;
|
||||
}
|
||||
return $return;
|
||||
return $version;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -130,12 +138,18 @@ class dba {
|
|||
return 0;
|
||||
}
|
||||
|
||||
if ($this->mysqli) {
|
||||
$return = $this->result->num_rows;
|
||||
} else {
|
||||
$return = mysql_num_rows($this->result);
|
||||
switch ($this->driver) {
|
||||
case 'pdo':
|
||||
$rows = $this->result->rowCount();
|
||||
break;
|
||||
case 'mysqli':
|
||||
$rows = $this->result->num_rows;
|
||||
break;
|
||||
case 'mysql':
|
||||
$rows = mysql_num_rows($this->result);
|
||||
break;
|
||||
}
|
||||
return $return;
|
||||
return $rows;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -172,8 +186,9 @@ class dba {
|
|||
if ((intval($a->config["system"]["db_loglimit_index"]) > 0)) {
|
||||
$log = (in_array($row['key'], $watchlist) AND
|
||||
($row['rows'] >= intval($a->config["system"]["db_loglimit_index"])));
|
||||
} else
|
||||
} else {
|
||||
$log = false;
|
||||
}
|
||||
|
||||
if ((intval($a->config["system"]["db_loglimit_index_high"]) > 0) AND ($row['rows'] >= intval($a->config["system"]["db_loglimit_index_high"]))) {
|
||||
$log = true;
|
||||
|
|
@ -203,13 +218,7 @@ class dba {
|
|||
|
||||
$this->error = '';
|
||||
|
||||
// Check the connection (This can reconnect the connection - if configured)
|
||||
if ($this->mysqli) {
|
||||
$connected = $this->db->ping();
|
||||
} else {
|
||||
$connected = mysql_ping($this->db);
|
||||
}
|
||||
$connstr = ($connected ? "Connected" : "Disonnected");
|
||||
$connstr = ($this->connected() ? "Connected" : "Disonnected");
|
||||
|
||||
$stamp1 = microtime(true);
|
||||
|
||||
|
|
@ -219,10 +228,20 @@ class dba {
|
|||
$sql = "/*".$a->callstack()." */ ".$sql;
|
||||
}
|
||||
|
||||
if ($this->mysqli) {
|
||||
$columns = 0;
|
||||
|
||||
switch ($this->driver) {
|
||||
case 'pdo':
|
||||
$result = @$this->db->query($sql);
|
||||
} else {
|
||||
// Is used to separate between queries that returning data - or not
|
||||
$columns = $result->columnCount();
|
||||
break;
|
||||
case 'mysqli':
|
||||
$result = @$this->db->query($sql);
|
||||
break;
|
||||
case 'mysql':
|
||||
$result = @mysql_query($sql,$this->db);
|
||||
break;
|
||||
}
|
||||
$stamp2 = microtime(true);
|
||||
$duration = (float)($stamp2-$stamp1);
|
||||
|
|
@ -243,16 +262,27 @@ class dba {
|
|||
}
|
||||
}
|
||||
|
||||
if ($this->mysqli) {
|
||||
switch ($this->driver) {
|
||||
case 'pdo':
|
||||
$errorInfo = $this->db->errorInfo();
|
||||
if ($errorInfo) {
|
||||
$this->error = $errorInfo[2];
|
||||
$this->errorno = $errorInfo[1];
|
||||
}
|
||||
break;
|
||||
case 'mysqli':
|
||||
if ($this->db->errno) {
|
||||
$this->error = $this->db->error;
|
||||
$this->errorno = $this->db->errno;
|
||||
}
|
||||
} elseif (mysql_errno($this->db)) {
|
||||
break;
|
||||
case 'mysql':
|
||||
if (mysql_errno($this->db)) {
|
||||
$this->error = mysql_error($this->db);
|
||||
$this->errorno = mysql_errno($this->db);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
if (strlen($this->error)) {
|
||||
logger('DB Error ('.$connstr.') '.$this->errorno.': '.$this->error);
|
||||
}
|
||||
|
|
@ -266,10 +296,16 @@ class dba {
|
|||
} elseif ($result === true) {
|
||||
$mesg = 'true';
|
||||
} else {
|
||||
if ($this->mysqli) {
|
||||
$mesg = $result->num_rows . ' results' . EOL;
|
||||
} else {
|
||||
$mesg = mysql_num_rows($result) . ' results' . EOL;
|
||||
switch ($this->driver) {
|
||||
case 'pdo':
|
||||
$mesg = $result->rowCount().' results'.EOL;
|
||||
break;
|
||||
case 'mysqli':
|
||||
$mesg = $result->num_rows.' results'.EOL;
|
||||
break;
|
||||
case 'mysql':
|
||||
$mesg = mysql_num_rows($result).' results'.EOL;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -302,18 +338,32 @@ class dba {
|
|||
}
|
||||
|
||||
$r = array();
|
||||
if ($this->mysqli) {
|
||||
if ($result->num_rows) {
|
||||
while($x = $result->fetch_array(MYSQLI_ASSOC))
|
||||
switch ($this->driver) {
|
||||
case 'pdo':
|
||||
while ($x = $result->fetch(PDO::FETCH_ASSOC)) {
|
||||
$r[] = $x;
|
||||
}
|
||||
$result->closeCursor();
|
||||
break;
|
||||
case 'mysqli':
|
||||
while ($x = $result->fetch_array(MYSQLI_ASSOC)) {
|
||||
$r[] = $x;
|
||||
}
|
||||
$result->free_result();
|
||||
}
|
||||
} else {
|
||||
if (mysql_num_rows($result)) {
|
||||
while($x = mysql_fetch_array($result, MYSQL_ASSOC))
|
||||
break;
|
||||
case 'mysql':
|
||||
while ($x = mysql_fetch_array($result, MYSQL_ASSOC)) {
|
||||
$r[] = $x;
|
||||
mysql_free_result($result);
|
||||
}
|
||||
mysql_free_result($result);
|
||||
break;
|
||||
}
|
||||
|
||||
// PDO doesn't return "true" on successful operations - like mysqli does
|
||||
// Emulate this behaviour by checking if the query returned data and had columns
|
||||
// This should be reliable enough
|
||||
if (($this->driver == 'pdo') AND (count($r) == 0) AND ($columns == 0)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
//$a->save_timestamp($stamp1, "database");
|
||||
|
|
@ -328,12 +378,16 @@ class dba {
|
|||
$x = false;
|
||||
|
||||
if ($this->result) {
|
||||
if ($this->mysqli) {
|
||||
if ($this->result->num_rows)
|
||||
switch ($this->driver) {
|
||||
case 'pdo':
|
||||
$x = $this->result->fetch(PDO::FETCH_ASSOC);
|
||||
break;
|
||||
case 'mysqli':
|
||||
$x = $this->result->fetch_array(MYSQLI_ASSOC);
|
||||
} else {
|
||||
if (mysql_num_rows($this->result))
|
||||
break;
|
||||
case 'mysql':
|
||||
$x = mysql_fetch_array($this->result, MYSQL_ASSOC);
|
||||
break;
|
||||
}
|
||||
}
|
||||
return($x);
|
||||
|
|
@ -341,10 +395,16 @@ class dba {
|
|||
|
||||
public function qclose() {
|
||||
if ($this->result) {
|
||||
if ($this->mysqli) {
|
||||
switch ($this->driver) {
|
||||
case 'pdo':
|
||||
$this->result->closeCursor();
|
||||
break;
|
||||
case 'mysqli':
|
||||
$this->result->free_result();
|
||||
} else {
|
||||
break;
|
||||
case 'mysql':
|
||||
mysql_free_result($this->result);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -355,35 +415,65 @@ class dba {
|
|||
|
||||
public function escape($str) {
|
||||
if ($this->db && $this->connected) {
|
||||
if ($this->mysqli) {
|
||||
switch ($this->driver) {
|
||||
case 'pdo':
|
||||
return substr(@$this->db->quote($str, PDO::PARAM_STR), 1, -1);
|
||||
case 'mysqli':
|
||||
return @$this->db->real_escape_string($str);
|
||||
} else {
|
||||
case 'mysql':
|
||||
return @mysql_real_escape_string($str,$this->db);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function connected() {
|
||||
if ($this->mysqli) {
|
||||
switch ($this->driver) {
|
||||
case 'pdo':
|
||||
// Not sure if this really is working like expected
|
||||
$connected = ($this->db->getAttribute(PDO::ATTR_CONNECTION_STATUS) != "");
|
||||
break;
|
||||
case 'mysqli':
|
||||
$connected = $this->db->ping();
|
||||
} else {
|
||||
break;
|
||||
case 'mysql':
|
||||
$connected = mysql_ping($this->db);
|
||||
break;
|
||||
}
|
||||
return $connected;
|
||||
}
|
||||
|
||||
function insert_id() {
|
||||
switch ($this->driver) {
|
||||
case 'pdo':
|
||||
$id = $this->db->lastInsertId();
|
||||
break;
|
||||
case 'mysqli':
|
||||
$id = $this->db->insert_id;
|
||||
break;
|
||||
case 'mysql':
|
||||
$id = mysql_insert_id($this->db);
|
||||
break;
|
||||
}
|
||||
return $id;
|
||||
}
|
||||
|
||||
function __destruct() {
|
||||
if ($this->db) {
|
||||
if ($this->mysqli) {
|
||||
switch ($this->driver) {
|
||||
case 'pdo':
|
||||
$this->db = null;
|
||||
break;
|
||||
case 'mysqli':
|
||||
$this->db->close();
|
||||
} else {
|
||||
break;
|
||||
case 'mysql':
|
||||
mysql_close($this->db);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}}
|
||||
}
|
||||
|
||||
if (! function_exists('printable')) {
|
||||
function printable($s) {
|
||||
$s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s);
|
||||
$s = str_replace("\x00",'.',$s);
|
||||
|
|
@ -391,37 +481,32 @@ function printable($s) {
|
|||
$s = escape_tags($s);
|
||||
}
|
||||
return $s;
|
||||
}}
|
||||
}
|
||||
|
||||
// Procedural functions
|
||||
if (! function_exists('dbg')) {
|
||||
function dbg($state) {
|
||||
global $db;
|
||||
|
||||
if ($db) {
|
||||
$db->dbg($state);
|
||||
}
|
||||
}}
|
||||
}
|
||||
|
||||
if (! function_exists('dbesc')) {
|
||||
function dbesc($str) {
|
||||
global $db;
|
||||
|
||||
if ($db && $db->connected) {
|
||||
return($db->escape($str));
|
||||
} else {
|
||||
return(str_replace("'","\\'",$str));
|
||||
}
|
||||
}}
|
||||
|
||||
|
||||
}
|
||||
|
||||
// Function: q($sql,$args);
|
||||
// Description: execute SQL query with printf style args.
|
||||
// Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
|
||||
// 'user', 1);
|
||||
|
||||
if (! function_exists('q')) {
|
||||
function q($sql) {
|
||||
|
||||
global $db;
|
||||
$args = func_get_args();
|
||||
unset($args[0]);
|
||||
|
|
@ -445,8 +530,7 @@ function q($sql) {
|
|||
*/
|
||||
logger('dba: no database: ' . print_r($args,true));
|
||||
return false;
|
||||
|
||||
}}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Performs a query with "dirty reads"
|
||||
|
|
@ -458,8 +542,8 @@ function q($sql) {
|
|||
* @return array Query array
|
||||
*/
|
||||
function qu($sql) {
|
||||
|
||||
global $db;
|
||||
|
||||
$args = func_get_args();
|
||||
unset($args[0]);
|
||||
|
||||
|
|
@ -484,7 +568,6 @@ function qu($sql) {
|
|||
*/
|
||||
logger('dba: no database: ' . print_r($args,true));
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -492,40 +575,31 @@ function qu($sql) {
|
|||
* Raw db query, no arguments
|
||||
*
|
||||
*/
|
||||
|
||||
if (! function_exists('dbq')) {
|
||||
function dbq($sql) {
|
||||
|
||||
global $db;
|
||||
|
||||
if ($db && $db->connected) {
|
||||
$ret = $db->q($sql);
|
||||
} else {
|
||||
$ret = false;
|
||||
}
|
||||
return $ret;
|
||||
}}
|
||||
|
||||
}
|
||||
|
||||
// Caller is responsible for ensuring that any integer arguments to
|
||||
// dbesc_array are actually integers and not malformed strings containing
|
||||
// SQL injection vectors. All integer array elements should be specifically
|
||||
// cast to int to avoid trouble.
|
||||
|
||||
|
||||
if (! function_exists('dbesc_array_cb')) {
|
||||
function dbesc_array_cb(&$item, $key) {
|
||||
if (is_string($item))
|
||||
$item = dbesc($item);
|
||||
}}
|
||||
}
|
||||
|
||||
|
||||
if (! function_exists('dbesc_array')) {
|
||||
function dbesc_array(&$arr) {
|
||||
if (is_array($arr) && count($arr)) {
|
||||
array_walk($arr,'dbesc_array_cb');
|
||||
}
|
||||
}}
|
||||
|
||||
}
|
||||
|
||||
function dba_timer() {
|
||||
return microtime(true);
|
||||
|
|
|
|||
207
include/feed.php
207
include/feed.php
|
|
@ -17,11 +17,11 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
|
|||
|
||||
$a = get_app();
|
||||
|
||||
if (!$simulate)
|
||||
if (!$simulate) {
|
||||
logger("Import Atom/RSS feed '".$contact["name"]."' (Contact ".$contact["id"].") for user ".$importer["uid"], LOGGER_DEBUG);
|
||||
else
|
||||
} else {
|
||||
logger("Test Atom/RSS feed", LOGGER_DEBUG);
|
||||
|
||||
}
|
||||
if ($xml == "") {
|
||||
logger('XML is empty.', LOGGER_DEBUG);
|
||||
return;
|
||||
|
|
@ -45,63 +45,69 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
|
|||
$author["author-link"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:link/text()')->item(0)->nodeValue;
|
||||
$author["author-name"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:title/text()')->item(0)->nodeValue;
|
||||
|
||||
if ($author["author-name"] == "")
|
||||
if ($author["author-name"] == "") {
|
||||
$author["author-name"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:description/text()')->item(0)->nodeValue;
|
||||
|
||||
}
|
||||
$entries = $xpath->query('/rdf:RDF/rss:item');
|
||||
}
|
||||
|
||||
// Is it Atom?
|
||||
if ($xpath->query('/atom:feed')->length > 0) {
|
||||
$alternate = $xpath->query("atom:link[@rel='alternate']")->item(0)->attributes;
|
||||
if (is_object($alternate))
|
||||
foreach($alternate AS $attributes)
|
||||
if ($attributes->name == "href")
|
||||
$author["author-link"] = $attributes->textContent;
|
||||
|
||||
if ($author["author-link"] == "")
|
||||
$author["author-link"] = $author["author-id"];
|
||||
|
||||
if ($author["author-link"] == "") {
|
||||
$self = $xpath->query("atom:link[@rel='self']")->item(0)->attributes;
|
||||
if (is_object($self))
|
||||
foreach($self AS $attributes)
|
||||
if ($attributes->name == "href")
|
||||
if (is_object($alternate)) {
|
||||
foreach($alternate AS $attributes) {
|
||||
if ($attributes->name == "href") {
|
||||
$author["author-link"] = $attributes->textContent;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($author["author-link"] == "")
|
||||
if ($author["author-link"] == "") {
|
||||
$author["author-link"] = $author["author-id"];
|
||||
}
|
||||
if ($author["author-link"] == "") {
|
||||
$self = $xpath->query("atom:link[@rel='self']")->item(0)->attributes;
|
||||
if (is_object($self)) {
|
||||
foreach($self AS $attributes) {
|
||||
if ($attributes->name == "href") {
|
||||
$author["author-link"] = $attributes->textContent;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($author["author-link"] == "") {
|
||||
$author["author-link"] = $xpath->evaluate('/atom:feed/atom:id/text()')->item(0)->nodeValue;
|
||||
|
||||
}
|
||||
$author["author-avatar"] = $xpath->evaluate('/atom:feed/atom:logo/text()')->item(0)->nodeValue;
|
||||
|
||||
$author["author-name"] = $xpath->evaluate('/atom:feed/atom:title/text()')->item(0)->nodeValue;
|
||||
|
||||
if ($author["author-name"] == "")
|
||||
if ($author["author-name"] == "") {
|
||||
$author["author-name"] = $xpath->evaluate('/atom:feed/atom:subtitle/text()')->item(0)->nodeValue;
|
||||
|
||||
if ($author["author-name"] == "")
|
||||
}
|
||||
if ($author["author-name"] == "") {
|
||||
$author["author-name"] = $xpath->evaluate('/atom:feed/atom:author/atom:name/text()')->item(0)->nodeValue;
|
||||
|
||||
}
|
||||
$value = $xpath->evaluate('atom:author/poco:displayName/text()')->item(0)->nodeValue;
|
||||
if ($value != "")
|
||||
if ($value != "") {
|
||||
$author["author-name"] = $value;
|
||||
|
||||
}
|
||||
if ($simulate) {
|
||||
$author["author-id"] = $xpath->evaluate('/atom:feed/atom:author/atom:uri/text()')->item(0)->nodeValue;
|
||||
|
||||
$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()')->item(0)->nodeValue;
|
||||
if ($value != "")
|
||||
if ($value != "") {
|
||||
$author["author-nick"] = $value;
|
||||
|
||||
}
|
||||
$value = $xpath->evaluate('atom:author/poco:address/poco:formatted/text()', $context)->item(0)->nodeValue;
|
||||
if ($value != "")
|
||||
if ($value != "") {
|
||||
$author["author-location"] = $value;
|
||||
|
||||
}
|
||||
$value = $xpath->evaluate('atom:author/poco:note/text()')->item(0)->nodeValue;
|
||||
if ($value != "")
|
||||
if ($value != "") {
|
||||
$author["author-about"] = $value;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
$author["edited"] = $author["created"] = $xpath->query('/atom:feed/atom:updated/text()')->item(0)->nodeValue;
|
||||
|
|
@ -118,12 +124,12 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
|
|||
$author["author-name"] = $xpath->evaluate('/rss/channel/title/text()')->item(0)->nodeValue;
|
||||
$author["author-avatar"] = $xpath->evaluate('/rss/channel/image/url/text()')->item(0)->nodeValue;
|
||||
|
||||
if ($author["author-name"] == "")
|
||||
if ($author["author-name"] == "") {
|
||||
$author["author-name"] = $xpath->evaluate('/rss/channel/copyright/text()')->item(0)->nodeValue;
|
||||
|
||||
if ($author["author-name"] == "")
|
||||
}
|
||||
if ($author["author-name"] == "") {
|
||||
$author["author-name"] = $xpath->evaluate('/rss/channel/description/text()')->item(0)->nodeValue;
|
||||
|
||||
}
|
||||
$author["edited"] = $author["created"] = $xpath->query('/rss/channel/pubDate/text()')->item(0)->nodeValue;
|
||||
|
||||
$author["app"] = $xpath->evaluate('/rss/channel/generator/text()')->item(0)->nodeValue;
|
||||
|
|
@ -134,9 +140,9 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
|
|||
if (!$simulate) {
|
||||
$author["author-link"] = $contact["url"];
|
||||
|
||||
if ($author["author-name"] == "")
|
||||
if ($author["author-name"] == "") {
|
||||
$author["author-name"] = $contact["name"];
|
||||
|
||||
}
|
||||
$author["author-avatar"] = $contact["thumb"];
|
||||
|
||||
$author["owner-link"] = $contact["url"];
|
||||
|
|
@ -171,33 +177,39 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
|
|||
|
||||
$entrylist = array();
|
||||
|
||||
foreach ($entries AS $entry)
|
||||
foreach ($entries AS $entry) {
|
||||
$entrylist[] = $entry;
|
||||
|
||||
}
|
||||
foreach (array_reverse($entrylist) AS $entry) {
|
||||
$item = array_merge($header, $author);
|
||||
|
||||
if (is_object($alternate))
|
||||
foreach($alternate AS $attributes)
|
||||
if ($attributes->name == "href")
|
||||
$alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
|
||||
if (!is_object($alternate)) {
|
||||
$alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
|
||||
}
|
||||
if (is_object($alternate)) {
|
||||
foreach($alternate AS $attributes) {
|
||||
if ($attributes->name == "href") {
|
||||
$item["plink"] = $attributes->textContent;
|
||||
|
||||
if ($item["plink"] == "")
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($item["plink"] == "") {
|
||||
$item["plink"] = $xpath->evaluate('link/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
if ($item["plink"] == "")
|
||||
}
|
||||
if ($item["plink"] == "") {
|
||||
$item["plink"] = $xpath->evaluate('rss:link/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
}
|
||||
$item["plink"] = original_url($item["plink"]);
|
||||
|
||||
$item["uri"] = $xpath->evaluate('atom:id/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
if ($item["uri"] == "")
|
||||
if ($item["uri"] == "") {
|
||||
$item["uri"] = $xpath->evaluate('guid/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
if ($item["uri"] == "")
|
||||
}
|
||||
if ($item["uri"] == "") {
|
||||
$item["uri"] = $item["plink"];
|
||||
|
||||
}
|
||||
$item["parent-uri"] = $item["uri"];
|
||||
|
||||
if (!$simulate) {
|
||||
|
|
@ -211,54 +223,50 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
|
|||
|
||||
$item["title"] = $xpath->evaluate('atom:title/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
if ($item["title"] == "")
|
||||
if ($item["title"] == "") {
|
||||
$item["title"] = $xpath->evaluate('title/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
if ($item["title"] == "")
|
||||
}
|
||||
if ($item["title"] == "") {
|
||||
$item["title"] = $xpath->evaluate('rss:title/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
$alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
|
||||
if (!is_object($alternate))
|
||||
$alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
|
||||
|
||||
}
|
||||
$published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
if ($published == "")
|
||||
if ($published == "") {
|
||||
$published = $xpath->query('pubDate/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
if ($published == "")
|
||||
}
|
||||
if ($published == "") {
|
||||
$published = $xpath->query('dc:date/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
}
|
||||
$updated = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
if ($updated == "")
|
||||
if ($updated == "") {
|
||||
$updated = $published;
|
||||
|
||||
if ($published != "")
|
||||
}
|
||||
if ($published != "") {
|
||||
$item["created"] = $published;
|
||||
|
||||
if ($updated != "")
|
||||
}
|
||||
if ($updated != "") {
|
||||
$item["edited"] = $updated;
|
||||
|
||||
}
|
||||
$creator = $xpath->query('author/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
if ($creator == "")
|
||||
if ($creator == "") {
|
||||
$creator = $xpath->query('atom:author/atom:name/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
if ($creator == "")
|
||||
}
|
||||
if ($creator == "") {
|
||||
$creator = $xpath->query('dc:creator/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
if ($creator != "")
|
||||
}
|
||||
if ($creator != "") {
|
||||
$item["author-name"] = $creator;
|
||||
|
||||
if ($pubDate != "")
|
||||
}
|
||||
if ($pubDate != "") {
|
||||
$item["edited"] = $item["created"] = $pubDate;
|
||||
|
||||
}
|
||||
$creator = $xpath->query('dc:creator/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
if ($creator != "")
|
||||
if ($creator != "") {
|
||||
$item["author-name"] = $creator;
|
||||
|
||||
}
|
||||
/// @TODO ?
|
||||
// <category>Ausland</category>
|
||||
// <media:thumbnail width="152" height="76" url="http://www.taz.de/picture/667875/192/14388767.jpg"/>
|
||||
|
|
@ -273,13 +281,14 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
|
|||
$title = "";
|
||||
|
||||
foreach($enclosure->attributes AS $attributes) {
|
||||
if ($attributes->name == "url")
|
||||
if ($attributes->name == "url") {
|
||||
$href = $attributes->textContent;
|
||||
elseif ($attributes->name == "length")
|
||||
} elseif ($attributes->name == "length") {
|
||||
$length = $attributes->textContent;
|
||||
elseif ($attributes->name == "type")
|
||||
} elseif ($attributes->name == "type") {
|
||||
$type = $attributes->textContent;
|
||||
}
|
||||
}
|
||||
if(strlen($item["attach"]))
|
||||
$item["attach"] .= ',';
|
||||
|
||||
|
|
@ -292,9 +301,11 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
|
|||
$preview = "";
|
||||
|
||||
// Handle enclosures and treat them as preview picture
|
||||
foreach ($attachments AS $attachment)
|
||||
if ($attachment["type"] == "image/jpeg")
|
||||
foreach ($attachments AS $attachment) {
|
||||
if ($attachment["type"] == "image/jpeg") {
|
||||
$preview = $attachment["link"];
|
||||
}
|
||||
}
|
||||
|
||||
$item["body"] = $item["title"].add_page_info($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
|
||||
$item["tag"] = add_page_keywords($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
|
||||
|
|
@ -304,20 +315,20 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
|
|||
} else {
|
||||
$body = trim($xpath->evaluate('atom:content/text()', $entry)->item(0)->nodeValue);
|
||||
|
||||
if ($body == "")
|
||||
if ($body == "") {
|
||||
$body = trim($xpath->evaluate('content:encoded/text()', $entry)->item(0)->nodeValue);
|
||||
|
||||
if ($body == "")
|
||||
}
|
||||
if ($body == "") {
|
||||
$body = trim($xpath->evaluate('description/text()', $entry)->item(0)->nodeValue);
|
||||
|
||||
if ($body == "")
|
||||
}
|
||||
if ($body == "") {
|
||||
$body = trim($xpath->evaluate('atom:summary/text()', $entry)->item(0)->nodeValue);
|
||||
|
||||
}
|
||||
// remove the content of the title if it is identically to the body
|
||||
// This helps with auto generated titles e.g. from tumblr
|
||||
if (title_is_body($item["title"], $body))
|
||||
if (title_is_body($item["title"], $body)) {
|
||||
$item["title"] = "";
|
||||
|
||||
}
|
||||
$item["body"] = html2bbcode($body);
|
||||
}
|
||||
|
||||
|
|
@ -336,14 +347,16 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
|
|||
$id = item_store($item, false, $notify);
|
||||
|
||||
logger("Feed for contact ".$contact["url"]." stored under id ".$id);
|
||||
} else
|
||||
} else {
|
||||
$items[] = $item;
|
||||
|
||||
if ($simulate)
|
||||
}
|
||||
if ($simulate) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ($simulate)
|
||||
if ($simulate) {
|
||||
return array("header" => $author, "items" => $items);
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -11,14 +11,11 @@ define("IMPORT_DEBUG", False);
|
|||
|
||||
function last_insert_id() {
|
||||
global $db;
|
||||
|
||||
if (IMPORT_DEBUG)
|
||||
return 1;
|
||||
if ($db->mysqli) {
|
||||
$thedb = $db->getdb();
|
||||
return $thedb->insert_id;
|
||||
} else {
|
||||
return mysql_insert_id();
|
||||
}
|
||||
|
||||
return $db->insert_id();
|
||||
}
|
||||
|
||||
function last_error() {
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ function dropItem(url, elementId) {
|
|||
$el.fadeTo('fast', 0.33, function () {
|
||||
$.get(url).then(function() {
|
||||
$el.remove();
|
||||
}).error(function() {
|
||||
}).fail(function() {
|
||||
// @todo Show related error message
|
||||
$el.show();
|
||||
}).always(function() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user