sforkowany z mirror/friendica
Merge pull request #1057 from annando/master
Removing of several warnings to make the dav addon work again2022.09-rc
commit
599bc1eb0a
|
@ -452,7 +452,7 @@ function bb_ShareAttributes($share, $simplehtml) {
|
||||||
case 2:
|
case 2:
|
||||||
$text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.": <br />".$share[3];
|
$text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.": <br />".$share[3];
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3: // Diaspora
|
||||||
$headline = '<div class="shared_header">';
|
$headline = '<div class="shared_header">';
|
||||||
$headline .= '<span><b>'.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').$userid.':</b></span>';
|
$headline .= '<span><b>'.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').$userid.':</b></span>';
|
||||||
$headline .= "</div>";
|
$headline .= "</div>";
|
||||||
|
@ -484,15 +484,21 @@ function bb_ShareAttributes($share, $simplehtml) {
|
||||||
case 5:
|
case 5:
|
||||||
$text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.": <br />".$share[3];
|
$text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.": <br />".$share[3];
|
||||||
break;
|
break;
|
||||||
case 6:
|
case 6: // app.net
|
||||||
$text = $preshare.">> @".$userid_compact.": <br />".$share[3];
|
$text = $preshare.">> @".$userid_compact.": <br />".$share[3];
|
||||||
break;
|
break;
|
||||||
case 7:
|
case 7: // statusnet/GNU Social
|
||||||
$text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')." @".$userid_compact.": ".$share[3];
|
$text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')." @".$userid_compact.": ".$share[3];
|
||||||
break;
|
break;
|
||||||
case 8:
|
case 8: // twitter
|
||||||
$text = $preshare."RT @".$userid_compact.": ".$share[3];
|
$text = $preshare."RT @".$userid_compact.": ".$share[3];
|
||||||
break;
|
break;
|
||||||
|
case 9: // Google+/Facebook
|
||||||
|
$text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.": <br />".$share[3];
|
||||||
|
|
||||||
|
if ($link != "")
|
||||||
|
$text .= "<br /><br />".$link;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
$headline = trim($share[1]).'<div class="shared_header">';
|
$headline = trim($share[1]).'<div class="shared_header">';
|
||||||
if ($avatar != "")
|
if ($avatar != "")
|
||||||
|
@ -775,7 +781,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
|
||||||
$Text = preg_replace("/#\[url\=[$URLSearchString]*\]\^\[\/url\]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/i",
|
$Text = preg_replace("/#\[url\=[$URLSearchString]*\]\^\[\/url\]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/i",
|
||||||
"[bookmark=$1]$2[/bookmark]", $Text);
|
"[bookmark=$1]$2[/bookmark]", $Text);
|
||||||
|
|
||||||
if (in_array($simplehtml, array(2, 6, 7, 8))) {
|
if (in_array($simplehtml, array(2, 6, 7, 8, 9))) {
|
||||||
$Text = preg_replace_callback("/([^#@])\[url\=([^\]]*)\](.*?)\[\/url\]/ism","bb_expand_links",$Text);
|
$Text = preg_replace_callback("/([^#@])\[url\=([^\]]*)\](.*?)\[\/url\]/ism","bb_expand_links",$Text);
|
||||||
//$Text = preg_replace("/[^#@]\[url\=([^\]]*)\](.*?)\[\/url\]/ism",' $2 [url]$1[/url]',$Text);
|
//$Text = preg_replace("/[^#@]\[url\=([^\]]*)\](.*?)\[\/url\]/ism",' $2 [url]$1[/url]',$Text);
|
||||||
$Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",' $2 [url]$1[/url]',$Text);
|
$Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",' $2 [url]$1[/url]',$Text);
|
||||||
|
|
|
@ -182,13 +182,13 @@ class dba {
|
||||||
* These usually indicate SQL syntax errors that need to be resolved.
|
* These usually indicate SQL syntax errors that need to be resolved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if($result === false) {
|
if(isset($result) AND ($result === false)) {
|
||||||
logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
|
logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
|
||||||
if(file_exists('dbfail.out'))
|
if(file_exists('dbfail.out'))
|
||||||
file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
|
file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(($result === true) || ($result === false))
|
if(isset($result) AND (($result === true) || ($result === false)))
|
||||||
return $result;
|
return $result;
|
||||||
|
|
||||||
if ($onlyquery) {
|
if ($onlyquery) {
|
||||||
|
|
|
@ -655,7 +655,7 @@ function attribute_contains($attr,$s) {
|
||||||
if(! function_exists('logger')) {
|
if(! function_exists('logger')) {
|
||||||
/* setup int->string log level map */
|
/* setup int->string log level map */
|
||||||
$LOGGER_LEVELS = array();
|
$LOGGER_LEVELS = array();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* log levels:
|
* log levels:
|
||||||
* LOGGER_NORMAL (default)
|
* LOGGER_NORMAL (default)
|
||||||
|
@ -663,7 +663,7 @@ $LOGGER_LEVELS = array();
|
||||||
* LOGGER_DEBUG
|
* LOGGER_DEBUG
|
||||||
* LOGGER_DATA
|
* LOGGER_DATA
|
||||||
* LOGGER_ALL
|
* LOGGER_ALL
|
||||||
*
|
*
|
||||||
* @global App $a
|
* @global App $a
|
||||||
* @global dba $db
|
* @global dba $db
|
||||||
* @param string $msg
|
* @param string $msg
|
||||||
|
@ -674,15 +674,16 @@ function logger($msg,$level = 0) {
|
||||||
global $a;
|
global $a;
|
||||||
global $db;
|
global $db;
|
||||||
global $LOGGER_LEVELS;
|
global $LOGGER_LEVELS;
|
||||||
|
|
||||||
if(($a->module == 'install') || (! ($db && $db->connected))) return;
|
if(($a->module == 'install') || (! ($db && $db->connected))) return;
|
||||||
|
|
||||||
if (count($LOGGER_LEVEL)==0){
|
if (count($LOGGER_LEVELS)==0){
|
||||||
foreach (get_defined_constants() as $k=>$v){
|
foreach (get_defined_constants() as $k=>$v){
|
||||||
if (substr($k,0,7)=="LOGGER_") $LOGGER_LEVELS[$v] = substr($k,7,7);
|
if (substr($k,0,7)=="LOGGER_")
|
||||||
}
|
$LOGGER_LEVELS[$v] = substr($k,7,7);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$debugging = get_config('system','debugging');
|
$debugging = get_config('system','debugging');
|
||||||
$loglevel = intval(get_config('system','loglevel'));
|
$loglevel = intval(get_config('system','loglevel'));
|
||||||
$logfile = get_config('system','logfile');
|
$logfile = get_config('system','logfile');
|
||||||
|
|
|
@ -432,7 +432,7 @@ else
|
||||||
$a->page['htmlhead'] = str_replace('{{$stylesheet}}',$stylesheet,$a->page['htmlhead']);
|
$a->page['htmlhead'] = str_replace('{{$stylesheet}}',$stylesheet,$a->page['htmlhead']);
|
||||||
//$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
|
//$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
|
||||||
|
|
||||||
if (($_GET["mode"] == "raw") OR ($_GET["mode"] == "minimal")) {
|
if (isset($_GET["mode"]) AND (($_GET["mode"] == "raw") OR ($_GET["mode"] == "minimal"))) {
|
||||||
$doc = new DOMDocument();
|
$doc = new DOMDocument();
|
||||||
|
|
||||||
$target = new DOMDocument();
|
$target = new DOMDocument();
|
||||||
|
@ -455,7 +455,7 @@ if (($_GET["mode"] == "raw") OR ($_GET["mode"] == "minimal")) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($_GET["mode"] == "raw") {
|
if (isset($_GET["mode"]) AND ($_GET["mode"] == "raw")) {
|
||||||
|
|
||||||
header("Content-type: text/html; charset=utf-8");
|
header("Content-type: text/html; charset=utf-8");
|
||||||
|
|
||||||
|
@ -528,7 +528,7 @@ $profile = $a->profile;
|
||||||
header("Content-type: text/html; charset=utf-8");
|
header("Content-type: text/html; charset=utf-8");
|
||||||
|
|
||||||
|
|
||||||
if ($_GET["mode"] == "minimal") {
|
if (isset($_GET["mode"]) AND ($_GET["mode"] == "minimal")) {
|
||||||
//$page['content'] = substr($target->saveHTML(), 6, -8)."\n\n".
|
//$page['content'] = substr($target->saveHTML(), 6, -8)."\n\n".
|
||||||
// '<div id="conversation-end"></div>'."\n\n";
|
// '<div id="conversation-end"></div>'."\n\n";
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ class QueryException extends \Exception {
|
||||||
* and print them as exception
|
* and print them as exception
|
||||||
*
|
*
|
||||||
**/
|
**/
|
||||||
public function __construct(\PDOStatement $objPDO, $arrQueryDefinition) {
|
public function __construct(\PDOStatement $objPDO, array $arrQueryDefinition) {
|
||||||
|
|
||||||
$strMessage = self::createErrorMessage($objPDO, $arrQueryDefinition);
|
$strMessage = self::createErrorMessage($objPDO, $arrQueryDefinition);
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ class QueryException extends \Exception {
|
||||||
* and query definition
|
* and query definition
|
||||||
*
|
*
|
||||||
**/
|
**/
|
||||||
private function createErrorMessage($objPDO, $arrQueryDefinition) {
|
private function createErrorMessage(\PDOStatement $objPDO, array $arrQueryDefinition) {
|
||||||
|
|
||||||
$strMessage = self::flattenQueryErrorInfo($objPDO);
|
$strMessage = self::flattenQueryErrorInfo($objPDO);
|
||||||
$strMessage .= self::flattenQueryDefiniton($arrQueryDefinition);
|
$strMessage .= self::flattenQueryDefiniton($arrQueryDefinition);
|
||||||
|
@ -57,7 +57,7 @@ class QueryException extends \Exception {
|
||||||
* from the driver specific error message
|
* from the driver specific error message
|
||||||
*
|
*
|
||||||
**/
|
**/
|
||||||
private function flattenQueryErrorInfo($objPDO) {
|
private function flattenQueryErrorInfo(\PDOStatement $objPDO) {
|
||||||
|
|
||||||
$arrErrorInfo = $objPDO->errorInfo();
|
$arrErrorInfo = $objPDO->errorInfo();
|
||||||
|
|
||||||
|
@ -76,16 +76,18 @@ class QueryException extends \Exception {
|
||||||
*
|
*
|
||||||
* @return (string) a text version of the query definition
|
* @return (string) a text version of the query definition
|
||||||
*
|
*
|
||||||
* create an text, which contains all information
|
* create an text, which contains all *scalar* information
|
||||||
* of the query definition
|
* of the query definition. if there are non-scalar information
|
||||||
|
* added, the will be excluded from output
|
||||||
*
|
*
|
||||||
**/
|
**/
|
||||||
private function flattenQueryDefiniton($arrQueryDefinition) {
|
private function flattenQueryDefiniton(array $arrQueryDefinition) {
|
||||||
|
|
||||||
$strMessage = "\nQuery-Definiton:\n";
|
$strMessage = "\nQuery-Definiton:\n";
|
||||||
|
|
||||||
foreach($arrQueryDefinition AS $strKeyword => $strContent)
|
foreach($arrQueryDefinition AS $strKeyword => $strContent)
|
||||||
$strMessage .= "$strKeyword: $strContent\n";
|
if(is_scalar($strContent))
|
||||||
|
$strMessage .= "$strKeyword: $strContent\n";
|
||||||
|
|
||||||
return $strMessage . "\n";
|
return $strMessage . "\n";
|
||||||
|
|
||||||
|
|
|
@ -100,7 +100,7 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
|
||||||
// Fetch the first mentioned charset. Can be in body or header
|
// Fetch the first mentioned charset. Can be in body or header
|
||||||
$charset = "";
|
$charset = "";
|
||||||
if (preg_match('/charset=(.*?)['."'".'"\s\n]/', $header, $matches))
|
if (preg_match('/charset=(.*?)['."'".'"\s\n]/', $header, $matches))
|
||||||
$charset = trim(array_pop($matches));
|
$charset = trim(trim(trim(array_pop($matches)), ';,'));
|
||||||
|
|
||||||
if ($charset == "")
|
if ($charset == "")
|
||||||
$charset = "utf-8";
|
$charset = "utf-8";
|
||||||
|
@ -112,7 +112,12 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
|
||||||
else
|
else
|
||||||
$body = $header;
|
$body = $header;
|
||||||
|
|
||||||
$body = mb_convert_encoding($body, "UTF-8", $charset);
|
if (($charset != '') AND (strtoupper($charset) != "UTF-8")) {
|
||||||
|
logger("parseurl_getsiteinfo: detected charset ".$charset, LOGGER_DEBUG);
|
||||||
|
//$body = mb_convert_encoding($body, "UTF-8", $charset);
|
||||||
|
$body = iconv($charset, "UTF-8//TRANSLIT", $body);
|
||||||
|
}
|
||||||
|
|
||||||
$body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
|
$body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
|
||||||
|
|
||||||
$doc = new DOMDocument();
|
$doc = new DOMDocument();
|
||||||
|
|
Ładowanie…
Reference in New Issue