"; var_dump($consumer, $token); die(); - }catch(Exception $e){ + echo __FILE__.__LINE__.__FUNCTION__ . ""; + var_dump($consumer, $token); + die(); + } catch (Exception $e) { logger($e); } - - // workaround for HTTP-auth in CGI mode - if(x($_SERVER,'REDIRECT_REMOTE_USER')) { - $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"],6)) ; - if(strlen($userpass)) { + if (x($_SERVER, 'REDIRECT_REMOTE_USER')) { + $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ; + if (strlen($userpass)) { list($name, $password) = explode(':', $userpass); $_SERVER['PHP_AUTH_USER'] = $name; $_SERVER['PHP_AUTH_PW'] = $password; } } - if (!isset($_SERVER['PHP_AUTH_USER'])) { + if (!x($_SERVER, 'PHP_AUTH_USER')) { logger('API_login: ' . print_r($_SERVER,true), LOGGER_DEBUG); header('WWW-Authenticate: Basic realm="Friendica"'); throw new UnauthorizedException("This API requires login"); @@ -171,55 +173,51 @@ use \Friendica\Core\Config; $user = $_SERVER['PHP_AUTH_USER']; $password = $_SERVER['PHP_AUTH_PW']; - $encrypted = hash('whirlpool',trim($password)); + $encrypted = hash('whirlpool', trim($password)); // allow "user@server" login (but ignore 'server' part) - $at=strstr($user, "@", true); - if ( $at ) $user=$at; + $at = strstr($user, "@", true); + if ($at) { + $user = $at; + } - /** - * next code from mod/auth.php. needs better solution - */ + // next code from mod/auth.php. needs better solution $record = null; $addon_auth = array( 'username' => trim($user), 'password' => trim($password), 'authenticated' => 0, - 'user_record' => null + 'user_record' => null, ); - /** - * + /* * A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record * Plugins should never set 'authenticated' except to indicate success - as hooks may be chained * and later plugins should not interfere with an earlier one that succeeded. - * */ - call_hooks('authenticate', $addon_auth); - if(($addon_auth['authenticated']) && (count($addon_auth['user_record']))) { + if (($addon_auth['authenticated']) && (count($addon_auth['user_record']))) { $record = $addon_auth['user_record']; - } - else { + } else { // process normal login request - $r = q("SELECT * FROM `user` WHERE (`email` = '%s' OR `nickname` = '%s') AND `password` = '%s' AND NOT `blocked` AND NOT `account_expired` AND NOT `account_removed` AND `verified` LIMIT 1", dbesc(trim($user)), dbesc(trim($user)), dbesc($encrypted) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $record = $r[0]; + } } - if((! $record) || (! count($record))) { - logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG); + if ((! $record) || (! count($record))) { + logger('API_login failure: ' . print_r($_SERVER, true), LOGGER_DEBUG); header('WWW-Authenticate: Basic realm="Friendica"'); - #header('HTTP/1.0 401 Unauthorized'); - #die('This api requires login'); + //header('HTTP/1.0 401 Unauthorized'); + //die('This api requires login'); throw new UnauthorizedException("This API requires login"); } @@ -242,8 +240,10 @@ use \Friendica\Core\Config; * @return bool */ function api_check_method($method) { - if ($method=="*") return True; - return strpos($method, $_SERVER['REQUEST_METHOD']) !== false; + if ($method == "*") { + return true; + } + return (strpos($method, $_SERVER['REQUEST_METHOD']) !== false); } /** @@ -254,39 +254,51 @@ use \Friendica\Core\Config; * @param App $a * @return string API call result */ - function api_call(App $a){ + function api_call(App $a) { global $API, $called_api; - $type="json"; - if (strpos($a->query_string, ".xml")>0) $type="xml"; - if (strpos($a->query_string, ".json")>0) $type="json"; - if (strpos($a->query_string, ".rss")>0) $type="rss"; - if (strpos($a->query_string, ".atom")>0) $type="atom"; + $type = "json"; + if (strpos($a->query_string, ".xml") > 0) { + $type = "xml"; + } + if (strpos($a->query_string, ".json") > 0) { + $type = "json"; + } + if (strpos($a->query_string, ".rss") > 0) { + $type = "rss"; + } + if (strpos($a->query_string, ".atom") > 0) { + $type = "atom"; + } + try { - foreach ($API as $p=>$info){ - if (strpos($a->query_string, $p)===0){ - if (!api_check_method($info['method'])){ + foreach ($API as $p => $info) { + if (strpos($a->query_string, $p) === 0) { + if (!api_check_method($info['method'])) { throw new MethodNotAllowedException(); } - $called_api= explode("/",$p); + $called_api = explode("/", $p); //unset($_SERVER['PHP_AUTH_USER']); - if ($info['auth']===true && api_user()===false) { - api_login($a); + + /// @TODO should be "true ==[=] $info['auth']", if you miss only one = character, you assign a variable (only with ==). Let's make all this even. + if ($info['auth'] === true && api_user() === false) { + api_login($a); } logger('API call for ' . $a->user['username'] . ': ' . $a->query_string); - logger('API parameters: ' . print_r($_REQUEST,true)); + logger('API parameters: ' . print_r($_REQUEST, true)); $stamp = microtime(true); $r = call_user_func($info['func'], $type); - $duration = (float)(microtime(true)-$stamp); - logger("API call duration: ".round($duration, 2)."\t".$a->query_string, LOGGER_DEBUG); + $duration = (float) (microtime(true) - $stamp); + logger("API call duration: " . round($duration, 2) . "\t" . $a->query_string, LOGGER_DEBUG); if (get_config("system", "profiler")) { $duration = microtime(true)-$a->performance["start"]; - logger(parse_url($a->query_string, PHP_URL_PATH).": ".sprintf("Database: %s/%s, Network: %s, I/O: %s, Other: %s, Total: %s", + /// @TODO round() really everywhere? + logger(parse_url($a->query_string, PHP_URL_PATH) . ": " . sprintf("Database: %s/%s, Network: %s, I/O: %s, Other: %s, Total: %s", round($a->performance["database"] - $a->performance["database_write"], 3), round($a->performance["database_write"], 3), round($a->performance["network"], 2), @@ -294,65 +306,71 @@ use \Friendica\Core\Config; round($duration - ($a->performance["database"] + $a->performance["network"] + $a->performance["file"]), 2), round($duration, 2)), - LOGGER_DEBUG); + LOGGER_DEBUG + ); if (get_config("rendertime", "callstack")) { $o = "Database Read:\n"; foreach ($a->callstack["database"] AS $func => $time) { $time = round($time, 3); - if ($time > 0) - $o .= $func.": ".$time."\n"; + if ($time > 0) { + $o .= $func . ": " . $time . "\n"; + } } $o .= "\nDatabase Write:\n"; foreach ($a->callstack["database_write"] AS $func => $time) { $time = round($time, 3); - if ($time > 0) - $o .= $func.": ".$time."\n"; + if ($time > 0) { + $o .= $func . ": " . $time . "\n"; + } } $o .= "\nNetwork:\n"; foreach ($a->callstack["network"] AS $func => $time) { $time = round($time, 3); - if ($time > 0) - $o .= $func.": ".$time."\n"; + if ($time > 0) { + $o .= $func . ": " . $time . "\n"; + } } logger($o, LOGGER_DEBUG); } } - - if ($r===false) { - // api function returned false withour throw an - // exception. This should not happend, throw a 500 + if (false === $r) { + /* + * api function returned false withour throw an + * exception. This should not happend, throw a 500 + */ throw new InternalServerErrorException(); } - switch($type){ + switch ($type) { case "xml": header ("Content-Type: text/xml"); return $r; break; case "json": header ("Content-Type: application/json"); - foreach($r as $rr) + foreach ($r as $rr) $json = json_encode($rr); - if ($_GET['callback']) - $json = $_GET['callback']."(".$json.")"; + if (x($_GET, 'callback')) { + $json = $_GET['callback'] . "(" . $json . ")"; + } return $json; break; case "rss": header ("Content-Type: application/rss+xml"); - return ''."\n".$r; + return '' . "\n" . $r; break; case "atom": header ("Content-Type: application/atom+xml"); - return ''."\n".$r; + return '' . "\n" . $r; break; - } } } - logger('API call not implemented: '.$a->query_string); + + logger('API call not implemented: ' . $a->query_string); throw new NotImplementedException(); } catch (HTTPException $e) { header("HTTP/1.1 {$e->httpcode} {$e->httpdesc}"); @@ -371,16 +389,16 @@ use \Friendica\Core\Config; $a = get_app(); - $error = ($e->getMessage()!==""?$e->getMessage():$e->httpdesc); - # TODO: https://dev.twitter.com/overview/api/response-codes + $error = ($e->getMessage() !== "" ? $e->getMessage() : $e->httpdesc); + /// @TODO: https://dev.twitter.com/overview/api/response-codes $error = array("error" => $error, - "code" => $e->httpcode." ".$e->httpdesc, + "code" => $e->httpcode . " " . $e->httpdesc, "request" => $a->query_string); $ret = api_format_data('status', $type, array('status' => $error)); - switch($type){ + switch ($type) { case "xml": header ("Content-Type: text/xml"); return $ret; @@ -407,18 +425,22 @@ use \Friendica\Core\Config; * @param array $arr Array to be passed to template * @param array $user_info * @return array + * @todo find proper type-hints */ - function api_rss_extra(App $a, $arr, $user_info){ - if (is_null($user_info)) $user_info = api_get_user($a); + function api_rss_extra(App $a, $arr, $user_info) { + if (is_null($user_info)) { + $user_info = api_get_user($a); + } + $arr['$user'] = $user_info; $arr['$rss'] = array( 'alternate' => $user_info['url'], - 'self' => App::get_baseurl(). "/". $a->query_string, + 'self' => App::get_baseurl() . "/" . $a->query_string, 'base' => App::get_baseurl(), 'updated' => api_date(null), - 'atom_updated' => datetime_convert('UTC','UTC','now',ATOM_TIME), + 'atom_updated' => datetime_convert('UTC', 'UTC', 'now', ATOM_TIME), 'language' => $user_info['language'], - 'logo' => App::get_baseurl()."/images/friendica-32.png", + 'logo' => App::get_baseurl() . "/images/friendica-32.png", ); return $arr; @@ -432,13 +454,11 @@ use \Friendica\Core\Config; * @return bool|string * Contact url or False if contact id is unknown */ - function api_unique_id_to_url($id){ + function api_unique_id_to_url($id) { $r = q("SELECT `url` FROM `contact` WHERE `uid` = 0 AND `id` = %d LIMIT 1", intval($id)); - if ($r) - return ($r[0]["url"]); - else - return false; + + return (dbm::is_result($r) && $r[0]["url"]); } /** @@ -448,8 +468,9 @@ use \Friendica\Core\Config; * @param int|string $contact_id Contact ID or URL * @param string $type Return type (for errors) */ - function api_get_user(App $a, $contact_id = Null, $type = "json"){ + function api_get_user(App $a, $contact_id = null, $type = "json") { global $called_api; + $user = null; $extra_query = ""; $url = ""; @@ -458,68 +479,83 @@ use \Friendica\Core\Config; logger("api_get_user: Fetching user data for user ".$contact_id, LOGGER_DEBUG); // Searching for contact URL - if(!is_null($contact_id) AND (intval($contact_id) == 0)){ + if (!is_null($contact_id) AND (intval($contact_id) == 0)) { $user = dbesc(normalise_link($contact_id)); $url = $user; $extra_query = "AND `contact`.`nurl` = '%s' "; - if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); + if (api_user() !== false) { + $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); + } } // Searching for contact id with uid = 0 - if(!is_null($contact_id) AND (intval($contact_id) != 0)){ + if (!is_null($contact_id) AND (intval($contact_id) != 0)) { $user = dbesc(api_unique_id_to_url($contact_id)); - if ($user == "") + if ($user == "") { throw new BadRequestException("User not found."); + } $url = $user; $extra_query = "AND `contact`.`nurl` = '%s' "; - if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); + if (api_user() !== false) { + $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); + } } - if(is_null($user) && x($_GET, 'user_id')) { + if (is_null($user) && x($_GET, 'user_id')) { $user = dbesc(api_unique_id_to_url($_GET['user_id'])); - if ($user == "") + if ($user == "") { throw new BadRequestException("User not found."); + } $url = $user; $extra_query = "AND `contact`.`nurl` = '%s' "; - if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); + if (api_user() !== false) { + $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); + } } - if(is_null($user) && x($_GET, 'screen_name')) { + if (is_null($user) && x($_GET, 'screen_name')) { $user = dbesc($_GET['screen_name']); $nick = $user; $extra_query = "AND `contact`.`nick` = '%s' "; - if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); + if (api_user() !== false) { + $extra_query .= "AND `contact`.`uid`=".intval(api_user()); + } } - if (is_null($user) AND ($a->argc > (count($called_api)-1)) AND (count($called_api) > 0)){ + if (is_null($user) AND ($a->argc > (count($called_api) - 1)) AND (count($called_api) > 0)) { $argid = count($called_api); - list($user, $null) = explode(".",$a->argv[$argid]); - if(is_numeric($user)){ + list($user, $null) = explode(".", $a->argv[$argid]); + if (is_numeric($user)) { $user = dbesc(api_unique_id_to_url($user)); - if ($user == "") + if ($user == "") { return false; + } $url = $user; $extra_query = "AND `contact`.`nurl` = '%s' "; - if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); + if (api_user() !== false) { + $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); + } } else { $user = dbesc($user); $nick = $user; $extra_query = "AND `contact`.`nick` = '%s' "; - if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); + if (api_user() !== false) { + $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); + } } } logger("api_get_user: user ".$user, LOGGER_DEBUG); if (!$user) { - if (api_user()===false) { + if (api_user() === false) { api_login($a); - return False; + return false; } else { $user = $_SESSION['uid']; $extra_query = "AND `contact`.`uid` = %d AND `contact`.`self` "; @@ -528,8 +564,9 @@ use \Friendica\Core\Config; } logger('api_user: ' . $extra_query . ', user: ' . $user); + // user info - $uinfo = q("SELECT *, `contact`.`id` as `cid` FROM `contact` + $uinfo = q("SELECT *, `contact`.`id` AS `cid` FROM `contact` WHERE 1 $extra_query", $user @@ -539,18 +576,20 @@ use \Friendica\Core\Config; api_best_nickname($uinfo); // if the contact wasn't found, fetch it from the contacts with uid = 0 - if (count($uinfo)==0) { + if (!dbm::is_result($uinfo)) { $r = array(); - if ($url != "") + if ($url != "") { $r = q("SELECT * FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s' LIMIT 1", dbesc(normalise_link($url))); + } - if ($r) { + if (dbm::is_result($r)) { $network_name = network_to_name($r[0]['network'], $r[0]['url']); // If no nick where given, extract it from the address - if (($r[0]['nick'] == "") OR ($r[0]['name'] == $r[0]['nick'])) + if (($r[0]['nick'] == "") OR ($r[0]['name'] == $r[0]['nick'])) { $r[0]['nick'] = api_get_nick($r[0]["url"]); + } $ret = array( 'id' => $r[0]["id"], @@ -594,18 +633,20 @@ use \Friendica\Core\Config; } } - if($uinfo[0]['self']) { + if ($uinfo[0]['self']) { - if ($uinfo[0]['network'] == "") + if ($uinfo[0]['network'] == "") { $uinfo[0]['network'] = NETWORK_DFRN; + } - $usr = q("select * from user where uid = %d limit 1", + $usr = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval(api_user()) ); - $profile = q("select * from profile where uid = %d and `is-default` = 1 limit 1", + $profile = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", intval(api_user()) ); + /// @TODO old-lost code? (twice) // Counting is deactivated by now, due to performance issues // count public wall messages //$r = q("SELECT COUNT(*) as `count` FROM `item` WHERE `uid` = %d AND `wall`", @@ -622,6 +663,8 @@ use \Friendica\Core\Config; //$countitms = $r[0]['count']; $countitms = 0; } + + /// @TODO old-lost code? (twice) /* // Counting is deactivated by now, due to performance issues // count friends @@ -649,7 +692,7 @@ use \Friendica\Core\Config; $starred = $r[0]['count']; - if(! $uinfo[0]['self']) { + if (! $uinfo[0]['self']) { $countfriends = 0; $countfollowers = 0; $starred = 0; @@ -668,7 +711,7 @@ use \Friendica\Core\Config; $pcontact_id = get_contact($uinfo[0]['url'], 0, true); - $ret = Array( + $ret = array( 'id' => intval($pcontact_id), 'id_str' => (string) intval($pcontact_id), 'name' => (($uinfo[0]['name']) ? $uinfo[0]['name'] : $uinfo[0]['nick']), @@ -697,6 +740,7 @@ use \Friendica\Core\Config; 'follow_request_sent' => false, 'statusnet_blocking' => false, 'notifications' => false, + /// @TODO old way? //'statusnet_profile_url' => App::get_baseurl()."/contacts/".$uinfo[0]['cid'], 'statusnet_profile_url' => $uinfo[0]['url'], 'uid' => intval($uinfo[0]['uid']), @@ -726,7 +770,11 @@ use \Friendica\Core\Config; ($item["deny_gid"] != "") OR $item["private"]); - $owner_user = api_get_user($a, $item["owner-link"]); + if ($item['thr-parent'] == $item['uri']) { + $owner_user = api_get_user($a, $item["owner-link"]); + } else { + $owner_user = $status_user; + } return (array($status_user, $owner_user)); } @@ -745,11 +793,13 @@ use \Friendica\Core\Config; foreach ($array as $k => $v) { if (is_array($v)) { - if ($callback($v, $k)) + if ($callback($v, $k)) { $new_array[$k] = api_walk_recursive($v, $callback); + } } else { - if ($callback($v, $k)) + if ($callback($v, $k)) { $new_array[$k] = $v; + } } } $array = $new_array; @@ -766,13 +816,16 @@ use \Friendica\Core\Config; * @return boolean Should the array item be deleted? */ function api_reformat_xml(&$item, &$key) { - if (is_bool($item)) + if (is_bool($item)) { $item = ($item ? "true" : "false"); + } - if (substr($key, 0, 10) == "statusnet_") + if (substr($key, 0, 10) == "statusnet_") { $key = "statusnet:".substr($key, 10); - elseif (substr($key, 0, 10) == "friendica_") + } elseif (substr($key, 0, 10) == "friendica_") { $key = "friendica:".substr($key, 10); + } + /// @TODO old-lost code? //else // $key = "default:".$key; @@ -798,18 +851,21 @@ use \Friendica\Core\Config; "georss" => "http://www.georss.org/georss"); /// @todo Auto detection of needed namespaces - if (in_array($root_element, array("ok", "hash", "config", "version", "ids", "notes", "photos"))) + if (in_array($root_element, array("ok", "hash", "config", "version", "ids", "notes", "photos"))) { $namespaces = array(); + } - if (is_array($data2)) + if (is_array($data2)) { api_walk_recursive($data2, "api_reformat_xml"); + } if ($key == "0") { $data4 = array(); $i = 1; - foreach ($data2 AS $item) + foreach ($data2 AS $item) { $data4[$i++.":".$childname] = $item; + } $data2 = $data4; } @@ -829,11 +885,11 @@ use \Friendica\Core\Config; * * @return (string|object) XML data or JSON data */ - function api_format_data($root_element, $type, $data){ + function api_format_data($root_element, $type, $data) { $a = get_app(); - switch($type){ + switch ($type) { case "atom": case "rss": case "xml": @@ -856,11 +912,13 @@ use \Friendica\Core\Config; * returns a 401 status code and an error message if not. * http://developer.twitter.com/doc/get/account/verify_credentials */ - function api_account_verify_credentials($type){ + function api_account_verify_credentials($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } unset($_REQUEST["user_id"]); unset($_GET["user_id"]); @@ -868,7 +926,7 @@ use \Friendica\Core\Config; unset($_REQUEST["screen_name"]); unset($_GET["screen_name"]); - $skip_status = (x($_REQUEST,'skip_status')?$_REQUEST['skip_status']:false); + $skip_status = (x($_REQUEST, 'skip_status')?$_REQUEST['skip_status'] : false); $user_info = api_get_user($a); @@ -878,10 +936,11 @@ use \Friendica\Core\Config; // - Adding last status if (!$skip_status) { $user_info["status"] = api_status_show("raw"); - if (!count($user_info["status"])) + if (!count($user_info["status"])) { unset($user_info["status"]); - else + } else { unset($user_info["status"]["user"]); + } } // "uid" and "self" are only needed for some internal stuff, so remove it from here @@ -891,17 +950,18 @@ use \Friendica\Core\Config; return api_format_data("user", $type, array('user' => $user_info)); } - api_register_func('api/account/verify_credentials','api_account_verify_credentials', true); + /// @TODO move to top of file or somwhere better + api_register_func('api/account/verify_credentials','api_account_verify_credentials', true); /** * get data from $_POST or $_GET */ - function requestdata($k){ - if (isset($_POST[$k])){ + function requestdata($k) { + if (x($_POST, $k)) { return $_POST[$k]; } - if (isset($_GET[$k])){ + if (x($_GET, $k)) { return $_GET[$k]; } return null; @@ -912,7 +972,7 @@ use \Friendica\Core\Config; $a = get_app(); - if (api_user()===false) { + if (api_user() === false) { logger('api_statuses_update: no user'); throw new ForbiddenException(); } @@ -922,9 +982,10 @@ use \Friendica\Core\Config; $_REQUEST['profile_uid'] = api_user(); $_REQUEST['api_source'] = true; $txt = requestdata('status'); + /// @TODO old-lost code? //$txt = urldecode(requestdata('status')); - if((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) { + if ((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) { $txt = html2bb_video($txt); $config = HTMLPurifier_Config::createDefault(); @@ -936,25 +997,26 @@ use \Friendica\Core\Config; $a->argv[1]=$user_info['screen_name']; //should be set to username? - $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo + // tell wall_upload function to return img info instead of echo + $_REQUEST['hush'] = 'yeah'; $bebop = wall_upload_post($a); - //now that we have the img url in bbcode we can add it to the status and insert the wall item. - $_REQUEST['body']=$txt."\n\n".$bebop; + // now that we have the img url in bbcode we can add it to the status and insert the wall item. + $_REQUEST['body'] = $txt . "\n\n" . $bebop; item_post($a); // this should output the last post (the one we just posted). return api_status_show($type); } - api_register_func('api/statuses/mediap','api_statuses_mediap', true, API_METHOD_POST); -/*Waitman Gobble Mod*/ + /// @TODO move this to top of file or somewhere better! + api_register_func('api/statuses/mediap','api_statuses_mediap', true, API_METHOD_POST); function api_statuses_update($type) { $a = get_app(); - if (api_user()===false) { + if (api_user() === false) { logger('api_statuses_update: no user'); throw new ForbiddenException(); } @@ -965,9 +1027,9 @@ use \Friendica\Core\Config; // logger('api_post: ' . print_r($_POST,true)); - if(requestdata('htmlstatus')) { + if (requestdata('htmlstatus')) { $txt = requestdata('htmlstatus'); - if((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) { + if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) { $txt = html2bb_video($txt); $config = HTMLPurifier_Config::createDefault(); @@ -979,29 +1041,33 @@ use \Friendica\Core\Config; $_REQUEST['body'] = html2bbcode($txt); } - } else + } else { $_REQUEST['body'] = requestdata('status'); + } $_REQUEST['title'] = requestdata('title'); $parent = requestdata('in_reply_to_status_id'); // Twidere sends "-1" if it is no reply ... - if ($parent == -1) + if ($parent == -1) { $parent = ""; + } - if(ctype_digit($parent)) + if (ctype_digit($parent)) { $_REQUEST['parent'] = $parent; - else + } else { $_REQUEST['parent_uri'] = $parent; + } - if(requestdata('lat') && requestdata('long')) - $_REQUEST['coord'] = sprintf("%s %s",requestdata('lat'),requestdata('long')); + if (requestdata('lat') && requestdata('long')) { + $_REQUEST['coord'] = sprintf("%s %s", requestdata('lat'), requestdata('long')); + } $_REQUEST['profile_uid'] = api_user(); - if($parent) + if ($parent) { $_REQUEST['type'] = 'net-comment'; - else { + } else { // Check for throttling (maximum posts per day, week and month) $throttle_day = get_config('system','throttle_limit_day'); if ($throttle_day > 0) { @@ -1011,14 +1077,15 @@ use \Friendica\Core\Config; AND `created` > '%s' AND `id` = `parent`", intval(api_user()), dbesc($datefrom)); - if ($r) + if (dbm::is_result($r)) { $posts_day = $r[0]["posts_day"]; - else + } else { $posts_day = 0; + } if ($posts_day > $throttle_day) { logger('Daily posting limit reached for user '.api_user(), LOGGER_DEBUG); - #die(api_error($type, sprintf(t("Daily posting limit of %d posts reached. The post was rejected."), $throttle_day))); + // die(api_error($type, sprintf(t("Daily posting limit of %d posts reached. The post was rejected."), $throttle_day))); throw new TooManyRequestsException(sprintf(t("Daily posting limit of %d posts reached. The post was rejected."), $throttle_day)); } } @@ -1031,16 +1098,16 @@ use \Friendica\Core\Config; AND `created` > '%s' AND `id` = `parent`", intval(api_user()), dbesc($datefrom)); - if ($r) + if (dbm::is_result($r)) { $posts_week = $r[0]["posts_week"]; - else + } else { $posts_week = 0; + } if ($posts_week > $throttle_week) { logger('Weekly posting limit reached for user '.api_user(), LOGGER_DEBUG); - #die(api_error($type, sprintf(t("Weekly posting limit of %d posts reached. The post was rejected."), $throttle_week))); + // die(api_error($type, sprintf(t("Weekly posting limit of %d posts reached. The post was rejected."), $throttle_week))); throw new TooManyRequestsException(sprintf(t("Weekly posting limit of %d posts reached. The post was rejected."), $throttle_week)); - } } @@ -1052,14 +1119,15 @@ use \Friendica\Core\Config; AND `created` > '%s' AND `id` = `parent`", intval(api_user()), dbesc($datefrom)); - if ($r) + if (dbm::is_result($r)) { $posts_month = $r[0]["posts_month"]; - else + } else { $posts_month = 0; + } if ($posts_month > $throttle_month) { logger('Monthly posting limit reached for user '.api_user(), LOGGER_DEBUG); - #die(api_error($type, sprintf(t("Monthly posting limit of %d posts reached. The post was rejected."), $throttle_month))); + // die(api_error($type, sprintf(t("Monthly posting limit of %d posts reached. The post was rejected."), $throttle_month))); throw new TooManyRequestsException(sprintf(t("Monthly posting limit of %d posts reached. The post was rejected."), $throttle_month)); } } @@ -1067,23 +1135,24 @@ use \Friendica\Core\Config; $_REQUEST['type'] = 'wall'; } - if(x($_FILES,'media')) { + if (x($_FILES, 'media')) { // upload the image if we have one - $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo + $_REQUEST['hush'] = 'yeah'; //tell wall_upload function to return img info instead of echo $media = wall_upload_post($a); - if(strlen($media)>0) - $_REQUEST['body'] .= "\n\n".$media; + if (strlen($media) > 0) { + $_REQUEST['body'] .= "\n\n" . $media; + } } // To-Do: Multiple IDs if (requestdata('media_ids')) { $r = q("SELECT `resource-id`, `scale`, `nickname`, `type` FROM `photo` INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN (SELECT `resource-id` FROM `photo` WHERE `id` = %d) AND `scale` > 0 AND `photo`.`uid` = %d ORDER BY `photo`.`width` DESC LIMIT 1", intval(requestdata('media_ids')), api_user()); - if ($r) { + if (dbm::is_result($r)) { $phototypes = Photo::supportedTypes(); $ext = $phototypes[$r[0]['type']]; - $_REQUEST['body'] .= "\n\n".'[url='.App::get_baseurl().'/photos/'.$r[0]['nickname'].'/image/'.$r[0]['resource-id'].']'; - $_REQUEST['body'] .= '[img]'.App::get_baseurl()."/photo/".$r[0]['resource-id']."-".$r[0]['scale'].".".$ext."[/img][/url]"; + $_REQUEST['body'] .= "\n\n" . '[url=' . App::get_baseurl() . '/photos/' . $r[0]['nickname'] . '/image/' . $r[0]['resource-id'] . ']'; + $_REQUEST['body'] .= '[img]' . App::get_baseurl() . '/photo/' . $r[0]['resource-id'] . '-' . $r[0]['scale'] . '.' . $ext . '[/img][/url]'; } } @@ -1091,38 +1160,39 @@ use \Friendica\Core\Config; $_REQUEST['api_source'] = true; - if (!x($_REQUEST, "source")) + if (!x($_REQUEST, "source")) { $_REQUEST["source"] = api_source(); + } // call out normal post function - item_post($a); // this should output the last post (the one we just posted). return api_status_show($type); } + + /// @TODO move to top of file or somwhere better api_register_func('api/statuses/update','api_statuses_update', true, API_METHOD_POST); api_register_func('api/statuses/update_with_media','api_statuses_update', true, API_METHOD_POST); - function api_media_upload($type) { $a = get_app(); - if (api_user()===false) { + if (api_user() === false) { logger('no user'); throw new ForbiddenException(); } $user_info = api_get_user($a); - if(!x($_FILES,'media')) { + if (!x($_FILES, 'media')) { // Output error throw new BadRequestException("No media."); } $media = wall_upload_post($a, false); - if(!$media) { + if (!$media) { // Output error throw new InternalServerErrorException(); } @@ -1135,13 +1205,15 @@ use \Friendica\Core\Config; "h" => $media["height"], "image_type" => $media["type"]); - logger("Media uploaded: ".print_r($returndata, true), LOGGER_DEBUG); + logger("Media uploaded: " . print_r($returndata, true), LOGGER_DEBUG); return array("media" => $returndata); } + + /// @TODO move to top of file or somwhere better api_register_func('api/media/upload','api_media_upload', true, API_METHOD_POST); - function api_status_show($type){ + function api_status_show($type) { $a = get_app(); @@ -1149,10 +1221,11 @@ use \Friendica\Core\Config; logger('api_status_show: user_info: '.print_r($user_info, true), LOGGER_DEBUG); - if ($type == "raw") + if ($type == "raw") { $privacy_sql = "AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''"; - else + } else { $privacy_sql = ""; + } // get last public wall message $lastwall = q("SELECT `item`.* @@ -1170,17 +1243,18 @@ use \Friendica\Core\Config; dbesc(normalise_link($user_info['url'])) ); - if (count($lastwall)>0){ + if (dbm::is_result($lastwall)) { $lastwall = $lastwall[0]; $in_reply_to = api_in_reply_to($lastwall); $converted = api_convert_item($lastwall); - if ($type == "xml") + if ($type == "xml") { $geo = "georss:point"; - else + } else { $geo = "geo"; + } $status_info = array( 'created_at' => api_date($lastwall['created']), @@ -1210,16 +1284,19 @@ use \Friendica\Core\Config; 'statusnet_conversation_id' => $lastwall['parent'], ); - if (count($converted["attachments"]) > 0) + if (count($converted["attachments"]) > 0) { $status_info["attachments"] = $converted["attachments"]; + } - if (count($converted["entities"]) > 0) + if (count($converted["entities"]) > 0) { $status_info["entities"] = $converted["entities"]; + } - if (($lastwall['item_network'] != "") AND ($status["source"] == 'web')) + if (($lastwall['item_network'] != "") AND ($status["source"] == 'web')) { $status_info["source"] = network_to_name($lastwall['item_network'], $user_info['url']); - elseif (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $status_info["source"])) + } elseif (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $status_info["source"])) { $status_info["source"] = trim($status_info["source"].' ('.network_to_name($lastwall['item_network'], $user_info['url']).')'); + } // "uid" and "self" are only needed for some internal stuff, so remove it from here unset($status_info["user"]["uid"]); @@ -1228,23 +1305,20 @@ use \Friendica\Core\Config; logger('status_info: '.print_r($status_info, true), LOGGER_DEBUG); - if ($type == "raw") - return($status_info); + if ($type == "raw") { + return $status_info; + } - return api_format_data("statuses", $type, array('status' => $status_info)); + return api_format_data("statuses", $type, array('status' => $status_info)); } - - - - /** * Returns extended information of a given user, specified by ID or screen name as per the required id parameter. * The author's most recent status will be returned inline. * http://developer.twitter.com/doc/get/users/show */ - function api_users_show($type){ + function api_users_show($type) { $a = get_app(); @@ -1267,17 +1341,18 @@ use \Friendica\Core\Config; dbesc(normalise_link($user_info['url'])) ); - if (count($lastwall)>0){ + if (dbm::is_result($lastwall)) { $lastwall = $lastwall[0]; $in_reply_to = api_in_reply_to($lastwall); $converted = api_convert_item($lastwall); - if ($type == "xml") + if ($type == "xml") { $geo = "georss:point"; - else + } else { $geo = "geo"; + } $user_info['status'] = array( 'text' => $converted["text"], @@ -1293,20 +1368,25 @@ use \Friendica\Core\Config; 'in_reply_to_screen_name' => $in_reply_to['screen_name'], $geo => NULL, 'favorited' => $lastwall['starred'] ? true : false, - 'statusnet_html' => $converted["html"], + 'statusnet_html' => $converted["html"], 'statusnet_conversation_id' => $lastwall['parent'], ); - if (count($converted["attachments"]) > 0) + if (count($converted["attachments"]) > 0) { $user_info["status"]["attachments"] = $converted["attachments"]; + } - if (count($converted["entities"]) > 0) + if (count($converted["entities"]) > 0) { $user_info["status"]["entities"] = $converted["entities"]; + } - if (($lastwall['item_network'] != "") AND ($user_info["status"]["source"] == 'web')) + if (($lastwall['item_network'] != "") AND ($user_info["status"]["source"] == 'web')) { $user_info["status"]["source"] = network_to_name($lastwall['item_network'], $user_info['url']); - if (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $user_info["status"]["source"])) - $user_info["status"]["source"] = trim($user_info["status"]["source"].' ('.network_to_name($lastwall['item_network'], $user_info['url']).')'); + } + + if (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $user_info["status"]["source"])) { + $user_info["status"]["source"] = trim($user_info["status"]["source"] . ' (' . network_to_name($lastwall['item_network'], $user_info['url']) . ')'); + } } @@ -1314,34 +1394,38 @@ use \Friendica\Core\Config; unset($user_info["uid"]); unset($user_info["self"]); - return api_format_data("user", $type, array('user' => $user_info)); + return api_format_data("user", $type, array('user' => $user_info)); } - api_register_func('api/users/show','api_users_show'); + /// @TODO move to top of file or somewhere better + api_register_func('api/users/show','api_users_show'); function api_users_search($type) { $a = get_app(); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0); $userlist = array(); - if (isset($_GET["q"])) { + if (x($_GET, 'q')) { $r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", dbesc($_GET["q"])); - if (!dbm::is_result($r)) + + if (!dbm::is_result($r)) { $r = q("SELECT `id` FROM `contact` WHERE `uid` = 0 AND `nick` = '%s'", dbesc($_GET["q"])); + } if (dbm::is_result($r)) { $k = 0; foreach ($r AS $user) { $user_info = api_get_user($a, $user["id"], "json"); - if ($type == "xml") + if ($type == "xml") { $userlist[$k++.":user"] = $user_info; - else + } else { $userlist[] = $user_info; + } } $userlist = array("users" => $userlist); } else { @@ -1353,6 +1437,7 @@ use \Friendica\Core\Config; return api_format_data("users", $type, $userlist); } + /// @TODO move to top of file or somewhere better api_register_func('api/users/search','api_users_search'); /** @@ -1362,11 +1447,13 @@ use \Friendica\Core\Config; * TODO: Optional parameters * TODO: Add reply info */ - function api_statuses_home_timeline($type){ + function api_statuses_home_timeline($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } unset($_REQUEST["user_id"]); unset($_GET["user_id"]); @@ -1378,24 +1465,29 @@ use \Friendica\Core\Config; // get last newtork messages // params - $count = (x($_REQUEST,'count')?$_REQUEST['count']:20); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); - if ($page<0) $page=0; - $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); - //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0); - $conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0); + $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0); + if ($page < 0) { + $page = 0; + } + $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); + $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); + //$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0); + $exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0); + $conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0); - $start = $page*$count; + $start = $page * $count; $sql_extra = ''; - if ($max_id > 0) - $sql_extra .= ' AND `item`.`id` <= '.intval($max_id); - if ($exclude_replies > 0) + if ($max_id > 0) { + $sql_extra .= ' AND `item`.`id` <= ' . intval($max_id); + } + if ($exclude_replies > 0) { $sql_extra .= ' AND `item`.`parent` = `item`.`id`'; - if ($conversation_id > 0) - $sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id); + } + if ($conversation_id > 0) { + $sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id); + } $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -1415,63 +1507,73 @@ use \Friendica\Core\Config; intval($start), intval($count) ); - $ret = api_format_items($r,$user_info, false, $type); + $ret = api_format_items($r, $user_info, false, $type); // Set all posts from the query above to seen $idarray = array(); - foreach ($r AS $item) + foreach ($r AS $item) { $idarray[] = intval($item["id"]); + } $idlist = implode(",", $idarray); if ($idlist != "") { $unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `id` IN (%s)", $idlist); - if ($unseen) + if ($unseen) { $r = q("UPDATE `item` SET `unseen` = 0 WHERE `unseen` AND `id` IN (%s)", $idlist); + } } $data = array('status' => $ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); break; } - return api_format_data("statuses", $type, $data); + return api_format_data("statuses", $type, $data); } + + /// @TODO move to top of file or somewhere better api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true); api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true); - function api_statuses_public_timeline($type){ + function api_statuses_public_timeline($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } $user_info = api_get_user($a); // get last newtork messages - // params - $count = (x($_REQUEST,'count')?$_REQUEST['count']:20); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); - if ($page<0) $page=0; - $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); - //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0); - $conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0); + $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0); + if ($page < 0) { + $page = 0; + } + $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); + $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); + //$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0); + $exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0); + $conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0); - $start = $page*$count; + $start = $page * $count; - if ($max_id > 0) - $sql_extra = 'AND `item`.`id` <= '.intval($max_id); - if ($exclude_replies > 0) + if ($max_id > 0) { + $sql_extra = 'AND `item`.`id` <= ' . intval($max_id); + } + if ($exclude_replies > 0) { $sql_extra .= ' AND `item`.`parent` = `item`.`id`'; - if ($conversation_id > 0) - $sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id); + } + if ($conversation_id > 0) { + $sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id); + } $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -1495,51 +1597,57 @@ use \Friendica\Core\Config; intval($start), intval($count)); - $ret = api_format_items($r,$user_info, false, $type); - + $ret = api_format_items($r, $user_info, false, $type); $data = array('status' => $ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); break; } - return api_format_data("statuses", $type, $data); + return api_format_data("statuses", $type, $data); } + + /// @TODO move to top of file or somewhere better api_register_func('api/statuses/public_timeline','api_statuses_public_timeline', true); /** - * + * @TODO nothing to say? */ - function api_statuses_show($type){ + function api_statuses_show($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } $user_info = api_get_user($a); // params $id = intval($a->argv[3]); - if ($id == 0) + if ($id == 0) { $id = intval($_REQUEST["id"]); + } // Hotot workaround - if ($id == 0) + if ($id == 0) { $id = intval($a->argv[4]); + } - logger('API: api_statuses_show: '.$id); + logger('API: api_statuses_show: ' . $id); - $conversation = (x($_REQUEST,'conversation')?1:0); + $conversation = (x($_REQUEST, 'conversation') ? 1 : 0); $sql_extra = ''; - if ($conversation) + if ($conversation) { $sql_extra .= " AND `item`.`parent` = %d ORDER BY `id` ASC "; - else + } else { $sql_extra .= " AND `item`.`id` = %d"; + } $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -1556,7 +1664,8 @@ use \Friendica\Core\Config; intval($id) ); - if (!$r) { + /// @TODO How about copying this to above methods which don't check $r ? + if (!dbm::is_result($r)) { throw new BadRequestException("There is no status with this id."); } @@ -1567,50 +1676,59 @@ use \Friendica\Core\Config; return api_format_data("statuses", $type, $data); } else { $data = array('status' => $ret[0]); - return api_format_data("status", $type, $data); + return api_format_data("status", $type, $data); } } + + /// @TODO move to top of file or somewhere better api_register_func('api/statuses/show','api_statuses_show', true); - /** - * + * @TODO nothing to say? */ - function api_conversation_show($type){ + function api_conversation_show($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } $user_info = api_get_user($a); // params $id = intval($a->argv[3]); - $count = (x($_REQUEST,'count')?$_REQUEST['count']:20); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); - if ($page<0) $page=0; - $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); + $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0); + if ($page < 0) { + $page = 0; + } + $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); + $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); $start = $page*$count; - if ($id == 0) + if ($id == 0) { $id = intval($_REQUEST["id"]); + } // Hotot workaround - if ($id == 0) + if ($id == 0) { $id = intval($a->argv[4]); + } logger('API: api_conversation_show: '.$id); $r = q("SELECT `parent` FROM `item` WHERE `id` = %d", intval($id)); - if ($r) + if (dbm::is_result($r)) { $id = $r[0]["parent"]; + } $sql_extra = ''; - if ($max_id > 0) - $sql_extra = ' AND `item`.`id` <= '.intval($max_id); + if ($max_id > 0) { + $sql_extra = ' AND `item`.`id` <= ' . intval($max_id); + } // Not sure why this query was so complicated. We should keep it here for a while, // just to make sure that we really don't need it. @@ -1635,39 +1753,45 @@ use \Friendica\Core\Config; intval($start), intval($count) ); - if (!$r) - throw new BadRequestException("There is no conversation with this id."); + if (!dbm::is_result($r)) { + throw new BadRequestException("There is no status with this id."); + } - $ret = api_format_items($r,$user_info, false, $type); + $ret = api_format_items($r, $user_info, false, $type); $data = array('status' => $ret); return api_format_data("statuses", $type, $data); } + + /// @TODO move to top of file or somewhere better api_register_func('api/conversation/show','api_conversation_show', true); api_register_func('api/statusnet/conversation','api_conversation_show', true); - /** - * + * @TODO nothing to say? */ - function api_statuses_repeat($type){ + function api_statuses_repeat($type) { global $called_api; $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } $user_info = api_get_user($a); // params $id = intval($a->argv[3]); - if ($id == 0) + if ($id == 0) { $id = intval($_REQUEST["id"]); + } // Hotot workaround - if ($id == 0) + if ($id == 0) { $id = intval($a->argv[4]); + } logger('API: api_statuses_repeat: '.$id); @@ -1686,7 +1810,8 @@ use \Friendica\Core\Config; intval($id) ); - if ($r[0]['body'] != "") { + /// @TODO other style than above functions! + if (dbm::is_result($r) && $r[0]['body'] != "") { if (strpos($r[0]['body'], "[/share]") !== false) { $pos = strpos($r[0]['body'], "[share"); $post = substr($r[0]['body'], $pos); @@ -1701,39 +1826,47 @@ use \Friendica\Core\Config; $_REQUEST['type'] = 'wall'; $_REQUEST['api_source'] = true; - if (!x($_REQUEST, "source")) + if (!x($_REQUEST, "source")) { $_REQUEST["source"] = api_source(); + } item_post($a); - } else + } else { throw new ForbiddenException(); + } // this should output the last post (the one we just posted). $called_api = null; - return(api_status_show($type)); + return api_status_show($type); } + + /// @TODO move to top of file or somewhere better api_register_func('api/statuses/retweet','api_statuses_repeat', true, API_METHOD_POST); /** - * + * @TODO nothing to say? */ - function api_statuses_destroy($type){ + function api_statuses_destroy($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } $user_info = api_get_user($a); // params $id = intval($a->argv[3]); - if ($id == 0) + if ($id == 0) { $id = intval($_REQUEST["id"]); + } // Hotot workaround - if ($id == 0) + if ($id == 0) { $id = intval($a->argv[4]); + } logger('API: api_statuses_destroy: '.$id); @@ -1741,20 +1874,23 @@ use \Friendica\Core\Config; drop_item($id, false); - return($ret); + return $ret; } + + /// @TODO move to top of file or somewhere better api_register_func('api/statuses/destroy','api_statuses_destroy', true, API_METHOD_DELETE); /** - * + * @TODO Nothing more than an URL to say? * http://developer.twitter.com/doc/get/statuses/mentions - * */ - function api_statuses_mentions($type){ + function api_statuses_mentions($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } unset($_REQUEST["user_id"]); unset($_GET["user_id"]); @@ -1767,24 +1903,27 @@ use \Friendica\Core\Config; // params - $count = (x($_REQUEST,'count')?$_REQUEST['count']:20); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); - if ($page<0) $page=0; - $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); - //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); + $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0); + if ($page < 0) { + $page = 0; + } + $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); + $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); + //$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0); - $start = $page*$count; + $start = $page * $count; // Ugly code - should be changed $myurl = App::get_baseurl() . '/profile/'. $a->user['nickname']; - $myurl = substr($myurl,strpos($myurl,'://')+3); + $myurl = substr($myurl,strpos($myurl, '://') + 3); //$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); - $myurl = str_replace('www.','',$myurl); - $diasp_url = str_replace('/profile/','/u/',$myurl); + $myurl = str_replace('www.', '', $myurl); + $diasp_url = str_replace('/profile/', '/u/', $myurl); - if ($max_id > 0) - $sql_extra = ' AND `item`.`id` <= '.intval($max_id); + if ($max_id > 0) { + $sql_extra = ' AND `item`.`id` <= ' . intval($max_id); + } $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -1809,28 +1948,30 @@ use \Friendica\Core\Config; intval($start), intval($count) ); - $ret = api_format_items($r,$user_info, false, $type); - + $ret = api_format_items($r, $user_info, false, $type); $data = array('status' => $ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); break; } - return api_format_data("statuses", $type, $data); + return api_format_data("statuses", $type, $data); } + + /// @TODO move to top of file or somewhere better api_register_func('api/statuses/mentions','api_statuses_mentions', true); api_register_func('api/statuses/replies','api_statuses_mentions', true); - - function api_statuses_user_timeline($type){ + function api_statuses_user_timeline($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } $user_info = api_get_user($a); // get last network messages @@ -1841,24 +1982,29 @@ use \Friendica\Core\Config; LOGGER_DEBUG); // params - $count = (x($_REQUEST,'count')?$_REQUEST['count']:20); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); - if ($page<0) $page=0; - $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0); - $conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0); + $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0); + if ($page < 0) { + $page = 0; + } + $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); + //$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0); + $exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0); + $conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0); - $start = $page*$count; + $start = $page * $count; $sql_extra = ''; - if ($user_info['self']==1) + if ($user_info['self'] == 1) { $sql_extra .= " AND `item`.`wall` = 1 "; + } - if ($exclude_replies > 0) + if ($exclude_replies > 0) { $sql_extra .= ' AND `item`.`parent` = `item`.`id`'; - if ($conversation_id > 0) - $sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id); + } + if ($conversation_id > 0) { + $sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id); + } $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -1880,19 +2026,21 @@ use \Friendica\Core\Config; intval($start), intval($count) ); - $ret = api_format_items($r,$user_info, true, $type); + $ret = api_format_items($r, $user_info, true, $type); $data = array('status' => $ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); + break; } - return api_format_data("statuses", $type, $data); + return api_format_data("statuses", $type, $data); } - api_register_func('api/statuses/user_timeline','api_statuses_user_timeline', true); + /// @TODO move to top of file or somwhere better + api_register_func('api/statuses/user_timeline','api_statuses_user_timeline', true); /** * Star/unstar an item @@ -1900,49 +2048,59 @@ use \Friendica\Core\Config; * * api v1 : https://web.archive.org/web/20131019055350/https://dev.twitter.com/docs/api/1/post/favorites/create/%3Aid */ - function api_favorites_create_destroy($type){ + function api_favorites_create_destroy($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } // for versioned api. /// @TODO We need a better global soluton - $action_argv_id=2; - if ($a->argv[1]=="1.1") $action_argv_id=3; + $action_argv_id = 2; + if ($a->argv[1] == "1.1") { + $action_argv_id = 3; + } - if ($a->argc<=$action_argv_id) throw new BadRequestException("Invalid request."); - $action = str_replace(".".$type,"",$a->argv[$action_argv_id]); - if ($a->argc==$action_argv_id+2) { - $itemid = intval($a->argv[$action_argv_id+1]); + if ($a->argc <= $action_argv_id) { + throw new BadRequestException("Invalid request."); + } + $action = str_replace("." . $type, "", $a->argv[$action_argv_id]); + if ($a->argc == $action_argv_id + 2) { + $itemid = intval($a->argv[$action_argv_id + 1]); } else { + /// @TODO use x() to check if _REQUEST contains 'id' $itemid = intval($_REQUEST['id']); } - $item = q("SELECT * FROM item WHERE id=%d AND uid=%d", + $item = q("SELECT * FROM `item` WHERE `id`=%d AND `uid`=%d LIMIT 1", $itemid, api_user()); - if ($item===false || count($item)==0) + if (!dbm::is_result($item) || count($item) == 0) { throw new BadRequestException("Invalid item."); + } - switch($action){ + switch ($action) { case "create": - $item[0]['starred']=1; + $item[0]['starred'] = 1; break; case "destroy": - $item[0]['starred']=0; + $item[0]['starred'] = 0; break; default: throw new BadRequestException("Invalid action ".$action); } + $r = q("UPDATE item SET starred=%d WHERE id=%d AND uid=%d", $item[0]['starred'], $itemid, api_user()); q("UPDATE thread SET starred=%d WHERE iid=%d AND uid=%d", $item[0]['starred'], $itemid, api_user()); - if ($r===false) - throw InternalServerErrorException("DB error"); + if ($r === false) { + throw new InternalServerErrorException("DB error"); + } $user_info = api_get_user($a); @@ -1950,7 +2108,7 @@ use \Friendica\Core\Config; $ret = $rets[0]; $data = array('status' => $ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); @@ -1958,17 +2116,21 @@ use \Friendica\Core\Config; return api_format_data("status", $type, $data); } + + /// @TODO move to top of file or somwhere better api_register_func('api/favorites/create', 'api_favorites_create_destroy', true, API_METHOD_POST); api_register_func('api/favorites/destroy', 'api_favorites_create_destroy', true, API_METHOD_DELETE); - function api_favorites($type){ + function api_favorites($type) { global $called_api; $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } - $called_api= array(); + $called_api = array(); $user_info = api_get_user($a); @@ -1976,22 +2138,25 @@ use \Friendica\Core\Config; // return favorites only for self logger('api_favorites: self:' . $user_info['self']); - if ($user_info['self']==0) { + if ($user_info['self'] == 0) { $ret = array(); } else { $sql_extra = ""; // params - $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); - $count = (x($_GET,'count')?$_GET['count']:20); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); - if ($page<0) $page=0; + $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); + $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); + $count = (x($_GET, 'count') ? $_GET['count'] : 20); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0); + if ($page < 0) { + $page = 0; + } $start = $page*$count; - if ($max_id > 0) - $sql_extra .= ' AND `item`.`id` <= '.intval($max_id); + if ($max_id > 0) { + $sql_extra .= ' AND `item`.`id` <= ' . intval($max_id); + } $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -2016,14 +2181,16 @@ use \Friendica\Core\Config; } $data = array('status' => $ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); } - return api_format_data("statuses", $type, $data); + return api_format_data("statuses", $type, $data); } + + /// @TODO move to top of file or somwhere better api_register_func('api/favorites','api_favorites', true); function api_format_messages($item, $recipient, $sender) { @@ -2038,9 +2205,9 @@ use \Friendica\Core\Config; 'recipient_screen_name' => $recipient['screen_name'], 'sender' => $sender, 'recipient' => $recipient, - 'title' => "", - 'friendica_seen' => $item['seen'], - 'friendica_parent_uri' => $item['parent-uri'], + 'title' => "", + 'friendica_seen' => $item['seen'], + 'friendica_parent_uri' => $item['parent-uri'], ); // "uid" and "self" are only needed for some internal stuff, so remove it from here @@ -2052,18 +2219,16 @@ use \Friendica\Core\Config; //don't send title to regular StatusNET requests to avoid confusing these apps if (x($_GET, 'getText')) { $ret['title'] = $item['title'] ; - if ($_GET["getText"] == "html") { + if ($_GET['getText'] == 'html') { $ret['text'] = bbcode($item['body'], false, false); - } - elseif ($_GET["getText"] == "plain") { + } elseif ($_GET['getText'] == 'plain') { //$ret['text'] = html2plain(bbcode($item['body'], false, false, true), 0); $ret['text'] = trim(html2plain(bbcode(api_clean_plain_items($item['body']), false, false, 2, true), 0)); } + } else { + $ret['text'] = $item['title'] . "\n" . html2plain(bbcode(api_clean_plain_items($item['body']), false, false, 2, true), 0); } - else { - $ret['text'] = $item['title']."\n".html2plain(bbcode(api_clean_plain_items($item['body']), false, false, 2, true), 0); - } - if (isset($_GET["getUserObjects"]) && $_GET["getUserObjects"] == "false") { + if (x($_GET, 'getUserObjects') && $_GET['getUserObjects'] == 'false') { unset($ret['sender']); unset($ret['recipient']); } @@ -2084,13 +2249,15 @@ use \Friendica\Core\Config; $statustitle = trim($item['title']); - if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false)) + if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false)) { $statustext = trim($statusbody); - else + } else { $statustext = trim($statustitle."\n\n".$statusbody); + } - if (($item["network"] == NETWORK_FEED) and (strlen($statustext)> 1000)) + if (($item["network"] == NETWORK_FEED) and (strlen($statustext)> 1000)) { $statustext = substr($statustext, 0, 1000)."... \n".$item["plink"]; + } $statushtml = trim(bbcode($body, false, false)); @@ -2104,8 +2271,9 @@ use \Friendica\Core\Config; "\n", "\n", "\n", "\n"); $statushtml = str_replace($search, $replace, $statushtml); - if ($item['title'] != "") - $statushtml = "".bbcode($item['title'])."\n".$statushtml; + if ($item['title'] != "") { + $statushtml = "" . bbcode($item['title']) . "\n" . $statushtml; + } $entities = api_get_entitities($statustext, $body); @@ -2125,21 +2293,25 @@ use \Friendica\Core\Config; $URLSearchString = "^\[\]"; $ret = preg_match_all("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $text, $images); - if (!$ret) + if (!$ret) { return false; + } $attachments = array(); foreach ($images[1] AS $image) { $imagedata = get_photo_info($image); - if ($imagedata) + if ($imagedata) { $attachments[] = array("url" => $image, "mimetype" => $imagedata["mime"], "size" => $imagedata["size"]); + } } - if (strstr($_SERVER['HTTP_USER_AGENT'], "AndStatus")) - foreach ($images[0] AS $orig) + if (strstr($_SERVER['HTTP_USER_AGENT'], "AndStatus")) { + foreach ($images[0] AS $orig) { $body = str_replace($orig, "", $body); + } + } return $attachments; } @@ -2152,7 +2324,7 @@ use \Friendica\Core\Config; $a = get_app(); - $include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false"); + $include_entities = strtolower(x($_REQUEST, 'include_entities') ? $_REQUEST['include_entities'] : "false"); if ($include_entities != "true") { @@ -2198,11 +2370,12 @@ use \Friendica\Core\Config; preg_match_all("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $bbcode, $urls); $ordered_urls = array(); - foreach ($urls[1] AS $id=>$url) { + foreach ($urls[1] AS $id => $url) { //$start = strpos($text, $url, $offset); $start = iconv_strpos($text, $url, 0, "UTF-8"); - if (!($start === false)) + if (!($start === false)) { $ordered_urls[$start] = array("url" => $url, "title" => $urls[2][$id]); + } } ksort($ordered_urls); @@ -2296,9 +2469,9 @@ use \Friendica\Core\Config; } } - return($entities); + return $entities; } - function api_format_items_embeded_images(&$item, $text){ + function api_format_items_embeded_images(&$item, $text) { $text = preg_replace_callback( "|data:image/([^;]+)[^=]+=*|m", function($match) use ($item) { @@ -2352,7 +2525,7 @@ use \Friendica\Core\Config; 'dislike' => array(), 'attendyes' => array(), 'attendno' => array(), - 'attendmaybe' => array() + 'attendmaybe' => array(), ); $items = q('SELECT * FROM item @@ -2360,13 +2533,13 @@ use \Friendica\Core\Config; intval($item['uid']), dbesc($item['uri'])); - foreach ($items as $i){ + foreach ($items as $i) { // not used as result should be structured like other user data //builtin_activity_puller($i, $activities); // get user data and add it to the array of the activity $user = api_get_user($a, $i['author-link']); - switch($i['verb']) { + switch ($i['verb']) { case ACTIVITY_LIKE: $activities['like'][] = $user; break; @@ -2468,25 +2641,27 @@ use \Friendica\Core\Config; $a = get_app(); - $ret = Array(); + $ret = array(); - foreach($r as $item) { + foreach ($r as $item) { localize_item($item); - list($status_user, $owner_user) = api_item_get_user($a,$item); + list($status_user, $owner_user) = api_item_get_user($a, $item); // Look if the posts are matching if they should be filtered by user id - if ($filter_user AND ($status_user["id"] != $user_info["id"])) + if ($filter_user AND ($status_user["id"] != $user_info["id"])) { continue; + } $in_reply_to = api_in_reply_to($item); $converted = api_convert_item($item); - if ($type == "xml") + if ($type == "xml") { $geo = "georss:point"; - else + } else { $geo = "geo"; + } $status = array( 'text' => $converted["text"], @@ -2510,16 +2685,19 @@ use \Friendica\Core\Config; 'friendica_activities' => api_format_items_activities($item, $type), ); - if (count($converted["attachments"]) > 0) + if (count($converted["attachments"]) > 0) { $status["attachments"] = $converted["attachments"]; + } - if (count($converted["entities"]) > 0) + if (count($converted["entities"]) > 0) { $status["entities"] = $converted["entities"]; + } - if (($item['item_network'] != "") AND ($status["source"] == 'web')) + if (($item['item_network'] != "") AND ($status["source"] == 'web')) { $status["source"] = network_to_name($item['item_network'], $user_info['url']); - else if (($item['item_network'] != "") AND (network_to_name($item['item_network'], $user_info['url']) != $status["source"])) + } elseif (($item['item_network'] != "") AND (network_to_name($item['item_network'], $user_info['url']) != $status["source"])) { $status["source"] = trim($status["source"].' ('.network_to_name($item['item_network'], $user_info['url']).')'); + } // Retweets are only valid for top postings @@ -2534,7 +2712,7 @@ use \Friendica\Core\Config; if ($retweeted_item !== false) { $retweeted_status = $status; try { - $retweeted_status["user"] = api_get_user($a,$retweeted_item["author-link"]); + $retweeted_status["user"] = api_get_user($a, $retweeted_item["author-link"]); } catch( BadRequestException $e ) { // user not found. should be found? /// @todo check if the user should be always found @@ -2571,67 +2749,81 @@ use \Friendica\Core\Config; return $ret; } - function api_account_rate_limit_status($type) { - if ($type == "xml") + if ($type == "xml") { $hash = array( - 'remaining-hits' => (string) 150, + 'remaining-hits' => '150', '@attributes' => array("type" => "integer"), - 'hourly-limit' => (string) 150, + 'hourly-limit' => '150', '@attributes2' => array("type" => "integer"), - 'reset-time' => datetime_convert('UTC','UTC','now + 1 hour',ATOM_TIME), + 'reset-time' => datetime_convert('UTC', 'UTC','now + 1 hour',ATOM_TIME), '@attributes3' => array("type" => "datetime"), 'reset_time_in_seconds' => strtotime('now + 1 hour'), '@attributes4' => array("type" => "integer"), ); - else + } else { $hash = array( 'reset_time_in_seconds' => strtotime('now + 1 hour'), - 'remaining_hits' => (string) 150, - 'hourly_limit' => (string) 150, - 'reset_time' => api_date(datetime_convert('UTC','UTC','now + 1 hour',ATOM_TIME)), + 'remaining_hits' => '150', + 'hourly_limit' => '150', + 'reset_time' => api_date(datetime_convert('UTC', 'UTC','now + 1 hour',ATOM_TIME)), ); + } return api_format_data('hash', $type, array('hash' => $hash)); } + + /// @TODO move to top of file or somwhere better api_register_func('api/account/rate_limit_status','api_account_rate_limit_status',true); function api_help_test($type) { - if ($type == 'xml') + if ($type == 'xml') { $ok = "true"; - else + } else { $ok = "ok"; + } return api_format_data('ok', $type, array("ok" => $ok)); } - api_register_func('api/help/test','api_help_test',false); + + /// @TODO move to top of file or somwhere better + api_register_func('api/help/test','api_help_test', false); function api_lists($type) { $ret = array(); + /// @TODO $ret is not filled here? return api_format_data('lists', $type, array("lists_list" => $ret)); } + + /// @TODO move to top of file or somwhere better api_register_func('api/lists','api_lists',true); function api_lists_list($type) { $ret = array(); + /// @TODO $ret is not filled here? return api_format_data('lists', $type, array("lists_list" => $ret)); } + + /// @TODO move to top of file or somwhere better api_register_func('api/lists/list','api_lists_list',true); /** - * https://dev.twitter.com/docs/api/1/get/statuses/friends - * This function is deprecated by Twitter - * returns: json, xml - **/ + * https://dev.twitter.com/docs/api/1/get/statuses/friends + * This function is deprecated by Twitter + * returns: json, xml + */ function api_statuses_f($type, $qtype) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } + $user_info = api_get_user($a); - if (x($_GET,'cursor') && $_GET['cursor']=='undefined'){ + if (x($_GET, 'cursor') && $_GET['cursor']=='undefined') { /* this is to stop Hotot to load friends multiple times * I'm not sure if I'm missing return something or * is a bug in hotot. Workaround, meantime @@ -2642,51 +2834,58 @@ use \Friendica\Core\Config; return false; } - if($qtype == 'friends') + if ($qtype == 'friends') { $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND)); - if($qtype == 'followers') + } + if ($qtype == 'followers') { $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND)); + } // friends and followers only for self - if ($user_info['self'] == 0) + if ($user_info['self'] == 0) { $sql_extra = " AND false "; + } $r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND NOT `self` AND (NOT `blocked` OR `pending`) $sql_extra", intval(api_user()) ); $ret = array(); - foreach($r as $cid){ + foreach ($r as $cid) { $user = api_get_user($a, $cid['nurl']); // "uid" and "self" are only needed for some internal stuff, so remove it from here unset($user["uid"]); unset($user["self"]); - if ($user) + if ($user) { $ret[] = $user; + } } return array('user' => $ret); } - function api_statuses_friends($type){ + + function api_statuses_friends($type) { $data = api_statuses_f($type, "friends"); - if ($data===false) return false; - return api_format_data("users", $type, $data); + if ($data === false) { + return false; + } + return api_format_data("users", $type, $data); } - function api_statuses_followers($type){ + + function api_statuses_followers($type) { $data = api_statuses_f($type, "followers"); - if ($data===false) return false; - return api_format_data("users", $type, $data); + if ($data === false) { + return false; + } + return api_format_data("users", $type, $data); } + + /// @TODO move to top of file or somewhere better api_register_func('api/statuses/friends','api_statuses_friends',true); api_register_func('api/statuses/followers','api_statuses_followers',true); - - - - - function api_statusnet_config($type) { $a = get_app(); @@ -2698,8 +2897,9 @@ use \Friendica\Core\Config; $closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false'); $private = ((Config::get('system', 'block_public')) ? 'true' : 'false'); $textlimit = (string) (($a->config['max_import_size']) ? $a->config['max_import_size'] : 200000); - if($a->config['api_import_size']) + if ($a->config['api_import_size']) { $texlimit = string($a->config['api_import_size']); + } $ssl = ((Config::get('system', 'have_ssl')) ? 'true' : 'false'); $sslserver = (($ssl === 'true') ? str_replace('http:','https:',App::get_baseurl()) : ''); @@ -2721,8 +2921,10 @@ use \Friendica\Core\Config; return api_format_data('config', $type, array('config' => $config)); } - api_register_func('api/gnusocial/config','api_statusnet_config',false); - api_register_func('api/statusnet/config','api_statusnet_config',false); + + /// @TODO move to top of file or somewhere better + api_register_func('api/gnusocial/config','api_statusnet_config', false); + api_register_func('api/statusnet/config','api_statusnet_config', false); function api_statusnet_version($type) { // liar @@ -2730,8 +2932,10 @@ use \Friendica\Core\Config; return api_format_data('version', $type, array('version' => $fake_statusnet_version)); } - api_register_func('api/gnusocial/version','api_statusnet_version',false); - api_register_func('api/statusnet/version','api_statusnet_version',false); + + /// @TODO move to top of file or somewhere better + api_register_func('api/gnusocial/version','api_statusnet_version', false); + api_register_func('api/statusnet/version','api_statusnet_version', false); /** * @todo use api_format_data() to return data @@ -2740,19 +2944,24 @@ use \Friendica\Core\Config; $a = get_app(); - if(! api_user()) throw new ForbiddenException(); + if (! api_user()) { + throw new ForbiddenException(); + } $user_info = api_get_user($a); - if($qtype == 'friends') + if ($qtype == 'friends') { $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND)); - if($qtype == 'followers') + } + if ($qtype == 'followers') { $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND)); + } - if (!$user_info["self"]) + if (!$user_info["self"]) { $sql_extra = " AND false "; + } - $stringify_ids = (x($_REQUEST,'stringify_ids')?$_REQUEST['stringify_ids']:false); + $stringify_ids = (x($_REQUEST, 'stringify_ids') ? $_REQUEST['stringify_ids'] : false); $r = q("SELECT `pcontact`.`id` FROM `contact` INNER JOIN `contact` AS `pcontact` ON `contact`.`nurl` = `pcontact`.`nurl` AND `pcontact`.`uid` = 0 @@ -2760,15 +2969,18 @@ use \Friendica\Core\Config; intval(api_user()) ); - if (!dbm::is_result($r)) + if (!dbm::is_result($r)) { return; + } $ids = array(); - foreach($r as $rr) - if ($stringify_ids) + foreach ($r as $rr) { + if ($stringify_ids) { $ids[] = $rr['id']; - else + } else { $ids[] = intval($rr['id']); + } + } return api_format_data("ids", $type, array('id' => $ids)); } @@ -2776,18 +2988,20 @@ use \Friendica\Core\Config; function api_friends_ids($type) { return api_ff_ids($type,'friends'); } + function api_followers_ids($type) { return api_ff_ids($type,'followers'); } + + /// @TODO move to top of file or somewhere better api_register_func('api/friends/ids','api_friends_ids',true); api_register_func('api/followers/ids','api_followers_ids',true); - function api_direct_messages_new($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); if (!x($_POST, "text") OR (!x($_POST,"screen_name") AND !x($_POST,"user_id"))) return; @@ -2807,45 +3021,43 @@ use \Friendica\Core\Config; $replyto = ''; $sub = ''; - if (x($_REQUEST,'replyto')) { + if (x($_REQUEST, 'replyto')) { $r = q('SELECT `parent-uri`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d', intval(api_user()), intval($_REQUEST['replyto'])); $replyto = $r[0]['parent-uri']; $sub = $r[0]['title']; - } - else { - if (x($_REQUEST,'title')) { + } else { + if (x($_REQUEST, 'title')) { $sub = $_REQUEST['title']; - } - else { - $sub = ((strlen($_POST['text'])>10)?substr($_POST['text'],0,10)."...":$_POST['text']); + } else { + $sub = ((strlen($_POST['text'])>10) ? substr($_POST['text'],0,10)."...":$_POST['text']); } } $id = send_message($recipient['cid'], $_POST['text'], $sub, $replyto); - if ($id>-1) { + if ($id > -1) { $r = q("SELECT * FROM `mail` WHERE id=%d", intval($id)); $ret = api_format_messages($r[0], $recipient, $sender); - } else { $ret = array("error"=>$id); } - $data = Array('direct_message'=>$ret); + $data = array('direct_message'=>$ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); } - return api_format_data("direct-messages", $type, $data); + return api_format_data("direct-messages", $type, $data); } - api_register_func('api/direct_messages/new','api_direct_messages_new',true, API_METHOD_POST); + /// @TODO move to top of file or somewhere better + api_register_func('api/direct_messages/new','api_direct_messages_new',true, API_METHOD_POST); /** * @brief delete a direct_message from mail table through api @@ -2853,31 +3065,33 @@ use \Friendica\Core\Config; * @param string $type Known types are 'atom', 'rss', 'xml' and 'json' * @return string */ - function api_direct_messages_destroy($type){ + function api_direct_messages_destroy($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } // params $user_info = api_get_user($a); //required - $id = (x($_REQUEST,'id') ? $_REQUEST['id'] : 0); + $id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0); // optional $parenturi = (x($_REQUEST, 'friendica_parenturi') ? $_REQUEST['friendica_parenturi'] : ""); - $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false"); + $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); /// @todo optional parameter 'include_entities' from Twitter API not yet implemented $uid = $user_info['uid']; // error if no id or parenturi specified (for clients posting parent-uri as well) - if ($verbose == "true") { - if ($id == 0 || $parenturi == "") { - $answer = array('result' => 'error', 'message' => 'message id or parenturi not specified'); - return api_format_data("direct_messages_delete", $type, array('$result' => $answer)); - } + if ($verbose == "true" && ($id == 0 || $parenturi == "")) { + $answer = array('result' => 'error', 'message' => 'message id or parenturi not specified'); + return api_format_data("direct_messages_delete", $type, array('$result' => $answer)); } // BadRequestException if no id specified (for clients using Twitter API) - if ($id == 0) throw new BadRequestException('Message id not specified'); + if ($id == 0) { + throw new BadRequestException('Message id not specified'); + } // add parent-uri to sql command if specified by calling app $sql_extra = ($parenturi != "" ? " AND `parent-uri` = '" . dbesc($parenturi) . "'" : ""); @@ -2907,8 +3121,7 @@ use \Friendica\Core\Config; // return success $answer = array('result' => 'ok', 'message' => 'message deleted'); return api_format_data("direct_message_delete", $type, array('$result' => $answer)); - } - else { + } else { $answer = array('result' => 'error', 'message' => 'unknown error'); return api_format_data("direct_messages_delete", $type, array('$result' => $answer)); } @@ -2916,25 +3129,30 @@ use \Friendica\Core\Config; /// @todo return JSON data like Twitter API not yet implemented } - api_register_func('api/direct_messages/destroy', 'api_direct_messages_destroy', true, API_METHOD_DELETE); + /// @TODO move to top of file or somewhere better + api_register_func('api/direct_messages/destroy', 'api_direct_messages_destroy', true, API_METHOD_DELETE); function api_direct_messages_box($type, $box, $verbose) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } // params - $count = (x($_GET,'count')?$_GET['count']:20); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); - if ($page<0) $page=0; + $count = (x($_GET, 'count') ? $_GET['count'] : 20); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0); + if ($page < 0) { + $page = 0; + } - $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); + $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); + $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); - $user_id = (x($_REQUEST,'user_id')?$_REQUEST['user_id']:""); - $screen_name = (x($_REQUEST,'screen_name')?$_REQUEST['screen_name']:""); + $user_id = (x($_REQUEST, 'user_id') ? $_REQUEST['user_id'] : ""); + $screen_name = (x($_REQUEST, 'screen_name') ? $_REQUEST['screen_name'] : ""); // caller user info unset($_REQUEST["user_id"]); @@ -2946,31 +3164,27 @@ use \Friendica\Core\Config; $user_info = api_get_user($a); $profile_url = $user_info["url"]; - // pagination - $start = $page*$count; + $start = $page * $count; // filters if ($box=="sentbox") { - $sql_extra = "`mail`.`from-url`='".dbesc( $profile_url )."'"; - } - elseif ($box=="conversation") { - $sql_extra = "`mail`.`parent-uri`='".dbesc( $_GET["uri"] ) ."'"; - } - elseif ($box=="all") { + $sql_extra = "`mail`.`from-url`='" . dbesc( $profile_url ) . "'"; + } elseif ($box == "conversation") { + $sql_extra = "`mail`.`parent-uri`='" . dbesc( $_GET["uri"] ) . "'"; + } elseif ($box == "all") { $sql_extra = "true"; - } - elseif ($box=="inbox") { - $sql_extra = "`mail`.`from-url`!='".dbesc( $profile_url )."'"; + } elseif ($box == "inbox") { + $sql_extra = "`mail`.`from-url`!='" . dbesc( $profile_url ) . "'"; } - if ($max_id > 0) - $sql_extra .= ' AND `mail`.`id` <= '.intval($max_id); + if ($max_id > 0) { + $sql_extra .= ' AND `mail`.`id` <= ' . intval($max_id); + } - if ($user_id !="") { + if ($user_id != "") { $sql_extra .= ' AND `mail`.`contact-id` = ' . intval($user_id); - } - elseif($screen_name !=""){ + } elseif ($screen_name !="") { $sql_extra .= " AND `contact`.`nick` = '" . dbesc($screen_name). "'"; } @@ -2979,131 +3193,142 @@ use \Friendica\Core\Config; intval($since_id), intval($start), intval($count) ); - if ($verbose == "true") { - // stop execution and return error message if no mails available - if($r == null) { - $answer = array('result' => 'error', 'message' => 'no mails available'); - return api_format_data("direct_messages_all", $type, array('$result' => $answer)); - } + if ($verbose == "true" && !dbm::is_result($r)) { + $answer = array('result' => 'error', 'message' => 'no mails available'); + return api_format_data("direct_messages_all", $type, array('$result' => $answer)); } - $ret = Array(); - foreach($r as $item) { - if ($box == "inbox" || $item['from-url'] != $profile_url){ + $ret = array(); + foreach ($r as $item) { + if ($box == "inbox" || $item['from-url'] != $profile_url) { $recipient = $user_info; $sender = api_get_user($a,normalise_link($item['contact-url'])); - } - elseif ($box == "sentbox" || $item['from-url'] == $profile_url){ + } elseif ($box == "sentbox" || $item['from-url'] == $profile_url) { $recipient = api_get_user($a,normalise_link($item['contact-url'])); $sender = $user_info; - } - $ret[]=api_format_messages($item, $recipient, $sender); + + $ret[] = api_format_messages($item, $recipient, $sender); } $data = array('direct_message' => $ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); } - return api_format_data("direct-messages", $type, $data); + return api_format_data("direct-messages", $type, $data); } - function api_direct_messages_sentbox($type){ - $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false"); + function api_direct_messages_sentbox($type) { + $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); return api_direct_messages_box($type, "sentbox", $verbose); } - function api_direct_messages_inbox($type){ - $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false"); + + function api_direct_messages_inbox($type) { + $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); return api_direct_messages_box($type, "inbox", $verbose); } - function api_direct_messages_all($type){ - $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false"); + + function api_direct_messages_all($type) { + $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); return api_direct_messages_box($type, "all", $verbose); } - function api_direct_messages_conversation($type){ - $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false"); + + function api_direct_messages_conversation($type) { + $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); return api_direct_messages_box($type, "conversation", $verbose); } + + /// @TODO move to top of file or somewhere better api_register_func('api/direct_messages/conversation','api_direct_messages_conversation',true); api_register_func('api/direct_messages/all','api_direct_messages_all',true); api_register_func('api/direct_messages/sent','api_direct_messages_sentbox',true); api_register_func('api/direct_messages','api_direct_messages_inbox',true); - - - function api_oauth_request_token($type){ - try{ + function api_oauth_request_token($type) { + try { $oauth = new FKOAuth1(); $r = $oauth->fetch_request_token(OAuthRequest::from_request()); - }catch(Exception $e){ - echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); killme(); + } catch (Exception $e) { + echo "error=" . OAuthUtil::urlencode_rfc3986($e->getMessage()); + killme(); } echo $r; killme(); } - function api_oauth_access_token($type){ - try{ + + function api_oauth_access_token($type) { + try { $oauth = new FKOAuth1(); $r = $oauth->fetch_access_token(OAuthRequest::from_request()); - }catch(Exception $e){ + } catch (Exception $e) { echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); killme(); } echo $r; killme(); } + /// @TODO move to top of file or somewhere better api_register_func('api/oauth/request_token', 'api_oauth_request_token', false); api_register_func('api/oauth/access_token', 'api_oauth_access_token', false); - function api_fr_photos_list($type) { - if (api_user()===false) throw new ForbiddenException(); - $r = q("select `resource-id`, max(scale) as scale, album, filename, type from photo - where uid = %d and album != 'Contact Photos' group by `resource-id`", + if (api_user() === false) { + throw new ForbiddenException(); + } + + $r = q("SELECT `resource-id`, MAX(`scale`) AS `scale`, `album`, `filename`, `type` + FROM `photo` + WHERE `uid` = %d AND `album` != 'Contact Photos' GROUP BY `resource-id`, `album`, `filename`, `type`", intval(local_user()) ); $typetoext = array( - 'image/jpeg' => 'jpg', - 'image/png' => 'png', - 'image/gif' => 'gif' + 'image/jpeg' => 'jpg', + 'image/png' => 'png', + 'image/gif' => 'gif' ); - $data = array('photo'=>array()); - if ($r) { + $data = array('photo' => array()); + if (dbm::is_result($r)) { foreach ($r as $rr) { $photo = array(); $photo['id'] = $rr['resource-id']; $photo['album'] = $rr['album']; $photo['filename'] = $rr['filename']; $photo['type'] = $rr['type']; - $thumb = App::get_baseurl()."/photo/".$rr['resource-id']."-".$rr['scale'].".".$typetoext[$rr['type']]; + $thumb = App::get_baseurl() . "/photo/" . $rr['resource-id'] . "-" . $rr['scale'] . "." . $typetoext[$rr['type']]; - if ($type == "xml") + if ($type == "xml") { $data['photo'][] = array("@attributes" => $photo, "1" => $thumb); - else { + } else { $photo['thumb'] = $thumb; $data['photo'][] = $photo; } } } - return api_format_data("photos", $type, $data); + return api_format_data("photos", $type, $data); } function api_fr_photo_detail($type) { - if (api_user()===false) throw new ForbiddenException(); - if(!x($_REQUEST,'photo_id')) throw new BadRequestException("No photo id."); + if (api_user() === false) { + throw new ForbiddenException(); + } elseif (!x($_REQUEST, 'photo_id')) { + throw new BadRequestException("No photo id."); + } $scale = (x($_REQUEST, 'scale') ? intval($_REQUEST['scale']) : false); - $scale_sql = ($scale === false ? "" : sprintf("and scale=%d",intval($scale))); - $data_sql = ($scale === false ? "" : "data, "); + $scale_sql = ($scale === false ? "" : sprintf("AND `scale`=%d",intval($scale))); + $data_sql = ($scale === false ? "" : "ANY_VALUE(`data`) AS data`,"); - $r = q("select %s `resource-id`, `created`, `edited`, `title`, `desc`, `album`, `filename`, - `type`, `height`, `width`, `datasize`, `profile`, min(`scale`) as minscale, max(`scale`) as maxscale - from photo where `uid` = %d and `resource-id` = '%s' %s group by `resource-id`", + $r = q("SELECT %s ANY_VALUE(`resource-id`) AS `resource-id`, ANY_VALUE(`created`) AS `created`, + ANY_VALUE(`edited`) AS `edited`, ANY_VALUE(`title`) AS `title`, ANY_VALUE(`desc`) AS `desc`, + ANY_VALUE(`album`) AS `album`, ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`type`) AS `type`, + ANY_VALUE(`height`) AS `height`, ANY_VALUE(`width`) AS `width`, ANY_VALUE(`datasize`) AS `datasize`, + ANY_VALUE(`profile`) AS `profile`, min(`scale`) as minscale, max(`scale`) as maxscale + FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' %s", $data_sql, intval(local_user()), dbesc($_REQUEST['photo_id']), @@ -3111,12 +3336,12 @@ use \Friendica\Core\Config; ); $typetoext = array( - 'image/jpeg' => 'jpg', - 'image/png' => 'png', - 'image/gif' => 'gif' + 'image/jpeg' => 'jpg', + 'image/png' => 'png', + 'image/gif' => 'gif' ); - if ($r) { + if (dbm::is_result($r)) { $data = array('photo' => $r[0]); $data['photo']['id'] = $data['photo']['resource-id']; if ($scale !== false) { @@ -3126,14 +3351,15 @@ use \Friendica\Core\Config; } if ($type == "xml") { $data['photo']['links'] = array(); - for ($k=intval($data['photo']['minscale']); $k<=intval($data['photo']['maxscale']); $k++) - $data['photo']['links'][$k.":link"]["@attributes"] = array("type" => $data['photo']['type'], - "scale" => $k, - "href" => App::get_baseurl()."/photo/".$data['photo']['resource-id']."-".$k.".".$typetoext[$data['photo']['type']]); + for ($k = intval($data['photo']['minscale']); $k <= intval($data['photo']['maxscale']); $k++) { + $data['photo']['links'][$k . ":link"]["@attributes"] = array("type" => $data['photo']['type'], + "scale" => $k, + "href" => App::get_baseurl() . "/photo/" . $data['photo']['resource-id'] . "-" . $k . "." . $typetoext[$data['photo']['type']]); + } } else { $data['photo']['link'] = array(); - for ($k=intval($data['photo']['minscale']); $k<=intval($data['photo']['maxscale']); $k++) { - $data['photo']['link'][$k] = App::get_baseurl()."/photo/".$data['photo']['resource-id']."-".$k.".".$typetoext[$data['photo']['type']]; + for ($k = intval($data['photo']['minscale']); $k <= intval($data['photo']['maxscale']); $k++) { + $data['photo']['link'][$k] = App::get_baseurl() . "/photo/" . $data['photo']['resource-id'] . "-" . $k . "." . $typetoext[$data['photo']['type']]; } } unset($data['photo']['resource-id']); @@ -3164,11 +3390,12 @@ use \Friendica\Core\Config; * url: string, url to redirect after auth */ function api_friendica_remoteauth() { - $url = ((x($_GET,'url')) ? $_GET['url'] : ''); - $c_url = ((x($_GET,'c_url')) ? $_GET['c_url'] : ''); + $url = ((x($_GET, 'url')) ? $_GET['url'] : ''); + $c_url = ((x($_GET, 'c_url')) ? $_GET['c_url'] : ''); - if ($url === '' || $c_url === '') + if ($url === '' || $c_url === '') { throw new BadRequestException("Wrong parameters."); + } $c_url = normalise_link($c_url); @@ -3179,18 +3406,19 @@ use \Friendica\Core\Config; intval(api_user()) ); - if ((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN)) + if ((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN)) { throw new BadRequestException("Unknown contact"); + } $cid = $r[0]['id']; $dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']); - if($r[0]['duplex'] && $r[0]['issued-id']) { + if ($r[0]['duplex'] && $r[0]['issued-id']) { $orig_id = $r[0]['issued-id']; $dfrn_id = '1:' . $orig_id; } - if($r[0]['duplex'] && $r[0]['dfrn-id']) { + if ($r[0]['duplex'] && $r[0]['dfrn-id']) { $orig_id = $r[0]['dfrn-id']; $dfrn_id = '0:' . $orig_id; } @@ -3227,12 +3455,16 @@ use \Friendica\Core\Config; return false; } - $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body); - // Skip if there is no shared message in there - // we already checked this in diaspora::is_reshare() - // but better one more than one less... - if ($body == $attributes) + /// @TODO "$1" should maybe mean '$1' ? + $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body); + /* + * Skip if there is no shared message in there + * we already checked this in diaspora::is_reshare() + * but better one more than one less... + */ + if ($body == $attributes) { return false; + } // build the fake reshared item @@ -3240,55 +3472,63 @@ use \Friendica\Core\Config; $author = ""; preg_match("/author='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); + if ($matches[1] != "") { + $author = html_entity_decode($matches[1], ENT_QUOTES, 'UTF-8'); + } preg_match('/author="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $author = $matches[1]; + } $profile = ""; preg_match("/profile='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $profile = $matches[1]; + } preg_match('/profile="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $profile = $matches[1]; + } $avatar = ""; preg_match("/avatar='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $avatar = $matches[1]; + } preg_match('/avatar="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $avatar = $matches[1]; + } $link = ""; preg_match("/link='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $link = $matches[1]; + } preg_match('/link="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $link = $matches[1]; + } $posted = ""; preg_match("/posted='(.*?)'/ism", $attributes, $matches); if ($matches[1] != "") - $posted= $matches[1]; + $posted = $matches[1]; preg_match('/posted="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $posted = $matches[1]; + } $shared_body = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$2",$body); - if (($shared_body == "") || ($profile == "") || ($author == "") || ($avatar == "") || ($posted == "")) + if (($shared_body == "") || ($profile == "") || ($author == "") || ($avatar == "") || ($posted == "")) { return false; - - + } $reshared_item["body"] = $shared_body; $reshared_item["author-name"] = $author; @@ -3312,32 +3552,39 @@ use \Friendica\Core\Config; $r = q("SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'", dbesc(normalise_link($profile))); - if ($r) + + if (dbm::is_result($r)) { $nick = $r[0]["nick"]; + } if (!$nick == "") { $r = q("SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'", dbesc(normalise_link($profile))); - if ($r) + + if (dbm::is_result($r)) { $nick = $r[0]["nick"]; + } } if (!$nick == "") { $friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2", $profile); - if ($friendica != $profile) + if ($friendica != $profile) { $nick = $friendica; + } } if (!$nick == "") { $diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2", $profile); - if ($diaspora != $profile) + if ($diaspora != $profile) { $nick = $diaspora; + } } if (!$nick == "") { $twitter = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $profile); - if ($twitter != $profile) + if ($twitter != $profile) { $nick = $twitter; + } } @@ -3348,8 +3595,9 @@ use \Friendica\Core\Config; if ($StatusnetUser != $profile) { $UserData = fetch_url("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser); $user = json_decode($UserData); - if ($user) + if ($user) { $nick = $user->screen_name; + } } } } @@ -3363,10 +3611,11 @@ use \Friendica\Core\Config; //} - if ($nick != "") - return($nick); + if ($nick != "") { + return $nick; + } - return(false); + return false; } function api_in_reply_to($item) { @@ -3424,7 +3673,7 @@ use \Friendica\Core\Config; } function api_clean_plain_items($Text) { - $include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false"); + $include_entities = strtolower(x($_REQUEST, 'include_entities') ? $_REQUEST['include_entities'] : "false"); $Text = bb_CleanPictureLinks($Text); $URLSearchString = "^\[\]"; @@ -3518,11 +3767,11 @@ use \Friendica\Core\Config; $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); // params $user_info = api_get_user($a); - $gid = (x($_REQUEST,'gid') ? $_REQUEST['gid'] : 0); + $gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0); $uid = $user_info['uid']; // get data of the specified group id or all groups if not specified @@ -3569,11 +3818,11 @@ use \Friendica\Core\Config; $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); // params $user_info = api_get_user($a); - $gid = (x($_REQUEST,'gid') ? $_REQUEST['gid'] : 0); + $gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0); $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : ""); $uid = $user_info['uid']; @@ -3616,7 +3865,7 @@ use \Friendica\Core\Config; $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); // params $user_info = api_get_user($a); @@ -3682,7 +3931,7 @@ use \Friendica\Core\Config; $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); // params $user_info = api_get_user($a); @@ -3734,14 +3983,14 @@ use \Friendica\Core\Config; $success = array('success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers); return api_format_data("group_update", $type, array('result' => $success)); } - api_register_func('api/friendica/group_update', 'api_friendica_group_update', true, API_METHOD_POST); + api_register_func('api/friendica/group_update', 'api_friendica_group_update', true, API_METHOD_POST); function api_friendica_activity($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); $verb = strtolower($a->argv[3]); $verb = preg_replace("|\..*$|", "", $verb); @@ -3760,6 +4009,8 @@ use \Friendica\Core\Config; } } + + /// @TODO move to top of file or somwhere better api_register_func('api/friendica/activity/like', 'api_friendica_activity', true, API_METHOD_POST); api_register_func('api/friendica/activity/dislike', 'api_friendica_activity', true, API_METHOD_POST); api_register_func('api/friendica/activity/attendyes', 'api_friendica_activity', true, API_METHOD_POST); @@ -3781,7 +4032,7 @@ use \Friendica\Core\Config; $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); if ($a->argc!==3) throw new BadRequestException("Invalid argument count"); $nm = new NotificationsManager(); @@ -3806,11 +4057,11 @@ use \Friendica\Core\Config; * @param string $type Known types are 'atom', 'rss', 'xml' and 'json' * @return string */ - function api_friendica_notification_seen($type){ + function api_friendica_notification_seen($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); if ($a->argc!==4) throw new BadRequestException("Invalid argument count"); $id = (x($_REQUEST, 'id') ? intval($_REQUEST['id']) : 0); @@ -3838,19 +4089,21 @@ use \Friendica\Core\Config; return api_format_data('result', $type, array('result' => "success")); } + /// @TODO move to top of file or somwhere better api_register_func('api/friendica/notification/seen', 'api_friendica_notification_seen', true, API_METHOD_POST); api_register_func('api/friendica/notification', 'api_friendica_notification', true, API_METHOD_GET); - /** * @brief update a direct_message to seen state * * @param string $type Known types are 'atom', 'rss', 'xml' and 'json' * @return string (success result=ok, error result=error with error message) */ - function api_friendica_direct_messages_setseen($type){ + function api_friendica_direct_messages_setseen($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } // params $user_info = api_get_user($a); @@ -3867,6 +4120,7 @@ use \Friendica\Core\Config; $r = q("SELECT `id` FROM `mail` WHERE `id` = %d AND `uid` = %d", intval($id), intval($uid)); + // error message if specified id is not in database if (!dbm::is_result($r)) { $answer = array('result' => 'error', 'message' => 'message id not in database'); @@ -3887,11 +4141,10 @@ use \Friendica\Core\Config; return api_format_data("direct_messages_setseen", $type, array('$result' => $answer)); } } + + /// @TODO move to top of file or somwhere better api_register_func('api/friendica/direct_messages_setseen', 'api_friendica_direct_messages_setseen', true); - - - /** * @brief search for direct_messages containing a searchstring through api * @@ -3900,14 +4153,16 @@ use \Friendica\Core\Config; * success=false if nothing was found, search_result='nothing found', * error: result=error with error message) */ - function api_friendica_direct_messages_search($type){ + function api_friendica_direct_messages_search($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } // params $user_info = api_get_user($a); - $searchstring = (x($_REQUEST,'searchstring') ? $_REQUEST['searchstring'] : ""); + $searchstring = (x($_REQUEST, 'searchstring') ? $_REQUEST['searchstring'] : ""); $uid = $user_info['uid']; // error if no searchstring specified @@ -3923,29 +4178,32 @@ use \Friendica\Core\Config; ); $profile_url = $user_info["url"]; + // message if nothing was found - if (!dbm::is_result($r)) + if (!dbm::is_result($r)) { $success = array('success' => false, 'search_results' => 'problem with query'); - else if (count($r) == 0) + } elseif (count($r) == 0) { $success = array('success' => false, 'search_results' => 'nothing found'); - else { - $ret = Array(); - foreach($r as $item) { - if ($box == "inbox" || $item['from-url'] != $profile_url){ + } else { + $ret = array(); + foreach ($r as $item) { + if ($box == "inbox" || $item['from-url'] != $profile_url) { $recipient = $user_info; $sender = api_get_user($a,normalise_link($item['contact-url'])); - } - elseif ($box == "sentbox" || $item['from-url'] == $profile_url){ + } elseif ($box == "sentbox" || $item['from-url'] == $profile_url) { $recipient = api_get_user($a,normalise_link($item['contact-url'])); $sender = $user_info; } - $ret[]=api_format_messages($item, $recipient, $sender); + + $ret[] = api_format_messages($item, $recipient, $sender); } $success = array('success' => true, 'search_results' => $ret); } return api_format_data("direct_message_search", $type, array('$result' => $success)); } + + /// @TODO move to top of file or somwhere better api_register_func('api/friendica/direct_messages_search', 'api_friendica_direct_messages_search', true); /** @@ -3954,13 +4212,15 @@ use \Friendica\Core\Config; * @param string $type Known types are 'atom', 'rss', 'xml' and 'json' * @return string */ - function api_friendica_profile_show($type){ + function api_friendica_profile_show($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } // input params - $profileid = (x($_REQUEST,'profile_id') ? $_REQUEST['profile_id'] : 0); + $profileid = (x($_REQUEST, 'profile_id') ? $_REQUEST['profile_id'] : 0); // retrieve general information about profiles for user $multi_profiles = feature_enabled(api_user(),'multi_profiles'); @@ -3971,9 +4231,11 @@ use \Friendica\Core\Config; $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d", intval(api_user()), intval($profileid)); + // error message if specified gid is not in database - if (!dbm::is_result($r)) + if (!dbm::is_result($r)) { throw new BadRequestException("profile_id not available"); + } } else { $r = q("SELECT * FROM `profile` WHERE `uid` = %d", intval(api_user())); @@ -3991,13 +4253,13 @@ use \Friendica\Core\Config; foreach ($r as $rr) { $user = api_get_user($a, $rr['nurl']); - ($type == "xml") ? $users[$k++.":user"] = $user : $users[] = $user; + ($type == "xml") ? $users[$k++ . ":user"] = $user : $users[] = $user; } $profile['users'] = $users; // add prepared profile data to array for final return if ($type == "xml") { - $profiles[$k++.":profile"] = $profile; + $profiles[$k++ . ":profile"] = $profile; } else { $profiles[] = $profile; } @@ -4015,6 +4277,7 @@ use \Friendica\Core\Config; api_register_func('api/friendica/profile/show', 'api_friendica_profile_show', true, API_METHOD_GET); /* +@TODO Maybe open to implement? To.Do: [pagename] => api/1.1/statuses/lookup.json [id] => 605138389168451584 diff --git a/include/attach.php b/include/attach.php index 6b26b1ed6..ee6f49937 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1060,13 +1060,14 @@ function z_mime_content_type($filename) { 'zsh' => 'text/x-script.zsh', ); - $dot = strpos($filename,'.'); - if($dot !== false) { - $ext = strtolower(substr($filename,$dot+1)); + $dot = strpos($filename, '.'); + if ($dot !== false) { + $ext = strtolower(substr($filename, $dot + 1)); if (array_key_exists($ext, $mime_types)) { return $mime_types[$ext]; } } + /// @TODO Then let's get rid of it? // can't use this because we're just passing a name, e.g. not a file that can be opened // elseif (function_exists('finfo_open')) { // $finfo = @finfo_open(FILEINFO_MIME); diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 03eff5a6b..a07a58353 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -1,11 +1,12 @@ convert($Text); // unmask the special chars back to HTML - $Text = str_replace(array('&_lt_;','&_gt_;','&_amp_;'),array('<','>','&'),$Text); + $Text = str_replace(array('&_lt_;', '&_gt_;', '&_amp_;'), array('<', '>', '&'), $Text); $a->save_timestamp($stamp1, "parser"); @@ -172,20 +201,31 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { $Text = preg_replace_callback("/([@]\[(.*?)\])\(([$URLSearchString]*?)\)/ism", 'diaspora_mentions', $Text); } + // Restore code blocks + $Text = preg_replace_callback('/#codeblock-([0-9]+)#/iU', + function ($matches) use ($codeblocks) { + $return = ''; + if (isset($codeblocks[intval($matches[1])])) { + $return = $codeblocks[$matches[1]]; + } + return $return; + } + , $Text); + call_hooks('bb2diaspora',$Text); return $Text; } function unescape_underscores_in_links($m) { - $y = str_replace('\\_','_', $m[2]); + $y = str_replace('\\_', '_', $m[2]); return('[' . $m[1] . '](' . $y . ')'); } function format_event_diaspora($ev) { - - if(! ((is_array($ev)) && count($ev))) + if (! ((is_array($ev)) && count($ev))) { return ''; + } $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM @@ -200,17 +240,19 @@ function format_event_diaspora($ev) { $ev['start'] , $bd_format))) . '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n"; - if(! $ev['nofinish']) + if (! $ev['nofinish']) { $o .= t('Finishes:') . ' ' . '[' . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC', $ev['finish'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', $ev['finish'] , $bd_format ))) . '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n"; + } - if(strlen($ev['location'])) + if (strlen($ev['location'])) { $o .= t('Location:') . bb2diaspora($ev['location']) . "\n"; + } $o .= "\n"; return $o; diff --git a/include/bbcode.php b/include/bbcode.php index 489ef8b2e..2715334e4 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1,43 +1,46 @@ ' . generate_map(str_replace('/',' ',$match[1])) . '', $match[0]); + return str_replace($match[0], '' . generate_map(str_replace('/', ' ', $match[1])) . '', $match[0]); } function bb_map_location($match) { // the extra space in the following line is intentional - return str_replace($match[0],'' . generate_named_map($match[1]) . '', $match[0]); + return str_replace($match[0], '' . generate_named_map($match[1]) . '', $match[0]); } function bb_attachment($Text, $simplehtml = false, $tryoembed = true) { $data = get_attachment_data($Text); - if (!$data) + if (!$data) { return $Text; + } if (isset($data["title"])) { $data["title"] = strip_tags($data["title"]); @@ -57,83 +60,91 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) { // If the link description is similar to the text above then don't add the link description if (($data["title"] != "") AND ((strpos($test1,$test2) !== false) OR - (similar_text($test1,$test2) / strlen($data["title"])) > 0.9)) + (similar_text($test1,$test2) / strlen($data["title"])) > 0.9)) { $title2 = $data["url"]; - $text = sprintf('%s', + } + $text = sprintf('%s', $data["url"], $data["title"], $title2); - } elseif (($simplehtml != 4) AND ($simplehtml != 0)) + } elseif (($simplehtml != 4) AND ($simplehtml != 0)) { $text = sprintf('%s', $data["url"], $data["title"]); - else { + } else { $text = sprintf('', $data["type"]); $bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $data["url"], $data["title"]), $data["url"], $data["title"]); - if ($tryoembed) + if ($tryoembed) { $oembed = tryoembed($bookmark); - else + } else { $oembed = $bookmark[0]; + } - if (strstr(strtolower($oembed), "<img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $data["url"], proxy_url($data["image"]), $data["title"]); - elseif (($data["preview"] != "") AND !strstr(strtolower($oembed), "<img ")) + } elseif (($data["preview"] != "") AND !strstr(strtolower($oembed), "<img ")) { $text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], proxy_url($data["preview"]), $data["title"]); + } - if (($data["type"] == "photo") AND ($data["url"] != "") AND ($data["image"] != "")) + if (($data["type"] == "photo") AND ($data["url"] != "") AND ($data["image"] != "")) { $text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], proxy_url($data["image"]), $data["title"]); - else + } else { $text .= $oembed; + } - if (trim($data["description"]) != "") + if (trim($data["description"]) != "") { $text .= sprintf('<blockquote>%s</blockquote></span>', trim(bbcode($data["description"]))); + } } } - return $data["text"].$text.$data["after"]; + return trim($data["text"].' '.$text.' '.$data["after"]); } function bb_remove_share_information($Text, $plaintext = false, $nolink = false) { $data = get_attachment_data($Text); - if (!$data) + if (!$data) { return $Text; - - if ($nolink) - return $data["text"].$data["after"]; + } elseif ($nolink) { + return $data["text"] . $data["after"]; + } $title = htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false); $text = htmlentities($data["text"], ENT_QUOTES, 'UTF-8', false); - if ($plaintext OR (($title != "") AND strstr($text, $title))) + if ($plaintext OR (($title != "") AND strstr($text, $title))) { $data["title"] = $data["url"]; - elseif (($text != "") AND strstr($title, $text)) { + } elseif (($text != "") AND strstr($title, $text)) { $data["text"] = $data["title"]; $data["title"] = $data["url"]; } - if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == "")) - return $data["title"].$data["after"]; + if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == "")) { + return $data["title"] . $data["after"]; + } // If the link already is included in the post, don't add it again - if (($data["url"] != "") AND strpos($data["text"], $data["url"])) - return $data["text"].$data["after"]; + if (($data["url"] != "") AND strpos($data["text"], $data["url"])) { + return $data["text"] . $data["after"]; + } $text = $data["text"]; - if (($data["url"] != "") AND ($data["title"] != "")) - $text .= "\n[url=".$data["url"]."]".$data["title"]."[/url]"; - elseif (($data["url"] != "")) - $text .= "\n".$data["url"]; + if (($data["url"] != "") AND ($data["title"] != "")) { + $text .= "\n[url=" . $data["url"] . "]" . $data["title"] . "[/url]"; + } elseif (($data["url"] != "")) { + $text .= "\n" . $data["url"]; + } - return $text."\n".$data["after"]; + return $text . "\n" . $data["after"]; } function bb_cleanstyle($st) { - return "<span style=\"".cleancss($st[1]).";\">".$st[2]."</span>"; + return "<span style=\"" . cleancss($st[1]) . ";\">" . $st[2] . "</span>"; } function bb_cleanclass($st) { - return "<span class=\"".cleancss($st[1])."\">".$st[2]."</span>"; + return "<span class=\"" . cleancss($st[1]) . "\">" . $st[2] . "</span>"; } function cleancss($input) { @@ -145,128 +156,145 @@ function cleancss($input) { for ($i = 0; $i < strlen($input); $i++) { $char = substr($input, $i, 1); - if (($char >= "a") and ($char <= "z")) + if (($char >= "a") and ($char <= "z")) { $cleaned .= $char; + } - if (!(strpos(" #;:0123456789-_.%", $char) === false)) + if (!(strpos(" #;:0123456789-_.%", $char) === false)) { $cleaned .= $char; + } } - return($cleaned); + return $cleaned; } function stripcode_br_cb($s) { return '[code]' . str_replace('<br />', '', $s[1]) . '[/code]'; } -function bb_onelinecode_cb($match) { - if (strpos($match[1],"<br>")===false){ - return "<key>".$match[1]."</key>"; - } - return "<code>".$match[1]."</code>"; -} - -function tryoembed($match){ +function tryoembed($match) { $url = $match[1]; // Always embed the SSL version $url = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"), array("https://www.youtube.com/", "https://player.vimeo.com/"), $url); - $o = oembed_fetch_url($url); - if (!is_object($o)) + if (!is_object($o)) { return $match[0]; - - if (isset($match[2])) - $o->title = $match[2]; - - if ($o->type=="error") return $match[0]; - - $html = oembed_format_object($o); - return $html; - -} - -// [noparse][i]italic[/i][/noparse] turns into -// [noparse][ i ]italic[ /i ][/noparse], -// to hide them from parser. - -function bb_spacefy($st) { - $whole_match = $st[0]; - $captured = $st[1]; - $spacefied = preg_replace("/\[(.*?)\]/", "[ $1 ]", $captured); - $new_str = str_replace($captured, $spacefied, $whole_match); - return $new_str; -} - -// The previously spacefied [noparse][ i ]italic[ /i ][/noparse], -// now turns back and the [noparse] tags are trimed -// returning [i]italic[/i] - -function bb_unspacefy_and_trim($st) { - $whole_match = $st[0]; - $captured = $st[1]; - $unspacefied = preg_replace("/\[ (.*?)\ ]/", "[$1]", $captured); - return $unspacefied; -} - -function bb_find_open_close($s, $open, $close, $occurance = 1) { - - if($occurance < 1) - $occurance = 1; - - $start_pos = -1; - for($i = 1; $i <= $occurance; $i++) { - if( $start_pos !== false) - $start_pos = strpos($s, $open, $start_pos + 1); } - if( $start_pos === false) + if (isset($match[2])) { + $o->title = $match[2]; + } + + if ($o->type == "error") { + return $match[0]; + } + + $html = oembed_format_object($o); + + return $html; +} + +/* + * [noparse][i]italic[/i][/noparse] turns into + * [noparse][ i ]italic[ /i ][/noparse], + * to hide them from parser. + */ +function bb_spacefy($st) { + $whole_match = $st[0]; + $captured = $st[1]; + $spacefied = preg_replace("/\[(.*?)\]/", "[ $1 ]", $captured); + $new_str = str_replace($captured, $spacefied, $whole_match); + return $new_str; +} + +/* + * The previously spacefied [noparse][ i ]italic[ /i ][/noparse], + * now turns back and the [noparse] tags are trimed + * returning [i]italic[/i] + */ +function bb_unspacefy_and_trim($st) { + $whole_match = $st[0]; + $captured = $st[1]; + $unspacefied = preg_replace("/\[ (.*?)\ ]/", "[$1]", $captured); + return $unspacefied; +} + +function bb_find_open_close($s, $open, $close, $occurence = 1) { + if ($occurence < 1) { + $occurence = 1; + } + + $start_pos = -1; + for ($i = 1; $i <= $occurence; $i++) { + if ($start_pos !== false) { + $start_pos = strpos($s, $open, $start_pos + 1); + } + } + + if ($start_pos === false) { return false; + } $end_pos = strpos($s, $close, $start_pos); - if( $end_pos === false) + if ($end_pos === false) { return false; + } $res = array( 'start' => $start_pos, 'end' => $end_pos ); return $res; } -function get_bb_tag_pos($s, $name, $occurance = 1) { - - if($occurance < 1) - $occurance = 1; - - $start_open = -1; - for($i = 1; $i <= $occurance; $i++) { - if( $start_open !== false) - $start_open = strpos($s, '[' . $name, $start_open + 1); // allow [name= type tags +function get_bb_tag_pos($s, $name, $occurence = 1) { + if ($occurence < 1) { + $occurence = 1; } - if( $start_open === false) + $start_open = -1; + for ($i = 1; $i <= $occurence; $i++) { + if ($start_open !== false) { + $start_open = strpos($s, '[' . $name, $start_open + 1); // allow [name= type tags + } + } + + if ($start_open === false) { return false; + } $start_equal = strpos($s, '=', $start_open); $start_close = strpos($s, ']', $start_open); - if( $start_close === false) + if ($start_close === false) { return false; + } $start_close++; $end_open = strpos($s, '[/' . $name . ']', $start_close); - if( $end_open === false) + if ($end_open === false) { return false; + } - $res = array( 'start' => array('open' => $start_open, 'close' => $start_close), - 'end' => array('open' => $end_open, 'close' => $end_open + strlen('[/' . $name . ']')) ); - if( $start_equal !== false) + $res = array( + 'start' => array( + 'open' => $start_open, + 'close' => $start_close + ), + 'end' => array( + 'open' => $end_open, + 'close' => $end_open + strlen('[/' . $name . ']') + ), + ); + + if ($start_equal !== false) { $res['start']['equal'] = $start_equal + 1; + } return $res; } @@ -275,27 +303,27 @@ function bb_tag_preg_replace($pattern, $replace, $name, $s) { $string = $s; - $occurance = 1; - $pos = get_bb_tag_pos($string, $name, $occurance); - while($pos !== false && $occurance < 1000) { - + $occurence = 1; + $pos = get_bb_tag_pos($string, $name, $occurence); + while ($pos !== false && $occurence < 1000) { $start = substr($string, 0, $pos['start']['open']); $subject = substr($string, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']); $end = substr($string, $pos['end']['close']); - if($end === false) + if ($end === false) { $end = ''; + } $subject = preg_replace($pattern, $replace, $subject); $string = $start . $subject . $end; - $occurance++; - $pos = get_bb_tag_pos($string, $name, $occurance); + $occurence++; + $pos = get_bb_tag_pos($string, $name, $occurence); } return $string; } -if(! function_exists('bb_extract_images')) { +if (! function_exists('bb_extract_images')) { function bb_extract_images($body) { $saved_image = array(); @@ -306,26 +334,28 @@ function bb_extract_images($body) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); - while(($img_st_close !== false) && ($img_end !== false)) { + while (($img_st_close !== false) && ($img_end !== false)) { $img_st_close++; // make it point to AFTER the closing bracket $img_end += $img_start; - if(! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { + if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { // This is an embedded image $saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - ($img_start + $img_st_close)); $new_body = $new_body . substr($orig_body, 0, $img_start) . '[$#saved_image' . $cnt . '#$]'; $cnt++; - } - else + } else { $new_body = $new_body . substr($orig_body, 0, $img_end + strlen('[/img]')); + } $orig_body = substr($orig_body, $img_end + strlen('[/img]')); - if($orig_body === false) // in case the body ends on a closing image tag + if ($orig_body === false) { + // in case the body ends on a closing image tag $orig_body = ''; + } $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); @@ -337,7 +367,7 @@ function bb_extract_images($body) { return array('body' => $new_body, 'images' => $saved_image); }} -if(! function_exists('bb_replace_images')) { +if (! function_exists('bb_replace_images')) { function bb_replace_images($body, $images) { $newbody = $body; @@ -512,85 +542,94 @@ function bb_ShareAttributes($share, $simplehtml) { ); break; } - return($text); + + return $text; } function GetProfileUsername($profile, $username, $compact = false, $getnetwork = false) { $twitter = preg_replace("=https?://twitter.com/(.*)=ism", "$1@twitter.com", $profile); if ($twitter != $profile) { - if ($getnetwork) - return(NETWORK_TWITTER); - elseif ($compact) - return($twitter); - else - return($username." (".$twitter.")"); + if ($getnetwork) { + return NETWORK_TWITTER; + } elseif ($compact) { + return $twitter; + } else { + return ($username . " (" . $twitter . ")"); + } } $appnet = preg_replace("=https?://alpha.app.net/(.*)=ism", "$1@alpha.app.net", $profile); if ($appnet != $profile) { - if ($getnetwork) - return(NETWORK_APPNET); - elseif ($compact) - return($appnet); - else - return($username." (".$appnet.")"); + if ($getnetwork) { + return NETWORK_APPNET; + } elseif ($compact) { + return $appnet; + } else { + return ($username . " (" . $appnet . ")"); + } } $gplus = preg_replace("=https?://plus.google.com/(.*)=ism", "$1@plus.google.com", $profile); if ($gplus != $profile) { - if ($getnetwork) - return(NETWORK_GPLUS); - elseif ($compact) - return($gplususername." (".$username.")"); - else - return($username." (".$gplus.")"); + if ($getnetwork) { + return NETWORK_GPLUS; + } elseif ($compact) { + return ($gplususername . " (" . $username . ")"); + } else { + return ($username . " (" . $gplus . ")"); + } } $friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2@$1", $profile); if ($friendica != $profile) { - if ($getnetwork) - return(NETWORK_DFRN); - elseif ($compact) - return($friendica); - else - return($username." (".$friendica.")"); + if ($getnetwork) { + return NETWORK_DFRN; + } elseif ($compact) { + return $friendica; + } else { + return ($username . " (" . $friendica . ")"); + } } $diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile); if ($diaspora != $profile) { - if ($getnetwork) - return(NETWORK_DIASPORA); - elseif ($compact) - return($diaspora); - else - return($username." (".$diaspora.")"); + if ($getnetwork) { + return NETWORK_DIASPORA; + } elseif ($compact) { + return $diaspora; + } else { + return ($username . " (" . $diaspora . ")"); + } } $red = preg_replace("=https?://(.*)/channel/(.*)=ism", "$2@$1", $profile); if ($red != $profile) { - if ($getnetwork) + if ($getnetwork) { // red is identified as Diaspora - friendica can't connect directly to it - return(NETWORK_DIASPORA); - elseif ($compact) - return($red); - else - return($username." (".$red.")"); + return NETWORK_DIASPORA; + } elseif ($compact) { + return $red; + } else { + return ($username . " (" . $red . ")"); + } } $StatusnetHost = preg_replace("=https?://(.*)/user/(.*)=ism", "$1", $profile); if ($StatusnetHost != $profile) { $StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile); if ($StatusnetUser != $profile) { + /// @TODO Some hosts run on https, not just http and sometimes http is disabled, let's support both here $UserData = fetch_url("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser); $user = json_decode($UserData); if ($user) { - if ($getnetwork) - return(NETWORK_STATUSNET); - elseif ($compact) - return($user->screen_name."@".$StatusnetHost); - else - return($username." (".$user->screen_name."@".$StatusnetHost.")"); + if ($getnetwork) { + return NETWORK_STATUSNET; + } elseif ($compact) { + return ($user->screen_name . "@" . $StatusnetHost); + } else { + return ($username . " (" . $user->screen_name . "@" . $StatusnetHost . ")"); + } } } } @@ -600,16 +639,17 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork = if ($rest == "") { $pumpio = preg_replace("=https?://([\.\w]+)/([\.\w]+)(.*)=ism", "$2@$1", $profile); if ($pumpio != $profile) { - if ($getnetwork) - return(NETWORK_PUMPIO); - elseif ($compact) - return($pumpio); - else - return($username." (".$pumpio.")"); + if ($getnetwork) { + return NETWORK_PUMPIO; + } elseif ($compact) { + return $pumpio; + } else { + return ($username . " (" . $pumpio . ")"); + } } } - return($username); + return $username; } function bb_DiasporaLinks($match) { @@ -619,7 +659,7 @@ function bb_DiasporaLinks($match) { function bb_RemovePictureLinks($match) { $text = Cache::get($match[1]); - if(is_null($text)){ + if (is_null($text)) { $a = get_app(); $stamp1 = microtime(true); @@ -660,20 +700,22 @@ function bb_RemovePictureLinks($match) { } Cache::set($match[1],$text); } - return($text); + + return $text; } function bb_expand_links($match) { - if (($match[3] == "") OR ($match[2] == $match[3]) OR stristr($match[2], $match[3])) - return ($match[1]."[url]".$match[2]."[/url]"); - else - return ($match[1].$match[3]." [url]".$match[2]."[/url]"); + if (($match[3] == "") OR ($match[2] == $match[3]) OR stristr($match[2], $match[3])) { + return ($match[1] . "[url]" . $match[2] . "[/url]"); + } else { + return ($match[1] . $match[3] . " [url]" . $match[2] . "[/url]"); + } } function bb_CleanPictureLinksSub($match) { $text = Cache::get($match[1]); - if(is_null($text)){ + if (is_null($text)) { $a = get_app(); $stamp1 = microtime(true); @@ -715,34 +757,58 @@ function bb_CleanPictureLinksSub($match) { } Cache::set($match[1],$text); } - return($text); + + return $text; } function bb_CleanPictureLinks($text) { $text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_CleanPictureLinksSub', $text); - return ($text); + return $text; } function bb_highlight($match) { - if(in_array(strtolower($match[1]),['php','css','mysql','sql','abap','diff','html','perl','ruby', - 'vbscript','avrc','dtd','java','xml','cpp','python','javascript','js','sh'])) - return text_highlight($match[2],strtolower($match[1])); + if (in_array(strtolower($match[1]), ['php', 'css', 'mysql', 'sql', 'abap', 'diff', 'html', 'perl', 'ruby', + 'vbscript', 'avrc', 'dtd', 'java', 'xml', 'cpp', 'python', 'javascript', 'js', 'sh'])) { + return text_highlight($match[2], strtolower($match[1])); + } return $match[0]; } - // BBcode 2 HTML was written by WAY2WEB.net - // extended to work with Mistpark/Friendica - Mike Macgirvin - -function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = false, $forplaintext = false) { +/** + * @brief Converts a BBCode message to HTML message + * + * BBcode 2 HTML was written by WAY2WEB.net + * extended to work with Mistpark/Friendica - Mike Macgirvin + * + * Simple HTML values meaning: + * - 0: Friendica display + * - 1: Unused + * - 2: Used for Facebook, Google+, Windows Phone push, Friendica API + * - 3: Used before converting to Markdown in bb2diaspora.php + * - 4: Used for WordPress, Libertree (before Markdown), pump.io and tumblr + * - 5: Unused + * - 6: Used for Appnet + * - 7: Used for dfrn, OStatus + * - 8: Used for WP backlink text setting + * + * @staticvar array $allowed_src_protocols + * @param string $Text + * @param bool $preserve_nl + * @param bool $tryoembed + * @param int $simplehtml + * @param bool $forplaintext + * @return string + */ +function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = false, $forplaintext = false) { $a = get_app(); // Hide all [noparse] contained bbtags by spacefying them // POSSIBLE BUG --> Will the 'preg' functions crash if there's an embedded image? - $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy',$Text); - $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_spacefy',$Text); - $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy',$Text); + $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy', $Text); + $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_spacefy', $Text); + $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy', $Text); // Remove the abstract element. It is a non visible element. $Text = remove_abstract($Text); @@ -772,19 +838,20 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $Text = str_replace(">", ">", $Text); // remove some newlines before the general conversion - $Text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","[share$1]$2[/share]",$Text); - $Text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism","[quote$1]$2[/quote]",$Text); + $Text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "[share$1]$2[/share]", $Text); + $Text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism", "[quote$1]$2[/quote]", $Text); $Text = preg_replace("/\n\[code\]/ism", "[code]", $Text); $Text = preg_replace("/\[\/code\]\n/ism", "[/code]", $Text); // when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems - if (!$tryoembed) - $Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","\n[share$1$2]$3[/share]",$Text); + if (!$tryoembed) { + $Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "\n[share$1$2]$3[/share]", $Text); + } // Check for [code] text here, before the linefeeds are messed with. // The highlighter will unescape and re-escape the content. - if (strpos($Text,'[code=') !== false) { + if (strpos($Text, '[code=') !== false) { $Text = preg_replace_callback("/\[code=(.*?)\](.*?)\[\/code\]/ism", 'bb_highlight', $Text); } // Convert new line chars to html <br /> tags @@ -795,7 +862,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // We'll emulate it. $Text = trim($Text); - $Text = str_replace("\r\n","\n", $Text); + $Text = str_replace("\r\n", "\n", $Text); // removing multiplicated newlines if (get_config("system", "remove_multiplicated_lines")) { @@ -812,10 +879,11 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // Handle attached links or videos $Text = bb_attachment($Text, $simplehtml, $tryoembed); - $Text = str_replace(array("\r","\n"), array('<br />','<br />'), $Text); + $Text = str_replace(array("\r","\n"), array('<br />', '<br />'), $Text); - if($preserve_nl) - $Text = str_replace(array("\n","\r"), array('',''),$Text); + if ($preserve_nl) { + $Text = str_replace(array("\n", "\r"), array('', ''), $Text); + } // Set up the parameters for a URL search string $URLSearchString = "^\[\]"; @@ -823,20 +891,21 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $MAILSearchString = $URLSearchString; // Remove all hashtag addresses - if ((!$tryoembed OR $simplehtml) AND !in_array($simplehtml, array(3, 7))) + if ((!$tryoembed OR $simplehtml) AND !in_array($simplehtml, array(3, 7))) { $Text = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text); - elseif ($simplehtml == 3) + } elseif ($simplehtml == 3) { $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1<a href="$2">$3</a>', $Text); - elseif ($simplehtml == 7) + } elseif ($simplehtml == 7) { $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1<span class="vcard"><a href="$2" class="url" title="$3"><span class="fn nickname mention">$3</span></a></span>', $Text); - elseif (!$simplehtml) + } elseif (!$simplehtml) { $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1<a href="$2" class="userinfo mention" title="$3">$3</a>', $Text); + } // Bookmarks in red - will be converted to bookmarks in friendica $Text = preg_replace("/#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $Text); @@ -845,38 +914,42 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal "[bookmark=$1]$2[/bookmark]", $Text); if (in_array($simplehtml, array(2, 6, 7, 8, 9))) { - $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("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",' $2 [url]$1[/url]',$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("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", ' $2 [url]$1[/url]',$Text); } - if ($simplehtml == 5) + if ($simplehtml == 5) { $Text = preg_replace("/[^#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $Text); + } // Perform URL Search - if ($tryoembed) - $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'tryoembed',$Text); + if ($tryoembed) { + $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", 'tryoembed', $Text); + } - if ($simplehtml == 5) - $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url]$1[/url]',$Text); - else - $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$Text); + if ($simplehtml == 5) { + $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url]$1[/url]', $Text); + } else { + $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url=$1]$2[/url]', $Text); + } // Handle Diaspora posts $Text = preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi", 'bb_DiasporaLinks', $Text); // if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text // if ($simplehtml != 7) { - if (!$forplaintext) + if (!$forplaintext) { $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="_blank">$2</a>', $Text); - else { - $Text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism"," $1 ",$Text); + } else { + $Text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism", " $1 ", $Text); $Text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_RemovePictureLinks', $Text); } // } - if ($tryoembed) - $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$Text); + if ($tryoembed) { + $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'tryoembed', $Text); + } $Text = preg_replace("/([#])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1<a href="$2" class="tag" title="$3">$3</a>', $Text); @@ -892,7 +965,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // we may need to restrict this further if it picks up too many strays // link acct:user@host to a webfinger profile redirector - $Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . App::get_baseurl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>',$Text); + $Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . App::get_baseurl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>', $Text); // Perform MAIL Search $Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text); @@ -901,61 +974,61 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // leave open the posibility of [map=something] // this is replaced in prepare_body() which has knowledge of the item location - if (strpos($Text,'[/map]') !== false) { + if (strpos($Text, '[/map]') !== false) { $Text = preg_replace_callback("/\[map\](.*?)\[\/map\]/ism", 'bb_map_location', $Text); } - if (strpos($Text,'[map=') !== false) { + if (strpos($Text, '[map=') !== false) { $Text = preg_replace_callback("/\[map=(.*?)\]/ism", 'bb_map_coords', $Text); } - if (strpos($Text,'[map]') !== false) { + if (strpos($Text, '[map]') !== false) { $Text = preg_replace("/\[map\]/", '<div class="map"></div>', $Text); } // Check for headers - $Text = preg_replace("(\[h1\](.*?)\[\/h1\])ism",'<h1>$1</h1>',$Text); - $Text = preg_replace("(\[h2\](.*?)\[\/h2\])ism",'<h2>$1</h2>',$Text); - $Text = preg_replace("(\[h3\](.*?)\[\/h3\])ism",'<h3>$1</h3>',$Text); - $Text = preg_replace("(\[h4\](.*?)\[\/h4\])ism",'<h4>$1</h4>',$Text); - $Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism",'<h5>$1</h5>',$Text); - $Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'<h6>$1</h6>',$Text); + $Text = preg_replace("(\[h1\](.*?)\[\/h1\])ism", '<h1>$1</h1>', $Text); + $Text = preg_replace("(\[h2\](.*?)\[\/h2\])ism", '<h2>$1</h2>', $Text); + $Text = preg_replace("(\[h3\](.*?)\[\/h3\])ism", '<h3>$1</h3>', $Text); + $Text = preg_replace("(\[h4\](.*?)\[\/h4\])ism", '<h4>$1</h4>', $Text); + $Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism", '<h5>$1</h5>', $Text); + $Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism", '<h6>$1</h6>', $Text); // Check for paragraph - $Text = preg_replace("(\[p\](.*?)\[\/p\])ism",'<p>$1</p>',$Text); + $Text = preg_replace("(\[p\](.*?)\[\/p\])ism", '<p>$1</p>', $Text); // Check for bold text - $Text = preg_replace("(\[b\](.*?)\[\/b\])ism",'<strong>$1</strong>',$Text); + $Text = preg_replace("(\[b\](.*?)\[\/b\])ism", '<strong>$1</strong>', $Text); // Check for Italics text - $Text = preg_replace("(\[i\](.*?)\[\/i\])ism",'<em>$1</em>',$Text); + $Text = preg_replace("(\[i\](.*?)\[\/i\])ism", '<em>$1</em>', $Text); // Check for Underline text - $Text = preg_replace("(\[u\](.*?)\[\/u\])ism",'<u>$1</u>',$Text); + $Text = preg_replace("(\[u\](.*?)\[\/u\])ism", '<u>$1</u>', $Text); // Check for strike-through text - $Text = preg_replace("(\[s\](.*?)\[\/s\])ism",'<strike>$1</strike>',$Text); + $Text = preg_replace("(\[s\](.*?)\[\/s\])ism", '<strike>$1</strike>', $Text); // Check for over-line text - $Text = preg_replace("(\[o\](.*?)\[\/o\])ism",'<span class="overline">$1</span>',$Text); + $Text = preg_replace("(\[o\](.*?)\[\/o\])ism", '<span class="overline">$1</span>', $Text); // Check for colored text - $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])ism","<span style=\"color: $1;\">$2</span>",$Text); + $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])ism", "<span style=\"color: $1;\">$2</span>", $Text); // Check for sized text // [size=50] --> font-size: 50px (with the unit). - $Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1px; line-height: initial;\">$2</span>",$Text); - $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1; line-height: initial;\">$2</span>",$Text); + $Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism", "<span style=\"font-size: $1px; line-height: initial;\">$2</span>", $Text); + $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism", "<span style=\"font-size: $1; line-height: initial;\">$2</span>", $Text); // Check for centered text - $Text = preg_replace("(\[center\](.*?)\[\/center\])ism","<div style=\"text-align:center;\">$1</div>",$Text); + $Text = preg_replace("(\[center\](.*?)\[\/center\])ism", "<div style=\"text-align:center;\">$1</div>", $Text); // Check for list text $Text = str_replace("[*]", "<li>", $Text); // Check for style sheet commands - $Text = preg_replace_callback("(\[style=(.*?)\](.*?)\[\/style\])ism","bb_cleanstyle",$Text); + $Text = preg_replace_callback("(\[style=(.*?)\](.*?)\[\/style\])ism", "bb_cleanstyle", $Text); // Check for CSS classes - $Text = preg_replace_callback("(\[class=(.*?)\](.*?)\[\/class\])ism","bb_cleanclass",$Text); + $Text = preg_replace_callback("(\[class=(.*?)\](.*?)\[\/class\])ism", "bb_cleanclass", $Text); // handle nested lists $endlessloop = 0; @@ -964,42 +1037,42 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal ((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) || ((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false)) || ((strpos($Text, "[/li]") !== false) && (strpos($Text, "[li]") !== false))) && (++$endlessloop < 20)) { - $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' ,$Text); - $Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '<ul class="listnone" style="list-style-type: none;">$1</ul>' ,$Text); - $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>' ,$Text); - $Text = preg_replace("/\[list=((?-i)i)\](.*?)\[\/list\]/ism",'<ul class="listlowerroman" style="list-style-type: lower-roman;">$2</ul>' ,$Text); - $Text = preg_replace("/\[list=((?-i)I)\](.*?)\[\/list\]/ism", '<ul class="listupperroman" style="list-style-type: upper-roman;">$2</ul>' ,$Text); - $Text = preg_replace("/\[list=((?-i)a)\](.*?)\[\/list\]/ism", '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$2</ul>' ,$Text); - $Text = preg_replace("/\[list=((?-i)A)\](.*?)\[\/list\]/ism", '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$2</ul>' ,$Text); - $Text = preg_replace("/\[ul\](.*?)\[\/ul\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' ,$Text); - $Text = preg_replace("/\[ol\](.*?)\[\/ol\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>' ,$Text); - $Text = preg_replace("/\[li\](.*?)\[\/li\]/ism", '<li>$1</li>' ,$Text); + $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>', $Text); + $Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '<ul class="listnone" style="list-style-type: none;">$1</ul>', $Text); + $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>', $Text); + $Text = preg_replace("/\[list=((?-i)i)\](.*?)\[\/list\]/ism", '<ul class="listlowerroman" style="list-style-type: lower-roman;">$2</ul>', $Text); + $Text = preg_replace("/\[list=((?-i)I)\](.*?)\[\/list\]/ism", '<ul class="listupperroman" style="list-style-type: upper-roman;">$2</ul>', $Text); + $Text = preg_replace("/\[list=((?-i)a)\](.*?)\[\/list\]/ism", '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$2</ul>', $Text); + $Text = preg_replace("/\[list=((?-i)A)\](.*?)\[\/list\]/ism", '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$2</ul>', $Text); + $Text = preg_replace("/\[ul\](.*?)\[\/ul\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>', $Text); + $Text = preg_replace("/\[ol\](.*?)\[\/ol\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>', $Text); + $Text = preg_replace("/\[li\](.*?)\[\/li\]/ism", '<li>$1</li>', $Text); } - $Text = preg_replace("/\[th\](.*?)\[\/th\]/sm", '<th>$1</th>' ,$Text); - $Text = preg_replace("/\[td\](.*?)\[\/td\]/sm", '<td>$1</td>' ,$Text); - $Text = preg_replace("/\[tr\](.*?)\[\/tr\]/sm", '<tr>$1</tr>' ,$Text); - $Text = preg_replace("/\[table\](.*?)\[\/table\]/sm", '<table>$1</table>' ,$Text); + $Text = preg_replace("/\[th\](.*?)\[\/th\]/sm", '<th>$1</th>', $Text); + $Text = preg_replace("/\[td\](.*?)\[\/td\]/sm", '<td>$1</td>', $Text); + $Text = preg_replace("/\[tr\](.*?)\[\/tr\]/sm", '<tr>$1</tr>', $Text); + $Text = preg_replace("/\[table\](.*?)\[\/table\]/sm", '<table>$1</table>', $Text); - $Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/sm", '<table border="1" >$1</table>' ,$Text); - $Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/sm", '<table border="0" >$1</table>' ,$Text); + $Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/sm", '<table border="1" >$1</table>', $Text); + $Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/sm", '<table border="0" >$1</table>', $Text); - $Text = str_replace('[hr]','<hr />', $Text); + $Text = str_replace('[hr]', '<hr />', $Text); // This is actually executed in prepare_body() - $Text = str_replace('[nosmile]','',$Text); + $Text = str_replace('[nosmile]', '', $Text); // Check for font change text - $Text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm","<span style=\"font-family: $1;\">$2</span>",$Text); + $Text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm", "<span style=\"font-family: $1;\">$2</span>", $Text); // Declare the format for [code] layout -// $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism",'stripcode_br_cb',$Text); +// $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism", 'stripcode_br_cb', $Text); $CodeLayout = '<code>$1</code>'; // Check for [code] text - $Text = preg_replace("/\[code\](.*?)\[\/code\]/ism","$CodeLayout", $Text); + $Text = preg_replace("/\[code\](.*?)\[\/code\]/ism", "$CodeLayout", $Text); // Declare the format for [spoiler] layout $SpoilerLayout = '<blockquote class="spoiler">$1</blockquote>'; @@ -1007,8 +1080,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // Check for [spoiler] text // handle nested quotes $endlessloop = 0; - while ((strpos($Text, "[/spoiler]") !== false) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20)) - $Text = preg_replace("/\[spoiler\](.*?)\[\/spoiler\]/ism","$SpoilerLayout", $Text); + while ((strpos($Text, "[/spoiler]") !== false) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20)) { + $Text = preg_replace("/\[spoiler\](.*?)\[\/spoiler\]/ism", "$SpoilerLayout", $Text); + } // Check for [spoiler=Author] text @@ -1016,10 +1090,11 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // handle nested quotes $endlessloop = 0; - while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20)) + while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20)) { $Text = preg_replace("/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism", "<br /><strong class=".'"spoiler"'.">" . $t_wrote . "</strong><blockquote class=".'"spoiler"'.">$2</blockquote>", $Text); + } // Declare the format for [quote] layout $QuoteLayout = '<blockquote>$1</blockquote>'; @@ -1027,8 +1102,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // Check for [quote] text // handle nested quotes $endlessloop = 0; - while ((strpos($Text, "[/quote]") !== false) and (strpos($Text, "[quote]") !== false) and (++$endlessloop < 20)) - $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism","$QuoteLayout", $Text); + while ((strpos($Text, "[/quote]") !== false) and (strpos($Text, "[quote]") !== false) and (++$endlessloop < 20)) { + $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism", "$QuoteLayout", $Text); + } // Check for [quote=Author] text @@ -1036,10 +1112,11 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // handle nested quotes $endlessloop = 0; - while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20)) + while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20)) { $Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism", "<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote>$2</blockquote>", $Text); + } // [img=widthxheight]image source[/img] @@ -1057,14 +1134,13 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // Shared content $Text = preg_replace_callback("/(.*?)\[share(.*?)\](.*?)\[\/share\]/ism", - function ($match) use ($simplehtml){ - return(bb_ShareAttributes($match, $simplehtml)); - },$Text); - - $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text); - $Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text); - //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text); + function ($match) use ($simplehtml) { + return bb_ShareAttributes($match, $simplehtml); + }, $Text); + $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text); + $Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text); + //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text); // Try to Oembed if ($tryoembed) { @@ -1083,41 +1159,44 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // html5 video and audio - if ($tryoembed) + if ($tryoembed) { $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<iframe src="$1" width="' . $a->videowidth . '" height="' . $a->videoheight . '"><a href="$1">$1</a>', $Text); - else + } else { $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '$1', $Text); + } // Youtube extensions if ($tryoembed) { $Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text); $Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text); - $Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism",'tryoembed',$Text); + $Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism", 'tryoembed', $Text); } - $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); - $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); - $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); - - if ($tryoembed) - $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '', $Text); - else - $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", - 'https://www.youtube.com/watch?v=$1', $Text); + $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $Text); + $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $Text); + $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $Text); if ($tryoembed) { - $Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); - $Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); + $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '', $Text); + } else { + $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", + 'https://www.youtube.com/watch?v=$1', $Text); } - $Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text); - $Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text); + if ($tryoembed) { + $Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism", 'tryoembed', $Text); + $Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism", 'tryoembed', $Text); + } - if ($tryoembed) + $Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $Text); + $Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $Text); + + if ($tryoembed) { $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '', $Text); - else + } else { $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", 'https://vimeo.com/$1', $Text); + } // $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '', $Text); @@ -1132,33 +1211,42 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // Summary (e.g. title) is required, earlier revisions only required description (in addition to // start which is always required). Allow desc with a missing summary for compatibility. - if((x($ev,'desc') || x($ev,'summary')) && x($ev,'start')) { + if ((x($ev, 'desc') || x($ev, 'summary')) && x($ev, 'start')) { $sub = format_event_html($ev, $simplehtml); - $Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism",'',$Text); - $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism",'',$Text); - $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism",$sub,$Text); - $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism",'',$Text); - $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/ism",'',$Text); - $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism",'',$Text); - $Text = preg_replace("/\[event\-id\](.*?)\[\/event\-id\]/ism",'',$Text); + $Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism", '', $Text); + $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism", '', $Text); + $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism", $sub, $Text); + $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism", '', $Text); + $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/ism", '', $Text); + $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism", '', $Text); + $Text = preg_replace("/\[event\-id\](.*?)\[\/event\-id\]/ism", '', $Text); } - //replace oneliner with - $Text = preg_replace_callback("|(?!]*>)([^<]*)(?!]*>)|ism", 'bb_onelinecode_cb', $Text); + // Replace inline code blocks + $Text = preg_replace_callback("|(?!]*>)([^<]*)(?!]*>)|ism", + function ($match) use ($simplehtml) { + $return = '' . $match[1] . ''; + // Use for Diaspora inline code blocks + if ($simplehtml === 3) { + $return = '' . $match[1] . ''; + } + return $return; + } + , $Text); // Unhide all [noparse] contained bbtags unspacefying them // and triming the [noparse] tag. - $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim',$Text); - $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim',$Text); - $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim',$Text); + $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim', $Text); + $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim', $Text); + $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim', $Text); - $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/','&$1;',$Text); - $Text = preg_replace('/\&\#039\;/','\'',$Text); - $Text = preg_replace('/\"\;/','"',$Text); + $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/', '&$1;', $Text); + $Text = preg_replace('/\&\#039\;/', '\'', $Text); + $Text = preg_replace('/\"\;/', '"', $Text); // fix any escaped ampersands that may have been converted into links $Text = preg_replace('/\<([^>]*?)(src|href)=(.*?)\&\;(.*?)\>/ism', '<$1$2=$3&$4>', $Text); @@ -1178,7 +1266,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $regex = '#<([^>]*?)(href)="(?!' . implode('|', $allowed_link_protocols) . ')(.*?)"(.*?)>#ism'; $Text = preg_replace($regex, '<$1$2="javascript:void(0)"$4 class="invalid-href" title="' . t('Invalid link protocol') . '">', $Text); - if($saved_image) { + if ($saved_image) { $Text = bb_replace_images($Text, $saved_image); } @@ -1198,19 +1286,19 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $Text = $doc->saveHTML(); $Text = str_replace(array("", "", $doctype, $encoding), array("", "", "", ""), $Text); - $Text = str_replace('','', $Text); + $Text = str_replace('', '', $Text); //$Text = mb_convert_encoding($Text, "UTF-8", 'HTML-ENTITIES'); } // Clean up some useless linebreaks in lists - //$Text = str_replace('','', $Text); - //$Text = str_replace('','', $Text); - //$Text = str_replace('','', $Text); - // $Text = str_replace('', '', $Text); + //$Text = str_replace('', '', $Text); + //$Text = str_replace('', '', $Text); + //$Text = str_replace(' diff --git a/include/cli_startup.php b/include/cli_startup.php index 4b66b47a0..557d08c28 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -19,7 +19,7 @@ function cli_startup() { require_once("dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); - }; + }; require_once('include/session.php'); diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 56c032847..7069af066 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -9,12 +9,12 @@ function contact_profile_assign($current,$foreign_net) { $o .= "\r\n"; - $r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d", + $r = q("SELECT `id`, `profile-name`, `is-default` FROM `profile` WHERE `uid` = %d", intval($_SESSION['uid'])); if (dbm::is_result($r)) { foreach ($r as $rr) { - $selected = (($rr['id'] == $current) ? " selected=\"selected\" " : ""); + $selected = (($rr['id'] == $current || ($current == 0 && $rr['is-default'] == 1)) ? " selected=\"selected\" " : ""); $o .= "{$rr['profile-name']}\r\n"; } } @@ -37,7 +37,7 @@ function contact_reputation($current) { 5 => t('Reputable, has my trust') ); - foreach($rep as $k => $v) { + foreach ($rep as $k => $v) { $selected = (($k == $current) ? " selected=\"selected\" " : ""); $o .= "$v\r\n"; } @@ -61,7 +61,7 @@ function contact_poll_interval($current, $disabled = false) { 5 => t('Monthly') ); - foreach($rep as $k => $v) { + foreach ($rep as $k => $v) { $selected = (($k == $current) ? " selected=\"selected\" " : ""); $o .= "$v\r\n"; } diff --git a/include/contact_widgets.php b/include/contact_widgets.php index d077a065e..5dd3a8bb4 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -2,7 +2,7 @@ function follow_widget($value = "") { - return replace_macros(get_markup_template('follow.tpl'),array( + return replace_macros(get_markup_template('follow.tpl'), array( '$connect' => t('Add New Contact'), '$desc' => t('Enter address or web location'), '$hint' => t('Example: bob@example.com, http://example.com/barbara'), @@ -13,20 +13,20 @@ function follow_widget($value = "") { } function findpeople_widget() { - require_once('include/Contact.php'); + require_once 'include/Contact.php'; $a = get_app(); - if(get_config('system','invitation_only')) { - $x = get_pconfig(local_user(),'system','invites_remaining'); - if($x || is_site_admin()) { + if (get_config('system', 'invitation_only')) { + $x = get_pconfig(local_user(), 'system', 'invites_remaining'); + if ($x || is_site_admin()) { $a->page['aside'] .= '' - . sprintf( tt('%d invitation available','%d invitations available',$x), $x) + . sprintf( tt('%d invitation available', '%d invitations available', $x), $x) . '' . $inv; } } - return replace_macros(get_markup_template('peoplefind.tpl'),array( + return replace_macros(get_markup_template('peoplefind.tpl'), array( '$findpeople' => t('Find People'), '$desc' => t('Enter name or interest'), '$label' => t('Connect/Follow'), @@ -45,32 +45,41 @@ function unavailable_networks() { $networks = array(); - if (!plugin_enabled("appnet")) + if (!plugin_enabled("appnet")) { $networks[] = NETWORK_APPNET; + } - if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook")) + if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook")) { $networks[] = NETWORK_FACEBOOK; + } - if (!plugin_enabled("statusnet")) + if (!plugin_enabled("statusnet")) { $networks[] = NETWORK_STATUSNET; + } - if (!plugin_enabled("pumpio")) + if (!plugin_enabled("pumpio")) { $networks[] = NETWORK_PUMPIO; + } - if (!plugin_enabled("twitter")) + if (!plugin_enabled("twitter")) { $networks[] = NETWORK_TWITTER; + } - if (get_config("system","ostatus_disabled")) + if (get_config("system", "ostatus_disabled")) { $networks[] = NETWORK_OSTATUS; + } - if (!get_config("system","diaspora_enabled")) + if (!get_config("system", "diaspora_enabled")) { $networks[] = NETWORK_DIASPORA; + } - if (!plugin_enabled("pnut")) + if (!plugin_enabled("pnut")) { $networks[] = NETWORK_PNUT; + } - if (!sizeof($networks)) + if (!sizeof($networks)) { return ""; + } $network_filter = implode("','", $networks); @@ -79,7 +88,7 @@ function unavailable_networks() { return $network_filter; } -function networks_widget($baseurl,$selected = '') { +function networks_widget($baseurl, $selected = '') { $a = get_app(); @@ -87,7 +96,7 @@ function networks_widget($baseurl,$selected = '') { return ''; } - if (!feature_enabled(local_user(),'networks')) { + if (!feature_enabled(local_user(), 'networks')) { return ''; } @@ -99,7 +108,7 @@ function networks_widget($baseurl,$selected = '') { $nets = array(); if (dbm::is_result($r)) { - require_once('include/contact_selectors.php'); + require_once 'include/contact_selectors.php'; foreach ($r as $rr) { /// @TODO If 'network' is not there, this triggers an E_NOTICE if ($rr['network']) { @@ -108,10 +117,11 @@ function networks_widget($baseurl,$selected = '') { } } - if(count($nets) < 2) + if (count($nets) < 2) { return ''; + } - return replace_macros(get_markup_template('nets.tpl'),array( + return replace_macros(get_markup_template('nets.tpl'), array( '$title' => t('Networks'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -122,31 +132,31 @@ function networks_widget($baseurl,$selected = '') { )); } -function fileas_widget($baseurl,$selected = '') { +function fileas_widget($baseurl, $selected = '') { if (! local_user()) { return ''; } - if (! feature_enabled(local_user(),'filing')) { + if (! feature_enabled(local_user(), 'filing')) { return ''; } - $saved = get_pconfig(local_user(),'system','filetags'); + $saved = get_pconfig(local_user(), 'system', 'filetags'); if (! strlen($saved)) { return; } $matches = false; $terms = array(); - $cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { + foreach ($matches as $mtch) { $unescaped = xmlify(file_tag_decode($mtch[1])); - $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); + $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); } } - return replace_macros(get_markup_template('fileas_widget.tpl'),array( + return replace_macros(get_markup_template('fileas_widget.tpl'), array( '$title' => t('Saved Folders'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -157,30 +167,31 @@ function fileas_widget($baseurl,$selected = '') { )); } -function categories_widget($baseurl,$selected = '') { +function categories_widget($baseurl, $selected = '') { $a = get_app(); - if (! feature_enabled($a->profile['profile_uid'],'categories')) { + if (! feature_enabled($a->profile['profile_uid'], 'categories')) { return ''; } - $saved = get_pconfig($a->profile['profile_uid'],'system','filetags'); + $saved = get_pconfig($a->profile['profile_uid'], 'system', 'filetags'); if (! strlen($saved)) { return; } $matches = false; $terms = array(); - $cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER); - if($cnt) { - foreach($matches as $mtch) { - $unescaped = xmlify(file_tag_decode($mtch[1])); - $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); + $cnt = preg_match_all('/<(.*?)>/', $saved, $matches, PREG_SET_ORDER); + + if ($cnt) { + foreach ($matches as $mtch) { + $unescaped = xmlify(file_tag_decode($mtch[1])); + $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); } } - return replace_macros(get_markup_template('categories_widget.tpl'),array( + return replace_macros(get_markup_template('categories_widget.tpl'), array( '$title' => t('Categories'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -195,29 +206,30 @@ function common_friends_visitor_widget($profile_uid) { $a = get_app(); - if(local_user() == $profile_uid) + if (local_user() == $profile_uid) { return; + } $cid = $zcid = 0; - if(is_array($_SESSION['remote'])) { - foreach($_SESSION['remote'] as $visitor) { - if($visitor['uid'] == $profile_uid) { + if (is_array($_SESSION['remote'])) { + foreach ($_SESSION['remote'] as $visitor) { + if ($visitor['uid'] == $profile_uid) { $cid = $visitor['cid']; break; } } } - if(! $cid) { - if(get_my_url()) { + if (! $cid) { + if (get_my_url()) { $r = q("select id from contact where nurl = '%s' and uid = %d limit 1", dbesc(normalise_link(get_my_url())), intval($profile_uid) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $cid = $r[0]['id']; - else { + } else { $r = q("select id from gcontact where nurl = '%s' limit 1", dbesc(normalise_link(get_my_url())) ); @@ -227,22 +239,26 @@ function common_friends_visitor_widget($profile_uid) { } } - if($cid == 0 && $zcid == 0) + if ($cid == 0 && $zcid == 0) { return; + } - require_once('include/socgraph.php'); + require_once 'include/socgraph.php'; - if($cid) - $t = count_common_friends($profile_uid,$cid); - else - $t = count_common_friends_zcid($profile_uid,$zcid); - if(! $t) + if ($cid) { + $t = count_common_friends($profile_uid, $cid); + } else { + $t = count_common_friends_zcid($profile_uid, $zcid); + } + if (! $t) { return; + } - if($cid) - $r = common_friends($profile_uid,$cid,0,5,true); - else - $r = common_friends_zcid($profile_uid,$zcid,0,5,true); + if ($cid) { + $r = common_friends($profile_uid, $cid, 0, 5, true); + } else { + $r = common_friends_zcid($profile_uid, $zcid, 0, 5, true); + } return replace_macros(get_markup_template('remote_friends_common.tpl'), array( '$desc' => sprintf( tt("%d contact in common", "%d contacts in common", $t), $t), diff --git a/include/conversation.php b/include/conversation.php index 93c42cd7b..64204c696 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1,13 +1,15 @@ $new_body, 'images' => $saved_image); }} -if(! function_exists('item_redir_and_replace_images')) { +if (! function_exists('item_redir_and_replace_images')) { function item_redir_and_replace_images($body, $images, $cid) { $origbody = $body; @@ -57,7 +61,7 @@ function item_redir_and_replace_images($body, $images, $cid) { $cnt = 1; $pos = get_bb_tag_pos($origbody, 'url', 1); - while($pos !== false && $cnt < 1000) { + while ($pos !== false && $cnt < 1000) { $search = '/\[url\=(.*?)\]\[!#saved_image([0-9]*)#!\]\[\/url\]' . '/is'; $replace = '[url=' . z_path() . '/redir/' . $cid @@ -66,8 +70,9 @@ function item_redir_and_replace_images($body, $images, $cid) { $newbody .= substr($origbody, 0, $pos['start']['open']); $subject = substr($origbody, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']); $origbody = substr($origbody, $pos['end']['close']); - if($origbody === false) + if ($origbody === false) { $origbody = ''; + } $subject = preg_replace($search, $replace, $subject); $newbody .= $subject; @@ -79,45 +84,51 @@ function item_redir_and_replace_images($body, $images, $cid) { $cnt = 0; foreach ($images as $image) { - // We're depending on the property of 'foreach' (specified on the PHP website) that - // it loops over the array starting from the first element and going sequentially - // to the last element + /* + * We're depending on the property of 'foreach' (specified on the PHP website) that + * it loops over the array starting from the first element and going sequentially + * to the last element. + */ $newbody = str_replace('[!#saved_image' . $cnt . '#!]', '[img]' . $image . '[/img]', $newbody); $cnt++; } return $newbody; }} - - /** * Render actions localized */ -function localize_item(&$item){ +function localize_item(&$item) { $extracted = item_extract_images($item['body']); - if($extracted['images']) + if ($extracted['images']) { $item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']); + } - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - if (activity_match($item['verb'],ACTIVITY_LIKE) - || activity_match($item['verb'],ACTIVITY_DISLIKE) - || activity_match($item['verb'],ACTIVITY_ATTEND) - || activity_match($item['verb'],ACTIVITY_ATTENDNO) - || activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)){ + /// @Separted ??? + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; + if (activity_match($item['verb'], ACTIVITY_LIKE) + || activity_match($item['verb'], ACTIVITY_DISLIKE) + || activity_match($item['verb'], ACTIVITY_ATTEND) + || activity_match($item['verb'], ACTIVITY_ATTENDNO) + || activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) { - $r = q("SELECT * from `item`,`contact` WHERE - `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", - dbesc($item['parent-uri'])); - if (!dbm::is_result($r)) return; - $obj=$r[0]; + /// @TODO may hurt performance + $r = q("SELECT * FROM `item`, `contact` + WHERE `item`.`contact-id`=`contact`.`id` + AND `item`.`uri`='%s'", + dbesc($item['parent-uri'])); + if (!dbm::is_result($r)) { + return; + } + $obj = $r[0]; $author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; $objauthor = '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]'; - switch($obj['verb']){ + switch ($obj['verb']) { case ACTIVITY_POST: - switch ($obj['object-type']){ + switch ($obj['object-type']) { case ACTIVITY_OBJ_EVENT: $post_type = t('event'); break; @@ -126,9 +137,10 @@ function localize_item(&$item){ } break; default: - if($obj['resource-id']){ + if ($obj['resource-id']) { $post_type = t('photo'); - $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); + $m = array(); + preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); $rr['plink'] = $m[1]; } else { $post_type = t('status'); @@ -137,25 +149,25 @@ function localize_item(&$item){ $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; - if(activity_match($item['verb'],ACTIVITY_LIKE)) { + if (activity_match($item['verb'], ACTIVITY_LIKE)) { $bodyverb = t('%1$s likes %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_DISLIKE)) { + elseif (activity_match($item['verb'], ACTIVITY_DISLIKE)) { $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTEND)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTEND)) { $bodyverb = t('%1$s attends %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTENDNO)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTENDNO)) { $bodyverb = t('%1$s doesn\'t attend %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) { $bodyverb = t('%1$s attends maybe %2$s\'s %3$s'); } $item['body'] = sprintf($bodyverb, $author, $objauthor, $plink); } - if (activity_match($item['verb'],ACTIVITY_FRIEND)) { + if (activity_match($item['verb'], ACTIVITY_FRIEND)) { if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return; @@ -169,57 +181,65 @@ function localize_item(&$item){ $Bname = $obj->title; $Blink = ""; $Bphoto = ""; - foreach ($links->link as $l){ + foreach ($links->link as $l) { $atts = $l->attributes(); - switch($atts['rel']){ + switch ($atts['rel']) { case "alternate": $Blink = $atts['href']; case "photo": $Bphoto = $atts['href']; } - } $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; - if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]'; + if ($Bphoto != "") { + $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]'; + } $item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto; } - if (stristr($item['verb'],ACTIVITY_POKE)) { + if (stristr($item['verb'], ACTIVITY_POKE)) { $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); - if(! $verb) + if (! $verb) { return; - if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return; + } + if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) { + return; + } $Aname = $item['author-name']; $Alink = $item['author-link']; - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; $obj = parse_xml_string($xmlhead.$item['object']); $links = parse_xml_string($xmlhead."".unxmlify($obj->link).""); $Bname = $obj->title; - $Blink = ""; $Bphoto = ""; - foreach ($links->link as $l){ + $Blink = ""; + $Bphoto = ""; + foreach ($links->link as $l) { $atts = $l->attributes(); - switch($atts['rel']){ + switch ($atts['rel']) { case "alternate": $Blink = $atts['href']; case "photo": $Bphoto = $atts['href']; } - } $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; - if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]'; + if ($Bphoto != "") { + $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]'; + } - // we can't have a translation string with three positions but no distinguishable text - // So here is the translate string. + /* + * we can't have a translation string with three positions but no distinguishable text + * So here is the translate string. + */ $txt = t('%1$s poked %2$s'); // now translate the verb - $poked_t = trim(sprintf($txt, "","")); + $poked_t = trim(sprintf($txt, "", "")); $txt = str_replace( $poked_t, t($verb), $txt); // then do the sprintf on the translation string @@ -227,10 +247,11 @@ function localize_item(&$item){ $item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto; } - if (stristr($item['verb'],ACTIVITY_MOOD)) { - $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); - if(! $verb) + if (stristr($item['verb'], ACTIVITY_MOOD)) { + $verb = urldecode(substr($item['verb'], strpos($item['verb'], '#') + 1)); + if (! $verb) { return; + } $Aname = $item['author-name']; $Alink = $item['author-link']; @@ -241,19 +262,25 @@ function localize_item(&$item){ $item['body'] = sprintf($txt, $A, t($verb)); } - if (activity_match($item['verb'],ACTIVITY_TAG)) { - $r = q("SELECT * from `item`,`contact` WHERE - `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", - dbesc($item['parent-uri'])); - if (!dbm::is_result($r)) return; - $obj=$r[0]; + if (activity_match($item['verb'], ACTIVITY_TAG)) { + /// @TODO may hurt performance "joining" two tables + asterisk + $r = q("SELECT * FROM `item`, `contact` + WHERE `item`.`contact-id`=`contact`.`id` + AND `item`.`uri`='%s'", + dbesc($item['parent-uri'])); + + if (!dbm::is_result($r)) { + return; + } + + $obj = $r[0]; $author = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]'; $objauthor = '[url=' . zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]'; - switch($obj['verb']){ + switch ($obj['verb']) { case ACTIVITY_POST: - switch ($obj['object-type']){ + switch ($obj['object-type']) { case ACTIVITY_OBJ_EVENT: $post_type = t('event'); break; @@ -262,13 +289,15 @@ function localize_item(&$item){ } break; default: - if($obj['resource-id']){ + if ($obj['resource-id']) { $post_type = t('photo'); $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); $rr['plink'] = $m[1]; } else { $post_type = t('status'); } + // Let's break everthing ... ;-) + break; } $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; @@ -278,22 +307,24 @@ function localize_item(&$item){ $item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag ); } - if (activity_match($item['verb'],ACTIVITY_FAVORITE)){ + if (activity_match($item['verb'], ACTIVITY_FAVORITE)) { - if ($item['object-type']== "") + if ($item['object-type'] == "") { return; + } $Aname = $item['author-name']; $Alink = $item['author-link']; - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; $obj = parse_xml_string($xmlhead.$item['object']); - if(strlen($obj->id)) { - $r = q("select * from item where uri = '%s' and uid = %d limit 1", + if (strlen($obj->id)) { + $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($obj->id), intval($item['uid']) ); + if (dbm::is_result($r) && $r[0]['plink']) { $target = $r[0]; $Bname = $target['author-name']; @@ -302,21 +333,21 @@ function localize_item(&$item){ $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; $P = '[url=' . $target['plink'] . ']' . t('post/item') . '[/url]'; $item['body'] = sprintf( t('%1$s marked %2$s\'s %3$s as favorite'), $A, $B, $P)."\n"; - } } } $matches = null; - if(preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) { - foreach($matches as $mtch) { - if(! strpos($mtch[1],'zrl=')) - $item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']); + if (preg_match_all('/@\[url=(.*?)\]/is', $item['body'], $matches, PREG_SET_ORDER)) { + foreach ($matches as $mtch) { + if (! strpos($mtch[1], 'zrl=')) { + $item['body'] = str_replace($mtch[0], '@[url=' . zrl($mtch[1]) . ']', $item['body']); + } } } // add zrl's to public images $photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is"; - if(preg_match($photo_pattern,$item['body'])) { + if (preg_match($photo_pattern, $item['body'])) { $photo_replace = '[url=' . zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5' . '[/img][/url]'; $item['body'] = bb_tag_preg_replace($photo_pattern, $photo_replace, 'url', $item['body']); } @@ -326,27 +357,26 @@ function localize_item(&$item){ $x = stristr($item['plink'],'/display/'); if ($x) { $sparkle = false; - $y = best_link_url($item,$sparkle,true); + $y = best_link_url($item, $sparkle, true); - if (strstr($y,'/redir/')) { + if (strstr($y, '/redir/')) { $item['plink'] = $y . '?f=&url=' . $item['plink']; } } - - - } /** * Count the total of comments on this item and its desendants + * @TODO proper type-hint + doc-tag */ function count_descendants($item) { $total = count($item['children']); - if($total > 0) { - foreach($item['children'] as $child) { - if(! visible_activity($child)) + if ($total > 0) { + foreach ($item['children'] as $child) { + if (! visible_activity($child)) { $total --; + } $total += count_descendants($child); } } @@ -356,18 +386,19 @@ function count_descendants($item) { function visible_activity($item) { - // likes (etc.) can apply to other things besides posts. Check if they are post children, - // in which case we handle them specially - + /* + * likes (etc.) can apply to other things besides posts. Check if they are post children, + * in which case we handle them specially + */ $hidden_activities = array(ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE); - foreach($hidden_activities as $act) { - if(activity_match($item['verb'],$act)) { + foreach ($hidden_activities as $act) { + if (activity_match($item['verb'], $act)) { return false; } } - if(activity_match($item['verb'],ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) { - if(! (($item['self']) && ($item['uid'] == local_user()))) { + if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) { + if (! (($item['self']) && ($item['uid'] == local_user()))) { return false; } } @@ -379,9 +410,8 @@ function visible_activity($item) { * @brief SQL query for items */ function item_query() { - - return "SELECT ".item_fieldlists()." FROM `item` ". - item_joins()." WHERE ".item_condition(); + return "SELECT " . item_fieldlists() . " FROM `item` " . + item_joins() . " WHERE " . item_condition(); } /** @@ -439,7 +469,6 @@ These Fields are not added below (yet). They are here to for bug search. * @brief SQL join for contacts that are needed for displaying items */ function item_joins() { - return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`) LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` @@ -450,10 +479,10 @@ function item_joins() { * @brief SQL condition for items that are needed for displaying items */ function item_condition() { - return "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`"; } +if (!function_exists('conversation')) { /** * "Render" a conversation or list of items for HTML display. * There are two major forms of display: @@ -464,13 +493,11 @@ function item_condition() { * that are based on unique features of the calling module. * */ - -if(!function_exists('conversation')) { function conversation(App $a, $items, $mode, $update, $preview = false) { - require_once('include/bbcode.php'); - require_once('include/Contact.php'); - require_once('mod/proxy.php'); + require_once 'include/bbcode.php'; + require_once 'include/Contact.php'; + require_once 'mod/proxy.php'; $ssl_state = ((local_user()) ? true : false); @@ -480,100 +507,100 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $arr_blocked = null; - if(local_user()) { - $str_blocked = get_pconfig(local_user(),'system','blocked'); - if($str_blocked) { - $arr_blocked = explode(',',$str_blocked); - for($x = 0; $x < count($arr_blocked); $x ++) + if (local_user()) { + $str_blocked = get_pconfig(local_user(), 'system', 'blocked'); + if ($str_blocked) { + $arr_blocked = explode(',', $str_blocked); + for ($x = 0; $x < count($arr_blocked); $x ++) { $arr_blocked[$x] = trim($arr_blocked[$x]); + } } } $previewing = (($preview) ? ' preview ' : ''); - if($mode === 'network') { + if ($mode === 'network') { $profile_owner = local_user(); $page_writeable = true; - if(!$update) { - // The special div is needed for liveUpdate to kick in for this page. - // We only launch liveUpdate if you aren't filtering in some incompatible - // way and also you aren't writing a comment (discovered in javascript). - + if (!$update) { + /* + * The special div is needed for liveUpdate to kick in for this page. + * We only launch liveUpdate if you aren't filtering in some incompatible + * way and also you aren't writing a comment (discovered in javascript). + */ $live_update_div = '' . "\r\n" . "\r\n"; } - } - else if($mode === 'profile') { + } elseif ($mode === 'profile') { $profile_owner = $a->profile['profile_uid']; $page_writeable = can_write_wall($a,$profile_owner); - if(!$update) { + if (!$update) { $tab = notags(trim($_GET['tab'])); $tab = ( $tab ? $tab : 'posts' ); - if($tab === 'posts') { - // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, - // because browser prefetching might change it on us. We have to deliver it with the page. + if ($tab === 'posts') { + /* + * This is ugly, but we can't pass the profile_uid through the session to the ajax updater, + * because browser prefetching might change it on us. We have to deliver it with the page. + */ $live_update_div = '' . "\r\n" . "\r\n"; } } - } - else if($mode === 'notes') { + } elseif ($mode === 'notes') { $profile_owner = local_user(); $page_writeable = true; - if(!$update) { + if (!$update) { $live_update_div = '' . "\r\n" . "\r\n"; } - } - else if($mode === 'display') { + } elseif ($mode === 'display') { $profile_owner = $a->profile['uid']; $page_writeable = can_write_wall($a,$profile_owner); - if(!$update) { + if (!$update) { $live_update_div = '' . "\r\n" . ""; } - } - else if($mode === 'community') { + } elseif ($mode === 'community') { $profile_owner = 0; $page_writeable = false; - if(!$update) { + if (!$update) { $live_update_div = '' . "\r\n" . "\r\n"; } - } - else if($mode === 'search') { + } elseif ($mode === 'search') { $live_update_div = '' . "\r\n"; } $page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false); - if($update) + if ($update) { $return_url = $_SESSION['return_url']; - else + } else { $return_url = $_SESSION['return_url'] = $a->query_string; + } $cb = array('items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview); call_hooks('conversation_start',$cb); @@ -594,28 +621,32 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $page_template = get_markup_template("conversation.tpl"); - if($items && count($items)) { + if ($items && count($items)) { - if($mode === 'network-new' || $mode === 'search' || $mode === 'community') { + if ($mode === 'network-new' || $mode === 'search' || $mode === 'community') { - // "New Item View" on network page or search page results - // - just loop through the items and format them minimally for display + /* + * "New Item View" on network page or search page results + * - just loop through the items and format them minimally for display + */ -// $tpl = get_markup_template('search_item.tpl'); + /// @TODO old lost code? + // $tpl = get_markup_template('search_item.tpl'); $tpl = 'search_item.tpl'; - foreach($items as $item) { + foreach ($items as $item) { - if($arr_blocked) { + if ($arr_blocked) { $blocked = false; - foreach($arr_blocked as $b) { - if($b && link_compare($item['author-link'],$b)) { + foreach ($arr_blocked as $b) { + if ($b && link_compare($item['author-link'], $b)) { $blocked = true; break; } } - if($blocked) + if ($blocked) { continue; + } } @@ -626,70 +657,76 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $owner_name = ''; $sparkle = ''; - if($mode === 'search' || $mode === 'community') { - if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) + if ($mode === 'search' || $mode === 'community') { + if (((activity_match($item['verb'], ACTIVITY_LIKE)) || (activity_match($item['verb'], ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent'])) continue; $nickname = $item['nickname']; - } - else + } else { $nickname = $a->user['nickname']; + } // prevent private email from leaking. - if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) - continue; + if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { + continue; + } - $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); - if($item['author-link'] && (! $item['author-name'])) + $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); + if ($item['author-link'] && (! $item['author-name'])) { $profile_name = $item['author-link']; + } - - - $tags=array(); + $tags = array(); $hashtags = array(); $mentions = array(); $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`", intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION)); - foreach($taglist as $tag) { + foreach ($taglist as $tag) { - if ($tag["url"] == "") - $tag["url"] = $searchpath.strtolower($tag["term"]); + if ($tag["url"] == "") { + $tag["url"] = $searchpath . strtolower($tag["term"]); + } if ($tag["type"] == TERM_HASHTAG) { - $hashtags[] = "#".$tag["term"].""; + $hashtags[] = "#" . $tag["term"] . ""; $prefix = "#"; } elseif ($tag["type"] == TERM_MENTION) { - $mentions[] = "@".$tag["term"].""; + $mentions[] = "@" . $tag["term"] . ""; $prefix = "@"; } - $tags[] = $prefix."".$tag["term"].""; + $tags[] = $prefix."" . $tag["term"] . ""; } $sp = false; $profile_link = best_link_url($item,$sp); - if($profile_link === 'mailbox') + if ($profile_link === 'mailbox') { $profile_link = ''; - if($sp) - $sparkle = ' sparkle'; - else - $profile_link = zrl($profile_link); + } - if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) { + if ($sp) { + $sparkle = ' sparkle'; + } else { + $profile_link = zrl($profile_link); + } + + if (!x($item, 'author-thumb') OR ($item['author-thumb'] == "")) { $author_contact = get_contact_details_by_url($item['author-link'], $profile_owner); - if ($author_contact["thumb"]) + if ($author_contact["thumb"]) { $item['author-thumb'] = $author_contact["thumb"]; - else + } else { $item['author-thumb'] = $item['author-avatar']; + } } if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) { $owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner); - if ($owner_contact["thumb"]) + if ($owner_contact["thumb"]) { $item['owner-thumb'] = $owner_contact["thumb"]; - else + } else { $item['owner-thumb'] = $item['owner-avatar']; + } } $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); @@ -698,11 +735,11 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate)); localize_item($item); - if($mode === 'network-new') + if ($mode === 'network-new') { $dropping = true; - else + } else { $dropping = false; - + } $drop = array( 'dropping' => $dropping, @@ -718,12 +755,11 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $likebuttons = false; $shareable = false; - $body = prepare_body($item,true, $preview); - + $body = prepare_body($item, true, $preview); list($categories, $folders) = get_cats_and_terms($item); - if($a->theme['template_engine'] === 'internal') { + if ($a->theme['template_engine'] === 'internal') { $profile_name_e = template_escape($profile_name); $item['title_e'] = template_escape($item['title']); $body_e = template_escape($body); @@ -732,8 +768,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $mentions_e = template_escape($mentions); $location_e = template_escape($location); $owner_name_e = template_escape($owner_name); - } - else { + } else { $profile_name_e = $profile_name; $item['title_e'] = $item['title']; $body_e = $body; @@ -744,8 +779,9 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $owner_name_e = $owner_name; } - if ($item['item_network'] == "") + if ($item['item_network'] == "") { $item['item_network'] = $item['network']; + } $tmp_item = array( 'template' => $tpl, @@ -802,47 +838,45 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $threads[$threadsid]['items'] = array($arr['output']); } - } - else - { + } else { // Normal View $page_template = get_markup_template("threaded_conversation.tpl"); - require_once('object/Conversation.php'); - require_once('object/Item.php'); + require_once 'object/Conversation.php'; + require_once 'object/Item.php'; $conv = new Conversation($mode, $preview); - // get all the topmost parents - // this shouldn't be needed, as we should have only them in our array - // But for now, this array respects the old style, just in case - + /* + * get all the topmost parents + * this shouldn't be needed, as we should have only them in our array + * But for now, this array respects the old style, just in case + */ $threads = array(); - foreach($items as $item) { + foreach ($items as $item) { - if($arr_blocked) { + if ($arr_blocked) { $blocked = false; - foreach($arr_blocked as $b) { - - if($b && link_compare($item['author-link'],$b)) { + foreach ($arr_blocked as $b) { + if ($b && link_compare($item['author-link'], $b)) { $blocked = true; break; } } - if($blocked) + if ($blocked) { continue; + } } - - // Can we put this after the visibility check? builtin_activity_puller($item, $conv_responses); // Only add what is visible - if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { + if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { continue; } - if(! visible_activity($item)) { + + if (! visible_activity($item)) { continue; } @@ -850,7 +884,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $item['pagedrop'] = $page_dropping; - if($item['id'] == $item['parent']) { + if ($item['id'] == $item['parent']) { $item_object = new Item($item); $conv->add_thread($item_object); } @@ -858,7 +892,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $threads = $conv->get_template_data($conv_responses); - if(!$threads) { + if (!$threads) { logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG); $threads = array(); } @@ -873,13 +907,13 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { '$mode' => $mode, '$user' => $a->user, '$threads' => $threads, - '$dropping' => ($page_dropping && feature_enabled(local_user(),'multi_delete') ? t('Delete Selected Items') : False), + '$dropping' => ($page_dropping && feature_enabled(local_user(), 'multi_delete') ? t('Delete Selected Items') : False), )); return $o; }} -function best_link_url($item,&$sparkle,$ssl_state = false) { +function best_link_url($item, &$sparkle, $ssl_state = false) { $best_url = ''; $sparkle = false; @@ -889,16 +923,17 @@ function best_link_url($item,&$sparkle,$ssl_state = false) { if (local_user()) { $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' AND NOT `pending` LIMIT 1", dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url))); - if ($r) { - $best_url = 'redir/'.$r[0]['id']; + if (dbm::is_result($r)) { + $best_url = 'redir/' . $r[0]['id']; $sparkle = true; } } - if(! $best_url) { - if(strlen($item['author-link'])) + if (! $best_url) { + if (strlen($item['author-link'])) { $best_url = $item['author-link']; - else + } else { $best_url = $item['url']; + } } return $best_url; @@ -906,11 +941,10 @@ function best_link_url($item,&$sparkle,$ssl_state = false) { if (! function_exists('item_photo_menu')) { -function item_photo_menu($item) -{ +function item_photo_menu($item) { $ssl_state = false; - if(local_user()) { + if (local_user()) { $ssl_state = true; } @@ -938,13 +972,13 @@ function item_photo_menu($item) $rel = 0; $r = q("SELECT `id`, `network`, `rel` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1", intval(local_user()), dbesc(normalise_link($item['author-link']))); - if ($r) { + if (dbm::is_result($r)) { $cid = $r[0]['id']; $network = $r[0]['network']; $rel = $r[0]['rel']; } - if($sparkle) { + if ($sparkle) { $status_link = $profile_link . '?url=status'; $photos_link = $profile_link . '?url=photos'; $profile_link = $profile_link . '?url=profile'; @@ -964,7 +998,7 @@ function item_photo_menu($item) } if (local_user()) { - $menu = Array( + $menu = array( t('Follow Thread') => $sub_link, t('View Status') => $status_link, t('View Profile') => $profile_link, @@ -1004,6 +1038,7 @@ function item_photo_menu($item) return $o; }} +if (! function_exists('builtin_activity_puller')) { /** * @brief Checks item to see if it is one of the builtin activities (like/dislike, event attendance, consensus items, etc.) * Increments the count of each matching activity and adds a link to the author as needed. @@ -1012,13 +1047,12 @@ function item_photo_menu($item) * @param array &$conv_responses (already created with builtin activity structure) * @return void */ -if(! function_exists('builtin_activity_puller')) { function builtin_activity_puller($item, &$conv_responses) { - foreach($conv_responses as $mode => $v) { + foreach ($conv_responses as $mode => $v) { $url = ''; $sparkle = ''; - switch($mode) { + switch ($mode) { case 'like': $verb = ACTIVITY_LIKE; break; @@ -1039,32 +1073,36 @@ function builtin_activity_puller($item, &$conv_responses) { break; } - if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { + if ((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { $url = $item['author-link']; - if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) { + if ((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'], $item['url']))) { $url = 'redir/' . $item['contact-id']; $sparkle = ' class="sparkle" '; - } - else + } else { $url = zrl($url); + } $url = '' . htmlentities($item['author-name']) . ''; - if(! $item['thr-parent']) + if (! $item['thr-parent']) { $item['thr-parent'] = $item['parent-uri']; + } - if(! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l'])) - && (is_array($conv_responses[$mode][$item['thr-parent'] . '-l'])))) + if (! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l'])) + && (is_array($conv_responses[$mode][$item['thr-parent'] . '-l'])))) { $conv_responses[$mode][$item['thr-parent'] . '-l'] = array(); + } // only list each unique author once - if(in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) + if (in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) { continue; + } - if(! isset($conv_responses[$mode][$item['thr-parent']])) + if (! isset($conv_responses[$mode][$item['thr-parent']])) { $conv_responses[$mode][$item['thr-parent']] = 1; - else + } else { $conv_responses[$mode][$item['thr-parent']] ++; + } if (public_contact() == $item['author-id']) { $conv_responses[$mode][$item['thr-parent'] . '-self'] = 1; @@ -1078,24 +1116,25 @@ function builtin_activity_puller($item, &$conv_responses) { } }} -// Format the vote text for a profile item -// $cnt = number of people who vote the item -// $arr = array of pre-linked names of likers/dislikers -// $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe' -// $id = item id -// returns formatted text - -if(! function_exists('format_like')) { -function format_like($cnt,$arr,$type,$id) { +if (! function_exists('format_like')) { +/** + * Format the vote text for a profile item + * @param int $cnt = number of people who vote the item + * @param array $arr = array of pre-linked names of likers/dislikers + * @param string $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe' + * @param int $id = item id + * @return formatted text + */ +function format_like($cnt, array $arr, $type, $id) { $o = ''; $expanded = ''; - if($cnt == 1) { + if ($cnt == 1) { $likers = $arr[0]; // Phrase if there is only one liker. In other cases it will be uses for the expanded // list which show all likers - switch($type) { + switch ($type) { case 'like' : $phrase = sprintf( t('%s likes this.'), $likers); break; @@ -1114,16 +1153,17 @@ function format_like($cnt,$arr,$type,$id) { } } - if($cnt > 1) { + if ($cnt > 1) { $total = count($arr); - if($total >= MAX_LIKERS) + if ($total >= MAX_LIKERS) { $arr = array_slice($arr, 0, MAX_LIKERS - 1); - if($total < MAX_LIKERS) { + } + if ($total < MAX_LIKERS) { $last = t('and') . ' ' . $arr[count($arr)-1]; $arr2 = array_slice($arr, 0, -1); $str = implode(', ', $arr2) . ' ' . $last; } - if($total >= MAX_LIKERS) { + if ($total >= MAX_LIKERS) { $str = implode(', ', $arr); $str .= sprintf( t(', and %d other people'), $total - MAX_LIKERS ); } @@ -1132,7 +1172,7 @@ function format_like($cnt,$arr,$type,$id) { $spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\""; - switch($type) { + switch ($type) { case 'like': $phrase = sprintf( t('%2$d people like this'), $spanatts, $cnt); $explikers = sprintf( t('%s like this.'), $likers); @@ -1169,11 +1209,10 @@ function format_like($cnt,$arr,$type,$id) { return $o; }} - -function status_editor($a,$x, $notes_cid = 0, $popup=false) { +function status_editor(App $a, $x, $notes_cid = 0, $popup = false) { $o = ''; - $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); + $geotag = (x($x, 'allow_location') ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); $tpl = get_markup_template('jot-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array( @@ -1211,24 +1250,27 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { // Private/public post links for the non-JS ACL form $private_post = 1; - if($_REQUEST['public']) + if (x($_REQUEST, 'public')) { $private_post = 0; + } $query_str = $a->query_string; - if(strpos($query_str, 'public=1') !== false) + if (strpos($query_str, 'public=1') !== false) { $query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str); + } - // I think $a->query_string may never have ? in it, but I could be wrong - // It looks like it's from the index.php?q=[etc] rewrite that the web - // server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61 - if(strpos($query_str, '?') === false) + /* + * I think $a->query_string may never have ? in it, but I could be wrong + * It looks like it's from the index.php?q=[etc] rewrite that the web + * server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61 + */ + if (strpos($query_str, '?') === false) { $public_post_link = '?public=1'; - else + } else { $public_post_link = '&public=1'; + } - - -// $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); + // $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); $tpl = get_markup_template("jot.tpl"); $o .= replace_macros($tpl,array( @@ -1252,7 +1294,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$title' => $x['title'], '$placeholdertitle' => t('Set title'), '$category' => $x['category'], - '$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''), + '$placeholdercategory' => (feature_enabled(local_user(), 'categories') ? t('Categories (comma-separated list)') : ''), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$shortpermset' => t('permissions'), @@ -1290,9 +1332,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { )); - if ($popup==true){ + if ($popup == true) { $o = ''.$o.''; - } return $o; @@ -1302,20 +1343,20 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { function get_item_children($arr, $parent) { $children = array(); $a = get_app(); - foreach($arr as $item) { - if($item['id'] != $item['parent']) { - if(get_config('system','thread_allow') && $a->theme_thread_allow) { + foreach ($arr as $item) { + if ($item['id'] != $item['parent']) { + if (get_config('system', 'thread_allow') && $a->theme_thread_allow) { // Fallback to parent-uri if thr-parent is not set $thr_parent = $item['thr-parent']; - if($thr_parent == '') + if ($thr_parent == '') { $thr_parent = $item['parent-uri']; + } - if($thr_parent == $parent['uri']) { + if ($thr_parent == $parent['uri']) { $item['children'] = get_item_children($arr, $item); $children[] = $item; } - } - else if($item['parent'] == $parent['id']) { + } elseif ($item['parent'] == $parent['id']) { $children[] = $item; } } @@ -1323,66 +1364,82 @@ function get_item_children($arr, $parent) { return $children; } +/// @TODO Add type-hint function sort_item_children($items) { $result = $items; - usort($result,'sort_thr_created_rev'); - foreach($result as $k => $i) { - if(count($result[$k]['children'])) { + usort($result, 'sort_thr_created_rev'); + foreach ($result as $k => $i) { + if (count($result[$k]['children'])) { $result[$k]['children'] = sort_item_children($result[$k]['children']); } } return $result; } +/// @TODO Add type-hint function add_children_to_list($children, &$arr) { - foreach($children as $y) { + foreach ($children as $y) { $arr[] = $y; - if(count($y['children'])) + if (count($y['children'])) { add_children_to_list($y['children'], $arr); + } } } -function conv_sort($arr,$order) { +/// @TODO Add type-hint +function conv_sort($arr, $order) { - if((!(is_array($arr) && count($arr)))) + if ((!(is_array($arr) && count($arr)))) { return array(); + } $parents = array(); $children = array(); $newarr = array(); - // This is a preparation for having two different items with the same uri in one thread - // This will otherwise lead to an endless loop. - foreach($arr as $x) - if (!isset($newarr[$x['uri']])) + /* + * This is a preparation for having two different items with the same uri in one thread + * This will otherwise lead to an endless loop. + */ + foreach ($arr as $x) { + if (!isset($newarr[$x['uri']])) { $newarr[$x['uri']] = $x; + } + } $arr = $newarr; - foreach($arr as $x) - if($x['id'] == $x['parent']) - $parents[] = $x; + foreach ($arr as $x) { + if ($x['id'] == $x['parent']) { + $parents[] = $x; + } + } - if(stristr($order,'created')) - usort($parents,'sort_thr_created'); - elseif(stristr($order,'commented')) - usort($parents,'sort_thr_commented'); + if (stristr($order, 'created')) { + usort($parents, 'sort_thr_created'); + } elseif (stristr($order, 'commented')) { + usort($parents, 'sort_thr_commented'); + } - if(count($parents)) - foreach($parents as $i=>$_x) + if (count($parents)) { + foreach ($parents as $i => $_x) { $parents[$i]['children'] = get_item_children($arr, $_x); + } + } - /*foreach($arr as $x) { - if($x['id'] != $x['parent']) { + /// @TODO Old-lost code? + /*foreach ($arr as $x) { + if ($x['id'] != $x['parent']) { $p = find_thread_parent_index($parents,$x); - if($p !== false) + if ($p !== false) $parents[$p]['children'][] = $x; } }*/ - if(count($parents)) { - foreach($parents as $k => $v) { - if(count($parents[$k]['children'])) { + if (count($parents)) { + foreach ($parents as $k => $v) { + if (count($parents[$k]['children'])) { $parents[$k]['children'] = sort_item_children($parents[$k]['children']); + /// @TODO Old-lost code? /*$y = $parents[$k]['children']; usort($y,'sort_thr_created_rev'); $parents[$k]['children'] = $y;*/ @@ -1391,92 +1448,103 @@ function conv_sort($arr,$order) { } $ret = array(); - if(count($parents)) { - foreach($parents as $x) { + if (count($parents)) { + foreach ($parents as $x) { $ret[] = $x; - if(count($x['children'])) + if (count($x['children'])) { add_children_to_list($x['children'], $ret); - /*foreach($x['children'] as $y) + /// @TODO Old-lost code? + /*foreach ($x['children'] as $y) $ret[] = $y;*/ + } } } return $ret; } - -function sort_thr_created($a,$b) { - return strcmp($b['created'],$a['created']); +/// @TODO Add type-hint +function sort_thr_created($a, $b) { + return strcmp($b['created'], $a['created']); } -function sort_thr_created_rev($a,$b) { - return strcmp($a['created'],$b['created']); +/// @TODO Add type-hint +function sort_thr_created_rev($a, $b) { + return strcmp($a['created'], $b['created']); } -function sort_thr_commented($a,$b) { - return strcmp($b['commented'],$a['commented']); +/// @TODO Add type-hint +function sort_thr_commented($a, $b) { + return strcmp($b['commented'], $a['commented']); } -function find_thread_parent_index($arr,$x) { - foreach($arr as $k => $v) - if($v['id'] == $x['parent']) +/// @TODO Add type-hint +function find_thread_parent_index($arr, $x) { + foreach ($arr as $k => $v) { + if ($v['id'] == $x['parent']) { return $k; + } + } return false; } +/// @TODO Add type-hint function render_location_dummy($item) { - if ($item['location'] != "") + if ($item['location'] != "") { return $item['location']; + } - if ($item['coord'] != "") + if ($item['coord'] != "") { return $item['coord']; + } } -function get_responses($conv_responses,$response_verbs,$ob,$item) { +/// @TODO Add type-hint +function get_responses($conv_responses, $response_verbs, $ob, $item) { $ret = array(); - foreach($response_verbs as $v) { + foreach ($response_verbs as $v) { $ret[$v] = array(); - $ret[$v]['count'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri']] : ''); - $ret[$v]['list'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : ''); - $ret[$v]['self'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0'); - if(count($ret[$v]['list']) > MAX_LIKERS) { + $ret[$v]['count'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri']] : ''); + $ret[$v]['list'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : ''); + $ret[$v]['self'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0'); + if (count($ret[$v]['list']) > MAX_LIKERS) { $ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS); array_push($ret[$v]['list_part'], '' . t('View all') . ''); - } - else { + } else { $ret[$v]['list_part'] = ''; } - $ret[$v]['button'] = get_response_button_text($v,$ret[$v]['count']); + $ret[$v]['button'] = get_response_button_text($v, $ret[$v]['count']); $ret[$v]['title'] = $conv_responses[$v]['title']; } $count = 0; - foreach($ret as $key) { - if ($key['count'] == true) + foreach ($ret as $key) { + if ($key['count'] == true) { $count++; + } } $ret['count'] = $count; return $ret; } -function get_response_button_text($v,$count) { - switch($v) { +function get_response_button_text($v, $count) { + switch ($v) { case 'like': - return tt('Like','Likes',$count,'noun'); + return tt('Like', 'Likes', $count, 'noun'); break; case 'dislike': - return tt('Dislike','Dislikes',$count,'noun'); + return tt('Dislike', 'Dislikes', $count, 'noun'); break; case 'attendyes': - return tt('Attending','Attending',$count,'noun'); + return tt('Attending', 'Attending', $count, 'noun'); break; case 'attendno': - return tt('Not Attending','Not Attending',$count,'noun'); + return tt('Not Attending', 'Not Attending', $count, 'noun'); break; case 'attendmaybe': - return tt('Undecided','Undecided',$count,'noun'); + return tt('Undecided', 'Undecided', $count, 'noun'); break; } } diff --git a/include/cron.php b/include/cron.php index 58a3fcf9c..c4299dd4c 100644 --- a/include/cron.php +++ b/include/cron.php @@ -4,7 +4,7 @@ use \Friendica\Core\Config; function cron_run(&$argv, &$argc){ global $a; - require_once('include/datetime.php'); + require_once 'include/datetime.php'; // Poll contacts with specific parameters if ($argc > 1) { @@ -12,15 +12,16 @@ function cron_run(&$argv, &$argc){ return; } - $last = get_config('system','last_cron'); + $last = get_config('system', 'last_cron'); - $poll_interval = intval(get_config('system','cron_interval')); + $poll_interval = intval(get_config('system', 'cron_interval')); if (! $poll_interval) { $poll_interval = 10; } + if ($last) { $next = $last + ($poll_interval * 60); - if($next > time()) { + if ($next > time()) { logger('cron intervall not reached'); return; } @@ -62,10 +63,10 @@ function cron_run(&$argv, &$argc){ proc_run(PRIORITY_LOW, "include/cronjobs.php", "repair_database"); // once daily run birthday_updates and then expire in background - $d1 = get_config('system','last_expire_day'); - $d2 = intval(datetime_convert('UTC','UTC','now','d')); + $d1 = get_config('system', 'last_expire_day'); + $d2 = intval(datetime_convert('UTC', 'UTC', 'now', 'd')); - if($d2 != intval($d1)) { + if ($d2 != intval($d1)) { proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_contact_birthdays"); @@ -73,7 +74,7 @@ function cron_run(&$argv, &$argc){ proc_run(PRIORITY_LOW, "include/discover_poco.php", "suggestions"); - set_config('system','last_expire_day',$d2); + set_config('system', 'last_expire_day', $d2); proc_run(PRIORITY_LOW, 'include/expire.php'); @@ -87,7 +88,7 @@ function cron_run(&$argv, &$argc){ logger('cron: end'); - set_config('system','last_cron', time()); + set_config('system', 'last_cron', time()); return; } @@ -130,7 +131,7 @@ function cron_poll_contacts($argc, $argv) { // and which have a polling address and ignore Diaspora since // we are unable to match those posts with a Diaspora GUID and prevent duplicates. - $abandon_days = intval(get_config('system','account_abandon_days')); + $abandon_days = intval(get_config('system', 'account_abandon_days')); if ($abandon_days < 1) { $abandon_days = 0; } @@ -156,7 +157,7 @@ function cron_poll_contacts($argc, $argv) { dbesc(NETWORK_MAIL2) ); - if (!count($contacts)) { + if (!dbm::is_result($contacts)) { return; } @@ -170,7 +171,7 @@ function cron_poll_contacts($argc, $argv) { continue; } - foreach($res as $contact) { + foreach ($res as $contact) { $xml = false; @@ -183,49 +184,48 @@ function cron_poll_contacts($argc, $argv) { } if ($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) { - // We should be getting everything via a hub. But just to be sure, let's check once a day. - // (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately) - // This also lets us update our subscription to the hub, and add or replace hubs in case it - // changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. - - $poll_interval = get_config('system','pushpoll_frequency'); + /* + * We should be getting everything via a hub. But just to be sure, let's check once a day. + * (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately) + * This also lets us update our subscription to the hub, and add or replace hubs in case it + * changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. + */ + $poll_interval = get_config('system', 'pushpoll_frequency'); $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3); } - if($contact['priority'] AND !$force) { - - $update = false; + if ($contact['priority'] AND !$force) { + $update = false; $t = $contact['last-update']; - /** + /* * Based on $contact['priority'], should we poll this site now? Or later? */ - switch ($contact['priority']) { case 5: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 month")) { $update = true; } break; case 4: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 week")) { $update = true; } break; case 3: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day")) { $update = true; } break; case 2: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 12 hour")) { $update = true; } break; case 1: default: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 hour")) { $update = true; } break; @@ -235,7 +235,7 @@ function cron_poll_contacts($argc, $argv) { } } - logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]); + logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact["nick"] . " " . $contact["name"]); if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) { proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', intval($contact['id'])); diff --git a/include/cronhooks.php b/include/cronhooks.php index bea0f6a19..a519dee22 100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php @@ -2,43 +2,45 @@ use \Friendica\Core\Config; -function cronhooks_run(&$argv, &$argc){ +function cronhooks_run(&$argv, &$argc) { global $a; - require_once('include/datetime.php'); + require_once 'include/datetime.php'; if (($argc == 2) AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) { - foreach ($a->hooks["cron"] as $hook) + foreach ($a->hooks["cron"] as $hook) { if ($hook[1] == $argv[1]) { - logger("Calling cron hook '".$hook[1]."'", LOGGER_DEBUG); + logger("Calling cron hook '" . $hook[1] . "'", LOGGER_DEBUG); call_single_hook($a, $name, $hook, $data); } + } return; } $last = get_config('system', 'last_cronhook'); - $poll_interval = intval(get_config('system','cronhook_interval')); - if(! $poll_interval) + $poll_interval = intval(get_config('system', 'cronhook_interval')); + if (! $poll_interval) { $poll_interval = 9; + } - if($last) { + if ($last) { $next = $last + ($poll_interval * 60); - if($next > time()) { + if ($next > time()) { logger('cronhook intervall not reached'); return; } } - $a->set_baseurl(get_config('system','url')); + $a->set_baseurl(get_config('system', 'url')); logger('cronhooks: start'); $d = datetime_convert(); if (is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) { - foreach ($a->hooks["cron"] as $hook) { - logger("Calling cronhooks for '".$hook[1]."'", LOGGER_DEBUG); + foreach ($a->hooks["cron"] as $hook) { + logger("Calling cronhooks for '" . $hook[1] . "'", LOGGER_DEBUG); proc_run(PRIORITY_MEDIUM, "include/cronhooks.php", $hook[1]); } } diff --git a/include/datetime.php b/include/datetime.php index 9e1d4b55c..da454a32a 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -14,13 +14,20 @@ use \Friendica\Core\Config; * @return int */ function timezone_cmp($a, $b) { - if(strstr($a,'/') && strstr($b,'/')) { - if ( t($a) == t($b)) return 0; + if (strstr($a, '/') && strstr($b, '/')) { + if ( t($a) == t($b)) { + return 0; + } return ( t($a) < t($b)) ? -1 : 1; } - if(strstr($a,'/')) return -1; - if(strstr($b,'/')) return 1; - if ( t($a) == t($b)) return 0; + + if (strstr($a, '/')) { + return -1; + } elseif (strstr($b, '/')) { + return 1; + } elseif ( t($a) == t($b)) { + return 0; + } return ( t($a) < t($b)) ? -1 : 1; } @@ -39,23 +46,24 @@ function select_timezone($current = 'America/Los_Angeles') { usort($timezone_identifiers, 'timezone_cmp'); $continent = ''; - foreach($timezone_identifiers as $value) { + foreach ($timezone_identifiers as $value) { $ex = explode("/", $value); - if(count($ex) > 1) { - if($ex[0] != $continent) { - if($continent != '') + if (count($ex) > 1) { + if ($ex[0] != $continent) { + if ($continent != '') { $o .= ''; + } $continent = $ex[0]; $o .= ''; } - if(count($ex) > 2) + if (count($ex) > 2) { $city = substr($value,strpos($value,'/')+1); - else + } else { $city = $ex[1]; - } - else { + } + } else { $city = $ex[0]; - if($continent != t('Miscellaneous')) { + if ($continent != t('Miscellaneous')) { $o .= ''; $continent = t('Miscellaneous'); $o .= ''; @@ -114,48 +122,50 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d // Defaults to UTC if nothing is set, but throws an exception if set to empty string. // Provide some sane defaults regardless. - if($from === '') + if ($from === '') { $from = 'UTC'; - if($to === '') + } + if ($to === '') { $to = 'UTC'; - if( ($s === '') || (! is_string($s)) ) + } + if ( ($s === '') || (! is_string($s)) ) { $s = 'now'; + } - // Slight hackish adjustment so that 'zero' datetime actually returns what is intended - // otherwise we end up with -0001-11-30 ... - // add 32 days so that we at least get year 00, and then hack around the fact that - // months and days always start with 1. + /* + * Slight hackish adjustment so that 'zero' datetime actually returns what is intended + * otherwise we end up with -0001-11-30 ... + * add 32 days so that we at least get year 00, and then hack around the fact that + * months and days always start with 1. + */ - if(substr($s,0,10) == '0000-00-00') { + if (substr($s,0,10) <= '0001-01-01') { $d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC')); return str_replace('1','0',$d->format($fmt)); } try { $from_obj = new DateTimeZone($from); - } - catch(Exception $e) { + } catch (Exception $e) { $from_obj = new DateTimeZone('UTC'); } try { $d = new DateTime($s, $from_obj); - } - catch(Exception $e) { + } catch (Exception $e) { logger('datetime_convert: exception: ' . $e->getMessage()); $d = new DateTime('now', $from_obj); } try { $to_obj = new DateTimeZone($to); - } - catch(Exception $e) { + } catch (Exception $e) { $to_obj = new DateTimeZone('UTC'); } $d->setTimeZone($to_obj); - return($d->format($fmt)); + return $d->format($fmt); } @@ -169,12 +179,14 @@ function dob($dob) { list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d'); $f = get_config('system','birthday_input_format'); - if(! $f) + if (! $f) { $f = 'ymd'; - if($dob === '0000-00-00') + } + if ($dob <= '0001-01-01') { $value = ''; - else + } else { $value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d')); + } $age = ((intval($value)) ? age($value, $a->user["timezone"], $a->user["timezone"]) : ""); @@ -189,7 +201,8 @@ function dob($dob) { ) )); -// if ($dob && $dob != '0000-00-00') + /// @TODO Old-lost code? +// if ($dob && $dob > '0001-01-01') // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob'); // else // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),false,'dob'); @@ -214,7 +227,7 @@ function dob($dob) { * @return string Parsed HTML output. */ function datesel($format, $min, $max, $default, $id = 'datepicker') { - return datetimesel($format,$min,$max,$default,'',$id,true,false, '',''); + return datetimesel($format, $min, $max, $default, '', $id, true, false, '', ''); } /** @@ -231,8 +244,8 @@ function datesel($format, $min, $max, $default, $id = 'datepicker') { * * @return string Parsed HTML output. */ -function timesel($format, $h, $m, $id='timepicker') { - return datetimesel($format,new DateTime(),new DateTime(),new DateTime("$h:$m"),'',$id,false,true); +function timesel($format, $h, $m, $id = 'timepicker') { + return datetimesel($format, new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true); } /** @@ -267,7 +280,9 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke // First day of the week (0 = Sunday) $firstDay = get_pconfig(local_user(),'system','first_day_of_week'); - if ($firstDay === false) $firstDay=0; + if ($firstDay === false) { + $firstDay=0; + } $lang = substr(get_browser_language(), 0, 2); @@ -279,9 +294,15 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $o = ''; $dateformat = ''; - if($pickdate) $dateformat .= 'Y-m-d'; - if($pickdate && $picktime) $dateformat .= ' '; - if($picktime) $dateformat .= 'H:i'; + if ($pickdate) { + $dateformat .= 'Y-m-d'; + } + if ($pickdate && $picktime) { + $dateformat .= ' '; + } + if ($picktime) { + $dateformat .= 'H:i'; + } $minjs = $min ? ",minDate: new Date({$min->getTimestamp()}*1000), yearStart: " . $min->format('Y') : ''; $maxjs = $max ? ",maxDate: new Date({$max->getTimestamp()}*1000), yearEnd: " . $max->format('Y') : ''; @@ -290,15 +311,21 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $defaultdatejs = $default ? ",defaultDate: new Date({$default->getTimestamp()}*1000)" : ''; $pickers = ''; - if(!$pickdate) $pickers .= ',datepicker: false'; - if(!$picktime) $pickers .= ',timepicker: false'; + if (!$pickdate) { + $pickers .= ',datepicker: false'; + } + if (!$picktime) { + $pickers .= ',timepicker: false'; + } $extra_js = ''; $pickers .= ",dayOfWeekStart: ".$firstDay.",lang:'".$lang."'"; - if($minfrom != '') + if ($minfrom != '') { $extra_js .= "\$('#id_$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})"; - if($maxfrom != '') + } + if ($maxfrom != '') { $extra_js .= "\$('#id_$maxfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({maxDate: currentDateTime})}})"; + } $readable_format = $dateformat; $readable_format = str_replace('Y','yyyy',$readable_format); @@ -393,13 +420,16 @@ function relative_date($posted_date, $format = null) { * * @return int Age in years */ -function age($dob,$owner_tz = '',$viewer_tz = '') { - if(! intval($dob)) +function age($dob, $owner_tz = '', $viewer_tz = '') { + if (! intval($dob)) { return 0; - if(! $owner_tz) + } + if (! $owner_tz) { $owner_tz = date_default_timezone_get(); - if(! $viewer_tz) + } + if (! $viewer_tz) { $viewer_tz = date_default_timezone_get(); + } $birthdate = datetime_convert('UTC',$owner_tz,$dob . ' 00:00:00+00:00','Y-m-d'); list($year,$month,$day) = explode("-",$birthdate); @@ -407,8 +437,9 @@ function age($dob,$owner_tz = '',$viewer_tz = '') { $curr_month = datetime_convert('UTC',$viewer_tz,'now','m'); $curr_day = datetime_convert('UTC',$viewer_tz,'now','d'); - if(($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) + if (($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) { $year_diff--; + } return $year_diff; } @@ -430,11 +461,11 @@ function get_dim($y,$m) { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); - if($m != 2) + if ($m != 2) { return $dim[$m]; - - if(((($y % 4) == 0) && (($y % 100) != 0)) || (($y % 400) == 0)) + } elseif (((($y % 4) == 0) && (($y % 100) != 0)) || (($y % 400) == 0)) { return 29; + } return $dim[2]; } @@ -473,8 +504,6 @@ function get_first_dim($y,$m) { * @todo Provide (prev,next) links, define class variations for different size calendars */ function cal($y = 0,$m = 0, $links = false, $class='') { - - // month table - start at 1 to match human usage. $mtab = array(' ', @@ -486,10 +515,12 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); - if(! $y) + if (! $y) { $y = $thisyear; - if(! $m) + } + if (! $m) { $m = intval($thismonth); + } $dn = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'); $f = get_first_dim($y,$m); @@ -498,29 +529,33 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $dow = 0; $started = false; - if(($y == $thisyear) && ($m == $thismonth)) + if (($y == $thisyear) && ($m == $thismonth)) { $tddate = intval(datetime_convert('UTC',date_default_timezone_get(),'now','j')); + } $str_month = day_translate($mtab[$m]); $o = ''; $o .= "$str_month $y"; - for($a = 0; $a < 7; $a ++) + for ($a = 0; $a < 7; $a ++) { $o .= '' . mb_substr(day_translate($dn[$a]),0,3,'UTF-8') . ''; + } $o .= ''; - while($d <= $l) { - if(($dow == $f) && (! $started)) + while ($d <= $l) { + if (($dow == $f) && (! $started)) { $started = true; + } $today = (((isset($tddate)) && ($tddate == $d)) ? "class=\"today\" " : ''); $o .= ""; $day = str_replace(' ',' ',sprintf('%2.2d', $d)); - if($started) { - if(is_array($links) && isset($links[$d])) + if ($started) { + if (is_array($links) && isset($links[$d])) { $o .= "$day"; - else + } else { $o .= $day; + } $d ++; } else { @@ -529,14 +564,16 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $o .= ''; $dow ++; - if(($dow == 7) && ($d <= $l)) { + if (($dow == 7) && ($d <= $l)) { $dow = 0; $o .= ''; } } - if($dow) - for($a = $dow; $a < 7; $a ++) + if ($dow) { + for ($a = $dow; $a < 7; $a ++) { $o .= ' '; + } + } $o .= ''."\r\n"; @@ -553,7 +590,7 @@ function update_contact_birthdays() { // This only handles foreign or alien networks where a birthday has been provided. // In-network birthdays are handled within local_delivery - $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` != '0000-00-00' AND SUBSTRING(`bd`,1,4) != `bdyear` "); + $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`,1,4) != `bdyear` "); if (dbm::is_result($r)) { foreach ($r as $rr) { diff --git a/include/dba.php b/include/dba.php index 62728acae..5066dcd56 100644 --- a/include/dba.php +++ b/include/dba.php @@ -20,6 +20,7 @@ class dba { private $driver; public $connected = false; public $error = false; + private $_server_info = ''; function __construct($server, $user, $pass, $db, $install = false) { $a = get_app(); @@ -103,18 +104,20 @@ class dba { * @return string */ public function server_info() { - 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; + if ($this->_server_info == '') { + switch ($this->driver) { + case 'pdo': + $this->_server_info = $this->db->getAttribute(PDO::ATTR_SERVER_VERSION); + break; + case 'mysqli': + $this->_server_info = $this->db->server_info; + break; + case 'mysql': + $this->_server_info = mysql_get_server_info($this->db); + break; + } } - return $version; + return $this->_server_info; } /** @@ -474,6 +477,26 @@ class dba { } } } + + /** + * @brief Replaces ANY_VALUE() function by MIN() function, + * if the database server does not support ANY_VALUE(). + * + * Considerations for Standard SQL, or MySQL with ONLY_FULL_GROUP_BY (default since 5.7.5). + * ANY_VALUE() is available from MySQL 5.7.5 https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html + * A standard fall-back is to use MIN(). + * + * @param string $sql An SQL string without the values + * @return string The input SQL string modified if necessary. + */ + public function any_value_fallback($sql) { + $server_info = $this->server_info(); + if (version_compare($server_info, '5.7.5', '<') || + (stripos($server_info, 'MariaDB') !== false)) { + $sql = str_ireplace('ANY_VALUE(', 'MIN(', $sql); + } + return $sql; + } } function printable($s) { @@ -514,6 +537,7 @@ function q($sql) { unset($args[0]); if ($db && $db->connected) { + $sql = $db->any_value_fallback($sql); $stmt = @vsprintf($sql,$args); // Disabled warnings //logger("dba: q: $stmt", LOGGER_ALL); if ($stmt === false) @@ -550,6 +574,7 @@ function qu($sql) { unset($args[0]); if ($db && $db->connected) { + $sql = $db->any_value_fallback($sql); $stmt = @vsprintf($sql,$args); // Disabled warnings if ($stmt === false) logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG); diff --git a/include/dba_pdo.php b/include/dba_pdo.php index a44c447af..56692fbb3 100644 --- a/include/dba_pdo.php +++ b/include/dba_pdo.php @@ -34,7 +34,7 @@ $objDDDBLResultHandler->add('PDOStatement', array('HANDLER' => $cloPDOStatementR * */ -if(! class_exists('dba')) { +if (! class_exists('dba')) { class dba { private $debug = 0; @@ -66,9 +66,9 @@ class dba { return; } - if($install) { - if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { - if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { + 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->connected = false; $this->db = null; @@ -81,13 +81,13 @@ class dba { \DDDBL\connect(); $this->db = \DDDBL\getDB(); - if(\DDDBL\isConnected()) { + if (\DDDBL\isConnected()) { $this->connected = true; } - if(! $this->connected) { + if (! $this->connected) { $this->db = null; - if(! $install) + if (! $install) system_unavailable(); } @@ -109,11 +109,11 @@ class dba { $objPreparedQueryPool = new \DDDBL\DataObjectPool('Query-Definition'); # check if query do not exists till now, if so create its definition - if(!$objPreparedQueryPool->exists($strQueryAlias)) + if (!$objPreparedQueryPool->exists($strQueryAlias)) $objPreparedQueryPool->add($strQueryAlias, array('QUERY' => $sql, 'HANDLER' => $strHandler)); - if((! $this->db) || (! $this->connected)) + if ((! $this->db) || (! $this->connected)) return false; $this->error = ''; @@ -124,7 +124,7 @@ class dba { $r = \DDDBL\get($strQueryAlias); # bad workaround to emulate the bizzare behavior of mysql_query - if(in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) + if (in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) $result = true; $intErrorCode = false; @@ -138,7 +138,7 @@ class dba { $a->save_timestamp($stamp1, "database"); - if(x($a->config,'system') && x($a->config['system'],'db_log')) { + if (x($a->config,'system') && x($a->config['system'],'db_log')) { if (($duration > $a->config["system"]["db_loglimit"])) { $duration = round($duration, 3); $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); @@ -149,20 +149,20 @@ class dba { } } - if($intErrorCode) + if ($intErrorCode) $this->error = $intErrorCode; - if(strlen($this->error)) { + if (strlen($this->error)) { logger('dba: ' . $this->error); } - if($this->debug) { + if ($this->debug) { $mesg = ''; - if($result === false) + if ($result === false) $mesg = 'false'; - elseif($result === true) + elseif ($result === true) $mesg = 'true'; else { # this needs fixing, but is a bug itself @@ -182,13 +182,13 @@ class dba { * These usually indicate SQL syntax errors that need to be resolved. */ - if(isset($result) AND ($result === false)) { + if (isset($result) AND ($result === false)) { 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); } - if(isset($result) AND (($result === true) || ($result === false))) + if (isset($result) AND (($result === true) || ($result === false))) return $result; if ($onlyquery) { @@ -199,7 +199,7 @@ class dba { //$a->save_timestamp($stamp1, "database"); - if($this->debug) + if ($this->debug) logger('dba: ' . printable(print_r($r, true))); return($r); } @@ -223,7 +223,7 @@ class dba { } public function escape($str) { - if($this->db && $this->connected) { + if ($this->db && $this->connected) { $strQuoted = $this->db->quote($str); # this workaround is needed, because quote creates "'" and the beginning and the end # of the string, which is correct. but until now the queries set this delimiter manually, @@ -238,27 +238,27 @@ class dba { } }} -if(! function_exists('printable')) { +if (! function_exists('printable')) { function printable($s) { $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s); $s = str_replace("\x00",'.',$s); - if(x($_SERVER,'SERVER_NAME')) + if (x($_SERVER,'SERVER_NAME')) $s = escape_tags($s); return $s; }} // Procedural functions -if(! function_exists('dbg')) { +if (! function_exists('dbg')) { function dbg($state) { global $db; - if($db) + if ($db) $db->dbg($state); }} -if(! function_exists('dbesc')) { +if (! function_exists('dbesc')) { function dbesc($str) { global $db; - if($db && $db->connected) + if ($db && $db->connected) return($db->escape($str)); else return(str_replace("'","\\'",$str)); @@ -271,17 +271,17 @@ function dbesc($str) { // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", // 'user', 1); -if(! function_exists('q')) { +if (! function_exists('q')) { function q($sql) { global $db; $args = func_get_args(); unset($args[0]); - if($db && $db->connected) { + if ($db && $db->connected) { $stmt = @vsprintf($sql,$args); // Disabled warnings //logger("dba: q: $stmt", LOGGER_ALL); - if($stmt === false) + if ($stmt === false) logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG); return $db->q($stmt); } @@ -303,11 +303,11 @@ function q($sql) { * */ -if(! function_exists('dbq')) { +if (! function_exists('dbq')) { function dbq($sql) { global $db; - if($db && $db->connected) + if ($db && $db->connected) $ret = $db->q($sql); else $ret = false; @@ -321,21 +321,21 @@ function dbq($sql) { // cast to int to avoid trouble. -if(! function_exists('dbesc_array_cb')) { +if (! function_exists('dbesc_array_cb')) { function dbesc_array_cb(&$item, $key) { - if(is_string($item)) + if (is_string($item)) $item = dbesc($item); }} -if(! function_exists('dbesc_array')) { +if (! function_exists('dbesc_array')) { function dbesc_array(&$arr) { - if(is_array($arr) && count($arr)) { + if (is_array($arr) && count($arr)) { array_walk($arr,'dbesc_array_cb'); } }} -if(! function_exists('dba_timer')) { +if (! function_exists('dba_timer')) { function dba_timer() { return microtime(true); }} diff --git a/include/dbstructure.php b/include/dbstructure.php index 48cc02d2d..76f1bb000 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -78,8 +78,18 @@ function update_fail($update_id, $error_message){ function table_structure($table) { $structures = q("DESCRIBE `%s`", $table); + $full_columns = q("SHOW FULL COLUMNS FROM `%s`", $table); + $indexes = q("SHOW INDEX FROM `%s`", $table); + $table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table); + + if (dbm::is_result($table_status)) { + $table_status = $table_status[0]; + } else { + $table_status = array(); + } + $fielddata = array(); $indexdata = array(); @@ -104,7 +114,6 @@ function table_structure($table) { $indexdata[$index["Key_name"]][] = $column; } - if (dbm::is_result($structures)) { foreach ($structures AS $field) { $fielddata[$field["Field"]]["type"] = $field["Type"]; @@ -125,10 +134,16 @@ function table_structure($table) { } } } - return(array("fields"=>$fielddata, "indexes"=>$indexdata)); + if (dbm::is_result($full_columns)) { + foreach ($full_columns AS $column) { + $fielddata[$column["Field"]]["Collation"] = $column["Collation"]; + } + } + + return array("fields" => $fielddata, "indexes" => $indexdata, "table_status" => $table_status); } -function print_structure($database, $charset) { +function print_structure($database) { echo "-- ------------------------------------------\n"; echo "-- ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION." (".FRIENDICA_CODENAME,")\n"; echo "-- DB_UPDATE_VERSION ".DB_UPDATE_VERSION."\n"; @@ -137,24 +152,33 @@ function print_structure($database, $charset) { echo "--\n"; echo "-- TABLE $name\n"; echo "--\n"; - db_create_table($name, $structure['fields'], $charset, true, false, $structure["indexes"]); + db_create_table($name, $structure['fields'], true, false, $structure["indexes"]); echo "\n"; } } +/** + * @brief Print out database error messages + * + * @param object $db Database object + * @param string $message Message to be added to the error message + * + * @return string Error message + */ +function print_update_error($db, $message) { + echo sprintf(t("\nError %d occured during database update:\n%s\n"), + $db->errorno, $db->error); + + return t('Errors encountered performing database changes: ').$message.EOL; +} + function update_structure($verbose, $action, $tables=null, $definition=null) { global $a, $db; if ($action) { Config::set('system', 'maintenance', 1); - Config::set('system', 'maintenance_reason', 'Database update'); - } - - if (isset($a->config["system"]["db_charset"])) { - $charset = $a->config["system"]["db_charset"]; - } else { - $charset = "utf8"; + Config::set('system', 'maintenance_reason', sprintf(t(': Database update'), dbm::date().' '.date('e'))); } $errors = false; @@ -168,16 +192,18 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $tables = q("SHOW TABLES"); } - foreach ($tables AS $table) { - $table = current($table); + if (dbm::is_result($tables)) { + foreach ($tables AS $table) { + $table = current($table); - logger(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG); - $database[$table] = table_structure($table); + logger(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG); + $database[$table] = table_structure($table); + } } // Get the definition if (is_null($definition)) { - $definition = db_definition($charset); + $definition = db_definition(); } // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements @@ -194,9 +220,9 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $group_by = ""; $sql3 = ""; if (!isset($database[$name])) { - $r = db_create_table($name, $structure["fields"], $charset, $verbose, $action, $structure['indexes']); + $r = db_create_table($name, $structure["fields"], $verbose, $action, $structure['indexes']); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered creating database tables.').$name.EOL; + $errors .= print_update_error($db, $name); } $is_new_table = True; } else { @@ -252,17 +278,24 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { } } else { // Compare the field definition - $current_field_definition = implode(",",$database[$name]["fields"][$fieldname]); - $new_field_definition = implode(",",$parameters); + $field_definition = $database[$name]["fields"][$fieldname]; + + // We change the collation after the indexes had been changed. + // This is done to avoid index length problems. + // So here we always ensure that there is no need to change it. + unset($parameters['Collation']); + unset($field_definition['Collation']); + + $current_field_definition = implode(",", $field_definition); + $new_field_definition = implode(",", $parameters); if ($current_field_definition != $new_field_definition) { - $sql2=db_modify_table_field($fieldname, $parameters); + $sql2 = db_modify_table_field($fieldname, $parameters); if ($sql3 == "") { $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; } else { $sql3 .= ", ".$sql2; } } - } } } @@ -288,16 +321,59 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $group_by = db_group_by($indexname, $fieldnames); } if ($sql2 != "") { - if ($sql3 == "") + if ($sql3 == "") { $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; - else + } else { $sql3 .= ", ".$sql2; + } + } + } + } + + if (isset($database[$name]["table_status"]["Collation"])) { + if ($database[$name]["table_status"]["Collation"] != 'utf8mb4_general_ci') { + $sql2 = "DEFAULT COLLATE utf8mb4_general_ci"; + + if ($sql3 == "") { + $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; + } else { + $sql3 .= ", ".$sql2; + } + } + } + + if ($sql3 != "") { + $sql3 .= "; "; + } + + // Now have a look at the field collations + // Compare the field structure field by field + foreach ($structure["fields"] AS $fieldname => $parameters) { + // Compare the field definition + $field_definition = $database[$name]["fields"][$fieldname]; + + // Define the default collation if not given + if (!isset($parameters['Collation']) AND !is_null($field_definition['Collation'])) { + $parameters['Collation'] = 'utf8mb4_general_ci'; + } else { + $parameters['Collation'] = null; + } + + if ($field_definition['Collation'] != $parameters['Collation']) { + $sql2 = db_modify_table_field($fieldname, $parameters); + if (($sql3 == "") OR (substr($sql3, -2, 2) == "; ")) { + $sql3 .= "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; + } else { + $sql3 .= ", ".$sql2; } } } } + if ($sql3 != "") { - $sql3 .= ";"; + if (substr($sql3, -2, 2) != "; ") { + $sql3 .= ";"; + } if ($verbose) { // Ensure index conversion to unique removes duplicates @@ -323,6 +399,8 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { } if ($action) { + Config::set('system', 'maintenance_reason', sprintf(t('%s: updating %s table.'), dbm::date().' '.date('e'), $name)); + // Ensure index conversion to unique removes duplicates if ($is_unique) { if ($ignore != "") { @@ -330,33 +408,33 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { } else { $r = $db->q("CREATE TABLE `".$temp_name."` LIKE `".$name."`;"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } } } $r = @$db->q($sql3); - if (!dbm::is_result($r)) - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; - + if (!dbm::is_result($r)) { + $errors .= print_update_error($db, $sql3); + } if ($is_unique) { if ($ignore != "") { $db->q("SET session old_alter_table=0;"); } else { $r = $db->q("INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } $r = $db->q("DROP TABLE `".$name."`;"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } $r = $db->q("RENAME TABLE `".$temp_name."` TO `".$name."`;"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } } @@ -376,6 +454,10 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { function db_field_command($parameters, $create = true) { $fieldstruct = $parameters["type"]; + if (!is_null($parameters["Collation"])) { + $fieldstruct .= " COLLATE ".$parameters["Collation"]; + } + if ($parameters["not null"]) $fieldstruct .= " NOT NULL"; @@ -395,7 +477,7 @@ function db_field_command($parameters, $create = true) { return($fieldstruct); } -function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=null) { +function db_create_table($name, $fields, $verbose, $action, $indexes=null) { global $a, $db; $r = true; @@ -404,7 +486,7 @@ function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=n $sql_rows = array(); $primary_keys = array(); - foreach($fields AS $fieldname => $field) { + foreach ($fields AS $fieldname => $field) { $sql_rows[] = "`".dbesc($fieldname)."` ".db_field_command($field); if (x($field,'primary') and $field['primary']!=''){ $primary_keys[] = $fieldname; @@ -420,7 +502,7 @@ function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=n $sql = implode(",\n\t", $sql_rows); - $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=".$charset; + $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT COLLATE utf8mb4_general_ci"; if ($verbose) echo $sql.";\n"; @@ -503,18 +585,7 @@ function db_group_by($indexname, $fieldnames) { return $sql; } -function db_index_suffix($charset, $reduce = 0) { - if ($charset != "utf8mb4") { - return ""; - } - - // On utf8mb4 indexes can only have a length of 191 - $indexlength = 191 - $reduce; - - return "(".$indexlength.")"; -} - -function db_definition($charset) { +function db_definition() { $database = array(); @@ -671,7 +742,7 @@ function db_definition($charset) { "writable" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "forum" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "prv" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), - "contact-type" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"), + "contact-type" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "hidden" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "archive" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "pending" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"), @@ -681,7 +752,7 @@ function db_definition($charset) { "info" => array("type" => "mediumtext"), "profile-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "bdyear" => array("type" => "varchar(4)", "not null" => "1", "default" => ""), - "bd" => array("type" => "date", "not null" => "1", "default" => "0000-00-00"), + "bd" => array("type" => "date", "not null" => "1", "default" => "0001-01-01"), "notify_new_posts" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "fetch_further_information" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "ffi_keyword_blacklist" => array("type" => "text"), @@ -840,7 +911,7 @@ function db_definition($charset) { "about" => array("type" => "text"), "keywords" => array("type" => "text"), "gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""), - "birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"), + "birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0001-01-01"), "community" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "contact-type" => array("type" => "tinyint(1)", "not null" => "1", "default" => "-1"), "hide" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), @@ -1304,7 +1375,7 @@ function db_definition($charset) { "hide-friends" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "pdesc" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "dob" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"), + "dob" => array("type" => "varchar(32)", "not null" => "1", "default" => "0001-01-01"), "address" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "locality" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "region" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), @@ -1621,11 +1692,11 @@ function db_definition($charset) { function dbstructure_run(&$argv, &$argc) { global $a, $db; - if(is_null($a)){ + if (is_null($a)){ $a = new App; } - if(is_null($db)) { + if (is_null($db)) { @include(".htconfig.php"); require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); @@ -1650,7 +1721,7 @@ function dbstructure_run(&$argv, &$argc) { $current = intval(DB_UPDATE_VERSION); // run any left update_nnnn functions in update.php - for($x = $stored; $x < $current; $x ++) { + for ($x = $stored; $x < $current; $x ++) { $r = run_update_function($x); if (!$r) break; } @@ -1658,9 +1729,7 @@ function dbstructure_run(&$argv, &$argc) { set_config('system','build',DB_UPDATE_VERSION); return; case "dumpsql": - // For the dump that is used to create the database.sql we always assume utfmb4 - $charset = "utf8mb4"; - print_structure(db_definition($charset), $charset); + print_structure(db_definition()); return; } } diff --git a/include/dfrn.php b/include/dfrn.php index aae935963..a4651c6c8 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -554,8 +554,9 @@ class dfrn { xml::add_element($doc, $author, "poco:displayName", $profile["name"]); xml::add_element($doc, $author, "poco:updated", $namdate); - if (trim($profile["dob"]) != "0000-00-00") + if (trim($profile["dob"]) > '0001-01-01') { xml::add_element($doc, $author, "poco:birthday", "0000-".date("m-d", strtotime($profile["dob"]))); + } xml::add_element($doc, $author, "poco:note", $profile["about"]); xml::add_element($doc, $author, "poco:preferredUsername", $profile["nickname"]); @@ -867,7 +868,7 @@ class dfrn { // The signed text contains the content in Markdown, the sender handle and the signatur for the content // It is needed for relayed comments to Diaspora. - if($item['signed_text']) { + if ($item['signed_text']) { $sign = base64_encode(json_encode(array('signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer']))); xml::add_element($doc, $entry, "dfrn:diaspora_signature", $sign); } @@ -1287,7 +1288,7 @@ class dfrn { $href = ""; $width = 0; foreach ($avatar->attributes AS $attributes) { - /// @TODO Rewrite these similar if() to one switch + /// @TODO Rewrite these similar if () to one switch if ($attributes->name == "href") { $href = $attributes->textContent; } @@ -1402,7 +1403,7 @@ class dfrn { // "poco:birthday" is the birthday in the format "yyyy-mm-dd" $value = $xpath->evaluate($element . "/poco:birthday/text()", $context)->item(0)->nodeValue; - if (!in_array($value, array("", "0000-00-00"))) { + if (!in_array($value, array("", "0000-00-00", "0001-01-01"))) { $bdyear = date("Y"); $value = str_replace("0000", $bdyear, $value); @@ -2164,7 +2165,7 @@ class dfrn { $title = ""; foreach ($links AS $link) { foreach ($link->attributes AS $attributes) { - /// @TODO Rewrite these repeated (same) if() statements to a switch() + /// @TODO Rewrite these repeated (same) if () statements to a switch() if ($attributes->name == "href") { $href = $attributes->textContent; } @@ -2414,7 +2415,7 @@ class dfrn { // When activated, forums don't work. // And: Why should we disallow commenting by followers? // the behaviour is now similar to the Diaspora part. - //if($importer["rel"] == CONTACT_IS_FOLLOWER) { + //if ($importer["rel"] == CONTACT_IS_FOLLOWER) { // logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG); // return; //} @@ -2539,7 +2540,7 @@ class dfrn { logger("Item was stored with id ".$posted_id, LOGGER_DEBUG); - if(stristr($item["verb"],ACTIVITY_POKE)) + if (stristr($item["verb"],ACTIVITY_POKE)) self::do_poke($item, $importer, $posted_id); } } @@ -2666,7 +2667,7 @@ class dfrn { create_tags_from_itemuri($uri, $importer["uid"]); create_files_from_itemuri($uri, $importer["uid"]); update_thread_uri($uri, $importer["importer_uid"]); - if($item["last-child"]) { + if ($item["last-child"]) { // ensure that last-child is set in case the comment that had it just got wiped. q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ", dbesc(datetime_convert()), diff --git a/include/diaspora.php b/include/diaspora.php index bdedb9e0b..b8eff62b1 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -45,7 +45,7 @@ class Diaspora { $servers = explode(",", $serverdata); - foreach($servers AS $server) { + foreach ($servers AS $server) { $server = trim($server); $addr = "relay@".str_replace("http://", "", normalise_link($server)); $batch = $server."/receive/public"; @@ -207,7 +207,7 @@ class Diaspora { $children = $basedom->children('https://joindiaspora.com/protocol'); - if($children->header) { + if ($children->header) { $public = true; $author_link = str_replace('acct:','',$children->header->author_id); } else { @@ -240,11 +240,11 @@ class Diaspora { // figure out where in the DOM tree our data is hiding - if($dom->provenance->data) + if ($dom->provenance->data) $base = $dom->provenance; - elseif($dom->env->data) + elseif ($dom->env->data) $base = $dom->env; - elseif($dom->data) + elseif ($dom->data) $base = $dom; if (!$base) { @@ -277,7 +277,7 @@ class Diaspora { $data = base64url_decode($data); - if($public) + if ($public) $inner_decrypted = $data; else { @@ -578,7 +578,7 @@ class Diaspora { logger("Fetching diaspora key for: ".$handle); $r = self::person_by_handle($handle); - if($r) + if ($r) return $r["pubkey"]; return ""; @@ -634,7 +634,7 @@ class Diaspora { */ private static function add_fcontact($arr, $update = false) { - if($update) { + if ($update) { $r = q("UPDATE `fcontact` SET `name` = '%s', `photo` = '%s', @@ -818,7 +818,7 @@ class Diaspora { // perhaps we were already sharing with this person. Now they're sharing with us. // That makes us friends. // Normally this should have handled by getting a request - but this could get lost - if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { + if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d", intval(CONTACT_IS_FRIEND), intval($contact["id"]), @@ -828,12 +828,12 @@ class Diaspora { logger("defining user ".$contact["nick"]." as friend"); } - if(($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"])) + if (($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"])) return false; - if($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND) + if ($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND) return true; - if($contact["rel"] == CONTACT_IS_FOLLOWER) - if(($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment) + if ($contact["rel"] == CONTACT_IS_FOLLOWER) + if (($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment) return true; // Messages for the global users are always accepted @@ -991,7 +991,7 @@ class Diaspora { logger("Fetch post from ".$source_url, LOGGER_DEBUG); $envelope = fetch_url($source_url); - if($envelope) { + if ($envelope) { logger("Envelope was fetched.", LOGGER_DEBUG); $x = self::verify_magic_envelope($envelope); if (!$x) @@ -1007,7 +1007,7 @@ class Diaspora { logger("Fetch post from ".$source_url, LOGGER_DEBUG); $x = fetch_url($source_url); - if(!$x) + if (!$x) return false; } @@ -1064,7 +1064,7 @@ class Diaspora { FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", intval($uid), dbesc($guid)); - if(!$r) { + if (!$r) { $result = self::store_by_guid($guid, $contact["url"], $uid); if (!$result) { @@ -1325,7 +1325,7 @@ class Diaspora { } // If we are the origin of the parent we store the original data and notify our followers - if($message_id AND $parent_item["origin"]) { + if ($message_id AND $parent_item["origin"]) { // Formerly we stored the signed text, the signature and the author in different fields. // We now store the raw data so that we are more flexible. @@ -1502,7 +1502,7 @@ class Diaspora { intval($importer["uid"]), dbesc($guid) ); - if($c) + if ($c) $conversation = $c[0]; else { $r = q("INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`) @@ -1515,13 +1515,13 @@ class Diaspora { dbesc($subject), dbesc($participants) ); - if($r) + if ($r) $c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", intval($importer["uid"]), dbesc($guid) ); - if($c) + if ($c) $conversation = $c[0]; } if (!$conversation) { @@ -1529,7 +1529,7 @@ class Diaspora { return; } - foreach($messages as $mesg) + foreach ($messages as $mesg) self::receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation); return true; @@ -1659,7 +1659,7 @@ class Diaspora { logger("Stored like ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG); // If we are the origin of the parent we store the original data and notify our followers - if($message_id AND $parent_item["origin"]) { + if ($message_id AND $parent_item["origin"]) { // Formerly we stored the signed text, the signature and the author in different fields. // We now store the raw data so that we are more flexible. @@ -1834,10 +1834,10 @@ class Diaspora { $handle_parts = explode("@", $author); $nick = $handle_parts[0]; - if($name === "") + if ($name === "") $name = $handle_parts[0]; - if( preg_match("|^https?://|", $image_url) === 0) + if ( preg_match("|^https?://|", $image_url) === 0) $image_url = "http://".$handle_parts[1].$image_url; update_contact_avatar($image_url, $importer["uid"], $contact["id"]); @@ -1852,7 +1852,7 @@ class Diaspora { // this is to prevent multiple birthday notifications in a single year // if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year - if(substr($birthday,5) === substr($contact["bd"],5)) + if (substr($birthday,5) === substr($contact["bd"],5)) $birthday = $contact["bd"]; $r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s', @@ -1895,7 +1895,7 @@ class Diaspora { $a = get_app(); - if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { + if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d", intval(CONTACT_IS_FRIEND), intval($contact["id"]), @@ -1908,7 +1908,7 @@ class Diaspora { intval($importer["uid"]) ); - if($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) { + if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) { $self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1", intval($importer["uid"]) @@ -1916,7 +1916,7 @@ class Diaspora { // they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array - if($self && $contact["rel"] == CONTACT_IS_FOLLOWER) { + if ($self && $contact["rel"] == CONTACT_IS_FOLLOWER) { $arr = array(); $arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]); @@ -1947,7 +1947,7 @@ class Diaspora { $arr["deny_gid"] = $user[0]["deny_gid"]; $i = item_store($arr); - if($i) + if ($i) proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i); } } @@ -2086,12 +2086,12 @@ class Diaspora { $def_gid = get_default_group($importer['uid'], $ret["network"]); - if(intval($def_gid)) + if (intval($def_gid)) group_add_member($importer["uid"], "", $contact_record["id"], $def_gid); update_contact_avatar($ret["photo"], $importer['uid'], $contact_record["id"], true); - if($importer["page-flags"] == PAGE_NORMAL) { + if ($importer["page-flags"] == PAGE_NORMAL) { logger("Sending intra message for author ".$author.".", LOGGER_DEBUG); @@ -2141,7 +2141,7 @@ class Diaspora { ); $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"])); - if($u) { + if ($u) { logger("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], LOGGER_DEBUG); $ret = self::send_share($u[0], $contact_record); @@ -2765,7 +2765,7 @@ class Diaspora { $a = get_app(); $enabled = intval(get_config("system", "diaspora_enabled")); - if(!$enabled) + if (!$enabled) return 200; $logid = random_string(4); @@ -3104,14 +3104,14 @@ class Diaspora { $body = html_entity_decode(bb2diaspora($body)); // Adding the title - if(strlen($title)) + if (strlen($title)) $body = "## ".html_entity_decode($title)."\n\n".$body; if ($item["attach"]) { $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER); - if(cnt) { + if (cnt) { $body .= "\n".t("Attachments:")."\n"; - foreach($matches as $mtch) + foreach ($matches as $mtch) $body .= "[".$mtch[3]."](".$mtch[1].")\n"; } } @@ -3591,7 +3591,7 @@ class Diaspora { if ($searchable === 'true') { $dob = '1000-00-00'; - if (($profile['dob']) && ($profile['dob'] != '0000-00-00')) + if (($profile['dob']) && ($profile['dob'] > '0001-01-01')) $dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC','UTC',$profile['dob'],'m-d'); $about = $profile['about']; @@ -3604,7 +3604,7 @@ class Diaspora { $kw = str_replace(' ',' ',$kw); $arr = explode(' ',$profile['pub_keywords']); if (count($arr)) { - for($x = 0; $x < 5; $x ++) { + for ($x = 0; $x < 5; $x ++) { if (trim($arr[$x])) $tags .= '#'. trim($arr[$x]) .' '; } @@ -3626,7 +3626,7 @@ class Diaspora { "searchable" => $searchable, "tag_string" => $tags); - foreach($recips as $recip) { + foreach ($recips as $recip) { logger("Send updated profile data for user ".$uid." to contact ".$recip["id"], LOGGER_DEBUG); self::build_and_transmit($profile, $recip, "profile", $message, false, "", true); } @@ -3649,17 +3649,20 @@ class Diaspora { } $r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid'])); - if(!$r) + if (!dbm::is_result($r)) { return false; + } $contact["uprvkey"] = $r[0]['prvkey']; $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($post_id)); - if (!$r) + if (!dbm::is_result($r)) { return false; + } - if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) + if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) { return false; + } $message = self::construct_like($r[0], $contact); $message["author_signature"] = self::signature($contact, $message); diff --git a/include/directory.php b/include/directory.php index 088adbe78..41a3dd784 100644 --- a/include/directory.php +++ b/include/directory.php @@ -1,17 +1,19 @@ $argv[1]); @@ -22,5 +24,20 @@ function directory_run(&$argv, &$argc){ if (strlen($arr['url'])) { fetch_url($dir . '?url=' . bin2hex($arr['url'])); } + return; } + +function directory_update_all() { + $r = q("SELECT `url` FROM `contact` + INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid` + INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` + WHERE `contact`.`self` AND `profile`.`net-publish` AND `profile`.`is-default` AND + NOT `user`.`account_expired` AND `user`.`verified`"); + + if (dbm::is_result($r)) { + foreach ($r AS $user) { + proc_run(PRIORITY_LOW, 'include/directory.php', $user['url']); + } + } +} diff --git a/include/discover_poco.php b/include/discover_poco.php index bb53efb5c..ff97b0e59 100644 --- a/include/discover_poco.php +++ b/include/discover_poco.php @@ -209,10 +209,10 @@ function discover_directory($search) { $j = json_decode($x); if (count($j->results)) { - foreach($j->results as $jj) { + foreach ($j->results as $jj) { // Check if the contact already exists $exists = q("SELECT `id`, `last_contact`, `last_failure`, `updated` FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($jj->url)); - if ($exists) { + if (dbm::is_result($exists)) { logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG); if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) AND @@ -272,12 +272,16 @@ function gs_search_user($search) { if (!$result["success"]) { return false; } + $contacts = json_decode($result["body"]); if ($contacts->status == 'ERROR') { return false; } - foreach($contacts->data AS $user) { + + /// @TODO AS is considered as a notation for constants (as they usually being written all upper-case) + /// @TODO find all those and convert to all lower-case which is a keyword then + foreach ($contacts->data AS $user) { $contact = probe_url($user->site_address."/".$user->name); if ($contact["network"] != NETWORK_PHANTOM) { $contact["about"] = $user->description; diff --git a/include/email.php b/include/email.php index 42f80c242..b8d99433e 100644 --- a/include/email.php +++ b/include/email.php @@ -4,7 +4,7 @@ require_once('include/msgclean.php'); require_once('include/quoteconvert.php'); function email_connect($mailbox,$username,$password) { - if(! function_exists('imap_open')) + if (! function_exists('imap_open')) return false; $mbox = @imap_open($mailbox,$username,$password); @@ -14,23 +14,23 @@ function email_connect($mailbox,$username,$password) { function email_poll($mbox,$email_addr) { - if(! ($mbox && $email_addr)) + if (! ($mbox && $email_addr)) return array(); $search1 = @imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID); - if(! $search1) + if (! $search1) $search1 = array(); $search2 = @imap_search($mbox,'TO "' . $email_addr . '"', SE_UID); - if(! $search2) + if (! $search2) $search2 = array(); $search3 = @imap_search($mbox,'CC "' . $email_addr . '"', SE_UID); - if(! $search3) + if (! $search3) $search3 = array(); $search4 = @imap_search($mbox,'BCC "' . $email_addr . '"', SE_UID); - if(! $search4) + if (! $search4) $search4 = array(); $res = array_unique(array_merge($search1,$search2,$search3,$search4)); @@ -57,8 +57,8 @@ function email_msg_headers($mbox,$uid) { $raw_header = str_replace("\r",'',$raw_header); $ret = array(); $h = explode("\n",$raw_header); - if(count($h)) - foreach($h as $line ) { + if (count($h)) + foreach ($h as $line ) { if (preg_match("/^[a-zA-Z]/", $line)) { $key = substr($line,0,strpos($line,':')); $value = substr($line,strpos($line,':')+1); @@ -79,10 +79,10 @@ function email_get_msg($mbox,$uid, $reply) { $struc = (($mbox && $uid) ? @imap_fetchstructure($mbox,$uid,FT_UID) : null); - if(! $struc) + if (! $struc) return $ret; - if(! $struc->parts) { + if (! $struc->parts) { $ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html'); $html = $ret['body']; @@ -94,7 +94,7 @@ function email_get_msg($mbox,$uid, $reply) { else { $text = ''; $html = ''; - foreach($struc->parts as $ptop => $p) { + foreach ($struc->parts as $ptop => $p) { $x = email_get_part($mbox,$uid,$p,$ptop + 1, 'plain'); if ($x) { $text .= $x; @@ -206,16 +206,16 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) { function email_header_encode($in_str, $charset) { - $out_str = $in_str; + $out_str = $in_str; $need_to_convert = false; - for($x = 0; $x < strlen($in_str); $x ++) { - if((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) { + for ($x = 0; $x < strlen($in_str); $x ++) { + if ((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) { $need_to_convert = true; } } - if(! $need_to_convert) + if (! $need_to_convert) return $in_str; if ($out_str && $charset) { diff --git a/include/enotify.php b/include/enotify.php index ebc27309d..f86174bd4 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -411,10 +411,12 @@ function notification($params) { $hash = random_string(); $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", dbesc($hash)); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $dups = true; - } while($dups == true); + } + } while ($dups == true); + /// @TODO One statement is enough $datarray = array(); $datarray['hash'] = $hash; $datarray['name'] = $params['source_name']; diff --git a/include/event.php b/include/event.php index ebd4885c9..280b1380a 100644 --- a/include/event.php +++ b/include/event.php @@ -10,7 +10,7 @@ require_once 'include/datetime.php'; function format_event_html($ev, $simple = false) { - if(! ((is_array($ev)) && count($ev))) { + if (! ((is_array($ev)) && count($ev))) { return ''; } @@ -98,26 +98,26 @@ function parse_event($h) { logger('parse_event: parse error: ' . $e); } - if(! $dom) + if (! $dom) return $ret; $items = $dom->getElementsByTagName('*'); - foreach($items as $item) { - if(attribute_contains($item->getAttribute('class'), 'vevent')) { + foreach ($items as $item) { + if (attribute_contains($item->getAttribute('class'), 'vevent')) { $level2 = $item->getElementsByTagName('*'); - foreach($level2 as $x) { - if(attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) { + foreach ($level2 as $x) { + if (attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) { $ret['start'] = $x->getAttribute('title'); - if(! strpos($ret['start'],'Z')) + if (! strpos($ret['start'],'Z')) $ret['adjust'] = true; } - if(attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title')) + if (attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title')) $ret['finish'] = $x->getAttribute('title'); - if(attribute_contains($x->getAttribute('class'),'description')) + if (attribute_contains($x->getAttribute('class'),'description')) $ret['desc'] = $x->textContent; - if(attribute_contains($x->getAttribute('class'),'location')) + if (attribute_contains($x->getAttribute('class'),'location')) $ret['location'] = $x->textContent; } } @@ -125,23 +125,23 @@ function parse_event($h) { // sanitise - if((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) { + if ((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) { $config = HTMLPurifier_Config::createDefault(); $config->set('Cache.DefinitionImpl', null); $purifier = new HTMLPurifier($config); $ret['desc'] = html2bbcode($purifier->purify($ret['desc'])); } - if((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) { + if ((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) { $config = HTMLPurifier_Config::createDefault(); $config->set('Cache.DefinitionImpl', null); $purifier = new HTMLPurifier($config); $ret['location'] = html2bbcode($purifier->purify($ret['location'])); } - if(x($ret,'start')) + if (x($ret,'start')) $ret['start'] = datetime_convert('UTC','UTC',$ret['start']); - if(x($ret,'finish')) + if (x($ret,'finish')) $ret['finish'] = datetime_convert('UTC','UTC',$ret['finish']); return $ret; @@ -595,7 +595,7 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') { */ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') { // Only allow events if there is a valid owner_id - if($owner_uid == 0) { + if ($owner_uid == 0) { return; } diff --git a/include/expire.php b/include/expire.php index 35b109a50..098125a79 100644 --- a/include/expire.php +++ b/include/expire.php @@ -11,12 +11,13 @@ function expire_run(&$argv, &$argc){ // physically remove anything that has been deleted for more than two months - $r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY"); + $r = q("DELETE FROM `item` WHERE `deleted` = 1 AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"); // make this optional as it could have a performance impact on large sites - if(intval(get_config('system','optimize_items'))) - q("optimize table item"); + if (intval(get_config('system','optimize_items'))) { + q("OPTIMIZE TABLE `item`"); + } logger('expire: start'); diff --git a/include/feed.php b/include/feed.php index 295993370..2117676db 100644 --- a/include/feed.php +++ b/include/feed.php @@ -200,7 +200,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { 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; @@ -210,12 +209,17 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { if ($item["uri"] == "") { $item["uri"] = $item["plink"]; } + + $orig_plink = $item["plink"]; + + $item["plink"] = original_url($item["plink"]); + $item["parent-uri"] = $item["uri"]; if (!$simulate) { $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s', '%s')", intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED), dbesc(NETWORK_DFRN)); - if ($r) { + if (dbm::is_result($r)) { logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG); continue; } @@ -340,6 +344,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { // Distributed items should have a well formatted URI. // Additionally we have to avoid conflicts with identical URI between imported feeds and these items. if ($notify) { + $item['guid'] = uri_to_guid($orig_plink, $a->get_hostname()); unset($item['uri']); unset($item['parent-uri']); } diff --git a/include/identity.php b/include/identity.php index 8138e9b04..a21624a21 100644 --- a/include/identity.php +++ b/include/identity.php @@ -202,6 +202,9 @@ function profile_sidebar($profile, $block = 0) { $address = false; // $pdesc = true; + // This function can also use contact information in $profile + $is_contact = x($profile, 'cid'); + if((! is_array($profile)) && (! count($profile))) return $o; @@ -281,7 +284,7 @@ function profile_sidebar($profile, $block = 0) { } // show edit profile to yourself - if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) { + if (!$is_contact && $profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) { $profile['edit'] = array(App::get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles')); $r = q("SELECT * FROM `profile` WHERE `uid` = %d", local_user()); @@ -310,7 +313,7 @@ function profile_sidebar($profile, $block = 0) { } } - if ($profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) { + if (!$is_contact && $profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) { $profile['edit'] = array(App::get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile')); $profile['menu'] = array( 'chg_photo' => t('Change profile photo'), @@ -628,7 +631,7 @@ function advanced_profile(App $a) { if($a->profile['gender']) $profile['gender'] = array( t('Gender:'), $a->profile['gender'] ); - if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { + if(($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) { $year_bd_format = t('j F, Y'); $short_bd_format = t('j F'); diff --git a/include/items.php b/include/items.php index c2b3d7d1f..2500e08d5 100644 --- a/include/items.php +++ b/include/items.php @@ -6,31 +6,33 @@ use \Friendica\ParseUrl; -require_once('include/bbcode.php'); -require_once('include/oembed.php'); -require_once('include/salmon.php'); -require_once('include/crypto.php'); -require_once('include/Photo.php'); -require_once('include/tags.php'); -require_once('include/files.php'); -require_once('include/text.php'); -require_once('include/email.php'); -require_once('include/threads.php'); -require_once('include/socgraph.php'); -require_once('include/plaintext.php'); -require_once('include/ostatus.php'); -require_once('include/feed.php'); -require_once('include/Contact.php'); -require_once('mod/share.php'); -require_once('include/enotify.php'); -require_once('include/dfrn.php'); -require_once('include/group.php'); +require_once 'include/bbcode.php'; +require_once 'include/oembed.php'; +require_once 'include/salmon.php'; +require_once 'include/crypto.php'; +require_once 'include/Photo.php'; +require_once 'include/tags.php'; +require_once 'include/files.php'; +require_once 'include/text.php'; +require_once 'include/email.php'; +require_once 'include/threads.php'; +require_once 'include/socgraph.php'; +require_once 'include/plaintext.php'; +require_once 'include/ostatus.php'; +require_once 'include/feed.php'; +require_once 'include/Contact.php'; +require_once 'mod/share.php'; +require_once 'include/enotify.php'; +require_once 'include/dfrn.php'; +require_once 'include/group.php'; -require_once('library/defuse/php-encryption-1.2.1/Crypto.php'); +/// @TODO one day with composer autoloader no more needed +require_once 'library/defuse/php-encryption-1.2.1/Crypto.php'; function construct_verb($item) { - if ($item['verb']) + if ($item['verb']) { return $item['verb']; + } return ACTIVITY_POST; } @@ -60,7 +62,7 @@ function limit_body_size($body) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); - while(($img_st_close !== false) && ($img_end !== false)) { + while (($img_st_close !== false) && ($img_end !== false)) { $img_st_close++; // make it point to AFTER the closing bracket $img_end += $img_start; @@ -69,7 +71,7 @@ function limit_body_size($body) { if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { // This is an embedded image - if ( ($textlen + $img_start) > $maxlen ) { + if (($textlen + $img_start) > $maxlen ) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens before an embedded image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); @@ -83,7 +85,7 @@ function limit_body_size($body) { $new_body = $new_body . substr($orig_body, $img_start, $img_end - $img_start); } else { - if ( ($textlen + $img_end) > $maxlen ) { + if (($textlen + $img_end) > $maxlen ) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens before the end of a non-embedded image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); @@ -96,15 +98,17 @@ function limit_body_size($body) { } $orig_body = substr($orig_body, $img_end); - if ($orig_body === false) // in case the body ends on a closing image tag + if ($orig_body === false) { + // in case the body ends on a closing image tag $orig_body = ''; + } $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); } - if ( ($textlen + strlen($orig_body)) > $maxlen) { + if (($textlen + strlen($orig_body)) > $maxlen) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens after the end of the last image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); @@ -117,8 +121,9 @@ function limit_body_size($body) { } return $new_body; - } else + } else { return $body; + } }} function title_is_body($title, $body) { @@ -126,15 +131,16 @@ function title_is_body($title, $body) { $title = strip_tags($title); $title = trim($title); $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8'); - $title = str_replace(array("\n", "\r", "\t", " "), array("","","",""), $title); + $title = str_replace(array("\n", "\r", "\t", " "), array("", "", "", ""), $title); $body = strip_tags($body); $body = trim($body); $body = html_entity_decode($body, ENT_QUOTES, 'UTF-8'); - $body = str_replace(array("\n", "\r", "\t", " "), array("","","",""), $body); + $body = str_replace(array("\n", "\r", "\t", " "), array("", "", "", ""), $body); - if (strlen($title) < strlen($body)) + if (strlen($title) < strlen($body)) { $body = substr($body, 0, strlen($title)); + } if (($title != $body) and (substr($title, -3) == "...")) { $pos = strrpos($title, "..."); @@ -144,7 +150,7 @@ function title_is_body($title, $body) { } } - return($title == $body); + return ($title == $body); } function add_page_info_data($data) { @@ -212,8 +218,8 @@ function add_page_info_data($data) { foreach ($data["keywords"] AS $keyword) { /// @todo make a positive list of allowed characters $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"), - array("","", "", "", "", "", "", "", "", "", "", ""), $keyword); - $hashtags .= "#[url=".App::get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url] "; + array("", "", "", "", "", "", "", "", "", "", "", ""), $keyword); + $hashtags .= "#[url=" . App::get_baseurl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url] "; } } @@ -224,25 +230,28 @@ function query_page_info($url, $no_photos = false, $photo = "", $keywords = fals $data = ParseUrl::getSiteinfoCached($url, true); - if ($photo != "") + if ($photo != "") { $data["images"][0]["src"] = $photo; + } - logger('fetch page info for '.$url.' '.print_r($data, true), LOGGER_DEBUG); + logger('fetch page info for ' . $url . ' ' . print_r($data, true), LOGGER_DEBUG); - if (!$keywords AND isset($data["keywords"])) + if (!$keywords AND isset($data["keywords"])) { unset($data["keywords"]); + } if (($keyword_blacklist != "") AND isset($data["keywords"])) { - $list = explode(",", $keyword_blacklist); + $list = explode(", ", $keyword_blacklist); foreach ($list AS $keyword) { $keyword = trim($keyword); $index = array_search($keyword, $data["keywords"]); - if ($index !== false) + if ($index !== false) { unset($data["keywords"][$index]); + } } } - return($data); + return $data; } function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") { @@ -252,16 +261,17 @@ function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = fa if (isset($data["keywords"]) AND count($data["keywords"])) { foreach ($data["keywords"] AS $keyword) { $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'"), - array("","", "", "", "", ""), $keyword); + array("", "", "", "", "", ""), $keyword); - if ($tags != "") - $tags .= ","; + if ($tags != "") { + $tags .= ", "; + } - $tags .= "#[url=".App::get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url]"; + $tags .= "#[url=" . App::get_baseurl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]"; } } - return($tags); + return $tags; } function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") { @@ -269,52 +279,58 @@ function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $text = add_page_info_data($data); - return($text); + return $text; } function add_page_info_to_body($body, $texturl = false, $no_photos = false) { - logger('add_page_info_to_body: fetch page info for body '.$body, LOGGER_DEBUG); + logger('add_page_info_to_body: fetch page info for body ' . $body, LOGGER_DEBUG); $URLSearchString = "^\[\]"; // Fix for Mastodon where the mentions are in a different format $body = preg_replace("/\[url\=([$URLSearchString]*)\]([#!@])(.*?)\[\/url\]/ism", - '$2[url=$1]$3[/url]', $body); + '$2[url=$1]$3[/url]', $body); // Adding these spaces is a quick hack due to my problems with regular expressions :) - preg_match("/[^!#@]\[url\]([$URLSearchString]*)\[\/url\]/ism", " ".$body, $matches); + preg_match("/[^!#@]\[url\]([$URLSearchString]*)\[\/url\]/ism", " " . $body, $matches); - if (!$matches) - preg_match("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", " ".$body, $matches); + if (!$matches) { + preg_match("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", " " . $body, $matches); + } // Convert urls without bbcode elements if (!$matches AND $texturl) { preg_match("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", " ".$body, $matches); // Yeah, a hack. I really hate regular expressions :) - if ($matches) + if ($matches) { $matches[1] = $matches[2]; + } } - if ($matches) + if ($matches) { $footer = add_page_info($matches[1], $no_photos); + } // Remove the link from the body if the link is attached at the end of the post if (isset($footer) AND (trim($footer) != "") AND (strpos($footer, $matches[1]))) { $removedlink = trim(str_replace($matches[1], "", $body)); - if (($removedlink == "") OR strstr($body, $removedlink)) + if (($removedlink == "") OR strstr($body, $removedlink)) { $body = $removedlink; + } $url = str_replace(array('/', '.'), array('\/', '\.'), $matches[1]); - $removedlink = preg_replace("/\[url\=".$url."\](.*?)\[\/url\]/ism", '', $body); - if (($removedlink == "") OR strstr($body, $removedlink)) + $removedlink = preg_replace("/\[url\=" . $url . "\](.*?)\[\/url\]/ism", '', $body); + if (($removedlink == "") OR strstr($body, $removedlink)) { $body = $removedlink; + } } // Add the page information to the bottom - if (isset($footer) AND (trim($footer) != "")) + if (isset($footer) AND (trim($footer) != "")) { $body .= $footer; + } return $body; } @@ -328,12 +344,13 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) { */ function item_add_language_opt(&$arr) { - if (version_compare(PHP_VERSION, '5.3.0', '<')) return; // LanguageDetect.php not available ? + if (version_compare(PHP_VERSION, '5.3.0', '<')) { + // LanguageDetect.php not available ? + return; + } - if ( x($arr, 'postopts') ) - { - if ( strstr($arr['postopts'], 'lang=') ) - { + if (x($arr, 'postopts') ) { + if (strstr($arr['postopts'], 'lang=') ) { // do not override /// @TODO Add parameter to request overriding return; @@ -344,8 +361,9 @@ function item_add_language_opt(&$arr) { } require_once('library/langdet/Text/LanguageDetect.php'); - $naked_body = preg_replace('/\[(.+?)\]/','',$arr['body']); - $l = new Text_LanguageDetect; + + $naked_body = preg_replace('/\[(.+?)\]/','', $arr['body']); + $l = new Text_LanguageDetect(); //$lng = $l->detectConfidence($naked_body); //$arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : ''); $lng = $l->detect($naked_body, 3); @@ -355,7 +373,7 @@ function item_add_language_opt(&$arr) { $postopts .= 'lang='; $sep = ""; foreach ($lng as $language => $score) { - $postopts .= $sep . $language.";".$score; + $postopts .= $sep . $language . ";" . $score; $sep = ':'; } $arr['postopts'] = $postopts; @@ -392,7 +410,9 @@ function uri_to_guid($uri, $host = "") { return $guid_prefix.$host_hash; } -function item_store($arr,$force_parent = false, $notify = false, $dontcache = false) { +/// @TODO Maybe $arr must be called-by-reference? This function modifies it +/// @TODO add type-hint array +function item_store($arr, $force_parent = false, $notify = false, $dontcache = false) { $a = get_app(); @@ -407,18 +427,22 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri. // In difference to the call to "uri_to_guid" several lines below we add the hash of our own host. // This is done because our host is the original creator of the post. - if (isset($arr['plink'])) { - $arr['guid'] = uri_to_guid($arr['plink'], $a->get_hostname()); - } elseif (isset($arr['uri'])) { - $arr['guid'] = uri_to_guid($arr['uri'], $a->get_hostname()); + if (!isset($arr['guid'])) { + if (isset($arr['plink'])) { + $arr['guid'] = uri_to_guid($arr['plink'], $a->get_hostname()); + } elseif (isset($arr['uri'])) { + $arr['guid'] = uri_to_guid($arr['uri'], $a->get_hostname()); + } } } - // If a Diaspora signature structure was passed in, pull it out of the - // item array and set it aside for later storage. + /* + * If a Diaspora signature structure was passed in, pull it out of the + * item array and set it aside for later storage. + */ $dsprsig = null; - if (x($arr,'dsprsig')) { + if (x($arr, 'dsprsig')) { $encoded_signature = $arr['dsprsig']; $dsprsig = json_decode(base64_decode($arr['dsprsig'])); unset($arr['dsprsig']); @@ -426,27 +450,28 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // Converting the plink if ($arr['network'] == NETWORK_OSTATUS) { - if (isset($arr['plink'])) + if (isset($arr['plink'])) { $arr['plink'] = ostatus::convert_href($arr['plink']); - elseif (isset($arr['uri'])) + } elseif (isset($arr['uri'])) { $arr['plink'] = ostatus::convert_href($arr['uri']); + } } - if (x($arr, 'gravity')) + if (x($arr, 'gravity')) { $arr['gravity'] = intval($arr['gravity']); - elseif ($arr['parent-uri'] === $arr['uri']) + } elseif ($arr['parent-uri'] === $arr['uri']) { $arr['gravity'] = 0; - elseif (activity_match($arr['verb'],ACTIVITY_POST)) + } elseif (activity_match($arr['verb'],ACTIVITY_POST)) { $arr['gravity'] = 6; - else + } else { $arr['gravity'] = 6; // extensible catchall + } - if (! x($arr,'type')) + if (! x($arr, 'type')) { $arr['type'] = 'remote'; + } - - - /* check for create date and expire time */ + // check for create date and expire time $uid = intval($arr['uid']); $r = q("SELECT expire FROM user WHERE uid = %d", intval($uid)); if (dbm::is_result($r)) { @@ -461,8 +486,11 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa } } - // Do we already have this item? - // We have to check several networks since Friendica posts could be repeated via OStatus (maybe Diasporsa as well) + /* + * Do we already have this item? + * We have to check several networks since Friendica posts could be repeated + * via OStatus (maybe Diasporsa as well) + */ if (in_array(trim($arr['network']), array(NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS, ""))) { $r = q("SELECT `id`, `network` FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` IN ('%s', '%s', '%s') LIMIT 1", dbesc(trim($arr['uri'])), @@ -471,14 +499,17 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS) ); - if ($r) { + if (dbm::is_result($r)) { // We only log the entries with a different user id than 0. Otherwise we would have too many false positives - if ($uid != 0) + if ($uid != 0) { logger("Item with uri ".$arr['uri']." already existed for user ".$uid." with id ".$r[0]["id"]." target network ".$r[0]["network"]." - new network: ".$arr['network']); - return($r[0]["id"]); + } + + return $r[0]["id"]; } } + /// @TODO old-lost code? // Shouldn't happen but we want to make absolutely sure it doesn't leak from a plugin. // Deactivated, since the bbcode parser can handle with it - and it destroys posts with some smileys that contain "<" //if ((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false)) @@ -486,76 +517,79 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa item_add_language_opt($arr); - if ($notify) + if ($notify) { $guid_prefix = ""; - elseif ((trim($arr['guid']) == "") AND (trim($arr['plink']) != "")) + } elseif ((trim($arr['guid']) == "") AND (trim($arr['plink']) != "")) { $arr['guid'] = uri_to_guid($arr['plink']); - elseif ((trim($arr['guid']) == "") AND (trim($arr['uri']) != "")) + } elseif ((trim($arr['guid']) == "") AND (trim($arr['uri']) != "")) { $arr['guid'] = uri_to_guid($arr['uri']); - else { + } else { $parsed = parse_url($arr["author-link"]); $guid_prefix = hash("crc32", $parsed["host"]); } - $arr['wall'] = ((x($arr,'wall')) ? intval($arr['wall']) : 0); - $arr['guid'] = ((x($arr,'guid')) ? notags(trim($arr['guid'])) : get_guid(32, $guid_prefix)); - $arr['uri'] = ((x($arr,'uri')) ? notags(trim($arr['uri'])) : item_new_uri($a->get_hostname(), $uid, $arr['guid'])); - $arr['extid'] = ((x($arr,'extid')) ? notags(trim($arr['extid'])) : ''); - $arr['author-name'] = ((x($arr,'author-name')) ? trim($arr['author-name']) : ''); - $arr['author-link'] = ((x($arr,'author-link')) ? notags(trim($arr['author-link'])) : ''); - $arr['author-avatar'] = ((x($arr,'author-avatar')) ? notags(trim($arr['author-avatar'])) : ''); - $arr['owner-name'] = ((x($arr,'owner-name')) ? trim($arr['owner-name']) : ''); - $arr['owner-link'] = ((x($arr,'owner-link')) ? notags(trim($arr['owner-link'])) : ''); - $arr['owner-avatar'] = ((x($arr,'owner-avatar')) ? notags(trim($arr['owner-avatar'])) : ''); - $arr['created'] = ((x($arr,'created') !== false) ? datetime_convert('UTC','UTC',$arr['created']) : datetime_convert()); - $arr['edited'] = ((x($arr,'edited') !== false) ? datetime_convert('UTC','UTC',$arr['edited']) : datetime_convert()); - $arr['commented'] = ((x($arr,'commented') !== false) ? datetime_convert('UTC','UTC',$arr['commented']) : datetime_convert()); - $arr['received'] = ((x($arr,'received') !== false) ? datetime_convert('UTC','UTC',$arr['received']) : datetime_convert()); - $arr['changed'] = ((x($arr,'changed') !== false) ? datetime_convert('UTC','UTC',$arr['changed']) : datetime_convert()); - $arr['title'] = ((x($arr,'title')) ? trim($arr['title']) : ''); - $arr['location'] = ((x($arr,'location')) ? trim($arr['location']) : ''); - $arr['coord'] = ((x($arr,'coord')) ? notags(trim($arr['coord'])) : ''); - $arr['last-child'] = ((x($arr,'last-child')) ? intval($arr['last-child']) : 0 ); - $arr['visible'] = ((x($arr,'visible') !== false) ? intval($arr['visible']) : 1 ); + $arr['wall'] = ((x($arr, 'wall')) ? intval($arr['wall']) : 0); + $arr['guid'] = ((x($arr, 'guid')) ? notags(trim($arr['guid'])) : get_guid(32, $guid_prefix)); + $arr['uri'] = ((x($arr, 'uri')) ? notags(trim($arr['uri'])) : item_new_uri($a->get_hostname(), $uid, $arr['guid'])); + $arr['extid'] = ((x($arr, 'extid')) ? notags(trim($arr['extid'])) : ''); + $arr['author-name'] = ((x($arr, 'author-name')) ? trim($arr['author-name']) : ''); + $arr['author-link'] = ((x($arr, 'author-link')) ? notags(trim($arr['author-link'])) : ''); + $arr['author-avatar'] = ((x($arr, 'author-avatar')) ? notags(trim($arr['author-avatar'])) : ''); + $arr['owner-name'] = ((x($arr, 'owner-name')) ? trim($arr['owner-name']) : ''); + $arr['owner-link'] = ((x($arr, 'owner-link')) ? notags(trim($arr['owner-link'])) : ''); + $arr['owner-avatar'] = ((x($arr, 'owner-avatar')) ? notags(trim($arr['owner-avatar'])) : ''); + $arr['created'] = ((x($arr, 'created') !== false) ? datetime_convert('UTC','UTC', $arr['created']) : datetime_convert()); + $arr['edited'] = ((x($arr, 'edited') !== false) ? datetime_convert('UTC','UTC', $arr['edited']) : datetime_convert()); + $arr['commented'] = ((x($arr, 'commented') !== false) ? datetime_convert('UTC','UTC', $arr['commented']) : datetime_convert()); + $arr['received'] = ((x($arr, 'received') !== false) ? datetime_convert('UTC','UTC', $arr['received']) : datetime_convert()); + $arr['changed'] = ((x($arr, 'changed') !== false) ? datetime_convert('UTC','UTC', $arr['changed']) : datetime_convert()); + $arr['title'] = ((x($arr, 'title')) ? trim($arr['title']) : ''); + $arr['location'] = ((x($arr, 'location')) ? trim($arr['location']) : ''); + $arr['coord'] = ((x($arr, 'coord')) ? notags(trim($arr['coord'])) : ''); + $arr['last-child'] = ((x($arr, 'last-child')) ? intval($arr['last-child']) : 0 ); + $arr['visible'] = ((x($arr, 'visible') !== false) ? intval($arr['visible']) : 1 ); $arr['deleted'] = 0; - $arr['parent-uri'] = ((x($arr,'parent-uri')) ? notags(trim($arr['parent-uri'])) : $arr['uri']); - $arr['verb'] = ((x($arr,'verb')) ? notags(trim($arr['verb'])) : ''); - $arr['object-type'] = ((x($arr,'object-type')) ? notags(trim($arr['object-type'])) : ''); - $arr['object'] = ((x($arr,'object')) ? trim($arr['object']) : ''); - $arr['target-type'] = ((x($arr,'target-type')) ? notags(trim($arr['target-type'])) : ''); - $arr['target'] = ((x($arr,'target')) ? trim($arr['target']) : ''); - $arr['plink'] = ((x($arr,'plink')) ? notags(trim($arr['plink'])) : ''); - $arr['allow_cid'] = ((x($arr,'allow_cid')) ? trim($arr['allow_cid']) : ''); - $arr['allow_gid'] = ((x($arr,'allow_gid')) ? trim($arr['allow_gid']) : ''); - $arr['deny_cid'] = ((x($arr,'deny_cid')) ? trim($arr['deny_cid']) : ''); - $arr['deny_gid'] = ((x($arr,'deny_gid')) ? trim($arr['deny_gid']) : ''); - $arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0 ); - $arr['bookmark'] = ((x($arr,'bookmark')) ? intval($arr['bookmark']) : 0 ); - $arr['body'] = ((x($arr,'body')) ? trim($arr['body']) : ''); - $arr['tag'] = ((x($arr,'tag')) ? notags(trim($arr['tag'])) : ''); - $arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : ''); - $arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : ''); - $arr['origin'] = ((x($arr,'origin')) ? intval($arr['origin']) : 0 ); - $arr['network'] = ((x($arr,'network')) ? trim($arr['network']) : ''); - $arr['postopts'] = ((x($arr,'postopts')) ? trim($arr['postopts']) : ''); - $arr['resource-id'] = ((x($arr,'resource-id')) ? trim($arr['resource-id']) : ''); - $arr['event-id'] = ((x($arr,'event-id')) ? intval($arr['event-id']) : 0 ); - $arr['inform'] = ((x($arr,'inform')) ? trim($arr['inform']) : ''); - $arr['file'] = ((x($arr,'file')) ? trim($arr['file']) : ''); + $arr['parent-uri'] = ((x($arr, 'parent-uri')) ? notags(trim($arr['parent-uri'])) : $arr['uri']); + $arr['verb'] = ((x($arr, 'verb')) ? notags(trim($arr['verb'])) : ''); + $arr['object-type'] = ((x($arr, 'object-type')) ? notags(trim($arr['object-type'])) : ''); + $arr['object'] = ((x($arr, 'object')) ? trim($arr['object']) : ''); + $arr['target-type'] = ((x($arr, 'target-type')) ? notags(trim($arr['target-type'])) : ''); + $arr['target'] = ((x($arr, 'target')) ? trim($arr['target']) : ''); + $arr['plink'] = ((x($arr, 'plink')) ? notags(trim($arr['plink'])) : ''); + $arr['allow_cid'] = ((x($arr, 'allow_cid')) ? trim($arr['allow_cid']) : ''); + $arr['allow_gid'] = ((x($arr, 'allow_gid')) ? trim($arr['allow_gid']) : ''); + $arr['deny_cid'] = ((x($arr, 'deny_cid')) ? trim($arr['deny_cid']) : ''); + $arr['deny_gid'] = ((x($arr, 'deny_gid')) ? trim($arr['deny_gid']) : ''); + $arr['private'] = ((x($arr, 'private')) ? intval($arr['private']) : 0 ); + $arr['bookmark'] = ((x($arr, 'bookmark')) ? intval($arr['bookmark']) : 0 ); + $arr['body'] = ((x($arr, 'body')) ? trim($arr['body']) : ''); + $arr['tag'] = ((x($arr, 'tag')) ? notags(trim($arr['tag'])) : ''); + $arr['attach'] = ((x($arr, 'attach')) ? notags(trim($arr['attach'])) : ''); + $arr['app'] = ((x($arr, 'app')) ? notags(trim($arr['app'])) : ''); + $arr['origin'] = ((x($arr, 'origin')) ? intval($arr['origin']) : 0 ); + $arr['network'] = ((x($arr, 'network')) ? trim($arr['network']) : ''); + $arr['postopts'] = ((x($arr, 'postopts')) ? trim($arr['postopts']) : ''); + $arr['resource-id'] = ((x($arr, 'resource-id')) ? trim($arr['resource-id']) : ''); + $arr['event-id'] = ((x($arr, 'event-id')) ? intval($arr['event-id']) : 0 ); + $arr['inform'] = ((x($arr, 'inform')) ? trim($arr['inform']) : ''); + $arr['file'] = ((x($arr, 'file')) ? trim($arr['file']) : ''); // Items cannot be stored before they happen ... - if ($arr['created'] > datetime_convert()) + if ($arr['created'] > datetime_convert()) { $arr['created'] = datetime_convert(); + } // We haven't invented time travel by now. - if ($arr['edited'] > datetime_convert()) + if ($arr['edited'] > datetime_convert()) { $arr['edited'] = datetime_convert(); + } - if (($arr['author-link'] == "") AND ($arr['owner-link'] == "")) - logger("Both author-link and owner-link are empty. Called by: ".App::callstack(), LOGGER_DEBUG); + if (($arr['author-link'] == "") AND ($arr['owner-link'] == "")) { + logger("Both author-link and owner-link are empty. Called by: " . App::callstack(), LOGGER_DEBUG); + } if ($arr['plink'] == "") { - $arr['plink'] = App::get_baseurl().'/display/'.urlencode($arr['guid']); + $arr['plink'] = App::get_baseurl() . '/display/' . urlencode($arr['guid']); } if ($arr['network'] == "") { @@ -571,59 +605,74 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc(normalise_link($arr['author-link'])) ); - if (!dbm::is_result($r)) + if (!dbm::is_result($r)) { $r = q("SELECT `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($arr['contact-id']), intval($arr['uid']) ); + } - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $arr['network'] = $r[0]["network"]; + } // Fallback to friendica (why is it empty in some cases?) - if ($arr['network'] == "") + if ($arr['network'] == "") { $arr['network'] = NETWORK_DFRN; + } - logger("item_store: Set network to ".$arr["network"]." for ".$arr["uri"], LOGGER_DEBUG); + logger("item_store: Set network to " . $arr["network"] . " for " . $arr["uri"], LOGGER_DEBUG); } // The contact-id should be set before "item_store" was called - but there seems to be some issues if ($arr["contact-id"] == 0) { - // First we are looking for a suitable contact that matches with the author of the post - // This is done only for comments (See below explanation at "gcontact-id") - if ($arr['parent-uri'] != $arr['uri']) + /* + * First we are looking for a suitable contact that matches with the author of the post + * This is done only for comments (See below explanation at "gcontact-id") + */ + if ($arr['parent-uri'] != $arr['uri']) { $arr["contact-id"] = get_contact($arr['author-link'], $uid); + } // If not present then maybe the owner was found - if ($arr["contact-id"] == 0) + if ($arr["contact-id"] == 0) { $arr["contact-id"] = get_contact($arr['owner-link'], $uid); + } // Still missing? Then use the "self" contact of the current user if ($arr["contact-id"] == 0) { $r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid` = %d", intval($uid)); - if ($r) + + if (dbm::is_result($r)) { $arr["contact-id"] = $r[0]["id"]; + } } + logger("Contact-id was missing for post ".$arr["guid"]." from user id ".$uid." - now set to ".$arr["contact-id"], LOGGER_DEBUG); } if ($arr["gcontact-id"] == 0) { - // The gcontact should mostly behave like the contact. But is is supposed to be global for the system. - // This means that wall posts, repeated posts, etc. should have the gcontact id of the owner. - // On comments the author is the better choice. - if ($arr['parent-uri'] === $arr['uri']) + /* + * The gcontact should mostly behave like the contact. But is is supposed to be global for the system. + * This means that wall posts, repeated posts, etc. should have the gcontact id of the owner. + * On comments the author is the better choice. + */ + if ($arr['parent-uri'] === $arr['uri']) { $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['owner-link'], "network" => $arr['network'], "photo" => $arr['owner-avatar'], "name" => $arr['owner-name'])); - else + } else { $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['author-link'], "network" => $arr['network'], "photo" => $arr['author-avatar'], "name" => $arr['author-name'])); + } } - if ($arr["author-id"] == 0) + if ($arr["author-id"] == 0) { $arr["author-id"] = get_contact($arr["author-link"], 0); + } - if ($arr["owner-id"] == 0) + if ($arr["owner-id"] == 0) { $arr["owner-id"] = get_contact($arr["owner-link"], 0); + } if ($arr['guid'] != "") { // Checking if there is already an item with the same guid @@ -673,8 +722,10 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc($r[0]['parent-uri']), intval($arr['uid']) ); - if ($z && count($z)) + + if (dbm::is_result($z)) { $r = $z; + } } $parent_id = $r[0]['id']; @@ -686,20 +737,23 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa $arr['wall'] = $r[0]['wall']; $notify_type = 'comment-new'; - // if the parent is private, force privacy for the entire conversation - // This differs from the above settings as it subtly allows comments from - // email correspondents to be private even if the overall thread is not. - - if ($r[0]['private']) + /* + * If the parent is private, force privacy for the entire conversation + * This differs from the above settings as it subtly allows comments from + * email correspondents to be private even if the overall thread is not. + */ + if ($r[0]['private']) { $arr['private'] = $r[0]['private']; + } - // Edge case. We host a public forum that was originally posted to privately. - // The original author commented, but as this is a comment, the permissions - // weren't fixed up so it will still show the comment as private unless we fix it here. - - if ((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private'])) + /* + * Edge case. We host a public forum that was originally posted to privately. + * The original author commented, but as this is a comment, the permissions + * weren't fixed up so it will still show the comment as private unless we fix it here. + */ + if ((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private'])) { $arr['private'] = 0; - + } // If its a post from myself then tag the thread as "mention" logger("item_store: Checking if parent ".$parent_id." has to be tagged as mention for user ".$arr['uid'], LOGGER_DEBUG); @@ -714,10 +768,10 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa } } } else { - - // Allow one to see reply tweets from status.net even when - // we don't have or can't see the original post. - + /* + * Allow one to see reply tweets from status.net even when + * we don't have or can't see the original post. + */ if ($force_parent) { logger('item_store: $force_parent=true, reply converted to top-level post.'); $parent_id = 0; @@ -777,14 +831,15 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa } else { $isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `uri` = '%s'", dbesc($arr["uri"])); - $arr["global"] = (count($isglobal) > 0); + $arr["global"] = (dbm::is_result($isglobal) && count($isglobal) > 0); } // ACL settings - if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) + if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) { $private = 1; - else + } else { $private = $arr['private']; + } $arr["allow_cid"] = $allow_cid; $arr["allow_gid"] = $allow_gid; @@ -796,19 +851,22 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // Fill the cache field put_item_in_cache($arr); - if ($notify) - call_hooks('post_local',$arr); - else - call_hooks('post_remote',$arr); + if ($notify) { + call_hooks('post_local', $arr); + } else { + call_hooks('post_remote', $arr); + } - if (x($arr,'cancel')) { + if (x($arr, 'cancel')) { logger('item_store: post cancelled by plugin.'); return 0; } - // Check for already added items. - // There is a timing issue here that sometimes creates double postings. - // An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this. + /* + * Check for already added items. + * There is a timing issue here that sometimes creates double postings. + * An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this. + */ if ($arr["uid"] == 0) { $r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc(trim($arr['uri']))); if (dbm::is_result($r)) { @@ -893,7 +951,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa if ($r[0]["entries"] > 1) { // There are duplicates. We delete our just created entry. - logger('Duplicated post occurred. uri = '.$arr['uri'].' uid = '.$arr['uid']); + logger('Duplicated post occurred. uri = ' . $arr['uri'] . ' uid = ' . $arr['uid']); // Yes, we could do a rollback here - but we are having many users with MyISAM. q("DELETE FROM `item` WHERE `id` = %d", intval($current_post)); @@ -909,8 +967,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa logger('item_store: created item '.$current_post); item_set_last_item($arr); - if (!$parent_id || ($arr['parent-uri'] === $arr['uri'])) + if (!$parent_id || ($arr['parent-uri'] === $arr['uri'])) { $parent_id = $current_post; + } // Set parent id $r = q("UPDATE `item` SET `parent` = %d WHERE `id` = %d", @@ -923,28 +982,31 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // update the commented timestamp on the parent // Only update "commented" if it is really a comment - if (($arr['verb'] == ACTIVITY_POST) OR !get_config("system", "like_no_comment")) + if (($arr['verb'] == ACTIVITY_POST) OR !get_config("system", "like_no_comment")) { q("UPDATE `item` SET `commented` = '%s', `changed` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), dbesc(datetime_convert()), intval($parent_id) ); - else + } else { q("UPDATE `item` SET `changed` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($parent_id) ); + } if ($dsprsig) { - // Friendica servers lower than 3.4.3-2 had double encoded the signature ... - // We can check for this condition when we decode and encode the stuff again. + /* + * Friendica servers lower than 3.4.3-2 had double encoded the signature ... + * We can check for this condition when we decode and encode the stuff again. + */ if (base64_encode(base64_decode(base64_decode($dsprsig->signature))) == base64_decode($dsprsig->signature)) { $dsprsig->signature = base64_decode($dsprsig->signature); logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG); } - q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", + q("INSERT INTO `sign` (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", intval($current_post), dbesc($dsprsig->signed_text), dbesc($dsprsig->signature), @@ -952,10 +1014,12 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa ); } - $deleted = tag_deliver($arr['uid'],$current_post); + $deleted = tag_deliver($arr['uid'], $current_post); - // current post can be deleted if is for a community page and no mention are - // in it. + /* + * current post can be deleted if is for a community page and no mention are + * in it. + */ if (!$deleted AND !$dontcache) { $r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post)); @@ -978,13 +1042,17 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa q("COMMIT"); - // Due to deadlock issues with the "term" table we are doing these steps after the commit. - // This is not perfect - but a workable solution until we found the reason for the problem. + /* + * Due to deadlock issues with the "term" table we are doing these steps after the commit. + * This is not perfect - but a workable solution until we found the reason for the problem. + */ create_tags_from_item($current_post); create_files_from_item($current_post); - // If this is now the last-child, force all _other_ children of this parent to *not* be last-child - // It is done after the transaction to avoid dead locks. + /* + * If this is now the last-child, force all _other_ children of this parent to *not* be last-child + * It is done after the transaction to avoid dead locks. + */ if ($arr['last-child']) { $r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d AND `id` != %d", dbesc($arr['uri']), @@ -1025,7 +1093,7 @@ function item_set_last_item($arr) { if (!$update AND ($arr["network"] == NETWORK_DFRN) AND ($arr["parent-uri"] === $arr["uri"])) { $isforum = q("SELECT `forum` FROM `contact` WHERE `id` = %d AND `forum`", intval($arr['contact-id'])); - if ($isforum) { + if (dbm::is_result($isforum)) { $update = true; } } @@ -1060,8 +1128,9 @@ function item_body_set_hashtags(&$item) { $tags = get_tags($item["body"]); // No hashtags? - if (!count($tags)) - return(false); + if (!count($tags)) { + return false; + } // This sorting is important when there are hashtags that are part of other hashtags // Otherwise there could be problems with hashtags like #test and #test2 @@ -1071,6 +1140,7 @@ function item_body_set_hashtags(&$item) { $URLSearchString = "^\[\]"; + /// @TODO old-lost code? // All hashtags should point to the home server //$item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", // "#[url=".App::get_baseurl()."/search?tag=$2]$2[/url]", $item["body"]); @@ -1080,41 +1150,39 @@ function item_body_set_hashtags(&$item) { // mask hashtags inside of url, bookmarks and attachments to avoid urls in urls $item["body"] = preg_replace_callback("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", - function ($match){ - return("[url=".str_replace("#", "#", $match[1])."]".str_replace("#", "#", $match[2])."[/url]"); - },$item["body"]); + function ($match) { + return ("[url=" . str_replace("#", "#", $match[1]) . "]" . str_replace("#", "#", $match[2]) . "[/url]"); + }, $item["body"]); $item["body"] = preg_replace_callback("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", - function ($match){ - return("[bookmark=".str_replace("#", "#", $match[1])."]".str_replace("#", "#", $match[2])."[/bookmark]"); - },$item["body"]); + function ($match) { + return ("[bookmark=" . str_replace("#", "#", $match[1]) . "]" . str_replace("#", "#", $match[2]) . "[/bookmark]"); + }, $item["body"]); $item["body"] = preg_replace_callback("/\[attachment (.*)\](.*?)\[\/attachment\]/ism", - function ($match){ - return("[attachment ".str_replace("#", "#", $match[1])."]".$match[2]."[/attachment]"); - },$item["body"]); + function ($match) { + return ("[attachment " . str_replace("#", "#", $match[1]) . "]" . $match[2] . "[/attachment]"); + }, $item["body"]); // Repair recursive urls $item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", "#$2", $item["body"]); - - foreach($tags as $tag) { - if (strpos($tag,'#') !== 0) - continue; - - if (strpos($tag,'[url=')) + foreach ($tags as $tag) { + if ((strpos($tag, '#') !== 0) || (strpos($tag, '[url='))) { continue; + } $basetag = str_replace('_',' ',substr($tag,1)); - $newtag = '#[url='.App::get_baseurl().'/search?tag='.rawurlencode($basetag).']'.$basetag.'[/url]'; + $newtag = '#[url=' . App::get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; $item["body"] = str_replace($tag, $newtag, $item["body"]); - if (!stristr($item["tag"],"/search?tag=".$basetag."]".$basetag."[/url]")) { - if (strlen($item["tag"])) + if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) { + if (strlen($item["tag"])) { $item["tag"] = ','.$item["tag"]; + } $item["tag"] = $newtag.$item["tag"]; } } @@ -1125,10 +1193,12 @@ function item_body_set_hashtags(&$item) { function get_item_guid($id) { $r = q("SELECT `guid` FROM `item` WHERE `id` = %d LIMIT 1", intval($id)); - if (dbm::is_result($r)) - return($r[0]["guid"]); - else - return(""); + if (dbm::is_result($r)) { + return $r[0]["guid"]; + } else { + /// @TODO This else-block can be elimited again + return ""; + } } function get_item_id($guid, $uid = 0) { @@ -1136,8 +1206,9 @@ function get_item_id($guid, $uid = 0) { $nick = ""; $id = 0; - if ($uid == 0) + if ($uid == 0) { $uid == local_user(); + } // Does the given user have this item? if ($uid) { @@ -1163,14 +1234,15 @@ function get_item_id($guid, $uid = 0) { $nick = $r[0]["nickname"]; } } - return(array("nick" => $nick, "id" => $id)); + return array("nick" => $nick, "id" => $id); } // return - test -function get_item_contact($item,$contacts) { - if (! count($contacts) || (! is_array($item))) +function get_item_contact($item, $contacts) { + if (! count($contacts) || (! is_array($item))) { return false; - foreach($contacts as $contact) { + } + foreach ($contacts as $contact) { if ($contact['id'] == $item['contact-id']) { return $contact; break; // NOTREACHED @@ -1185,15 +1257,13 @@ function get_item_contact($item,$contacts) { * @param int $item_id * @return bool true if item was deleted, else false */ -function tag_deliver($uid,$item_id) { - - // +function tag_deliver($uid, $item_id) { $a = get_app(); $mention = false; - $u = q("select * from user where uid = %d limit 1", + $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid) ); @@ -1217,24 +1287,25 @@ function tag_deliver($uid,$item_id) { $link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']); - // Diaspora uses their own hardwired link URL in @-tags - // instead of the one we supply with webfinger - + /* + * Diaspora uses their own hardwired link URL in @-tags + * instead of the one we supply with webfinger + */ $dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']); - $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { - if (link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { + foreach ($matches as $mtch) { + if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) { $mention = true; logger('tag_deliver: mention found: ' . $mtch[2]); } } } - if (! $mention){ - if ( ($community_page || $prvgroup) && - (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])){ + if (! $mention) { + if (($community_page || $prvgroup) && + (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])) { // mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment) // delete it! logger("tag_deliver: no-mention top-level post to communuty or private group. delete."); @@ -1251,21 +1322,21 @@ function tag_deliver($uid,$item_id) { call_hooks('tagged', $arr); - if ((! $community_page) && (! $prvgroup)) + if ((! $community_page) && (! $prvgroup)) { return; + } - - // tgroup delivery - setup a second delivery chain - // prevent delivery looping - only proceed - // if the message originated elsewhere and is a top-level post - - if (($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) + /* + * tgroup delivery - setup a second delivery chain + * prevent delivery looping - only proceed + * if the message originated elsewhere and is a top-level post + */ + if (($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) { return; + } // now change this copy of the post to a forum head message and deliver to all the tgroup members - - - $c = q("select name, url, thumb from contact where self = 1 and uid = %d limit 1", + $c = q("SELECT `name`, `url`, `thumb` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", intval($u[0]['uid']) ); if (! dbm::is_result($c)) { @@ -1299,14 +1370,15 @@ function tag_deliver($uid,$item_id) { -function tgroup_check($uid,$item) { +function tgroup_check($uid, $item) { $mention = false; // check that the message originated elsewhere and is a top-level post - if (($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri'])) + if (($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri'])) { return false; + } /// @TODO Encapsulate this or find it encapsulated and replace all occurrances $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", @@ -1319,18 +1391,18 @@ function tgroup_check($uid,$item) { $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); $prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false); - $link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']); - // Diaspora uses their own hardwired link URL in @-tags - // instead of the one we supply with webfinger - + /* + * Diaspora uses their own hardwired link URL in @-tags + * instead of the one we supply with webfinger + */ $dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']); - $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) { foreach ($matches as $mtch) { - if (link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { + if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) { $mention = true; logger('tgroup_check: mention found: ' . $mtch[2]); } @@ -1341,23 +1413,25 @@ function tgroup_check($uid,$item) { return false; } - /// @TODO Combines both return statements into one + /// @TODO Combine both return statements into one return (($community_page) || ($prvgroup)); } -/* - This function returns true if $update has an edited timestamp newer - than $existing, i.e. $update contains new data which should override - what's already there. If there is no timestamp yet, the update is - assumed to be newer. If the update has no timestamp, the existing - item is assumed to be up-to-date. If the timestamps are equal it - assumes the update has been seen before and should be ignored. - */ -function edited_timestamp_is_newer($existing, $update) { - if (!x($existing,'edited') || !$existing['edited']) { +/** + * This function returns true if $update has an edited timestamp newer + * than $existing, i.e. $update contains new data which should override + * what's already there. If there is no timestamp yet, the update is + * assumed to be newer. If the update has no timestamp, the existing + * item is assumed to be up-to-date. If the timestamps are equal it + * assumes the update has been seen before and should be ignored. + * + * @todo fix type-hints (both array) + */ +function edited_timestamp_is_newer ($existing, $update) { + if (!x($existing, 'edited') || !$existing['edited']) { return true; } - if (!x($update,'edited') || !$update['edited']) { + if (!x($update, 'edited') || !$update['edited']) { return false; } @@ -1391,16 +1465,17 @@ function edited_timestamp_is_newer($existing, $update) { * model where comments can have sub-threads. That would require some massive sorting * to get all the feed items into a mostly linear ordering, and might still require * recursion. + * + * @todo find proper type-hints */ - -function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) { +function consume_feed($xml, $importer, &$contact, &$hub, $datedir = 0, $pass = 0) { if ($contact['network'] === NETWORK_OSTATUS) { if ($pass < 2) { // Test - remove before flight //$tempfile = tempnam(get_temppath(), "ostatus2"); //file_put_contents($tempfile, $xml); logger("Consume OStatus messages ", LOGGER_DEBUG); - ostatus::import($xml,$importer,$contact, $hub); + ostatus::import($xml, $importer, $contact, $hub); } return; } @@ -1408,7 +1483,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if ($contact['network'] === NETWORK_FEED) { if ($pass < 2) { logger("Consume feeds", LOGGER_DEBUG); - feed_import($xml,$importer,$contact, $hub); + feed_import($xml, $importer, $contact, $hub); } return; } @@ -1416,7 +1491,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if ($contact['network'] === NETWORK_DFRN) { logger("Consume DFRN messages", LOGGER_DEBUG); - $r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, + $r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, `contact`.`pubkey` AS `cpubkey`, `contact`.`prvkey` AS `cprvkey`, `contact`.`thumb` AS `thumb`, @@ -1428,34 +1503,40 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) WHERE `contact`.`id` = %d AND `user`.`uid` = %d", dbesc($contact["id"]), dbesc($importer["uid"]) ); - if ($r) { + if (dbm::is_result($r)) { logger("Now import the DFRN feed"); - dfrn::import($xml,$r[0], true); + dfrn::import($xml, $r[0], true); return; } } } +/// @TODO type-hint is array function item_is_remote_self($contact, &$datarray) { $a = get_app(); - if (!$contact['remote_self']) + if (!$contact['remote_self']) { return false; + } // Prevent the forwarding of posts that are forwarded - if ($datarray["extid"] == NETWORK_DFRN) + if ($datarray["extid"] == NETWORK_DFRN) { return false; + } // Prevent to forward already forwarded posts - if ($datarray["app"] == $a->get_hostname()) + if ($datarray["app"] == $a->get_hostname()) { return false; + } // Only forward posts - if ($datarray["verb"] != ACTIVITY_POST) + if ($datarray["verb"] != ACTIVITY_POST) { return false; + } - if (($contact['network'] != NETWORK_FEED) AND $datarray['private']) + if (($contact['network'] != NETWORK_FEED) AND $datarray['private']) { return false; + } $datarray2 = $datarray; logger('remote-self start - Contact '.$contact['url'].' - '.$contact['remote_self'].' Item '.print_r($datarray, true), LOGGER_DEBUG); @@ -1477,25 +1558,28 @@ function item_is_remote_self($contact, &$datarray) { if ($contact['network'] != NETWORK_FEED) { $datarray["guid"] = get_guid(32); unset($datarray["plink"]); - $datarray["uri"] = item_new_uri($a->get_hostname(),$contact['uid'], $datarray["guid"]); + $datarray["uri"] = item_new_uri($a->get_hostname(), $contact['uid'], $datarray["guid"]); $datarray["parent-uri"] = $datarray["uri"]; $datarray["extid"] = $contact['network']; $urlpart = parse_url($datarray2['author-link']); $datarray["app"] = $urlpart["host"]; - } else + } else { $datarray['private'] = 0; + } } if ($contact['network'] != NETWORK_FEED) { // Store the original post $r = item_store($datarray2, false, false); logger('remote-self post original item - Contact '.$contact['url'].' return '.$r.' Item '.print_r($datarray2, true), LOGGER_DEBUG); - } else + } else { $datarray["app"] = "Feed"; + } return true; } +/// @TODO find proper type-hints function new_follower($importer, $contact, $datarray, $item, $sharing = false) { $url = notags(trim($datarray['author-link'])); $name = notags(trim($datarray['author-name'])); @@ -1546,6 +1630,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) { update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true); } + /// @TODO Encapsulate this into a function/method $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer['uid']) ); @@ -1634,17 +1719,18 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { ); } - // Diaspora has different message-ids in feeds than they do - // through the direct Diaspora protocol. If we try and use - // the feed, we'll get duplicates. So don't. - - if ((! dbm::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) + /* + * Diaspora has different message-ids in feeds than they do + * through the direct Diaspora protocol. If we try and use + * the feed, we'll get duplicates. So don't. + */ + if ((! dbm::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) { return; + } $push_url = get_config('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id']; // Use a single verify token, even if multiple hubs - $verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string()); $params= 'hub.mode=' . $hubmode . '&hub.callback=' . urlencode($push_url) . '&hub.topic=' . urlencode($contact['poll']) . '&hub.verify=async&hub.verify_token=' . $verify_token; @@ -1658,7 +1744,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { ); } - post_url($url,$params); + post_url($url, $params); logger('subscribe_to_hub: returns: ' . $a->get_curl_code(), LOGGER_DEBUG); @@ -1668,8 +1754,9 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { function fix_private_photos($s, $uid, $item = null, $cid = 0) { - if (get_config('system','disable_embedded')) + if (get_config('system','disable_embedded')) { return $s; + } $a = get_app(); @@ -1682,7 +1769,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_len = ($img_start !== false ? strpos(substr($orig_body, $img_start + $img_st_close + 1), '[/img]') : false); - while( ($img_st_close !== false) && ($img_len !== false) ) { + while ( ($img_st_close !== false) && ($img_len !== false) ) { $img_st_close++; // make it point to AFTER the closing bracket $image = substr($orig_body, $img_start + $img_st_close, $img_len); @@ -1694,27 +1781,28 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { // Only embed locally hosted photos $replace = false; $i = basename($image); - $i = str_replace(array('.jpg','.png','.gif'),array('','',''),$i); - $x = strpos($i,'-'); + $i = str_replace(array('.jpg', '.png', '.gif'),array('', '',''), $i); + $x = strpos($i, '-'); if ($x) { - $res = substr($i,$x+1); - $i = substr($i,0,$x); + $res = substr($i, $x + 1); + $i = substr($i, 0, $x); $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d AND `uid` = %d", dbesc($i), intval($res), intval($uid) + ); - if ($r) { - - // Check to see if we should replace this photo link with an embedded image - // 1. No need to do so if the photo is public - // 2. If there's a contact-id provided, see if they're in the access list - // for the photo. If so, embed it. - // 3. Otherwise, if we have an item, see if the item permissions match the photo - // permissions, regardless of order but first check to see if they're an exact - // match to save some processing overhead. - + if (dbm::is_result($r)) { + /* + * Check to see if we should replace this photo link with an embedded image + * 1. No need to do so if the photo is public + * 2. If there's a contact-id provided, see if they're in the access list + * for the photo. If so, embed it. + * 3. Otherwise, if we have an item, see if the item permissions match the photo + * permissions, regardless of order but first check to see if they're an exact + * match to save some processing overhead. + */ if (has_permissions($r[0])) { if ($cid) { $recips = enumerate_permissions($r[0]); @@ -1722,8 +1810,9 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $replace = true; } } elseif ($item) { - if (compare_permissions($item,$r[0])) + if (compare_permissions($item, $r[0])) { $replace = true; + } } } if ($replace) { @@ -1755,8 +1844,9 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $new_body = $new_body . substr($orig_body, 0, $img_start + $img_st_close) . $image . '[/img]'; $orig_body = substr($orig_body, $img_start + $img_st_close + $img_len + strlen('[/img]')); - if ($orig_body === false) + if ($orig_body === false) { $orig_body = ''; + } $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); @@ -1765,63 +1855,75 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $new_body = $new_body . $orig_body; - return($new_body); + return $new_body; } +/// @TODO type-hint is array function has_permissions($obj) { - if (($obj['allow_cid'] != '') || ($obj['allow_gid'] != '') || ($obj['deny_cid'] != '') || ($obj['deny_gid'] != '')) - return true; - return false; + return ( + ( + x($obj, 'allow_cid') + ) || ( + x($obj, 'allow_gid') + ) || ( + x($obj, 'deny_cid') + ) || ( + x($obj, 'deny_gid') + ) + ); } -function compare_permissions($obj1,$obj2) { +/// @TODO type-hint is array +function compare_permissions($obj1, $obj2) { // first part is easy. Check that these are exactly the same. if (($obj1['allow_cid'] == $obj2['allow_cid']) && ($obj1['allow_gid'] == $obj2['allow_gid']) && ($obj1['deny_cid'] == $obj2['deny_cid']) - && ($obj1['deny_gid'] == $obj2['deny_gid'])) + && ($obj1['deny_gid'] == $obj2['deny_gid'])) { return true; + } // This is harder. Parse all the permissions and compare the resulting set. - $recipients1 = enumerate_permissions($obj1); $recipients2 = enumerate_permissions($obj2); sort($recipients1); sort($recipients2); - if ($recipients1 == $recipients2) - return true; - return false; + + /// @TODO Comparison of arrays, maybe use array_diff_assoc() here? + return ($recipients1 == $recipients2); } // returns an array of contact-ids that are allowed to see this object - +/// @TODO type-hint is array function enumerate_permissions($obj) { $allow_people = expand_acl($obj['allow_cid']); $allow_groups = expand_groups(expand_acl($obj['allow_gid'])); $deny_people = expand_acl($obj['deny_cid']); $deny_groups = expand_groups(expand_acl($obj['deny_gid'])); - $recipients = array_unique(array_merge($allow_people,$allow_groups)); - $deny = array_unique(array_merge($deny_people,$deny_groups)); - $recipients = array_diff($recipients,$deny); + $recipients = array_unique(array_merge($allow_people, $allow_groups)); + $deny = array_unique(array_merge($deny_people, $deny_groups)); + $recipients = array_diff($recipients, $deny); return $recipients; } function item_getfeedtags($item) { $ret = array(); $matches = false; - $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); + $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches); if ($cnt) { - for($x = 0; $x < $cnt; $x ++) { - if ($matches[1][$x]) - $ret[$matches[2][$x]] = array('#',$matches[1][$x], $matches[2][$x]); + for ($x = 0; $x < $cnt; $x ++) { + if ($matches[1][$x]) { + $ret[$matches[2][$x]] = array('#', $matches[1][$x], $matches[2][$x]); + } } } $matches = false; - $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); + $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches); if ($cnt) { - for($x = 0; $x < $cnt; $x ++) { - if ($matches[1][$x]) - $ret[] = array('@',$matches[1][$x], $matches[2][$x]); + for ($x = 0; $x < $cnt; $x ++) { + if ($matches[1][$x]) { + $ret[] = array('@', $matches[1][$x], $matches[2][$x]); + } } } return $ret; @@ -1829,23 +1931,29 @@ function item_getfeedtags($item) { function item_expire($uid, $days, $network = "", $force = false) { - if ((! $uid) || ($days < 1)) + if ((! $uid) || ($days < 1)) { return; + } - // $expire_network_only = save your own wall posts - // and just expire conversations started by others - - $expire_network_only = get_pconfig($uid,'expire','network_only'); + /* + * $expire_network_only = save your own wall posts + * and just expire conversations started by others + */ + $expire_network_only = get_pconfig($uid,'expire', 'network_only'); $sql_extra = ((intval($expire_network_only)) ? " AND wall = 0 " : ""); if ($network != "") { $sql_extra .= sprintf(" AND network = '%s' ", dbesc($network)); - // There is an index "uid_network_received" but not "uid_network_created" - // This avoids the creation of another index just for one purpose. - // And it doesn't really matter wether to look at "received" or "created" + + /* + * There is an index "uid_network_received" but not "uid_network_created" + * This avoids the creation of another index just for one purpose. + * And it doesn't really matter wether to look at "received" or "created" + */ $range = "AND `received` < UTC_TIMESTAMP() - INTERVAL %d DAY "; - } else + } else { $range = "AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY "; + } $r = q("SELECT `file`, `resource-id`, `starred`, `type`, `id` FROM `item` WHERE `uid` = %d $range @@ -1856,61 +1964,66 @@ function item_expire($uid, $days, $network = "", $force = false) { intval($days) ); - if (! dbm::is_result($r)) + if (! dbm::is_result($r)) { return; + } - $expire_items = get_pconfig($uid, 'expire','items'); - $expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1 + $expire_items = get_pconfig($uid, 'expire', 'items'); + $expire_items = (($expire_items === false) ? 1 : intval($expire_items)); // default if not set: 1 // Forcing expiring of items - but not notes and marked items - if ($force) + if ($force) { $expire_items = true; + } - $expire_notes = get_pconfig($uid, 'expire','notes'); - $expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1 + $expire_notes = get_pconfig($uid, 'expire', 'notes'); + $expire_notes = (($expire_notes === false) ? 1 : intval($expire_notes)); // default if not set: 1 - $expire_starred = get_pconfig($uid, 'expire','starred'); - $expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1 + $expire_starred = get_pconfig($uid, 'expire', 'starred'); + $expire_starred = (($expire_starred === false) ? 1 : intval($expire_starred)); // default if not set: 1 - $expire_photos = get_pconfig($uid, 'expire','photos'); - $expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0 + $expire_photos = get_pconfig($uid, 'expire', 'photos'); + $expire_photos = (($expire_photos === false) ? 0 : intval($expire_photos)); // default if not set: 0 logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); - foreach($r as $item) { + foreach ($r as $item) { // don't expire filed items - if (strpos($item['file'],'[') !== false) + if (strpos($item['file'],'[') !== false) { continue; + } // Only expire posts, not photos and photo comments - if ($expire_photos==0 && strlen($item['resource-id'])) + if ($expire_photos == 0 && strlen($item['resource-id'])) { continue; - if ($expire_starred==0 && intval($item['starred'])) + } elseif ($expire_starred == 0 && intval($item['starred'])) { continue; - if ($expire_notes==0 && $item['type']=='note') + } elseif ($expire_notes == 0 && $item['type'] == 'note') { continue; - if ($expire_items==0 && $item['type']!='note') + } elseif ($expire_items == 0 && $item['type'] != 'note') { continue; + } - drop_item($item['id'],false); + drop_item($item['id'], false); } - proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid); + proc_run(PRIORITY_HIGH, "include/notifier.php", "expire", $uid); } - +/// @TODO type-hint is array function drop_items($items) { $uid = 0; - if (! local_user() && ! remote_user()) + if (! local_user() && ! remote_user()) { return; + } if (count($items)) { - foreach($items as $item) { + foreach ($items as $item) { $owner = drop_item($item,false); if ($owner && ! $uid) $uid = $owner; @@ -1919,12 +2032,13 @@ function drop_items($items) { // multiple threads may have been deleted, send an expire notification - if ($uid) - proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid); + if ($uid) { + proc_run(PRIORITY_HIGH, "include/notifier.php", "expire", $uid); + } } -function drop_item($id,$interactive = true) { +function drop_item($id, $interactive = true) { $a = get_app(); @@ -1935,8 +2049,9 @@ function drop_item($id,$interactive = true) { ); if (! dbm::is_result($r)) { - if (! $interactive) + if (! $interactive) { return 0; + } notice( t('Item not found.') . EOL); goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); } @@ -1950,7 +2065,7 @@ function drop_item($id,$interactive = true) { // check if logged in user is either the author or owner of this item if (is_array($_SESSION['remote'])) { - foreach($_SESSION['remote'] as $visitor) { + foreach ($_SESSION['remote'] as $visitor) { if ($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) { $contact_id = $visitor['cid']; break; @@ -1967,7 +2082,7 @@ function drop_item($id,$interactive = true) { // so add any arguments as hidden inputs $query = explode_querystring($a->query_string); $inputs = array(); - foreach($query['args'] as $arg) { + foreach ($query['args'] as $arg) { if (strpos($arg, 'confirm=') === false) { $arg_parts = explode('=', $arg); $inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]); @@ -2004,27 +2119,28 @@ function drop_item($id,$interactive = true) { // clean up categories and tags so they don't end up as orphans $matches = false; - $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { - file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],true); + foreach ($matches as $mtch) { + file_tag_unsave_file($item['uid'], $item['id'], $mtch[1],true); } } $matches = false; - $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { - file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],false); + foreach ($matches as $mtch) { + file_tag_unsave_file($item['uid'], $item['id'], $mtch[1],false); } } - // If item is a link to a photo resource, nuke all the associated photos - // (visitors will not have photo resources) - // This only applies to photos uploaded from the photos page. Photos inserted into a post do not - // generate a resource-id and therefore aren't intimately linked to the item. - + /* + * If item is a link to a photo resource, nuke all the associated photos + * (visitors will not have photo resources) + * This only applies to photos uploaded from the photos page. Photos inserted into a post do not + * generate a resource-id and therefore aren't intimately linked to the item. + */ if (strlen($item['resource-id'])) { q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ", dbesc($item['resource-id']), @@ -2034,7 +2150,6 @@ function drop_item($id,$interactive = true) { } // If item is a link to an event, nuke the event record. - if (intval($item['event-id'])) { q("DELETE FROM `event` WHERE `id` = %d AND `uid` = %d", intval($item['event-id']), @@ -2044,8 +2159,7 @@ function drop_item($id,$interactive = true) { } // If item has attachments, drop them - - foreach(explode(",",$item['attach']) as $attach){ + foreach (explode(", ", $item['attach']) as $attach) { preg_match("|attach/(\d+)|", $attach, $matches); q("DELETE FROM `attach` WHERE `id` = %d AND `uid` = %d", intval($matches[1]), @@ -2058,7 +2172,7 @@ function drop_item($id,$interactive = true) { // clean up item_id and sign meta-data tables /* - // Old code - caused very long queries and warning entries in the mysql logfiles: + /// @TODO Old code - caused very long queries and warning entries in the mysql logfiles: $r = q("DELETE FROM item_id where iid in (select id from item where parent = %d and uid = %d)", intval($item['id']), @@ -2074,29 +2188,28 @@ function drop_item($id,$interactive = true) { // The new code splits the queries since the mysql optimizer really has bad problems with subqueries // Creating list of parents - $r = q("select id from item where parent = %d and uid = %d", + $r = q("SELECT `id` FROM `item` WHERE `parent` = %d AND `uid` = %d", intval($item['id']), intval($item['uid']) ); $parentid = ""; - foreach ($r AS $row) { - if ($parentid != "") + foreach ($r as $row) { + if ($parentid != "") { $parentid .= ", "; + } $parentid .= $row["id"]; } // Now delete them if ($parentid != "") { - $r = q("DELETE FROM item_id where iid in (%s)", dbesc($parentid)); - - $r = q("DELETE FROM sign where iid in (%s)", dbesc($parentid)); + $r = q("DELETE FROM `item_id` WHERE `iid` IN (%s)", dbesc($parentid)); + $r = q("DELETE FROM `sign` WHERE `iid` IN (%s)", dbesc($parentid)); } // If it's the parent of a comment thread, kill all the kids - if ($item['uri'] == $item['parent-uri']) { $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = '' WHERE `parent-uri` = '%s' AND `uid` = %d ", @@ -2132,15 +2245,17 @@ function drop_item($id,$interactive = true) { // send the notification upstream/downstream as the case may be - proc_run(PRIORITY_HIGH,"include/notifier.php", "drop", $drop_id); + proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id); - if (! $interactive) + if (! $interactive) { return $owner; + } goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); //NOTREACHED } else { - if (! $interactive) + if (! $interactive) { return 0; + } notice( t('Permission denied.') . EOL); goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); //NOTREACHED @@ -2149,101 +2264,113 @@ function drop_item($id,$interactive = true) { } -function first_post_date($uid,$wall = false) { - $r = q("select id, created from item - where uid = %d and wall = %d and deleted = 0 and visible = 1 AND moderated = 0 - and id = parent - order by created asc limit 1", +function first_post_date($uid, $wall = false) { + $r = q("SELECT `id`, `created` FROM `item` + WHERE `uid` = %d AND `wall` = %d AND `deleted` = 0 AND `visible` = 1 AND `moderated` = 0 + AND `id` = `parent` + ORDER BY `created` ASC LIMIT 1", intval($uid), intval($wall ? 1 : 0) ); if (dbm::is_result($r)) { -// logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA); - return substr(datetime_convert('',date_default_timezone_get(),$r[0]['created']),0,10); + // logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA); + return substr(datetime_convert('',date_default_timezone_get(), $r[0]['created']),0,10); } return false; } /* modified posted_dates() {below} to arrange the list in years */ function list_post_dates($uid, $wall) { - $dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d'); + $dnow = datetime_convert('',date_default_timezone_get(), 'now','Y-m-d'); $dthen = first_post_date($uid, $wall); - if (! $dthen) + if (! $dthen) { return array(); + } // Set the start and end date to the beginning of the month - $dnow = substr($dnow,0,8).'01'; - $dthen = substr($dthen,0,8).'01'; + $dnow = substr($dnow, 0, 8) . '01'; + $dthen = substr($dthen, 0, 8) . '01'; $ret = array(); - // Starting with the current month, get the first and last days of every - // month down to and including the month of the first post - while(substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { - $dyear = intval(substr($dnow,0,4)); - $dstart = substr($dnow,0,8) . '01'; - $dend = substr($dnow,0,8) . get_dim(intval($dnow),intval(substr($dnow,5))); - $start_month = datetime_convert('','',$dstart,'Y-m-d'); - $end_month = datetime_convert('','',$dend,'Y-m-d'); - $str = day_translate(datetime_convert('','',$dnow,'F')); - if (! $ret[$dyear]) + /* + * Starting with the current month, get the first and last days of every + * month down to and including the month of the first post + */ + while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { + $dyear = intval(substr($dnow, 0, 4)); + $dstart = substr($dnow, 0, 8) . '01'; + $dend = substr($dnow, 0, 8) . get_dim(intval($dnow), intval(substr($dnow, 5))); + $start_month = datetime_convert('', '', $dstart, 'Y-m-d'); + $end_month = datetime_convert('', '', $dend, 'Y-m-d'); + $str = day_translate(datetime_convert('', '', $dnow, 'F')); + if (!$ret[$dyear]) { $ret[$dyear] = array(); - $ret[$dyear][] = array($str,$end_month,$start_month); - $dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d'); + } + $ret[$dyear][] = array($str, $end_month, $start_month); + $dnow = datetime_convert('', '', $dnow . ' -1 month', 'Y-m-d'); } return $ret; } -function posted_dates($uid,$wall) { - $dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d'); +function posted_dates($uid, $wall) { + $dnow = datetime_convert('', date_default_timezone_get(), 'now', 'Y-m-d'); - $dthen = first_post_date($uid,$wall); - if (! $dthen) + $dthen = first_post_date($uid, $wall); + if (! $dthen) { return array(); + } // Set the start and end date to the beginning of the month - $dnow = substr($dnow,0,8).'01'; - $dthen = substr($dthen,0,8).'01'; + $dnow = substr($dnow, 0, 8) . '01'; + $dthen = substr($dthen, 0, 8) . '01'; $ret = array(); - // Starting with the current month, get the first and last days of every - // month down to and including the month of the first post - while(substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { - $dstart = substr($dnow,0,8) . '01'; - $dend = substr($dnow,0,8) . get_dim(intval($dnow),intval(substr($dnow,5))); - $start_month = datetime_convert('','',$dstart,'Y-m-d'); - $end_month = datetime_convert('','',$dend,'Y-m-d'); - $str = day_translate(datetime_convert('','',$dnow,'F Y')); - $ret[] = array($str,$end_month,$start_month); - $dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d'); + /* + * Starting with the current month, get the first and last days of every + * month down to and including the month of the first post + */ + while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { + $dstart = substr($dnow, 0, 8) . '01'; + $dend = substr($dnow, 0, 8) . get_dim(intval($dnow), intval(substr($dnow, 5))); + $start_month = datetime_convert('', '', $dstart, 'Y-m-d'); + $end_month = datetime_convert('', '', $dend, 'Y-m-d'); + $str = day_translate(datetime_convert('', '', $dnow, 'F Y')); + $ret[] = array($str, $end_month, $start_month); + $dnow = datetime_convert('', '', $dnow . ' -1 month', 'Y-m-d'); } return $ret; } -function posted_date_widget($url,$uid,$wall) { +function posted_date_widget($url, $uid, $wall) { $o = ''; - if (! feature_enabled($uid,'archives')) + if (! feature_enabled($uid, 'archives')) { return $o; + } // For former Facebook folks that left because of "timeline" - -/* if ($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget'))) - return $o;*/ + /* + * @TODO old-lost code? + if ($wall && intval(get_pconfig($uid, 'system', 'no_wall_archive_widget'))) + return $o; + */ $visible_years = get_pconfig($uid,'system','archive_visible_years'); - if (! $visible_years) + if (! $visible_years) { $visible_years = 5; + } - $ret = list_post_dates($uid,$wall); + $ret = list_post_dates($uid, $wall); - if (! dbm::is_result($ret)) + if (! dbm::is_result($ret)) { return $o; + } - $cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years; - $cutoff = ((array_key_exists($cutoff_year,$ret))? true : false); + $cutoff_year = intval(datetime_convert('',date_default_timezone_get(), 'now', 'Y')) - $visible_years; + $cutoff = ((array_key_exists($cutoff_year, $ret))? true : false); $o = replace_macros(get_markup_template('posted_date_widget.tpl'),array( '$title' => t('Archives'), diff --git a/include/notifier.php b/include/notifier.php index e3d7d10d6..370611b4e 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -516,7 +516,8 @@ function notifier_run(&$argv, &$argc){ $r0 = Diaspora::relay_list(); } - $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s' + $r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network` + FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()", dbesc(NETWORK_DIASPORA), intval($owner['uid']), diff --git a/include/ostatus.php b/include/ostatus.php index 9b7849509..c1d730eb1 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -355,6 +355,14 @@ class ostatus { $item["body"] = add_page_info_to_body(html2bbcode($xpath->query('atom:content/text()', $entry)->item(0)->nodeValue)); $item["object-type"] = $xpath->query('activity:object-type/text()', $entry)->item(0)->nodeValue; + $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue; + + // Mastodon Content Warning + if (($item["verb"] == ACTIVITY_POST) AND $xpath->evaluate('boolean(atom:summary)', $entry)) { + $clear_text = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue; + + $item["body"] = html2bbcode($clear_text) . '[spoiler]' . $item["body"] . '[/spoiler]'; + } if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) OR ($item["object-type"] == ACTIVITY_OBJ_EVENT)) { $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue; @@ -363,11 +371,10 @@ class ostatus { $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue; } $item["object"] = $xml; - $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue; /// @TODO /// Delete a message - if ($item["verb"] == "qvitter-delete-notice") { + if ($item["verb"] == "qvitter-delete-notice" || $item["verb"] == ACTIVITY_DELETE) { // ignore "Delete" messages (by now) logger("Ignore delete message ".print_r($item, true)); continue; @@ -713,11 +720,11 @@ class ostatus { $conversations = q("SELECT `term`.`oid`, `term`.`url`, `term`.`uid` FROM `term` STRAIGHT_JOIN `thread` ON `thread`.`iid` = `term`.`oid` AND `thread`.`uid` = `term`.`uid` WHERE `term`.`type` = 7 AND `term`.`term` > '%s' AND `thread`.`mention` - GROUP BY `term`.`url`, `term`.`uid` ORDER BY `term`.`term` DESC", dbesc($start)); + GROUP BY `term`.`url`, `term`.`uid`, `term`.`oid`, `term`.`term` ORDER BY `term`.`term` DESC", dbesc($start)); } else { $conversations = q("SELECT `oid`, `url`, `uid` FROM `term` WHERE `type` = 7 AND `term` > '%s' - GROUP BY `url`, `uid` ORDER BY `term` DESC", dbesc($start)); + GROUP BY `url`, `uid`, `oid`, `term` ORDER BY `term` DESC", dbesc($start)); } foreach ($conversations AS $conversation) { @@ -1472,15 +1479,7 @@ class ostatus { $o = ""; $siteinfo = get_attached_data($item["body"]); - switch($siteinfo["type"]) { - case 'link': - $attributes = array("rel" => "enclosure", - "href" => $siteinfo["url"], - "type" => "text/html; charset=UTF-8", - "length" => "", - "title" => $siteinfo["title"]); - xml::add_element($doc, $root, "link", "", $attributes); - break; + switch ($siteinfo["type"]) { case 'photo': $imgdata = get_photo_info($siteinfo["image"]); $attributes = array("rel" => "enclosure", @@ -1502,29 +1501,31 @@ class ostatus { } if (($siteinfo["type"] != "photo") AND isset($siteinfo["image"])) { - $photodata = get_photo_info($siteinfo["image"]); + $imgdata = get_photo_info($siteinfo["image"]); + $attributes = array("rel" => "enclosure", + "href" => $siteinfo["image"], + "type" => $imgdata["mime"], + "length" => intval($imgdata["size"])); - $attributes = array("rel" => "preview", "href" => $siteinfo["image"], "media:width" => $photodata[0], "media:height" => $photodata[1]); xml::add_element($doc, $root, "link", "", $attributes); } - - $arr = explode('[/attach],',$item['attach']); - if(count($arr)) { - foreach($arr as $r) { + $arr = explode('[/attach],', $item['attach']); + if (count($arr)) { + foreach ($arr as $r) { $matches = false; - $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches); - if($cnt) { + $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches); + if ($cnt) { $attributes = array("rel" => "enclosure", "href" => $matches[1], "type" => $matches[3]); - if(intval($matches[2])) + if (intval($matches[2])) { $attributes["length"] = intval($matches[2]); - - if(trim($matches[4]) != "") + } + if (trim($matches[4]) != "") { $attributes["title"] = trim($matches[4]); - + } xml::add_element($doc, $root, "link", "", $attributes); } } @@ -2052,7 +2053,7 @@ class ostatus { $mentioned = array(); - if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) { + if (($item['parent'] != $item['id']) OR ($item['parent-uri'] !== $item['uri']) OR (($item['thr-parent'] !== '') AND ($item['thr-parent'] !== $item['uri']))) { $parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"])); $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); @@ -2082,7 +2083,13 @@ class ostatus { if (intval($item["parent"]) > 0) { $conversation = App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]; xml::add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation", "href" => $conversation)); - xml::add_element($doc, $entry, "ostatus:conversation", $conversation); + + $attributes = array( + "href" => $conversation, + "local_id" => $item["parent"], + "ref" => $conversation); + + xml::add_element($doc, $entry, "ostatus:conversation", $conversation, $attributes); } $tags = item_getfeedtags($item); diff --git a/include/pgettext.php b/include/pgettext.php index 335869eda..b42dcec11 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -44,7 +44,7 @@ function get_browser_language() { // check if we have translations for the preferred languages and pick the 1st that has for ($i=0; $i 0) { for ($x = 0; $x < count($ret); $x ++) { - if (substr($ret[$x],0,5) === 'data:') { - if (strstr($ret[$x],',')) { - $ret[$x] = substr($ret[$x],strpos($ret[$x],',')+1); + if (substr($ret[$x], 0, 5) === 'data:') { + if (strstr($ret[$x], ',')) { + $ret[$x] = substr($ret[$x], strpos($ret[$x], ',') + 1); } else { - $ret[$x] = substr($ret[$x],5); + $ret[$x] = substr($ret[$x], 5); } } elseif (normalise_link($ret[$x]) == 'http://') { $ret[$x] = fetch_url($ret[$x]); @@ -39,7 +38,7 @@ function get_salmon_key($uri,$keyhash) { } - logger('Key located: ' . print_r($ret,true)); + logger('Key located: ' . print_r($ret, true)); if (count($ret) == 1) { @@ -50,10 +49,9 @@ function get_salmon_key($uri,$keyhash) { // have one key we'll be right. return $ret[0]; - } - else { + } else { foreach ($ret as $a) { - $hash = base64url_encode(hash('sha256',$a)); + $hash = base64url_encode(hash('sha256', $a)); if ($hash == $keyhash) { return $a; } @@ -65,17 +63,17 @@ function get_salmon_key($uri,$keyhash) { -function slapper($owner,$url,$slap) { +function slapper($owner, $url, $slap) { // does contact have a salmon endpoint? - if(! strlen($url)) + if (! strlen($url)) { return; + } - - if(! $owner['sprvkey']) { + if (! $owner['sprvkey']) { logger(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.", - $owner['username'],$owner['uid'])); + $owner['username'], $owner['uid'])); return; } @@ -87,30 +85,33 @@ function slapper($owner,$url,$slap) { $data_type = 'application/atom+xml'; $encoding = 'base64url'; $algorithm = 'RSA-SHA256'; - $keyhash = base64url_encode(hash('sha256',salmon_key($owner['spubkey'])),true); + $keyhash = base64url_encode(hash('sha256', salmon_key($owner['spubkey'])), true); - // precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods + $precomputed = '.' . base64url_encode($data_type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($algorithm); - $precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng=='; + // GNU Social format + $signature = base64url_encode(rsa_sign($data . $precomputed, $owner['sprvkey'])); - $signature = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),$owner['sprvkey'])); + // Compliant format + $signature2 = base64url_encode(rsa_sign(str_replace('=', '', $data . $precomputed), $owner['sprvkey'])); - $signature2 = base64url_encode(rsa_sign($data . $precomputed,$owner['sprvkey'])); + // Old Status.net format + $signature3 = base64url_encode(rsa_sign($data, $owner['sprvkey'])); - $signature3 = base64url_encode(rsa_sign($data,$owner['sprvkey'])); + // At first try the non compliant method that works for GNU Social + $xmldata = array("me:env" => array("me:data" => $data, + "@attributes" => array("type" => $data_type), + "me:encoding" => $encoding, + "me:alg" => $algorithm, + "me:sig" => $signature, + "@attributes2" => array("key_id" => $keyhash))); - $salmon_tpl = get_markup_template('magicsig.tpl'); + $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env"); - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature - )); + $salmon = xml::from_array($xmldata, $xml, false, $namespaces); // slap them - post_url($url,$salmon, array( + post_url($url, $salmon, array( 'Content-type: application/magic-envelope+xml', 'Content-length: ' . strlen($salmon) )); @@ -120,60 +121,59 @@ function slapper($owner,$url,$slap) { // check for success, e.g. 2xx - if($return_code > 299) { + if ($return_code > 299) { - logger('compliant salmon failed. Falling back to status.net hack2'); + logger('GNU Social salmon failed. Falling back to compliant mode'); - // Entirely likely that their salmon implementation is - // non-compliant. Let's try once more, this time only signing - // the data, without stripping '=' chars + // Now try the compliant mode that normally isn't used for GNU Social + $xmldata = array("me:env" => array("me:data" => $data, + "@attributes" => array("type" => $data_type), + "me:encoding" => $encoding, + "me:alg" => $algorithm, + "me:sig" => $signature2, + "@attributes2" => array("key_id" => $keyhash))); - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature2 - )); + $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env"); + + $salmon = xml::from_array($xmldata, $xml, false, $namespaces); // slap them - post_url($url,$salmon, array( + post_url($url, $salmon, array( 'Content-type: application/magic-envelope+xml', 'Content-length: ' . strlen($salmon) )); $return_code = $a->get_curl_code(); - - - if($return_code > 299) { - - logger('compliant salmon failed. Falling back to status.net hack3'); - - // Entirely likely that their salmon implementation is - // non-compliant. Let's try once more, this time only signing - // the data, without the precomputed blob - - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature3 - )); - - // slap them - post_url($url,$salmon, array( - 'Content-type: application/magic-envelope+xml', - 'Content-length: ' . strlen($salmon) - )); - $return_code = $a->get_curl_code(); - } } - logger('slapper for '.$url.' returned ' . $return_code); - if(! $return_code) - return(-1); - if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after'))) - return(-1); + if ($return_code > 299) { + logger('compliant salmon failed. Falling back to old status.net'); + + // Last try. This will most likely fail as well. + $xmldata = array("me:env" => array("me:data" => $data, + "@attributes" => array("type" => $data_type), + "me:encoding" => $encoding, + "me:alg" => $algorithm, + "me:sig" => $signature3, + "@attributes2" => array("key_id" => $keyhash))); + + $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env"); + + $salmon = xml::from_array($xmldata, $xml, false, $namespaces); + + // slap them + post_url($url, $salmon, array( + 'Content-type: application/magic-envelope+xml', + 'Content-length: ' . strlen($salmon) + )); + $return_code = $a->get_curl_code(); + } + + logger('slapper for '.$url.' returned ' . $return_code); + if (! $return_code) { + return(-1); + } + if (($return_code == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) { + return(-1); + } return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1); } - diff --git a/include/socgraph.php b/include/socgraph.php index 642d03d89..a39eca5e8 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -7,6 +7,8 @@ * @todo Detect if it is a forum */ +use \Friendica\Core\Config; + require_once('include/datetime.php'); require_once("include/Scrape.php"); require_once("include/network.php"); @@ -1656,6 +1658,20 @@ function poco_discover_federation() { } } + // Disvover Mastodon servers + if (!Config::get('system','ostatus_disabled')) { + $serverdata = fetch_url("https://instances.mastodon.xyz/instances.json"); + + if ($serverdata) { + $servers = json_decode($serverdata); + + foreach ($servers AS $server) { + $url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name; + proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($url)); + } + } + } + // Currently disabled, since the service isn't available anymore. // It is not removed since I hope that there will be a successor. // Discover GNU Social Servers. @@ -2096,7 +2112,7 @@ function update_gcontact($contact) { fix_alternate_contact_address($contact); if (!isset($contact["updated"])) - $contact["updated"] = datetime_convert(); + $contact["updated"] = dbm::date(); if ($contact["server_url"] == "") { $server_url = $contact["url"]; @@ -2151,7 +2167,7 @@ function update_gcontact($contact) { dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]), intval($contact["nsfw"]), intval($contact["contact-type"]), dbesc($contact["alias"]), dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]), - dbesc($contact["about"]), intval($contact["generation"]), dbesc($contact["updated"]), + dbesc($contact["about"]), intval($contact["generation"]), dbesc(dbm::date($contact["updated"])), dbesc($contact["server_url"]), dbesc($contact["connect"]), dbesc(normalise_link($contact["url"])), intval($contact["generation"])); diff --git a/js/acl.js b/js/acl.js index 4924ac128..054f50960 100644 --- a/js/acl.js +++ b/js/acl.js @@ -65,7 +65,7 @@ ACL.prototype.add_mention = function(id) { if (this.element.val().indexOf( searchText) >= 0 ) { return; } - this.element.val(searchText + this.element.val()); + this.element.val(searchText + this.element.val()).trigger('change'); } ACL.prototype.on_submit = function(){ diff --git a/js/autocomplete.js b/js/autocomplete.js index 8702abbcf..3ed9fa30f 100644 --- a/js/autocomplete.js +++ b/js/autocomplete.js @@ -166,7 +166,7 @@ function listNewLineAutocomplete(id) { if (word != null) { var textBefore = text.value.substring(0, caretPos); var textAfter = text.value.substring(caretPos, text.length); - $('#' + id).val(textBefore + '\r\n[*] ' + textAfter); + $('#' + id).val(textBefore + '\r\n[*] ' + textAfter).trigger('change'); setCaretPosition(text, caretPos + 5); return true; } diff --git a/js/main.js b/js/main.js index aaeef00cf..5df33ed59 100644 --- a/js/main.js +++ b/js/main.js @@ -101,6 +101,7 @@ var start = textarea.selectionStart; var end = textarea.selectionEnd; textarea.value = textarea.value.substring(0, start) + bbcode + textarea.value.substring(end, textarea.value.length); + $(textarea).trigger('change'); }); @@ -223,8 +224,11 @@ var nnm = $("#nav-notifications-menu"); nnm.html(notifications_all + notifications_mark); - var notification_lastitem = parseInt(localStorage.getItem("notification-lastitem")); + var lastItemStorageKey = "notification-lastitem:" + localUser; + var notification_lastitem = parseInt(localStorage.getItem(lastItemStorageKey)); var notification_id = 0; + + // Insert notifs into the notifications-menu $(data.notifications).each(function(key, notif){ var text = notif.message.format('' + notif.name + ''); var contact = ('' + notif.name + ''); @@ -232,19 +236,21 @@ var html = notifications_tpl.format( notif.href, // {0} // link to the source notif.photo, // {1} // photo of the contact - text, // {2} // preformatted text (autor + text) + text, // {2} // preformatted text (autor + text) notif.date, // {3} // date of notification (time ago) - seenclass, // {4} // visited status of the notification + seenclass, // {4} // visited status of the notification new Date(notif.timestamp*1000), // {5} // date of notification notif.url, // {6} // profile url of the contact notif.message.format(contact), // {7} // preformatted html (text including author profile url) - '' // {8} // Deprecated + '' // {8} // Deprecated ); nnm.append(html); }); + + // Desktop Notifications $(data.notifications.reverse()).each(function(key, e){ notification_id = parseInt(e.timestamp); - if (notification_lastitem !== null && notification_id > notification_lastitem) { + if (notification_lastitem !== null && notification_id > notification_lastitem && Number(e.seen) === 0) { if (getNotificationPermission() === "granted") { var notification = new Notification(document.title, { body: decodeHtml(e.message.replace('→ ', '').format(e.name)), @@ -259,7 +265,7 @@ }); notification_lastitem = notification_id; - localStorage.setItem("notification-lastitem", notification_lastitem) + localStorage.setItem(lastItemStorageKey, notification_lastitem) $("img[data-src]", nnm).each(function(i, el){ // Add src attribute for images with a data-src attribute @@ -285,7 +291,7 @@ $.jGrowl(message, {sticky: false, theme: 'info', life: 5000}); }); - /* update the js scrollbars */ + // Update the js scrollbars $('#nav-notifications-menu').perfectScrollbar('update'); }); @@ -317,6 +323,30 @@ } }); + // Scroll to the next/previous thread when pressing J and K + $(document).keydown(function (event) { + var threads = $('.thread_level_1'); + if ((event.keyCode === 74 || event.keyCode === 75) && !$(event.target).is('textarea, input')) { + var scrollTop = $(window).scrollTop(); + if (event.keyCode === 75) { + threads = $(threads.get().reverse()); + } + threads.each(function(key, item) { + var comparison; + var top = $(item).offset().top - 100; + if (event.keyCode === 74) { + comparison = top > scrollTop + 1; + } else if (event.keyCode === 75) { + comparison = top < scrollTop - 1; + } + if (comparison) { + $('html, body').animate({ scrollTop: top }, 200); + return false; + } + }); + } + }); + // Set an event listener for infinite scroll if(typeof infinite_scroll !== 'undefined') { $(window).scroll(function(e){ diff --git a/library/html-to-markdown/.gitignore b/library/html-to-markdown/.gitignore deleted file mode 100644 index aa429a9a1..000000000 --- a/library/html-to-markdown/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -~* -vendor -composer.lock \ No newline at end of file diff --git a/library/html-to-markdown/.travis.yml b/library/html-to-markdown/.travis.yml deleted file mode 100644 index 48b3e64a4..000000000 --- a/library/html-to-markdown/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -language: php -php: - - "5.5" - - "5.4" - - "5.3" -script: phpunit --no-configuration HTML_To_MarkdownTest ./tests/HTML_To_MarkdownTest.php \ No newline at end of file diff --git a/library/html-to-markdown/HTML_To_Markdown.php b/library/html-to-markdown/HTML_To_Markdown.php deleted file mode 100644 index 109780edd..000000000 --- a/library/html-to-markdown/HTML_To_Markdown.php +++ /dev/null @@ -1,598 +0,0 @@ - - * @link https://github.com/nickcernis/html2markdown/ Latest version on GitHub. - * @link http://twitter.com/nickcernis Nick on twitter. - * @license http://www.opensource.org/licenses/mit-license.php MIT - */ -class HTML_To_Markdown -{ - /** - * @var DOMDocument The root of the document tree that holds our HTML. - */ - private $document; - - /** - * @var string|boolean The Markdown version of the original HTML, or false if conversion failed - */ - private $output; - - /** - * @var array Class-wide options users can override. - */ - private $options = array( - 'header_style' => 'setext', // Set to "atx" to output H1 and H2 headers as # Header1 and ## Header2 - 'suppress_errors' => true, // Set to false to show warnings when loading malformed HTML - 'strip_tags' => false, // Set to true to strip tags that don't have markdown equivalents. N.B. Strips tags, not their content. Useful to clean MS Word HTML output. - 'bold_style' => '**', // Set to '__' if you prefer the underlined style - 'italic_style' => '*', // Set to '_' if you prefer the underlined style - 'remove_nodes' => '', // space-separated list of dom nodes that should be removed. example: "meta style script" - ); - - - /** - * Constructor - * - * Set up a new DOMDocument from the supplied HTML, convert it to Markdown, and store it in $this->$output. - * - * @param string $html The HTML to convert to Markdown. - * @param array $overrides [optional] List of style and error display overrides. - */ - public function __construct($html = null, $overrides = null) - { - if ($overrides) - $this->options = array_merge($this->options, $overrides); - - if ($html) - $this->convert($html); - } - - - /** - * Setter for conversion options - * - * @param $name - * @param $value - */ - public function set_option($name, $value) - { - $this->options[$name] = $value; - } - - - /** - * Convert - * - * Loads HTML and passes to get_markdown() - * - * @param $html - * @return string The Markdown version of the html - */ - public function convert($html) - { - $html = preg_replace('~>\s+<~', '><', $html); // Strip white space between tags to prevent creation of empty #text nodes - - $this->document = new DOMDocument(); - - if ($this->options['suppress_errors']) - libxml_use_internal_errors(true); // Suppress conversion errors (from http://bit.ly/pCCRSX ) - - $this->document->loadHTML('' . $html); // Hack to load utf-8 HTML (from http://bit.ly/pVDyCt ) - $this->document->encoding = 'UTF-8'; - - if ($this->options['suppress_errors']) - libxml_clear_errors(); - - return $this->get_markdown($html); - } - - - /** - * Is Child Of? - * - * Is the node a child of the given parent tag? - * - * @param $parent_name string|array The name of the parent node(s) to search for e.g. 'code' or array('pre', 'code') - * @param $node - * @return bool - */ - private static function is_child_of($parent_name, $node) - { - for ($p = $node->parentNode; $p != false; $p = $p->parentNode) { - if (is_null($p)) - return false; - - if ( is_array($parent_name) && in_array($p->nodeName, $parent_name) ) - return true; - - if ($p->nodeName == $parent_name) - return true; - } - return false; - } - - - /** - * Convert Children - * - * Recursive function to drill into the DOM and convert each node into Markdown from the inside out. - * - * Finds children of each node and convert those to #text nodes containing their Markdown equivalent, - * starting with the innermost element and working up to the outermost element. - * - * @param $node - */ - private function convert_children($node) - { - // Don't convert HTML code inside and blocks to Markdown - that should stay as HTML - if (self::is_child_of(array('pre', 'code'), $node)) - return; - - // If the node has children, convert those to Markdown first - if ($node->hasChildNodes()) { - $length = $node->childNodes->length; - - for ($i = 0; $i < $length; $i++) { - $child = $node->childNodes->item($i); - $this->convert_children($child); - } - } - - // Now that child nodes have been converted, convert the original node - $markdown = $this->convert_to_markdown($node); - - // Create a DOM text node containing the Markdown equivalent of the original node - $markdown_node = $this->document->createTextNode($markdown); - - // Replace the old $node e.g. "Title" with the new $markdown_node e.g. "### Title" - $node->parentNode->replaceChild($markdown_node, $node); - } - - - /** - * Get Markdown - * - * Sends the body node to convert_children() to change inner nodes to Markdown #text nodes, then saves and - * returns the resulting converted document as a string in Markdown format. - * - * @return string|boolean The converted HTML as Markdown, or false if conversion failed - */ - private function get_markdown() - { - // Work on the entire DOM tree (including head and body) - $input = $this->document->getElementsByTagName("html")->item(0); - - if (!$input) - return false; - - // Convert all children of this root element. The DOMDocument stored in $this->doc will - // then consist of #text nodes, each containing a Markdown version of the original node - // that it replaced. - $this->convert_children($input); - - // Sanitize and return the body contents as a string. - $markdown = $this->document->saveHTML(); // stores the DOMDocument as a string - $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8'); - $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8'); // Double decode to cover cases like http://www.php.net/manual/en/function.htmlentities.php#99984 - $markdown = preg_replace("/]+>/", "", $markdown); // Strip doctype declaration - $unwanted = array('', '', '', '', '', '', '', ' '); - $markdown = str_replace($unwanted, '', $markdown); // Strip unwanted tags - $markdown = trim($markdown, "\n\r\0\x0B"); - - $this->output = $markdown; - - return $markdown; - } - - - /** - * Convert to Markdown - * - * Converts an individual node into a #text node containing a string of its Markdown equivalent. - * - * Example: An node with text content of "Title" becomes a text node with content of "### Title" - * - * @param $node - * @return string The converted HTML as Markdown - */ - private function convert_to_markdown($node) - { - $tag = $node->nodeName; // the type of element, e.g. h1 - $value = $node->nodeValue; // the value of that element, e.g. The Title - - // Strip nodes named in remove_nodes - $tags_to_remove = explode(' ', $this->options['remove_nodes']); - if ( in_array($tag, $tags_to_remove) ) - return false; - - switch ($tag) { - case "p": - $markdown = (trim($value)) ? rtrim($value) . PHP_EOL . PHP_EOL : ''; - break; - case "pre": - $markdown = PHP_EOL . $this->convert_code($node) . PHP_EOL; - break; - case "h1": - case "h2": - $markdown = $this->convert_header($tag, $node); - break; - case "h3": - $markdown = "### " . $value . PHP_EOL . PHP_EOL; - break; - case "h4": - $markdown = "#### " . $value . PHP_EOL . PHP_EOL; - break; - case "h5": - $markdown = "##### " . $value . PHP_EOL . PHP_EOL; - break; - case "h6": - $markdown = "###### " . $value . PHP_EOL . PHP_EOL; - break; - case "em": - case "i": - case "strong": - case "b": - $markdown = $this->convert_emphasis($tag, $value); - break; - case "hr": - $markdown = "- - - - - -" . PHP_EOL . PHP_EOL; - break; - case "br": - $markdown = " " . PHP_EOL; - break; - case "blockquote": - $markdown = $this->convert_blockquote($node); - break; - case "code": - $markdown = $this->convert_code($node); - break; - case "ol": - case "ul": - $markdown = $value . PHP_EOL; - break; - case "li": - $markdown = $this->convert_list($node); - break; - case "img": - $markdown = $this->convert_image($node); - break; - case "a": - $markdown = $this->convert_anchor($node); - break; - case "#text": - $markdown = preg_replace('~\s+~', ' ', $value); - $markdown = preg_replace('~^#~', '\\\\#', $markdown); - break; - case "#comment": - $markdown = ''; - break; - case "div": - $markdown = ($this->options['strip_tags']) ? $value . PHP_EOL . PHP_EOL : html_entity_decode($node->C14N()); - break; - default: - // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, - // such as nodes on their own. C14N() canonicalizes the node to a string. - // See: http://www.php.net/manual/en/domnode.c14n.php - $markdown = ($this->options['strip_tags']) ? $value : html_entity_decode($node->C14N()); - } - - return $markdown; - } - - - /** - * Convert Header - * - * Converts h1 and h2 headers to Markdown-style headers in setext style, - * matching the number of underscores with the length of the title. - * - * e.g. Header 1 Header Two - * ======== ---------- - * - * Returns atx headers instead if $this->options['header_style'] is "atx" - * - * e.g. # Header 1 ## Header Two - * - * @param string $level The header level, including the "h". e.g. h1 - * @param string $node The node to convert. - * @return string The Markdown version of the header. - */ - private function convert_header($level, $node) - { - $content = $node->nodeValue; - - if (!$this->is_child_of('blockquote', $node) && $this->options['header_style'] == "setext") { - $length = (function_exists('mb_strlen')) ? mb_strlen($content, 'utf-8') : strlen($content); - $underline = ($level == "h1") ? "=" : "-"; - $markdown = $content . PHP_EOL . str_repeat($underline, $length) . PHP_EOL . PHP_EOL; // setext style - } else { - $prefix = ($level == "h1") ? "# " : "## "; - $markdown = $prefix . $content . PHP_EOL . PHP_EOL; // atx style - } - - return $markdown; - } - - - /** - * Converts inline styles - * This function is used to render strong and em tags - * - * eg bold text becomes **bold text** or __bold text__ - * - * @param string $tag - * @param string $value - * @return string - */ - private function convert_emphasis($tag, $value) - { - if ($tag == 'i' || $tag == 'em') { - $markdown = $this->options['italic_style'] . $value . $this->options['italic_style']; - } else { - $markdown = $this->options['bold_style'] . $value . $this->options['bold_style']; - } - - return $markdown; - } - - - /** - * Convert Image - * - * Converts tags to Markdown. - * - * e.g. - * becomes  - * - * @param $node - * @return string - */ - private function convert_image($node) - { - $src = $node->getAttribute('src'); - $alt = $node->getAttribute('alt'); - $title = $node->getAttribute('title'); - - if ($title != "") { - $markdown = ''; // No newlines added. should be in a block-level element. - } else { - $markdown = ''; - } - - return $markdown; - } - - - /** - * Convert Anchor - * - * Converts tags to Markdown. - * - * e.g. Modern Nerd - * becomes [Modern Nerd](http://modernnerd.net "Title") - * - * @param $node - * @return string - */ - private function convert_anchor($node) - { - $href = $node->getAttribute('href'); - $title = $node->getAttribute('title'); - $text = $node->nodeValue; - - if ($title != "") { - $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; - } else { - $markdown = '[' . $text . '](' . $href . ')'; - } - - if (! $href) - $markdown = html_entity_decode($node->C14N()); - - // Append a space if the node after this one is also an anchor - $next_node_name = $this->get_next_node_name($node); - - if ($next_node_name == 'a') - $markdown = $markdown . ' '; - - return $markdown; - } - - - /** - * Convert List - * - * Converts and lists to Markdown. - * - * @param $node - * @return string - */ - private function convert_list($node) - { - // If parent is an ol, use numbers, otherwise, use dashes - $list_type = $node->parentNode->nodeName; - $value = $node->nodeValue; - - if ($list_type == "ul") { - $markdown = "- " . trim($value) . PHP_EOL; - } else { - $number = $this->get_position($node); - $markdown = $number . ". " . trim($value) . PHP_EOL; - } - - return $markdown; - } - - - /** - * Convert Code - * - * Convert code tags by indenting blocks of code and wrapping single lines in backticks. - * - * @param DOMNode $node - * @return string - */ - private function convert_code($node) - { - // Store the content of the code block in an array, one entry for each line - - $markdown = ''; - - $code_content = html_entity_decode($node->C14N()); - $code_content = str_replace(array("", ""), "", $code_content); - $code_content = str_replace(array("", ""), "", $code_content); - - $lines = preg_split('/\r\n|\r|\n/', $code_content); - $total = count($lines); - - // If there's more than one line of code, prepend each line with four spaces and no backticks. - if ($total > 1 || $node->nodeName === 'pre') { - - // Remove the first and last line if they're empty - $first_line = trim($lines[0]); - $last_line = trim($lines[$total - 1]); - $first_line = trim($first_line, " "); //trim XML style carriage returns too - $last_line = trim($last_line, " "); - - if (empty($first_line)) - array_shift($lines); - - if (empty($last_line)) - array_pop($lines); - - $count = 1; - foreach ($lines as $line) { - $line = str_replace(' ', '', $line); - $markdown .= " " . $line; - // Add newlines, except final line of the code - if ($count != $total) - $markdown .= PHP_EOL; - $count++; - } - $markdown .= PHP_EOL; - - } else { // There's only one line of code. It's a code span, not a block. Just wrap it with backticks. - - $markdown .= "`" . $lines[0] . "`"; - - } - - return $markdown; - } - - - /** - * Convert blockquote - * - * Prepend blockquotes with > chars. - * - * @param $node - * @return string - */ - private function convert_blockquote($node) - { - // Contents should have already been converted to Markdown by this point, - // so we just need to add ">" symbols to each line. - - $markdown = ''; - - $quote_content = trim($node->nodeValue); - - $lines = preg_split('/\r\n|\r|\n/', $quote_content); - - $total_lines = count($lines); - - foreach ($lines as $i => $line) { - $markdown .= "> " . $line . PHP_EOL; - if ($i + 1 == $total_lines) - $markdown .= PHP_EOL; - } - - return $markdown; - } - - - /** - * Get Position - * - * Returns the numbered position of a node inside its parent - * - * @param $node - * @return int The numbered position of the node, starting at 1. - */ - private function get_position($node) - { - // Get all of the nodes inside the parent - $list_nodes = $node->parentNode->childNodes; - $total_nodes = $list_nodes->length; - - $position = 1; - - // Loop through all nodes and find the given $node - for ($a = 0; $a < $total_nodes; $a++) { - $current_node = $list_nodes->item($a); - - if ($current_node->isSameNode($node)) - $position = $a + 1; - } - - return $position; - } - - - /** - * Get Next Node Name - * - * Return the name of the node immediately after the passed one. - * - * @param $node - * @return string|null The node name (e.g. 'h1') or null. - */ - private function get_next_node_name($node) - { - $next_node_name = null; - - $current_position = $this->get_position($node); - $next_node = $node->parentNode->childNodes->item($current_position); - - if ($next_node) - $next_node_name = $next_node->nodeName; - - return $next_node_name; - } - - - /** - * To String - * - * Magic method to return Markdown output when HTML_To_Markdown instance is treated as a string. - * - * @return string - */ - public function __toString() - { - return $this->output(); - } - - - /** - * Output - * - * Getter for the converted Markdown contents stored in $this->output - * - * @return string - */ - public function output() - { - if (!$this->output) { - return ''; - } else { - return $this->output; - } - } -} diff --git a/library/html-to-markdown/README.md b/library/html-to-markdown/README.md deleted file mode 100644 index de91c9d08..000000000 --- a/library/html-to-markdown/README.md +++ /dev/null @@ -1,138 +0,0 @@ -HTML To Markdown for PHP -======================== - -A helper class that converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. - -[](https://travis-ci.org/nickcernis/html-to-markdown) - -**Version**: 2.2.1 -**Requires**: PHP 5.3+ -**Author**: [@nickcernis](http://twitter.com/nickcernis) -**License**: [MIT](http://www.opensource.org/licenses/mit-license.php) - -### Why convert HTML to Markdown? - -*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](http://michelf.com/projects/php-markdown/),"* you continue, already labouring the question somewhat, *"but why go the other way?"* - -Typically you would convert HTML to Markdown if: - -1. You have an existing HTML document that needs to be edited by people with good taste. -2. You want to store new content in HTML format but edit it as Markdown. -3. You want to convert HTML email to plain text email. -4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. -5. You just really like Markdown. - -### How to use it - -Either include HTML_To_Markdown.php directly: - - require_once( dirname( __FILE__) . '/HTML_To_Markdown.php' ); - -Or, require the library in your composer.json: - - { - "require": { - "nickcernis/html-to-markdown": "dev-master" - } - } - -Then `composer install` and add `require 'vendor/autoload.php';` to the top of your script. - -Next, create a new HTML_To_Markdown instance, passing in your valid HTML code: - - $html = "Quick, to the Batpoles!"; - $markdown = new HTML_To_Markdown($html); - -The `$markdown` object now contains the Markdown version of your HTML. Use it like a string: - - echo $markdown; // ==> ### Quick, to the Batpoles! - -Or access the Markdown output directly: - - $string = $markdown->output(); - -The included `demo` directory contains an HTML->Markdown conversion form to try out. - -### Conversion options - -By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. - -To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: - - $html = 'Turnips!'; - $markdown = new HTML_To_Markdown($html, array('strip_tags' => true)); // $markdown now contains "Turnips!" - -Or more explicitly, like this: - - $html = 'Turnips!'; - $markdown = new HTML_To_Markdown(); - $markdown->set_option('strip_tags', true); - $markdown->convert($html); // $markdown now contains "Turnips!" - -Note that only the tags themselves are stripped, not the content they hold. - -To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: - - $html = 'Turnips!Monkeys!'; - $markdown = new HTML_To_Markdown($html, array('remove_nodes' => 'span div')); // $markdown now contains "" - -### Style options - -Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. - - $html = 'Italic and a bold'; - $markdown = new HTML_To_Markdown(); - $markdown->set_option('italic_style', '_'); - $markdown->set_option('bold_style', '__'); - $markdown->convert($html); // $markdown now contains "_Italic_ and a __bold__" - -### Limitations - -- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. - -### Known issues - -- Nested lists and lists containing multiple paragraphs aren't converted correctly. -- Lists inside blockquotes aren't converted correctly. -- Any reported [open issues here](https://github.com/nickcernis/html-to-markdown/issues?state=open). - -[Report your issue or request a feature here.](https://github.com/nickcernis/html2markdown/issues/new) Issues with patches or failing tests are especially welcome. - -### Style notes - -- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: - - `$markdown = new HTML_To_Markdown( $html, array('header_style'=>'atx') );` - - Headers of H3 priority and lower always use atx style. - -- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. -- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. - -### Dependencies - -HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. - -Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. - -### Architecture notes - -HTML To Markdown is a single file that uses native DOM manipulation libraries (DOMDocument), not regex voodoo, to convert code. - -### Contributors - -Many thanks to all [contributors](https://github.com/nickcernis/html2markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. - -### How it works - -HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. - -### To-do - -- Support for nested lists and lists inside blockquotes. -- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). - -### Trying to convert Markdown to HTML? - -Use [PHP Markdown](http://michelf.com/projects/php-markdown/) from Michel Fortin. No guarantees about the Elvish, though. - diff --git a/library/html-to-markdown/circle.yml b/library/html-to-markdown/circle.yml deleted file mode 100644 index 9893a4b92..000000000 --- a/library/html-to-markdown/circle.yml +++ /dev/null @@ -1,4 +0,0 @@ -test: - override: - - phpunit --no-configuration HTML_To_MarkdownTest ./tests/HTML_To_MarkdownTest.php - diff --git a/library/html-to-markdown/composer.json b/library/html-to-markdown/composer.json deleted file mode 100644 index beb7faab4..000000000 --- a/library/html-to-markdown/composer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "nickcernis/html-to-markdown", - "type": "library", - "description": "An HTML-to-markdown conversion helper for PHP", - "keywords": ["markdown", "html"], - "homepage": "https://github.com/nickcernis/html-to-markdown", - "license": "MIT", - "authors": [ - { - "name": "Nick Cernis", - "email": "nick@cern.is", - "homepage": "http://modernnerd.net" - } - ], - "autoload": { - "classmap": [ "HTML_To_Markdown.php" ] - }, - "require": { - "php": ">=5.3" - }, - "require-dev": { - "php": ">=5.3.3", - "phpunit/phpunit": "4.*" - } -} diff --git a/mod/acl.php b/mod/acl.php index 04aa9f50a..9220bc77a 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -1,7 +1,7 @@ = `last_failure` ORDER BY `version` ASC;', $p); $total = $total + $c[0]['total']; @@ -474,9 +475,6 @@ function admin_page_summary(App $a) { $r = qu("SELECT COUNT(`id`) AS `count` FROM `register`"); $pending = $r[0]['count']; - $r = qu("SELECT COUNT(*) AS `total` FROM `deliverq` WHERE 1"); - $deliverq = (($r) ? $r[0]['total'] : 0); - $r = qu("SELECT COUNT(*) AS `total` FROM `queue` WHERE 1"); $queue = (($r) ? $r[0]['total'] : 0); @@ -485,7 +483,7 @@ function admin_page_summary(App $a) { // We can do better, but this is a quick queue status - $queues = array('label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue, 'workerq' => $workerqueue); + $queues = array('label' => t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue); $t = get_markup_template("admin_summary.tpl"); @@ -655,7 +653,6 @@ function admin_page_site_post(App $a) { $force_ssl = ((x($_POST,'force_ssl')) ? True : False); $hide_help = ((x($_POST,'hide_help')) ? True : False); $suppress_tags = ((x($_POST,'suppress_tags')) ? True : False); - $use_fulltext_engine = ((x($_POST,'use_fulltext_engine')) ? True : False); $itemcache = ((x($_POST,'itemcache')) ? notags(trim($_POST['itemcache'])) : ''); $itemcache_duration = ((x($_POST,'itemcache_duration')) ? intval($_POST['itemcache_duration']) : 0); $max_comments = ((x($_POST,'max_comments')) ? intval($_POST['max_comments']) : 0); @@ -670,6 +667,12 @@ function admin_page_site_post(App $a) { $worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False); $worker_frontend = ((x($_POST,'worker_frontend')) ? True : False); + // Has the directory url changed? If yes, then resubmit the existing profiles there + if ($global_directory != Config::get('system', 'directory') AND ($global_directory != '')) { + Config::set('system', 'directory', $global_directory); + proc_run(PRIORITY_LOW, 'include/directory.php'); + } + if ($a->get_path() != "") { $diaspora_enabled = false; } @@ -773,7 +776,6 @@ function admin_page_site_post(App $a) { set_config('system', 'allowed_email', $allowed_email); set_config('system', 'block_public', $block_public); set_config('system', 'publish_all', $force_publish); - set_config('system', 'directory', $global_directory); set_config('system', 'thread_allow', $thread_allow); set_config('system', 'newuser_private', $newuser_private); set_config('system', 'enotify_no_content', $enotify_no_content); @@ -799,7 +801,6 @@ function admin_page_site_post(App $a) { set_config('system', 'force_ssl', $force_ssl); set_config('system', 'hide_help', $hide_help); - set_config('system', 'use_fulltext_engine', $use_fulltext_engine); set_config('system', 'itemcache', $itemcache); set_config('system', 'itemcache_duration', $itemcache_duration); set_config('system', 'max_comments', $max_comments); @@ -971,7 +972,7 @@ function admin_page_site(App $a) { '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$shortcut_icon' => array('shortcut_icon', t("Shortcut icon"), get_config('system','shortcut_icon'), t("Link to an icon that will be used for browsers.")), '$touch_icon' => array('touch_icon', t("Touch icon"), get_config('system','touch_icon'), t("Link to an icon that will be used for tablets and mobiles.")), - '$info' => array('info',t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), + '$info' => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile), @@ -1028,7 +1029,6 @@ function admin_page_site(App $a) { '$nodeinfo' => array('nodeinfo', t("Publish server information"), get_config('system','nodeinfo'), t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details.")), - '$use_fulltext_engine' => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")), '$suppress_tags' => array('suppress_tags', t("Suppress Tags"), get_config('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")), '$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), t("The item caches buffers generated bbcode and external images.")), '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")), @@ -2058,8 +2058,8 @@ function admin_page_features(App $a) { $set = $f[3]; } $arr[$fname][1][] = array( - 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('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'))) ); } } diff --git a/mod/cal.php b/mod/cal.php index f43a4e8a7..7398426bc 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -269,8 +269,8 @@ function cal_content(App $a) { '$tabs' => $tabs, '$title' => t('Events'), '$view' => t('View'), - '$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''), - '$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''), + '$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth", t('Previous'),'',''), + '$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth", t('Next'),'',''), '$calendar' => cal($y,$m,$links, ' eventcal'), '$events' => $events, diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 52b5eb9f9..f3875ed8e 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -872,7 +872,7 @@ function dfrn_request_content(App $a) { '$header' => t('Friend/Connection Request'), '$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'), '$pls_answer' => t('Please answer the following:'), - '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'),t('Yes'))), + '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'), t('Yes'))), /*'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']), '$yes' => t('Yes'), '$no' => t('No'), */ diff --git a/mod/follow.php b/mod/follow.php index 2b564c1bf..6e1f90694 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -110,7 +110,7 @@ function follow_content(App $a) { //'$photo' => proxy_url($ret["photo"], false, PROXY_SIZE_SMALL), '$desc' => "", '$pls_answer' => t('Please answer the following:'), - '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'),t('Yes'))), + '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'), t('Yes'))), '$add_note' => t('Add a personal note:'), '$page_desc' => "", '$friendica' => "", diff --git a/mod/hovercard.php b/mod/hovercard.php index ec749db20..65b03f2b9 100644 --- a/mod/hovercard.php +++ b/mod/hovercard.php @@ -75,7 +75,7 @@ function hovercard_content() { 'tags' => $contact["keywords"], // 'nsfw' => intval($contact["nsfw"]), // 'server_url' => $contact["server_url"], - 'bd' => (($contact["birthday"] == "0000-00-00") ? "" : $contact["birthday"]), + 'bd' => (($contact["birthday"] <= '0001-01-01') ? "" : $contact["birthday"]), // 'generation' => $contact["generation"], 'account_type' => account_type($contact), 'actions' => $actions, diff --git a/mod/install.php b/mod/install.php index fbd296a9d..8854723b7 100755 --- a/mod/install.php +++ b/mod/install.php @@ -48,7 +48,7 @@ function install_post(App $a) { $db = new dba($dbhost, $dbuser, $dbpass, '', true); if(! get_db_errno()) { - $r = q("CREATE DATABASE '%s'", + $r = q("CREATE DATABASE '%s' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci", dbesc($dbdata) ); if ($r) { diff --git a/mod/manifest.php b/mod/manifest.php new file mode 100644 index 000000000..6dc0d10a2 --- /dev/null +++ b/mod/manifest.php @@ -0,0 +1,26 @@ + App::get_baseurl(), + '$touch_icon' => $touch_icon, + '$title' => Config::get('config', 'sitename', 'Friendica'), + )); + + echo $o; + + killme(); + + } +?> diff --git a/mod/message.php b/mod/message.php index 9e9669146..beaa7b1df 100644 --- a/mod/message.php +++ b/mod/message.php @@ -349,7 +349,7 @@ function message_content(App $a) { $o .= $header; - $r = q("SELECT count(*) AS `total` FROM `mail` + $r = q("SELECT count(*) AS `total` FROM `mail`, ANY_VALUE(`created`) AS `created` WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC", intval(local_user()) ); @@ -528,12 +528,20 @@ function message_content(App $a) { } function get_messages($user, $lstart, $lend) { - + //TODO: rewritte with a sub-query to get the first message of each private thread with certainty return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, - `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`, - count( * ) as count + ANY_VALUE(`mail`.`id`) AS `id`, ANY_VALUE(`mail`.`uid`) AS `uid`, ANY_VALUE(`mail`.`guid`) AS `guid`, + ANY_VALUE(`mail`.`from-name`) AS `from-name`, ANY_VALUE(`mail`.`from-photo`) AS `from-photo`, + ANY_VALUE(`mail`.`from-url`) AS `from-url`, ANY_VALUE(`mail`.`contact-id`) AS `contact-id`, + ANY_VALUE(`mail`.`convid`) AS `convid`, ANY_VALUE(`mail`.`title`) AS `title`, ANY_VALUE(`mail`.`body`) AS `body`, + ANY_VALUE(`mail`.`seen`) AS `seen`, ANY_VALUE(`mail`.`reply`) AS `reply`, ANY_VALUE(`mail`.`replied`) AS `replied`, + ANY_VALUE(`mail`.`unknown`) AS `unknown`, ANY_VALUE(`mail`.`uri`) AS `uri`, + `mail`.`parent-uri`, + ANY_VALUE(`mail`.`created`) AS `created`, ANY_VALUE(`contact`.`name`) AS `name`, ANY_VALUE(`contact`.`url`) AS `url`, + ANY_VALUE(`contact`.`thumb`) AS `thumb`, ANY_VALUE(`contact`.`network`) AS `network`, + count( * ) as `count` FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` - WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", + WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", intval($user), intval($lstart), intval($lend) ); } diff --git a/mod/network.php b/mod/network.php index 5e94429b5..db4bb9130 100644 --- a/mod/network.php +++ b/mod/network.php @@ -581,11 +581,7 @@ function network_content(App $a, $update = 0) { $sql_order = "`item`.`id`"; $order_mode = "id"; } else { - // Disabled until final decision what to do with this - //if (get_config('system','use_fulltext_engine')) - // $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search))); - //else - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); $sql_order = "`item`.`id`"; $order_mode = "id"; } diff --git a/mod/notifications.php b/mod/notifications.php index 0c08b66ce..bab5fd627 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -292,7 +292,7 @@ function notifications_content(App $a) { '$item_link' => $it['link'], '$item_image' => $it['image'], '$item_url' => $it['url'], - '$item_text' => htmlentities($it['text']), + '$item_text' => $it['text'], '$item_when' => $it['when'], '$item_ago' => $it['ago'], '$item_seen' => $it['seen'], diff --git a/mod/photos.php b/mod/photos.php index ddf081467..a22f919c8 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1240,7 +1240,10 @@ function photos_content(App $a) { $order = 'DESC'; } - $r = q("SELECT `resource-id`, `id`, `filename`, type, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' + $r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, + ANY_VALUE(`type`) AS `type`, max(`scale`) AS `scale`, ANY_VALUE(`desc`) as `desc`, + ANY_VALUE(`created`) as `created` + FROM `photo` WHERE `uid` = %d AND `album` = '%s' AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d", intval($owner_uid), dbesc($album), @@ -1581,9 +1584,9 @@ function photos_content(App $a) { '$album' => array('albname', t('New album name'), $album_e,''), '$caption' => array('desc', t('Caption'), $caption_e, ''), '$tags' => array('newtag', t('Add a Tag'), "", t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')), - '$rotate_none' => array('rotate',t('Do not rotate'),0,'', true), - '$rotate_cw' => array('rotate',t('Rotate CW (right)'),1,''), - '$rotate_ccw' => array('rotate',t('Rotate CCW (left)'),2,''), + '$rotate_none' => array('rotate', t('Do not rotate'),0,'', true), + '$rotate_cw' => array('rotate', t('Rotate CW (right)'),1,''), + '$rotate_ccw' => array('rotate', t('Rotate CCW (left)'),2,''), '$nickname' => $a->data['user']['nickname'], '$resource_id' => $ph[0]['resource-id'], @@ -1840,7 +1843,9 @@ function photos_content(App $a) { $a->set_pager_itemspage(20); } - $r = qu("SELECT `resource-id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` + $r = qu("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, + ANY_VALUE(`type`) AS `type`, ANY_VALUE(`album`) AS `album`, max(`scale`) AS `scale`, + ANY_VALUE(`created`) AS `created` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", intval($a->data['user']['uid']), diff --git a/mod/ping.php b/mod/ping.php index b5330c7b3..ba496a70b 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -199,7 +199,7 @@ function ping_init(App $a) $cachekey = "ping_init:".local_user(); $ev = Cache::get($cachekey); if (is_null($ev)) { - $ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event` + $ev = qu("SELECT type, start, adjust FROM `event` WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0 ORDER BY `start` ASC ", intval(local_user()), @@ -212,7 +212,7 @@ function ping_init(App $a) } if (dbm::is_result($ev)) { - $all_events = intval($ev[0]['total']); + $all_events = count($ev); if ($all_events) { $str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d'); diff --git a/mod/probe.php b/mod/probe.php index 95f856bfa..8c951a7fc 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -4,6 +4,13 @@ require_once('include/Scrape.php'); function probe_content(App $a) { + if (!local_user()) { + http_status_exit(403, + array("title" => t("Public access denied."), + "description" => t("Only logged in users are permitted to perform a probing."))); + killme(); + } + $o .= 'Probe Diagnostic'; $o .= ''; diff --git a/mod/profile.php b/mod/profile.php index fbce509d2..a83cb076f 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -210,7 +210,7 @@ function profile_content(App $a, $update = 0) { if ($update) { - $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network` + $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`, `item`.`created` FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND diff --git a/mod/profiles.php b/mod/profiles.php index b73c46e71..bd57f106d 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -193,7 +193,7 @@ function profiles_post(App $a) { return; } - $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated? + $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0001-01-01'; // FIXME: Needs to be validated? $y = substr($dob, 0, 4); if ((! ctype_digit($y)) || ($y < 1900)) { @@ -201,15 +201,15 @@ function profiles_post(App $a) { } else { $ignore_year = false; } - if ($dob != '0000-00-00') { - if (strpos($dob, '0000-') === 0) { + if (!in_array($dob, array('0000-00-00', '0001-01-01'))) { + if (strpos($dob, '0000-') === 0 || strpos($dob, '0001-') === 0) { $ignore_year = true; $dob = substr($dob, 5); } $dob = datetime_convert('UTC', 'UTC', (($ignore_year) ? '1900-' . $dob : $dob), (($ignore_year) ? 'm-d' : 'Y-m-d')); if ($ignore_year) { - $dob = '0000-' . $dob; + $dob = '0001-' . $dob; } } @@ -637,7 +637,7 @@ function profiles_content(App $a) { t('Hide contacts and friends:'), //Label !!$r[0]['hide-friends'], //Value '', //Help string - array(t('No'),t('Yes')) //Off - On strings + array(t('No'), t('Yes')) //Off - On strings ), '$desc' => t('Hide your contact/friend list from viewers of this profile?'), '$yes_str' => t('Yes'), @@ -739,7 +739,7 @@ function profiles_content(App $a) { '$tv' => array('tv', t('Television'), $r[0]['tv']), '$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']), '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']), - '$romance' => array('romance',t('Love/romance'), $r[0]['romance']), + '$romance' => array('romance', t('Love/romance'), $r[0]['romance']), '$work' => array('work', t('Work/employment'), $r[0]['work']), '$education' => array('education', t('School/education'), $r[0]['education']), '$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']), diff --git a/mod/register.php b/mod/register.php index 81e8c3ad8..5e8da4685 100644 --- a/mod/register.php +++ b/mod/register.php @@ -282,7 +282,7 @@ function register_content(App $a) { '$passwords' => $passwords, '$password1' => array('password1', t('New Password:'), '', t('Leave empty for an auto generated password.')), '$password2' => array('confirm', t('Confirm:'), '', ''), - '$nickdesc' => str_replace('$sitename',$a->get_hostname(),t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.')), + '$nickdesc' => str_replace('$sitename',$a->get_hostname(), t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.')), '$nicklabel' => t('Choose a nickname: '), '$photo' => $photo, '$publish' => $profile_publish, diff --git a/mod/salmon.php b/mod/salmon.php index 69809f523..10b1046b0 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -79,7 +79,7 @@ function salmon_post(App $a) { $signed_data = $data . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg); - $compliant_format = str_replace('=','',$signed_data); + $compliant_format = str_replace('=', '', $signed_data); // decode the data @@ -115,24 +115,28 @@ function salmon_post(App $a) { // We should have everything we need now. Let's see if it verifies. - $verify = rsa_verify($compliant_format,$signature,$pubkey); + // Try GNU Social format + $verify = rsa_verify($signed_data, $signature, $pubkey); + $mode = 1; - if(! $verify) { - logger('mod-salmon: message did not verify using protocol. Trying padding hack.'); - $verify = rsa_verify($signed_data,$signature,$pubkey); + if (! $verify) { + logger('mod-salmon: message did not verify using protocol. Trying compliant format.'); + $verify = rsa_verify($compliant_format, $signature, $pubkey); + $mode = 2; } - if(! $verify) { - logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.'); - $verify = rsa_verify($stnet_signed_data,$signature,$pubkey); + if (! $verify) { + logger('mod-salmon: message did not verify using padding. Trying old statusnet format.'); + $verify = rsa_verify($stnet_signed_data, $signature, $pubkey); + $mode = 3; } - if(! $verify) { + if (! $verify) { logger('mod-salmon: Message did not verify. Discarding.'); http_status_exit(400); } - logger('mod-salmon: Message verified.'); + logger('mod-salmon: Message verified with mode '.$mode); /* diff --git a/mod/search.php b/mod/search.php index 7d588aa4d..a804ca32e 100644 --- a/mod/search.php +++ b/mod/search.php @@ -203,18 +203,13 @@ function search_content(App $a) { } else { logger("Start fulltext search for '".$search."'", LOGGER_DEBUG); - // Disabled until finally is decided how to proceed with this - //if (get_config('system','use_fulltext_engine')) { - // $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search))); - //} else { - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); - //} + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); $r = q("SELECT %s FROM `item` %s WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`)) $sql_extra - GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d", + GROUP BY `item`.`uri`, `item`.`id` ORDER BY `item`.`id` DESC LIMIT %d , %d", item_fieldlists(), item_joins(), item_condition(), intval(local_user()), intval($a->pager['start']), intval($a->pager['itemspage'])); diff --git a/mod/settings.php b/mod/settings.php index 5c9c439e0..1d83251d4 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -779,7 +779,7 @@ function settings_content(App $a) { $arr[$fname] = array(); $arr[$fname][0] = $fdata[0]; foreach (array_slice($fdata,1) as $f) { - $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); + $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'), t('On'))); } } @@ -1164,48 +1164,48 @@ function settings_content(App $a) { } $opt_tpl = get_markup_template("field_yesno.tpl"); - if(get_config('system','publish_all')) { + if (get_config('system','publish_all')) { $profile_in_dir = ''; } else { - $profile_in_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))), + $profile_in_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), array(t('No'), t('Yes'))) )); } if (strlen(get_config('system','directory'))) { - $profile_in_net_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))), + $profile_in_net_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'), t('Yes'))) )); } else { $profile_in_net_dir = ''; } $hide_friends = replace_macros($opt_tpl,array( - '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'),t('Yes'))), + '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'), t('Yes'))), )); $hide_wall = replace_macros($opt_tpl,array( - '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'),t('Yes'))), + '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'), t('Yes'))), )); $blockwall = replace_macros($opt_tpl,array( - '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'),t('Yes'))), + '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); $blocktags = replace_macros($opt_tpl,array( - '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'),t('Yes'))), + '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); $suggestme = replace_macros($opt_tpl,array( - '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'),t('Yes'))), + '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'), t('Yes'))), )); $unkmail = replace_macros($opt_tpl,array( - '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))), + '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'), t('Yes'))), )); @@ -1231,11 +1231,11 @@ function settings_content(App $a) { 'days' => array('expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')), 'advanced' => t('Advanced expiration settings'), 'label' => t('Advanced Expiration'), - 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'),t('Yes'))), - 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))), - 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))), - 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))), - 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'),t('Yes'))), + 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'), t('Yes'))), + 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'), t('Yes'))), + 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'), t('Yes'))), + 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'), t('Yes'))), + 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'), t('Yes'))), ); require_once('include/group.php'); @@ -1293,7 +1293,7 @@ function settings_content(App $a) { '$h_prv' => t('Security and Privacy Settings'), - '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq ,t("\x28to prevent spam abuse\x29")), + '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq , t("\x28to prevent spam abuse\x29")), '$permissions' => t('Default Post Permissions'), '$permdesc' => t("\x28click to open/close\x29"), '$visibility' => $profile['net-publish'], @@ -1323,7 +1323,7 @@ function settings_content(App $a) { '$hide_friends' => $hide_friends, '$hide_wall' => $hide_wall, '$unkmail' => $unkmail, - '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail ,t("\x28to prevent spam abuse\x29")), + '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail , t("\x28to prevent spam abuse\x29")), '$h_not' => t('Notification Settings'), diff --git a/mod/uexport.php b/mod/uexport.php index cada539bc..77a45f8a3 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -34,8 +34,8 @@ function uexport_content(App $a) { * list of array( 'link url', 'link text', 'help text' ) */ $options = array( - array('uexport/account',t('Export account'),t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')), - array('uexport/backup',t('Export all'),t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')), + array('uexport/account', t('Export account'), t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')), + array('uexport/backup', t('Export all'), t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')), ); call_hooks('uexport_options', $options); diff --git a/mod/videos.php b/mod/videos.php index 3828b8f1f..269d53785 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -356,7 +356,9 @@ function videos_content(App $a) { $a->set_pager_itemspage(20); } - $r = q("SELECT hash, `id`, `filename`, filetype FROM `attach` + $r = q("SELECT hash, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`created`) AS `created`, + ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`filetype`) as `filetype` + FROM `attach` WHERE `uid` = %d AND filetype LIKE '%%video%%' $sql_extra GROUP BY hash ORDER BY `created` DESC LIMIT %d , %d", intval($a->data['user']['uid']), diff --git a/mod/webfinger.php b/mod/webfinger.php index eee0580e3..d823bd2dc 100644 --- a/mod/webfinger.php +++ b/mod/webfinger.php @@ -3,6 +3,13 @@ require_once("include/Probe.php"); function webfinger_content(App $a) { + if (!local_user()) { + http_status_exit(403, + array("title" => t("Public access denied."), + "description" => t("Only logged in users are permitted to perform a probing."))); + killme(); + } + $o .= 'Webfinger Diagnostic'; $o .= ''; diff --git a/update.php b/update.php index 8404f5bf2..ea0c57535 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ /dev/null 2>&1; then + # Cygwin paths start with /cygdrive/ which will break windows PHP, + # so we need to translate the dir path to windows format. However + # we could be using cygwin PHP which does not require this, so we + # test if the path to PHP starts with /cygdrive/ rather than /usr/bin + if [[ $(which php) == /cygdrive/* ]]; then + dir=$(cygpath -m "$dir"); + fi +fi + +dir=$(echo $dir | sed 's/ /\ /g') +"${dir}/html-to-markdown" "$@" diff --git a/vendor/bin/html-to-markdown.bat b/vendor/bin/html-to-markdown.bat new file mode 100644 index 000000000..273f24a5d --- /dev/null +++ b/vendor/bin/html-to-markdown.bat @@ -0,0 +1,4 @@ +@ECHO OFF +setlocal DISABLEDELAYEDEXPANSION +SET BIN_TARGET=%~dp0/../league/html-to-markdown/bin/html-to-markdown +php "%BIN_TARGET%" %* diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 95407cff6..4553da2e2 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -241,6 +241,29 @@ return array( 'HTMLPurifier_VarParser_Flexible' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php', 'HTMLPurifier_VarParser_Native' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php', 'HTMLPurifier_Zipper' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php', + 'League\\HTMLToMarkdown\\Configuration' => $vendorDir . '/league/html-to-markdown/src/Configuration.php', + 'League\\HTMLToMarkdown\\ConfigurationAwareInterface' => $vendorDir . '/league/html-to-markdown/src/ConfigurationAwareInterface.php', + 'League\\HTMLToMarkdown\\Converter\\BlockquoteConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/BlockquoteConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CodeConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/CodeConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CommentConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/CommentConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ConverterInterface' => $vendorDir . '/league/html-to-markdown/src/Converter/ConverterInterface.php', + 'League\\HTMLToMarkdown\\Converter\\DefaultConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/DefaultConverter.php', + 'League\\HTMLToMarkdown\\Converter\\DivConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/DivConverter.php', + 'League\\HTMLToMarkdown\\Converter\\EmphasisConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/EmphasisConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HardBreakConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HardBreakConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HeaderConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HeaderConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HorizontalRuleConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ImageConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ImageConverter.php', + 'League\\HTMLToMarkdown\\Converter\\LinkConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/LinkConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListBlockConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListBlockConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListItemConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ParagraphConverter.php', + 'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/PreformattedConverter.php', + 'League\\HTMLToMarkdown\\Converter\\TextConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/TextConverter.php', + 'League\\HTMLToMarkdown\\Element' => $vendorDir . '/league/html-to-markdown/src/Element.php', + 'League\\HTMLToMarkdown\\ElementInterface' => $vendorDir . '/league/html-to-markdown/src/ElementInterface.php', + 'League\\HTMLToMarkdown\\Environment' => $vendorDir . '/league/html-to-markdown/src/Environment.php', + 'League\\HTMLToMarkdown\\HtmlConverter' => $vendorDir . '/league/html-to-markdown/src/HtmlConverter.php', 'Mobile_Detect' => $vendorDir . '/mobiledetect/mobiledetectlib/Mobile_Detect.php', 'OS_Guess' => $vendorDir . '/pear-pear.php.net/PEAR/OS/Guess.php', 'PEAR' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR.php', diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index a8d577d5e..61a440ffd 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -6,5 +6,6 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( + 'League\\HTMLToMarkdown\\' => array($vendorDir . '/league/html-to-markdown/src'), 'Friendica\\' => array($baseDir . '/src'), ); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 370e53218..37d3c878b 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -11,6 +11,10 @@ class ComposerStaticInitFriendica ); public static $prefixLengthsPsr4 = array ( + 'L' => + array ( + 'League\\HTMLToMarkdown\\' => 22, + ), 'F' => array ( 'Friendica\\' => 10, @@ -18,6 +22,10 @@ class ComposerStaticInitFriendica ); public static $prefixDirsPsr4 = array ( + 'League\\HTMLToMarkdown\\' => + array ( + 0 => __DIR__ . '/..' . '/league/html-to-markdown/src', + ), 'Friendica\\' => array ( 0 => __DIR__ . '/../..' . '/src', @@ -277,6 +285,29 @@ class ComposerStaticInitFriendica 'HTMLPurifier_VarParser_Flexible' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php', 'HTMLPurifier_VarParser_Native' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php', 'HTMLPurifier_Zipper' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php', + 'League\\HTMLToMarkdown\\Configuration' => __DIR__ . '/..' . '/league/html-to-markdown/src/Configuration.php', + 'League\\HTMLToMarkdown\\ConfigurationAwareInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/ConfigurationAwareInterface.php', + 'League\\HTMLToMarkdown\\Converter\\BlockquoteConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/BlockquoteConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CodeConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/CodeConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CommentConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/CommentConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ConverterInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ConverterInterface.php', + 'League\\HTMLToMarkdown\\Converter\\DefaultConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/DefaultConverter.php', + 'League\\HTMLToMarkdown\\Converter\\DivConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/DivConverter.php', + 'League\\HTMLToMarkdown\\Converter\\EmphasisConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/EmphasisConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HardBreakConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HardBreakConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HeaderConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HeaderConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HorizontalRuleConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ImageConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ImageConverter.php', + 'League\\HTMLToMarkdown\\Converter\\LinkConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/LinkConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListBlockConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ListBlockConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ListItemConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ParagraphConverter.php', + 'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/PreformattedConverter.php', + 'League\\HTMLToMarkdown\\Converter\\TextConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/TextConverter.php', + 'League\\HTMLToMarkdown\\Element' => __DIR__ . '/..' . '/league/html-to-markdown/src/Element.php', + 'League\\HTMLToMarkdown\\ElementInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/ElementInterface.php', + 'League\\HTMLToMarkdown\\Environment' => __DIR__ . '/..' . '/league/html-to-markdown/src/Environment.php', + 'League\\HTMLToMarkdown\\HtmlConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/HtmlConverter.php', 'Mobile_Detect' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/Mobile_Detect.php', 'OS_Guess' => __DIR__ . '/..' . '/pear-pear.php.net/PEAR/OS/Guess.php', 'PEAR' => __DIR__ . '/..' . '/pear-pear.php.net/PEAR/PEAR.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index d55aed01d..45038987b 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -330,5 +330,71 @@ "PHP License" ], "description": "Text_Highlighter is a package for syntax highlighting.\n\nIt provides a base class provining all the functionality,\nand a descendent classes geneator class.\n\nThe main idea is to simplify creation of subclasses\nimplementing syntax highlighting for particular language.\nSubclasses do not implement any new functioanality,\nthey just provide syntax highlighting rules.\nThe rules sources are in XML format.\n\nTo create a highlighter for a language, there is no need\nto code a new class manually. Simply describe the rules\nin XML file and use Text_Highlighter_Generator to create\na new class." + }, + { + "name": "league/html-to-markdown", + "version": "4.4.1", + "version_normalized": "4.4.1.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/html-to-markdown.git", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/82ea375b5b2b1da1da222644c0565c695bf88186", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xml": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "time": "2017-03-16T00:45:59+00:00", + "bin": [ + "bin/html-to-markdown" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "description": "An HTML-to-markdown conversion helper for PHP", + "homepage": "https://github.com/thephpleague/html-to-markdown", + "keywords": [ + "html", + "markdown" + ] } ] diff --git a/vendor/league/html-to-markdown/CHANGELOG.md b/vendor/league/html-to-markdown/CHANGELOG.md new file mode 100644 index 000000000..067864412 --- /dev/null +++ b/vendor/league/html-to-markdown/CHANGELOG.md @@ -0,0 +1,214 @@ +# Change Log +All notable changes to this project will be documented in this file. +Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles. + +## [Unreleased][unreleased] + +## [4.4.1] + +### Fixed + - Fixed autolinking of invalid URLs (#129) + +## [4.4.0] + +### Added + - Added `hard_break` configuration option (#112, #115) + - The `HtmlConverter` can now be instantiated with an `Environment` (#118) + +### Fixed + - Fixed handling of paragraphs in list item elements (#47, #110) + - Fixed phantom spaces when newlines follow `br` elements (#116, #117) + - Fixed link converter not sanitizing inner spaces properly (#119, #120) + +## [4.3.1] +### Changed + - Revised the sanitization implementation (#109) + +### Fixed + - Fixed tag-like content not being escaped (#67, #109) + - Fixed thematic break-like content not being escaped (#65, #109) + - Fixed codefence-like content not being escaped (#64, #109) + +## [4.3.0] +### Added + - Added full support for PHP 7.0 and 7.1 + +### Changed + - Changed `` and `` conversions to use backticks instead of indendation (#102) + +### Fixed + - Fixed issue where specified code language was not preserved (#70, #102) + - Fixed issue where `` tags nested in `` was not converted properly (#70, #102) + - Fixed header-like content not being escaped (#76, #105) + - Fixed blockquote-like content not being escaped (#77, #103) + - Fixed ordered list-like content not being escaped (#73, #106) + - Fixed unordered list-like content not being escaped (#71, #107) + +## [4.2.2] +### Fixed + - Fixed sanitization bug which sometimes removes desired content (#63, #101) + +## [4.2.1] +### Fixed + - Fixed path to autoload.php when used as a library (#98) + - Fixed edge case for tags containing only whitespace (#99) + +### Removed + - Removed double HTML entity decoding, as this is not desireable (#60) + +## [4.2.0] + +### Added + - Added the ability to invoke HtmlConverter objects as functions (#85) + +### Fixed + - Fixed improper handling of nested list items (#19 and #84) + - Fixed preceeding or trailing spaces within emphasis tags (#83) + +## [4.1.1] + +### Fixed + - Fixed conversion of empty paragraphs (#78) + - Fixed `preg_replace` so it wouldn't break UTF-8 characters (#79) + +## [4.1.0] + +### Added + - Added `bin/html-to-markdown` script + +### Changed + - Changed default italic character to `_` (#58) + +## [4.0.1] + +### Fixed + - Added escaping to avoid * and _ in a text being rendered as emphasis (#48) + +### Removed + - Removed the demo (#51) + - `.styleci.yml` and `CONTRIBUTING.md` are no longer included in distributions (#50) + +## [4.0.0] + +This release changes the visibility of several methods/properties. #42 and #43 brought to light that some visiblities were +not ideally set, so this releases fixes that. Moving forwards this should reduce the chance of introducing BC-breaking changes. + +### Added + - Added new `HtmlConverter::getEnvironment()` method to expose the `Environment` (#42, #43) + +### Changed + - Changed `Environment::addConverter()` from `protected` to `public`, enabling custom converters to be added (#42, #43) + - Changed `HtmlConverter::createDOMDocument()` from `protected` to `private` + - Changed `Element::nextCached` from `protected` to `private` + - Made the `Environment` class `final` + +## [3.1.1] +### Fixed + - Empty HTML strings now result in empty Markdown documents (#40, #41) + +## [3.1.0] +### Added + - Added new `equals` method to `Element` to check for equality + +### Changes + - Use Linux line endings consistently instead of plaform-specific line endings (#36) + +### Fixed + - Cleaned up code style + +## [3.0.0] +### Changed + - Changed namespace to `League\HTMLToMarkdown` + - Changed packagist name to `league/html-to-markdown` + - Re-organized code into several separate classes + - `` tags with identical href and inner text are now rendered using angular bracket syntax (#31) + - `` elements are now treated as block-level elements (#33) + +## [2.2.2] +### Added + - Added support for PHP 5.6 and HHVM + - Enabled testing against PHP 7 nightlies + - Added this CHANGELOG.md + +### Fixed + - Fixed whitespace preservation between inline elements (#9 and #10) + +## [2.2.1] +### Fixed + - Preserve placeholder links (#22) + +## [2.2.0] +### Added + - Added CircleCI config + +### Changed + - `` blocks are now treated as code elements + +### Removed + - Dropped support for PHP 5.2 + - Removed incorrect README comment regarding `#text` nodes (#17) + +## [2.1.2] +### Added + - Added the ability to blacklist/remove specific node types (#11) + +### Changed + - Line breaks are now placed after divs instead of before them + - Newlines inside of link texts are now removed + - Updated the minimum PHPUnit version to 4.* + +## [2.1.1] +### Added + - Added options to customize emphasis characters + +## [2.1.0] +### Added + - Added option to strip HTML tags without Markdown equivalents + - Added `convert()` method for converter reuse + - Added ability to set options after instance construction + - Documented the required PHP extensions (#4) + +### Changed + - ATX style now used for h1 and h2 tags inside blockquotes + +### Fixed + - Newlines inside blockquotes are now started with a bracket + - Fixed some incorrect docblocks + - `__toString()` now returns an empty string if input is empty + - Convert head tag if body tag is empty (#7) + - Preserve special characters inside tags without md equivalents (#6) + + +## [2.0.1] +### Fixed + - Fixed first line indentation for multi-line code blocks + - Fixed consecutive anchors get separating spaces stripped (#3) + +## [2.0.0] +### Added + - Initial release + +[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.4.1...master +[4.4.1]: https://github.com/thephpleague/html-to-markdown/compare/4.4.0...4.4.1 +[4.4.0]: https://github.com/thephpleague/html-to-markdown/compare/4.3.1...4.4.0 +[4.3.1]: https://github.com/thephpleague/html-to-markdown/compare/4.3.0...4.3.1 +[4.3.0]: https://github.com/thephpleague/html-to-markdown/compare/4.2.2...4.3.0 +[4.2.2]: https://github.com/thephpleague/html-to-markdown/compare/4.2.1...4.2.2 +[4.2.1]: https://github.com/thephpleague/html-to-markdown/compare/4.2.0...4.2.1 +[4.2.0]: https://github.com/thephpleague/html-to-markdown/compare/4.1.1...4.2.0 +[4.1.1]: https://github.com/thephpleague/html-to-markdown/compare/4.1.0...4.1.1 +[4.1.0]: https://github.com/thephpleague/html-to-markdown/compare/4.0.1...4.1.0 +[4.0.1]: https://github.com/thephpleague/html-to-markdown/compare/4.0.0...4.0.1 +[4.0.0]: https://github.com/thephpleague/html-to-markdown/compare/3.1.1...4.0.0 +[3.1.1]: https://github.com/thephpleague/html-to-markdown/compare/3.1.0...3.1.1 +[3.1.0]: https://github.com/thephpleague/html-to-markdown/compare/3.0.0...3.1.0 +[3.0.0]: https://github.com/thephpleague/html-to-markdown/compare/2.2.2...3.0.0 +[2.2.2]: https://github.com/thephpleague/html-to-markdown/compare/2.2.1...2.2.2 +[2.2.1]: https://github.com/thephpleague/html-to-markdown/compare/2.2.0...2.2.1 +[2.2.0]: https://github.com/thephpleague/html-to-markdown/compare/2.1.2...2.2.0 +[2.1.2]: https://github.com/thephpleague/html-to-markdown/compare/2.1.1...2.1.2 +[2.1.1]: https://github.com/thephpleague/html-to-markdown/compare/2.1.0...2.1.1 +[2.1.0]: https://github.com/thephpleague/html-to-markdown/compare/2.0.1...2.1.0 +[2.0.1]: https://github.com/thephpleague/html-to-markdown/compare/2.0.0...2.0.1 +[2.0.0]: https://github.com/thephpleague/html-to-markdown/compare/775f91e...2.0.0 + diff --git a/vendor/league/html-to-markdown/CONDUCT.md b/vendor/league/html-to-markdown/CONDUCT.md new file mode 100644 index 000000000..01b8644f1 --- /dev/null +++ b/vendor/league/html-to-markdown/CONDUCT.md @@ -0,0 +1,22 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) diff --git a/library/html-to-markdown/LICENSE b/vendor/league/html-to-markdown/LICENSE similarity index 93% rename from library/html-to-markdown/LICENSE rename to vendor/league/html-to-markdown/LICENSE index f538c2ac9..6c04a59dd 100644 --- a/library/html-to-markdown/LICENSE +++ b/vendor/league/html-to-markdown/LICENSE @@ -1,6 +1,8 @@ The MIT License (MIT) -Copyright (c) 2013 Nick Cernis +Copyright (c) 2015 Colin O'Dell + +Originally created by Nick Cernis Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/vendor/league/html-to-markdown/README.md b/vendor/league/html-to-markdown/README.md new file mode 100644 index 000000000..8d75649d6 --- /dev/null +++ b/vendor/league/html-to-markdown/README.md @@ -0,0 +1,196 @@ +HTML To Markdown for PHP +======================== + +[](https://gitter.im/thephpleague/html-to-markdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +[](https://packagist.org/packages/league/html-to-markdown) +[](LICENSE) +[](https://travis-ci.org/thephpleague/html-to-markdown) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown/code-structure) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown) +[](https://packagist.org/packages/league/html-to-markdown) + +Library which converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. + + +**Requires**: PHP 5.3+ + +**Lead Developer**: [@colinodell](http://twitter.com/colinodell) + +**Original Author**: [@nickcernis](http://twitter.com/nickcernis) + + +### Why convert HTML to Markdown? + +*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](https://github.com/thephpleague/commonmark),"* you continue, already labouring the question somewhat, *"but why go the other way?"* + +Typically you would convert HTML to Markdown if: + +1. You have an existing HTML document that needs to be edited by people with good taste. +2. You want to store new content in HTML format but edit it as Markdown. +3. You want to convert HTML email to plain text email. +4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. +5. You just really like Markdown. + +### How to use it + +Require the library by issuing this command: + +```bash +composer require league/html-to-markdown +``` + +Add `require 'vendor/autoload.php';` to the top of your script. + +Next, create a new HtmlConverter instance, passing in your valid HTML code to its `convert()` function: + +```php +use League\HTMLToMarkdown\HtmlConverter; + +$converter = new HtmlConverter(); + +$html = "Quick, to the Batpoles!"; +$markdown = $converter->convert($html); +``` + +The `$markdown` variable now contains the Markdown version of your HTML as a string: + +```php +echo $markdown; // ==> ### Quick, to the Batpoles! +``` + +The included `demo` directory contains an HTML->Markdown conversion form to try out. + +### Conversion options + +By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. + +To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: + +```php +$converter = new HtmlConverter(array('strip_tags' => true)); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Or more explicitly, like this: + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('strip_tags', true); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Note that only the tags themselves are stripped, not the content they hold. + +To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: + +```php +$converter = new HtmlConverter(array('remove_nodes' => 'span div')); + +$html = 'Turnips!Monkeys!'; +$markdown = $converter->convert($html); // $markdown now contains "" +``` + +### Style options + +Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('italic_style', '_'); +$converter->getConfig()->setOption('bold_style', '__'); + +$html = 'Italic and a bold'; +$markdown = $converter->convert($html); // $markdown now contains "_Italic_ and a __bold__" +``` + +### Line break options + +By default, `br` tags are converted to two spaces followed by a newline character as per [traditional Markdown](https://daringfireball.net/projects/markdown/syntax#p). Set `hard_break` to `true` to omit the two spaces, as per GitHub Flavored Markdown (GFM). + +```php +$converter = new HtmlConverter(); +$html = 'testline break'; + +$converter->getConfig()->setOption('hard_break', true); +$markdown = $converter->convert($html); // $markdown now contains "test\nline break" + +$converter->getConfig()->setOption('hard_break', false); // default +$markdown = $converter->convert($html); // $markdown now contains "test \nline break" +``` + +### Passing custom Environment object + +You can pass current `Environment` object to customize i.e. which converters should be used. + +```php +$environment = new Environment(array( + // your configuration here +)); +$environment->addConverter(new HeaderConverter()); // optionally - add converter manually + +$converter = new HtmlConverter($environment); + +$html = 'Header + +'; +$markdown = $converter->convert($html); // $markdown now contains "### Header" and "" +``` + +### Limitations + +- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. + +### Known issues + +- Nested lists and lists containing multiple paragraphs aren't converted correctly. +- Lists inside blockquotes aren't converted correctly. +- Any reported [open issues here](https://github.com/thephpleague/html-to-markdown/issues?state=open). + +[Report your issue or request a feature here.](https://github.com/thephpleague/html-to-markdown/issues/new) Issues with patches or failing tests are especially welcome. + +### Style notes + +- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: + + `$converter = new HtmlConverter(array('header_style'=>'atx'));` + + Headers of H3 priority and lower always use atx style. + +- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. +- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. + +### Dependencies + +HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. + +Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. + +### Contributors + +Many thanks to all [contributors](https://github.com/thephpleague/html-to-markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. + +### How it works + +HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. + +### To-do + +- Support for nested lists and lists inside blockquotes. +- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). + +### Trying to convert Markdown to HTML? + +Use one of these great libraries: + + - [league/commonmark](https://github.com/thephpleague/commonmark) (recommended) + - [cebe/markdown](https://github.com/cebe/markdown) + - [PHP Markdown](https://michelf.ca/projects/php-markdown/) + - [Parsedown](https://github.com/erusev/parsedown) + +No guarantees about the Elvish, though. + diff --git a/vendor/league/html-to-markdown/bin/html-to-markdown b/vendor/league/html-to-markdown/bin/html-to-markdown new file mode 100644 index 000000000..2815a7cef --- /dev/null +++ b/vendor/league/html-to-markdown/bin/html-to-markdown @@ -0,0 +1,108 @@ +#!/usr/bin/env php + $arg) { + if ($i === 0) { + continue; + } + + if (substr($arg, 0, 1) === '-') { + switch ($arg) { + case '-h': + case '--help': + echo getHelpText(); + exit(0); + default: + fail('Unknown option: ' . $arg); + } + } else { + $src = $argv[1]; + } +} + +if (isset($src)) { + if (!file_exists($src)) { + fail('File not found: ' . $src); + } + + $html = file_get_contents($src); +} else { + $stdin = fopen('php://stdin', 'r'); + stream_set_blocking($stdin, false); + $html = stream_get_contents($stdin); + fclose($stdin); + + if (empty($html)) { + fail(getHelpText()); + } +} + + +$converter = new League\HTMLToMarkdown\HtmlConverter(); +echo $converter->convert($html); + +/** + * Get help and usage info + * + * @return string + */ +function getHelpText() +{ + return << output.md + + Converting from STDIN: + + echo -e 'Hello World!' | html-to-markdown + + Converting from STDIN and saving the output: + + echo -e 'Hello World!' | html-to-markdown > output.md + +HELP; +} + +/** + * @param string $message Error message + */ +function fail($message) +{ + fwrite(STDERR, $message . "\n"); + exit(1); +} + +function requireAutoloader() +{ + $autoloadPaths = array( + // Local package usage + __DIR__ . '/../vendor/autoload.php', + // Package was included as a library + __DIR__ . '/../../../autoload.php', + ); + foreach ($autoloadPaths as $path) { + if (file_exists($path)) { + require_once $path; + break; + } + } +} diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json new file mode 100644 index 000000000..58764bcb5 --- /dev/null +++ b/vendor/league/html-to-markdown/composer.json @@ -0,0 +1,48 @@ +{ + "name": "league/html-to-markdown", + "type": "library", + "description": "An HTML-to-markdown conversion helper for PHP", + "keywords": ["markdown", "html"], + "homepage": "https://github.com/thephpleague/html-to-markdown", + "license": "MIT", + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "League\\HTMLToMarkdown\\Test\\": "tests" + } + }, + "require": { + "php": ">=5.3.3", + "ext-dom": "*", + "ext-xml": "*" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "bin": ["bin/html-to-markdown"], + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + } +} diff --git a/vendor/league/html-to-markdown/src/Configuration.php b/vendor/league/html-to-markdown/src/Configuration.php new file mode 100644 index 000000000..2943383aa --- /dev/null +++ b/vendor/league/html-to-markdown/src/Configuration.php @@ -0,0 +1,60 @@ +config = $config; + } + + /** + * @param array $config + */ + public function merge(array $config = array()) + { + $this->config = array_replace_recursive($this->config, $config); + } + + /** + * @param array $config + */ + public function replace(array $config = array()) + { + $this->config = $config; + } + + /** + * @param string $key + * @param mixed $value + */ + public function setOption($key, $value) + { + $this->config[$key] = $value; + } + + /** + * @param string|null $key + * @param mixed|null $default + * + * @return mixed|null + */ + public function getOption($key = null, $default = null) + { + if ($key === null) { + return $this->config; + } + + if (!isset($this->config[$key])) { + return $default; + } + + return $this->config[$key]; + } +} diff --git a/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php new file mode 100644 index 000000000..8aca530be --- /dev/null +++ b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php @@ -0,0 +1,11 @@ +' symbols to each line. + + $markdown = ''; + + $quote_content = trim($element->getValue()); + + $lines = preg_split('/\r\n|\r|\n/', $quote_content); + + $total_lines = count($lines); + + foreach ($lines as $i => $line) { + $markdown .= '> ' . $line . "\n"; + if ($i + 1 === $total_lines) { + $markdown .= "\n"; + } + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('blockquote'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php new file mode 100644 index 000000000..c8ec2c005 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php @@ -0,0 +1,62 @@ +getAttribute('class'); + + if ($classes) { + // Since tags can have more than one class, we need to find the one that starts with 'language-' + $classes = explode(' ', $classes); + foreach ($classes as $class) { + if (strpos($class, 'language-') !== false) { + // Found one, save it as the selected language and stop looping over the classes. + // The space after the language avoids gluing the actual code with the language tag + $language = str_replace('language-', '', $class) . ' '; + break; + } + } + } + + $markdown = ''; + $code = html_entity_decode($element->getChildrenAsString()); + + // In order to remove the code tags we need to search for them and, in the case of the opening tag + // use a regular expression to find the tag and the other attributes it might have + $code = preg_replace('/]*>/', '', $code); + $code = str_replace('', '', $code); + + // Checking if the code has multiple lines + $lines = preg_split('/\r\n|\r|\n/', $code); + if (count($lines) > 1) { + // Multiple lines detected, adding three backticks and newlines + $markdown .= '```' . $language . "\n" . $code . "\n" . '```'; + } else { + // One line of code, wrapping it on one backtick. + $markdown .= '`' . $language . $code . '`'; + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('code'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CommentConverter.php b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php new file mode 100644 index 000000000..55038b254 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php @@ -0,0 +1,26 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, + // such as nodes on their own. C14N() canonicalizes the node to a string. + // See: http://www.php.net/manual/en/domnode.c14n.php + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue(); + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array(self::DEFAULT_CONVERTER); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/DivConverter.php b/vendor/league/html-to-markdown/src/Converter/DivConverter.php new file mode 100644 index 000000000..656a0ba4d --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/DivConverter.php @@ -0,0 +1,45 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue() . "\n\n"; + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('div'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php new file mode 100644 index 000000000..67250769b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php @@ -0,0 +1,57 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $tag = $element->getTagName(); + $value = $element->getValue(); + + if (!trim($value)) { + return ''; + } + + if ($tag === 'i' || $tag === 'em') { + $style = $this->config->getOption('italic_style'); + } else { + $style = $this->config->getOption('bold_style'); + } + + $prefix = ltrim($value) !== $value ? ' ' : ''; + $suffix = rtrim($value) !== $value ? ' ' : ''; + + return $prefix . $style . trim($value) . $style . $suffix; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('em', 'i', 'strong', 'b'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php new file mode 100644 index 000000000..37cd44e73 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php @@ -0,0 +1,41 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + return $this->config->getOption('hard_break') ? "\n" : " \n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('br'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php new file mode 100644 index 000000000..d117e7d36 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php @@ -0,0 +1,78 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $level = (int) substr($element->getTagName(), 1, 1); + $style = $this->config->getOption('header_style', self::STYLE_SETEXT); + + if (($level === 1 || $level === 2) && !$element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) { + return $this->createSetextHeader($level, $element->getValue()); + } + + return $this->createAtxHeader($level, $element->getValue()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'); + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createSetextHeader($level, $content) + { + $length = function_exists('mb_strlen') ? mb_strlen($content, 'utf-8') : strlen($content); + $underline = ($level === 1) ? '=' : '-'; + + return $content . "\n" . str_repeat($underline, $length) . "\n\n"; + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createAtxHeader($level, $content) + { + $prefix = str_repeat('#', $level) . ' '; + + return $prefix . $content . "\n\n"; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php new file mode 100644 index 000000000..8f54f9397 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php @@ -0,0 +1,26 @@ +getAttribute('src'); + $alt = $element->getAttribute('alt'); + $title = $element->getAttribute('title'); + + if ($title !== '') { + // No newlines added. should be in a block-level element. + return ''; + } + + return ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('img'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php new file mode 100644 index 000000000..f0765f38b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php @@ -0,0 +1,52 @@ +getAttribute('href'); + $title = $element->getAttribute('title'); + $text = trim($element->getValue()); + + if ($title !== '') { + $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; + } elseif ($href === $text && $this->isValidAutolink($href)) { + $markdown = '<' . $href . '>'; + } else { + $markdown = '[' . $text . '](' . $href . ')'; + } + + if (!$href) { + $markdown = html_entity_decode($element->getChildrenAsString()); + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('a'); + } + + /** + * @param string $href + * + * @return bool + */ + private function isValidAutolink($href) + { + return preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php new file mode 100644 index 000000000..07a4c85a9 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php @@ -0,0 +1,26 @@ +getValue() . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('ol', 'ul'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php new file mode 100644 index 000000000..dafec077c --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php @@ -0,0 +1,47 @@ +getParent()->getTagName(); + + // Add spaces to start for nested list items + $level = $element->getListItemLevel($element); + + $prefixForParagraph = str_repeat(' ', $level + 1); + $value = trim(implode("\n" . $prefixForParagraph, explode("\n", trim($element->getValue())))); + + // If list item is the first in a nested list, add a newline before it + $prefix = ''; + if ($level > 0 && $element->getSiblingPosition() === 1) { + $prefix = "\n"; + } + + if ($list_type === 'ul') { + return $prefix . '- ' . $value . "\n"; + } + + $number = $element->getSiblingPosition(); + + return $prefix . $number . '. ' . $value . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('li'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php new file mode 100644 index 000000000..cf852bfcf --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php @@ -0,0 +1,124 @@ +getValue(); + + $markdown = ''; + + $lines = preg_split('/\r\n|\r|\n/', $value); + foreach ($lines as $line) { + /* + * Some special characters need to be escaped based on the position that they appear + * The following function will deal with those special cases. + */ + $markdown .= $this->escapeSpecialCharacters($line); + $markdown .= "\n"; + } + + return trim($markdown) !== '' ? rtrim($markdown) . "\n\n" : ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('p'); + } + + /** + * @param string $line + * + * @return string + */ + private function escapeSpecialCharacters($line) + { + $line = $this->escapeFirstCharacters($line); + $line = $this->escapeOtherCharacters($line); + $line = $this->escapeOtherCharactersRegex($line); + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeFirstCharacters($line) + { + $escapable = array( + '>', + '- ', + '+ ', + '--', + '~~~', + '---', + '- - -' + ); + + foreach ($escapable as $i) { + if (strpos(ltrim($line), $i) === 0) { + // Found a character that must be escaped, adding a backslash before + return '\\' . ltrim($line); + } + } + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeOtherCharacters($line) + { + $escapable = array( + ' {{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache_duration}} diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl index a8243b614..e65014413 100644 --- a/view/templates/admin_summary.tpl +++ b/view/templates/admin_summary.tpl @@ -11,7 +11,7 @@ {{$queues.label}} - {{$queues.deliverq}} - {{$queues.queue}} - {{$queues.workerq}} + {{$queues.queue}} - {{$queues.workerq}} {{$pending.0}} diff --git a/view/templates/head.tpl b/view/templates/head.tpl index 0772af0bc..e7df8a18c 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -7,7 +7,7 @@ - + @@ -19,6 +19,7 @@ +
"; + var_dump($consumer, $token); + die(); + } catch (Exception $e) { logger($e); } - - // workaround for HTTP-auth in CGI mode - if(x($_SERVER,'REDIRECT_REMOTE_USER')) { - $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"],6)) ; - if(strlen($userpass)) { + if (x($_SERVER, 'REDIRECT_REMOTE_USER')) { + $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ; + if (strlen($userpass)) { list($name, $password) = explode(':', $userpass); $_SERVER['PHP_AUTH_USER'] = $name; $_SERVER['PHP_AUTH_PW'] = $password; } } - if (!isset($_SERVER['PHP_AUTH_USER'])) { + if (!x($_SERVER, 'PHP_AUTH_USER')) { logger('API_login: ' . print_r($_SERVER,true), LOGGER_DEBUG); header('WWW-Authenticate: Basic realm="Friendica"'); throw new UnauthorizedException("This API requires login"); @@ -171,55 +173,51 @@ use \Friendica\Core\Config; $user = $_SERVER['PHP_AUTH_USER']; $password = $_SERVER['PHP_AUTH_PW']; - $encrypted = hash('whirlpool',trim($password)); + $encrypted = hash('whirlpool', trim($password)); // allow "user@server" login (but ignore 'server' part) - $at=strstr($user, "@", true); - if ( $at ) $user=$at; + $at = strstr($user, "@", true); + if ($at) { + $user = $at; + } - /** - * next code from mod/auth.php. needs better solution - */ + // next code from mod/auth.php. needs better solution $record = null; $addon_auth = array( 'username' => trim($user), 'password' => trim($password), 'authenticated' => 0, - 'user_record' => null + 'user_record' => null, ); - /** - * + /* * A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record * Plugins should never set 'authenticated' except to indicate success - as hooks may be chained * and later plugins should not interfere with an earlier one that succeeded. - * */ - call_hooks('authenticate', $addon_auth); - if(($addon_auth['authenticated']) && (count($addon_auth['user_record']))) { + if (($addon_auth['authenticated']) && (count($addon_auth['user_record']))) { $record = $addon_auth['user_record']; - } - else { + } else { // process normal login request - $r = q("SELECT * FROM `user` WHERE (`email` = '%s' OR `nickname` = '%s') AND `password` = '%s' AND NOT `blocked` AND NOT `account_expired` AND NOT `account_removed` AND `verified` LIMIT 1", dbesc(trim($user)), dbesc(trim($user)), dbesc($encrypted) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $record = $r[0]; + } } - if((! $record) || (! count($record))) { - logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG); + if ((! $record) || (! count($record))) { + logger('API_login failure: ' . print_r($_SERVER, true), LOGGER_DEBUG); header('WWW-Authenticate: Basic realm="Friendica"'); - #header('HTTP/1.0 401 Unauthorized'); - #die('This api requires login'); + //header('HTTP/1.0 401 Unauthorized'); + //die('This api requires login'); throw new UnauthorizedException("This API requires login"); } @@ -242,8 +240,10 @@ use \Friendica\Core\Config; * @return bool */ function api_check_method($method) { - if ($method=="*") return True; - return strpos($method, $_SERVER['REQUEST_METHOD']) !== false; + if ($method == "*") { + return true; + } + return (strpos($method, $_SERVER['REQUEST_METHOD']) !== false); } /** @@ -254,39 +254,51 @@ use \Friendica\Core\Config; * @param App $a * @return string API call result */ - function api_call(App $a){ + function api_call(App $a) { global $API, $called_api; - $type="json"; - if (strpos($a->query_string, ".xml")>0) $type="xml"; - if (strpos($a->query_string, ".json")>0) $type="json"; - if (strpos($a->query_string, ".rss")>0) $type="rss"; - if (strpos($a->query_string, ".atom")>0) $type="atom"; + $type = "json"; + if (strpos($a->query_string, ".xml") > 0) { + $type = "xml"; + } + if (strpos($a->query_string, ".json") > 0) { + $type = "json"; + } + if (strpos($a->query_string, ".rss") > 0) { + $type = "rss"; + } + if (strpos($a->query_string, ".atom") > 0) { + $type = "atom"; + } + try { - foreach ($API as $p=>$info){ - if (strpos($a->query_string, $p)===0){ - if (!api_check_method($info['method'])){ + foreach ($API as $p => $info) { + if (strpos($a->query_string, $p) === 0) { + if (!api_check_method($info['method'])) { throw new MethodNotAllowedException(); } - $called_api= explode("/",$p); + $called_api = explode("/", $p); //unset($_SERVER['PHP_AUTH_USER']); - if ($info['auth']===true && api_user()===false) { - api_login($a); + + /// @TODO should be "true ==[=] $info['auth']", if you miss only one = character, you assign a variable (only with ==). Let's make all this even. + if ($info['auth'] === true && api_user() === false) { + api_login($a); } logger('API call for ' . $a->user['username'] . ': ' . $a->query_string); - logger('API parameters: ' . print_r($_REQUEST,true)); + logger('API parameters: ' . print_r($_REQUEST, true)); $stamp = microtime(true); $r = call_user_func($info['func'], $type); - $duration = (float)(microtime(true)-$stamp); - logger("API call duration: ".round($duration, 2)."\t".$a->query_string, LOGGER_DEBUG); + $duration = (float) (microtime(true) - $stamp); + logger("API call duration: " . round($duration, 2) . "\t" . $a->query_string, LOGGER_DEBUG); if (get_config("system", "profiler")) { $duration = microtime(true)-$a->performance["start"]; - logger(parse_url($a->query_string, PHP_URL_PATH).": ".sprintf("Database: %s/%s, Network: %s, I/O: %s, Other: %s, Total: %s", + /// @TODO round() really everywhere? + logger(parse_url($a->query_string, PHP_URL_PATH) . ": " . sprintf("Database: %s/%s, Network: %s, I/O: %s, Other: %s, Total: %s", round($a->performance["database"] - $a->performance["database_write"], 3), round($a->performance["database_write"], 3), round($a->performance["network"], 2), @@ -294,65 +306,71 @@ use \Friendica\Core\Config; round($duration - ($a->performance["database"] + $a->performance["network"] + $a->performance["file"]), 2), round($duration, 2)), - LOGGER_DEBUG); + LOGGER_DEBUG + ); if (get_config("rendertime", "callstack")) { $o = "Database Read:\n"; foreach ($a->callstack["database"] AS $func => $time) { $time = round($time, 3); - if ($time > 0) - $o .= $func.": ".$time."\n"; + if ($time > 0) { + $o .= $func . ": " . $time . "\n"; + } } $o .= "\nDatabase Write:\n"; foreach ($a->callstack["database_write"] AS $func => $time) { $time = round($time, 3); - if ($time > 0) - $o .= $func.": ".$time."\n"; + if ($time > 0) { + $o .= $func . ": " . $time . "\n"; + } } $o .= "\nNetwork:\n"; foreach ($a->callstack["network"] AS $func => $time) { $time = round($time, 3); - if ($time > 0) - $o .= $func.": ".$time."\n"; + if ($time > 0) { + $o .= $func . ": " . $time . "\n"; + } } logger($o, LOGGER_DEBUG); } } - - if ($r===false) { - // api function returned false withour throw an - // exception. This should not happend, throw a 500 + if (false === $r) { + /* + * api function returned false withour throw an + * exception. This should not happend, throw a 500 + */ throw new InternalServerErrorException(); } - switch($type){ + switch ($type) { case "xml": header ("Content-Type: text/xml"); return $r; break; case "json": header ("Content-Type: application/json"); - foreach($r as $rr) + foreach ($r as $rr) $json = json_encode($rr); - if ($_GET['callback']) - $json = $_GET['callback']."(".$json.")"; + if (x($_GET, 'callback')) { + $json = $_GET['callback'] . "(" . $json . ")"; + } return $json; break; case "rss": header ("Content-Type: application/rss+xml"); - return ''."\n".$r; + return '' . "\n" . $r; break; case "atom": header ("Content-Type: application/atom+xml"); - return ''."\n".$r; + return '' . "\n" . $r; break; - } } } - logger('API call not implemented: '.$a->query_string); + + logger('API call not implemented: ' . $a->query_string); throw new NotImplementedException(); } catch (HTTPException $e) { header("HTTP/1.1 {$e->httpcode} {$e->httpdesc}"); @@ -371,16 +389,16 @@ use \Friendica\Core\Config; $a = get_app(); - $error = ($e->getMessage()!==""?$e->getMessage():$e->httpdesc); - # TODO: https://dev.twitter.com/overview/api/response-codes + $error = ($e->getMessage() !== "" ? $e->getMessage() : $e->httpdesc); + /// @TODO: https://dev.twitter.com/overview/api/response-codes $error = array("error" => $error, - "code" => $e->httpcode." ".$e->httpdesc, + "code" => $e->httpcode . " " . $e->httpdesc, "request" => $a->query_string); $ret = api_format_data('status', $type, array('status' => $error)); - switch($type){ + switch ($type) { case "xml": header ("Content-Type: text/xml"); return $ret; @@ -407,18 +425,22 @@ use \Friendica\Core\Config; * @param array $arr Array to be passed to template * @param array $user_info * @return array + * @todo find proper type-hints */ - function api_rss_extra(App $a, $arr, $user_info){ - if (is_null($user_info)) $user_info = api_get_user($a); + function api_rss_extra(App $a, $arr, $user_info) { + if (is_null($user_info)) { + $user_info = api_get_user($a); + } + $arr['$user'] = $user_info; $arr['$rss'] = array( 'alternate' => $user_info['url'], - 'self' => App::get_baseurl(). "/". $a->query_string, + 'self' => App::get_baseurl() . "/" . $a->query_string, 'base' => App::get_baseurl(), 'updated' => api_date(null), - 'atom_updated' => datetime_convert('UTC','UTC','now',ATOM_TIME), + 'atom_updated' => datetime_convert('UTC', 'UTC', 'now', ATOM_TIME), 'language' => $user_info['language'], - 'logo' => App::get_baseurl()."/images/friendica-32.png", + 'logo' => App::get_baseurl() . "/images/friendica-32.png", ); return $arr; @@ -432,13 +454,11 @@ use \Friendica\Core\Config; * @return bool|string * Contact url or False if contact id is unknown */ - function api_unique_id_to_url($id){ + function api_unique_id_to_url($id) { $r = q("SELECT `url` FROM `contact` WHERE `uid` = 0 AND `id` = %d LIMIT 1", intval($id)); - if ($r) - return ($r[0]["url"]); - else - return false; + + return (dbm::is_result($r) && $r[0]["url"]); } /** @@ -448,8 +468,9 @@ use \Friendica\Core\Config; * @param int|string $contact_id Contact ID or URL * @param string $type Return type (for errors) */ - function api_get_user(App $a, $contact_id = Null, $type = "json"){ + function api_get_user(App $a, $contact_id = null, $type = "json") { global $called_api; + $user = null; $extra_query = ""; $url = ""; @@ -458,68 +479,83 @@ use \Friendica\Core\Config; logger("api_get_user: Fetching user data for user ".$contact_id, LOGGER_DEBUG); // Searching for contact URL - if(!is_null($contact_id) AND (intval($contact_id) == 0)){ + if (!is_null($contact_id) AND (intval($contact_id) == 0)) { $user = dbesc(normalise_link($contact_id)); $url = $user; $extra_query = "AND `contact`.`nurl` = '%s' "; - if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); + if (api_user() !== false) { + $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); + } } // Searching for contact id with uid = 0 - if(!is_null($contact_id) AND (intval($contact_id) != 0)){ + if (!is_null($contact_id) AND (intval($contact_id) != 0)) { $user = dbesc(api_unique_id_to_url($contact_id)); - if ($user == "") + if ($user == "") { throw new BadRequestException("User not found."); + } $url = $user; $extra_query = "AND `contact`.`nurl` = '%s' "; - if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); + if (api_user() !== false) { + $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); + } } - if(is_null($user) && x($_GET, 'user_id')) { + if (is_null($user) && x($_GET, 'user_id')) { $user = dbesc(api_unique_id_to_url($_GET['user_id'])); - if ($user == "") + if ($user == "") { throw new BadRequestException("User not found."); + } $url = $user; $extra_query = "AND `contact`.`nurl` = '%s' "; - if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); + if (api_user() !== false) { + $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); + } } - if(is_null($user) && x($_GET, 'screen_name')) { + if (is_null($user) && x($_GET, 'screen_name')) { $user = dbesc($_GET['screen_name']); $nick = $user; $extra_query = "AND `contact`.`nick` = '%s' "; - if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); + if (api_user() !== false) { + $extra_query .= "AND `contact`.`uid`=".intval(api_user()); + } } - if (is_null($user) AND ($a->argc > (count($called_api)-1)) AND (count($called_api) > 0)){ + if (is_null($user) AND ($a->argc > (count($called_api) - 1)) AND (count($called_api) > 0)) { $argid = count($called_api); - list($user, $null) = explode(".",$a->argv[$argid]); - if(is_numeric($user)){ + list($user, $null) = explode(".", $a->argv[$argid]); + if (is_numeric($user)) { $user = dbesc(api_unique_id_to_url($user)); - if ($user == "") + if ($user == "") { return false; + } $url = $user; $extra_query = "AND `contact`.`nurl` = '%s' "; - if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); + if (api_user() !== false) { + $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); + } } else { $user = dbesc($user); $nick = $user; $extra_query = "AND `contact`.`nick` = '%s' "; - if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); + if (api_user() !== false) { + $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); + } } } logger("api_get_user: user ".$user, LOGGER_DEBUG); if (!$user) { - if (api_user()===false) { + if (api_user() === false) { api_login($a); - return False; + return false; } else { $user = $_SESSION['uid']; $extra_query = "AND `contact`.`uid` = %d AND `contact`.`self` "; @@ -528,8 +564,9 @@ use \Friendica\Core\Config; } logger('api_user: ' . $extra_query . ', user: ' . $user); + // user info - $uinfo = q("SELECT *, `contact`.`id` as `cid` FROM `contact` + $uinfo = q("SELECT *, `contact`.`id` AS `cid` FROM `contact` WHERE 1 $extra_query", $user @@ -539,18 +576,20 @@ use \Friendica\Core\Config; api_best_nickname($uinfo); // if the contact wasn't found, fetch it from the contacts with uid = 0 - if (count($uinfo)==0) { + if (!dbm::is_result($uinfo)) { $r = array(); - if ($url != "") + if ($url != "") { $r = q("SELECT * FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s' LIMIT 1", dbesc(normalise_link($url))); + } - if ($r) { + if (dbm::is_result($r)) { $network_name = network_to_name($r[0]['network'], $r[0]['url']); // If no nick where given, extract it from the address - if (($r[0]['nick'] == "") OR ($r[0]['name'] == $r[0]['nick'])) + if (($r[0]['nick'] == "") OR ($r[0]['name'] == $r[0]['nick'])) { $r[0]['nick'] = api_get_nick($r[0]["url"]); + } $ret = array( 'id' => $r[0]["id"], @@ -594,18 +633,20 @@ use \Friendica\Core\Config; } } - if($uinfo[0]['self']) { + if ($uinfo[0]['self']) { - if ($uinfo[0]['network'] == "") + if ($uinfo[0]['network'] == "") { $uinfo[0]['network'] = NETWORK_DFRN; + } - $usr = q("select * from user where uid = %d limit 1", + $usr = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval(api_user()) ); - $profile = q("select * from profile where uid = %d and `is-default` = 1 limit 1", + $profile = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", intval(api_user()) ); + /// @TODO old-lost code? (twice) // Counting is deactivated by now, due to performance issues // count public wall messages //$r = q("SELECT COUNT(*) as `count` FROM `item` WHERE `uid` = %d AND `wall`", @@ -622,6 +663,8 @@ use \Friendica\Core\Config; //$countitms = $r[0]['count']; $countitms = 0; } + + /// @TODO old-lost code? (twice) /* // Counting is deactivated by now, due to performance issues // count friends @@ -649,7 +692,7 @@ use \Friendica\Core\Config; $starred = $r[0]['count']; - if(! $uinfo[0]['self']) { + if (! $uinfo[0]['self']) { $countfriends = 0; $countfollowers = 0; $starred = 0; @@ -668,7 +711,7 @@ use \Friendica\Core\Config; $pcontact_id = get_contact($uinfo[0]['url'], 0, true); - $ret = Array( + $ret = array( 'id' => intval($pcontact_id), 'id_str' => (string) intval($pcontact_id), 'name' => (($uinfo[0]['name']) ? $uinfo[0]['name'] : $uinfo[0]['nick']), @@ -697,6 +740,7 @@ use \Friendica\Core\Config; 'follow_request_sent' => false, 'statusnet_blocking' => false, 'notifications' => false, + /// @TODO old way? //'statusnet_profile_url' => App::get_baseurl()."/contacts/".$uinfo[0]['cid'], 'statusnet_profile_url' => $uinfo[0]['url'], 'uid' => intval($uinfo[0]['uid']), @@ -726,7 +770,11 @@ use \Friendica\Core\Config; ($item["deny_gid"] != "") OR $item["private"]); - $owner_user = api_get_user($a, $item["owner-link"]); + if ($item['thr-parent'] == $item['uri']) { + $owner_user = api_get_user($a, $item["owner-link"]); + } else { + $owner_user = $status_user; + } return (array($status_user, $owner_user)); } @@ -745,11 +793,13 @@ use \Friendica\Core\Config; foreach ($array as $k => $v) { if (is_array($v)) { - if ($callback($v, $k)) + if ($callback($v, $k)) { $new_array[$k] = api_walk_recursive($v, $callback); + } } else { - if ($callback($v, $k)) + if ($callback($v, $k)) { $new_array[$k] = $v; + } } } $array = $new_array; @@ -766,13 +816,16 @@ use \Friendica\Core\Config; * @return boolean Should the array item be deleted? */ function api_reformat_xml(&$item, &$key) { - if (is_bool($item)) + if (is_bool($item)) { $item = ($item ? "true" : "false"); + } - if (substr($key, 0, 10) == "statusnet_") + if (substr($key, 0, 10) == "statusnet_") { $key = "statusnet:".substr($key, 10); - elseif (substr($key, 0, 10) == "friendica_") + } elseif (substr($key, 0, 10) == "friendica_") { $key = "friendica:".substr($key, 10); + } + /// @TODO old-lost code? //else // $key = "default:".$key; @@ -798,18 +851,21 @@ use \Friendica\Core\Config; "georss" => "http://www.georss.org/georss"); /// @todo Auto detection of needed namespaces - if (in_array($root_element, array("ok", "hash", "config", "version", "ids", "notes", "photos"))) + if (in_array($root_element, array("ok", "hash", "config", "version", "ids", "notes", "photos"))) { $namespaces = array(); + } - if (is_array($data2)) + if (is_array($data2)) { api_walk_recursive($data2, "api_reformat_xml"); + } if ($key == "0") { $data4 = array(); $i = 1; - foreach ($data2 AS $item) + foreach ($data2 AS $item) { $data4[$i++.":".$childname] = $item; + } $data2 = $data4; } @@ -829,11 +885,11 @@ use \Friendica\Core\Config; * * @return (string|object) XML data or JSON data */ - function api_format_data($root_element, $type, $data){ + function api_format_data($root_element, $type, $data) { $a = get_app(); - switch($type){ + switch ($type) { case "atom": case "rss": case "xml": @@ -856,11 +912,13 @@ use \Friendica\Core\Config; * returns a 401 status code and an error message if not. * http://developer.twitter.com/doc/get/account/verify_credentials */ - function api_account_verify_credentials($type){ + function api_account_verify_credentials($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } unset($_REQUEST["user_id"]); unset($_GET["user_id"]); @@ -868,7 +926,7 @@ use \Friendica\Core\Config; unset($_REQUEST["screen_name"]); unset($_GET["screen_name"]); - $skip_status = (x($_REQUEST,'skip_status')?$_REQUEST['skip_status']:false); + $skip_status = (x($_REQUEST, 'skip_status')?$_REQUEST['skip_status'] : false); $user_info = api_get_user($a); @@ -878,10 +936,11 @@ use \Friendica\Core\Config; // - Adding last status if (!$skip_status) { $user_info["status"] = api_status_show("raw"); - if (!count($user_info["status"])) + if (!count($user_info["status"])) { unset($user_info["status"]); - else + } else { unset($user_info["status"]["user"]); + } } // "uid" and "self" are only needed for some internal stuff, so remove it from here @@ -891,17 +950,18 @@ use \Friendica\Core\Config; return api_format_data("user", $type, array('user' => $user_info)); } - api_register_func('api/account/verify_credentials','api_account_verify_credentials', true); + /// @TODO move to top of file or somwhere better + api_register_func('api/account/verify_credentials','api_account_verify_credentials', true); /** * get data from $_POST or $_GET */ - function requestdata($k){ - if (isset($_POST[$k])){ + function requestdata($k) { + if (x($_POST, $k)) { return $_POST[$k]; } - if (isset($_GET[$k])){ + if (x($_GET, $k)) { return $_GET[$k]; } return null; @@ -912,7 +972,7 @@ use \Friendica\Core\Config; $a = get_app(); - if (api_user()===false) { + if (api_user() === false) { logger('api_statuses_update: no user'); throw new ForbiddenException(); } @@ -922,9 +982,10 @@ use \Friendica\Core\Config; $_REQUEST['profile_uid'] = api_user(); $_REQUEST['api_source'] = true; $txt = requestdata('status'); + /// @TODO old-lost code? //$txt = urldecode(requestdata('status')); - if((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) { + if ((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) { $txt = html2bb_video($txt); $config = HTMLPurifier_Config::createDefault(); @@ -936,25 +997,26 @@ use \Friendica\Core\Config; $a->argv[1]=$user_info['screen_name']; //should be set to username? - $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo + // tell wall_upload function to return img info instead of echo + $_REQUEST['hush'] = 'yeah'; $bebop = wall_upload_post($a); - //now that we have the img url in bbcode we can add it to the status and insert the wall item. - $_REQUEST['body']=$txt."\n\n".$bebop; + // now that we have the img url in bbcode we can add it to the status and insert the wall item. + $_REQUEST['body'] = $txt . "\n\n" . $bebop; item_post($a); // this should output the last post (the one we just posted). return api_status_show($type); } - api_register_func('api/statuses/mediap','api_statuses_mediap', true, API_METHOD_POST); -/*Waitman Gobble Mod*/ + /// @TODO move this to top of file or somewhere better! + api_register_func('api/statuses/mediap','api_statuses_mediap', true, API_METHOD_POST); function api_statuses_update($type) { $a = get_app(); - if (api_user()===false) { + if (api_user() === false) { logger('api_statuses_update: no user'); throw new ForbiddenException(); } @@ -965,9 +1027,9 @@ use \Friendica\Core\Config; // logger('api_post: ' . print_r($_POST,true)); - if(requestdata('htmlstatus')) { + if (requestdata('htmlstatus')) { $txt = requestdata('htmlstatus'); - if((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) { + if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) { $txt = html2bb_video($txt); $config = HTMLPurifier_Config::createDefault(); @@ -979,29 +1041,33 @@ use \Friendica\Core\Config; $_REQUEST['body'] = html2bbcode($txt); } - } else + } else { $_REQUEST['body'] = requestdata('status'); + } $_REQUEST['title'] = requestdata('title'); $parent = requestdata('in_reply_to_status_id'); // Twidere sends "-1" if it is no reply ... - if ($parent == -1) + if ($parent == -1) { $parent = ""; + } - if(ctype_digit($parent)) + if (ctype_digit($parent)) { $_REQUEST['parent'] = $parent; - else + } else { $_REQUEST['parent_uri'] = $parent; + } - if(requestdata('lat') && requestdata('long')) - $_REQUEST['coord'] = sprintf("%s %s",requestdata('lat'),requestdata('long')); + if (requestdata('lat') && requestdata('long')) { + $_REQUEST['coord'] = sprintf("%s %s", requestdata('lat'), requestdata('long')); + } $_REQUEST['profile_uid'] = api_user(); - if($parent) + if ($parent) { $_REQUEST['type'] = 'net-comment'; - else { + } else { // Check for throttling (maximum posts per day, week and month) $throttle_day = get_config('system','throttle_limit_day'); if ($throttle_day > 0) { @@ -1011,14 +1077,15 @@ use \Friendica\Core\Config; AND `created` > '%s' AND `id` = `parent`", intval(api_user()), dbesc($datefrom)); - if ($r) + if (dbm::is_result($r)) { $posts_day = $r[0]["posts_day"]; - else + } else { $posts_day = 0; + } if ($posts_day > $throttle_day) { logger('Daily posting limit reached for user '.api_user(), LOGGER_DEBUG); - #die(api_error($type, sprintf(t("Daily posting limit of %d posts reached. The post was rejected."), $throttle_day))); + // die(api_error($type, sprintf(t("Daily posting limit of %d posts reached. The post was rejected."), $throttle_day))); throw new TooManyRequestsException(sprintf(t("Daily posting limit of %d posts reached. The post was rejected."), $throttle_day)); } } @@ -1031,16 +1098,16 @@ use \Friendica\Core\Config; AND `created` > '%s' AND `id` = `parent`", intval(api_user()), dbesc($datefrom)); - if ($r) + if (dbm::is_result($r)) { $posts_week = $r[0]["posts_week"]; - else + } else { $posts_week = 0; + } if ($posts_week > $throttle_week) { logger('Weekly posting limit reached for user '.api_user(), LOGGER_DEBUG); - #die(api_error($type, sprintf(t("Weekly posting limit of %d posts reached. The post was rejected."), $throttle_week))); + // die(api_error($type, sprintf(t("Weekly posting limit of %d posts reached. The post was rejected."), $throttle_week))); throw new TooManyRequestsException(sprintf(t("Weekly posting limit of %d posts reached. The post was rejected."), $throttle_week)); - } } @@ -1052,14 +1119,15 @@ use \Friendica\Core\Config; AND `created` > '%s' AND `id` = `parent`", intval(api_user()), dbesc($datefrom)); - if ($r) + if (dbm::is_result($r)) { $posts_month = $r[0]["posts_month"]; - else + } else { $posts_month = 0; + } if ($posts_month > $throttle_month) { logger('Monthly posting limit reached for user '.api_user(), LOGGER_DEBUG); - #die(api_error($type, sprintf(t("Monthly posting limit of %d posts reached. The post was rejected."), $throttle_month))); + // die(api_error($type, sprintf(t("Monthly posting limit of %d posts reached. The post was rejected."), $throttle_month))); throw new TooManyRequestsException(sprintf(t("Monthly posting limit of %d posts reached. The post was rejected."), $throttle_month)); } } @@ -1067,23 +1135,24 @@ use \Friendica\Core\Config; $_REQUEST['type'] = 'wall'; } - if(x($_FILES,'media')) { + if (x($_FILES, 'media')) { // upload the image if we have one - $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo + $_REQUEST['hush'] = 'yeah'; //tell wall_upload function to return img info instead of echo $media = wall_upload_post($a); - if(strlen($media)>0) - $_REQUEST['body'] .= "\n\n".$media; + if (strlen($media) > 0) { + $_REQUEST['body'] .= "\n\n" . $media; + } } // To-Do: Multiple IDs if (requestdata('media_ids')) { $r = q("SELECT `resource-id`, `scale`, `nickname`, `type` FROM `photo` INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN (SELECT `resource-id` FROM `photo` WHERE `id` = %d) AND `scale` > 0 AND `photo`.`uid` = %d ORDER BY `photo`.`width` DESC LIMIT 1", intval(requestdata('media_ids')), api_user()); - if ($r) { + if (dbm::is_result($r)) { $phototypes = Photo::supportedTypes(); $ext = $phototypes[$r[0]['type']]; - $_REQUEST['body'] .= "\n\n".'[url='.App::get_baseurl().'/photos/'.$r[0]['nickname'].'/image/'.$r[0]['resource-id'].']'; - $_REQUEST['body'] .= '[img]'.App::get_baseurl()."/photo/".$r[0]['resource-id']."-".$r[0]['scale'].".".$ext."[/img][/url]"; + $_REQUEST['body'] .= "\n\n" . '[url=' . App::get_baseurl() . '/photos/' . $r[0]['nickname'] . '/image/' . $r[0]['resource-id'] . ']'; + $_REQUEST['body'] .= '[img]' . App::get_baseurl() . '/photo/' . $r[0]['resource-id'] . '-' . $r[0]['scale'] . '.' . $ext . '[/img][/url]'; } } @@ -1091,38 +1160,39 @@ use \Friendica\Core\Config; $_REQUEST['api_source'] = true; - if (!x($_REQUEST, "source")) + if (!x($_REQUEST, "source")) { $_REQUEST["source"] = api_source(); + } // call out normal post function - item_post($a); // this should output the last post (the one we just posted). return api_status_show($type); } + + /// @TODO move to top of file or somwhere better api_register_func('api/statuses/update','api_statuses_update', true, API_METHOD_POST); api_register_func('api/statuses/update_with_media','api_statuses_update', true, API_METHOD_POST); - function api_media_upload($type) { $a = get_app(); - if (api_user()===false) { + if (api_user() === false) { logger('no user'); throw new ForbiddenException(); } $user_info = api_get_user($a); - if(!x($_FILES,'media')) { + if (!x($_FILES, 'media')) { // Output error throw new BadRequestException("No media."); } $media = wall_upload_post($a, false); - if(!$media) { + if (!$media) { // Output error throw new InternalServerErrorException(); } @@ -1135,13 +1205,15 @@ use \Friendica\Core\Config; "h" => $media["height"], "image_type" => $media["type"]); - logger("Media uploaded: ".print_r($returndata, true), LOGGER_DEBUG); + logger("Media uploaded: " . print_r($returndata, true), LOGGER_DEBUG); return array("media" => $returndata); } + + /// @TODO move to top of file or somwhere better api_register_func('api/media/upload','api_media_upload', true, API_METHOD_POST); - function api_status_show($type){ + function api_status_show($type) { $a = get_app(); @@ -1149,10 +1221,11 @@ use \Friendica\Core\Config; logger('api_status_show: user_info: '.print_r($user_info, true), LOGGER_DEBUG); - if ($type == "raw") + if ($type == "raw") { $privacy_sql = "AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''"; - else + } else { $privacy_sql = ""; + } // get last public wall message $lastwall = q("SELECT `item`.* @@ -1170,17 +1243,18 @@ use \Friendica\Core\Config; dbesc(normalise_link($user_info['url'])) ); - if (count($lastwall)>0){ + if (dbm::is_result($lastwall)) { $lastwall = $lastwall[0]; $in_reply_to = api_in_reply_to($lastwall); $converted = api_convert_item($lastwall); - if ($type == "xml") + if ($type == "xml") { $geo = "georss:point"; - else + } else { $geo = "geo"; + } $status_info = array( 'created_at' => api_date($lastwall['created']), @@ -1210,16 +1284,19 @@ use \Friendica\Core\Config; 'statusnet_conversation_id' => $lastwall['parent'], ); - if (count($converted["attachments"]) > 0) + if (count($converted["attachments"]) > 0) { $status_info["attachments"] = $converted["attachments"]; + } - if (count($converted["entities"]) > 0) + if (count($converted["entities"]) > 0) { $status_info["entities"] = $converted["entities"]; + } - if (($lastwall['item_network'] != "") AND ($status["source"] == 'web')) + if (($lastwall['item_network'] != "") AND ($status["source"] == 'web')) { $status_info["source"] = network_to_name($lastwall['item_network'], $user_info['url']); - elseif (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $status_info["source"])) + } elseif (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $status_info["source"])) { $status_info["source"] = trim($status_info["source"].' ('.network_to_name($lastwall['item_network'], $user_info['url']).')'); + } // "uid" and "self" are only needed for some internal stuff, so remove it from here unset($status_info["user"]["uid"]); @@ -1228,23 +1305,20 @@ use \Friendica\Core\Config; logger('status_info: '.print_r($status_info, true), LOGGER_DEBUG); - if ($type == "raw") - return($status_info); + if ($type == "raw") { + return $status_info; + } - return api_format_data("statuses", $type, array('status' => $status_info)); + return api_format_data("statuses", $type, array('status' => $status_info)); } - - - - /** * Returns extended information of a given user, specified by ID or screen name as per the required id parameter. * The author's most recent status will be returned inline. * http://developer.twitter.com/doc/get/users/show */ - function api_users_show($type){ + function api_users_show($type) { $a = get_app(); @@ -1267,17 +1341,18 @@ use \Friendica\Core\Config; dbesc(normalise_link($user_info['url'])) ); - if (count($lastwall)>0){ + if (dbm::is_result($lastwall)) { $lastwall = $lastwall[0]; $in_reply_to = api_in_reply_to($lastwall); $converted = api_convert_item($lastwall); - if ($type == "xml") + if ($type == "xml") { $geo = "georss:point"; - else + } else { $geo = "geo"; + } $user_info['status'] = array( 'text' => $converted["text"], @@ -1293,20 +1368,25 @@ use \Friendica\Core\Config; 'in_reply_to_screen_name' => $in_reply_to['screen_name'], $geo => NULL, 'favorited' => $lastwall['starred'] ? true : false, - 'statusnet_html' => $converted["html"], + 'statusnet_html' => $converted["html"], 'statusnet_conversation_id' => $lastwall['parent'], ); - if (count($converted["attachments"]) > 0) + if (count($converted["attachments"]) > 0) { $user_info["status"]["attachments"] = $converted["attachments"]; + } - if (count($converted["entities"]) > 0) + if (count($converted["entities"]) > 0) { $user_info["status"]["entities"] = $converted["entities"]; + } - if (($lastwall['item_network'] != "") AND ($user_info["status"]["source"] == 'web')) + if (($lastwall['item_network'] != "") AND ($user_info["status"]["source"] == 'web')) { $user_info["status"]["source"] = network_to_name($lastwall['item_network'], $user_info['url']); - if (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $user_info["status"]["source"])) - $user_info["status"]["source"] = trim($user_info["status"]["source"].' ('.network_to_name($lastwall['item_network'], $user_info['url']).')'); + } + + if (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $user_info["status"]["source"])) { + $user_info["status"]["source"] = trim($user_info["status"]["source"] . ' (' . network_to_name($lastwall['item_network'], $user_info['url']) . ')'); + } } @@ -1314,34 +1394,38 @@ use \Friendica\Core\Config; unset($user_info["uid"]); unset($user_info["self"]); - return api_format_data("user", $type, array('user' => $user_info)); + return api_format_data("user", $type, array('user' => $user_info)); } - api_register_func('api/users/show','api_users_show'); + /// @TODO move to top of file or somewhere better + api_register_func('api/users/show','api_users_show'); function api_users_search($type) { $a = get_app(); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0); $userlist = array(); - if (isset($_GET["q"])) { + if (x($_GET, 'q')) { $r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", dbesc($_GET["q"])); - if (!dbm::is_result($r)) + + if (!dbm::is_result($r)) { $r = q("SELECT `id` FROM `contact` WHERE `uid` = 0 AND `nick` = '%s'", dbesc($_GET["q"])); + } if (dbm::is_result($r)) { $k = 0; foreach ($r AS $user) { $user_info = api_get_user($a, $user["id"], "json"); - if ($type == "xml") + if ($type == "xml") { $userlist[$k++.":user"] = $user_info; - else + } else { $userlist[] = $user_info; + } } $userlist = array("users" => $userlist); } else { @@ -1353,6 +1437,7 @@ use \Friendica\Core\Config; return api_format_data("users", $type, $userlist); } + /// @TODO move to top of file or somewhere better api_register_func('api/users/search','api_users_search'); /** @@ -1362,11 +1447,13 @@ use \Friendica\Core\Config; * TODO: Optional parameters * TODO: Add reply info */ - function api_statuses_home_timeline($type){ + function api_statuses_home_timeline($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } unset($_REQUEST["user_id"]); unset($_GET["user_id"]); @@ -1378,24 +1465,29 @@ use \Friendica\Core\Config; // get last newtork messages // params - $count = (x($_REQUEST,'count')?$_REQUEST['count']:20); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); - if ($page<0) $page=0; - $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); - //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0); - $conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0); + $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0); + if ($page < 0) { + $page = 0; + } + $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); + $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); + //$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0); + $exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0); + $conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0); - $start = $page*$count; + $start = $page * $count; $sql_extra = ''; - if ($max_id > 0) - $sql_extra .= ' AND `item`.`id` <= '.intval($max_id); - if ($exclude_replies > 0) + if ($max_id > 0) { + $sql_extra .= ' AND `item`.`id` <= ' . intval($max_id); + } + if ($exclude_replies > 0) { $sql_extra .= ' AND `item`.`parent` = `item`.`id`'; - if ($conversation_id > 0) - $sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id); + } + if ($conversation_id > 0) { + $sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id); + } $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -1415,63 +1507,73 @@ use \Friendica\Core\Config; intval($start), intval($count) ); - $ret = api_format_items($r,$user_info, false, $type); + $ret = api_format_items($r, $user_info, false, $type); // Set all posts from the query above to seen $idarray = array(); - foreach ($r AS $item) + foreach ($r AS $item) { $idarray[] = intval($item["id"]); + } $idlist = implode(",", $idarray); if ($idlist != "") { $unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `id` IN (%s)", $idlist); - if ($unseen) + if ($unseen) { $r = q("UPDATE `item` SET `unseen` = 0 WHERE `unseen` AND `id` IN (%s)", $idlist); + } } $data = array('status' => $ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); break; } - return api_format_data("statuses", $type, $data); + return api_format_data("statuses", $type, $data); } + + /// @TODO move to top of file or somewhere better api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true); api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true); - function api_statuses_public_timeline($type){ + function api_statuses_public_timeline($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } $user_info = api_get_user($a); // get last newtork messages - // params - $count = (x($_REQUEST,'count')?$_REQUEST['count']:20); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); - if ($page<0) $page=0; - $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); - //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0); - $conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0); + $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0); + if ($page < 0) { + $page = 0; + } + $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); + $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); + //$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0); + $exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0); + $conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0); - $start = $page*$count; + $start = $page * $count; - if ($max_id > 0) - $sql_extra = 'AND `item`.`id` <= '.intval($max_id); - if ($exclude_replies > 0) + if ($max_id > 0) { + $sql_extra = 'AND `item`.`id` <= ' . intval($max_id); + } + if ($exclude_replies > 0) { $sql_extra .= ' AND `item`.`parent` = `item`.`id`'; - if ($conversation_id > 0) - $sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id); + } + if ($conversation_id > 0) { + $sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id); + } $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -1495,51 +1597,57 @@ use \Friendica\Core\Config; intval($start), intval($count)); - $ret = api_format_items($r,$user_info, false, $type); - + $ret = api_format_items($r, $user_info, false, $type); $data = array('status' => $ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); break; } - return api_format_data("statuses", $type, $data); + return api_format_data("statuses", $type, $data); } + + /// @TODO move to top of file or somewhere better api_register_func('api/statuses/public_timeline','api_statuses_public_timeline', true); /** - * + * @TODO nothing to say? */ - function api_statuses_show($type){ + function api_statuses_show($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } $user_info = api_get_user($a); // params $id = intval($a->argv[3]); - if ($id == 0) + if ($id == 0) { $id = intval($_REQUEST["id"]); + } // Hotot workaround - if ($id == 0) + if ($id == 0) { $id = intval($a->argv[4]); + } - logger('API: api_statuses_show: '.$id); + logger('API: api_statuses_show: ' . $id); - $conversation = (x($_REQUEST,'conversation')?1:0); + $conversation = (x($_REQUEST, 'conversation') ? 1 : 0); $sql_extra = ''; - if ($conversation) + if ($conversation) { $sql_extra .= " AND `item`.`parent` = %d ORDER BY `id` ASC "; - else + } else { $sql_extra .= " AND `item`.`id` = %d"; + } $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -1556,7 +1664,8 @@ use \Friendica\Core\Config; intval($id) ); - if (!$r) { + /// @TODO How about copying this to above methods which don't check $r ? + if (!dbm::is_result($r)) { throw new BadRequestException("There is no status with this id."); } @@ -1567,50 +1676,59 @@ use \Friendica\Core\Config; return api_format_data("statuses", $type, $data); } else { $data = array('status' => $ret[0]); - return api_format_data("status", $type, $data); + return api_format_data("status", $type, $data); } } + + /// @TODO move to top of file or somewhere better api_register_func('api/statuses/show','api_statuses_show', true); - /** - * + * @TODO nothing to say? */ - function api_conversation_show($type){ + function api_conversation_show($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } $user_info = api_get_user($a); // params $id = intval($a->argv[3]); - $count = (x($_REQUEST,'count')?$_REQUEST['count']:20); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); - if ($page<0) $page=0; - $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); + $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0); + if ($page < 0) { + $page = 0; + } + $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); + $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); $start = $page*$count; - if ($id == 0) + if ($id == 0) { $id = intval($_REQUEST["id"]); + } // Hotot workaround - if ($id == 0) + if ($id == 0) { $id = intval($a->argv[4]); + } logger('API: api_conversation_show: '.$id); $r = q("SELECT `parent` FROM `item` WHERE `id` = %d", intval($id)); - if ($r) + if (dbm::is_result($r)) { $id = $r[0]["parent"]; + } $sql_extra = ''; - if ($max_id > 0) - $sql_extra = ' AND `item`.`id` <= '.intval($max_id); + if ($max_id > 0) { + $sql_extra = ' AND `item`.`id` <= ' . intval($max_id); + } // Not sure why this query was so complicated. We should keep it here for a while, // just to make sure that we really don't need it. @@ -1635,39 +1753,45 @@ use \Friendica\Core\Config; intval($start), intval($count) ); - if (!$r) - throw new BadRequestException("There is no conversation with this id."); + if (!dbm::is_result($r)) { + throw new BadRequestException("There is no status with this id."); + } - $ret = api_format_items($r,$user_info, false, $type); + $ret = api_format_items($r, $user_info, false, $type); $data = array('status' => $ret); return api_format_data("statuses", $type, $data); } + + /// @TODO move to top of file or somewhere better api_register_func('api/conversation/show','api_conversation_show', true); api_register_func('api/statusnet/conversation','api_conversation_show', true); - /** - * + * @TODO nothing to say? */ - function api_statuses_repeat($type){ + function api_statuses_repeat($type) { global $called_api; $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } $user_info = api_get_user($a); // params $id = intval($a->argv[3]); - if ($id == 0) + if ($id == 0) { $id = intval($_REQUEST["id"]); + } // Hotot workaround - if ($id == 0) + if ($id == 0) { $id = intval($a->argv[4]); + } logger('API: api_statuses_repeat: '.$id); @@ -1686,7 +1810,8 @@ use \Friendica\Core\Config; intval($id) ); - if ($r[0]['body'] != "") { + /// @TODO other style than above functions! + if (dbm::is_result($r) && $r[0]['body'] != "") { if (strpos($r[0]['body'], "[/share]") !== false) { $pos = strpos($r[0]['body'], "[share"); $post = substr($r[0]['body'], $pos); @@ -1701,39 +1826,47 @@ use \Friendica\Core\Config; $_REQUEST['type'] = 'wall'; $_REQUEST['api_source'] = true; - if (!x($_REQUEST, "source")) + if (!x($_REQUEST, "source")) { $_REQUEST["source"] = api_source(); + } item_post($a); - } else + } else { throw new ForbiddenException(); + } // this should output the last post (the one we just posted). $called_api = null; - return(api_status_show($type)); + return api_status_show($type); } + + /// @TODO move to top of file or somewhere better api_register_func('api/statuses/retweet','api_statuses_repeat', true, API_METHOD_POST); /** - * + * @TODO nothing to say? */ - function api_statuses_destroy($type){ + function api_statuses_destroy($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } $user_info = api_get_user($a); // params $id = intval($a->argv[3]); - if ($id == 0) + if ($id == 0) { $id = intval($_REQUEST["id"]); + } // Hotot workaround - if ($id == 0) + if ($id == 0) { $id = intval($a->argv[4]); + } logger('API: api_statuses_destroy: '.$id); @@ -1741,20 +1874,23 @@ use \Friendica\Core\Config; drop_item($id, false); - return($ret); + return $ret; } + + /// @TODO move to top of file or somewhere better api_register_func('api/statuses/destroy','api_statuses_destroy', true, API_METHOD_DELETE); /** - * + * @TODO Nothing more than an URL to say? * http://developer.twitter.com/doc/get/statuses/mentions - * */ - function api_statuses_mentions($type){ + function api_statuses_mentions($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } unset($_REQUEST["user_id"]); unset($_GET["user_id"]); @@ -1767,24 +1903,27 @@ use \Friendica\Core\Config; // params - $count = (x($_REQUEST,'count')?$_REQUEST['count']:20); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); - if ($page<0) $page=0; - $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); - //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); + $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0); + if ($page < 0) { + $page = 0; + } + $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); + $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); + //$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0); - $start = $page*$count; + $start = $page * $count; // Ugly code - should be changed $myurl = App::get_baseurl() . '/profile/'. $a->user['nickname']; - $myurl = substr($myurl,strpos($myurl,'://')+3); + $myurl = substr($myurl,strpos($myurl, '://') + 3); //$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); - $myurl = str_replace('www.','',$myurl); - $diasp_url = str_replace('/profile/','/u/',$myurl); + $myurl = str_replace('www.', '', $myurl); + $diasp_url = str_replace('/profile/', '/u/', $myurl); - if ($max_id > 0) - $sql_extra = ' AND `item`.`id` <= '.intval($max_id); + if ($max_id > 0) { + $sql_extra = ' AND `item`.`id` <= ' . intval($max_id); + } $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -1809,28 +1948,30 @@ use \Friendica\Core\Config; intval($start), intval($count) ); - $ret = api_format_items($r,$user_info, false, $type); - + $ret = api_format_items($r, $user_info, false, $type); $data = array('status' => $ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); break; } - return api_format_data("statuses", $type, $data); + return api_format_data("statuses", $type, $data); } + + /// @TODO move to top of file or somewhere better api_register_func('api/statuses/mentions','api_statuses_mentions', true); api_register_func('api/statuses/replies','api_statuses_mentions', true); - - function api_statuses_user_timeline($type){ + function api_statuses_user_timeline($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } $user_info = api_get_user($a); // get last network messages @@ -1841,24 +1982,29 @@ use \Friendica\Core\Config; LOGGER_DEBUG); // params - $count = (x($_REQUEST,'count')?$_REQUEST['count']:20); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); - if ($page<0) $page=0; - $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0); - $conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0); + $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0); + if ($page < 0) { + $page = 0; + } + $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); + //$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0); + $exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0); + $conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0); - $start = $page*$count; + $start = $page * $count; $sql_extra = ''; - if ($user_info['self']==1) + if ($user_info['self'] == 1) { $sql_extra .= " AND `item`.`wall` = 1 "; + } - if ($exclude_replies > 0) + if ($exclude_replies > 0) { $sql_extra .= ' AND `item`.`parent` = `item`.`id`'; - if ($conversation_id > 0) - $sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id); + } + if ($conversation_id > 0) { + $sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id); + } $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -1880,19 +2026,21 @@ use \Friendica\Core\Config; intval($start), intval($count) ); - $ret = api_format_items($r,$user_info, true, $type); + $ret = api_format_items($r, $user_info, true, $type); $data = array('status' => $ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); + break; } - return api_format_data("statuses", $type, $data); + return api_format_data("statuses", $type, $data); } - api_register_func('api/statuses/user_timeline','api_statuses_user_timeline', true); + /// @TODO move to top of file or somwhere better + api_register_func('api/statuses/user_timeline','api_statuses_user_timeline', true); /** * Star/unstar an item @@ -1900,49 +2048,59 @@ use \Friendica\Core\Config; * * api v1 : https://web.archive.org/web/20131019055350/https://dev.twitter.com/docs/api/1/post/favorites/create/%3Aid */ - function api_favorites_create_destroy($type){ + function api_favorites_create_destroy($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } // for versioned api. /// @TODO We need a better global soluton - $action_argv_id=2; - if ($a->argv[1]=="1.1") $action_argv_id=3; + $action_argv_id = 2; + if ($a->argv[1] == "1.1") { + $action_argv_id = 3; + } - if ($a->argc<=$action_argv_id) throw new BadRequestException("Invalid request."); - $action = str_replace(".".$type,"",$a->argv[$action_argv_id]); - if ($a->argc==$action_argv_id+2) { - $itemid = intval($a->argv[$action_argv_id+1]); + if ($a->argc <= $action_argv_id) { + throw new BadRequestException("Invalid request."); + } + $action = str_replace("." . $type, "", $a->argv[$action_argv_id]); + if ($a->argc == $action_argv_id + 2) { + $itemid = intval($a->argv[$action_argv_id + 1]); } else { + /// @TODO use x() to check if _REQUEST contains 'id' $itemid = intval($_REQUEST['id']); } - $item = q("SELECT * FROM item WHERE id=%d AND uid=%d", + $item = q("SELECT * FROM `item` WHERE `id`=%d AND `uid`=%d LIMIT 1", $itemid, api_user()); - if ($item===false || count($item)==0) + if (!dbm::is_result($item) || count($item) == 0) { throw new BadRequestException("Invalid item."); + } - switch($action){ + switch ($action) { case "create": - $item[0]['starred']=1; + $item[0]['starred'] = 1; break; case "destroy": - $item[0]['starred']=0; + $item[0]['starred'] = 0; break; default: throw new BadRequestException("Invalid action ".$action); } + $r = q("UPDATE item SET starred=%d WHERE id=%d AND uid=%d", $item[0]['starred'], $itemid, api_user()); q("UPDATE thread SET starred=%d WHERE iid=%d AND uid=%d", $item[0]['starred'], $itemid, api_user()); - if ($r===false) - throw InternalServerErrorException("DB error"); + if ($r === false) { + throw new InternalServerErrorException("DB error"); + } $user_info = api_get_user($a); @@ -1950,7 +2108,7 @@ use \Friendica\Core\Config; $ret = $rets[0]; $data = array('status' => $ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); @@ -1958,17 +2116,21 @@ use \Friendica\Core\Config; return api_format_data("status", $type, $data); } + + /// @TODO move to top of file or somwhere better api_register_func('api/favorites/create', 'api_favorites_create_destroy', true, API_METHOD_POST); api_register_func('api/favorites/destroy', 'api_favorites_create_destroy', true, API_METHOD_DELETE); - function api_favorites($type){ + function api_favorites($type) { global $called_api; $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } - $called_api= array(); + $called_api = array(); $user_info = api_get_user($a); @@ -1976,22 +2138,25 @@ use \Friendica\Core\Config; // return favorites only for self logger('api_favorites: self:' . $user_info['self']); - if ($user_info['self']==0) { + if ($user_info['self'] == 0) { $ret = array(); } else { $sql_extra = ""; // params - $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); - $count = (x($_GET,'count')?$_GET['count']:20); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); - if ($page<0) $page=0; + $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); + $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); + $count = (x($_GET, 'count') ? $_GET['count'] : 20); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0); + if ($page < 0) { + $page = 0; + } $start = $page*$count; - if ($max_id > 0) - $sql_extra .= ' AND `item`.`id` <= '.intval($max_id); + if ($max_id > 0) { + $sql_extra .= ' AND `item`.`id` <= ' . intval($max_id); + } $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -2016,14 +2181,16 @@ use \Friendica\Core\Config; } $data = array('status' => $ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); } - return api_format_data("statuses", $type, $data); + return api_format_data("statuses", $type, $data); } + + /// @TODO move to top of file or somwhere better api_register_func('api/favorites','api_favorites', true); function api_format_messages($item, $recipient, $sender) { @@ -2038,9 +2205,9 @@ use \Friendica\Core\Config; 'recipient_screen_name' => $recipient['screen_name'], 'sender' => $sender, 'recipient' => $recipient, - 'title' => "", - 'friendica_seen' => $item['seen'], - 'friendica_parent_uri' => $item['parent-uri'], + 'title' => "", + 'friendica_seen' => $item['seen'], + 'friendica_parent_uri' => $item['parent-uri'], ); // "uid" and "self" are only needed for some internal stuff, so remove it from here @@ -2052,18 +2219,16 @@ use \Friendica\Core\Config; //don't send title to regular StatusNET requests to avoid confusing these apps if (x($_GET, 'getText')) { $ret['title'] = $item['title'] ; - if ($_GET["getText"] == "html") { + if ($_GET['getText'] == 'html') { $ret['text'] = bbcode($item['body'], false, false); - } - elseif ($_GET["getText"] == "plain") { + } elseif ($_GET['getText'] == 'plain') { //$ret['text'] = html2plain(bbcode($item['body'], false, false, true), 0); $ret['text'] = trim(html2plain(bbcode(api_clean_plain_items($item['body']), false, false, 2, true), 0)); } + } else { + $ret['text'] = $item['title'] . "\n" . html2plain(bbcode(api_clean_plain_items($item['body']), false, false, 2, true), 0); } - else { - $ret['text'] = $item['title']."\n".html2plain(bbcode(api_clean_plain_items($item['body']), false, false, 2, true), 0); - } - if (isset($_GET["getUserObjects"]) && $_GET["getUserObjects"] == "false") { + if (x($_GET, 'getUserObjects') && $_GET['getUserObjects'] == 'false') { unset($ret['sender']); unset($ret['recipient']); } @@ -2084,13 +2249,15 @@ use \Friendica\Core\Config; $statustitle = trim($item['title']); - if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false)) + if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false)) { $statustext = trim($statusbody); - else + } else { $statustext = trim($statustitle."\n\n".$statusbody); + } - if (($item["network"] == NETWORK_FEED) and (strlen($statustext)> 1000)) + if (($item["network"] == NETWORK_FEED) and (strlen($statustext)> 1000)) { $statustext = substr($statustext, 0, 1000)."... \n".$item["plink"]; + } $statushtml = trim(bbcode($body, false, false)); @@ -2104,8 +2271,9 @@ use \Friendica\Core\Config; "\n", "\n", "\n", "\n"); $statushtml = str_replace($search, $replace, $statushtml); - if ($item['title'] != "") - $statushtml = "".bbcode($item['title'])."\n".$statushtml; + if ($item['title'] != "") { + $statushtml = "" . bbcode($item['title']) . "\n" . $statushtml; + } $entities = api_get_entitities($statustext, $body); @@ -2125,21 +2293,25 @@ use \Friendica\Core\Config; $URLSearchString = "^\[\]"; $ret = preg_match_all("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $text, $images); - if (!$ret) + if (!$ret) { return false; + } $attachments = array(); foreach ($images[1] AS $image) { $imagedata = get_photo_info($image); - if ($imagedata) + if ($imagedata) { $attachments[] = array("url" => $image, "mimetype" => $imagedata["mime"], "size" => $imagedata["size"]); + } } - if (strstr($_SERVER['HTTP_USER_AGENT'], "AndStatus")) - foreach ($images[0] AS $orig) + if (strstr($_SERVER['HTTP_USER_AGENT'], "AndStatus")) { + foreach ($images[0] AS $orig) { $body = str_replace($orig, "", $body); + } + } return $attachments; } @@ -2152,7 +2324,7 @@ use \Friendica\Core\Config; $a = get_app(); - $include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false"); + $include_entities = strtolower(x($_REQUEST, 'include_entities') ? $_REQUEST['include_entities'] : "false"); if ($include_entities != "true") { @@ -2198,11 +2370,12 @@ use \Friendica\Core\Config; preg_match_all("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $bbcode, $urls); $ordered_urls = array(); - foreach ($urls[1] AS $id=>$url) { + foreach ($urls[1] AS $id => $url) { //$start = strpos($text, $url, $offset); $start = iconv_strpos($text, $url, 0, "UTF-8"); - if (!($start === false)) + if (!($start === false)) { $ordered_urls[$start] = array("url" => $url, "title" => $urls[2][$id]); + } } ksort($ordered_urls); @@ -2296,9 +2469,9 @@ use \Friendica\Core\Config; } } - return($entities); + return $entities; } - function api_format_items_embeded_images(&$item, $text){ + function api_format_items_embeded_images(&$item, $text) { $text = preg_replace_callback( "|data:image/([^;]+)[^=]+=*|m", function($match) use ($item) { @@ -2352,7 +2525,7 @@ use \Friendica\Core\Config; 'dislike' => array(), 'attendyes' => array(), 'attendno' => array(), - 'attendmaybe' => array() + 'attendmaybe' => array(), ); $items = q('SELECT * FROM item @@ -2360,13 +2533,13 @@ use \Friendica\Core\Config; intval($item['uid']), dbesc($item['uri'])); - foreach ($items as $i){ + foreach ($items as $i) { // not used as result should be structured like other user data //builtin_activity_puller($i, $activities); // get user data and add it to the array of the activity $user = api_get_user($a, $i['author-link']); - switch($i['verb']) { + switch ($i['verb']) { case ACTIVITY_LIKE: $activities['like'][] = $user; break; @@ -2468,25 +2641,27 @@ use \Friendica\Core\Config; $a = get_app(); - $ret = Array(); + $ret = array(); - foreach($r as $item) { + foreach ($r as $item) { localize_item($item); - list($status_user, $owner_user) = api_item_get_user($a,$item); + list($status_user, $owner_user) = api_item_get_user($a, $item); // Look if the posts are matching if they should be filtered by user id - if ($filter_user AND ($status_user["id"] != $user_info["id"])) + if ($filter_user AND ($status_user["id"] != $user_info["id"])) { continue; + } $in_reply_to = api_in_reply_to($item); $converted = api_convert_item($item); - if ($type == "xml") + if ($type == "xml") { $geo = "georss:point"; - else + } else { $geo = "geo"; + } $status = array( 'text' => $converted["text"], @@ -2510,16 +2685,19 @@ use \Friendica\Core\Config; 'friendica_activities' => api_format_items_activities($item, $type), ); - if (count($converted["attachments"]) > 0) + if (count($converted["attachments"]) > 0) { $status["attachments"] = $converted["attachments"]; + } - if (count($converted["entities"]) > 0) + if (count($converted["entities"]) > 0) { $status["entities"] = $converted["entities"]; + } - if (($item['item_network'] != "") AND ($status["source"] == 'web')) + if (($item['item_network'] != "") AND ($status["source"] == 'web')) { $status["source"] = network_to_name($item['item_network'], $user_info['url']); - else if (($item['item_network'] != "") AND (network_to_name($item['item_network'], $user_info['url']) != $status["source"])) + } elseif (($item['item_network'] != "") AND (network_to_name($item['item_network'], $user_info['url']) != $status["source"])) { $status["source"] = trim($status["source"].' ('.network_to_name($item['item_network'], $user_info['url']).')'); + } // Retweets are only valid for top postings @@ -2534,7 +2712,7 @@ use \Friendica\Core\Config; if ($retweeted_item !== false) { $retweeted_status = $status; try { - $retweeted_status["user"] = api_get_user($a,$retweeted_item["author-link"]); + $retweeted_status["user"] = api_get_user($a, $retweeted_item["author-link"]); } catch( BadRequestException $e ) { // user not found. should be found? /// @todo check if the user should be always found @@ -2571,67 +2749,81 @@ use \Friendica\Core\Config; return $ret; } - function api_account_rate_limit_status($type) { - if ($type == "xml") + if ($type == "xml") { $hash = array( - 'remaining-hits' => (string) 150, + 'remaining-hits' => '150', '@attributes' => array("type" => "integer"), - 'hourly-limit' => (string) 150, + 'hourly-limit' => '150', '@attributes2' => array("type" => "integer"), - 'reset-time' => datetime_convert('UTC','UTC','now + 1 hour',ATOM_TIME), + 'reset-time' => datetime_convert('UTC', 'UTC','now + 1 hour',ATOM_TIME), '@attributes3' => array("type" => "datetime"), 'reset_time_in_seconds' => strtotime('now + 1 hour'), '@attributes4' => array("type" => "integer"), ); - else + } else { $hash = array( 'reset_time_in_seconds' => strtotime('now + 1 hour'), - 'remaining_hits' => (string) 150, - 'hourly_limit' => (string) 150, - 'reset_time' => api_date(datetime_convert('UTC','UTC','now + 1 hour',ATOM_TIME)), + 'remaining_hits' => '150', + 'hourly_limit' => '150', + 'reset_time' => api_date(datetime_convert('UTC', 'UTC','now + 1 hour',ATOM_TIME)), ); + } return api_format_data('hash', $type, array('hash' => $hash)); } + + /// @TODO move to top of file or somwhere better api_register_func('api/account/rate_limit_status','api_account_rate_limit_status',true); function api_help_test($type) { - if ($type == 'xml') + if ($type == 'xml') { $ok = "true"; - else + } else { $ok = "ok"; + } return api_format_data('ok', $type, array("ok" => $ok)); } - api_register_func('api/help/test','api_help_test',false); + + /// @TODO move to top of file or somwhere better + api_register_func('api/help/test','api_help_test', false); function api_lists($type) { $ret = array(); + /// @TODO $ret is not filled here? return api_format_data('lists', $type, array("lists_list" => $ret)); } + + /// @TODO move to top of file or somwhere better api_register_func('api/lists','api_lists',true); function api_lists_list($type) { $ret = array(); + /// @TODO $ret is not filled here? return api_format_data('lists', $type, array("lists_list" => $ret)); } + + /// @TODO move to top of file or somwhere better api_register_func('api/lists/list','api_lists_list',true); /** - * https://dev.twitter.com/docs/api/1/get/statuses/friends - * This function is deprecated by Twitter - * returns: json, xml - **/ + * https://dev.twitter.com/docs/api/1/get/statuses/friends + * This function is deprecated by Twitter + * returns: json, xml + */ function api_statuses_f($type, $qtype) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } + $user_info = api_get_user($a); - if (x($_GET,'cursor') && $_GET['cursor']=='undefined'){ + if (x($_GET, 'cursor') && $_GET['cursor']=='undefined') { /* this is to stop Hotot to load friends multiple times * I'm not sure if I'm missing return something or * is a bug in hotot. Workaround, meantime @@ -2642,51 +2834,58 @@ use \Friendica\Core\Config; return false; } - if($qtype == 'friends') + if ($qtype == 'friends') { $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND)); - if($qtype == 'followers') + } + if ($qtype == 'followers') { $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND)); + } // friends and followers only for self - if ($user_info['self'] == 0) + if ($user_info['self'] == 0) { $sql_extra = " AND false "; + } $r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND NOT `self` AND (NOT `blocked` OR `pending`) $sql_extra", intval(api_user()) ); $ret = array(); - foreach($r as $cid){ + foreach ($r as $cid) { $user = api_get_user($a, $cid['nurl']); // "uid" and "self" are only needed for some internal stuff, so remove it from here unset($user["uid"]); unset($user["self"]); - if ($user) + if ($user) { $ret[] = $user; + } } return array('user' => $ret); } - function api_statuses_friends($type){ + + function api_statuses_friends($type) { $data = api_statuses_f($type, "friends"); - if ($data===false) return false; - return api_format_data("users", $type, $data); + if ($data === false) { + return false; + } + return api_format_data("users", $type, $data); } - function api_statuses_followers($type){ + + function api_statuses_followers($type) { $data = api_statuses_f($type, "followers"); - if ($data===false) return false; - return api_format_data("users", $type, $data); + if ($data === false) { + return false; + } + return api_format_data("users", $type, $data); } + + /// @TODO move to top of file or somewhere better api_register_func('api/statuses/friends','api_statuses_friends',true); api_register_func('api/statuses/followers','api_statuses_followers',true); - - - - - function api_statusnet_config($type) { $a = get_app(); @@ -2698,8 +2897,9 @@ use \Friendica\Core\Config; $closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false'); $private = ((Config::get('system', 'block_public')) ? 'true' : 'false'); $textlimit = (string) (($a->config['max_import_size']) ? $a->config['max_import_size'] : 200000); - if($a->config['api_import_size']) + if ($a->config['api_import_size']) { $texlimit = string($a->config['api_import_size']); + } $ssl = ((Config::get('system', 'have_ssl')) ? 'true' : 'false'); $sslserver = (($ssl === 'true') ? str_replace('http:','https:',App::get_baseurl()) : ''); @@ -2721,8 +2921,10 @@ use \Friendica\Core\Config; return api_format_data('config', $type, array('config' => $config)); } - api_register_func('api/gnusocial/config','api_statusnet_config',false); - api_register_func('api/statusnet/config','api_statusnet_config',false); + + /// @TODO move to top of file or somewhere better + api_register_func('api/gnusocial/config','api_statusnet_config', false); + api_register_func('api/statusnet/config','api_statusnet_config', false); function api_statusnet_version($type) { // liar @@ -2730,8 +2932,10 @@ use \Friendica\Core\Config; return api_format_data('version', $type, array('version' => $fake_statusnet_version)); } - api_register_func('api/gnusocial/version','api_statusnet_version',false); - api_register_func('api/statusnet/version','api_statusnet_version',false); + + /// @TODO move to top of file or somewhere better + api_register_func('api/gnusocial/version','api_statusnet_version', false); + api_register_func('api/statusnet/version','api_statusnet_version', false); /** * @todo use api_format_data() to return data @@ -2740,19 +2944,24 @@ use \Friendica\Core\Config; $a = get_app(); - if(! api_user()) throw new ForbiddenException(); + if (! api_user()) { + throw new ForbiddenException(); + } $user_info = api_get_user($a); - if($qtype == 'friends') + if ($qtype == 'friends') { $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND)); - if($qtype == 'followers') + } + if ($qtype == 'followers') { $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND)); + } - if (!$user_info["self"]) + if (!$user_info["self"]) { $sql_extra = " AND false "; + } - $stringify_ids = (x($_REQUEST,'stringify_ids')?$_REQUEST['stringify_ids']:false); + $stringify_ids = (x($_REQUEST, 'stringify_ids') ? $_REQUEST['stringify_ids'] : false); $r = q("SELECT `pcontact`.`id` FROM `contact` INNER JOIN `contact` AS `pcontact` ON `contact`.`nurl` = `pcontact`.`nurl` AND `pcontact`.`uid` = 0 @@ -2760,15 +2969,18 @@ use \Friendica\Core\Config; intval(api_user()) ); - if (!dbm::is_result($r)) + if (!dbm::is_result($r)) { return; + } $ids = array(); - foreach($r as $rr) - if ($stringify_ids) + foreach ($r as $rr) { + if ($stringify_ids) { $ids[] = $rr['id']; - else + } else { $ids[] = intval($rr['id']); + } + } return api_format_data("ids", $type, array('id' => $ids)); } @@ -2776,18 +2988,20 @@ use \Friendica\Core\Config; function api_friends_ids($type) { return api_ff_ids($type,'friends'); } + function api_followers_ids($type) { return api_ff_ids($type,'followers'); } + + /// @TODO move to top of file or somewhere better api_register_func('api/friends/ids','api_friends_ids',true); api_register_func('api/followers/ids','api_followers_ids',true); - function api_direct_messages_new($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); if (!x($_POST, "text") OR (!x($_POST,"screen_name") AND !x($_POST,"user_id"))) return; @@ -2807,45 +3021,43 @@ use \Friendica\Core\Config; $replyto = ''; $sub = ''; - if (x($_REQUEST,'replyto')) { + if (x($_REQUEST, 'replyto')) { $r = q('SELECT `parent-uri`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d', intval(api_user()), intval($_REQUEST['replyto'])); $replyto = $r[0]['parent-uri']; $sub = $r[0]['title']; - } - else { - if (x($_REQUEST,'title')) { + } else { + if (x($_REQUEST, 'title')) { $sub = $_REQUEST['title']; - } - else { - $sub = ((strlen($_POST['text'])>10)?substr($_POST['text'],0,10)."...":$_POST['text']); + } else { + $sub = ((strlen($_POST['text'])>10) ? substr($_POST['text'],0,10)."...":$_POST['text']); } } $id = send_message($recipient['cid'], $_POST['text'], $sub, $replyto); - if ($id>-1) { + if ($id > -1) { $r = q("SELECT * FROM `mail` WHERE id=%d", intval($id)); $ret = api_format_messages($r[0], $recipient, $sender); - } else { $ret = array("error"=>$id); } - $data = Array('direct_message'=>$ret); + $data = array('direct_message'=>$ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); } - return api_format_data("direct-messages", $type, $data); + return api_format_data("direct-messages", $type, $data); } - api_register_func('api/direct_messages/new','api_direct_messages_new',true, API_METHOD_POST); + /// @TODO move to top of file or somewhere better + api_register_func('api/direct_messages/new','api_direct_messages_new',true, API_METHOD_POST); /** * @brief delete a direct_message from mail table through api @@ -2853,31 +3065,33 @@ use \Friendica\Core\Config; * @param string $type Known types are 'atom', 'rss', 'xml' and 'json' * @return string */ - function api_direct_messages_destroy($type){ + function api_direct_messages_destroy($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } // params $user_info = api_get_user($a); //required - $id = (x($_REQUEST,'id') ? $_REQUEST['id'] : 0); + $id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0); // optional $parenturi = (x($_REQUEST, 'friendica_parenturi') ? $_REQUEST['friendica_parenturi'] : ""); - $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false"); + $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); /// @todo optional parameter 'include_entities' from Twitter API not yet implemented $uid = $user_info['uid']; // error if no id or parenturi specified (for clients posting parent-uri as well) - if ($verbose == "true") { - if ($id == 0 || $parenturi == "") { - $answer = array('result' => 'error', 'message' => 'message id or parenturi not specified'); - return api_format_data("direct_messages_delete", $type, array('$result' => $answer)); - } + if ($verbose == "true" && ($id == 0 || $parenturi == "")) { + $answer = array('result' => 'error', 'message' => 'message id or parenturi not specified'); + return api_format_data("direct_messages_delete", $type, array('$result' => $answer)); } // BadRequestException if no id specified (for clients using Twitter API) - if ($id == 0) throw new BadRequestException('Message id not specified'); + if ($id == 0) { + throw new BadRequestException('Message id not specified'); + } // add parent-uri to sql command if specified by calling app $sql_extra = ($parenturi != "" ? " AND `parent-uri` = '" . dbesc($parenturi) . "'" : ""); @@ -2907,8 +3121,7 @@ use \Friendica\Core\Config; // return success $answer = array('result' => 'ok', 'message' => 'message deleted'); return api_format_data("direct_message_delete", $type, array('$result' => $answer)); - } - else { + } else { $answer = array('result' => 'error', 'message' => 'unknown error'); return api_format_data("direct_messages_delete", $type, array('$result' => $answer)); } @@ -2916,25 +3129,30 @@ use \Friendica\Core\Config; /// @todo return JSON data like Twitter API not yet implemented } - api_register_func('api/direct_messages/destroy', 'api_direct_messages_destroy', true, API_METHOD_DELETE); + /// @TODO move to top of file or somewhere better + api_register_func('api/direct_messages/destroy', 'api_direct_messages_destroy', true, API_METHOD_DELETE); function api_direct_messages_box($type, $box, $verbose) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } // params - $count = (x($_GET,'count')?$_GET['count']:20); - $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); - if ($page<0) $page=0; + $count = (x($_GET, 'count') ? $_GET['count'] : 20); + $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0); + if ($page < 0) { + $page = 0; + } - $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); - $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); + $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); + $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); - $user_id = (x($_REQUEST,'user_id')?$_REQUEST['user_id']:""); - $screen_name = (x($_REQUEST,'screen_name')?$_REQUEST['screen_name']:""); + $user_id = (x($_REQUEST, 'user_id') ? $_REQUEST['user_id'] : ""); + $screen_name = (x($_REQUEST, 'screen_name') ? $_REQUEST['screen_name'] : ""); // caller user info unset($_REQUEST["user_id"]); @@ -2946,31 +3164,27 @@ use \Friendica\Core\Config; $user_info = api_get_user($a); $profile_url = $user_info["url"]; - // pagination - $start = $page*$count; + $start = $page * $count; // filters if ($box=="sentbox") { - $sql_extra = "`mail`.`from-url`='".dbesc( $profile_url )."'"; - } - elseif ($box=="conversation") { - $sql_extra = "`mail`.`parent-uri`='".dbesc( $_GET["uri"] ) ."'"; - } - elseif ($box=="all") { + $sql_extra = "`mail`.`from-url`='" . dbesc( $profile_url ) . "'"; + } elseif ($box == "conversation") { + $sql_extra = "`mail`.`parent-uri`='" . dbesc( $_GET["uri"] ) . "'"; + } elseif ($box == "all") { $sql_extra = "true"; - } - elseif ($box=="inbox") { - $sql_extra = "`mail`.`from-url`!='".dbesc( $profile_url )."'"; + } elseif ($box == "inbox") { + $sql_extra = "`mail`.`from-url`!='" . dbesc( $profile_url ) . "'"; } - if ($max_id > 0) - $sql_extra .= ' AND `mail`.`id` <= '.intval($max_id); + if ($max_id > 0) { + $sql_extra .= ' AND `mail`.`id` <= ' . intval($max_id); + } - if ($user_id !="") { + if ($user_id != "") { $sql_extra .= ' AND `mail`.`contact-id` = ' . intval($user_id); - } - elseif($screen_name !=""){ + } elseif ($screen_name !="") { $sql_extra .= " AND `contact`.`nick` = '" . dbesc($screen_name). "'"; } @@ -2979,131 +3193,142 @@ use \Friendica\Core\Config; intval($since_id), intval($start), intval($count) ); - if ($verbose == "true") { - // stop execution and return error message if no mails available - if($r == null) { - $answer = array('result' => 'error', 'message' => 'no mails available'); - return api_format_data("direct_messages_all", $type, array('$result' => $answer)); - } + if ($verbose == "true" && !dbm::is_result($r)) { + $answer = array('result' => 'error', 'message' => 'no mails available'); + return api_format_data("direct_messages_all", $type, array('$result' => $answer)); } - $ret = Array(); - foreach($r as $item) { - if ($box == "inbox" || $item['from-url'] != $profile_url){ + $ret = array(); + foreach ($r as $item) { + if ($box == "inbox" || $item['from-url'] != $profile_url) { $recipient = $user_info; $sender = api_get_user($a,normalise_link($item['contact-url'])); - } - elseif ($box == "sentbox" || $item['from-url'] == $profile_url){ + } elseif ($box == "sentbox" || $item['from-url'] == $profile_url) { $recipient = api_get_user($a,normalise_link($item['contact-url'])); $sender = $user_info; - } - $ret[]=api_format_messages($item, $recipient, $sender); + + $ret[] = api_format_messages($item, $recipient, $sender); } $data = array('direct_message' => $ret); - switch($type){ + switch ($type) { case "atom": case "rss": $data = api_rss_extra($a, $data, $user_info); } - return api_format_data("direct-messages", $type, $data); + return api_format_data("direct-messages", $type, $data); } - function api_direct_messages_sentbox($type){ - $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false"); + function api_direct_messages_sentbox($type) { + $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); return api_direct_messages_box($type, "sentbox", $verbose); } - function api_direct_messages_inbox($type){ - $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false"); + + function api_direct_messages_inbox($type) { + $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); return api_direct_messages_box($type, "inbox", $verbose); } - function api_direct_messages_all($type){ - $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false"); + + function api_direct_messages_all($type) { + $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); return api_direct_messages_box($type, "all", $verbose); } - function api_direct_messages_conversation($type){ - $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false"); + + function api_direct_messages_conversation($type) { + $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); return api_direct_messages_box($type, "conversation", $verbose); } + + /// @TODO move to top of file or somewhere better api_register_func('api/direct_messages/conversation','api_direct_messages_conversation',true); api_register_func('api/direct_messages/all','api_direct_messages_all',true); api_register_func('api/direct_messages/sent','api_direct_messages_sentbox',true); api_register_func('api/direct_messages','api_direct_messages_inbox',true); - - - function api_oauth_request_token($type){ - try{ + function api_oauth_request_token($type) { + try { $oauth = new FKOAuth1(); $r = $oauth->fetch_request_token(OAuthRequest::from_request()); - }catch(Exception $e){ - echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); killme(); + } catch (Exception $e) { + echo "error=" . OAuthUtil::urlencode_rfc3986($e->getMessage()); + killme(); } echo $r; killme(); } - function api_oauth_access_token($type){ - try{ + + function api_oauth_access_token($type) { + try { $oauth = new FKOAuth1(); $r = $oauth->fetch_access_token(OAuthRequest::from_request()); - }catch(Exception $e){ + } catch (Exception $e) { echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); killme(); } echo $r; killme(); } + /// @TODO move to top of file or somewhere better api_register_func('api/oauth/request_token', 'api_oauth_request_token', false); api_register_func('api/oauth/access_token', 'api_oauth_access_token', false); - function api_fr_photos_list($type) { - if (api_user()===false) throw new ForbiddenException(); - $r = q("select `resource-id`, max(scale) as scale, album, filename, type from photo - where uid = %d and album != 'Contact Photos' group by `resource-id`", + if (api_user() === false) { + throw new ForbiddenException(); + } + + $r = q("SELECT `resource-id`, MAX(`scale`) AS `scale`, `album`, `filename`, `type` + FROM `photo` + WHERE `uid` = %d AND `album` != 'Contact Photos' GROUP BY `resource-id`, `album`, `filename`, `type`", intval(local_user()) ); $typetoext = array( - 'image/jpeg' => 'jpg', - 'image/png' => 'png', - 'image/gif' => 'gif' + 'image/jpeg' => 'jpg', + 'image/png' => 'png', + 'image/gif' => 'gif' ); - $data = array('photo'=>array()); - if ($r) { + $data = array('photo' => array()); + if (dbm::is_result($r)) { foreach ($r as $rr) { $photo = array(); $photo['id'] = $rr['resource-id']; $photo['album'] = $rr['album']; $photo['filename'] = $rr['filename']; $photo['type'] = $rr['type']; - $thumb = App::get_baseurl()."/photo/".$rr['resource-id']."-".$rr['scale'].".".$typetoext[$rr['type']]; + $thumb = App::get_baseurl() . "/photo/" . $rr['resource-id'] . "-" . $rr['scale'] . "." . $typetoext[$rr['type']]; - if ($type == "xml") + if ($type == "xml") { $data['photo'][] = array("@attributes" => $photo, "1" => $thumb); - else { + } else { $photo['thumb'] = $thumb; $data['photo'][] = $photo; } } } - return api_format_data("photos", $type, $data); + return api_format_data("photos", $type, $data); } function api_fr_photo_detail($type) { - if (api_user()===false) throw new ForbiddenException(); - if(!x($_REQUEST,'photo_id')) throw new BadRequestException("No photo id."); + if (api_user() === false) { + throw new ForbiddenException(); + } elseif (!x($_REQUEST, 'photo_id')) { + throw new BadRequestException("No photo id."); + } $scale = (x($_REQUEST, 'scale') ? intval($_REQUEST['scale']) : false); - $scale_sql = ($scale === false ? "" : sprintf("and scale=%d",intval($scale))); - $data_sql = ($scale === false ? "" : "data, "); + $scale_sql = ($scale === false ? "" : sprintf("AND `scale`=%d",intval($scale))); + $data_sql = ($scale === false ? "" : "ANY_VALUE(`data`) AS data`,"); - $r = q("select %s `resource-id`, `created`, `edited`, `title`, `desc`, `album`, `filename`, - `type`, `height`, `width`, `datasize`, `profile`, min(`scale`) as minscale, max(`scale`) as maxscale - from photo where `uid` = %d and `resource-id` = '%s' %s group by `resource-id`", + $r = q("SELECT %s ANY_VALUE(`resource-id`) AS `resource-id`, ANY_VALUE(`created`) AS `created`, + ANY_VALUE(`edited`) AS `edited`, ANY_VALUE(`title`) AS `title`, ANY_VALUE(`desc`) AS `desc`, + ANY_VALUE(`album`) AS `album`, ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`type`) AS `type`, + ANY_VALUE(`height`) AS `height`, ANY_VALUE(`width`) AS `width`, ANY_VALUE(`datasize`) AS `datasize`, + ANY_VALUE(`profile`) AS `profile`, min(`scale`) as minscale, max(`scale`) as maxscale + FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' %s", $data_sql, intval(local_user()), dbesc($_REQUEST['photo_id']), @@ -3111,12 +3336,12 @@ use \Friendica\Core\Config; ); $typetoext = array( - 'image/jpeg' => 'jpg', - 'image/png' => 'png', - 'image/gif' => 'gif' + 'image/jpeg' => 'jpg', + 'image/png' => 'png', + 'image/gif' => 'gif' ); - if ($r) { + if (dbm::is_result($r)) { $data = array('photo' => $r[0]); $data['photo']['id'] = $data['photo']['resource-id']; if ($scale !== false) { @@ -3126,14 +3351,15 @@ use \Friendica\Core\Config; } if ($type == "xml") { $data['photo']['links'] = array(); - for ($k=intval($data['photo']['minscale']); $k<=intval($data['photo']['maxscale']); $k++) - $data['photo']['links'][$k.":link"]["@attributes"] = array("type" => $data['photo']['type'], - "scale" => $k, - "href" => App::get_baseurl()."/photo/".$data['photo']['resource-id']."-".$k.".".$typetoext[$data['photo']['type']]); + for ($k = intval($data['photo']['minscale']); $k <= intval($data['photo']['maxscale']); $k++) { + $data['photo']['links'][$k . ":link"]["@attributes"] = array("type" => $data['photo']['type'], + "scale" => $k, + "href" => App::get_baseurl() . "/photo/" . $data['photo']['resource-id'] . "-" . $k . "." . $typetoext[$data['photo']['type']]); + } } else { $data['photo']['link'] = array(); - for ($k=intval($data['photo']['minscale']); $k<=intval($data['photo']['maxscale']); $k++) { - $data['photo']['link'][$k] = App::get_baseurl()."/photo/".$data['photo']['resource-id']."-".$k.".".$typetoext[$data['photo']['type']]; + for ($k = intval($data['photo']['minscale']); $k <= intval($data['photo']['maxscale']); $k++) { + $data['photo']['link'][$k] = App::get_baseurl() . "/photo/" . $data['photo']['resource-id'] . "-" . $k . "." . $typetoext[$data['photo']['type']]; } } unset($data['photo']['resource-id']); @@ -3164,11 +3390,12 @@ use \Friendica\Core\Config; * url: string, url to redirect after auth */ function api_friendica_remoteauth() { - $url = ((x($_GET,'url')) ? $_GET['url'] : ''); - $c_url = ((x($_GET,'c_url')) ? $_GET['c_url'] : ''); + $url = ((x($_GET, 'url')) ? $_GET['url'] : ''); + $c_url = ((x($_GET, 'c_url')) ? $_GET['c_url'] : ''); - if ($url === '' || $c_url === '') + if ($url === '' || $c_url === '') { throw new BadRequestException("Wrong parameters."); + } $c_url = normalise_link($c_url); @@ -3179,18 +3406,19 @@ use \Friendica\Core\Config; intval(api_user()) ); - if ((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN)) + if ((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN)) { throw new BadRequestException("Unknown contact"); + } $cid = $r[0]['id']; $dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']); - if($r[0]['duplex'] && $r[0]['issued-id']) { + if ($r[0]['duplex'] && $r[0]['issued-id']) { $orig_id = $r[0]['issued-id']; $dfrn_id = '1:' . $orig_id; } - if($r[0]['duplex'] && $r[0]['dfrn-id']) { + if ($r[0]['duplex'] && $r[0]['dfrn-id']) { $orig_id = $r[0]['dfrn-id']; $dfrn_id = '0:' . $orig_id; } @@ -3227,12 +3455,16 @@ use \Friendica\Core\Config; return false; } - $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body); - // Skip if there is no shared message in there - // we already checked this in diaspora::is_reshare() - // but better one more than one less... - if ($body == $attributes) + /// @TODO "$1" should maybe mean '$1' ? + $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body); + /* + * Skip if there is no shared message in there + * we already checked this in diaspora::is_reshare() + * but better one more than one less... + */ + if ($body == $attributes) { return false; + } // build the fake reshared item @@ -3240,55 +3472,63 @@ use \Friendica\Core\Config; $author = ""; preg_match("/author='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); + if ($matches[1] != "") { + $author = html_entity_decode($matches[1], ENT_QUOTES, 'UTF-8'); + } preg_match('/author="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $author = $matches[1]; + } $profile = ""; preg_match("/profile='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $profile = $matches[1]; + } preg_match('/profile="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $profile = $matches[1]; + } $avatar = ""; preg_match("/avatar='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $avatar = $matches[1]; + } preg_match('/avatar="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $avatar = $matches[1]; + } $link = ""; preg_match("/link='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $link = $matches[1]; + } preg_match('/link="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $link = $matches[1]; + } $posted = ""; preg_match("/posted='(.*?)'/ism", $attributes, $matches); if ($matches[1] != "") - $posted= $matches[1]; + $posted = $matches[1]; preg_match('/posted="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if ($matches[1] != "") { $posted = $matches[1]; + } $shared_body = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$2",$body); - if (($shared_body == "") || ($profile == "") || ($author == "") || ($avatar == "") || ($posted == "")) + if (($shared_body == "") || ($profile == "") || ($author == "") || ($avatar == "") || ($posted == "")) { return false; - - + } $reshared_item["body"] = $shared_body; $reshared_item["author-name"] = $author; @@ -3312,32 +3552,39 @@ use \Friendica\Core\Config; $r = q("SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'", dbesc(normalise_link($profile))); - if ($r) + + if (dbm::is_result($r)) { $nick = $r[0]["nick"]; + } if (!$nick == "") { $r = q("SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'", dbesc(normalise_link($profile))); - if ($r) + + if (dbm::is_result($r)) { $nick = $r[0]["nick"]; + } } if (!$nick == "") { $friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2", $profile); - if ($friendica != $profile) + if ($friendica != $profile) { $nick = $friendica; + } } if (!$nick == "") { $diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2", $profile); - if ($diaspora != $profile) + if ($diaspora != $profile) { $nick = $diaspora; + } } if (!$nick == "") { $twitter = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $profile); - if ($twitter != $profile) + if ($twitter != $profile) { $nick = $twitter; + } } @@ -3348,8 +3595,9 @@ use \Friendica\Core\Config; if ($StatusnetUser != $profile) { $UserData = fetch_url("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser); $user = json_decode($UserData); - if ($user) + if ($user) { $nick = $user->screen_name; + } } } } @@ -3363,10 +3611,11 @@ use \Friendica\Core\Config; //} - if ($nick != "") - return($nick); + if ($nick != "") { + return $nick; + } - return(false); + return false; } function api_in_reply_to($item) { @@ -3424,7 +3673,7 @@ use \Friendica\Core\Config; } function api_clean_plain_items($Text) { - $include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false"); + $include_entities = strtolower(x($_REQUEST, 'include_entities') ? $_REQUEST['include_entities'] : "false"); $Text = bb_CleanPictureLinks($Text); $URLSearchString = "^\[\]"; @@ -3518,11 +3767,11 @@ use \Friendica\Core\Config; $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); // params $user_info = api_get_user($a); - $gid = (x($_REQUEST,'gid') ? $_REQUEST['gid'] : 0); + $gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0); $uid = $user_info['uid']; // get data of the specified group id or all groups if not specified @@ -3569,11 +3818,11 @@ use \Friendica\Core\Config; $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); // params $user_info = api_get_user($a); - $gid = (x($_REQUEST,'gid') ? $_REQUEST['gid'] : 0); + $gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0); $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : ""); $uid = $user_info['uid']; @@ -3616,7 +3865,7 @@ use \Friendica\Core\Config; $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); // params $user_info = api_get_user($a); @@ -3682,7 +3931,7 @@ use \Friendica\Core\Config; $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); // params $user_info = api_get_user($a); @@ -3734,14 +3983,14 @@ use \Friendica\Core\Config; $success = array('success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers); return api_format_data("group_update", $type, array('result' => $success)); } - api_register_func('api/friendica/group_update', 'api_friendica_group_update', true, API_METHOD_POST); + api_register_func('api/friendica/group_update', 'api_friendica_group_update', true, API_METHOD_POST); function api_friendica_activity($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); $verb = strtolower($a->argv[3]); $verb = preg_replace("|\..*$|", "", $verb); @@ -3760,6 +4009,8 @@ use \Friendica\Core\Config; } } + + /// @TODO move to top of file or somwhere better api_register_func('api/friendica/activity/like', 'api_friendica_activity', true, API_METHOD_POST); api_register_func('api/friendica/activity/dislike', 'api_friendica_activity', true, API_METHOD_POST); api_register_func('api/friendica/activity/attendyes', 'api_friendica_activity', true, API_METHOD_POST); @@ -3781,7 +4032,7 @@ use \Friendica\Core\Config; $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); if ($a->argc!==3) throw new BadRequestException("Invalid argument count"); $nm = new NotificationsManager(); @@ -3806,11 +4057,11 @@ use \Friendica\Core\Config; * @param string $type Known types are 'atom', 'rss', 'xml' and 'json' * @return string */ - function api_friendica_notification_seen($type){ + function api_friendica_notification_seen($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) throw new ForbiddenException(); if ($a->argc!==4) throw new BadRequestException("Invalid argument count"); $id = (x($_REQUEST, 'id') ? intval($_REQUEST['id']) : 0); @@ -3838,19 +4089,21 @@ use \Friendica\Core\Config; return api_format_data('result', $type, array('result' => "success")); } + /// @TODO move to top of file or somwhere better api_register_func('api/friendica/notification/seen', 'api_friendica_notification_seen', true, API_METHOD_POST); api_register_func('api/friendica/notification', 'api_friendica_notification', true, API_METHOD_GET); - /** * @brief update a direct_message to seen state * * @param string $type Known types are 'atom', 'rss', 'xml' and 'json' * @return string (success result=ok, error result=error with error message) */ - function api_friendica_direct_messages_setseen($type){ + function api_friendica_direct_messages_setseen($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } // params $user_info = api_get_user($a); @@ -3867,6 +4120,7 @@ use \Friendica\Core\Config; $r = q("SELECT `id` FROM `mail` WHERE `id` = %d AND `uid` = %d", intval($id), intval($uid)); + // error message if specified id is not in database if (!dbm::is_result($r)) { $answer = array('result' => 'error', 'message' => 'message id not in database'); @@ -3887,11 +4141,10 @@ use \Friendica\Core\Config; return api_format_data("direct_messages_setseen", $type, array('$result' => $answer)); } } + + /// @TODO move to top of file or somwhere better api_register_func('api/friendica/direct_messages_setseen', 'api_friendica_direct_messages_setseen', true); - - - /** * @brief search for direct_messages containing a searchstring through api * @@ -3900,14 +4153,16 @@ use \Friendica\Core\Config; * success=false if nothing was found, search_result='nothing found', * error: result=error with error message) */ - function api_friendica_direct_messages_search($type){ + function api_friendica_direct_messages_search($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } // params $user_info = api_get_user($a); - $searchstring = (x($_REQUEST,'searchstring') ? $_REQUEST['searchstring'] : ""); + $searchstring = (x($_REQUEST, 'searchstring') ? $_REQUEST['searchstring'] : ""); $uid = $user_info['uid']; // error if no searchstring specified @@ -3923,29 +4178,32 @@ use \Friendica\Core\Config; ); $profile_url = $user_info["url"]; + // message if nothing was found - if (!dbm::is_result($r)) + if (!dbm::is_result($r)) { $success = array('success' => false, 'search_results' => 'problem with query'); - else if (count($r) == 0) + } elseif (count($r) == 0) { $success = array('success' => false, 'search_results' => 'nothing found'); - else { - $ret = Array(); - foreach($r as $item) { - if ($box == "inbox" || $item['from-url'] != $profile_url){ + } else { + $ret = array(); + foreach ($r as $item) { + if ($box == "inbox" || $item['from-url'] != $profile_url) { $recipient = $user_info; $sender = api_get_user($a,normalise_link($item['contact-url'])); - } - elseif ($box == "sentbox" || $item['from-url'] == $profile_url){ + } elseif ($box == "sentbox" || $item['from-url'] == $profile_url) { $recipient = api_get_user($a,normalise_link($item['contact-url'])); $sender = $user_info; } - $ret[]=api_format_messages($item, $recipient, $sender); + + $ret[] = api_format_messages($item, $recipient, $sender); } $success = array('success' => true, 'search_results' => $ret); } return api_format_data("direct_message_search", $type, array('$result' => $success)); } + + /// @TODO move to top of file or somwhere better api_register_func('api/friendica/direct_messages_search', 'api_friendica_direct_messages_search', true); /** @@ -3954,13 +4212,15 @@ use \Friendica\Core\Config; * @param string $type Known types are 'atom', 'rss', 'xml' and 'json' * @return string */ - function api_friendica_profile_show($type){ + function api_friendica_profile_show($type) { $a = get_app(); - if (api_user()===false) throw new ForbiddenException(); + if (api_user() === false) { + throw new ForbiddenException(); + } // input params - $profileid = (x($_REQUEST,'profile_id') ? $_REQUEST['profile_id'] : 0); + $profileid = (x($_REQUEST, 'profile_id') ? $_REQUEST['profile_id'] : 0); // retrieve general information about profiles for user $multi_profiles = feature_enabled(api_user(),'multi_profiles'); @@ -3971,9 +4231,11 @@ use \Friendica\Core\Config; $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d", intval(api_user()), intval($profileid)); + // error message if specified gid is not in database - if (!dbm::is_result($r)) + if (!dbm::is_result($r)) { throw new BadRequestException("profile_id not available"); + } } else { $r = q("SELECT * FROM `profile` WHERE `uid` = %d", intval(api_user())); @@ -3991,13 +4253,13 @@ use \Friendica\Core\Config; foreach ($r as $rr) { $user = api_get_user($a, $rr['nurl']); - ($type == "xml") ? $users[$k++.":user"] = $user : $users[] = $user; + ($type == "xml") ? $users[$k++ . ":user"] = $user : $users[] = $user; } $profile['users'] = $users; // add prepared profile data to array for final return if ($type == "xml") { - $profiles[$k++.":profile"] = $profile; + $profiles[$k++ . ":profile"] = $profile; } else { $profiles[] = $profile; } @@ -4015,6 +4277,7 @@ use \Friendica\Core\Config; api_register_func('api/friendica/profile/show', 'api_friendica_profile_show', true, API_METHOD_GET); /* +@TODO Maybe open to implement? To.Do: [pagename] => api/1.1/statuses/lookup.json [id] => 605138389168451584 diff --git a/include/attach.php b/include/attach.php index 6b26b1ed6..ee6f49937 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1060,13 +1060,14 @@ function z_mime_content_type($filename) { 'zsh' => 'text/x-script.zsh', ); - $dot = strpos($filename,'.'); - if($dot !== false) { - $ext = strtolower(substr($filename,$dot+1)); + $dot = strpos($filename, '.'); + if ($dot !== false) { + $ext = strtolower(substr($filename, $dot + 1)); if (array_key_exists($ext, $mime_types)) { return $mime_types[$ext]; } } + /// @TODO Then let's get rid of it? // can't use this because we're just passing a name, e.g. not a file that can be opened // elseif (function_exists('finfo_open')) { // $finfo = @finfo_open(FILEINFO_MIME); diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 03eff5a6b..a07a58353 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -1,11 +1,12 @@ convert($Text); // unmask the special chars back to HTML - $Text = str_replace(array('&_lt_;','&_gt_;','&_amp_;'),array('<','>','&'),$Text); + $Text = str_replace(array('&_lt_;', '&_gt_;', '&_amp_;'), array('<', '>', '&'), $Text); $a->save_timestamp($stamp1, "parser"); @@ -172,20 +201,31 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { $Text = preg_replace_callback("/([@]\[(.*?)\])\(([$URLSearchString]*?)\)/ism", 'diaspora_mentions', $Text); } + // Restore code blocks + $Text = preg_replace_callback('/#codeblock-([0-9]+)#/iU', + function ($matches) use ($codeblocks) { + $return = ''; + if (isset($codeblocks[intval($matches[1])])) { + $return = $codeblocks[$matches[1]]; + } + return $return; + } + , $Text); + call_hooks('bb2diaspora',$Text); return $Text; } function unescape_underscores_in_links($m) { - $y = str_replace('\\_','_', $m[2]); + $y = str_replace('\\_', '_', $m[2]); return('[' . $m[1] . '](' . $y . ')'); } function format_event_diaspora($ev) { - - if(! ((is_array($ev)) && count($ev))) + if (! ((is_array($ev)) && count($ev))) { return ''; + } $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM @@ -200,17 +240,19 @@ function format_event_diaspora($ev) { $ev['start'] , $bd_format))) . '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n"; - if(! $ev['nofinish']) + if (! $ev['nofinish']) { $o .= t('Finishes:') . ' ' . '[' . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC', $ev['finish'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', $ev['finish'] , $bd_format ))) . '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n"; + } - if(strlen($ev['location'])) + if (strlen($ev['location'])) { $o .= t('Location:') . bb2diaspora($ev['location']) . "\n"; + } $o .= "\n"; return $o; diff --git a/include/bbcode.php b/include/bbcode.php index 489ef8b2e..2715334e4 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1,43 +1,46 @@ ' . generate_map(str_replace('/',' ',$match[1])) . '', $match[0]); + return str_replace($match[0], '' . generate_map(str_replace('/', ' ', $match[1])) . '', $match[0]); } function bb_map_location($match) { // the extra space in the following line is intentional - return str_replace($match[0],'' . generate_named_map($match[1]) . '', $match[0]); + return str_replace($match[0], '' . generate_named_map($match[1]) . '', $match[0]); } function bb_attachment($Text, $simplehtml = false, $tryoembed = true) { $data = get_attachment_data($Text); - if (!$data) + if (!$data) { return $Text; + } if (isset($data["title"])) { $data["title"] = strip_tags($data["title"]); @@ -57,83 +60,91 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) { // If the link description is similar to the text above then don't add the link description if (($data["title"] != "") AND ((strpos($test1,$test2) !== false) OR - (similar_text($test1,$test2) / strlen($data["title"])) > 0.9)) + (similar_text($test1,$test2) / strlen($data["title"])) > 0.9)) { $title2 = $data["url"]; - $text = sprintf('%s', + } + $text = sprintf('%s', $data["url"], $data["title"], $title2); - } elseif (($simplehtml != 4) AND ($simplehtml != 0)) + } elseif (($simplehtml != 4) AND ($simplehtml != 0)) { $text = sprintf('%s', $data["url"], $data["title"]); - else { + } else { $text = sprintf('', $data["type"]); $bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $data["url"], $data["title"]), $data["url"], $data["title"]); - if ($tryoembed) + if ($tryoembed) { $oembed = tryoembed($bookmark); - else + } else { $oembed = $bookmark[0]; + } - if (strstr(strtolower($oembed), "<img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $data["url"], proxy_url($data["image"]), $data["title"]); - elseif (($data["preview"] != "") AND !strstr(strtolower($oembed), "<img ")) + } elseif (($data["preview"] != "") AND !strstr(strtolower($oembed), "<img ")) { $text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], proxy_url($data["preview"]), $data["title"]); + } - if (($data["type"] == "photo") AND ($data["url"] != "") AND ($data["image"] != "")) + if (($data["type"] == "photo") AND ($data["url"] != "") AND ($data["image"] != "")) { $text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], proxy_url($data["image"]), $data["title"]); - else + } else { $text .= $oembed; + } - if (trim($data["description"]) != "") + if (trim($data["description"]) != "") { $text .= sprintf('<blockquote>%s</blockquote></span>', trim(bbcode($data["description"]))); + } } } - return $data["text"].$text.$data["after"]; + return trim($data["text"].' '.$text.' '.$data["after"]); } function bb_remove_share_information($Text, $plaintext = false, $nolink = false) { $data = get_attachment_data($Text); - if (!$data) + if (!$data) { return $Text; - - if ($nolink) - return $data["text"].$data["after"]; + } elseif ($nolink) { + return $data["text"] . $data["after"]; + } $title = htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false); $text = htmlentities($data["text"], ENT_QUOTES, 'UTF-8', false); - if ($plaintext OR (($title != "") AND strstr($text, $title))) + if ($plaintext OR (($title != "") AND strstr($text, $title))) { $data["title"] = $data["url"]; - elseif (($text != "") AND strstr($title, $text)) { + } elseif (($text != "") AND strstr($title, $text)) { $data["text"] = $data["title"]; $data["title"] = $data["url"]; } - if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == "")) - return $data["title"].$data["after"]; + if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == "")) { + return $data["title"] . $data["after"]; + } // If the link already is included in the post, don't add it again - if (($data["url"] != "") AND strpos($data["text"], $data["url"])) - return $data["text"].$data["after"]; + if (($data["url"] != "") AND strpos($data["text"], $data["url"])) { + return $data["text"] . $data["after"]; + } $text = $data["text"]; - if (($data["url"] != "") AND ($data["title"] != "")) - $text .= "\n[url=".$data["url"]."]".$data["title"]."[/url]"; - elseif (($data["url"] != "")) - $text .= "\n".$data["url"]; + if (($data["url"] != "") AND ($data["title"] != "")) { + $text .= "\n[url=" . $data["url"] . "]" . $data["title"] . "[/url]"; + } elseif (($data["url"] != "")) { + $text .= "\n" . $data["url"]; + } - return $text."\n".$data["after"]; + return $text . "\n" . $data["after"]; } function bb_cleanstyle($st) { - return "<span style=\"".cleancss($st[1]).";\">".$st[2]."</span>"; + return "<span style=\"" . cleancss($st[1]) . ";\">" . $st[2] . "</span>"; } function bb_cleanclass($st) { - return "<span class=\"".cleancss($st[1])."\">".$st[2]."</span>"; + return "<span class=\"" . cleancss($st[1]) . "\">" . $st[2] . "</span>"; } function cleancss($input) { @@ -145,128 +156,145 @@ function cleancss($input) { for ($i = 0; $i < strlen($input); $i++) { $char = substr($input, $i, 1); - if (($char >= "a") and ($char <= "z")) + if (($char >= "a") and ($char <= "z")) { $cleaned .= $char; + } - if (!(strpos(" #;:0123456789-_.%", $char) === false)) + if (!(strpos(" #;:0123456789-_.%", $char) === false)) { $cleaned .= $char; + } } - return($cleaned); + return $cleaned; } function stripcode_br_cb($s) { return '[code]' . str_replace('<br />', '', $s[1]) . '[/code]'; } -function bb_onelinecode_cb($match) { - if (strpos($match[1],"<br>")===false){ - return "<key>".$match[1]."</key>"; - } - return "<code>".$match[1]."</code>"; -} - -function tryoembed($match){ +function tryoembed($match) { $url = $match[1]; // Always embed the SSL version $url = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"), array("https://www.youtube.com/", "https://player.vimeo.com/"), $url); - $o = oembed_fetch_url($url); - if (!is_object($o)) + if (!is_object($o)) { return $match[0]; - - if (isset($match[2])) - $o->title = $match[2]; - - if ($o->type=="error") return $match[0]; - - $html = oembed_format_object($o); - return $html; - -} - -// [noparse][i]italic[/i][/noparse] turns into -// [noparse][ i ]italic[ /i ][/noparse], -// to hide them from parser. - -function bb_spacefy($st) { - $whole_match = $st[0]; - $captured = $st[1]; - $spacefied = preg_replace("/\[(.*?)\]/", "[ $1 ]", $captured); - $new_str = str_replace($captured, $spacefied, $whole_match); - return $new_str; -} - -// The previously spacefied [noparse][ i ]italic[ /i ][/noparse], -// now turns back and the [noparse] tags are trimed -// returning [i]italic[/i] - -function bb_unspacefy_and_trim($st) { - $whole_match = $st[0]; - $captured = $st[1]; - $unspacefied = preg_replace("/\[ (.*?)\ ]/", "[$1]", $captured); - return $unspacefied; -} - -function bb_find_open_close($s, $open, $close, $occurance = 1) { - - if($occurance < 1) - $occurance = 1; - - $start_pos = -1; - for($i = 1; $i <= $occurance; $i++) { - if( $start_pos !== false) - $start_pos = strpos($s, $open, $start_pos + 1); } - if( $start_pos === false) + if (isset($match[2])) { + $o->title = $match[2]; + } + + if ($o->type == "error") { + return $match[0]; + } + + $html = oembed_format_object($o); + + return $html; +} + +/* + * [noparse][i]italic[/i][/noparse] turns into + * [noparse][ i ]italic[ /i ][/noparse], + * to hide them from parser. + */ +function bb_spacefy($st) { + $whole_match = $st[0]; + $captured = $st[1]; + $spacefied = preg_replace("/\[(.*?)\]/", "[ $1 ]", $captured); + $new_str = str_replace($captured, $spacefied, $whole_match); + return $new_str; +} + +/* + * The previously spacefied [noparse][ i ]italic[ /i ][/noparse], + * now turns back and the [noparse] tags are trimed + * returning [i]italic[/i] + */ +function bb_unspacefy_and_trim($st) { + $whole_match = $st[0]; + $captured = $st[1]; + $unspacefied = preg_replace("/\[ (.*?)\ ]/", "[$1]", $captured); + return $unspacefied; +} + +function bb_find_open_close($s, $open, $close, $occurence = 1) { + if ($occurence < 1) { + $occurence = 1; + } + + $start_pos = -1; + for ($i = 1; $i <= $occurence; $i++) { + if ($start_pos !== false) { + $start_pos = strpos($s, $open, $start_pos + 1); + } + } + + if ($start_pos === false) { return false; + } $end_pos = strpos($s, $close, $start_pos); - if( $end_pos === false) + if ($end_pos === false) { return false; + } $res = array( 'start' => $start_pos, 'end' => $end_pos ); return $res; } -function get_bb_tag_pos($s, $name, $occurance = 1) { - - if($occurance < 1) - $occurance = 1; - - $start_open = -1; - for($i = 1; $i <= $occurance; $i++) { - if( $start_open !== false) - $start_open = strpos($s, '[' . $name, $start_open + 1); // allow [name= type tags +function get_bb_tag_pos($s, $name, $occurence = 1) { + if ($occurence < 1) { + $occurence = 1; } - if( $start_open === false) + $start_open = -1; + for ($i = 1; $i <= $occurence; $i++) { + if ($start_open !== false) { + $start_open = strpos($s, '[' . $name, $start_open + 1); // allow [name= type tags + } + } + + if ($start_open === false) { return false; + } $start_equal = strpos($s, '=', $start_open); $start_close = strpos($s, ']', $start_open); - if( $start_close === false) + if ($start_close === false) { return false; + } $start_close++; $end_open = strpos($s, '[/' . $name . ']', $start_close); - if( $end_open === false) + if ($end_open === false) { return false; + } - $res = array( 'start' => array('open' => $start_open, 'close' => $start_close), - 'end' => array('open' => $end_open, 'close' => $end_open + strlen('[/' . $name . ']')) ); - if( $start_equal !== false) + $res = array( + 'start' => array( + 'open' => $start_open, + 'close' => $start_close + ), + 'end' => array( + 'open' => $end_open, + 'close' => $end_open + strlen('[/' . $name . ']') + ), + ); + + if ($start_equal !== false) { $res['start']['equal'] = $start_equal + 1; + } return $res; } @@ -275,27 +303,27 @@ function bb_tag_preg_replace($pattern, $replace, $name, $s) { $string = $s; - $occurance = 1; - $pos = get_bb_tag_pos($string, $name, $occurance); - while($pos !== false && $occurance < 1000) { - + $occurence = 1; + $pos = get_bb_tag_pos($string, $name, $occurence); + while ($pos !== false && $occurence < 1000) { $start = substr($string, 0, $pos['start']['open']); $subject = substr($string, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']); $end = substr($string, $pos['end']['close']); - if($end === false) + if ($end === false) { $end = ''; + } $subject = preg_replace($pattern, $replace, $subject); $string = $start . $subject . $end; - $occurance++; - $pos = get_bb_tag_pos($string, $name, $occurance); + $occurence++; + $pos = get_bb_tag_pos($string, $name, $occurence); } return $string; } -if(! function_exists('bb_extract_images')) { +if (! function_exists('bb_extract_images')) { function bb_extract_images($body) { $saved_image = array(); @@ -306,26 +334,28 @@ function bb_extract_images($body) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); - while(($img_st_close !== false) && ($img_end !== false)) { + while (($img_st_close !== false) && ($img_end !== false)) { $img_st_close++; // make it point to AFTER the closing bracket $img_end += $img_start; - if(! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { + if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { // This is an embedded image $saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - ($img_start + $img_st_close)); $new_body = $new_body . substr($orig_body, 0, $img_start) . '[$#saved_image' . $cnt . '#$]'; $cnt++; - } - else + } else { $new_body = $new_body . substr($orig_body, 0, $img_end + strlen('[/img]')); + } $orig_body = substr($orig_body, $img_end + strlen('[/img]')); - if($orig_body === false) // in case the body ends on a closing image tag + if ($orig_body === false) { + // in case the body ends on a closing image tag $orig_body = ''; + } $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); @@ -337,7 +367,7 @@ function bb_extract_images($body) { return array('body' => $new_body, 'images' => $saved_image); }} -if(! function_exists('bb_replace_images')) { +if (! function_exists('bb_replace_images')) { function bb_replace_images($body, $images) { $newbody = $body; @@ -512,85 +542,94 @@ function bb_ShareAttributes($share, $simplehtml) { ); break; } - return($text); + + return $text; } function GetProfileUsername($profile, $username, $compact = false, $getnetwork = false) { $twitter = preg_replace("=https?://twitter.com/(.*)=ism", "$1@twitter.com", $profile); if ($twitter != $profile) { - if ($getnetwork) - return(NETWORK_TWITTER); - elseif ($compact) - return($twitter); - else - return($username." (".$twitter.")"); + if ($getnetwork) { + return NETWORK_TWITTER; + } elseif ($compact) { + return $twitter; + } else { + return ($username . " (" . $twitter . ")"); + } } $appnet = preg_replace("=https?://alpha.app.net/(.*)=ism", "$1@alpha.app.net", $profile); if ($appnet != $profile) { - if ($getnetwork) - return(NETWORK_APPNET); - elseif ($compact) - return($appnet); - else - return($username." (".$appnet.")"); + if ($getnetwork) { + return NETWORK_APPNET; + } elseif ($compact) { + return $appnet; + } else { + return ($username . " (" . $appnet . ")"); + } } $gplus = preg_replace("=https?://plus.google.com/(.*)=ism", "$1@plus.google.com", $profile); if ($gplus != $profile) { - if ($getnetwork) - return(NETWORK_GPLUS); - elseif ($compact) - return($gplususername." (".$username.")"); - else - return($username." (".$gplus.")"); + if ($getnetwork) { + return NETWORK_GPLUS; + } elseif ($compact) { + return ($gplususername . " (" . $username . ")"); + } else { + return ($username . " (" . $gplus . ")"); + } } $friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2@$1", $profile); if ($friendica != $profile) { - if ($getnetwork) - return(NETWORK_DFRN); - elseif ($compact) - return($friendica); - else - return($username." (".$friendica.")"); + if ($getnetwork) { + return NETWORK_DFRN; + } elseif ($compact) { + return $friendica; + } else { + return ($username . " (" . $friendica . ")"); + } } $diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile); if ($diaspora != $profile) { - if ($getnetwork) - return(NETWORK_DIASPORA); - elseif ($compact) - return($diaspora); - else - return($username." (".$diaspora.")"); + if ($getnetwork) { + return NETWORK_DIASPORA; + } elseif ($compact) { + return $diaspora; + } else { + return ($username . " (" . $diaspora . ")"); + } } $red = preg_replace("=https?://(.*)/channel/(.*)=ism", "$2@$1", $profile); if ($red != $profile) { - if ($getnetwork) + if ($getnetwork) { // red is identified as Diaspora - friendica can't connect directly to it - return(NETWORK_DIASPORA); - elseif ($compact) - return($red); - else - return($username." (".$red.")"); + return NETWORK_DIASPORA; + } elseif ($compact) { + return $red; + } else { + return ($username . " (" . $red . ")"); + } } $StatusnetHost = preg_replace("=https?://(.*)/user/(.*)=ism", "$1", $profile); if ($StatusnetHost != $profile) { $StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile); if ($StatusnetUser != $profile) { + /// @TODO Some hosts run on https, not just http and sometimes http is disabled, let's support both here $UserData = fetch_url("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser); $user = json_decode($UserData); if ($user) { - if ($getnetwork) - return(NETWORK_STATUSNET); - elseif ($compact) - return($user->screen_name."@".$StatusnetHost); - else - return($username." (".$user->screen_name."@".$StatusnetHost.")"); + if ($getnetwork) { + return NETWORK_STATUSNET; + } elseif ($compact) { + return ($user->screen_name . "@" . $StatusnetHost); + } else { + return ($username . " (" . $user->screen_name . "@" . $StatusnetHost . ")"); + } } } } @@ -600,16 +639,17 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork = if ($rest == "") { $pumpio = preg_replace("=https?://([\.\w]+)/([\.\w]+)(.*)=ism", "$2@$1", $profile); if ($pumpio != $profile) { - if ($getnetwork) - return(NETWORK_PUMPIO); - elseif ($compact) - return($pumpio); - else - return($username." (".$pumpio.")"); + if ($getnetwork) { + return NETWORK_PUMPIO; + } elseif ($compact) { + return $pumpio; + } else { + return ($username . " (" . $pumpio . ")"); + } } } - return($username); + return $username; } function bb_DiasporaLinks($match) { @@ -619,7 +659,7 @@ function bb_DiasporaLinks($match) { function bb_RemovePictureLinks($match) { $text = Cache::get($match[1]); - if(is_null($text)){ + if (is_null($text)) { $a = get_app(); $stamp1 = microtime(true); @@ -660,20 +700,22 @@ function bb_RemovePictureLinks($match) { } Cache::set($match[1],$text); } - return($text); + + return $text; } function bb_expand_links($match) { - if (($match[3] == "") OR ($match[2] == $match[3]) OR stristr($match[2], $match[3])) - return ($match[1]."[url]".$match[2]."[/url]"); - else - return ($match[1].$match[3]." [url]".$match[2]."[/url]"); + if (($match[3] == "") OR ($match[2] == $match[3]) OR stristr($match[2], $match[3])) { + return ($match[1] . "[url]" . $match[2] . "[/url]"); + } else { + return ($match[1] . $match[3] . " [url]" . $match[2] . "[/url]"); + } } function bb_CleanPictureLinksSub($match) { $text = Cache::get($match[1]); - if(is_null($text)){ + if (is_null($text)) { $a = get_app(); $stamp1 = microtime(true); @@ -715,34 +757,58 @@ function bb_CleanPictureLinksSub($match) { } Cache::set($match[1],$text); } - return($text); + + return $text; } function bb_CleanPictureLinks($text) { $text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_CleanPictureLinksSub', $text); - return ($text); + return $text; } function bb_highlight($match) { - if(in_array(strtolower($match[1]),['php','css','mysql','sql','abap','diff','html','perl','ruby', - 'vbscript','avrc','dtd','java','xml','cpp','python','javascript','js','sh'])) - return text_highlight($match[2],strtolower($match[1])); + if (in_array(strtolower($match[1]), ['php', 'css', 'mysql', 'sql', 'abap', 'diff', 'html', 'perl', 'ruby', + 'vbscript', 'avrc', 'dtd', 'java', 'xml', 'cpp', 'python', 'javascript', 'js', 'sh'])) { + return text_highlight($match[2], strtolower($match[1])); + } return $match[0]; } - // BBcode 2 HTML was written by WAY2WEB.net - // extended to work with Mistpark/Friendica - Mike Macgirvin - -function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = false, $forplaintext = false) { +/** + * @brief Converts a BBCode message to HTML message + * + * BBcode 2 HTML was written by WAY2WEB.net + * extended to work with Mistpark/Friendica - Mike Macgirvin + * + * Simple HTML values meaning: + * - 0: Friendica display + * - 1: Unused + * - 2: Used for Facebook, Google+, Windows Phone push, Friendica API + * - 3: Used before converting to Markdown in bb2diaspora.php + * - 4: Used for WordPress, Libertree (before Markdown), pump.io and tumblr + * - 5: Unused + * - 6: Used for Appnet + * - 7: Used for dfrn, OStatus + * - 8: Used for WP backlink text setting + * + * @staticvar array $allowed_src_protocols + * @param string $Text + * @param bool $preserve_nl + * @param bool $tryoembed + * @param int $simplehtml + * @param bool $forplaintext + * @return string + */ +function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = false, $forplaintext = false) { $a = get_app(); // Hide all [noparse] contained bbtags by spacefying them // POSSIBLE BUG --> Will the 'preg' functions crash if there's an embedded image? - $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy',$Text); - $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_spacefy',$Text); - $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy',$Text); + $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy', $Text); + $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_spacefy', $Text); + $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy', $Text); // Remove the abstract element. It is a non visible element. $Text = remove_abstract($Text); @@ -772,19 +838,20 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $Text = str_replace(">", ">", $Text); // remove some newlines before the general conversion - $Text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","[share$1]$2[/share]",$Text); - $Text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism","[quote$1]$2[/quote]",$Text); + $Text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "[share$1]$2[/share]", $Text); + $Text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism", "[quote$1]$2[/quote]", $Text); $Text = preg_replace("/\n\[code\]/ism", "[code]", $Text); $Text = preg_replace("/\[\/code\]\n/ism", "[/code]", $Text); // when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems - if (!$tryoembed) - $Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","\n[share$1$2]$3[/share]",$Text); + if (!$tryoembed) { + $Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "\n[share$1$2]$3[/share]", $Text); + } // Check for [code] text here, before the linefeeds are messed with. // The highlighter will unescape and re-escape the content. - if (strpos($Text,'[code=') !== false) { + if (strpos($Text, '[code=') !== false) { $Text = preg_replace_callback("/\[code=(.*?)\](.*?)\[\/code\]/ism", 'bb_highlight', $Text); } // Convert new line chars to html <br /> tags @@ -795,7 +862,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // We'll emulate it. $Text = trim($Text); - $Text = str_replace("\r\n","\n", $Text); + $Text = str_replace("\r\n", "\n", $Text); // removing multiplicated newlines if (get_config("system", "remove_multiplicated_lines")) { @@ -812,10 +879,11 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // Handle attached links or videos $Text = bb_attachment($Text, $simplehtml, $tryoembed); - $Text = str_replace(array("\r","\n"), array('<br />','<br />'), $Text); + $Text = str_replace(array("\r","\n"), array('<br />', '<br />'), $Text); - if($preserve_nl) - $Text = str_replace(array("\n","\r"), array('',''),$Text); + if ($preserve_nl) { + $Text = str_replace(array("\n", "\r"), array('', ''), $Text); + } // Set up the parameters for a URL search string $URLSearchString = "^\[\]"; @@ -823,20 +891,21 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $MAILSearchString = $URLSearchString; // Remove all hashtag addresses - if ((!$tryoembed OR $simplehtml) AND !in_array($simplehtml, array(3, 7))) + if ((!$tryoembed OR $simplehtml) AND !in_array($simplehtml, array(3, 7))) { $Text = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text); - elseif ($simplehtml == 3) + } elseif ($simplehtml == 3) { $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1<a href="$2">$3</a>', $Text); - elseif ($simplehtml == 7) + } elseif ($simplehtml == 7) { $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1<span class="vcard"><a href="$2" class="url" title="$3"><span class="fn nickname mention">$3</span></a></span>', $Text); - elseif (!$simplehtml) + } elseif (!$simplehtml) { $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1<a href="$2" class="userinfo mention" title="$3">$3</a>', $Text); + } // Bookmarks in red - will be converted to bookmarks in friendica $Text = preg_replace("/#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $Text); @@ -845,38 +914,42 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal "[bookmark=$1]$2[/bookmark]", $Text); if (in_array($simplehtml, array(2, 6, 7, 8, 9))) { - $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("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",' $2 [url]$1[/url]',$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("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", ' $2 [url]$1[/url]',$Text); } - if ($simplehtml == 5) + if ($simplehtml == 5) { $Text = preg_replace("/[^#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $Text); + } // Perform URL Search - if ($tryoembed) - $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'tryoembed',$Text); + if ($tryoembed) { + $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", 'tryoembed', $Text); + } - if ($simplehtml == 5) - $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url]$1[/url]',$Text); - else - $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$Text); + if ($simplehtml == 5) { + $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url]$1[/url]', $Text); + } else { + $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url=$1]$2[/url]', $Text); + } // Handle Diaspora posts $Text = preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi", 'bb_DiasporaLinks', $Text); // if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text // if ($simplehtml != 7) { - if (!$forplaintext) + if (!$forplaintext) { $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="_blank">$2</a>', $Text); - else { - $Text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism"," $1 ",$Text); + } else { + $Text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism", " $1 ", $Text); $Text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_RemovePictureLinks', $Text); } // } - if ($tryoembed) - $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$Text); + if ($tryoembed) { + $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'tryoembed', $Text); + } $Text = preg_replace("/([#])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1<a href="$2" class="tag" title="$3">$3</a>', $Text); @@ -892,7 +965,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // we may need to restrict this further if it picks up too many strays // link acct:user@host to a webfinger profile redirector - $Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . App::get_baseurl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>',$Text); + $Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . App::get_baseurl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>', $Text); // Perform MAIL Search $Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text); @@ -901,61 +974,61 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // leave open the posibility of [map=something] // this is replaced in prepare_body() which has knowledge of the item location - if (strpos($Text,'[/map]') !== false) { + if (strpos($Text, '[/map]') !== false) { $Text = preg_replace_callback("/\[map\](.*?)\[\/map\]/ism", 'bb_map_location', $Text); } - if (strpos($Text,'[map=') !== false) { + if (strpos($Text, '[map=') !== false) { $Text = preg_replace_callback("/\[map=(.*?)\]/ism", 'bb_map_coords', $Text); } - if (strpos($Text,'[map]') !== false) { + if (strpos($Text, '[map]') !== false) { $Text = preg_replace("/\[map\]/", '<div class="map"></div>', $Text); } // Check for headers - $Text = preg_replace("(\[h1\](.*?)\[\/h1\])ism",'<h1>$1</h1>',$Text); - $Text = preg_replace("(\[h2\](.*?)\[\/h2\])ism",'<h2>$1</h2>',$Text); - $Text = preg_replace("(\[h3\](.*?)\[\/h3\])ism",'<h3>$1</h3>',$Text); - $Text = preg_replace("(\[h4\](.*?)\[\/h4\])ism",'<h4>$1</h4>',$Text); - $Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism",'<h5>$1</h5>',$Text); - $Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'<h6>$1</h6>',$Text); + $Text = preg_replace("(\[h1\](.*?)\[\/h1\])ism", '<h1>$1</h1>', $Text); + $Text = preg_replace("(\[h2\](.*?)\[\/h2\])ism", '<h2>$1</h2>', $Text); + $Text = preg_replace("(\[h3\](.*?)\[\/h3\])ism", '<h3>$1</h3>', $Text); + $Text = preg_replace("(\[h4\](.*?)\[\/h4\])ism", '<h4>$1</h4>', $Text); + $Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism", '<h5>$1</h5>', $Text); + $Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism", '<h6>$1</h6>', $Text); // Check for paragraph - $Text = preg_replace("(\[p\](.*?)\[\/p\])ism",'<p>$1</p>',$Text); + $Text = preg_replace("(\[p\](.*?)\[\/p\])ism", '<p>$1</p>', $Text); // Check for bold text - $Text = preg_replace("(\[b\](.*?)\[\/b\])ism",'<strong>$1</strong>',$Text); + $Text = preg_replace("(\[b\](.*?)\[\/b\])ism", '<strong>$1</strong>', $Text); // Check for Italics text - $Text = preg_replace("(\[i\](.*?)\[\/i\])ism",'<em>$1</em>',$Text); + $Text = preg_replace("(\[i\](.*?)\[\/i\])ism", '<em>$1</em>', $Text); // Check for Underline text - $Text = preg_replace("(\[u\](.*?)\[\/u\])ism",'<u>$1</u>',$Text); + $Text = preg_replace("(\[u\](.*?)\[\/u\])ism", '<u>$1</u>', $Text); // Check for strike-through text - $Text = preg_replace("(\[s\](.*?)\[\/s\])ism",'<strike>$1</strike>',$Text); + $Text = preg_replace("(\[s\](.*?)\[\/s\])ism", '<strike>$1</strike>', $Text); // Check for over-line text - $Text = preg_replace("(\[o\](.*?)\[\/o\])ism",'<span class="overline">$1</span>',$Text); + $Text = preg_replace("(\[o\](.*?)\[\/o\])ism", '<span class="overline">$1</span>', $Text); // Check for colored text - $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])ism","<span style=\"color: $1;\">$2</span>",$Text); + $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])ism", "<span style=\"color: $1;\">$2</span>", $Text); // Check for sized text // [size=50] --> font-size: 50px (with the unit). - $Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1px; line-height: initial;\">$2</span>",$Text); - $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1; line-height: initial;\">$2</span>",$Text); + $Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism", "<span style=\"font-size: $1px; line-height: initial;\">$2</span>", $Text); + $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism", "<span style=\"font-size: $1; line-height: initial;\">$2</span>", $Text); // Check for centered text - $Text = preg_replace("(\[center\](.*?)\[\/center\])ism","<div style=\"text-align:center;\">$1</div>",$Text); + $Text = preg_replace("(\[center\](.*?)\[\/center\])ism", "<div style=\"text-align:center;\">$1</div>", $Text); // Check for list text $Text = str_replace("[*]", "<li>", $Text); // Check for style sheet commands - $Text = preg_replace_callback("(\[style=(.*?)\](.*?)\[\/style\])ism","bb_cleanstyle",$Text); + $Text = preg_replace_callback("(\[style=(.*?)\](.*?)\[\/style\])ism", "bb_cleanstyle", $Text); // Check for CSS classes - $Text = preg_replace_callback("(\[class=(.*?)\](.*?)\[\/class\])ism","bb_cleanclass",$Text); + $Text = preg_replace_callback("(\[class=(.*?)\](.*?)\[\/class\])ism", "bb_cleanclass", $Text); // handle nested lists $endlessloop = 0; @@ -964,42 +1037,42 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal ((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) || ((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false)) || ((strpos($Text, "[/li]") !== false) && (strpos($Text, "[li]") !== false))) && (++$endlessloop < 20)) { - $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' ,$Text); - $Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '<ul class="listnone" style="list-style-type: none;">$1</ul>' ,$Text); - $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>' ,$Text); - $Text = preg_replace("/\[list=((?-i)i)\](.*?)\[\/list\]/ism",'<ul class="listlowerroman" style="list-style-type: lower-roman;">$2</ul>' ,$Text); - $Text = preg_replace("/\[list=((?-i)I)\](.*?)\[\/list\]/ism", '<ul class="listupperroman" style="list-style-type: upper-roman;">$2</ul>' ,$Text); - $Text = preg_replace("/\[list=((?-i)a)\](.*?)\[\/list\]/ism", '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$2</ul>' ,$Text); - $Text = preg_replace("/\[list=((?-i)A)\](.*?)\[\/list\]/ism", '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$2</ul>' ,$Text); - $Text = preg_replace("/\[ul\](.*?)\[\/ul\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' ,$Text); - $Text = preg_replace("/\[ol\](.*?)\[\/ol\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>' ,$Text); - $Text = preg_replace("/\[li\](.*?)\[\/li\]/ism", '<li>$1</li>' ,$Text); + $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>', $Text); + $Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '<ul class="listnone" style="list-style-type: none;">$1</ul>', $Text); + $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>', $Text); + $Text = preg_replace("/\[list=((?-i)i)\](.*?)\[\/list\]/ism", '<ul class="listlowerroman" style="list-style-type: lower-roman;">$2</ul>', $Text); + $Text = preg_replace("/\[list=((?-i)I)\](.*?)\[\/list\]/ism", '<ul class="listupperroman" style="list-style-type: upper-roman;">$2</ul>', $Text); + $Text = preg_replace("/\[list=((?-i)a)\](.*?)\[\/list\]/ism", '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$2</ul>', $Text); + $Text = preg_replace("/\[list=((?-i)A)\](.*?)\[\/list\]/ism", '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$2</ul>', $Text); + $Text = preg_replace("/\[ul\](.*?)\[\/ul\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>', $Text); + $Text = preg_replace("/\[ol\](.*?)\[\/ol\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>', $Text); + $Text = preg_replace("/\[li\](.*?)\[\/li\]/ism", '<li>$1</li>', $Text); } - $Text = preg_replace("/\[th\](.*?)\[\/th\]/sm", '<th>$1</th>' ,$Text); - $Text = preg_replace("/\[td\](.*?)\[\/td\]/sm", '<td>$1</td>' ,$Text); - $Text = preg_replace("/\[tr\](.*?)\[\/tr\]/sm", '<tr>$1</tr>' ,$Text); - $Text = preg_replace("/\[table\](.*?)\[\/table\]/sm", '<table>$1</table>' ,$Text); + $Text = preg_replace("/\[th\](.*?)\[\/th\]/sm", '<th>$1</th>', $Text); + $Text = preg_replace("/\[td\](.*?)\[\/td\]/sm", '<td>$1</td>', $Text); + $Text = preg_replace("/\[tr\](.*?)\[\/tr\]/sm", '<tr>$1</tr>', $Text); + $Text = preg_replace("/\[table\](.*?)\[\/table\]/sm", '<table>$1</table>', $Text); - $Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/sm", '<table border="1" >$1</table>' ,$Text); - $Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/sm", '<table border="0" >$1</table>' ,$Text); + $Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/sm", '<table border="1" >$1</table>', $Text); + $Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/sm", '<table border="0" >$1</table>', $Text); - $Text = str_replace('[hr]','<hr />', $Text); + $Text = str_replace('[hr]', '<hr />', $Text); // This is actually executed in prepare_body() - $Text = str_replace('[nosmile]','',$Text); + $Text = str_replace('[nosmile]', '', $Text); // Check for font change text - $Text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm","<span style=\"font-family: $1;\">$2</span>",$Text); + $Text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm", "<span style=\"font-family: $1;\">$2</span>", $Text); // Declare the format for [code] layout -// $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism",'stripcode_br_cb',$Text); +// $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism", 'stripcode_br_cb', $Text); $CodeLayout = '<code>$1</code>'; // Check for [code] text - $Text = preg_replace("/\[code\](.*?)\[\/code\]/ism","$CodeLayout", $Text); + $Text = preg_replace("/\[code\](.*?)\[\/code\]/ism", "$CodeLayout", $Text); // Declare the format for [spoiler] layout $SpoilerLayout = '<blockquote class="spoiler">$1</blockquote>'; @@ -1007,8 +1080,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // Check for [spoiler] text // handle nested quotes $endlessloop = 0; - while ((strpos($Text, "[/spoiler]") !== false) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20)) - $Text = preg_replace("/\[spoiler\](.*?)\[\/spoiler\]/ism","$SpoilerLayout", $Text); + while ((strpos($Text, "[/spoiler]") !== false) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20)) { + $Text = preg_replace("/\[spoiler\](.*?)\[\/spoiler\]/ism", "$SpoilerLayout", $Text); + } // Check for [spoiler=Author] text @@ -1016,10 +1090,11 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // handle nested quotes $endlessloop = 0; - while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20)) + while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20)) { $Text = preg_replace("/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism", "<br /><strong class=".'"spoiler"'.">" . $t_wrote . "</strong><blockquote class=".'"spoiler"'.">$2</blockquote>", $Text); + } // Declare the format for [quote] layout $QuoteLayout = '<blockquote>$1</blockquote>'; @@ -1027,8 +1102,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // Check for [quote] text // handle nested quotes $endlessloop = 0; - while ((strpos($Text, "[/quote]") !== false) and (strpos($Text, "[quote]") !== false) and (++$endlessloop < 20)) - $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism","$QuoteLayout", $Text); + while ((strpos($Text, "[/quote]") !== false) and (strpos($Text, "[quote]") !== false) and (++$endlessloop < 20)) { + $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism", "$QuoteLayout", $Text); + } // Check for [quote=Author] text @@ -1036,10 +1112,11 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // handle nested quotes $endlessloop = 0; - while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20)) + while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20)) { $Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism", "<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote>$2</blockquote>", $Text); + } // [img=widthxheight]image source[/img] @@ -1057,14 +1134,13 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // Shared content $Text = preg_replace_callback("/(.*?)\[share(.*?)\](.*?)\[\/share\]/ism", - function ($match) use ($simplehtml){ - return(bb_ShareAttributes($match, $simplehtml)); - },$Text); - - $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text); - $Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text); - //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text); + function ($match) use ($simplehtml) { + return bb_ShareAttributes($match, $simplehtml); + }, $Text); + $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text); + $Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text); + //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text); // Try to Oembed if ($tryoembed) { @@ -1083,41 +1159,44 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // html5 video and audio - if ($tryoembed) + if ($tryoembed) { $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<iframe src="$1" width="' . $a->videowidth . '" height="' . $a->videoheight . '"><a href="$1">$1</a>', $Text); - else + } else { $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '$1', $Text); + } // Youtube extensions if ($tryoembed) { $Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text); $Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text); - $Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism",'tryoembed',$Text); + $Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism", 'tryoembed', $Text); } - $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); - $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); - $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); - - if ($tryoembed) - $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '', $Text); - else - $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", - 'https://www.youtube.com/watch?v=$1', $Text); + $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $Text); + $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $Text); + $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $Text); if ($tryoembed) { - $Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); - $Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); + $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '', $Text); + } else { + $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", + 'https://www.youtube.com/watch?v=$1', $Text); } - $Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text); - $Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text); + if ($tryoembed) { + $Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism", 'tryoembed', $Text); + $Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism", 'tryoembed', $Text); + } - if ($tryoembed) + $Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $Text); + $Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $Text); + + if ($tryoembed) { $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '', $Text); - else + } else { $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", 'https://vimeo.com/$1', $Text); + } // $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '', $Text); @@ -1132,33 +1211,42 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // Summary (e.g. title) is required, earlier revisions only required description (in addition to // start which is always required). Allow desc with a missing summary for compatibility. - if((x($ev,'desc') || x($ev,'summary')) && x($ev,'start')) { + if ((x($ev, 'desc') || x($ev, 'summary')) && x($ev, 'start')) { $sub = format_event_html($ev, $simplehtml); - $Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism",'',$Text); - $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism",'',$Text); - $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism",$sub,$Text); - $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism",'',$Text); - $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/ism",'',$Text); - $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism",'',$Text); - $Text = preg_replace("/\[event\-id\](.*?)\[\/event\-id\]/ism",'',$Text); + $Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism", '', $Text); + $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism", '', $Text); + $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism", $sub, $Text); + $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism", '', $Text); + $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/ism", '', $Text); + $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism", '', $Text); + $Text = preg_replace("/\[event\-id\](.*?)\[\/event\-id\]/ism", '', $Text); } - //replace oneliner with - $Text = preg_replace_callback("|(?!]*>)([^<]*)(?!]*>)|ism", 'bb_onelinecode_cb', $Text); + // Replace inline code blocks + $Text = preg_replace_callback("|(?!]*>)([^<]*)(?!]*>)|ism", + function ($match) use ($simplehtml) { + $return = '' . $match[1] . ''; + // Use for Diaspora inline code blocks + if ($simplehtml === 3) { + $return = '' . $match[1] . ''; + } + return $return; + } + , $Text); // Unhide all [noparse] contained bbtags unspacefying them // and triming the [noparse] tag. - $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim',$Text); - $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim',$Text); - $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim',$Text); + $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim', $Text); + $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim', $Text); + $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim', $Text); - $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/','&$1;',$Text); - $Text = preg_replace('/\&\#039\;/','\'',$Text); - $Text = preg_replace('/\"\;/','"',$Text); + $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/', '&$1;', $Text); + $Text = preg_replace('/\&\#039\;/', '\'', $Text); + $Text = preg_replace('/\"\;/', '"', $Text); // fix any escaped ampersands that may have been converted into links $Text = preg_replace('/\<([^>]*?)(src|href)=(.*?)\&\;(.*?)\>/ism', '<$1$2=$3&$4>', $Text); @@ -1178,7 +1266,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $regex = '#<([^>]*?)(href)="(?!' . implode('|', $allowed_link_protocols) . ')(.*?)"(.*?)>#ism'; $Text = preg_replace($regex, '<$1$2="javascript:void(0)"$4 class="invalid-href" title="' . t('Invalid link protocol') . '">', $Text); - if($saved_image) { + if ($saved_image) { $Text = bb_replace_images($Text, $saved_image); } @@ -1198,19 +1286,19 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $Text = $doc->saveHTML(); $Text = str_replace(array("", "", $doctype, $encoding), array("", "", "", ""), $Text); - $Text = str_replace('','', $Text); + $Text = str_replace('', '', $Text); //$Text = mb_convert_encoding($Text, "UTF-8", 'HTML-ENTITIES'); } // Clean up some useless linebreaks in lists - //$Text = str_replace('','', $Text); - //$Text = str_replace('','', $Text); - //$Text = str_replace('','', $Text); - // $Text = str_replace('', '', $Text); + //$Text = str_replace('', '', $Text); + //$Text = str_replace('', '', $Text); + //$Text = str_replace(' diff --git a/include/cli_startup.php b/include/cli_startup.php index 4b66b47a0..557d08c28 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -19,7 +19,7 @@ function cli_startup() { require_once("dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); - }; + }; require_once('include/session.php'); diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 56c032847..7069af066 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -9,12 +9,12 @@ function contact_profile_assign($current,$foreign_net) { $o .= "\r\n"; - $r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d", + $r = q("SELECT `id`, `profile-name`, `is-default` FROM `profile` WHERE `uid` = %d", intval($_SESSION['uid'])); if (dbm::is_result($r)) { foreach ($r as $rr) { - $selected = (($rr['id'] == $current) ? " selected=\"selected\" " : ""); + $selected = (($rr['id'] == $current || ($current == 0 && $rr['is-default'] == 1)) ? " selected=\"selected\" " : ""); $o .= "{$rr['profile-name']}\r\n"; } } @@ -37,7 +37,7 @@ function contact_reputation($current) { 5 => t('Reputable, has my trust') ); - foreach($rep as $k => $v) { + foreach ($rep as $k => $v) { $selected = (($k == $current) ? " selected=\"selected\" " : ""); $o .= "$v\r\n"; } @@ -61,7 +61,7 @@ function contact_poll_interval($current, $disabled = false) { 5 => t('Monthly') ); - foreach($rep as $k => $v) { + foreach ($rep as $k => $v) { $selected = (($k == $current) ? " selected=\"selected\" " : ""); $o .= "$v\r\n"; } diff --git a/include/contact_widgets.php b/include/contact_widgets.php index d077a065e..5dd3a8bb4 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -2,7 +2,7 @@ function follow_widget($value = "") { - return replace_macros(get_markup_template('follow.tpl'),array( + return replace_macros(get_markup_template('follow.tpl'), array( '$connect' => t('Add New Contact'), '$desc' => t('Enter address or web location'), '$hint' => t('Example: bob@example.com, http://example.com/barbara'), @@ -13,20 +13,20 @@ function follow_widget($value = "") { } function findpeople_widget() { - require_once('include/Contact.php'); + require_once 'include/Contact.php'; $a = get_app(); - if(get_config('system','invitation_only')) { - $x = get_pconfig(local_user(),'system','invites_remaining'); - if($x || is_site_admin()) { + if (get_config('system', 'invitation_only')) { + $x = get_pconfig(local_user(), 'system', 'invites_remaining'); + if ($x || is_site_admin()) { $a->page['aside'] .= '' - . sprintf( tt('%d invitation available','%d invitations available',$x), $x) + . sprintf( tt('%d invitation available', '%d invitations available', $x), $x) . '' . $inv; } } - return replace_macros(get_markup_template('peoplefind.tpl'),array( + return replace_macros(get_markup_template('peoplefind.tpl'), array( '$findpeople' => t('Find People'), '$desc' => t('Enter name or interest'), '$label' => t('Connect/Follow'), @@ -45,32 +45,41 @@ function unavailable_networks() { $networks = array(); - if (!plugin_enabled("appnet")) + if (!plugin_enabled("appnet")) { $networks[] = NETWORK_APPNET; + } - if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook")) + if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook")) { $networks[] = NETWORK_FACEBOOK; + } - if (!plugin_enabled("statusnet")) + if (!plugin_enabled("statusnet")) { $networks[] = NETWORK_STATUSNET; + } - if (!plugin_enabled("pumpio")) + if (!plugin_enabled("pumpio")) { $networks[] = NETWORK_PUMPIO; + } - if (!plugin_enabled("twitter")) + if (!plugin_enabled("twitter")) { $networks[] = NETWORK_TWITTER; + } - if (get_config("system","ostatus_disabled")) + if (get_config("system", "ostatus_disabled")) { $networks[] = NETWORK_OSTATUS; + } - if (!get_config("system","diaspora_enabled")) + if (!get_config("system", "diaspora_enabled")) { $networks[] = NETWORK_DIASPORA; + } - if (!plugin_enabled("pnut")) + if (!plugin_enabled("pnut")) { $networks[] = NETWORK_PNUT; + } - if (!sizeof($networks)) + if (!sizeof($networks)) { return ""; + } $network_filter = implode("','", $networks); @@ -79,7 +88,7 @@ function unavailable_networks() { return $network_filter; } -function networks_widget($baseurl,$selected = '') { +function networks_widget($baseurl, $selected = '') { $a = get_app(); @@ -87,7 +96,7 @@ function networks_widget($baseurl,$selected = '') { return ''; } - if (!feature_enabled(local_user(),'networks')) { + if (!feature_enabled(local_user(), 'networks')) { return ''; } @@ -99,7 +108,7 @@ function networks_widget($baseurl,$selected = '') { $nets = array(); if (dbm::is_result($r)) { - require_once('include/contact_selectors.php'); + require_once 'include/contact_selectors.php'; foreach ($r as $rr) { /// @TODO If 'network' is not there, this triggers an E_NOTICE if ($rr['network']) { @@ -108,10 +117,11 @@ function networks_widget($baseurl,$selected = '') { } } - if(count($nets) < 2) + if (count($nets) < 2) { return ''; + } - return replace_macros(get_markup_template('nets.tpl'),array( + return replace_macros(get_markup_template('nets.tpl'), array( '$title' => t('Networks'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -122,31 +132,31 @@ function networks_widget($baseurl,$selected = '') { )); } -function fileas_widget($baseurl,$selected = '') { +function fileas_widget($baseurl, $selected = '') { if (! local_user()) { return ''; } - if (! feature_enabled(local_user(),'filing')) { + if (! feature_enabled(local_user(), 'filing')) { return ''; } - $saved = get_pconfig(local_user(),'system','filetags'); + $saved = get_pconfig(local_user(), 'system', 'filetags'); if (! strlen($saved)) { return; } $matches = false; $terms = array(); - $cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { + foreach ($matches as $mtch) { $unescaped = xmlify(file_tag_decode($mtch[1])); - $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); + $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); } } - return replace_macros(get_markup_template('fileas_widget.tpl'),array( + return replace_macros(get_markup_template('fileas_widget.tpl'), array( '$title' => t('Saved Folders'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -157,30 +167,31 @@ function fileas_widget($baseurl,$selected = '') { )); } -function categories_widget($baseurl,$selected = '') { +function categories_widget($baseurl, $selected = '') { $a = get_app(); - if (! feature_enabled($a->profile['profile_uid'],'categories')) { + if (! feature_enabled($a->profile['profile_uid'], 'categories')) { return ''; } - $saved = get_pconfig($a->profile['profile_uid'],'system','filetags'); + $saved = get_pconfig($a->profile['profile_uid'], 'system', 'filetags'); if (! strlen($saved)) { return; } $matches = false; $terms = array(); - $cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER); - if($cnt) { - foreach($matches as $mtch) { - $unescaped = xmlify(file_tag_decode($mtch[1])); - $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); + $cnt = preg_match_all('/<(.*?)>/', $saved, $matches, PREG_SET_ORDER); + + if ($cnt) { + foreach ($matches as $mtch) { + $unescaped = xmlify(file_tag_decode($mtch[1])); + $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); } } - return replace_macros(get_markup_template('categories_widget.tpl'),array( + return replace_macros(get_markup_template('categories_widget.tpl'), array( '$title' => t('Categories'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -195,29 +206,30 @@ function common_friends_visitor_widget($profile_uid) { $a = get_app(); - if(local_user() == $profile_uid) + if (local_user() == $profile_uid) { return; + } $cid = $zcid = 0; - if(is_array($_SESSION['remote'])) { - foreach($_SESSION['remote'] as $visitor) { - if($visitor['uid'] == $profile_uid) { + if (is_array($_SESSION['remote'])) { + foreach ($_SESSION['remote'] as $visitor) { + if ($visitor['uid'] == $profile_uid) { $cid = $visitor['cid']; break; } } } - if(! $cid) { - if(get_my_url()) { + if (! $cid) { + if (get_my_url()) { $r = q("select id from contact where nurl = '%s' and uid = %d limit 1", dbesc(normalise_link(get_my_url())), intval($profile_uid) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $cid = $r[0]['id']; - else { + } else { $r = q("select id from gcontact where nurl = '%s' limit 1", dbesc(normalise_link(get_my_url())) ); @@ -227,22 +239,26 @@ function common_friends_visitor_widget($profile_uid) { } } - if($cid == 0 && $zcid == 0) + if ($cid == 0 && $zcid == 0) { return; + } - require_once('include/socgraph.php'); + require_once 'include/socgraph.php'; - if($cid) - $t = count_common_friends($profile_uid,$cid); - else - $t = count_common_friends_zcid($profile_uid,$zcid); - if(! $t) + if ($cid) { + $t = count_common_friends($profile_uid, $cid); + } else { + $t = count_common_friends_zcid($profile_uid, $zcid); + } + if (! $t) { return; + } - if($cid) - $r = common_friends($profile_uid,$cid,0,5,true); - else - $r = common_friends_zcid($profile_uid,$zcid,0,5,true); + if ($cid) { + $r = common_friends($profile_uid, $cid, 0, 5, true); + } else { + $r = common_friends_zcid($profile_uid, $zcid, 0, 5, true); + } return replace_macros(get_markup_template('remote_friends_common.tpl'), array( '$desc' => sprintf( tt("%d contact in common", "%d contacts in common", $t), $t), diff --git a/include/conversation.php b/include/conversation.php index 93c42cd7b..64204c696 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1,13 +1,15 @@ $new_body, 'images' => $saved_image); }} -if(! function_exists('item_redir_and_replace_images')) { +if (! function_exists('item_redir_and_replace_images')) { function item_redir_and_replace_images($body, $images, $cid) { $origbody = $body; @@ -57,7 +61,7 @@ function item_redir_and_replace_images($body, $images, $cid) { $cnt = 1; $pos = get_bb_tag_pos($origbody, 'url', 1); - while($pos !== false && $cnt < 1000) { + while ($pos !== false && $cnt < 1000) { $search = '/\[url\=(.*?)\]\[!#saved_image([0-9]*)#!\]\[\/url\]' . '/is'; $replace = '[url=' . z_path() . '/redir/' . $cid @@ -66,8 +70,9 @@ function item_redir_and_replace_images($body, $images, $cid) { $newbody .= substr($origbody, 0, $pos['start']['open']); $subject = substr($origbody, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']); $origbody = substr($origbody, $pos['end']['close']); - if($origbody === false) + if ($origbody === false) { $origbody = ''; + } $subject = preg_replace($search, $replace, $subject); $newbody .= $subject; @@ -79,45 +84,51 @@ function item_redir_and_replace_images($body, $images, $cid) { $cnt = 0; foreach ($images as $image) { - // We're depending on the property of 'foreach' (specified on the PHP website) that - // it loops over the array starting from the first element and going sequentially - // to the last element + /* + * We're depending on the property of 'foreach' (specified on the PHP website) that + * it loops over the array starting from the first element and going sequentially + * to the last element. + */ $newbody = str_replace('[!#saved_image' . $cnt . '#!]', '[img]' . $image . '[/img]', $newbody); $cnt++; } return $newbody; }} - - /** * Render actions localized */ -function localize_item(&$item){ +function localize_item(&$item) { $extracted = item_extract_images($item['body']); - if($extracted['images']) + if ($extracted['images']) { $item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']); + } - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - if (activity_match($item['verb'],ACTIVITY_LIKE) - || activity_match($item['verb'],ACTIVITY_DISLIKE) - || activity_match($item['verb'],ACTIVITY_ATTEND) - || activity_match($item['verb'],ACTIVITY_ATTENDNO) - || activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)){ + /// @Separted ??? + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; + if (activity_match($item['verb'], ACTIVITY_LIKE) + || activity_match($item['verb'], ACTIVITY_DISLIKE) + || activity_match($item['verb'], ACTIVITY_ATTEND) + || activity_match($item['verb'], ACTIVITY_ATTENDNO) + || activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) { - $r = q("SELECT * from `item`,`contact` WHERE - `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", - dbesc($item['parent-uri'])); - if (!dbm::is_result($r)) return; - $obj=$r[0]; + /// @TODO may hurt performance + $r = q("SELECT * FROM `item`, `contact` + WHERE `item`.`contact-id`=`contact`.`id` + AND `item`.`uri`='%s'", + dbesc($item['parent-uri'])); + if (!dbm::is_result($r)) { + return; + } + $obj = $r[0]; $author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; $objauthor = '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]'; - switch($obj['verb']){ + switch ($obj['verb']) { case ACTIVITY_POST: - switch ($obj['object-type']){ + switch ($obj['object-type']) { case ACTIVITY_OBJ_EVENT: $post_type = t('event'); break; @@ -126,9 +137,10 @@ function localize_item(&$item){ } break; default: - if($obj['resource-id']){ + if ($obj['resource-id']) { $post_type = t('photo'); - $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); + $m = array(); + preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); $rr['plink'] = $m[1]; } else { $post_type = t('status'); @@ -137,25 +149,25 @@ function localize_item(&$item){ $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; - if(activity_match($item['verb'],ACTIVITY_LIKE)) { + if (activity_match($item['verb'], ACTIVITY_LIKE)) { $bodyverb = t('%1$s likes %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_DISLIKE)) { + elseif (activity_match($item['verb'], ACTIVITY_DISLIKE)) { $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTEND)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTEND)) { $bodyverb = t('%1$s attends %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTENDNO)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTENDNO)) { $bodyverb = t('%1$s doesn\'t attend %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) { $bodyverb = t('%1$s attends maybe %2$s\'s %3$s'); } $item['body'] = sprintf($bodyverb, $author, $objauthor, $plink); } - if (activity_match($item['verb'],ACTIVITY_FRIEND)) { + if (activity_match($item['verb'], ACTIVITY_FRIEND)) { if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return; @@ -169,57 +181,65 @@ function localize_item(&$item){ $Bname = $obj->title; $Blink = ""; $Bphoto = ""; - foreach ($links->link as $l){ + foreach ($links->link as $l) { $atts = $l->attributes(); - switch($atts['rel']){ + switch ($atts['rel']) { case "alternate": $Blink = $atts['href']; case "photo": $Bphoto = $atts['href']; } - } $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; - if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]'; + if ($Bphoto != "") { + $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]'; + } $item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto; } - if (stristr($item['verb'],ACTIVITY_POKE)) { + if (stristr($item['verb'], ACTIVITY_POKE)) { $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); - if(! $verb) + if (! $verb) { return; - if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return; + } + if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) { + return; + } $Aname = $item['author-name']; $Alink = $item['author-link']; - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; $obj = parse_xml_string($xmlhead.$item['object']); $links = parse_xml_string($xmlhead."".unxmlify($obj->link).""); $Bname = $obj->title; - $Blink = ""; $Bphoto = ""; - foreach ($links->link as $l){ + $Blink = ""; + $Bphoto = ""; + foreach ($links->link as $l) { $atts = $l->attributes(); - switch($atts['rel']){ + switch ($atts['rel']) { case "alternate": $Blink = $atts['href']; case "photo": $Bphoto = $atts['href']; } - } $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; - if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]'; + if ($Bphoto != "") { + $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]'; + } - // we can't have a translation string with three positions but no distinguishable text - // So here is the translate string. + /* + * we can't have a translation string with three positions but no distinguishable text + * So here is the translate string. + */ $txt = t('%1$s poked %2$s'); // now translate the verb - $poked_t = trim(sprintf($txt, "","")); + $poked_t = trim(sprintf($txt, "", "")); $txt = str_replace( $poked_t, t($verb), $txt); // then do the sprintf on the translation string @@ -227,10 +247,11 @@ function localize_item(&$item){ $item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto; } - if (stristr($item['verb'],ACTIVITY_MOOD)) { - $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); - if(! $verb) + if (stristr($item['verb'], ACTIVITY_MOOD)) { + $verb = urldecode(substr($item['verb'], strpos($item['verb'], '#') + 1)); + if (! $verb) { return; + } $Aname = $item['author-name']; $Alink = $item['author-link']; @@ -241,19 +262,25 @@ function localize_item(&$item){ $item['body'] = sprintf($txt, $A, t($verb)); } - if (activity_match($item['verb'],ACTIVITY_TAG)) { - $r = q("SELECT * from `item`,`contact` WHERE - `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", - dbesc($item['parent-uri'])); - if (!dbm::is_result($r)) return; - $obj=$r[0]; + if (activity_match($item['verb'], ACTIVITY_TAG)) { + /// @TODO may hurt performance "joining" two tables + asterisk + $r = q("SELECT * FROM `item`, `contact` + WHERE `item`.`contact-id`=`contact`.`id` + AND `item`.`uri`='%s'", + dbesc($item['parent-uri'])); + + if (!dbm::is_result($r)) { + return; + } + + $obj = $r[0]; $author = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]'; $objauthor = '[url=' . zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]'; - switch($obj['verb']){ + switch ($obj['verb']) { case ACTIVITY_POST: - switch ($obj['object-type']){ + switch ($obj['object-type']) { case ACTIVITY_OBJ_EVENT: $post_type = t('event'); break; @@ -262,13 +289,15 @@ function localize_item(&$item){ } break; default: - if($obj['resource-id']){ + if ($obj['resource-id']) { $post_type = t('photo'); $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); $rr['plink'] = $m[1]; } else { $post_type = t('status'); } + // Let's break everthing ... ;-) + break; } $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; @@ -278,22 +307,24 @@ function localize_item(&$item){ $item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag ); } - if (activity_match($item['verb'],ACTIVITY_FAVORITE)){ + if (activity_match($item['verb'], ACTIVITY_FAVORITE)) { - if ($item['object-type']== "") + if ($item['object-type'] == "") { return; + } $Aname = $item['author-name']; $Alink = $item['author-link']; - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; $obj = parse_xml_string($xmlhead.$item['object']); - if(strlen($obj->id)) { - $r = q("select * from item where uri = '%s' and uid = %d limit 1", + if (strlen($obj->id)) { + $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($obj->id), intval($item['uid']) ); + if (dbm::is_result($r) && $r[0]['plink']) { $target = $r[0]; $Bname = $target['author-name']; @@ -302,21 +333,21 @@ function localize_item(&$item){ $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; $P = '[url=' . $target['plink'] . ']' . t('post/item') . '[/url]'; $item['body'] = sprintf( t('%1$s marked %2$s\'s %3$s as favorite'), $A, $B, $P)."\n"; - } } } $matches = null; - if(preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) { - foreach($matches as $mtch) { - if(! strpos($mtch[1],'zrl=')) - $item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']); + if (preg_match_all('/@\[url=(.*?)\]/is', $item['body'], $matches, PREG_SET_ORDER)) { + foreach ($matches as $mtch) { + if (! strpos($mtch[1], 'zrl=')) { + $item['body'] = str_replace($mtch[0], '@[url=' . zrl($mtch[1]) . ']', $item['body']); + } } } // add zrl's to public images $photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is"; - if(preg_match($photo_pattern,$item['body'])) { + if (preg_match($photo_pattern, $item['body'])) { $photo_replace = '[url=' . zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5' . '[/img][/url]'; $item['body'] = bb_tag_preg_replace($photo_pattern, $photo_replace, 'url', $item['body']); } @@ -326,27 +357,26 @@ function localize_item(&$item){ $x = stristr($item['plink'],'/display/'); if ($x) { $sparkle = false; - $y = best_link_url($item,$sparkle,true); + $y = best_link_url($item, $sparkle, true); - if (strstr($y,'/redir/')) { + if (strstr($y, '/redir/')) { $item['plink'] = $y . '?f=&url=' . $item['plink']; } } - - - } /** * Count the total of comments on this item and its desendants + * @TODO proper type-hint + doc-tag */ function count_descendants($item) { $total = count($item['children']); - if($total > 0) { - foreach($item['children'] as $child) { - if(! visible_activity($child)) + if ($total > 0) { + foreach ($item['children'] as $child) { + if (! visible_activity($child)) { $total --; + } $total += count_descendants($child); } } @@ -356,18 +386,19 @@ function count_descendants($item) { function visible_activity($item) { - // likes (etc.) can apply to other things besides posts. Check if they are post children, - // in which case we handle them specially - + /* + * likes (etc.) can apply to other things besides posts. Check if they are post children, + * in which case we handle them specially + */ $hidden_activities = array(ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE); - foreach($hidden_activities as $act) { - if(activity_match($item['verb'],$act)) { + foreach ($hidden_activities as $act) { + if (activity_match($item['verb'], $act)) { return false; } } - if(activity_match($item['verb'],ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) { - if(! (($item['self']) && ($item['uid'] == local_user()))) { + if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) { + if (! (($item['self']) && ($item['uid'] == local_user()))) { return false; } } @@ -379,9 +410,8 @@ function visible_activity($item) { * @brief SQL query for items */ function item_query() { - - return "SELECT ".item_fieldlists()." FROM `item` ". - item_joins()." WHERE ".item_condition(); + return "SELECT " . item_fieldlists() . " FROM `item` " . + item_joins() . " WHERE " . item_condition(); } /** @@ -439,7 +469,6 @@ These Fields are not added below (yet). They are here to for bug search. * @brief SQL join for contacts that are needed for displaying items */ function item_joins() { - return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`) LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` @@ -450,10 +479,10 @@ function item_joins() { * @brief SQL condition for items that are needed for displaying items */ function item_condition() { - return "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`"; } +if (!function_exists('conversation')) { /** * "Render" a conversation or list of items for HTML display. * There are two major forms of display: @@ -464,13 +493,11 @@ function item_condition() { * that are based on unique features of the calling module. * */ - -if(!function_exists('conversation')) { function conversation(App $a, $items, $mode, $update, $preview = false) { - require_once('include/bbcode.php'); - require_once('include/Contact.php'); - require_once('mod/proxy.php'); + require_once 'include/bbcode.php'; + require_once 'include/Contact.php'; + require_once 'mod/proxy.php'; $ssl_state = ((local_user()) ? true : false); @@ -480,100 +507,100 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $arr_blocked = null; - if(local_user()) { - $str_blocked = get_pconfig(local_user(),'system','blocked'); - if($str_blocked) { - $arr_blocked = explode(',',$str_blocked); - for($x = 0; $x < count($arr_blocked); $x ++) + if (local_user()) { + $str_blocked = get_pconfig(local_user(), 'system', 'blocked'); + if ($str_blocked) { + $arr_blocked = explode(',', $str_blocked); + for ($x = 0; $x < count($arr_blocked); $x ++) { $arr_blocked[$x] = trim($arr_blocked[$x]); + } } } $previewing = (($preview) ? ' preview ' : ''); - if($mode === 'network') { + if ($mode === 'network') { $profile_owner = local_user(); $page_writeable = true; - if(!$update) { - // The special div is needed for liveUpdate to kick in for this page. - // We only launch liveUpdate if you aren't filtering in some incompatible - // way and also you aren't writing a comment (discovered in javascript). - + if (!$update) { + /* + * The special div is needed for liveUpdate to kick in for this page. + * We only launch liveUpdate if you aren't filtering in some incompatible + * way and also you aren't writing a comment (discovered in javascript). + */ $live_update_div = '' . "\r\n" . "\r\n"; } - } - else if($mode === 'profile') { + } elseif ($mode === 'profile') { $profile_owner = $a->profile['profile_uid']; $page_writeable = can_write_wall($a,$profile_owner); - if(!$update) { + if (!$update) { $tab = notags(trim($_GET['tab'])); $tab = ( $tab ? $tab : 'posts' ); - if($tab === 'posts') { - // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, - // because browser prefetching might change it on us. We have to deliver it with the page. + if ($tab === 'posts') { + /* + * This is ugly, but we can't pass the profile_uid through the session to the ajax updater, + * because browser prefetching might change it on us. We have to deliver it with the page. + */ $live_update_div = '' . "\r\n" . "\r\n"; } } - } - else if($mode === 'notes') { + } elseif ($mode === 'notes') { $profile_owner = local_user(); $page_writeable = true; - if(!$update) { + if (!$update) { $live_update_div = '' . "\r\n" . "\r\n"; } - } - else if($mode === 'display') { + } elseif ($mode === 'display') { $profile_owner = $a->profile['uid']; $page_writeable = can_write_wall($a,$profile_owner); - if(!$update) { + if (!$update) { $live_update_div = '' . "\r\n" . ""; } - } - else if($mode === 'community') { + } elseif ($mode === 'community') { $profile_owner = 0; $page_writeable = false; - if(!$update) { + if (!$update) { $live_update_div = '' . "\r\n" . "\r\n"; } - } - else if($mode === 'search') { + } elseif ($mode === 'search') { $live_update_div = '' . "\r\n"; } $page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false); - if($update) + if ($update) { $return_url = $_SESSION['return_url']; - else + } else { $return_url = $_SESSION['return_url'] = $a->query_string; + } $cb = array('items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview); call_hooks('conversation_start',$cb); @@ -594,28 +621,32 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $page_template = get_markup_template("conversation.tpl"); - if($items && count($items)) { + if ($items && count($items)) { - if($mode === 'network-new' || $mode === 'search' || $mode === 'community') { + if ($mode === 'network-new' || $mode === 'search' || $mode === 'community') { - // "New Item View" on network page or search page results - // - just loop through the items and format them minimally for display + /* + * "New Item View" on network page or search page results + * - just loop through the items and format them minimally for display + */ -// $tpl = get_markup_template('search_item.tpl'); + /// @TODO old lost code? + // $tpl = get_markup_template('search_item.tpl'); $tpl = 'search_item.tpl'; - foreach($items as $item) { + foreach ($items as $item) { - if($arr_blocked) { + if ($arr_blocked) { $blocked = false; - foreach($arr_blocked as $b) { - if($b && link_compare($item['author-link'],$b)) { + foreach ($arr_blocked as $b) { + if ($b && link_compare($item['author-link'], $b)) { $blocked = true; break; } } - if($blocked) + if ($blocked) { continue; + } } @@ -626,70 +657,76 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $owner_name = ''; $sparkle = ''; - if($mode === 'search' || $mode === 'community') { - if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) + if ($mode === 'search' || $mode === 'community') { + if (((activity_match($item['verb'], ACTIVITY_LIKE)) || (activity_match($item['verb'], ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent'])) continue; $nickname = $item['nickname']; - } - else + } else { $nickname = $a->user['nickname']; + } // prevent private email from leaking. - if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) - continue; + if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { + continue; + } - $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); - if($item['author-link'] && (! $item['author-name'])) + $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); + if ($item['author-link'] && (! $item['author-name'])) { $profile_name = $item['author-link']; + } - - - $tags=array(); + $tags = array(); $hashtags = array(); $mentions = array(); $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`", intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION)); - foreach($taglist as $tag) { + foreach ($taglist as $tag) { - if ($tag["url"] == "") - $tag["url"] = $searchpath.strtolower($tag["term"]); + if ($tag["url"] == "") { + $tag["url"] = $searchpath . strtolower($tag["term"]); + } if ($tag["type"] == TERM_HASHTAG) { - $hashtags[] = "#".$tag["term"].""; + $hashtags[] = "#" . $tag["term"] . ""; $prefix = "#"; } elseif ($tag["type"] == TERM_MENTION) { - $mentions[] = "@".$tag["term"].""; + $mentions[] = "@" . $tag["term"] . ""; $prefix = "@"; } - $tags[] = $prefix."".$tag["term"].""; + $tags[] = $prefix."" . $tag["term"] . ""; } $sp = false; $profile_link = best_link_url($item,$sp); - if($profile_link === 'mailbox') + if ($profile_link === 'mailbox') { $profile_link = ''; - if($sp) - $sparkle = ' sparkle'; - else - $profile_link = zrl($profile_link); + } - if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) { + if ($sp) { + $sparkle = ' sparkle'; + } else { + $profile_link = zrl($profile_link); + } + + if (!x($item, 'author-thumb') OR ($item['author-thumb'] == "")) { $author_contact = get_contact_details_by_url($item['author-link'], $profile_owner); - if ($author_contact["thumb"]) + if ($author_contact["thumb"]) { $item['author-thumb'] = $author_contact["thumb"]; - else + } else { $item['author-thumb'] = $item['author-avatar']; + } } if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) { $owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner); - if ($owner_contact["thumb"]) + if ($owner_contact["thumb"]) { $item['owner-thumb'] = $owner_contact["thumb"]; - else + } else { $item['owner-thumb'] = $item['owner-avatar']; + } } $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); @@ -698,11 +735,11 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate)); localize_item($item); - if($mode === 'network-new') + if ($mode === 'network-new') { $dropping = true; - else + } else { $dropping = false; - + } $drop = array( 'dropping' => $dropping, @@ -718,12 +755,11 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $likebuttons = false; $shareable = false; - $body = prepare_body($item,true, $preview); - + $body = prepare_body($item, true, $preview); list($categories, $folders) = get_cats_and_terms($item); - if($a->theme['template_engine'] === 'internal') { + if ($a->theme['template_engine'] === 'internal') { $profile_name_e = template_escape($profile_name); $item['title_e'] = template_escape($item['title']); $body_e = template_escape($body); @@ -732,8 +768,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $mentions_e = template_escape($mentions); $location_e = template_escape($location); $owner_name_e = template_escape($owner_name); - } - else { + } else { $profile_name_e = $profile_name; $item['title_e'] = $item['title']; $body_e = $body; @@ -744,8 +779,9 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $owner_name_e = $owner_name; } - if ($item['item_network'] == "") + if ($item['item_network'] == "") { $item['item_network'] = $item['network']; + } $tmp_item = array( 'template' => $tpl, @@ -802,47 +838,45 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $threads[$threadsid]['items'] = array($arr['output']); } - } - else - { + } else { // Normal View $page_template = get_markup_template("threaded_conversation.tpl"); - require_once('object/Conversation.php'); - require_once('object/Item.php'); + require_once 'object/Conversation.php'; + require_once 'object/Item.php'; $conv = new Conversation($mode, $preview); - // get all the topmost parents - // this shouldn't be needed, as we should have only them in our array - // But for now, this array respects the old style, just in case - + /* + * get all the topmost parents + * this shouldn't be needed, as we should have only them in our array + * But for now, this array respects the old style, just in case + */ $threads = array(); - foreach($items as $item) { + foreach ($items as $item) { - if($arr_blocked) { + if ($arr_blocked) { $blocked = false; - foreach($arr_blocked as $b) { - - if($b && link_compare($item['author-link'],$b)) { + foreach ($arr_blocked as $b) { + if ($b && link_compare($item['author-link'], $b)) { $blocked = true; break; } } - if($blocked) + if ($blocked) { continue; + } } - - // Can we put this after the visibility check? builtin_activity_puller($item, $conv_responses); // Only add what is visible - if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { + if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { continue; } - if(! visible_activity($item)) { + + if (! visible_activity($item)) { continue; } @@ -850,7 +884,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $item['pagedrop'] = $page_dropping; - if($item['id'] == $item['parent']) { + if ($item['id'] == $item['parent']) { $item_object = new Item($item); $conv->add_thread($item_object); } @@ -858,7 +892,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $threads = $conv->get_template_data($conv_responses); - if(!$threads) { + if (!$threads) { logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG); $threads = array(); } @@ -873,13 +907,13 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { '$mode' => $mode, '$user' => $a->user, '$threads' => $threads, - '$dropping' => ($page_dropping && feature_enabled(local_user(),'multi_delete') ? t('Delete Selected Items') : False), + '$dropping' => ($page_dropping && feature_enabled(local_user(), 'multi_delete') ? t('Delete Selected Items') : False), )); return $o; }} -function best_link_url($item,&$sparkle,$ssl_state = false) { +function best_link_url($item, &$sparkle, $ssl_state = false) { $best_url = ''; $sparkle = false; @@ -889,16 +923,17 @@ function best_link_url($item,&$sparkle,$ssl_state = false) { if (local_user()) { $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' AND NOT `pending` LIMIT 1", dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url))); - if ($r) { - $best_url = 'redir/'.$r[0]['id']; + if (dbm::is_result($r)) { + $best_url = 'redir/' . $r[0]['id']; $sparkle = true; } } - if(! $best_url) { - if(strlen($item['author-link'])) + if (! $best_url) { + if (strlen($item['author-link'])) { $best_url = $item['author-link']; - else + } else { $best_url = $item['url']; + } } return $best_url; @@ -906,11 +941,10 @@ function best_link_url($item,&$sparkle,$ssl_state = false) { if (! function_exists('item_photo_menu')) { -function item_photo_menu($item) -{ +function item_photo_menu($item) { $ssl_state = false; - if(local_user()) { + if (local_user()) { $ssl_state = true; } @@ -938,13 +972,13 @@ function item_photo_menu($item) $rel = 0; $r = q("SELECT `id`, `network`, `rel` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1", intval(local_user()), dbesc(normalise_link($item['author-link']))); - if ($r) { + if (dbm::is_result($r)) { $cid = $r[0]['id']; $network = $r[0]['network']; $rel = $r[0]['rel']; } - if($sparkle) { + if ($sparkle) { $status_link = $profile_link . '?url=status'; $photos_link = $profile_link . '?url=photos'; $profile_link = $profile_link . '?url=profile'; @@ -964,7 +998,7 @@ function item_photo_menu($item) } if (local_user()) { - $menu = Array( + $menu = array( t('Follow Thread') => $sub_link, t('View Status') => $status_link, t('View Profile') => $profile_link, @@ -1004,6 +1038,7 @@ function item_photo_menu($item) return $o; }} +if (! function_exists('builtin_activity_puller')) { /** * @brief Checks item to see if it is one of the builtin activities (like/dislike, event attendance, consensus items, etc.) * Increments the count of each matching activity and adds a link to the author as needed. @@ -1012,13 +1047,12 @@ function item_photo_menu($item) * @param array &$conv_responses (already created with builtin activity structure) * @return void */ -if(! function_exists('builtin_activity_puller')) { function builtin_activity_puller($item, &$conv_responses) { - foreach($conv_responses as $mode => $v) { + foreach ($conv_responses as $mode => $v) { $url = ''; $sparkle = ''; - switch($mode) { + switch ($mode) { case 'like': $verb = ACTIVITY_LIKE; break; @@ -1039,32 +1073,36 @@ function builtin_activity_puller($item, &$conv_responses) { break; } - if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { + if ((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { $url = $item['author-link']; - if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) { + if ((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'], $item['url']))) { $url = 'redir/' . $item['contact-id']; $sparkle = ' class="sparkle" '; - } - else + } else { $url = zrl($url); + } $url = '' . htmlentities($item['author-name']) . ''; - if(! $item['thr-parent']) + if (! $item['thr-parent']) { $item['thr-parent'] = $item['parent-uri']; + } - if(! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l'])) - && (is_array($conv_responses[$mode][$item['thr-parent'] . '-l'])))) + if (! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l'])) + && (is_array($conv_responses[$mode][$item['thr-parent'] . '-l'])))) { $conv_responses[$mode][$item['thr-parent'] . '-l'] = array(); + } // only list each unique author once - if(in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) + if (in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) { continue; + } - if(! isset($conv_responses[$mode][$item['thr-parent']])) + if (! isset($conv_responses[$mode][$item['thr-parent']])) { $conv_responses[$mode][$item['thr-parent']] = 1; - else + } else { $conv_responses[$mode][$item['thr-parent']] ++; + } if (public_contact() == $item['author-id']) { $conv_responses[$mode][$item['thr-parent'] . '-self'] = 1; @@ -1078,24 +1116,25 @@ function builtin_activity_puller($item, &$conv_responses) { } }} -// Format the vote text for a profile item -// $cnt = number of people who vote the item -// $arr = array of pre-linked names of likers/dislikers -// $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe' -// $id = item id -// returns formatted text - -if(! function_exists('format_like')) { -function format_like($cnt,$arr,$type,$id) { +if (! function_exists('format_like')) { +/** + * Format the vote text for a profile item + * @param int $cnt = number of people who vote the item + * @param array $arr = array of pre-linked names of likers/dislikers + * @param string $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe' + * @param int $id = item id + * @return formatted text + */ +function format_like($cnt, array $arr, $type, $id) { $o = ''; $expanded = ''; - if($cnt == 1) { + if ($cnt == 1) { $likers = $arr[0]; // Phrase if there is only one liker. In other cases it will be uses for the expanded // list which show all likers - switch($type) { + switch ($type) { case 'like' : $phrase = sprintf( t('%s likes this.'), $likers); break; @@ -1114,16 +1153,17 @@ function format_like($cnt,$arr,$type,$id) { } } - if($cnt > 1) { + if ($cnt > 1) { $total = count($arr); - if($total >= MAX_LIKERS) + if ($total >= MAX_LIKERS) { $arr = array_slice($arr, 0, MAX_LIKERS - 1); - if($total < MAX_LIKERS) { + } + if ($total < MAX_LIKERS) { $last = t('and') . ' ' . $arr[count($arr)-1]; $arr2 = array_slice($arr, 0, -1); $str = implode(', ', $arr2) . ' ' . $last; } - if($total >= MAX_LIKERS) { + if ($total >= MAX_LIKERS) { $str = implode(', ', $arr); $str .= sprintf( t(', and %d other people'), $total - MAX_LIKERS ); } @@ -1132,7 +1172,7 @@ function format_like($cnt,$arr,$type,$id) { $spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\""; - switch($type) { + switch ($type) { case 'like': $phrase = sprintf( t('%2$d people like this'), $spanatts, $cnt); $explikers = sprintf( t('%s like this.'), $likers); @@ -1169,11 +1209,10 @@ function format_like($cnt,$arr,$type,$id) { return $o; }} - -function status_editor($a,$x, $notes_cid = 0, $popup=false) { +function status_editor(App $a, $x, $notes_cid = 0, $popup = false) { $o = ''; - $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); + $geotag = (x($x, 'allow_location') ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); $tpl = get_markup_template('jot-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array( @@ -1211,24 +1250,27 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { // Private/public post links for the non-JS ACL form $private_post = 1; - if($_REQUEST['public']) + if (x($_REQUEST, 'public')) { $private_post = 0; + } $query_str = $a->query_string; - if(strpos($query_str, 'public=1') !== false) + if (strpos($query_str, 'public=1') !== false) { $query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str); + } - // I think $a->query_string may never have ? in it, but I could be wrong - // It looks like it's from the index.php?q=[etc] rewrite that the web - // server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61 - if(strpos($query_str, '?') === false) + /* + * I think $a->query_string may never have ? in it, but I could be wrong + * It looks like it's from the index.php?q=[etc] rewrite that the web + * server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61 + */ + if (strpos($query_str, '?') === false) { $public_post_link = '?public=1'; - else + } else { $public_post_link = '&public=1'; + } - - -// $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); + // $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); $tpl = get_markup_template("jot.tpl"); $o .= replace_macros($tpl,array( @@ -1252,7 +1294,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$title' => $x['title'], '$placeholdertitle' => t('Set title'), '$category' => $x['category'], - '$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''), + '$placeholdercategory' => (feature_enabled(local_user(), 'categories') ? t('Categories (comma-separated list)') : ''), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$shortpermset' => t('permissions'), @@ -1290,9 +1332,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { )); - if ($popup==true){ + if ($popup == true) { $o = ''.$o.''; - } return $o; @@ -1302,20 +1343,20 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { function get_item_children($arr, $parent) { $children = array(); $a = get_app(); - foreach($arr as $item) { - if($item['id'] != $item['parent']) { - if(get_config('system','thread_allow') && $a->theme_thread_allow) { + foreach ($arr as $item) { + if ($item['id'] != $item['parent']) { + if (get_config('system', 'thread_allow') && $a->theme_thread_allow) { // Fallback to parent-uri if thr-parent is not set $thr_parent = $item['thr-parent']; - if($thr_parent == '') + if ($thr_parent == '') { $thr_parent = $item['parent-uri']; + } - if($thr_parent == $parent['uri']) { + if ($thr_parent == $parent['uri']) { $item['children'] = get_item_children($arr, $item); $children[] = $item; } - } - else if($item['parent'] == $parent['id']) { + } elseif ($item['parent'] == $parent['id']) { $children[] = $item; } } @@ -1323,66 +1364,82 @@ function get_item_children($arr, $parent) { return $children; } +/// @TODO Add type-hint function sort_item_children($items) { $result = $items; - usort($result,'sort_thr_created_rev'); - foreach($result as $k => $i) { - if(count($result[$k]['children'])) { + usort($result, 'sort_thr_created_rev'); + foreach ($result as $k => $i) { + if (count($result[$k]['children'])) { $result[$k]['children'] = sort_item_children($result[$k]['children']); } } return $result; } +/// @TODO Add type-hint function add_children_to_list($children, &$arr) { - foreach($children as $y) { + foreach ($children as $y) { $arr[] = $y; - if(count($y['children'])) + if (count($y['children'])) { add_children_to_list($y['children'], $arr); + } } } -function conv_sort($arr,$order) { +/// @TODO Add type-hint +function conv_sort($arr, $order) { - if((!(is_array($arr) && count($arr)))) + if ((!(is_array($arr) && count($arr)))) { return array(); + } $parents = array(); $children = array(); $newarr = array(); - // This is a preparation for having two different items with the same uri in one thread - // This will otherwise lead to an endless loop. - foreach($arr as $x) - if (!isset($newarr[$x['uri']])) + /* + * This is a preparation for having two different items with the same uri in one thread + * This will otherwise lead to an endless loop. + */ + foreach ($arr as $x) { + if (!isset($newarr[$x['uri']])) { $newarr[$x['uri']] = $x; + } + } $arr = $newarr; - foreach($arr as $x) - if($x['id'] == $x['parent']) - $parents[] = $x; + foreach ($arr as $x) { + if ($x['id'] == $x['parent']) { + $parents[] = $x; + } + } - if(stristr($order,'created')) - usort($parents,'sort_thr_created'); - elseif(stristr($order,'commented')) - usort($parents,'sort_thr_commented'); + if (stristr($order, 'created')) { + usort($parents, 'sort_thr_created'); + } elseif (stristr($order, 'commented')) { + usort($parents, 'sort_thr_commented'); + } - if(count($parents)) - foreach($parents as $i=>$_x) + if (count($parents)) { + foreach ($parents as $i => $_x) { $parents[$i]['children'] = get_item_children($arr, $_x); + } + } - /*foreach($arr as $x) { - if($x['id'] != $x['parent']) { + /// @TODO Old-lost code? + /*foreach ($arr as $x) { + if ($x['id'] != $x['parent']) { $p = find_thread_parent_index($parents,$x); - if($p !== false) + if ($p !== false) $parents[$p]['children'][] = $x; } }*/ - if(count($parents)) { - foreach($parents as $k => $v) { - if(count($parents[$k]['children'])) { + if (count($parents)) { + foreach ($parents as $k => $v) { + if (count($parents[$k]['children'])) { $parents[$k]['children'] = sort_item_children($parents[$k]['children']); + /// @TODO Old-lost code? /*$y = $parents[$k]['children']; usort($y,'sort_thr_created_rev'); $parents[$k]['children'] = $y;*/ @@ -1391,92 +1448,103 @@ function conv_sort($arr,$order) { } $ret = array(); - if(count($parents)) { - foreach($parents as $x) { + if (count($parents)) { + foreach ($parents as $x) { $ret[] = $x; - if(count($x['children'])) + if (count($x['children'])) { add_children_to_list($x['children'], $ret); - /*foreach($x['children'] as $y) + /// @TODO Old-lost code? + /*foreach ($x['children'] as $y) $ret[] = $y;*/ + } } } return $ret; } - -function sort_thr_created($a,$b) { - return strcmp($b['created'],$a['created']); +/// @TODO Add type-hint +function sort_thr_created($a, $b) { + return strcmp($b['created'], $a['created']); } -function sort_thr_created_rev($a,$b) { - return strcmp($a['created'],$b['created']); +/// @TODO Add type-hint +function sort_thr_created_rev($a, $b) { + return strcmp($a['created'], $b['created']); } -function sort_thr_commented($a,$b) { - return strcmp($b['commented'],$a['commented']); +/// @TODO Add type-hint +function sort_thr_commented($a, $b) { + return strcmp($b['commented'], $a['commented']); } -function find_thread_parent_index($arr,$x) { - foreach($arr as $k => $v) - if($v['id'] == $x['parent']) +/// @TODO Add type-hint +function find_thread_parent_index($arr, $x) { + foreach ($arr as $k => $v) { + if ($v['id'] == $x['parent']) { return $k; + } + } return false; } +/// @TODO Add type-hint function render_location_dummy($item) { - if ($item['location'] != "") + if ($item['location'] != "") { return $item['location']; + } - if ($item['coord'] != "") + if ($item['coord'] != "") { return $item['coord']; + } } -function get_responses($conv_responses,$response_verbs,$ob,$item) { +/// @TODO Add type-hint +function get_responses($conv_responses, $response_verbs, $ob, $item) { $ret = array(); - foreach($response_verbs as $v) { + foreach ($response_verbs as $v) { $ret[$v] = array(); - $ret[$v]['count'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri']] : ''); - $ret[$v]['list'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : ''); - $ret[$v]['self'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0'); - if(count($ret[$v]['list']) > MAX_LIKERS) { + $ret[$v]['count'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri']] : ''); + $ret[$v]['list'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : ''); + $ret[$v]['self'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0'); + if (count($ret[$v]['list']) > MAX_LIKERS) { $ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS); array_push($ret[$v]['list_part'], '' . t('View all') . ''); - } - else { + } else { $ret[$v]['list_part'] = ''; } - $ret[$v]['button'] = get_response_button_text($v,$ret[$v]['count']); + $ret[$v]['button'] = get_response_button_text($v, $ret[$v]['count']); $ret[$v]['title'] = $conv_responses[$v]['title']; } $count = 0; - foreach($ret as $key) { - if ($key['count'] == true) + foreach ($ret as $key) { + if ($key['count'] == true) { $count++; + } } $ret['count'] = $count; return $ret; } -function get_response_button_text($v,$count) { - switch($v) { +function get_response_button_text($v, $count) { + switch ($v) { case 'like': - return tt('Like','Likes',$count,'noun'); + return tt('Like', 'Likes', $count, 'noun'); break; case 'dislike': - return tt('Dislike','Dislikes',$count,'noun'); + return tt('Dislike', 'Dislikes', $count, 'noun'); break; case 'attendyes': - return tt('Attending','Attending',$count,'noun'); + return tt('Attending', 'Attending', $count, 'noun'); break; case 'attendno': - return tt('Not Attending','Not Attending',$count,'noun'); + return tt('Not Attending', 'Not Attending', $count, 'noun'); break; case 'attendmaybe': - return tt('Undecided','Undecided',$count,'noun'); + return tt('Undecided', 'Undecided', $count, 'noun'); break; } } diff --git a/include/cron.php b/include/cron.php index 58a3fcf9c..c4299dd4c 100644 --- a/include/cron.php +++ b/include/cron.php @@ -4,7 +4,7 @@ use \Friendica\Core\Config; function cron_run(&$argv, &$argc){ global $a; - require_once('include/datetime.php'); + require_once 'include/datetime.php'; // Poll contacts with specific parameters if ($argc > 1) { @@ -12,15 +12,16 @@ function cron_run(&$argv, &$argc){ return; } - $last = get_config('system','last_cron'); + $last = get_config('system', 'last_cron'); - $poll_interval = intval(get_config('system','cron_interval')); + $poll_interval = intval(get_config('system', 'cron_interval')); if (! $poll_interval) { $poll_interval = 10; } + if ($last) { $next = $last + ($poll_interval * 60); - if($next > time()) { + if ($next > time()) { logger('cron intervall not reached'); return; } @@ -62,10 +63,10 @@ function cron_run(&$argv, &$argc){ proc_run(PRIORITY_LOW, "include/cronjobs.php", "repair_database"); // once daily run birthday_updates and then expire in background - $d1 = get_config('system','last_expire_day'); - $d2 = intval(datetime_convert('UTC','UTC','now','d')); + $d1 = get_config('system', 'last_expire_day'); + $d2 = intval(datetime_convert('UTC', 'UTC', 'now', 'd')); - if($d2 != intval($d1)) { + if ($d2 != intval($d1)) { proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_contact_birthdays"); @@ -73,7 +74,7 @@ function cron_run(&$argv, &$argc){ proc_run(PRIORITY_LOW, "include/discover_poco.php", "suggestions"); - set_config('system','last_expire_day',$d2); + set_config('system', 'last_expire_day', $d2); proc_run(PRIORITY_LOW, 'include/expire.php'); @@ -87,7 +88,7 @@ function cron_run(&$argv, &$argc){ logger('cron: end'); - set_config('system','last_cron', time()); + set_config('system', 'last_cron', time()); return; } @@ -130,7 +131,7 @@ function cron_poll_contacts($argc, $argv) { // and which have a polling address and ignore Diaspora since // we are unable to match those posts with a Diaspora GUID and prevent duplicates. - $abandon_days = intval(get_config('system','account_abandon_days')); + $abandon_days = intval(get_config('system', 'account_abandon_days')); if ($abandon_days < 1) { $abandon_days = 0; } @@ -156,7 +157,7 @@ function cron_poll_contacts($argc, $argv) { dbesc(NETWORK_MAIL2) ); - if (!count($contacts)) { + if (!dbm::is_result($contacts)) { return; } @@ -170,7 +171,7 @@ function cron_poll_contacts($argc, $argv) { continue; } - foreach($res as $contact) { + foreach ($res as $contact) { $xml = false; @@ -183,49 +184,48 @@ function cron_poll_contacts($argc, $argv) { } if ($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) { - // We should be getting everything via a hub. But just to be sure, let's check once a day. - // (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately) - // This also lets us update our subscription to the hub, and add or replace hubs in case it - // changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. - - $poll_interval = get_config('system','pushpoll_frequency'); + /* + * We should be getting everything via a hub. But just to be sure, let's check once a day. + * (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately) + * This also lets us update our subscription to the hub, and add or replace hubs in case it + * changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. + */ + $poll_interval = get_config('system', 'pushpoll_frequency'); $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3); } - if($contact['priority'] AND !$force) { - - $update = false; + if ($contact['priority'] AND !$force) { + $update = false; $t = $contact['last-update']; - /** + /* * Based on $contact['priority'], should we poll this site now? Or later? */ - switch ($contact['priority']) { case 5: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 month")) { $update = true; } break; case 4: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 week")) { $update = true; } break; case 3: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day")) { $update = true; } break; case 2: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 12 hour")) { $update = true; } break; case 1: default: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 hour")) { $update = true; } break; @@ -235,7 +235,7 @@ function cron_poll_contacts($argc, $argv) { } } - logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]); + logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact["nick"] . " " . $contact["name"]); if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) { proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', intval($contact['id'])); diff --git a/include/cronhooks.php b/include/cronhooks.php index bea0f6a19..a519dee22 100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php @@ -2,43 +2,45 @@ use \Friendica\Core\Config; -function cronhooks_run(&$argv, &$argc){ +function cronhooks_run(&$argv, &$argc) { global $a; - require_once('include/datetime.php'); + require_once 'include/datetime.php'; if (($argc == 2) AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) { - foreach ($a->hooks["cron"] as $hook) + foreach ($a->hooks["cron"] as $hook) { if ($hook[1] == $argv[1]) { - logger("Calling cron hook '".$hook[1]."'", LOGGER_DEBUG); + logger("Calling cron hook '" . $hook[1] . "'", LOGGER_DEBUG); call_single_hook($a, $name, $hook, $data); } + } return; } $last = get_config('system', 'last_cronhook'); - $poll_interval = intval(get_config('system','cronhook_interval')); - if(! $poll_interval) + $poll_interval = intval(get_config('system', 'cronhook_interval')); + if (! $poll_interval) { $poll_interval = 9; + } - if($last) { + if ($last) { $next = $last + ($poll_interval * 60); - if($next > time()) { + if ($next > time()) { logger('cronhook intervall not reached'); return; } } - $a->set_baseurl(get_config('system','url')); + $a->set_baseurl(get_config('system', 'url')); logger('cronhooks: start'); $d = datetime_convert(); if (is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) { - foreach ($a->hooks["cron"] as $hook) { - logger("Calling cronhooks for '".$hook[1]."'", LOGGER_DEBUG); + foreach ($a->hooks["cron"] as $hook) { + logger("Calling cronhooks for '" . $hook[1] . "'", LOGGER_DEBUG); proc_run(PRIORITY_MEDIUM, "include/cronhooks.php", $hook[1]); } } diff --git a/include/datetime.php b/include/datetime.php index 9e1d4b55c..da454a32a 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -14,13 +14,20 @@ use \Friendica\Core\Config; * @return int */ function timezone_cmp($a, $b) { - if(strstr($a,'/') && strstr($b,'/')) { - if ( t($a) == t($b)) return 0; + if (strstr($a, '/') && strstr($b, '/')) { + if ( t($a) == t($b)) { + return 0; + } return ( t($a) < t($b)) ? -1 : 1; } - if(strstr($a,'/')) return -1; - if(strstr($b,'/')) return 1; - if ( t($a) == t($b)) return 0; + + if (strstr($a, '/')) { + return -1; + } elseif (strstr($b, '/')) { + return 1; + } elseif ( t($a) == t($b)) { + return 0; + } return ( t($a) < t($b)) ? -1 : 1; } @@ -39,23 +46,24 @@ function select_timezone($current = 'America/Los_Angeles') { usort($timezone_identifiers, 'timezone_cmp'); $continent = ''; - foreach($timezone_identifiers as $value) { + foreach ($timezone_identifiers as $value) { $ex = explode("/", $value); - if(count($ex) > 1) { - if($ex[0] != $continent) { - if($continent != '') + if (count($ex) > 1) { + if ($ex[0] != $continent) { + if ($continent != '') { $o .= ''; + } $continent = $ex[0]; $o .= ''; } - if(count($ex) > 2) + if (count($ex) > 2) { $city = substr($value,strpos($value,'/')+1); - else + } else { $city = $ex[1]; - } - else { + } + } else { $city = $ex[0]; - if($continent != t('Miscellaneous')) { + if ($continent != t('Miscellaneous')) { $o .= ''; $continent = t('Miscellaneous'); $o .= ''; @@ -114,48 +122,50 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d // Defaults to UTC if nothing is set, but throws an exception if set to empty string. // Provide some sane defaults regardless. - if($from === '') + if ($from === '') { $from = 'UTC'; - if($to === '') + } + if ($to === '') { $to = 'UTC'; - if( ($s === '') || (! is_string($s)) ) + } + if ( ($s === '') || (! is_string($s)) ) { $s = 'now'; + } - // Slight hackish adjustment so that 'zero' datetime actually returns what is intended - // otherwise we end up with -0001-11-30 ... - // add 32 days so that we at least get year 00, and then hack around the fact that - // months and days always start with 1. + /* + * Slight hackish adjustment so that 'zero' datetime actually returns what is intended + * otherwise we end up with -0001-11-30 ... + * add 32 days so that we at least get year 00, and then hack around the fact that + * months and days always start with 1. + */ - if(substr($s,0,10) == '0000-00-00') { + if (substr($s,0,10) <= '0001-01-01') { $d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC')); return str_replace('1','0',$d->format($fmt)); } try { $from_obj = new DateTimeZone($from); - } - catch(Exception $e) { + } catch (Exception $e) { $from_obj = new DateTimeZone('UTC'); } try { $d = new DateTime($s, $from_obj); - } - catch(Exception $e) { + } catch (Exception $e) { logger('datetime_convert: exception: ' . $e->getMessage()); $d = new DateTime('now', $from_obj); } try { $to_obj = new DateTimeZone($to); - } - catch(Exception $e) { + } catch (Exception $e) { $to_obj = new DateTimeZone('UTC'); } $d->setTimeZone($to_obj); - return($d->format($fmt)); + return $d->format($fmt); } @@ -169,12 +179,14 @@ function dob($dob) { list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d'); $f = get_config('system','birthday_input_format'); - if(! $f) + if (! $f) { $f = 'ymd'; - if($dob === '0000-00-00') + } + if ($dob <= '0001-01-01') { $value = ''; - else + } else { $value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d')); + } $age = ((intval($value)) ? age($value, $a->user["timezone"], $a->user["timezone"]) : ""); @@ -189,7 +201,8 @@ function dob($dob) { ) )); -// if ($dob && $dob != '0000-00-00') + /// @TODO Old-lost code? +// if ($dob && $dob > '0001-01-01') // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob'); // else // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),false,'dob'); @@ -214,7 +227,7 @@ function dob($dob) { * @return string Parsed HTML output. */ function datesel($format, $min, $max, $default, $id = 'datepicker') { - return datetimesel($format,$min,$max,$default,'',$id,true,false, '',''); + return datetimesel($format, $min, $max, $default, '', $id, true, false, '', ''); } /** @@ -231,8 +244,8 @@ function datesel($format, $min, $max, $default, $id = 'datepicker') { * * @return string Parsed HTML output. */ -function timesel($format, $h, $m, $id='timepicker') { - return datetimesel($format,new DateTime(),new DateTime(),new DateTime("$h:$m"),'',$id,false,true); +function timesel($format, $h, $m, $id = 'timepicker') { + return datetimesel($format, new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true); } /** @@ -267,7 +280,9 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke // First day of the week (0 = Sunday) $firstDay = get_pconfig(local_user(),'system','first_day_of_week'); - if ($firstDay === false) $firstDay=0; + if ($firstDay === false) { + $firstDay=0; + } $lang = substr(get_browser_language(), 0, 2); @@ -279,9 +294,15 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $o = ''; $dateformat = ''; - if($pickdate) $dateformat .= 'Y-m-d'; - if($pickdate && $picktime) $dateformat .= ' '; - if($picktime) $dateformat .= 'H:i'; + if ($pickdate) { + $dateformat .= 'Y-m-d'; + } + if ($pickdate && $picktime) { + $dateformat .= ' '; + } + if ($picktime) { + $dateformat .= 'H:i'; + } $minjs = $min ? ",minDate: new Date({$min->getTimestamp()}*1000), yearStart: " . $min->format('Y') : ''; $maxjs = $max ? ",maxDate: new Date({$max->getTimestamp()}*1000), yearEnd: " . $max->format('Y') : ''; @@ -290,15 +311,21 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $defaultdatejs = $default ? ",defaultDate: new Date({$default->getTimestamp()}*1000)" : ''; $pickers = ''; - if(!$pickdate) $pickers .= ',datepicker: false'; - if(!$picktime) $pickers .= ',timepicker: false'; + if (!$pickdate) { + $pickers .= ',datepicker: false'; + } + if (!$picktime) { + $pickers .= ',timepicker: false'; + } $extra_js = ''; $pickers .= ",dayOfWeekStart: ".$firstDay.",lang:'".$lang."'"; - if($minfrom != '') + if ($minfrom != '') { $extra_js .= "\$('#id_$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})"; - if($maxfrom != '') + } + if ($maxfrom != '') { $extra_js .= "\$('#id_$maxfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({maxDate: currentDateTime})}})"; + } $readable_format = $dateformat; $readable_format = str_replace('Y','yyyy',$readable_format); @@ -393,13 +420,16 @@ function relative_date($posted_date, $format = null) { * * @return int Age in years */ -function age($dob,$owner_tz = '',$viewer_tz = '') { - if(! intval($dob)) +function age($dob, $owner_tz = '', $viewer_tz = '') { + if (! intval($dob)) { return 0; - if(! $owner_tz) + } + if (! $owner_tz) { $owner_tz = date_default_timezone_get(); - if(! $viewer_tz) + } + if (! $viewer_tz) { $viewer_tz = date_default_timezone_get(); + } $birthdate = datetime_convert('UTC',$owner_tz,$dob . ' 00:00:00+00:00','Y-m-d'); list($year,$month,$day) = explode("-",$birthdate); @@ -407,8 +437,9 @@ function age($dob,$owner_tz = '',$viewer_tz = '') { $curr_month = datetime_convert('UTC',$viewer_tz,'now','m'); $curr_day = datetime_convert('UTC',$viewer_tz,'now','d'); - if(($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) + if (($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) { $year_diff--; + } return $year_diff; } @@ -430,11 +461,11 @@ function get_dim($y,$m) { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); - if($m != 2) + if ($m != 2) { return $dim[$m]; - - if(((($y % 4) == 0) && (($y % 100) != 0)) || (($y % 400) == 0)) + } elseif (((($y % 4) == 0) && (($y % 100) != 0)) || (($y % 400) == 0)) { return 29; + } return $dim[2]; } @@ -473,8 +504,6 @@ function get_first_dim($y,$m) { * @todo Provide (prev,next) links, define class variations for different size calendars */ function cal($y = 0,$m = 0, $links = false, $class='') { - - // month table - start at 1 to match human usage. $mtab = array(' ', @@ -486,10 +515,12 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); - if(! $y) + if (! $y) { $y = $thisyear; - if(! $m) + } + if (! $m) { $m = intval($thismonth); + } $dn = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'); $f = get_first_dim($y,$m); @@ -498,29 +529,33 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $dow = 0; $started = false; - if(($y == $thisyear) && ($m == $thismonth)) + if (($y == $thisyear) && ($m == $thismonth)) { $tddate = intval(datetime_convert('UTC',date_default_timezone_get(),'now','j')); + } $str_month = day_translate($mtab[$m]); $o = ''; $o .= "$str_month $y"; - for($a = 0; $a < 7; $a ++) + for ($a = 0; $a < 7; $a ++) { $o .= '' . mb_substr(day_translate($dn[$a]),0,3,'UTF-8') . ''; + } $o .= ''; - while($d <= $l) { - if(($dow == $f) && (! $started)) + while ($d <= $l) { + if (($dow == $f) && (! $started)) { $started = true; + } $today = (((isset($tddate)) && ($tddate == $d)) ? "class=\"today\" " : ''); $o .= ""; $day = str_replace(' ',' ',sprintf('%2.2d', $d)); - if($started) { - if(is_array($links) && isset($links[$d])) + if ($started) { + if (is_array($links) && isset($links[$d])) { $o .= "$day"; - else + } else { $o .= $day; + } $d ++; } else { @@ -529,14 +564,16 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $o .= ''; $dow ++; - if(($dow == 7) && ($d <= $l)) { + if (($dow == 7) && ($d <= $l)) { $dow = 0; $o .= ''; } } - if($dow) - for($a = $dow; $a < 7; $a ++) + if ($dow) { + for ($a = $dow; $a < 7; $a ++) { $o .= ' '; + } + } $o .= ''."\r\n"; @@ -553,7 +590,7 @@ function update_contact_birthdays() { // This only handles foreign or alien networks where a birthday has been provided. // In-network birthdays are handled within local_delivery - $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` != '0000-00-00' AND SUBSTRING(`bd`,1,4) != `bdyear` "); + $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`,1,4) != `bdyear` "); if (dbm::is_result($r)) { foreach ($r as $rr) { diff --git a/include/dba.php b/include/dba.php index 62728acae..5066dcd56 100644 --- a/include/dba.php +++ b/include/dba.php @@ -20,6 +20,7 @@ class dba { private $driver; public $connected = false; public $error = false; + private $_server_info = ''; function __construct($server, $user, $pass, $db, $install = false) { $a = get_app(); @@ -103,18 +104,20 @@ class dba { * @return string */ public function server_info() { - 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; + if ($this->_server_info == '') { + switch ($this->driver) { + case 'pdo': + $this->_server_info = $this->db->getAttribute(PDO::ATTR_SERVER_VERSION); + break; + case 'mysqli': + $this->_server_info = $this->db->server_info; + break; + case 'mysql': + $this->_server_info = mysql_get_server_info($this->db); + break; + } } - return $version; + return $this->_server_info; } /** @@ -474,6 +477,26 @@ class dba { } } } + + /** + * @brief Replaces ANY_VALUE() function by MIN() function, + * if the database server does not support ANY_VALUE(). + * + * Considerations for Standard SQL, or MySQL with ONLY_FULL_GROUP_BY (default since 5.7.5). + * ANY_VALUE() is available from MySQL 5.7.5 https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html + * A standard fall-back is to use MIN(). + * + * @param string $sql An SQL string without the values + * @return string The input SQL string modified if necessary. + */ + public function any_value_fallback($sql) { + $server_info = $this->server_info(); + if (version_compare($server_info, '5.7.5', '<') || + (stripos($server_info, 'MariaDB') !== false)) { + $sql = str_ireplace('ANY_VALUE(', 'MIN(', $sql); + } + return $sql; + } } function printable($s) { @@ -514,6 +537,7 @@ function q($sql) { unset($args[0]); if ($db && $db->connected) { + $sql = $db->any_value_fallback($sql); $stmt = @vsprintf($sql,$args); // Disabled warnings //logger("dba: q: $stmt", LOGGER_ALL); if ($stmt === false) @@ -550,6 +574,7 @@ function qu($sql) { unset($args[0]); if ($db && $db->connected) { + $sql = $db->any_value_fallback($sql); $stmt = @vsprintf($sql,$args); // Disabled warnings if ($stmt === false) logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG); diff --git a/include/dba_pdo.php b/include/dba_pdo.php index a44c447af..56692fbb3 100644 --- a/include/dba_pdo.php +++ b/include/dba_pdo.php @@ -34,7 +34,7 @@ $objDDDBLResultHandler->add('PDOStatement', array('HANDLER' => $cloPDOStatementR * */ -if(! class_exists('dba')) { +if (! class_exists('dba')) { class dba { private $debug = 0; @@ -66,9 +66,9 @@ class dba { return; } - if($install) { - if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { - if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { + 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->connected = false; $this->db = null; @@ -81,13 +81,13 @@ class dba { \DDDBL\connect(); $this->db = \DDDBL\getDB(); - if(\DDDBL\isConnected()) { + if (\DDDBL\isConnected()) { $this->connected = true; } - if(! $this->connected) { + if (! $this->connected) { $this->db = null; - if(! $install) + if (! $install) system_unavailable(); } @@ -109,11 +109,11 @@ class dba { $objPreparedQueryPool = new \DDDBL\DataObjectPool('Query-Definition'); # check if query do not exists till now, if so create its definition - if(!$objPreparedQueryPool->exists($strQueryAlias)) + if (!$objPreparedQueryPool->exists($strQueryAlias)) $objPreparedQueryPool->add($strQueryAlias, array('QUERY' => $sql, 'HANDLER' => $strHandler)); - if((! $this->db) || (! $this->connected)) + if ((! $this->db) || (! $this->connected)) return false; $this->error = ''; @@ -124,7 +124,7 @@ class dba { $r = \DDDBL\get($strQueryAlias); # bad workaround to emulate the bizzare behavior of mysql_query - if(in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) + if (in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) $result = true; $intErrorCode = false; @@ -138,7 +138,7 @@ class dba { $a->save_timestamp($stamp1, "database"); - if(x($a->config,'system') && x($a->config['system'],'db_log')) { + if (x($a->config,'system') && x($a->config['system'],'db_log')) { if (($duration > $a->config["system"]["db_loglimit"])) { $duration = round($duration, 3); $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); @@ -149,20 +149,20 @@ class dba { } } - if($intErrorCode) + if ($intErrorCode) $this->error = $intErrorCode; - if(strlen($this->error)) { + if (strlen($this->error)) { logger('dba: ' . $this->error); } - if($this->debug) { + if ($this->debug) { $mesg = ''; - if($result === false) + if ($result === false) $mesg = 'false'; - elseif($result === true) + elseif ($result === true) $mesg = 'true'; else { # this needs fixing, but is a bug itself @@ -182,13 +182,13 @@ class dba { * These usually indicate SQL syntax errors that need to be resolved. */ - if(isset($result) AND ($result === false)) { + if (isset($result) AND ($result === false)) { 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); } - if(isset($result) AND (($result === true) || ($result === false))) + if (isset($result) AND (($result === true) || ($result === false))) return $result; if ($onlyquery) { @@ -199,7 +199,7 @@ class dba { //$a->save_timestamp($stamp1, "database"); - if($this->debug) + if ($this->debug) logger('dba: ' . printable(print_r($r, true))); return($r); } @@ -223,7 +223,7 @@ class dba { } public function escape($str) { - if($this->db && $this->connected) { + if ($this->db && $this->connected) { $strQuoted = $this->db->quote($str); # this workaround is needed, because quote creates "'" and the beginning and the end # of the string, which is correct. but until now the queries set this delimiter manually, @@ -238,27 +238,27 @@ class dba { } }} -if(! function_exists('printable')) { +if (! function_exists('printable')) { function printable($s) { $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s); $s = str_replace("\x00",'.',$s); - if(x($_SERVER,'SERVER_NAME')) + if (x($_SERVER,'SERVER_NAME')) $s = escape_tags($s); return $s; }} // Procedural functions -if(! function_exists('dbg')) { +if (! function_exists('dbg')) { function dbg($state) { global $db; - if($db) + if ($db) $db->dbg($state); }} -if(! function_exists('dbesc')) { +if (! function_exists('dbesc')) { function dbesc($str) { global $db; - if($db && $db->connected) + if ($db && $db->connected) return($db->escape($str)); else return(str_replace("'","\\'",$str)); @@ -271,17 +271,17 @@ function dbesc($str) { // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", // 'user', 1); -if(! function_exists('q')) { +if (! function_exists('q')) { function q($sql) { global $db; $args = func_get_args(); unset($args[0]); - if($db && $db->connected) { + if ($db && $db->connected) { $stmt = @vsprintf($sql,$args); // Disabled warnings //logger("dba: q: $stmt", LOGGER_ALL); - if($stmt === false) + if ($stmt === false) logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG); return $db->q($stmt); } @@ -303,11 +303,11 @@ function q($sql) { * */ -if(! function_exists('dbq')) { +if (! function_exists('dbq')) { function dbq($sql) { global $db; - if($db && $db->connected) + if ($db && $db->connected) $ret = $db->q($sql); else $ret = false; @@ -321,21 +321,21 @@ function dbq($sql) { // cast to int to avoid trouble. -if(! function_exists('dbesc_array_cb')) { +if (! function_exists('dbesc_array_cb')) { function dbesc_array_cb(&$item, $key) { - if(is_string($item)) + if (is_string($item)) $item = dbesc($item); }} -if(! function_exists('dbesc_array')) { +if (! function_exists('dbesc_array')) { function dbesc_array(&$arr) { - if(is_array($arr) && count($arr)) { + if (is_array($arr) && count($arr)) { array_walk($arr,'dbesc_array_cb'); } }} -if(! function_exists('dba_timer')) { +if (! function_exists('dba_timer')) { function dba_timer() { return microtime(true); }} diff --git a/include/dbstructure.php b/include/dbstructure.php index 48cc02d2d..76f1bb000 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -78,8 +78,18 @@ function update_fail($update_id, $error_message){ function table_structure($table) { $structures = q("DESCRIBE `%s`", $table); + $full_columns = q("SHOW FULL COLUMNS FROM `%s`", $table); + $indexes = q("SHOW INDEX FROM `%s`", $table); + $table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table); + + if (dbm::is_result($table_status)) { + $table_status = $table_status[0]; + } else { + $table_status = array(); + } + $fielddata = array(); $indexdata = array(); @@ -104,7 +114,6 @@ function table_structure($table) { $indexdata[$index["Key_name"]][] = $column; } - if (dbm::is_result($structures)) { foreach ($structures AS $field) { $fielddata[$field["Field"]]["type"] = $field["Type"]; @@ -125,10 +134,16 @@ function table_structure($table) { } } } - return(array("fields"=>$fielddata, "indexes"=>$indexdata)); + if (dbm::is_result($full_columns)) { + foreach ($full_columns AS $column) { + $fielddata[$column["Field"]]["Collation"] = $column["Collation"]; + } + } + + return array("fields" => $fielddata, "indexes" => $indexdata, "table_status" => $table_status); } -function print_structure($database, $charset) { +function print_structure($database) { echo "-- ------------------------------------------\n"; echo "-- ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION." (".FRIENDICA_CODENAME,")\n"; echo "-- DB_UPDATE_VERSION ".DB_UPDATE_VERSION."\n"; @@ -137,24 +152,33 @@ function print_structure($database, $charset) { echo "--\n"; echo "-- TABLE $name\n"; echo "--\n"; - db_create_table($name, $structure['fields'], $charset, true, false, $structure["indexes"]); + db_create_table($name, $structure['fields'], true, false, $structure["indexes"]); echo "\n"; } } +/** + * @brief Print out database error messages + * + * @param object $db Database object + * @param string $message Message to be added to the error message + * + * @return string Error message + */ +function print_update_error($db, $message) { + echo sprintf(t("\nError %d occured during database update:\n%s\n"), + $db->errorno, $db->error); + + return t('Errors encountered performing database changes: ').$message.EOL; +} + function update_structure($verbose, $action, $tables=null, $definition=null) { global $a, $db; if ($action) { Config::set('system', 'maintenance', 1); - Config::set('system', 'maintenance_reason', 'Database update'); - } - - if (isset($a->config["system"]["db_charset"])) { - $charset = $a->config["system"]["db_charset"]; - } else { - $charset = "utf8"; + Config::set('system', 'maintenance_reason', sprintf(t(': Database update'), dbm::date().' '.date('e'))); } $errors = false; @@ -168,16 +192,18 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $tables = q("SHOW TABLES"); } - foreach ($tables AS $table) { - $table = current($table); + if (dbm::is_result($tables)) { + foreach ($tables AS $table) { + $table = current($table); - logger(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG); - $database[$table] = table_structure($table); + logger(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG); + $database[$table] = table_structure($table); + } } // Get the definition if (is_null($definition)) { - $definition = db_definition($charset); + $definition = db_definition(); } // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements @@ -194,9 +220,9 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $group_by = ""; $sql3 = ""; if (!isset($database[$name])) { - $r = db_create_table($name, $structure["fields"], $charset, $verbose, $action, $structure['indexes']); + $r = db_create_table($name, $structure["fields"], $verbose, $action, $structure['indexes']); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered creating database tables.').$name.EOL; + $errors .= print_update_error($db, $name); } $is_new_table = True; } else { @@ -252,17 +278,24 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { } } else { // Compare the field definition - $current_field_definition = implode(",",$database[$name]["fields"][$fieldname]); - $new_field_definition = implode(",",$parameters); + $field_definition = $database[$name]["fields"][$fieldname]; + + // We change the collation after the indexes had been changed. + // This is done to avoid index length problems. + // So here we always ensure that there is no need to change it. + unset($parameters['Collation']); + unset($field_definition['Collation']); + + $current_field_definition = implode(",", $field_definition); + $new_field_definition = implode(",", $parameters); if ($current_field_definition != $new_field_definition) { - $sql2=db_modify_table_field($fieldname, $parameters); + $sql2 = db_modify_table_field($fieldname, $parameters); if ($sql3 == "") { $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; } else { $sql3 .= ", ".$sql2; } } - } } } @@ -288,16 +321,59 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $group_by = db_group_by($indexname, $fieldnames); } if ($sql2 != "") { - if ($sql3 == "") + if ($sql3 == "") { $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; - else + } else { $sql3 .= ", ".$sql2; + } + } + } + } + + if (isset($database[$name]["table_status"]["Collation"])) { + if ($database[$name]["table_status"]["Collation"] != 'utf8mb4_general_ci') { + $sql2 = "DEFAULT COLLATE utf8mb4_general_ci"; + + if ($sql3 == "") { + $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; + } else { + $sql3 .= ", ".$sql2; + } + } + } + + if ($sql3 != "") { + $sql3 .= "; "; + } + + // Now have a look at the field collations + // Compare the field structure field by field + foreach ($structure["fields"] AS $fieldname => $parameters) { + // Compare the field definition + $field_definition = $database[$name]["fields"][$fieldname]; + + // Define the default collation if not given + if (!isset($parameters['Collation']) AND !is_null($field_definition['Collation'])) { + $parameters['Collation'] = 'utf8mb4_general_ci'; + } else { + $parameters['Collation'] = null; + } + + if ($field_definition['Collation'] != $parameters['Collation']) { + $sql2 = db_modify_table_field($fieldname, $parameters); + if (($sql3 == "") OR (substr($sql3, -2, 2) == "; ")) { + $sql3 .= "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; + } else { + $sql3 .= ", ".$sql2; } } } } + if ($sql3 != "") { - $sql3 .= ";"; + if (substr($sql3, -2, 2) != "; ") { + $sql3 .= ";"; + } if ($verbose) { // Ensure index conversion to unique removes duplicates @@ -323,6 +399,8 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { } if ($action) { + Config::set('system', 'maintenance_reason', sprintf(t('%s: updating %s table.'), dbm::date().' '.date('e'), $name)); + // Ensure index conversion to unique removes duplicates if ($is_unique) { if ($ignore != "") { @@ -330,33 +408,33 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { } else { $r = $db->q("CREATE TABLE `".$temp_name."` LIKE `".$name."`;"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } } } $r = @$db->q($sql3); - if (!dbm::is_result($r)) - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; - + if (!dbm::is_result($r)) { + $errors .= print_update_error($db, $sql3); + } if ($is_unique) { if ($ignore != "") { $db->q("SET session old_alter_table=0;"); } else { $r = $db->q("INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } $r = $db->q("DROP TABLE `".$name."`;"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } $r = $db->q("RENAME TABLE `".$temp_name."` TO `".$name."`;"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } } @@ -376,6 +454,10 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { function db_field_command($parameters, $create = true) { $fieldstruct = $parameters["type"]; + if (!is_null($parameters["Collation"])) { + $fieldstruct .= " COLLATE ".$parameters["Collation"]; + } + if ($parameters["not null"]) $fieldstruct .= " NOT NULL"; @@ -395,7 +477,7 @@ function db_field_command($parameters, $create = true) { return($fieldstruct); } -function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=null) { +function db_create_table($name, $fields, $verbose, $action, $indexes=null) { global $a, $db; $r = true; @@ -404,7 +486,7 @@ function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=n $sql_rows = array(); $primary_keys = array(); - foreach($fields AS $fieldname => $field) { + foreach ($fields AS $fieldname => $field) { $sql_rows[] = "`".dbesc($fieldname)."` ".db_field_command($field); if (x($field,'primary') and $field['primary']!=''){ $primary_keys[] = $fieldname; @@ -420,7 +502,7 @@ function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=n $sql = implode(",\n\t", $sql_rows); - $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=".$charset; + $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT COLLATE utf8mb4_general_ci"; if ($verbose) echo $sql.";\n"; @@ -503,18 +585,7 @@ function db_group_by($indexname, $fieldnames) { return $sql; } -function db_index_suffix($charset, $reduce = 0) { - if ($charset != "utf8mb4") { - return ""; - } - - // On utf8mb4 indexes can only have a length of 191 - $indexlength = 191 - $reduce; - - return "(".$indexlength.")"; -} - -function db_definition($charset) { +function db_definition() { $database = array(); @@ -671,7 +742,7 @@ function db_definition($charset) { "writable" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "forum" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "prv" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), - "contact-type" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"), + "contact-type" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "hidden" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "archive" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "pending" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"), @@ -681,7 +752,7 @@ function db_definition($charset) { "info" => array("type" => "mediumtext"), "profile-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "bdyear" => array("type" => "varchar(4)", "not null" => "1", "default" => ""), - "bd" => array("type" => "date", "not null" => "1", "default" => "0000-00-00"), + "bd" => array("type" => "date", "not null" => "1", "default" => "0001-01-01"), "notify_new_posts" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "fetch_further_information" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "ffi_keyword_blacklist" => array("type" => "text"), @@ -840,7 +911,7 @@ function db_definition($charset) { "about" => array("type" => "text"), "keywords" => array("type" => "text"), "gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""), - "birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"), + "birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0001-01-01"), "community" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "contact-type" => array("type" => "tinyint(1)", "not null" => "1", "default" => "-1"), "hide" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), @@ -1304,7 +1375,7 @@ function db_definition($charset) { "hide-friends" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "pdesc" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "dob" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"), + "dob" => array("type" => "varchar(32)", "not null" => "1", "default" => "0001-01-01"), "address" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "locality" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "region" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), @@ -1621,11 +1692,11 @@ function db_definition($charset) { function dbstructure_run(&$argv, &$argc) { global $a, $db; - if(is_null($a)){ + if (is_null($a)){ $a = new App; } - if(is_null($db)) { + if (is_null($db)) { @include(".htconfig.php"); require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); @@ -1650,7 +1721,7 @@ function dbstructure_run(&$argv, &$argc) { $current = intval(DB_UPDATE_VERSION); // run any left update_nnnn functions in update.php - for($x = $stored; $x < $current; $x ++) { + for ($x = $stored; $x < $current; $x ++) { $r = run_update_function($x); if (!$r) break; } @@ -1658,9 +1729,7 @@ function dbstructure_run(&$argv, &$argc) { set_config('system','build',DB_UPDATE_VERSION); return; case "dumpsql": - // For the dump that is used to create the database.sql we always assume utfmb4 - $charset = "utf8mb4"; - print_structure(db_definition($charset), $charset); + print_structure(db_definition()); return; } } diff --git a/include/dfrn.php b/include/dfrn.php index aae935963..a4651c6c8 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -554,8 +554,9 @@ class dfrn { xml::add_element($doc, $author, "poco:displayName", $profile["name"]); xml::add_element($doc, $author, "poco:updated", $namdate); - if (trim($profile["dob"]) != "0000-00-00") + if (trim($profile["dob"]) > '0001-01-01') { xml::add_element($doc, $author, "poco:birthday", "0000-".date("m-d", strtotime($profile["dob"]))); + } xml::add_element($doc, $author, "poco:note", $profile["about"]); xml::add_element($doc, $author, "poco:preferredUsername", $profile["nickname"]); @@ -867,7 +868,7 @@ class dfrn { // The signed text contains the content in Markdown, the sender handle and the signatur for the content // It is needed for relayed comments to Diaspora. - if($item['signed_text']) { + if ($item['signed_text']) { $sign = base64_encode(json_encode(array('signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer']))); xml::add_element($doc, $entry, "dfrn:diaspora_signature", $sign); } @@ -1287,7 +1288,7 @@ class dfrn { $href = ""; $width = 0; foreach ($avatar->attributes AS $attributes) { - /// @TODO Rewrite these similar if() to one switch + /// @TODO Rewrite these similar if () to one switch if ($attributes->name == "href") { $href = $attributes->textContent; } @@ -1402,7 +1403,7 @@ class dfrn { // "poco:birthday" is the birthday in the format "yyyy-mm-dd" $value = $xpath->evaluate($element . "/poco:birthday/text()", $context)->item(0)->nodeValue; - if (!in_array($value, array("", "0000-00-00"))) { + if (!in_array($value, array("", "0000-00-00", "0001-01-01"))) { $bdyear = date("Y"); $value = str_replace("0000", $bdyear, $value); @@ -2164,7 +2165,7 @@ class dfrn { $title = ""; foreach ($links AS $link) { foreach ($link->attributes AS $attributes) { - /// @TODO Rewrite these repeated (same) if() statements to a switch() + /// @TODO Rewrite these repeated (same) if () statements to a switch() if ($attributes->name == "href") { $href = $attributes->textContent; } @@ -2414,7 +2415,7 @@ class dfrn { // When activated, forums don't work. // And: Why should we disallow commenting by followers? // the behaviour is now similar to the Diaspora part. - //if($importer["rel"] == CONTACT_IS_FOLLOWER) { + //if ($importer["rel"] == CONTACT_IS_FOLLOWER) { // logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG); // return; //} @@ -2539,7 +2540,7 @@ class dfrn { logger("Item was stored with id ".$posted_id, LOGGER_DEBUG); - if(stristr($item["verb"],ACTIVITY_POKE)) + if (stristr($item["verb"],ACTIVITY_POKE)) self::do_poke($item, $importer, $posted_id); } } @@ -2666,7 +2667,7 @@ class dfrn { create_tags_from_itemuri($uri, $importer["uid"]); create_files_from_itemuri($uri, $importer["uid"]); update_thread_uri($uri, $importer["importer_uid"]); - if($item["last-child"]) { + if ($item["last-child"]) { // ensure that last-child is set in case the comment that had it just got wiped. q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ", dbesc(datetime_convert()), diff --git a/include/diaspora.php b/include/diaspora.php index bdedb9e0b..b8eff62b1 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -45,7 +45,7 @@ class Diaspora { $servers = explode(",", $serverdata); - foreach($servers AS $server) { + foreach ($servers AS $server) { $server = trim($server); $addr = "relay@".str_replace("http://", "", normalise_link($server)); $batch = $server."/receive/public"; @@ -207,7 +207,7 @@ class Diaspora { $children = $basedom->children('https://joindiaspora.com/protocol'); - if($children->header) { + if ($children->header) { $public = true; $author_link = str_replace('acct:','',$children->header->author_id); } else { @@ -240,11 +240,11 @@ class Diaspora { // figure out where in the DOM tree our data is hiding - if($dom->provenance->data) + if ($dom->provenance->data) $base = $dom->provenance; - elseif($dom->env->data) + elseif ($dom->env->data) $base = $dom->env; - elseif($dom->data) + elseif ($dom->data) $base = $dom; if (!$base) { @@ -277,7 +277,7 @@ class Diaspora { $data = base64url_decode($data); - if($public) + if ($public) $inner_decrypted = $data; else { @@ -578,7 +578,7 @@ class Diaspora { logger("Fetching diaspora key for: ".$handle); $r = self::person_by_handle($handle); - if($r) + if ($r) return $r["pubkey"]; return ""; @@ -634,7 +634,7 @@ class Diaspora { */ private static function add_fcontact($arr, $update = false) { - if($update) { + if ($update) { $r = q("UPDATE `fcontact` SET `name` = '%s', `photo` = '%s', @@ -818,7 +818,7 @@ class Diaspora { // perhaps we were already sharing with this person. Now they're sharing with us. // That makes us friends. // Normally this should have handled by getting a request - but this could get lost - if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { + if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d", intval(CONTACT_IS_FRIEND), intval($contact["id"]), @@ -828,12 +828,12 @@ class Diaspora { logger("defining user ".$contact["nick"]." as friend"); } - if(($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"])) + if (($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"])) return false; - if($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND) + if ($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND) return true; - if($contact["rel"] == CONTACT_IS_FOLLOWER) - if(($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment) + if ($contact["rel"] == CONTACT_IS_FOLLOWER) + if (($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment) return true; // Messages for the global users are always accepted @@ -991,7 +991,7 @@ class Diaspora { logger("Fetch post from ".$source_url, LOGGER_DEBUG); $envelope = fetch_url($source_url); - if($envelope) { + if ($envelope) { logger("Envelope was fetched.", LOGGER_DEBUG); $x = self::verify_magic_envelope($envelope); if (!$x) @@ -1007,7 +1007,7 @@ class Diaspora { logger("Fetch post from ".$source_url, LOGGER_DEBUG); $x = fetch_url($source_url); - if(!$x) + if (!$x) return false; } @@ -1064,7 +1064,7 @@ class Diaspora { FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", intval($uid), dbesc($guid)); - if(!$r) { + if (!$r) { $result = self::store_by_guid($guid, $contact["url"], $uid); if (!$result) { @@ -1325,7 +1325,7 @@ class Diaspora { } // If we are the origin of the parent we store the original data and notify our followers - if($message_id AND $parent_item["origin"]) { + if ($message_id AND $parent_item["origin"]) { // Formerly we stored the signed text, the signature and the author in different fields. // We now store the raw data so that we are more flexible. @@ -1502,7 +1502,7 @@ class Diaspora { intval($importer["uid"]), dbesc($guid) ); - if($c) + if ($c) $conversation = $c[0]; else { $r = q("INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`) @@ -1515,13 +1515,13 @@ class Diaspora { dbesc($subject), dbesc($participants) ); - if($r) + if ($r) $c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", intval($importer["uid"]), dbesc($guid) ); - if($c) + if ($c) $conversation = $c[0]; } if (!$conversation) { @@ -1529,7 +1529,7 @@ class Diaspora { return; } - foreach($messages as $mesg) + foreach ($messages as $mesg) self::receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation); return true; @@ -1659,7 +1659,7 @@ class Diaspora { logger("Stored like ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG); // If we are the origin of the parent we store the original data and notify our followers - if($message_id AND $parent_item["origin"]) { + if ($message_id AND $parent_item["origin"]) { // Formerly we stored the signed text, the signature and the author in different fields. // We now store the raw data so that we are more flexible. @@ -1834,10 +1834,10 @@ class Diaspora { $handle_parts = explode("@", $author); $nick = $handle_parts[0]; - if($name === "") + if ($name === "") $name = $handle_parts[0]; - if( preg_match("|^https?://|", $image_url) === 0) + if ( preg_match("|^https?://|", $image_url) === 0) $image_url = "http://".$handle_parts[1].$image_url; update_contact_avatar($image_url, $importer["uid"], $contact["id"]); @@ -1852,7 +1852,7 @@ class Diaspora { // this is to prevent multiple birthday notifications in a single year // if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year - if(substr($birthday,5) === substr($contact["bd"],5)) + if (substr($birthday,5) === substr($contact["bd"],5)) $birthday = $contact["bd"]; $r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s', @@ -1895,7 +1895,7 @@ class Diaspora { $a = get_app(); - if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { + if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d", intval(CONTACT_IS_FRIEND), intval($contact["id"]), @@ -1908,7 +1908,7 @@ class Diaspora { intval($importer["uid"]) ); - if($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) { + if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) { $self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1", intval($importer["uid"]) @@ -1916,7 +1916,7 @@ class Diaspora { // they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array - if($self && $contact["rel"] == CONTACT_IS_FOLLOWER) { + if ($self && $contact["rel"] == CONTACT_IS_FOLLOWER) { $arr = array(); $arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]); @@ -1947,7 +1947,7 @@ class Diaspora { $arr["deny_gid"] = $user[0]["deny_gid"]; $i = item_store($arr); - if($i) + if ($i) proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i); } } @@ -2086,12 +2086,12 @@ class Diaspora { $def_gid = get_default_group($importer['uid'], $ret["network"]); - if(intval($def_gid)) + if (intval($def_gid)) group_add_member($importer["uid"], "", $contact_record["id"], $def_gid); update_contact_avatar($ret["photo"], $importer['uid'], $contact_record["id"], true); - if($importer["page-flags"] == PAGE_NORMAL) { + if ($importer["page-flags"] == PAGE_NORMAL) { logger("Sending intra message for author ".$author.".", LOGGER_DEBUG); @@ -2141,7 +2141,7 @@ class Diaspora { ); $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"])); - if($u) { + if ($u) { logger("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], LOGGER_DEBUG); $ret = self::send_share($u[0], $contact_record); @@ -2765,7 +2765,7 @@ class Diaspora { $a = get_app(); $enabled = intval(get_config("system", "diaspora_enabled")); - if(!$enabled) + if (!$enabled) return 200; $logid = random_string(4); @@ -3104,14 +3104,14 @@ class Diaspora { $body = html_entity_decode(bb2diaspora($body)); // Adding the title - if(strlen($title)) + if (strlen($title)) $body = "## ".html_entity_decode($title)."\n\n".$body; if ($item["attach"]) { $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER); - if(cnt) { + if (cnt) { $body .= "\n".t("Attachments:")."\n"; - foreach($matches as $mtch) + foreach ($matches as $mtch) $body .= "[".$mtch[3]."](".$mtch[1].")\n"; } } @@ -3591,7 +3591,7 @@ class Diaspora { if ($searchable === 'true') { $dob = '1000-00-00'; - if (($profile['dob']) && ($profile['dob'] != '0000-00-00')) + if (($profile['dob']) && ($profile['dob'] > '0001-01-01')) $dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC','UTC',$profile['dob'],'m-d'); $about = $profile['about']; @@ -3604,7 +3604,7 @@ class Diaspora { $kw = str_replace(' ',' ',$kw); $arr = explode(' ',$profile['pub_keywords']); if (count($arr)) { - for($x = 0; $x < 5; $x ++) { + for ($x = 0; $x < 5; $x ++) { if (trim($arr[$x])) $tags .= '#'. trim($arr[$x]) .' '; } @@ -3626,7 +3626,7 @@ class Diaspora { "searchable" => $searchable, "tag_string" => $tags); - foreach($recips as $recip) { + foreach ($recips as $recip) { logger("Send updated profile data for user ".$uid." to contact ".$recip["id"], LOGGER_DEBUG); self::build_and_transmit($profile, $recip, "profile", $message, false, "", true); } @@ -3649,17 +3649,20 @@ class Diaspora { } $r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid'])); - if(!$r) + if (!dbm::is_result($r)) { return false; + } $contact["uprvkey"] = $r[0]['prvkey']; $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($post_id)); - if (!$r) + if (!dbm::is_result($r)) { return false; + } - if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) + if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) { return false; + } $message = self::construct_like($r[0], $contact); $message["author_signature"] = self::signature($contact, $message); diff --git a/include/directory.php b/include/directory.php index 088adbe78..41a3dd784 100644 --- a/include/directory.php +++ b/include/directory.php @@ -1,17 +1,19 @@ $argv[1]); @@ -22,5 +24,20 @@ function directory_run(&$argv, &$argc){ if (strlen($arr['url'])) { fetch_url($dir . '?url=' . bin2hex($arr['url'])); } + return; } + +function directory_update_all() { + $r = q("SELECT `url` FROM `contact` + INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid` + INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` + WHERE `contact`.`self` AND `profile`.`net-publish` AND `profile`.`is-default` AND + NOT `user`.`account_expired` AND `user`.`verified`"); + + if (dbm::is_result($r)) { + foreach ($r AS $user) { + proc_run(PRIORITY_LOW, 'include/directory.php', $user['url']); + } + } +} diff --git a/include/discover_poco.php b/include/discover_poco.php index bb53efb5c..ff97b0e59 100644 --- a/include/discover_poco.php +++ b/include/discover_poco.php @@ -209,10 +209,10 @@ function discover_directory($search) { $j = json_decode($x); if (count($j->results)) { - foreach($j->results as $jj) { + foreach ($j->results as $jj) { // Check if the contact already exists $exists = q("SELECT `id`, `last_contact`, `last_failure`, `updated` FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($jj->url)); - if ($exists) { + if (dbm::is_result($exists)) { logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG); if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) AND @@ -272,12 +272,16 @@ function gs_search_user($search) { if (!$result["success"]) { return false; } + $contacts = json_decode($result["body"]); if ($contacts->status == 'ERROR') { return false; } - foreach($contacts->data AS $user) { + + /// @TODO AS is considered as a notation for constants (as they usually being written all upper-case) + /// @TODO find all those and convert to all lower-case which is a keyword then + foreach ($contacts->data AS $user) { $contact = probe_url($user->site_address."/".$user->name); if ($contact["network"] != NETWORK_PHANTOM) { $contact["about"] = $user->description; diff --git a/include/email.php b/include/email.php index 42f80c242..b8d99433e 100644 --- a/include/email.php +++ b/include/email.php @@ -4,7 +4,7 @@ require_once('include/msgclean.php'); require_once('include/quoteconvert.php'); function email_connect($mailbox,$username,$password) { - if(! function_exists('imap_open')) + if (! function_exists('imap_open')) return false; $mbox = @imap_open($mailbox,$username,$password); @@ -14,23 +14,23 @@ function email_connect($mailbox,$username,$password) { function email_poll($mbox,$email_addr) { - if(! ($mbox && $email_addr)) + if (! ($mbox && $email_addr)) return array(); $search1 = @imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID); - if(! $search1) + if (! $search1) $search1 = array(); $search2 = @imap_search($mbox,'TO "' . $email_addr . '"', SE_UID); - if(! $search2) + if (! $search2) $search2 = array(); $search3 = @imap_search($mbox,'CC "' . $email_addr . '"', SE_UID); - if(! $search3) + if (! $search3) $search3 = array(); $search4 = @imap_search($mbox,'BCC "' . $email_addr . '"', SE_UID); - if(! $search4) + if (! $search4) $search4 = array(); $res = array_unique(array_merge($search1,$search2,$search3,$search4)); @@ -57,8 +57,8 @@ function email_msg_headers($mbox,$uid) { $raw_header = str_replace("\r",'',$raw_header); $ret = array(); $h = explode("\n",$raw_header); - if(count($h)) - foreach($h as $line ) { + if (count($h)) + foreach ($h as $line ) { if (preg_match("/^[a-zA-Z]/", $line)) { $key = substr($line,0,strpos($line,':')); $value = substr($line,strpos($line,':')+1); @@ -79,10 +79,10 @@ function email_get_msg($mbox,$uid, $reply) { $struc = (($mbox && $uid) ? @imap_fetchstructure($mbox,$uid,FT_UID) : null); - if(! $struc) + if (! $struc) return $ret; - if(! $struc->parts) { + if (! $struc->parts) { $ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html'); $html = $ret['body']; @@ -94,7 +94,7 @@ function email_get_msg($mbox,$uid, $reply) { else { $text = ''; $html = ''; - foreach($struc->parts as $ptop => $p) { + foreach ($struc->parts as $ptop => $p) { $x = email_get_part($mbox,$uid,$p,$ptop + 1, 'plain'); if ($x) { $text .= $x; @@ -206,16 +206,16 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) { function email_header_encode($in_str, $charset) { - $out_str = $in_str; + $out_str = $in_str; $need_to_convert = false; - for($x = 0; $x < strlen($in_str); $x ++) { - if((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) { + for ($x = 0; $x < strlen($in_str); $x ++) { + if ((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) { $need_to_convert = true; } } - if(! $need_to_convert) + if (! $need_to_convert) return $in_str; if ($out_str && $charset) { diff --git a/include/enotify.php b/include/enotify.php index ebc27309d..f86174bd4 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -411,10 +411,12 @@ function notification($params) { $hash = random_string(); $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", dbesc($hash)); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $dups = true; - } while($dups == true); + } + } while ($dups == true); + /// @TODO One statement is enough $datarray = array(); $datarray['hash'] = $hash; $datarray['name'] = $params['source_name']; diff --git a/include/event.php b/include/event.php index ebd4885c9..280b1380a 100644 --- a/include/event.php +++ b/include/event.php @@ -10,7 +10,7 @@ require_once 'include/datetime.php'; function format_event_html($ev, $simple = false) { - if(! ((is_array($ev)) && count($ev))) { + if (! ((is_array($ev)) && count($ev))) { return ''; } @@ -98,26 +98,26 @@ function parse_event($h) { logger('parse_event: parse error: ' . $e); } - if(! $dom) + if (! $dom) return $ret; $items = $dom->getElementsByTagName('*'); - foreach($items as $item) { - if(attribute_contains($item->getAttribute('class'), 'vevent')) { + foreach ($items as $item) { + if (attribute_contains($item->getAttribute('class'), 'vevent')) { $level2 = $item->getElementsByTagName('*'); - foreach($level2 as $x) { - if(attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) { + foreach ($level2 as $x) { + if (attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) { $ret['start'] = $x->getAttribute('title'); - if(! strpos($ret['start'],'Z')) + if (! strpos($ret['start'],'Z')) $ret['adjust'] = true; } - if(attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title')) + if (attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title')) $ret['finish'] = $x->getAttribute('title'); - if(attribute_contains($x->getAttribute('class'),'description')) + if (attribute_contains($x->getAttribute('class'),'description')) $ret['desc'] = $x->textContent; - if(attribute_contains($x->getAttribute('class'),'location')) + if (attribute_contains($x->getAttribute('class'),'location')) $ret['location'] = $x->textContent; } } @@ -125,23 +125,23 @@ function parse_event($h) { // sanitise - if((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) { + if ((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) { $config = HTMLPurifier_Config::createDefault(); $config->set('Cache.DefinitionImpl', null); $purifier = new HTMLPurifier($config); $ret['desc'] = html2bbcode($purifier->purify($ret['desc'])); } - if((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) { + if ((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) { $config = HTMLPurifier_Config::createDefault(); $config->set('Cache.DefinitionImpl', null); $purifier = new HTMLPurifier($config); $ret['location'] = html2bbcode($purifier->purify($ret['location'])); } - if(x($ret,'start')) + if (x($ret,'start')) $ret['start'] = datetime_convert('UTC','UTC',$ret['start']); - if(x($ret,'finish')) + if (x($ret,'finish')) $ret['finish'] = datetime_convert('UTC','UTC',$ret['finish']); return $ret; @@ -595,7 +595,7 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') { */ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') { // Only allow events if there is a valid owner_id - if($owner_uid == 0) { + if ($owner_uid == 0) { return; } diff --git a/include/expire.php b/include/expire.php index 35b109a50..098125a79 100644 --- a/include/expire.php +++ b/include/expire.php @@ -11,12 +11,13 @@ function expire_run(&$argv, &$argc){ // physically remove anything that has been deleted for more than two months - $r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY"); + $r = q("DELETE FROM `item` WHERE `deleted` = 1 AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"); // make this optional as it could have a performance impact on large sites - if(intval(get_config('system','optimize_items'))) - q("optimize table item"); + if (intval(get_config('system','optimize_items'))) { + q("OPTIMIZE TABLE `item`"); + } logger('expire: start'); diff --git a/include/feed.php b/include/feed.php index 295993370..2117676db 100644 --- a/include/feed.php +++ b/include/feed.php @@ -200,7 +200,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { 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; @@ -210,12 +209,17 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { if ($item["uri"] == "") { $item["uri"] = $item["plink"]; } + + $orig_plink = $item["plink"]; + + $item["plink"] = original_url($item["plink"]); + $item["parent-uri"] = $item["uri"]; if (!$simulate) { $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s', '%s')", intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED), dbesc(NETWORK_DFRN)); - if ($r) { + if (dbm::is_result($r)) { logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG); continue; } @@ -340,6 +344,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { // Distributed items should have a well formatted URI. // Additionally we have to avoid conflicts with identical URI between imported feeds and these items. if ($notify) { + $item['guid'] = uri_to_guid($orig_plink, $a->get_hostname()); unset($item['uri']); unset($item['parent-uri']); } diff --git a/include/identity.php b/include/identity.php index 8138e9b04..a21624a21 100644 --- a/include/identity.php +++ b/include/identity.php @@ -202,6 +202,9 @@ function profile_sidebar($profile, $block = 0) { $address = false; // $pdesc = true; + // This function can also use contact information in $profile + $is_contact = x($profile, 'cid'); + if((! is_array($profile)) && (! count($profile))) return $o; @@ -281,7 +284,7 @@ function profile_sidebar($profile, $block = 0) { } // show edit profile to yourself - if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) { + if (!$is_contact && $profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) { $profile['edit'] = array(App::get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles')); $r = q("SELECT * FROM `profile` WHERE `uid` = %d", local_user()); @@ -310,7 +313,7 @@ function profile_sidebar($profile, $block = 0) { } } - if ($profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) { + if (!$is_contact && $profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) { $profile['edit'] = array(App::get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile')); $profile['menu'] = array( 'chg_photo' => t('Change profile photo'), @@ -628,7 +631,7 @@ function advanced_profile(App $a) { if($a->profile['gender']) $profile['gender'] = array( t('Gender:'), $a->profile['gender'] ); - if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { + if(($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) { $year_bd_format = t('j F, Y'); $short_bd_format = t('j F'); diff --git a/include/items.php b/include/items.php index c2b3d7d1f..2500e08d5 100644 --- a/include/items.php +++ b/include/items.php @@ -6,31 +6,33 @@ use \Friendica\ParseUrl; -require_once('include/bbcode.php'); -require_once('include/oembed.php'); -require_once('include/salmon.php'); -require_once('include/crypto.php'); -require_once('include/Photo.php'); -require_once('include/tags.php'); -require_once('include/files.php'); -require_once('include/text.php'); -require_once('include/email.php'); -require_once('include/threads.php'); -require_once('include/socgraph.php'); -require_once('include/plaintext.php'); -require_once('include/ostatus.php'); -require_once('include/feed.php'); -require_once('include/Contact.php'); -require_once('mod/share.php'); -require_once('include/enotify.php'); -require_once('include/dfrn.php'); -require_once('include/group.php'); +require_once 'include/bbcode.php'; +require_once 'include/oembed.php'; +require_once 'include/salmon.php'; +require_once 'include/crypto.php'; +require_once 'include/Photo.php'; +require_once 'include/tags.php'; +require_once 'include/files.php'; +require_once 'include/text.php'; +require_once 'include/email.php'; +require_once 'include/threads.php'; +require_once 'include/socgraph.php'; +require_once 'include/plaintext.php'; +require_once 'include/ostatus.php'; +require_once 'include/feed.php'; +require_once 'include/Contact.php'; +require_once 'mod/share.php'; +require_once 'include/enotify.php'; +require_once 'include/dfrn.php'; +require_once 'include/group.php'; -require_once('library/defuse/php-encryption-1.2.1/Crypto.php'); +/// @TODO one day with composer autoloader no more needed +require_once 'library/defuse/php-encryption-1.2.1/Crypto.php'; function construct_verb($item) { - if ($item['verb']) + if ($item['verb']) { return $item['verb']; + } return ACTIVITY_POST; } @@ -60,7 +62,7 @@ function limit_body_size($body) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); - while(($img_st_close !== false) && ($img_end !== false)) { + while (($img_st_close !== false) && ($img_end !== false)) { $img_st_close++; // make it point to AFTER the closing bracket $img_end += $img_start; @@ -69,7 +71,7 @@ function limit_body_size($body) { if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { // This is an embedded image - if ( ($textlen + $img_start) > $maxlen ) { + if (($textlen + $img_start) > $maxlen ) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens before an embedded image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); @@ -83,7 +85,7 @@ function limit_body_size($body) { $new_body = $new_body . substr($orig_body, $img_start, $img_end - $img_start); } else { - if ( ($textlen + $img_end) > $maxlen ) { + if (($textlen + $img_end) > $maxlen ) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens before the end of a non-embedded image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); @@ -96,15 +98,17 @@ function limit_body_size($body) { } $orig_body = substr($orig_body, $img_end); - if ($orig_body === false) // in case the body ends on a closing image tag + if ($orig_body === false) { + // in case the body ends on a closing image tag $orig_body = ''; + } $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); } - if ( ($textlen + strlen($orig_body)) > $maxlen) { + if (($textlen + strlen($orig_body)) > $maxlen) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens after the end of the last image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); @@ -117,8 +121,9 @@ function limit_body_size($body) { } return $new_body; - } else + } else { return $body; + } }} function title_is_body($title, $body) { @@ -126,15 +131,16 @@ function title_is_body($title, $body) { $title = strip_tags($title); $title = trim($title); $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8'); - $title = str_replace(array("\n", "\r", "\t", " "), array("","","",""), $title); + $title = str_replace(array("\n", "\r", "\t", " "), array("", "", "", ""), $title); $body = strip_tags($body); $body = trim($body); $body = html_entity_decode($body, ENT_QUOTES, 'UTF-8'); - $body = str_replace(array("\n", "\r", "\t", " "), array("","","",""), $body); + $body = str_replace(array("\n", "\r", "\t", " "), array("", "", "", ""), $body); - if (strlen($title) < strlen($body)) + if (strlen($title) < strlen($body)) { $body = substr($body, 0, strlen($title)); + } if (($title != $body) and (substr($title, -3) == "...")) { $pos = strrpos($title, "..."); @@ -144,7 +150,7 @@ function title_is_body($title, $body) { } } - return($title == $body); + return ($title == $body); } function add_page_info_data($data) { @@ -212,8 +218,8 @@ function add_page_info_data($data) { foreach ($data["keywords"] AS $keyword) { /// @todo make a positive list of allowed characters $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"), - array("","", "", "", "", "", "", "", "", "", "", ""), $keyword); - $hashtags .= "#[url=".App::get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url] "; + array("", "", "", "", "", "", "", "", "", "", "", ""), $keyword); + $hashtags .= "#[url=" . App::get_baseurl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url] "; } } @@ -224,25 +230,28 @@ function query_page_info($url, $no_photos = false, $photo = "", $keywords = fals $data = ParseUrl::getSiteinfoCached($url, true); - if ($photo != "") + if ($photo != "") { $data["images"][0]["src"] = $photo; + } - logger('fetch page info for '.$url.' '.print_r($data, true), LOGGER_DEBUG); + logger('fetch page info for ' . $url . ' ' . print_r($data, true), LOGGER_DEBUG); - if (!$keywords AND isset($data["keywords"])) + if (!$keywords AND isset($data["keywords"])) { unset($data["keywords"]); + } if (($keyword_blacklist != "") AND isset($data["keywords"])) { - $list = explode(",", $keyword_blacklist); + $list = explode(", ", $keyword_blacklist); foreach ($list AS $keyword) { $keyword = trim($keyword); $index = array_search($keyword, $data["keywords"]); - if ($index !== false) + if ($index !== false) { unset($data["keywords"][$index]); + } } } - return($data); + return $data; } function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") { @@ -252,16 +261,17 @@ function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = fa if (isset($data["keywords"]) AND count($data["keywords"])) { foreach ($data["keywords"] AS $keyword) { $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'"), - array("","", "", "", "", ""), $keyword); + array("", "", "", "", "", ""), $keyword); - if ($tags != "") - $tags .= ","; + if ($tags != "") { + $tags .= ", "; + } - $tags .= "#[url=".App::get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url]"; + $tags .= "#[url=" . App::get_baseurl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]"; } } - return($tags); + return $tags; } function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") { @@ -269,52 +279,58 @@ function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $text = add_page_info_data($data); - return($text); + return $text; } function add_page_info_to_body($body, $texturl = false, $no_photos = false) { - logger('add_page_info_to_body: fetch page info for body '.$body, LOGGER_DEBUG); + logger('add_page_info_to_body: fetch page info for body ' . $body, LOGGER_DEBUG); $URLSearchString = "^\[\]"; // Fix for Mastodon where the mentions are in a different format $body = preg_replace("/\[url\=([$URLSearchString]*)\]([#!@])(.*?)\[\/url\]/ism", - '$2[url=$1]$3[/url]', $body); + '$2[url=$1]$3[/url]', $body); // Adding these spaces is a quick hack due to my problems with regular expressions :) - preg_match("/[^!#@]\[url\]([$URLSearchString]*)\[\/url\]/ism", " ".$body, $matches); + preg_match("/[^!#@]\[url\]([$URLSearchString]*)\[\/url\]/ism", " " . $body, $matches); - if (!$matches) - preg_match("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", " ".$body, $matches); + if (!$matches) { + preg_match("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", " " . $body, $matches); + } // Convert urls without bbcode elements if (!$matches AND $texturl) { preg_match("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", " ".$body, $matches); // Yeah, a hack. I really hate regular expressions :) - if ($matches) + if ($matches) { $matches[1] = $matches[2]; + } } - if ($matches) + if ($matches) { $footer = add_page_info($matches[1], $no_photos); + } // Remove the link from the body if the link is attached at the end of the post if (isset($footer) AND (trim($footer) != "") AND (strpos($footer, $matches[1]))) { $removedlink = trim(str_replace($matches[1], "", $body)); - if (($removedlink == "") OR strstr($body, $removedlink)) + if (($removedlink == "") OR strstr($body, $removedlink)) { $body = $removedlink; + } $url = str_replace(array('/', '.'), array('\/', '\.'), $matches[1]); - $removedlink = preg_replace("/\[url\=".$url."\](.*?)\[\/url\]/ism", '', $body); - if (($removedlink == "") OR strstr($body, $removedlink)) + $removedlink = preg_replace("/\[url\=" . $url . "\](.*?)\[\/url\]/ism", '', $body); + if (($removedlink == "") OR strstr($body, $removedlink)) { $body = $removedlink; + } } // Add the page information to the bottom - if (isset($footer) AND (trim($footer) != "")) + if (isset($footer) AND (trim($footer) != "")) { $body .= $footer; + } return $body; } @@ -328,12 +344,13 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) { */ function item_add_language_opt(&$arr) { - if (version_compare(PHP_VERSION, '5.3.0', '<')) return; // LanguageDetect.php not available ? + if (version_compare(PHP_VERSION, '5.3.0', '<')) { + // LanguageDetect.php not available ? + return; + } - if ( x($arr, 'postopts') ) - { - if ( strstr($arr['postopts'], 'lang=') ) - { + if (x($arr, 'postopts') ) { + if (strstr($arr['postopts'], 'lang=') ) { // do not override /// @TODO Add parameter to request overriding return; @@ -344,8 +361,9 @@ function item_add_language_opt(&$arr) { } require_once('library/langdet/Text/LanguageDetect.php'); - $naked_body = preg_replace('/\[(.+?)\]/','',$arr['body']); - $l = new Text_LanguageDetect; + + $naked_body = preg_replace('/\[(.+?)\]/','', $arr['body']); + $l = new Text_LanguageDetect(); //$lng = $l->detectConfidence($naked_body); //$arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : ''); $lng = $l->detect($naked_body, 3); @@ -355,7 +373,7 @@ function item_add_language_opt(&$arr) { $postopts .= 'lang='; $sep = ""; foreach ($lng as $language => $score) { - $postopts .= $sep . $language.";".$score; + $postopts .= $sep . $language . ";" . $score; $sep = ':'; } $arr['postopts'] = $postopts; @@ -392,7 +410,9 @@ function uri_to_guid($uri, $host = "") { return $guid_prefix.$host_hash; } -function item_store($arr,$force_parent = false, $notify = false, $dontcache = false) { +/// @TODO Maybe $arr must be called-by-reference? This function modifies it +/// @TODO add type-hint array +function item_store($arr, $force_parent = false, $notify = false, $dontcache = false) { $a = get_app(); @@ -407,18 +427,22 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri. // In difference to the call to "uri_to_guid" several lines below we add the hash of our own host. // This is done because our host is the original creator of the post. - if (isset($arr['plink'])) { - $arr['guid'] = uri_to_guid($arr['plink'], $a->get_hostname()); - } elseif (isset($arr['uri'])) { - $arr['guid'] = uri_to_guid($arr['uri'], $a->get_hostname()); + if (!isset($arr['guid'])) { + if (isset($arr['plink'])) { + $arr['guid'] = uri_to_guid($arr['plink'], $a->get_hostname()); + } elseif (isset($arr['uri'])) { + $arr['guid'] = uri_to_guid($arr['uri'], $a->get_hostname()); + } } } - // If a Diaspora signature structure was passed in, pull it out of the - // item array and set it aside for later storage. + /* + * If a Diaspora signature structure was passed in, pull it out of the + * item array and set it aside for later storage. + */ $dsprsig = null; - if (x($arr,'dsprsig')) { + if (x($arr, 'dsprsig')) { $encoded_signature = $arr['dsprsig']; $dsprsig = json_decode(base64_decode($arr['dsprsig'])); unset($arr['dsprsig']); @@ -426,27 +450,28 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // Converting the plink if ($arr['network'] == NETWORK_OSTATUS) { - if (isset($arr['plink'])) + if (isset($arr['plink'])) { $arr['plink'] = ostatus::convert_href($arr['plink']); - elseif (isset($arr['uri'])) + } elseif (isset($arr['uri'])) { $arr['plink'] = ostatus::convert_href($arr['uri']); + } } - if (x($arr, 'gravity')) + if (x($arr, 'gravity')) { $arr['gravity'] = intval($arr['gravity']); - elseif ($arr['parent-uri'] === $arr['uri']) + } elseif ($arr['parent-uri'] === $arr['uri']) { $arr['gravity'] = 0; - elseif (activity_match($arr['verb'],ACTIVITY_POST)) + } elseif (activity_match($arr['verb'],ACTIVITY_POST)) { $arr['gravity'] = 6; - else + } else { $arr['gravity'] = 6; // extensible catchall + } - if (! x($arr,'type')) + if (! x($arr, 'type')) { $arr['type'] = 'remote'; + } - - - /* check for create date and expire time */ + // check for create date and expire time $uid = intval($arr['uid']); $r = q("SELECT expire FROM user WHERE uid = %d", intval($uid)); if (dbm::is_result($r)) { @@ -461,8 +486,11 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa } } - // Do we already have this item? - // We have to check several networks since Friendica posts could be repeated via OStatus (maybe Diasporsa as well) + /* + * Do we already have this item? + * We have to check several networks since Friendica posts could be repeated + * via OStatus (maybe Diasporsa as well) + */ if (in_array(trim($arr['network']), array(NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS, ""))) { $r = q("SELECT `id`, `network` FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` IN ('%s', '%s', '%s') LIMIT 1", dbesc(trim($arr['uri'])), @@ -471,14 +499,17 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS) ); - if ($r) { + if (dbm::is_result($r)) { // We only log the entries with a different user id than 0. Otherwise we would have too many false positives - if ($uid != 0) + if ($uid != 0) { logger("Item with uri ".$arr['uri']." already existed for user ".$uid." with id ".$r[0]["id"]." target network ".$r[0]["network"]." - new network: ".$arr['network']); - return($r[0]["id"]); + } + + return $r[0]["id"]; } } + /// @TODO old-lost code? // Shouldn't happen but we want to make absolutely sure it doesn't leak from a plugin. // Deactivated, since the bbcode parser can handle with it - and it destroys posts with some smileys that contain "<" //if ((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false)) @@ -486,76 +517,79 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa item_add_language_opt($arr); - if ($notify) + if ($notify) { $guid_prefix = ""; - elseif ((trim($arr['guid']) == "") AND (trim($arr['plink']) != "")) + } elseif ((trim($arr['guid']) == "") AND (trim($arr['plink']) != "")) { $arr['guid'] = uri_to_guid($arr['plink']); - elseif ((trim($arr['guid']) == "") AND (trim($arr['uri']) != "")) + } elseif ((trim($arr['guid']) == "") AND (trim($arr['uri']) != "")) { $arr['guid'] = uri_to_guid($arr['uri']); - else { + } else { $parsed = parse_url($arr["author-link"]); $guid_prefix = hash("crc32", $parsed["host"]); } - $arr['wall'] = ((x($arr,'wall')) ? intval($arr['wall']) : 0); - $arr['guid'] = ((x($arr,'guid')) ? notags(trim($arr['guid'])) : get_guid(32, $guid_prefix)); - $arr['uri'] = ((x($arr,'uri')) ? notags(trim($arr['uri'])) : item_new_uri($a->get_hostname(), $uid, $arr['guid'])); - $arr['extid'] = ((x($arr,'extid')) ? notags(trim($arr['extid'])) : ''); - $arr['author-name'] = ((x($arr,'author-name')) ? trim($arr['author-name']) : ''); - $arr['author-link'] = ((x($arr,'author-link')) ? notags(trim($arr['author-link'])) : ''); - $arr['author-avatar'] = ((x($arr,'author-avatar')) ? notags(trim($arr['author-avatar'])) : ''); - $arr['owner-name'] = ((x($arr,'owner-name')) ? trim($arr['owner-name']) : ''); - $arr['owner-link'] = ((x($arr,'owner-link')) ? notags(trim($arr['owner-link'])) : ''); - $arr['owner-avatar'] = ((x($arr,'owner-avatar')) ? notags(trim($arr['owner-avatar'])) : ''); - $arr['created'] = ((x($arr,'created') !== false) ? datetime_convert('UTC','UTC',$arr['created']) : datetime_convert()); - $arr['edited'] = ((x($arr,'edited') !== false) ? datetime_convert('UTC','UTC',$arr['edited']) : datetime_convert()); - $arr['commented'] = ((x($arr,'commented') !== false) ? datetime_convert('UTC','UTC',$arr['commented']) : datetime_convert()); - $arr['received'] = ((x($arr,'received') !== false) ? datetime_convert('UTC','UTC',$arr['received']) : datetime_convert()); - $arr['changed'] = ((x($arr,'changed') !== false) ? datetime_convert('UTC','UTC',$arr['changed']) : datetime_convert()); - $arr['title'] = ((x($arr,'title')) ? trim($arr['title']) : ''); - $arr['location'] = ((x($arr,'location')) ? trim($arr['location']) : ''); - $arr['coord'] = ((x($arr,'coord')) ? notags(trim($arr['coord'])) : ''); - $arr['last-child'] = ((x($arr,'last-child')) ? intval($arr['last-child']) : 0 ); - $arr['visible'] = ((x($arr,'visible') !== false) ? intval($arr['visible']) : 1 ); + $arr['wall'] = ((x($arr, 'wall')) ? intval($arr['wall']) : 0); + $arr['guid'] = ((x($arr, 'guid')) ? notags(trim($arr['guid'])) : get_guid(32, $guid_prefix)); + $arr['uri'] = ((x($arr, 'uri')) ? notags(trim($arr['uri'])) : item_new_uri($a->get_hostname(), $uid, $arr['guid'])); + $arr['extid'] = ((x($arr, 'extid')) ? notags(trim($arr['extid'])) : ''); + $arr['author-name'] = ((x($arr, 'author-name')) ? trim($arr['author-name']) : ''); + $arr['author-link'] = ((x($arr, 'author-link')) ? notags(trim($arr['author-link'])) : ''); + $arr['author-avatar'] = ((x($arr, 'author-avatar')) ? notags(trim($arr['author-avatar'])) : ''); + $arr['owner-name'] = ((x($arr, 'owner-name')) ? trim($arr['owner-name']) : ''); + $arr['owner-link'] = ((x($arr, 'owner-link')) ? notags(trim($arr['owner-link'])) : ''); + $arr['owner-avatar'] = ((x($arr, 'owner-avatar')) ? notags(trim($arr['owner-avatar'])) : ''); + $arr['created'] = ((x($arr, 'created') !== false) ? datetime_convert('UTC','UTC', $arr['created']) : datetime_convert()); + $arr['edited'] = ((x($arr, 'edited') !== false) ? datetime_convert('UTC','UTC', $arr['edited']) : datetime_convert()); + $arr['commented'] = ((x($arr, 'commented') !== false) ? datetime_convert('UTC','UTC', $arr['commented']) : datetime_convert()); + $arr['received'] = ((x($arr, 'received') !== false) ? datetime_convert('UTC','UTC', $arr['received']) : datetime_convert()); + $arr['changed'] = ((x($arr, 'changed') !== false) ? datetime_convert('UTC','UTC', $arr['changed']) : datetime_convert()); + $arr['title'] = ((x($arr, 'title')) ? trim($arr['title']) : ''); + $arr['location'] = ((x($arr, 'location')) ? trim($arr['location']) : ''); + $arr['coord'] = ((x($arr, 'coord')) ? notags(trim($arr['coord'])) : ''); + $arr['last-child'] = ((x($arr, 'last-child')) ? intval($arr['last-child']) : 0 ); + $arr['visible'] = ((x($arr, 'visible') !== false) ? intval($arr['visible']) : 1 ); $arr['deleted'] = 0; - $arr['parent-uri'] = ((x($arr,'parent-uri')) ? notags(trim($arr['parent-uri'])) : $arr['uri']); - $arr['verb'] = ((x($arr,'verb')) ? notags(trim($arr['verb'])) : ''); - $arr['object-type'] = ((x($arr,'object-type')) ? notags(trim($arr['object-type'])) : ''); - $arr['object'] = ((x($arr,'object')) ? trim($arr['object']) : ''); - $arr['target-type'] = ((x($arr,'target-type')) ? notags(trim($arr['target-type'])) : ''); - $arr['target'] = ((x($arr,'target')) ? trim($arr['target']) : ''); - $arr['plink'] = ((x($arr,'plink')) ? notags(trim($arr['plink'])) : ''); - $arr['allow_cid'] = ((x($arr,'allow_cid')) ? trim($arr['allow_cid']) : ''); - $arr['allow_gid'] = ((x($arr,'allow_gid')) ? trim($arr['allow_gid']) : ''); - $arr['deny_cid'] = ((x($arr,'deny_cid')) ? trim($arr['deny_cid']) : ''); - $arr['deny_gid'] = ((x($arr,'deny_gid')) ? trim($arr['deny_gid']) : ''); - $arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0 ); - $arr['bookmark'] = ((x($arr,'bookmark')) ? intval($arr['bookmark']) : 0 ); - $arr['body'] = ((x($arr,'body')) ? trim($arr['body']) : ''); - $arr['tag'] = ((x($arr,'tag')) ? notags(trim($arr['tag'])) : ''); - $arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : ''); - $arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : ''); - $arr['origin'] = ((x($arr,'origin')) ? intval($arr['origin']) : 0 ); - $arr['network'] = ((x($arr,'network')) ? trim($arr['network']) : ''); - $arr['postopts'] = ((x($arr,'postopts')) ? trim($arr['postopts']) : ''); - $arr['resource-id'] = ((x($arr,'resource-id')) ? trim($arr['resource-id']) : ''); - $arr['event-id'] = ((x($arr,'event-id')) ? intval($arr['event-id']) : 0 ); - $arr['inform'] = ((x($arr,'inform')) ? trim($arr['inform']) : ''); - $arr['file'] = ((x($arr,'file')) ? trim($arr['file']) : ''); + $arr['parent-uri'] = ((x($arr, 'parent-uri')) ? notags(trim($arr['parent-uri'])) : $arr['uri']); + $arr['verb'] = ((x($arr, 'verb')) ? notags(trim($arr['verb'])) : ''); + $arr['object-type'] = ((x($arr, 'object-type')) ? notags(trim($arr['object-type'])) : ''); + $arr['object'] = ((x($arr, 'object')) ? trim($arr['object']) : ''); + $arr['target-type'] = ((x($arr, 'target-type')) ? notags(trim($arr['target-type'])) : ''); + $arr['target'] = ((x($arr, 'target')) ? trim($arr['target']) : ''); + $arr['plink'] = ((x($arr, 'plink')) ? notags(trim($arr['plink'])) : ''); + $arr['allow_cid'] = ((x($arr, 'allow_cid')) ? trim($arr['allow_cid']) : ''); + $arr['allow_gid'] = ((x($arr, 'allow_gid')) ? trim($arr['allow_gid']) : ''); + $arr['deny_cid'] = ((x($arr, 'deny_cid')) ? trim($arr['deny_cid']) : ''); + $arr['deny_gid'] = ((x($arr, 'deny_gid')) ? trim($arr['deny_gid']) : ''); + $arr['private'] = ((x($arr, 'private')) ? intval($arr['private']) : 0 ); + $arr['bookmark'] = ((x($arr, 'bookmark')) ? intval($arr['bookmark']) : 0 ); + $arr['body'] = ((x($arr, 'body')) ? trim($arr['body']) : ''); + $arr['tag'] = ((x($arr, 'tag')) ? notags(trim($arr['tag'])) : ''); + $arr['attach'] = ((x($arr, 'attach')) ? notags(trim($arr['attach'])) : ''); + $arr['app'] = ((x($arr, 'app')) ? notags(trim($arr['app'])) : ''); + $arr['origin'] = ((x($arr, 'origin')) ? intval($arr['origin']) : 0 ); + $arr['network'] = ((x($arr, 'network')) ? trim($arr['network']) : ''); + $arr['postopts'] = ((x($arr, 'postopts')) ? trim($arr['postopts']) : ''); + $arr['resource-id'] = ((x($arr, 'resource-id')) ? trim($arr['resource-id']) : ''); + $arr['event-id'] = ((x($arr, 'event-id')) ? intval($arr['event-id']) : 0 ); + $arr['inform'] = ((x($arr, 'inform')) ? trim($arr['inform']) : ''); + $arr['file'] = ((x($arr, 'file')) ? trim($arr['file']) : ''); // Items cannot be stored before they happen ... - if ($arr['created'] > datetime_convert()) + if ($arr['created'] > datetime_convert()) { $arr['created'] = datetime_convert(); + } // We haven't invented time travel by now. - if ($arr['edited'] > datetime_convert()) + if ($arr['edited'] > datetime_convert()) { $arr['edited'] = datetime_convert(); + } - if (($arr['author-link'] == "") AND ($arr['owner-link'] == "")) - logger("Both author-link and owner-link are empty. Called by: ".App::callstack(), LOGGER_DEBUG); + if (($arr['author-link'] == "") AND ($arr['owner-link'] == "")) { + logger("Both author-link and owner-link are empty. Called by: " . App::callstack(), LOGGER_DEBUG); + } if ($arr['plink'] == "") { - $arr['plink'] = App::get_baseurl().'/display/'.urlencode($arr['guid']); + $arr['plink'] = App::get_baseurl() . '/display/' . urlencode($arr['guid']); } if ($arr['network'] == "") { @@ -571,59 +605,74 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc(normalise_link($arr['author-link'])) ); - if (!dbm::is_result($r)) + if (!dbm::is_result($r)) { $r = q("SELECT `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($arr['contact-id']), intval($arr['uid']) ); + } - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $arr['network'] = $r[0]["network"]; + } // Fallback to friendica (why is it empty in some cases?) - if ($arr['network'] == "") + if ($arr['network'] == "") { $arr['network'] = NETWORK_DFRN; + } - logger("item_store: Set network to ".$arr["network"]." for ".$arr["uri"], LOGGER_DEBUG); + logger("item_store: Set network to " . $arr["network"] . " for " . $arr["uri"], LOGGER_DEBUG); } // The contact-id should be set before "item_store" was called - but there seems to be some issues if ($arr["contact-id"] == 0) { - // First we are looking for a suitable contact that matches with the author of the post - // This is done only for comments (See below explanation at "gcontact-id") - if ($arr['parent-uri'] != $arr['uri']) + /* + * First we are looking for a suitable contact that matches with the author of the post + * This is done only for comments (See below explanation at "gcontact-id") + */ + if ($arr['parent-uri'] != $arr['uri']) { $arr["contact-id"] = get_contact($arr['author-link'], $uid); + } // If not present then maybe the owner was found - if ($arr["contact-id"] == 0) + if ($arr["contact-id"] == 0) { $arr["contact-id"] = get_contact($arr['owner-link'], $uid); + } // Still missing? Then use the "self" contact of the current user if ($arr["contact-id"] == 0) { $r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid` = %d", intval($uid)); - if ($r) + + if (dbm::is_result($r)) { $arr["contact-id"] = $r[0]["id"]; + } } + logger("Contact-id was missing for post ".$arr["guid"]." from user id ".$uid." - now set to ".$arr["contact-id"], LOGGER_DEBUG); } if ($arr["gcontact-id"] == 0) { - // The gcontact should mostly behave like the contact. But is is supposed to be global for the system. - // This means that wall posts, repeated posts, etc. should have the gcontact id of the owner. - // On comments the author is the better choice. - if ($arr['parent-uri'] === $arr['uri']) + /* + * The gcontact should mostly behave like the contact. But is is supposed to be global for the system. + * This means that wall posts, repeated posts, etc. should have the gcontact id of the owner. + * On comments the author is the better choice. + */ + if ($arr['parent-uri'] === $arr['uri']) { $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['owner-link'], "network" => $arr['network'], "photo" => $arr['owner-avatar'], "name" => $arr['owner-name'])); - else + } else { $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['author-link'], "network" => $arr['network'], "photo" => $arr['author-avatar'], "name" => $arr['author-name'])); + } } - if ($arr["author-id"] == 0) + if ($arr["author-id"] == 0) { $arr["author-id"] = get_contact($arr["author-link"], 0); + } - if ($arr["owner-id"] == 0) + if ($arr["owner-id"] == 0) { $arr["owner-id"] = get_contact($arr["owner-link"], 0); + } if ($arr['guid'] != "") { // Checking if there is already an item with the same guid @@ -673,8 +722,10 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc($r[0]['parent-uri']), intval($arr['uid']) ); - if ($z && count($z)) + + if (dbm::is_result($z)) { $r = $z; + } } $parent_id = $r[0]['id']; @@ -686,20 +737,23 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa $arr['wall'] = $r[0]['wall']; $notify_type = 'comment-new'; - // if the parent is private, force privacy for the entire conversation - // This differs from the above settings as it subtly allows comments from - // email correspondents to be private even if the overall thread is not. - - if ($r[0]['private']) + /* + * If the parent is private, force privacy for the entire conversation + * This differs from the above settings as it subtly allows comments from + * email correspondents to be private even if the overall thread is not. + */ + if ($r[0]['private']) { $arr['private'] = $r[0]['private']; + } - // Edge case. We host a public forum that was originally posted to privately. - // The original author commented, but as this is a comment, the permissions - // weren't fixed up so it will still show the comment as private unless we fix it here. - - if ((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private'])) + /* + * Edge case. We host a public forum that was originally posted to privately. + * The original author commented, but as this is a comment, the permissions + * weren't fixed up so it will still show the comment as private unless we fix it here. + */ + if ((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private'])) { $arr['private'] = 0; - + } // If its a post from myself then tag the thread as "mention" logger("item_store: Checking if parent ".$parent_id." has to be tagged as mention for user ".$arr['uid'], LOGGER_DEBUG); @@ -714,10 +768,10 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa } } } else { - - // Allow one to see reply tweets from status.net even when - // we don't have or can't see the original post. - + /* + * Allow one to see reply tweets from status.net even when + * we don't have or can't see the original post. + */ if ($force_parent) { logger('item_store: $force_parent=true, reply converted to top-level post.'); $parent_id = 0; @@ -777,14 +831,15 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa } else { $isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `uri` = '%s'", dbesc($arr["uri"])); - $arr["global"] = (count($isglobal) > 0); + $arr["global"] = (dbm::is_result($isglobal) && count($isglobal) > 0); } // ACL settings - if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) + if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) { $private = 1; - else + } else { $private = $arr['private']; + } $arr["allow_cid"] = $allow_cid; $arr["allow_gid"] = $allow_gid; @@ -796,19 +851,22 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // Fill the cache field put_item_in_cache($arr); - if ($notify) - call_hooks('post_local',$arr); - else - call_hooks('post_remote',$arr); + if ($notify) { + call_hooks('post_local', $arr); + } else { + call_hooks('post_remote', $arr); + } - if (x($arr,'cancel')) { + if (x($arr, 'cancel')) { logger('item_store: post cancelled by plugin.'); return 0; } - // Check for already added items. - // There is a timing issue here that sometimes creates double postings. - // An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this. + /* + * Check for already added items. + * There is a timing issue here that sometimes creates double postings. + * An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this. + */ if ($arr["uid"] == 0) { $r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc(trim($arr['uri']))); if (dbm::is_result($r)) { @@ -893,7 +951,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa if ($r[0]["entries"] > 1) { // There are duplicates. We delete our just created entry. - logger('Duplicated post occurred. uri = '.$arr['uri'].' uid = '.$arr['uid']); + logger('Duplicated post occurred. uri = ' . $arr['uri'] . ' uid = ' . $arr['uid']); // Yes, we could do a rollback here - but we are having many users with MyISAM. q("DELETE FROM `item` WHERE `id` = %d", intval($current_post)); @@ -909,8 +967,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa logger('item_store: created item '.$current_post); item_set_last_item($arr); - if (!$parent_id || ($arr['parent-uri'] === $arr['uri'])) + if (!$parent_id || ($arr['parent-uri'] === $arr['uri'])) { $parent_id = $current_post; + } // Set parent id $r = q("UPDATE `item` SET `parent` = %d WHERE `id` = %d", @@ -923,28 +982,31 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // update the commented timestamp on the parent // Only update "commented" if it is really a comment - if (($arr['verb'] == ACTIVITY_POST) OR !get_config("system", "like_no_comment")) + if (($arr['verb'] == ACTIVITY_POST) OR !get_config("system", "like_no_comment")) { q("UPDATE `item` SET `commented` = '%s', `changed` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), dbesc(datetime_convert()), intval($parent_id) ); - else + } else { q("UPDATE `item` SET `changed` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($parent_id) ); + } if ($dsprsig) { - // Friendica servers lower than 3.4.3-2 had double encoded the signature ... - // We can check for this condition when we decode and encode the stuff again. + /* + * Friendica servers lower than 3.4.3-2 had double encoded the signature ... + * We can check for this condition when we decode and encode the stuff again. + */ if (base64_encode(base64_decode(base64_decode($dsprsig->signature))) == base64_decode($dsprsig->signature)) { $dsprsig->signature = base64_decode($dsprsig->signature); logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG); } - q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", + q("INSERT INTO `sign` (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", intval($current_post), dbesc($dsprsig->signed_text), dbesc($dsprsig->signature), @@ -952,10 +1014,12 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa ); } - $deleted = tag_deliver($arr['uid'],$current_post); + $deleted = tag_deliver($arr['uid'], $current_post); - // current post can be deleted if is for a community page and no mention are - // in it. + /* + * current post can be deleted if is for a community page and no mention are + * in it. + */ if (!$deleted AND !$dontcache) { $r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post)); @@ -978,13 +1042,17 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa q("COMMIT"); - // Due to deadlock issues with the "term" table we are doing these steps after the commit. - // This is not perfect - but a workable solution until we found the reason for the problem. + /* + * Due to deadlock issues with the "term" table we are doing these steps after the commit. + * This is not perfect - but a workable solution until we found the reason for the problem. + */ create_tags_from_item($current_post); create_files_from_item($current_post); - // If this is now the last-child, force all _other_ children of this parent to *not* be last-child - // It is done after the transaction to avoid dead locks. + /* + * If this is now the last-child, force all _other_ children of this parent to *not* be last-child + * It is done after the transaction to avoid dead locks. + */ if ($arr['last-child']) { $r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d AND `id` != %d", dbesc($arr['uri']), @@ -1025,7 +1093,7 @@ function item_set_last_item($arr) { if (!$update AND ($arr["network"] == NETWORK_DFRN) AND ($arr["parent-uri"] === $arr["uri"])) { $isforum = q("SELECT `forum` FROM `contact` WHERE `id` = %d AND `forum`", intval($arr['contact-id'])); - if ($isforum) { + if (dbm::is_result($isforum)) { $update = true; } } @@ -1060,8 +1128,9 @@ function item_body_set_hashtags(&$item) { $tags = get_tags($item["body"]); // No hashtags? - if (!count($tags)) - return(false); + if (!count($tags)) { + return false; + } // This sorting is important when there are hashtags that are part of other hashtags // Otherwise there could be problems with hashtags like #test and #test2 @@ -1071,6 +1140,7 @@ function item_body_set_hashtags(&$item) { $URLSearchString = "^\[\]"; + /// @TODO old-lost code? // All hashtags should point to the home server //$item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", // "#[url=".App::get_baseurl()."/search?tag=$2]$2[/url]", $item["body"]); @@ -1080,41 +1150,39 @@ function item_body_set_hashtags(&$item) { // mask hashtags inside of url, bookmarks and attachments to avoid urls in urls $item["body"] = preg_replace_callback("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", - function ($match){ - return("[url=".str_replace("#", "#", $match[1])."]".str_replace("#", "#", $match[2])."[/url]"); - },$item["body"]); + function ($match) { + return ("[url=" . str_replace("#", "#", $match[1]) . "]" . str_replace("#", "#", $match[2]) . "[/url]"); + }, $item["body"]); $item["body"] = preg_replace_callback("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", - function ($match){ - return("[bookmark=".str_replace("#", "#", $match[1])."]".str_replace("#", "#", $match[2])."[/bookmark]"); - },$item["body"]); + function ($match) { + return ("[bookmark=" . str_replace("#", "#", $match[1]) . "]" . str_replace("#", "#", $match[2]) . "[/bookmark]"); + }, $item["body"]); $item["body"] = preg_replace_callback("/\[attachment (.*)\](.*?)\[\/attachment\]/ism", - function ($match){ - return("[attachment ".str_replace("#", "#", $match[1])."]".$match[2]."[/attachment]"); - },$item["body"]); + function ($match) { + return ("[attachment " . str_replace("#", "#", $match[1]) . "]" . $match[2] . "[/attachment]"); + }, $item["body"]); // Repair recursive urls $item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", "#$2", $item["body"]); - - foreach($tags as $tag) { - if (strpos($tag,'#') !== 0) - continue; - - if (strpos($tag,'[url=')) + foreach ($tags as $tag) { + if ((strpos($tag, '#') !== 0) || (strpos($tag, '[url='))) { continue; + } $basetag = str_replace('_',' ',substr($tag,1)); - $newtag = '#[url='.App::get_baseurl().'/search?tag='.rawurlencode($basetag).']'.$basetag.'[/url]'; + $newtag = '#[url=' . App::get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; $item["body"] = str_replace($tag, $newtag, $item["body"]); - if (!stristr($item["tag"],"/search?tag=".$basetag."]".$basetag."[/url]")) { - if (strlen($item["tag"])) + if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) { + if (strlen($item["tag"])) { $item["tag"] = ','.$item["tag"]; + } $item["tag"] = $newtag.$item["tag"]; } } @@ -1125,10 +1193,12 @@ function item_body_set_hashtags(&$item) { function get_item_guid($id) { $r = q("SELECT `guid` FROM `item` WHERE `id` = %d LIMIT 1", intval($id)); - if (dbm::is_result($r)) - return($r[0]["guid"]); - else - return(""); + if (dbm::is_result($r)) { + return $r[0]["guid"]; + } else { + /// @TODO This else-block can be elimited again + return ""; + } } function get_item_id($guid, $uid = 0) { @@ -1136,8 +1206,9 @@ function get_item_id($guid, $uid = 0) { $nick = ""; $id = 0; - if ($uid == 0) + if ($uid == 0) { $uid == local_user(); + } // Does the given user have this item? if ($uid) { @@ -1163,14 +1234,15 @@ function get_item_id($guid, $uid = 0) { $nick = $r[0]["nickname"]; } } - return(array("nick" => $nick, "id" => $id)); + return array("nick" => $nick, "id" => $id); } // return - test -function get_item_contact($item,$contacts) { - if (! count($contacts) || (! is_array($item))) +function get_item_contact($item, $contacts) { + if (! count($contacts) || (! is_array($item))) { return false; - foreach($contacts as $contact) { + } + foreach ($contacts as $contact) { if ($contact['id'] == $item['contact-id']) { return $contact; break; // NOTREACHED @@ -1185,15 +1257,13 @@ function get_item_contact($item,$contacts) { * @param int $item_id * @return bool true if item was deleted, else false */ -function tag_deliver($uid,$item_id) { - - // +function tag_deliver($uid, $item_id) { $a = get_app(); $mention = false; - $u = q("select * from user where uid = %d limit 1", + $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid) ); @@ -1217,24 +1287,25 @@ function tag_deliver($uid,$item_id) { $link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']); - // Diaspora uses their own hardwired link URL in @-tags - // instead of the one we supply with webfinger - + /* + * Diaspora uses their own hardwired link URL in @-tags + * instead of the one we supply with webfinger + */ $dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']); - $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { - if (link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { + foreach ($matches as $mtch) { + if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) { $mention = true; logger('tag_deliver: mention found: ' . $mtch[2]); } } } - if (! $mention){ - if ( ($community_page || $prvgroup) && - (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])){ + if (! $mention) { + if (($community_page || $prvgroup) && + (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])) { // mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment) // delete it! logger("tag_deliver: no-mention top-level post to communuty or private group. delete."); @@ -1251,21 +1322,21 @@ function tag_deliver($uid,$item_id) { call_hooks('tagged', $arr); - if ((! $community_page) && (! $prvgroup)) + if ((! $community_page) && (! $prvgroup)) { return; + } - - // tgroup delivery - setup a second delivery chain - // prevent delivery looping - only proceed - // if the message originated elsewhere and is a top-level post - - if (($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) + /* + * tgroup delivery - setup a second delivery chain + * prevent delivery looping - only proceed + * if the message originated elsewhere and is a top-level post + */ + if (($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) { return; + } // now change this copy of the post to a forum head message and deliver to all the tgroup members - - - $c = q("select name, url, thumb from contact where self = 1 and uid = %d limit 1", + $c = q("SELECT `name`, `url`, `thumb` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", intval($u[0]['uid']) ); if (! dbm::is_result($c)) { @@ -1299,14 +1370,15 @@ function tag_deliver($uid,$item_id) { -function tgroup_check($uid,$item) { +function tgroup_check($uid, $item) { $mention = false; // check that the message originated elsewhere and is a top-level post - if (($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri'])) + if (($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri'])) { return false; + } /// @TODO Encapsulate this or find it encapsulated and replace all occurrances $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", @@ -1319,18 +1391,18 @@ function tgroup_check($uid,$item) { $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); $prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false); - $link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']); - // Diaspora uses their own hardwired link URL in @-tags - // instead of the one we supply with webfinger - + /* + * Diaspora uses their own hardwired link URL in @-tags + * instead of the one we supply with webfinger + */ $dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']); - $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) { foreach ($matches as $mtch) { - if (link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { + if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) { $mention = true; logger('tgroup_check: mention found: ' . $mtch[2]); } @@ -1341,23 +1413,25 @@ function tgroup_check($uid,$item) { return false; } - /// @TODO Combines both return statements into one + /// @TODO Combine both return statements into one return (($community_page) || ($prvgroup)); } -/* - This function returns true if $update has an edited timestamp newer - than $existing, i.e. $update contains new data which should override - what's already there. If there is no timestamp yet, the update is - assumed to be newer. If the update has no timestamp, the existing - item is assumed to be up-to-date. If the timestamps are equal it - assumes the update has been seen before and should be ignored. - */ -function edited_timestamp_is_newer($existing, $update) { - if (!x($existing,'edited') || !$existing['edited']) { +/** + * This function returns true if $update has an edited timestamp newer + * than $existing, i.e. $update contains new data which should override + * what's already there. If there is no timestamp yet, the update is + * assumed to be newer. If the update has no timestamp, the existing + * item is assumed to be up-to-date. If the timestamps are equal it + * assumes the update has been seen before and should be ignored. + * + * @todo fix type-hints (both array) + */ +function edited_timestamp_is_newer ($existing, $update) { + if (!x($existing, 'edited') || !$existing['edited']) { return true; } - if (!x($update,'edited') || !$update['edited']) { + if (!x($update, 'edited') || !$update['edited']) { return false; } @@ -1391,16 +1465,17 @@ function edited_timestamp_is_newer($existing, $update) { * model where comments can have sub-threads. That would require some massive sorting * to get all the feed items into a mostly linear ordering, and might still require * recursion. + * + * @todo find proper type-hints */ - -function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) { +function consume_feed($xml, $importer, &$contact, &$hub, $datedir = 0, $pass = 0) { if ($contact['network'] === NETWORK_OSTATUS) { if ($pass < 2) { // Test - remove before flight //$tempfile = tempnam(get_temppath(), "ostatus2"); //file_put_contents($tempfile, $xml); logger("Consume OStatus messages ", LOGGER_DEBUG); - ostatus::import($xml,$importer,$contact, $hub); + ostatus::import($xml, $importer, $contact, $hub); } return; } @@ -1408,7 +1483,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if ($contact['network'] === NETWORK_FEED) { if ($pass < 2) { logger("Consume feeds", LOGGER_DEBUG); - feed_import($xml,$importer,$contact, $hub); + feed_import($xml, $importer, $contact, $hub); } return; } @@ -1416,7 +1491,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if ($contact['network'] === NETWORK_DFRN) { logger("Consume DFRN messages", LOGGER_DEBUG); - $r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, + $r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, `contact`.`pubkey` AS `cpubkey`, `contact`.`prvkey` AS `cprvkey`, `contact`.`thumb` AS `thumb`, @@ -1428,34 +1503,40 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) WHERE `contact`.`id` = %d AND `user`.`uid` = %d", dbesc($contact["id"]), dbesc($importer["uid"]) ); - if ($r) { + if (dbm::is_result($r)) { logger("Now import the DFRN feed"); - dfrn::import($xml,$r[0], true); + dfrn::import($xml, $r[0], true); return; } } } +/// @TODO type-hint is array function item_is_remote_self($contact, &$datarray) { $a = get_app(); - if (!$contact['remote_self']) + if (!$contact['remote_self']) { return false; + } // Prevent the forwarding of posts that are forwarded - if ($datarray["extid"] == NETWORK_DFRN) + if ($datarray["extid"] == NETWORK_DFRN) { return false; + } // Prevent to forward already forwarded posts - if ($datarray["app"] == $a->get_hostname()) + if ($datarray["app"] == $a->get_hostname()) { return false; + } // Only forward posts - if ($datarray["verb"] != ACTIVITY_POST) + if ($datarray["verb"] != ACTIVITY_POST) { return false; + } - if (($contact['network'] != NETWORK_FEED) AND $datarray['private']) + if (($contact['network'] != NETWORK_FEED) AND $datarray['private']) { return false; + } $datarray2 = $datarray; logger('remote-self start - Contact '.$contact['url'].' - '.$contact['remote_self'].' Item '.print_r($datarray, true), LOGGER_DEBUG); @@ -1477,25 +1558,28 @@ function item_is_remote_self($contact, &$datarray) { if ($contact['network'] != NETWORK_FEED) { $datarray["guid"] = get_guid(32); unset($datarray["plink"]); - $datarray["uri"] = item_new_uri($a->get_hostname(),$contact['uid'], $datarray["guid"]); + $datarray["uri"] = item_new_uri($a->get_hostname(), $contact['uid'], $datarray["guid"]); $datarray["parent-uri"] = $datarray["uri"]; $datarray["extid"] = $contact['network']; $urlpart = parse_url($datarray2['author-link']); $datarray["app"] = $urlpart["host"]; - } else + } else { $datarray['private'] = 0; + } } if ($contact['network'] != NETWORK_FEED) { // Store the original post $r = item_store($datarray2, false, false); logger('remote-self post original item - Contact '.$contact['url'].' return '.$r.' Item '.print_r($datarray2, true), LOGGER_DEBUG); - } else + } else { $datarray["app"] = "Feed"; + } return true; } +/// @TODO find proper type-hints function new_follower($importer, $contact, $datarray, $item, $sharing = false) { $url = notags(trim($datarray['author-link'])); $name = notags(trim($datarray['author-name'])); @@ -1546,6 +1630,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) { update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true); } + /// @TODO Encapsulate this into a function/method $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer['uid']) ); @@ -1634,17 +1719,18 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { ); } - // Diaspora has different message-ids in feeds than they do - // through the direct Diaspora protocol. If we try and use - // the feed, we'll get duplicates. So don't. - - if ((! dbm::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) + /* + * Diaspora has different message-ids in feeds than they do + * through the direct Diaspora protocol. If we try and use + * the feed, we'll get duplicates. So don't. + */ + if ((! dbm::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) { return; + } $push_url = get_config('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id']; // Use a single verify token, even if multiple hubs - $verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string()); $params= 'hub.mode=' . $hubmode . '&hub.callback=' . urlencode($push_url) . '&hub.topic=' . urlencode($contact['poll']) . '&hub.verify=async&hub.verify_token=' . $verify_token; @@ -1658,7 +1744,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { ); } - post_url($url,$params); + post_url($url, $params); logger('subscribe_to_hub: returns: ' . $a->get_curl_code(), LOGGER_DEBUG); @@ -1668,8 +1754,9 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { function fix_private_photos($s, $uid, $item = null, $cid = 0) { - if (get_config('system','disable_embedded')) + if (get_config('system','disable_embedded')) { return $s; + } $a = get_app(); @@ -1682,7 +1769,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_len = ($img_start !== false ? strpos(substr($orig_body, $img_start + $img_st_close + 1), '[/img]') : false); - while( ($img_st_close !== false) && ($img_len !== false) ) { + while ( ($img_st_close !== false) && ($img_len !== false) ) { $img_st_close++; // make it point to AFTER the closing bracket $image = substr($orig_body, $img_start + $img_st_close, $img_len); @@ -1694,27 +1781,28 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { // Only embed locally hosted photos $replace = false; $i = basename($image); - $i = str_replace(array('.jpg','.png','.gif'),array('','',''),$i); - $x = strpos($i,'-'); + $i = str_replace(array('.jpg', '.png', '.gif'),array('', '',''), $i); + $x = strpos($i, '-'); if ($x) { - $res = substr($i,$x+1); - $i = substr($i,0,$x); + $res = substr($i, $x + 1); + $i = substr($i, 0, $x); $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d AND `uid` = %d", dbesc($i), intval($res), intval($uid) + ); - if ($r) { - - // Check to see if we should replace this photo link with an embedded image - // 1. No need to do so if the photo is public - // 2. If there's a contact-id provided, see if they're in the access list - // for the photo. If so, embed it. - // 3. Otherwise, if we have an item, see if the item permissions match the photo - // permissions, regardless of order but first check to see if they're an exact - // match to save some processing overhead. - + if (dbm::is_result($r)) { + /* + * Check to see if we should replace this photo link with an embedded image + * 1. No need to do so if the photo is public + * 2. If there's a contact-id provided, see if they're in the access list + * for the photo. If so, embed it. + * 3. Otherwise, if we have an item, see if the item permissions match the photo + * permissions, regardless of order but first check to see if they're an exact + * match to save some processing overhead. + */ if (has_permissions($r[0])) { if ($cid) { $recips = enumerate_permissions($r[0]); @@ -1722,8 +1810,9 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $replace = true; } } elseif ($item) { - if (compare_permissions($item,$r[0])) + if (compare_permissions($item, $r[0])) { $replace = true; + } } } if ($replace) { @@ -1755,8 +1844,9 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $new_body = $new_body . substr($orig_body, 0, $img_start + $img_st_close) . $image . '[/img]'; $orig_body = substr($orig_body, $img_start + $img_st_close + $img_len + strlen('[/img]')); - if ($orig_body === false) + if ($orig_body === false) { $orig_body = ''; + } $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); @@ -1765,63 +1855,75 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $new_body = $new_body . $orig_body; - return($new_body); + return $new_body; } +/// @TODO type-hint is array function has_permissions($obj) { - if (($obj['allow_cid'] != '') || ($obj['allow_gid'] != '') || ($obj['deny_cid'] != '') || ($obj['deny_gid'] != '')) - return true; - return false; + return ( + ( + x($obj, 'allow_cid') + ) || ( + x($obj, 'allow_gid') + ) || ( + x($obj, 'deny_cid') + ) || ( + x($obj, 'deny_gid') + ) + ); } -function compare_permissions($obj1,$obj2) { +/// @TODO type-hint is array +function compare_permissions($obj1, $obj2) { // first part is easy. Check that these are exactly the same. if (($obj1['allow_cid'] == $obj2['allow_cid']) && ($obj1['allow_gid'] == $obj2['allow_gid']) && ($obj1['deny_cid'] == $obj2['deny_cid']) - && ($obj1['deny_gid'] == $obj2['deny_gid'])) + && ($obj1['deny_gid'] == $obj2['deny_gid'])) { return true; + } // This is harder. Parse all the permissions and compare the resulting set. - $recipients1 = enumerate_permissions($obj1); $recipients2 = enumerate_permissions($obj2); sort($recipients1); sort($recipients2); - if ($recipients1 == $recipients2) - return true; - return false; + + /// @TODO Comparison of arrays, maybe use array_diff_assoc() here? + return ($recipients1 == $recipients2); } // returns an array of contact-ids that are allowed to see this object - +/// @TODO type-hint is array function enumerate_permissions($obj) { $allow_people = expand_acl($obj['allow_cid']); $allow_groups = expand_groups(expand_acl($obj['allow_gid'])); $deny_people = expand_acl($obj['deny_cid']); $deny_groups = expand_groups(expand_acl($obj['deny_gid'])); - $recipients = array_unique(array_merge($allow_people,$allow_groups)); - $deny = array_unique(array_merge($deny_people,$deny_groups)); - $recipients = array_diff($recipients,$deny); + $recipients = array_unique(array_merge($allow_people, $allow_groups)); + $deny = array_unique(array_merge($deny_people, $deny_groups)); + $recipients = array_diff($recipients, $deny); return $recipients; } function item_getfeedtags($item) { $ret = array(); $matches = false; - $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); + $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches); if ($cnt) { - for($x = 0; $x < $cnt; $x ++) { - if ($matches[1][$x]) - $ret[$matches[2][$x]] = array('#',$matches[1][$x], $matches[2][$x]); + for ($x = 0; $x < $cnt; $x ++) { + if ($matches[1][$x]) { + $ret[$matches[2][$x]] = array('#', $matches[1][$x], $matches[2][$x]); + } } } $matches = false; - $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); + $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches); if ($cnt) { - for($x = 0; $x < $cnt; $x ++) { - if ($matches[1][$x]) - $ret[] = array('@',$matches[1][$x], $matches[2][$x]); + for ($x = 0; $x < $cnt; $x ++) { + if ($matches[1][$x]) { + $ret[] = array('@', $matches[1][$x], $matches[2][$x]); + } } } return $ret; @@ -1829,23 +1931,29 @@ function item_getfeedtags($item) { function item_expire($uid, $days, $network = "", $force = false) { - if ((! $uid) || ($days < 1)) + if ((! $uid) || ($days < 1)) { return; + } - // $expire_network_only = save your own wall posts - // and just expire conversations started by others - - $expire_network_only = get_pconfig($uid,'expire','network_only'); + /* + * $expire_network_only = save your own wall posts + * and just expire conversations started by others + */ + $expire_network_only = get_pconfig($uid,'expire', 'network_only'); $sql_extra = ((intval($expire_network_only)) ? " AND wall = 0 " : ""); if ($network != "") { $sql_extra .= sprintf(" AND network = '%s' ", dbesc($network)); - // There is an index "uid_network_received" but not "uid_network_created" - // This avoids the creation of another index just for one purpose. - // And it doesn't really matter wether to look at "received" or "created" + + /* + * There is an index "uid_network_received" but not "uid_network_created" + * This avoids the creation of another index just for one purpose. + * And it doesn't really matter wether to look at "received" or "created" + */ $range = "AND `received` < UTC_TIMESTAMP() - INTERVAL %d DAY "; - } else + } else { $range = "AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY "; + } $r = q("SELECT `file`, `resource-id`, `starred`, `type`, `id` FROM `item` WHERE `uid` = %d $range @@ -1856,61 +1964,66 @@ function item_expire($uid, $days, $network = "", $force = false) { intval($days) ); - if (! dbm::is_result($r)) + if (! dbm::is_result($r)) { return; + } - $expire_items = get_pconfig($uid, 'expire','items'); - $expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1 + $expire_items = get_pconfig($uid, 'expire', 'items'); + $expire_items = (($expire_items === false) ? 1 : intval($expire_items)); // default if not set: 1 // Forcing expiring of items - but not notes and marked items - if ($force) + if ($force) { $expire_items = true; + } - $expire_notes = get_pconfig($uid, 'expire','notes'); - $expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1 + $expire_notes = get_pconfig($uid, 'expire', 'notes'); + $expire_notes = (($expire_notes === false) ? 1 : intval($expire_notes)); // default if not set: 1 - $expire_starred = get_pconfig($uid, 'expire','starred'); - $expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1 + $expire_starred = get_pconfig($uid, 'expire', 'starred'); + $expire_starred = (($expire_starred === false) ? 1 : intval($expire_starred)); // default if not set: 1 - $expire_photos = get_pconfig($uid, 'expire','photos'); - $expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0 + $expire_photos = get_pconfig($uid, 'expire', 'photos'); + $expire_photos = (($expire_photos === false) ? 0 : intval($expire_photos)); // default if not set: 0 logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); - foreach($r as $item) { + foreach ($r as $item) { // don't expire filed items - if (strpos($item['file'],'[') !== false) + if (strpos($item['file'],'[') !== false) { continue; + } // Only expire posts, not photos and photo comments - if ($expire_photos==0 && strlen($item['resource-id'])) + if ($expire_photos == 0 && strlen($item['resource-id'])) { continue; - if ($expire_starred==0 && intval($item['starred'])) + } elseif ($expire_starred == 0 && intval($item['starred'])) { continue; - if ($expire_notes==0 && $item['type']=='note') + } elseif ($expire_notes == 0 && $item['type'] == 'note') { continue; - if ($expire_items==0 && $item['type']!='note') + } elseif ($expire_items == 0 && $item['type'] != 'note') { continue; + } - drop_item($item['id'],false); + drop_item($item['id'], false); } - proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid); + proc_run(PRIORITY_HIGH, "include/notifier.php", "expire", $uid); } - +/// @TODO type-hint is array function drop_items($items) { $uid = 0; - if (! local_user() && ! remote_user()) + if (! local_user() && ! remote_user()) { return; + } if (count($items)) { - foreach($items as $item) { + foreach ($items as $item) { $owner = drop_item($item,false); if ($owner && ! $uid) $uid = $owner; @@ -1919,12 +2032,13 @@ function drop_items($items) { // multiple threads may have been deleted, send an expire notification - if ($uid) - proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid); + if ($uid) { + proc_run(PRIORITY_HIGH, "include/notifier.php", "expire", $uid); + } } -function drop_item($id,$interactive = true) { +function drop_item($id, $interactive = true) { $a = get_app(); @@ -1935,8 +2049,9 @@ function drop_item($id,$interactive = true) { ); if (! dbm::is_result($r)) { - if (! $interactive) + if (! $interactive) { return 0; + } notice( t('Item not found.') . EOL); goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); } @@ -1950,7 +2065,7 @@ function drop_item($id,$interactive = true) { // check if logged in user is either the author or owner of this item if (is_array($_SESSION['remote'])) { - foreach($_SESSION['remote'] as $visitor) { + foreach ($_SESSION['remote'] as $visitor) { if ($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) { $contact_id = $visitor['cid']; break; @@ -1967,7 +2082,7 @@ function drop_item($id,$interactive = true) { // so add any arguments as hidden inputs $query = explode_querystring($a->query_string); $inputs = array(); - foreach($query['args'] as $arg) { + foreach ($query['args'] as $arg) { if (strpos($arg, 'confirm=') === false) { $arg_parts = explode('=', $arg); $inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]); @@ -2004,27 +2119,28 @@ function drop_item($id,$interactive = true) { // clean up categories and tags so they don't end up as orphans $matches = false; - $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { - file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],true); + foreach ($matches as $mtch) { + file_tag_unsave_file($item['uid'], $item['id'], $mtch[1],true); } } $matches = false; - $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { - file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],false); + foreach ($matches as $mtch) { + file_tag_unsave_file($item['uid'], $item['id'], $mtch[1],false); } } - // If item is a link to a photo resource, nuke all the associated photos - // (visitors will not have photo resources) - // This only applies to photos uploaded from the photos page. Photos inserted into a post do not - // generate a resource-id and therefore aren't intimately linked to the item. - + /* + * If item is a link to a photo resource, nuke all the associated photos + * (visitors will not have photo resources) + * This only applies to photos uploaded from the photos page. Photos inserted into a post do not + * generate a resource-id and therefore aren't intimately linked to the item. + */ if (strlen($item['resource-id'])) { q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ", dbesc($item['resource-id']), @@ -2034,7 +2150,6 @@ function drop_item($id,$interactive = true) { } // If item is a link to an event, nuke the event record. - if (intval($item['event-id'])) { q("DELETE FROM `event` WHERE `id` = %d AND `uid` = %d", intval($item['event-id']), @@ -2044,8 +2159,7 @@ function drop_item($id,$interactive = true) { } // If item has attachments, drop them - - foreach(explode(",",$item['attach']) as $attach){ + foreach (explode(", ", $item['attach']) as $attach) { preg_match("|attach/(\d+)|", $attach, $matches); q("DELETE FROM `attach` WHERE `id` = %d AND `uid` = %d", intval($matches[1]), @@ -2058,7 +2172,7 @@ function drop_item($id,$interactive = true) { // clean up item_id and sign meta-data tables /* - // Old code - caused very long queries and warning entries in the mysql logfiles: + /// @TODO Old code - caused very long queries and warning entries in the mysql logfiles: $r = q("DELETE FROM item_id where iid in (select id from item where parent = %d and uid = %d)", intval($item['id']), @@ -2074,29 +2188,28 @@ function drop_item($id,$interactive = true) { // The new code splits the queries since the mysql optimizer really has bad problems with subqueries // Creating list of parents - $r = q("select id from item where parent = %d and uid = %d", + $r = q("SELECT `id` FROM `item` WHERE `parent` = %d AND `uid` = %d", intval($item['id']), intval($item['uid']) ); $parentid = ""; - foreach ($r AS $row) { - if ($parentid != "") + foreach ($r as $row) { + if ($parentid != "") { $parentid .= ", "; + } $parentid .= $row["id"]; } // Now delete them if ($parentid != "") { - $r = q("DELETE FROM item_id where iid in (%s)", dbesc($parentid)); - - $r = q("DELETE FROM sign where iid in (%s)", dbesc($parentid)); + $r = q("DELETE FROM `item_id` WHERE `iid` IN (%s)", dbesc($parentid)); + $r = q("DELETE FROM `sign` WHERE `iid` IN (%s)", dbesc($parentid)); } // If it's the parent of a comment thread, kill all the kids - if ($item['uri'] == $item['parent-uri']) { $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = '' WHERE `parent-uri` = '%s' AND `uid` = %d ", @@ -2132,15 +2245,17 @@ function drop_item($id,$interactive = true) { // send the notification upstream/downstream as the case may be - proc_run(PRIORITY_HIGH,"include/notifier.php", "drop", $drop_id); + proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id); - if (! $interactive) + if (! $interactive) { return $owner; + } goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); //NOTREACHED } else { - if (! $interactive) + if (! $interactive) { return 0; + } notice( t('Permission denied.') . EOL); goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); //NOTREACHED @@ -2149,101 +2264,113 @@ function drop_item($id,$interactive = true) { } -function first_post_date($uid,$wall = false) { - $r = q("select id, created from item - where uid = %d and wall = %d and deleted = 0 and visible = 1 AND moderated = 0 - and id = parent - order by created asc limit 1", +function first_post_date($uid, $wall = false) { + $r = q("SELECT `id`, `created` FROM `item` + WHERE `uid` = %d AND `wall` = %d AND `deleted` = 0 AND `visible` = 1 AND `moderated` = 0 + AND `id` = `parent` + ORDER BY `created` ASC LIMIT 1", intval($uid), intval($wall ? 1 : 0) ); if (dbm::is_result($r)) { -// logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA); - return substr(datetime_convert('',date_default_timezone_get(),$r[0]['created']),0,10); + // logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA); + return substr(datetime_convert('',date_default_timezone_get(), $r[0]['created']),0,10); } return false; } /* modified posted_dates() {below} to arrange the list in years */ function list_post_dates($uid, $wall) { - $dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d'); + $dnow = datetime_convert('',date_default_timezone_get(), 'now','Y-m-d'); $dthen = first_post_date($uid, $wall); - if (! $dthen) + if (! $dthen) { return array(); + } // Set the start and end date to the beginning of the month - $dnow = substr($dnow,0,8).'01'; - $dthen = substr($dthen,0,8).'01'; + $dnow = substr($dnow, 0, 8) . '01'; + $dthen = substr($dthen, 0, 8) . '01'; $ret = array(); - // Starting with the current month, get the first and last days of every - // month down to and including the month of the first post - while(substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { - $dyear = intval(substr($dnow,0,4)); - $dstart = substr($dnow,0,8) . '01'; - $dend = substr($dnow,0,8) . get_dim(intval($dnow),intval(substr($dnow,5))); - $start_month = datetime_convert('','',$dstart,'Y-m-d'); - $end_month = datetime_convert('','',$dend,'Y-m-d'); - $str = day_translate(datetime_convert('','',$dnow,'F')); - if (! $ret[$dyear]) + /* + * Starting with the current month, get the first and last days of every + * month down to and including the month of the first post + */ + while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { + $dyear = intval(substr($dnow, 0, 4)); + $dstart = substr($dnow, 0, 8) . '01'; + $dend = substr($dnow, 0, 8) . get_dim(intval($dnow), intval(substr($dnow, 5))); + $start_month = datetime_convert('', '', $dstart, 'Y-m-d'); + $end_month = datetime_convert('', '', $dend, 'Y-m-d'); + $str = day_translate(datetime_convert('', '', $dnow, 'F')); + if (!$ret[$dyear]) { $ret[$dyear] = array(); - $ret[$dyear][] = array($str,$end_month,$start_month); - $dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d'); + } + $ret[$dyear][] = array($str, $end_month, $start_month); + $dnow = datetime_convert('', '', $dnow . ' -1 month', 'Y-m-d'); } return $ret; } -function posted_dates($uid,$wall) { - $dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d'); +function posted_dates($uid, $wall) { + $dnow = datetime_convert('', date_default_timezone_get(), 'now', 'Y-m-d'); - $dthen = first_post_date($uid,$wall); - if (! $dthen) + $dthen = first_post_date($uid, $wall); + if (! $dthen) { return array(); + } // Set the start and end date to the beginning of the month - $dnow = substr($dnow,0,8).'01'; - $dthen = substr($dthen,0,8).'01'; + $dnow = substr($dnow, 0, 8) . '01'; + $dthen = substr($dthen, 0, 8) . '01'; $ret = array(); - // Starting with the current month, get the first and last days of every - // month down to and including the month of the first post - while(substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { - $dstart = substr($dnow,0,8) . '01'; - $dend = substr($dnow,0,8) . get_dim(intval($dnow),intval(substr($dnow,5))); - $start_month = datetime_convert('','',$dstart,'Y-m-d'); - $end_month = datetime_convert('','',$dend,'Y-m-d'); - $str = day_translate(datetime_convert('','',$dnow,'F Y')); - $ret[] = array($str,$end_month,$start_month); - $dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d'); + /* + * Starting with the current month, get the first and last days of every + * month down to and including the month of the first post + */ + while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { + $dstart = substr($dnow, 0, 8) . '01'; + $dend = substr($dnow, 0, 8) . get_dim(intval($dnow), intval(substr($dnow, 5))); + $start_month = datetime_convert('', '', $dstart, 'Y-m-d'); + $end_month = datetime_convert('', '', $dend, 'Y-m-d'); + $str = day_translate(datetime_convert('', '', $dnow, 'F Y')); + $ret[] = array($str, $end_month, $start_month); + $dnow = datetime_convert('', '', $dnow . ' -1 month', 'Y-m-d'); } return $ret; } -function posted_date_widget($url,$uid,$wall) { +function posted_date_widget($url, $uid, $wall) { $o = ''; - if (! feature_enabled($uid,'archives')) + if (! feature_enabled($uid, 'archives')) { return $o; + } // For former Facebook folks that left because of "timeline" - -/* if ($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget'))) - return $o;*/ + /* + * @TODO old-lost code? + if ($wall && intval(get_pconfig($uid, 'system', 'no_wall_archive_widget'))) + return $o; + */ $visible_years = get_pconfig($uid,'system','archive_visible_years'); - if (! $visible_years) + if (! $visible_years) { $visible_years = 5; + } - $ret = list_post_dates($uid,$wall); + $ret = list_post_dates($uid, $wall); - if (! dbm::is_result($ret)) + if (! dbm::is_result($ret)) { return $o; + } - $cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years; - $cutoff = ((array_key_exists($cutoff_year,$ret))? true : false); + $cutoff_year = intval(datetime_convert('',date_default_timezone_get(), 'now', 'Y')) - $visible_years; + $cutoff = ((array_key_exists($cutoff_year, $ret))? true : false); $o = replace_macros(get_markup_template('posted_date_widget.tpl'),array( '$title' => t('Archives'), diff --git a/include/notifier.php b/include/notifier.php index e3d7d10d6..370611b4e 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -516,7 +516,8 @@ function notifier_run(&$argv, &$argc){ $r0 = Diaspora::relay_list(); } - $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s' + $r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network` + FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()", dbesc(NETWORK_DIASPORA), intval($owner['uid']), diff --git a/include/ostatus.php b/include/ostatus.php index 9b7849509..c1d730eb1 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -355,6 +355,14 @@ class ostatus { $item["body"] = add_page_info_to_body(html2bbcode($xpath->query('atom:content/text()', $entry)->item(0)->nodeValue)); $item["object-type"] = $xpath->query('activity:object-type/text()', $entry)->item(0)->nodeValue; + $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue; + + // Mastodon Content Warning + if (($item["verb"] == ACTIVITY_POST) AND $xpath->evaluate('boolean(atom:summary)', $entry)) { + $clear_text = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue; + + $item["body"] = html2bbcode($clear_text) . '[spoiler]' . $item["body"] . '[/spoiler]'; + } if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) OR ($item["object-type"] == ACTIVITY_OBJ_EVENT)) { $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue; @@ -363,11 +371,10 @@ class ostatus { $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue; } $item["object"] = $xml; - $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue; /// @TODO /// Delete a message - if ($item["verb"] == "qvitter-delete-notice") { + if ($item["verb"] == "qvitter-delete-notice" || $item["verb"] == ACTIVITY_DELETE) { // ignore "Delete" messages (by now) logger("Ignore delete message ".print_r($item, true)); continue; @@ -713,11 +720,11 @@ class ostatus { $conversations = q("SELECT `term`.`oid`, `term`.`url`, `term`.`uid` FROM `term` STRAIGHT_JOIN `thread` ON `thread`.`iid` = `term`.`oid` AND `thread`.`uid` = `term`.`uid` WHERE `term`.`type` = 7 AND `term`.`term` > '%s' AND `thread`.`mention` - GROUP BY `term`.`url`, `term`.`uid` ORDER BY `term`.`term` DESC", dbesc($start)); + GROUP BY `term`.`url`, `term`.`uid`, `term`.`oid`, `term`.`term` ORDER BY `term`.`term` DESC", dbesc($start)); } else { $conversations = q("SELECT `oid`, `url`, `uid` FROM `term` WHERE `type` = 7 AND `term` > '%s' - GROUP BY `url`, `uid` ORDER BY `term` DESC", dbesc($start)); + GROUP BY `url`, `uid`, `oid`, `term` ORDER BY `term` DESC", dbesc($start)); } foreach ($conversations AS $conversation) { @@ -1472,15 +1479,7 @@ class ostatus { $o = ""; $siteinfo = get_attached_data($item["body"]); - switch($siteinfo["type"]) { - case 'link': - $attributes = array("rel" => "enclosure", - "href" => $siteinfo["url"], - "type" => "text/html; charset=UTF-8", - "length" => "", - "title" => $siteinfo["title"]); - xml::add_element($doc, $root, "link", "", $attributes); - break; + switch ($siteinfo["type"]) { case 'photo': $imgdata = get_photo_info($siteinfo["image"]); $attributes = array("rel" => "enclosure", @@ -1502,29 +1501,31 @@ class ostatus { } if (($siteinfo["type"] != "photo") AND isset($siteinfo["image"])) { - $photodata = get_photo_info($siteinfo["image"]); + $imgdata = get_photo_info($siteinfo["image"]); + $attributes = array("rel" => "enclosure", + "href" => $siteinfo["image"], + "type" => $imgdata["mime"], + "length" => intval($imgdata["size"])); - $attributes = array("rel" => "preview", "href" => $siteinfo["image"], "media:width" => $photodata[0], "media:height" => $photodata[1]); xml::add_element($doc, $root, "link", "", $attributes); } - - $arr = explode('[/attach],',$item['attach']); - if(count($arr)) { - foreach($arr as $r) { + $arr = explode('[/attach],', $item['attach']); + if (count($arr)) { + foreach ($arr as $r) { $matches = false; - $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches); - if($cnt) { + $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches); + if ($cnt) { $attributes = array("rel" => "enclosure", "href" => $matches[1], "type" => $matches[3]); - if(intval($matches[2])) + if (intval($matches[2])) { $attributes["length"] = intval($matches[2]); - - if(trim($matches[4]) != "") + } + if (trim($matches[4]) != "") { $attributes["title"] = trim($matches[4]); - + } xml::add_element($doc, $root, "link", "", $attributes); } } @@ -2052,7 +2053,7 @@ class ostatus { $mentioned = array(); - if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) { + if (($item['parent'] != $item['id']) OR ($item['parent-uri'] !== $item['uri']) OR (($item['thr-parent'] !== '') AND ($item['thr-parent'] !== $item['uri']))) { $parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"])); $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); @@ -2082,7 +2083,13 @@ class ostatus { if (intval($item["parent"]) > 0) { $conversation = App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]; xml::add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation", "href" => $conversation)); - xml::add_element($doc, $entry, "ostatus:conversation", $conversation); + + $attributes = array( + "href" => $conversation, + "local_id" => $item["parent"], + "ref" => $conversation); + + xml::add_element($doc, $entry, "ostatus:conversation", $conversation, $attributes); } $tags = item_getfeedtags($item); diff --git a/include/pgettext.php b/include/pgettext.php index 335869eda..b42dcec11 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -44,7 +44,7 @@ function get_browser_language() { // check if we have translations for the preferred languages and pick the 1st that has for ($i=0; $i 0) { for ($x = 0; $x < count($ret); $x ++) { - if (substr($ret[$x],0,5) === 'data:') { - if (strstr($ret[$x],',')) { - $ret[$x] = substr($ret[$x],strpos($ret[$x],',')+1); + if (substr($ret[$x], 0, 5) === 'data:') { + if (strstr($ret[$x], ',')) { + $ret[$x] = substr($ret[$x], strpos($ret[$x], ',') + 1); } else { - $ret[$x] = substr($ret[$x],5); + $ret[$x] = substr($ret[$x], 5); } } elseif (normalise_link($ret[$x]) == 'http://') { $ret[$x] = fetch_url($ret[$x]); @@ -39,7 +38,7 @@ function get_salmon_key($uri,$keyhash) { } - logger('Key located: ' . print_r($ret,true)); + logger('Key located: ' . print_r($ret, true)); if (count($ret) == 1) { @@ -50,10 +49,9 @@ function get_salmon_key($uri,$keyhash) { // have one key we'll be right. return $ret[0]; - } - else { + } else { foreach ($ret as $a) { - $hash = base64url_encode(hash('sha256',$a)); + $hash = base64url_encode(hash('sha256', $a)); if ($hash == $keyhash) { return $a; } @@ -65,17 +63,17 @@ function get_salmon_key($uri,$keyhash) { -function slapper($owner,$url,$slap) { +function slapper($owner, $url, $slap) { // does contact have a salmon endpoint? - if(! strlen($url)) + if (! strlen($url)) { return; + } - - if(! $owner['sprvkey']) { + if (! $owner['sprvkey']) { logger(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.", - $owner['username'],$owner['uid'])); + $owner['username'], $owner['uid'])); return; } @@ -87,30 +85,33 @@ function slapper($owner,$url,$slap) { $data_type = 'application/atom+xml'; $encoding = 'base64url'; $algorithm = 'RSA-SHA256'; - $keyhash = base64url_encode(hash('sha256',salmon_key($owner['spubkey'])),true); + $keyhash = base64url_encode(hash('sha256', salmon_key($owner['spubkey'])), true); - // precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods + $precomputed = '.' . base64url_encode($data_type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($algorithm); - $precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng=='; + // GNU Social format + $signature = base64url_encode(rsa_sign($data . $precomputed, $owner['sprvkey'])); - $signature = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),$owner['sprvkey'])); + // Compliant format + $signature2 = base64url_encode(rsa_sign(str_replace('=', '', $data . $precomputed), $owner['sprvkey'])); - $signature2 = base64url_encode(rsa_sign($data . $precomputed,$owner['sprvkey'])); + // Old Status.net format + $signature3 = base64url_encode(rsa_sign($data, $owner['sprvkey'])); - $signature3 = base64url_encode(rsa_sign($data,$owner['sprvkey'])); + // At first try the non compliant method that works for GNU Social + $xmldata = array("me:env" => array("me:data" => $data, + "@attributes" => array("type" => $data_type), + "me:encoding" => $encoding, + "me:alg" => $algorithm, + "me:sig" => $signature, + "@attributes2" => array("key_id" => $keyhash))); - $salmon_tpl = get_markup_template('magicsig.tpl'); + $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env"); - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature - )); + $salmon = xml::from_array($xmldata, $xml, false, $namespaces); // slap them - post_url($url,$salmon, array( + post_url($url, $salmon, array( 'Content-type: application/magic-envelope+xml', 'Content-length: ' . strlen($salmon) )); @@ -120,60 +121,59 @@ function slapper($owner,$url,$slap) { // check for success, e.g. 2xx - if($return_code > 299) { + if ($return_code > 299) { - logger('compliant salmon failed. Falling back to status.net hack2'); + logger('GNU Social salmon failed. Falling back to compliant mode'); - // Entirely likely that their salmon implementation is - // non-compliant. Let's try once more, this time only signing - // the data, without stripping '=' chars + // Now try the compliant mode that normally isn't used for GNU Social + $xmldata = array("me:env" => array("me:data" => $data, + "@attributes" => array("type" => $data_type), + "me:encoding" => $encoding, + "me:alg" => $algorithm, + "me:sig" => $signature2, + "@attributes2" => array("key_id" => $keyhash))); - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature2 - )); + $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env"); + + $salmon = xml::from_array($xmldata, $xml, false, $namespaces); // slap them - post_url($url,$salmon, array( + post_url($url, $salmon, array( 'Content-type: application/magic-envelope+xml', 'Content-length: ' . strlen($salmon) )); $return_code = $a->get_curl_code(); - - - if($return_code > 299) { - - logger('compliant salmon failed. Falling back to status.net hack3'); - - // Entirely likely that their salmon implementation is - // non-compliant. Let's try once more, this time only signing - // the data, without the precomputed blob - - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature3 - )); - - // slap them - post_url($url,$salmon, array( - 'Content-type: application/magic-envelope+xml', - 'Content-length: ' . strlen($salmon) - )); - $return_code = $a->get_curl_code(); - } } - logger('slapper for '.$url.' returned ' . $return_code); - if(! $return_code) - return(-1); - if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after'))) - return(-1); + if ($return_code > 299) { + logger('compliant salmon failed. Falling back to old status.net'); + + // Last try. This will most likely fail as well. + $xmldata = array("me:env" => array("me:data" => $data, + "@attributes" => array("type" => $data_type), + "me:encoding" => $encoding, + "me:alg" => $algorithm, + "me:sig" => $signature3, + "@attributes2" => array("key_id" => $keyhash))); + + $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env"); + + $salmon = xml::from_array($xmldata, $xml, false, $namespaces); + + // slap them + post_url($url, $salmon, array( + 'Content-type: application/magic-envelope+xml', + 'Content-length: ' . strlen($salmon) + )); + $return_code = $a->get_curl_code(); + } + + logger('slapper for '.$url.' returned ' . $return_code); + if (! $return_code) { + return(-1); + } + if (($return_code == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) { + return(-1); + } return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1); } - diff --git a/include/socgraph.php b/include/socgraph.php index 642d03d89..a39eca5e8 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -7,6 +7,8 @@ * @todo Detect if it is a forum */ +use \Friendica\Core\Config; + require_once('include/datetime.php'); require_once("include/Scrape.php"); require_once("include/network.php"); @@ -1656,6 +1658,20 @@ function poco_discover_federation() { } } + // Disvover Mastodon servers + if (!Config::get('system','ostatus_disabled')) { + $serverdata = fetch_url("https://instances.mastodon.xyz/instances.json"); + + if ($serverdata) { + $servers = json_decode($serverdata); + + foreach ($servers AS $server) { + $url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name; + proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($url)); + } + } + } + // Currently disabled, since the service isn't available anymore. // It is not removed since I hope that there will be a successor. // Discover GNU Social Servers. @@ -2096,7 +2112,7 @@ function update_gcontact($contact) { fix_alternate_contact_address($contact); if (!isset($contact["updated"])) - $contact["updated"] = datetime_convert(); + $contact["updated"] = dbm::date(); if ($contact["server_url"] == "") { $server_url = $contact["url"]; @@ -2151,7 +2167,7 @@ function update_gcontact($contact) { dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]), intval($contact["nsfw"]), intval($contact["contact-type"]), dbesc($contact["alias"]), dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]), - dbesc($contact["about"]), intval($contact["generation"]), dbesc($contact["updated"]), + dbesc($contact["about"]), intval($contact["generation"]), dbesc(dbm::date($contact["updated"])), dbesc($contact["server_url"]), dbesc($contact["connect"]), dbesc(normalise_link($contact["url"])), intval($contact["generation"])); diff --git a/js/acl.js b/js/acl.js index 4924ac128..054f50960 100644 --- a/js/acl.js +++ b/js/acl.js @@ -65,7 +65,7 @@ ACL.prototype.add_mention = function(id) { if (this.element.val().indexOf( searchText) >= 0 ) { return; } - this.element.val(searchText + this.element.val()); + this.element.val(searchText + this.element.val()).trigger('change'); } ACL.prototype.on_submit = function(){ diff --git a/js/autocomplete.js b/js/autocomplete.js index 8702abbcf..3ed9fa30f 100644 --- a/js/autocomplete.js +++ b/js/autocomplete.js @@ -166,7 +166,7 @@ function listNewLineAutocomplete(id) { if (word != null) { var textBefore = text.value.substring(0, caretPos); var textAfter = text.value.substring(caretPos, text.length); - $('#' + id).val(textBefore + '\r\n[*] ' + textAfter); + $('#' + id).val(textBefore + '\r\n[*] ' + textAfter).trigger('change'); setCaretPosition(text, caretPos + 5); return true; } diff --git a/js/main.js b/js/main.js index aaeef00cf..5df33ed59 100644 --- a/js/main.js +++ b/js/main.js @@ -101,6 +101,7 @@ var start = textarea.selectionStart; var end = textarea.selectionEnd; textarea.value = textarea.value.substring(0, start) + bbcode + textarea.value.substring(end, textarea.value.length); + $(textarea).trigger('change'); }); @@ -223,8 +224,11 @@ var nnm = $("#nav-notifications-menu"); nnm.html(notifications_all + notifications_mark); - var notification_lastitem = parseInt(localStorage.getItem("notification-lastitem")); + var lastItemStorageKey = "notification-lastitem:" + localUser; + var notification_lastitem = parseInt(localStorage.getItem(lastItemStorageKey)); var notification_id = 0; + + // Insert notifs into the notifications-menu $(data.notifications).each(function(key, notif){ var text = notif.message.format('' + notif.name + ''); var contact = ('' + notif.name + ''); @@ -232,19 +236,21 @@ var html = notifications_tpl.format( notif.href, // {0} // link to the source notif.photo, // {1} // photo of the contact - text, // {2} // preformatted text (autor + text) + text, // {2} // preformatted text (autor + text) notif.date, // {3} // date of notification (time ago) - seenclass, // {4} // visited status of the notification + seenclass, // {4} // visited status of the notification new Date(notif.timestamp*1000), // {5} // date of notification notif.url, // {6} // profile url of the contact notif.message.format(contact), // {7} // preformatted html (text including author profile url) - '' // {8} // Deprecated + '' // {8} // Deprecated ); nnm.append(html); }); + + // Desktop Notifications $(data.notifications.reverse()).each(function(key, e){ notification_id = parseInt(e.timestamp); - if (notification_lastitem !== null && notification_id > notification_lastitem) { + if (notification_lastitem !== null && notification_id > notification_lastitem && Number(e.seen) === 0) { if (getNotificationPermission() === "granted") { var notification = new Notification(document.title, { body: decodeHtml(e.message.replace('→ ', '').format(e.name)), @@ -259,7 +265,7 @@ }); notification_lastitem = notification_id; - localStorage.setItem("notification-lastitem", notification_lastitem) + localStorage.setItem(lastItemStorageKey, notification_lastitem) $("img[data-src]", nnm).each(function(i, el){ // Add src attribute for images with a data-src attribute @@ -285,7 +291,7 @@ $.jGrowl(message, {sticky: false, theme: 'info', life: 5000}); }); - /* update the js scrollbars */ + // Update the js scrollbars $('#nav-notifications-menu').perfectScrollbar('update'); }); @@ -317,6 +323,30 @@ } }); + // Scroll to the next/previous thread when pressing J and K + $(document).keydown(function (event) { + var threads = $('.thread_level_1'); + if ((event.keyCode === 74 || event.keyCode === 75) && !$(event.target).is('textarea, input')) { + var scrollTop = $(window).scrollTop(); + if (event.keyCode === 75) { + threads = $(threads.get().reverse()); + } + threads.each(function(key, item) { + var comparison; + var top = $(item).offset().top - 100; + if (event.keyCode === 74) { + comparison = top > scrollTop + 1; + } else if (event.keyCode === 75) { + comparison = top < scrollTop - 1; + } + if (comparison) { + $('html, body').animate({ scrollTop: top }, 200); + return false; + } + }); + } + }); + // Set an event listener for infinite scroll if(typeof infinite_scroll !== 'undefined') { $(window).scroll(function(e){ diff --git a/library/html-to-markdown/.gitignore b/library/html-to-markdown/.gitignore deleted file mode 100644 index aa429a9a1..000000000 --- a/library/html-to-markdown/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -~* -vendor -composer.lock \ No newline at end of file diff --git a/library/html-to-markdown/.travis.yml b/library/html-to-markdown/.travis.yml deleted file mode 100644 index 48b3e64a4..000000000 --- a/library/html-to-markdown/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -language: php -php: - - "5.5" - - "5.4" - - "5.3" -script: phpunit --no-configuration HTML_To_MarkdownTest ./tests/HTML_To_MarkdownTest.php \ No newline at end of file diff --git a/library/html-to-markdown/HTML_To_Markdown.php b/library/html-to-markdown/HTML_To_Markdown.php deleted file mode 100644 index 109780edd..000000000 --- a/library/html-to-markdown/HTML_To_Markdown.php +++ /dev/null @@ -1,598 +0,0 @@ - - * @link https://github.com/nickcernis/html2markdown/ Latest version on GitHub. - * @link http://twitter.com/nickcernis Nick on twitter. - * @license http://www.opensource.org/licenses/mit-license.php MIT - */ -class HTML_To_Markdown -{ - /** - * @var DOMDocument The root of the document tree that holds our HTML. - */ - private $document; - - /** - * @var string|boolean The Markdown version of the original HTML, or false if conversion failed - */ - private $output; - - /** - * @var array Class-wide options users can override. - */ - private $options = array( - 'header_style' => 'setext', // Set to "atx" to output H1 and H2 headers as # Header1 and ## Header2 - 'suppress_errors' => true, // Set to false to show warnings when loading malformed HTML - 'strip_tags' => false, // Set to true to strip tags that don't have markdown equivalents. N.B. Strips tags, not their content. Useful to clean MS Word HTML output. - 'bold_style' => '**', // Set to '__' if you prefer the underlined style - 'italic_style' => '*', // Set to '_' if you prefer the underlined style - 'remove_nodes' => '', // space-separated list of dom nodes that should be removed. example: "meta style script" - ); - - - /** - * Constructor - * - * Set up a new DOMDocument from the supplied HTML, convert it to Markdown, and store it in $this->$output. - * - * @param string $html The HTML to convert to Markdown. - * @param array $overrides [optional] List of style and error display overrides. - */ - public function __construct($html = null, $overrides = null) - { - if ($overrides) - $this->options = array_merge($this->options, $overrides); - - if ($html) - $this->convert($html); - } - - - /** - * Setter for conversion options - * - * @param $name - * @param $value - */ - public function set_option($name, $value) - { - $this->options[$name] = $value; - } - - - /** - * Convert - * - * Loads HTML and passes to get_markdown() - * - * @param $html - * @return string The Markdown version of the html - */ - public function convert($html) - { - $html = preg_replace('~>\s+<~', '><', $html); // Strip white space between tags to prevent creation of empty #text nodes - - $this->document = new DOMDocument(); - - if ($this->options['suppress_errors']) - libxml_use_internal_errors(true); // Suppress conversion errors (from http://bit.ly/pCCRSX ) - - $this->document->loadHTML('' . $html); // Hack to load utf-8 HTML (from http://bit.ly/pVDyCt ) - $this->document->encoding = 'UTF-8'; - - if ($this->options['suppress_errors']) - libxml_clear_errors(); - - return $this->get_markdown($html); - } - - - /** - * Is Child Of? - * - * Is the node a child of the given parent tag? - * - * @param $parent_name string|array The name of the parent node(s) to search for e.g. 'code' or array('pre', 'code') - * @param $node - * @return bool - */ - private static function is_child_of($parent_name, $node) - { - for ($p = $node->parentNode; $p != false; $p = $p->parentNode) { - if (is_null($p)) - return false; - - if ( is_array($parent_name) && in_array($p->nodeName, $parent_name) ) - return true; - - if ($p->nodeName == $parent_name) - return true; - } - return false; - } - - - /** - * Convert Children - * - * Recursive function to drill into the DOM and convert each node into Markdown from the inside out. - * - * Finds children of each node and convert those to #text nodes containing their Markdown equivalent, - * starting with the innermost element and working up to the outermost element. - * - * @param $node - */ - private function convert_children($node) - { - // Don't convert HTML code inside and blocks to Markdown - that should stay as HTML - if (self::is_child_of(array('pre', 'code'), $node)) - return; - - // If the node has children, convert those to Markdown first - if ($node->hasChildNodes()) { - $length = $node->childNodes->length; - - for ($i = 0; $i < $length; $i++) { - $child = $node->childNodes->item($i); - $this->convert_children($child); - } - } - - // Now that child nodes have been converted, convert the original node - $markdown = $this->convert_to_markdown($node); - - // Create a DOM text node containing the Markdown equivalent of the original node - $markdown_node = $this->document->createTextNode($markdown); - - // Replace the old $node e.g. "Title" with the new $markdown_node e.g. "### Title" - $node->parentNode->replaceChild($markdown_node, $node); - } - - - /** - * Get Markdown - * - * Sends the body node to convert_children() to change inner nodes to Markdown #text nodes, then saves and - * returns the resulting converted document as a string in Markdown format. - * - * @return string|boolean The converted HTML as Markdown, or false if conversion failed - */ - private function get_markdown() - { - // Work on the entire DOM tree (including head and body) - $input = $this->document->getElementsByTagName("html")->item(0); - - if (!$input) - return false; - - // Convert all children of this root element. The DOMDocument stored in $this->doc will - // then consist of #text nodes, each containing a Markdown version of the original node - // that it replaced. - $this->convert_children($input); - - // Sanitize and return the body contents as a string. - $markdown = $this->document->saveHTML(); // stores the DOMDocument as a string - $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8'); - $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8'); // Double decode to cover cases like http://www.php.net/manual/en/function.htmlentities.php#99984 - $markdown = preg_replace("/]+>/", "", $markdown); // Strip doctype declaration - $unwanted = array('', '', '', '', '', '', '', ' '); - $markdown = str_replace($unwanted, '', $markdown); // Strip unwanted tags - $markdown = trim($markdown, "\n\r\0\x0B"); - - $this->output = $markdown; - - return $markdown; - } - - - /** - * Convert to Markdown - * - * Converts an individual node into a #text node containing a string of its Markdown equivalent. - * - * Example: An node with text content of "Title" becomes a text node with content of "### Title" - * - * @param $node - * @return string The converted HTML as Markdown - */ - private function convert_to_markdown($node) - { - $tag = $node->nodeName; // the type of element, e.g. h1 - $value = $node->nodeValue; // the value of that element, e.g. The Title - - // Strip nodes named in remove_nodes - $tags_to_remove = explode(' ', $this->options['remove_nodes']); - if ( in_array($tag, $tags_to_remove) ) - return false; - - switch ($tag) { - case "p": - $markdown = (trim($value)) ? rtrim($value) . PHP_EOL . PHP_EOL : ''; - break; - case "pre": - $markdown = PHP_EOL . $this->convert_code($node) . PHP_EOL; - break; - case "h1": - case "h2": - $markdown = $this->convert_header($tag, $node); - break; - case "h3": - $markdown = "### " . $value . PHP_EOL . PHP_EOL; - break; - case "h4": - $markdown = "#### " . $value . PHP_EOL . PHP_EOL; - break; - case "h5": - $markdown = "##### " . $value . PHP_EOL . PHP_EOL; - break; - case "h6": - $markdown = "###### " . $value . PHP_EOL . PHP_EOL; - break; - case "em": - case "i": - case "strong": - case "b": - $markdown = $this->convert_emphasis($tag, $value); - break; - case "hr": - $markdown = "- - - - - -" . PHP_EOL . PHP_EOL; - break; - case "br": - $markdown = " " . PHP_EOL; - break; - case "blockquote": - $markdown = $this->convert_blockquote($node); - break; - case "code": - $markdown = $this->convert_code($node); - break; - case "ol": - case "ul": - $markdown = $value . PHP_EOL; - break; - case "li": - $markdown = $this->convert_list($node); - break; - case "img": - $markdown = $this->convert_image($node); - break; - case "a": - $markdown = $this->convert_anchor($node); - break; - case "#text": - $markdown = preg_replace('~\s+~', ' ', $value); - $markdown = preg_replace('~^#~', '\\\\#', $markdown); - break; - case "#comment": - $markdown = ''; - break; - case "div": - $markdown = ($this->options['strip_tags']) ? $value . PHP_EOL . PHP_EOL : html_entity_decode($node->C14N()); - break; - default: - // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, - // such as nodes on their own. C14N() canonicalizes the node to a string. - // See: http://www.php.net/manual/en/domnode.c14n.php - $markdown = ($this->options['strip_tags']) ? $value : html_entity_decode($node->C14N()); - } - - return $markdown; - } - - - /** - * Convert Header - * - * Converts h1 and h2 headers to Markdown-style headers in setext style, - * matching the number of underscores with the length of the title. - * - * e.g. Header 1 Header Two - * ======== ---------- - * - * Returns atx headers instead if $this->options['header_style'] is "atx" - * - * e.g. # Header 1 ## Header Two - * - * @param string $level The header level, including the "h". e.g. h1 - * @param string $node The node to convert. - * @return string The Markdown version of the header. - */ - private function convert_header($level, $node) - { - $content = $node->nodeValue; - - if (!$this->is_child_of('blockquote', $node) && $this->options['header_style'] == "setext") { - $length = (function_exists('mb_strlen')) ? mb_strlen($content, 'utf-8') : strlen($content); - $underline = ($level == "h1") ? "=" : "-"; - $markdown = $content . PHP_EOL . str_repeat($underline, $length) . PHP_EOL . PHP_EOL; // setext style - } else { - $prefix = ($level == "h1") ? "# " : "## "; - $markdown = $prefix . $content . PHP_EOL . PHP_EOL; // atx style - } - - return $markdown; - } - - - /** - * Converts inline styles - * This function is used to render strong and em tags - * - * eg bold text becomes **bold text** or __bold text__ - * - * @param string $tag - * @param string $value - * @return string - */ - private function convert_emphasis($tag, $value) - { - if ($tag == 'i' || $tag == 'em') { - $markdown = $this->options['italic_style'] . $value . $this->options['italic_style']; - } else { - $markdown = $this->options['bold_style'] . $value . $this->options['bold_style']; - } - - return $markdown; - } - - - /** - * Convert Image - * - * Converts tags to Markdown. - * - * e.g. - * becomes  - * - * @param $node - * @return string - */ - private function convert_image($node) - { - $src = $node->getAttribute('src'); - $alt = $node->getAttribute('alt'); - $title = $node->getAttribute('title'); - - if ($title != "") { - $markdown = ''; // No newlines added. should be in a block-level element. - } else { - $markdown = ''; - } - - return $markdown; - } - - - /** - * Convert Anchor - * - * Converts tags to Markdown. - * - * e.g. Modern Nerd - * becomes [Modern Nerd](http://modernnerd.net "Title") - * - * @param $node - * @return string - */ - private function convert_anchor($node) - { - $href = $node->getAttribute('href'); - $title = $node->getAttribute('title'); - $text = $node->nodeValue; - - if ($title != "") { - $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; - } else { - $markdown = '[' . $text . '](' . $href . ')'; - } - - if (! $href) - $markdown = html_entity_decode($node->C14N()); - - // Append a space if the node after this one is also an anchor - $next_node_name = $this->get_next_node_name($node); - - if ($next_node_name == 'a') - $markdown = $markdown . ' '; - - return $markdown; - } - - - /** - * Convert List - * - * Converts and lists to Markdown. - * - * @param $node - * @return string - */ - private function convert_list($node) - { - // If parent is an ol, use numbers, otherwise, use dashes - $list_type = $node->parentNode->nodeName; - $value = $node->nodeValue; - - if ($list_type == "ul") { - $markdown = "- " . trim($value) . PHP_EOL; - } else { - $number = $this->get_position($node); - $markdown = $number . ". " . trim($value) . PHP_EOL; - } - - return $markdown; - } - - - /** - * Convert Code - * - * Convert code tags by indenting blocks of code and wrapping single lines in backticks. - * - * @param DOMNode $node - * @return string - */ - private function convert_code($node) - { - // Store the content of the code block in an array, one entry for each line - - $markdown = ''; - - $code_content = html_entity_decode($node->C14N()); - $code_content = str_replace(array("", ""), "", $code_content); - $code_content = str_replace(array("", ""), "", $code_content); - - $lines = preg_split('/\r\n|\r|\n/', $code_content); - $total = count($lines); - - // If there's more than one line of code, prepend each line with four spaces and no backticks. - if ($total > 1 || $node->nodeName === 'pre') { - - // Remove the first and last line if they're empty - $first_line = trim($lines[0]); - $last_line = trim($lines[$total - 1]); - $first_line = trim($first_line, " "); //trim XML style carriage returns too - $last_line = trim($last_line, " "); - - if (empty($first_line)) - array_shift($lines); - - if (empty($last_line)) - array_pop($lines); - - $count = 1; - foreach ($lines as $line) { - $line = str_replace(' ', '', $line); - $markdown .= " " . $line; - // Add newlines, except final line of the code - if ($count != $total) - $markdown .= PHP_EOL; - $count++; - } - $markdown .= PHP_EOL; - - } else { // There's only one line of code. It's a code span, not a block. Just wrap it with backticks. - - $markdown .= "`" . $lines[0] . "`"; - - } - - return $markdown; - } - - - /** - * Convert blockquote - * - * Prepend blockquotes with > chars. - * - * @param $node - * @return string - */ - private function convert_blockquote($node) - { - // Contents should have already been converted to Markdown by this point, - // so we just need to add ">" symbols to each line. - - $markdown = ''; - - $quote_content = trim($node->nodeValue); - - $lines = preg_split('/\r\n|\r|\n/', $quote_content); - - $total_lines = count($lines); - - foreach ($lines as $i => $line) { - $markdown .= "> " . $line . PHP_EOL; - if ($i + 1 == $total_lines) - $markdown .= PHP_EOL; - } - - return $markdown; - } - - - /** - * Get Position - * - * Returns the numbered position of a node inside its parent - * - * @param $node - * @return int The numbered position of the node, starting at 1. - */ - private function get_position($node) - { - // Get all of the nodes inside the parent - $list_nodes = $node->parentNode->childNodes; - $total_nodes = $list_nodes->length; - - $position = 1; - - // Loop through all nodes and find the given $node - for ($a = 0; $a < $total_nodes; $a++) { - $current_node = $list_nodes->item($a); - - if ($current_node->isSameNode($node)) - $position = $a + 1; - } - - return $position; - } - - - /** - * Get Next Node Name - * - * Return the name of the node immediately after the passed one. - * - * @param $node - * @return string|null The node name (e.g. 'h1') or null. - */ - private function get_next_node_name($node) - { - $next_node_name = null; - - $current_position = $this->get_position($node); - $next_node = $node->parentNode->childNodes->item($current_position); - - if ($next_node) - $next_node_name = $next_node->nodeName; - - return $next_node_name; - } - - - /** - * To String - * - * Magic method to return Markdown output when HTML_To_Markdown instance is treated as a string. - * - * @return string - */ - public function __toString() - { - return $this->output(); - } - - - /** - * Output - * - * Getter for the converted Markdown contents stored in $this->output - * - * @return string - */ - public function output() - { - if (!$this->output) { - return ''; - } else { - return $this->output; - } - } -} diff --git a/library/html-to-markdown/README.md b/library/html-to-markdown/README.md deleted file mode 100644 index de91c9d08..000000000 --- a/library/html-to-markdown/README.md +++ /dev/null @@ -1,138 +0,0 @@ -HTML To Markdown for PHP -======================== - -A helper class that converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. - -[](https://travis-ci.org/nickcernis/html-to-markdown) - -**Version**: 2.2.1 -**Requires**: PHP 5.3+ -**Author**: [@nickcernis](http://twitter.com/nickcernis) -**License**: [MIT](http://www.opensource.org/licenses/mit-license.php) - -### Why convert HTML to Markdown? - -*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](http://michelf.com/projects/php-markdown/),"* you continue, already labouring the question somewhat, *"but why go the other way?"* - -Typically you would convert HTML to Markdown if: - -1. You have an existing HTML document that needs to be edited by people with good taste. -2. You want to store new content in HTML format but edit it as Markdown. -3. You want to convert HTML email to plain text email. -4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. -5. You just really like Markdown. - -### How to use it - -Either include HTML_To_Markdown.php directly: - - require_once( dirname( __FILE__) . '/HTML_To_Markdown.php' ); - -Or, require the library in your composer.json: - - { - "require": { - "nickcernis/html-to-markdown": "dev-master" - } - } - -Then `composer install` and add `require 'vendor/autoload.php';` to the top of your script. - -Next, create a new HTML_To_Markdown instance, passing in your valid HTML code: - - $html = "Quick, to the Batpoles!"; - $markdown = new HTML_To_Markdown($html); - -The `$markdown` object now contains the Markdown version of your HTML. Use it like a string: - - echo $markdown; // ==> ### Quick, to the Batpoles! - -Or access the Markdown output directly: - - $string = $markdown->output(); - -The included `demo` directory contains an HTML->Markdown conversion form to try out. - -### Conversion options - -By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. - -To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: - - $html = 'Turnips!'; - $markdown = new HTML_To_Markdown($html, array('strip_tags' => true)); // $markdown now contains "Turnips!" - -Or more explicitly, like this: - - $html = 'Turnips!'; - $markdown = new HTML_To_Markdown(); - $markdown->set_option('strip_tags', true); - $markdown->convert($html); // $markdown now contains "Turnips!" - -Note that only the tags themselves are stripped, not the content they hold. - -To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: - - $html = 'Turnips!Monkeys!'; - $markdown = new HTML_To_Markdown($html, array('remove_nodes' => 'span div')); // $markdown now contains "" - -### Style options - -Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. - - $html = 'Italic and a bold'; - $markdown = new HTML_To_Markdown(); - $markdown->set_option('italic_style', '_'); - $markdown->set_option('bold_style', '__'); - $markdown->convert($html); // $markdown now contains "_Italic_ and a __bold__" - -### Limitations - -- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. - -### Known issues - -- Nested lists and lists containing multiple paragraphs aren't converted correctly. -- Lists inside blockquotes aren't converted correctly. -- Any reported [open issues here](https://github.com/nickcernis/html-to-markdown/issues?state=open). - -[Report your issue or request a feature here.](https://github.com/nickcernis/html2markdown/issues/new) Issues with patches or failing tests are especially welcome. - -### Style notes - -- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: - - `$markdown = new HTML_To_Markdown( $html, array('header_style'=>'atx') );` - - Headers of H3 priority and lower always use atx style. - -- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. -- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. - -### Dependencies - -HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. - -Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. - -### Architecture notes - -HTML To Markdown is a single file that uses native DOM manipulation libraries (DOMDocument), not regex voodoo, to convert code. - -### Contributors - -Many thanks to all [contributors](https://github.com/nickcernis/html2markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. - -### How it works - -HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. - -### To-do - -- Support for nested lists and lists inside blockquotes. -- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). - -### Trying to convert Markdown to HTML? - -Use [PHP Markdown](http://michelf.com/projects/php-markdown/) from Michel Fortin. No guarantees about the Elvish, though. - diff --git a/library/html-to-markdown/circle.yml b/library/html-to-markdown/circle.yml deleted file mode 100644 index 9893a4b92..000000000 --- a/library/html-to-markdown/circle.yml +++ /dev/null @@ -1,4 +0,0 @@ -test: - override: - - phpunit --no-configuration HTML_To_MarkdownTest ./tests/HTML_To_MarkdownTest.php - diff --git a/library/html-to-markdown/composer.json b/library/html-to-markdown/composer.json deleted file mode 100644 index beb7faab4..000000000 --- a/library/html-to-markdown/composer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "nickcernis/html-to-markdown", - "type": "library", - "description": "An HTML-to-markdown conversion helper for PHP", - "keywords": ["markdown", "html"], - "homepage": "https://github.com/nickcernis/html-to-markdown", - "license": "MIT", - "authors": [ - { - "name": "Nick Cernis", - "email": "nick@cern.is", - "homepage": "http://modernnerd.net" - } - ], - "autoload": { - "classmap": [ "HTML_To_Markdown.php" ] - }, - "require": { - "php": ">=5.3" - }, - "require-dev": { - "php": ">=5.3.3", - "phpunit/phpunit": "4.*" - } -} diff --git a/mod/acl.php b/mod/acl.php index 04aa9f50a..9220bc77a 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -1,7 +1,7 @@ = `last_failure` ORDER BY `version` ASC;', $p); $total = $total + $c[0]['total']; @@ -474,9 +475,6 @@ function admin_page_summary(App $a) { $r = qu("SELECT COUNT(`id`) AS `count` FROM `register`"); $pending = $r[0]['count']; - $r = qu("SELECT COUNT(*) AS `total` FROM `deliverq` WHERE 1"); - $deliverq = (($r) ? $r[0]['total'] : 0); - $r = qu("SELECT COUNT(*) AS `total` FROM `queue` WHERE 1"); $queue = (($r) ? $r[0]['total'] : 0); @@ -485,7 +483,7 @@ function admin_page_summary(App $a) { // We can do better, but this is a quick queue status - $queues = array('label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue, 'workerq' => $workerqueue); + $queues = array('label' => t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue); $t = get_markup_template("admin_summary.tpl"); @@ -655,7 +653,6 @@ function admin_page_site_post(App $a) { $force_ssl = ((x($_POST,'force_ssl')) ? True : False); $hide_help = ((x($_POST,'hide_help')) ? True : False); $suppress_tags = ((x($_POST,'suppress_tags')) ? True : False); - $use_fulltext_engine = ((x($_POST,'use_fulltext_engine')) ? True : False); $itemcache = ((x($_POST,'itemcache')) ? notags(trim($_POST['itemcache'])) : ''); $itemcache_duration = ((x($_POST,'itemcache_duration')) ? intval($_POST['itemcache_duration']) : 0); $max_comments = ((x($_POST,'max_comments')) ? intval($_POST['max_comments']) : 0); @@ -670,6 +667,12 @@ function admin_page_site_post(App $a) { $worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False); $worker_frontend = ((x($_POST,'worker_frontend')) ? True : False); + // Has the directory url changed? If yes, then resubmit the existing profiles there + if ($global_directory != Config::get('system', 'directory') AND ($global_directory != '')) { + Config::set('system', 'directory', $global_directory); + proc_run(PRIORITY_LOW, 'include/directory.php'); + } + if ($a->get_path() != "") { $diaspora_enabled = false; } @@ -773,7 +776,6 @@ function admin_page_site_post(App $a) { set_config('system', 'allowed_email', $allowed_email); set_config('system', 'block_public', $block_public); set_config('system', 'publish_all', $force_publish); - set_config('system', 'directory', $global_directory); set_config('system', 'thread_allow', $thread_allow); set_config('system', 'newuser_private', $newuser_private); set_config('system', 'enotify_no_content', $enotify_no_content); @@ -799,7 +801,6 @@ function admin_page_site_post(App $a) { set_config('system', 'force_ssl', $force_ssl); set_config('system', 'hide_help', $hide_help); - set_config('system', 'use_fulltext_engine', $use_fulltext_engine); set_config('system', 'itemcache', $itemcache); set_config('system', 'itemcache_duration', $itemcache_duration); set_config('system', 'max_comments', $max_comments); @@ -971,7 +972,7 @@ function admin_page_site(App $a) { '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$shortcut_icon' => array('shortcut_icon', t("Shortcut icon"), get_config('system','shortcut_icon'), t("Link to an icon that will be used for browsers.")), '$touch_icon' => array('touch_icon', t("Touch icon"), get_config('system','touch_icon'), t("Link to an icon that will be used for tablets and mobiles.")), - '$info' => array('info',t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), + '$info' => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile), @@ -1028,7 +1029,6 @@ function admin_page_site(App $a) { '$nodeinfo' => array('nodeinfo', t("Publish server information"), get_config('system','nodeinfo'), t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details.")), - '$use_fulltext_engine' => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")), '$suppress_tags' => array('suppress_tags', t("Suppress Tags"), get_config('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")), '$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), t("The item caches buffers generated bbcode and external images.")), '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")), @@ -2058,8 +2058,8 @@ function admin_page_features(App $a) { $set = $f[3]; } $arr[$fname][1][] = array( - 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('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'))) ); } } diff --git a/mod/cal.php b/mod/cal.php index f43a4e8a7..7398426bc 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -269,8 +269,8 @@ function cal_content(App $a) { '$tabs' => $tabs, '$title' => t('Events'), '$view' => t('View'), - '$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''), - '$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''), + '$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth", t('Previous'),'',''), + '$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth", t('Next'),'',''), '$calendar' => cal($y,$m,$links, ' eventcal'), '$events' => $events, diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 52b5eb9f9..f3875ed8e 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -872,7 +872,7 @@ function dfrn_request_content(App $a) { '$header' => t('Friend/Connection Request'), '$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'), '$pls_answer' => t('Please answer the following:'), - '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'),t('Yes'))), + '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'), t('Yes'))), /*'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']), '$yes' => t('Yes'), '$no' => t('No'), */ diff --git a/mod/follow.php b/mod/follow.php index 2b564c1bf..6e1f90694 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -110,7 +110,7 @@ function follow_content(App $a) { //'$photo' => proxy_url($ret["photo"], false, PROXY_SIZE_SMALL), '$desc' => "", '$pls_answer' => t('Please answer the following:'), - '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'),t('Yes'))), + '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'), t('Yes'))), '$add_note' => t('Add a personal note:'), '$page_desc' => "", '$friendica' => "", diff --git a/mod/hovercard.php b/mod/hovercard.php index ec749db20..65b03f2b9 100644 --- a/mod/hovercard.php +++ b/mod/hovercard.php @@ -75,7 +75,7 @@ function hovercard_content() { 'tags' => $contact["keywords"], // 'nsfw' => intval($contact["nsfw"]), // 'server_url' => $contact["server_url"], - 'bd' => (($contact["birthday"] == "0000-00-00") ? "" : $contact["birthday"]), + 'bd' => (($contact["birthday"] <= '0001-01-01') ? "" : $contact["birthday"]), // 'generation' => $contact["generation"], 'account_type' => account_type($contact), 'actions' => $actions, diff --git a/mod/install.php b/mod/install.php index fbd296a9d..8854723b7 100755 --- a/mod/install.php +++ b/mod/install.php @@ -48,7 +48,7 @@ function install_post(App $a) { $db = new dba($dbhost, $dbuser, $dbpass, '', true); if(! get_db_errno()) { - $r = q("CREATE DATABASE '%s'", + $r = q("CREATE DATABASE '%s' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci", dbesc($dbdata) ); if ($r) { diff --git a/mod/manifest.php b/mod/manifest.php new file mode 100644 index 000000000..6dc0d10a2 --- /dev/null +++ b/mod/manifest.php @@ -0,0 +1,26 @@ + App::get_baseurl(), + '$touch_icon' => $touch_icon, + '$title' => Config::get('config', 'sitename', 'Friendica'), + )); + + echo $o; + + killme(); + + } +?> diff --git a/mod/message.php b/mod/message.php index 9e9669146..beaa7b1df 100644 --- a/mod/message.php +++ b/mod/message.php @@ -349,7 +349,7 @@ function message_content(App $a) { $o .= $header; - $r = q("SELECT count(*) AS `total` FROM `mail` + $r = q("SELECT count(*) AS `total` FROM `mail`, ANY_VALUE(`created`) AS `created` WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC", intval(local_user()) ); @@ -528,12 +528,20 @@ function message_content(App $a) { } function get_messages($user, $lstart, $lend) { - + //TODO: rewritte with a sub-query to get the first message of each private thread with certainty return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, - `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`, - count( * ) as count + ANY_VALUE(`mail`.`id`) AS `id`, ANY_VALUE(`mail`.`uid`) AS `uid`, ANY_VALUE(`mail`.`guid`) AS `guid`, + ANY_VALUE(`mail`.`from-name`) AS `from-name`, ANY_VALUE(`mail`.`from-photo`) AS `from-photo`, + ANY_VALUE(`mail`.`from-url`) AS `from-url`, ANY_VALUE(`mail`.`contact-id`) AS `contact-id`, + ANY_VALUE(`mail`.`convid`) AS `convid`, ANY_VALUE(`mail`.`title`) AS `title`, ANY_VALUE(`mail`.`body`) AS `body`, + ANY_VALUE(`mail`.`seen`) AS `seen`, ANY_VALUE(`mail`.`reply`) AS `reply`, ANY_VALUE(`mail`.`replied`) AS `replied`, + ANY_VALUE(`mail`.`unknown`) AS `unknown`, ANY_VALUE(`mail`.`uri`) AS `uri`, + `mail`.`parent-uri`, + ANY_VALUE(`mail`.`created`) AS `created`, ANY_VALUE(`contact`.`name`) AS `name`, ANY_VALUE(`contact`.`url`) AS `url`, + ANY_VALUE(`contact`.`thumb`) AS `thumb`, ANY_VALUE(`contact`.`network`) AS `network`, + count( * ) as `count` FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` - WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", + WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", intval($user), intval($lstart), intval($lend) ); } diff --git a/mod/network.php b/mod/network.php index 5e94429b5..db4bb9130 100644 --- a/mod/network.php +++ b/mod/network.php @@ -581,11 +581,7 @@ function network_content(App $a, $update = 0) { $sql_order = "`item`.`id`"; $order_mode = "id"; } else { - // Disabled until final decision what to do with this - //if (get_config('system','use_fulltext_engine')) - // $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search))); - //else - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); $sql_order = "`item`.`id`"; $order_mode = "id"; } diff --git a/mod/notifications.php b/mod/notifications.php index 0c08b66ce..bab5fd627 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -292,7 +292,7 @@ function notifications_content(App $a) { '$item_link' => $it['link'], '$item_image' => $it['image'], '$item_url' => $it['url'], - '$item_text' => htmlentities($it['text']), + '$item_text' => $it['text'], '$item_when' => $it['when'], '$item_ago' => $it['ago'], '$item_seen' => $it['seen'], diff --git a/mod/photos.php b/mod/photos.php index ddf081467..a22f919c8 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1240,7 +1240,10 @@ function photos_content(App $a) { $order = 'DESC'; } - $r = q("SELECT `resource-id`, `id`, `filename`, type, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' + $r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, + ANY_VALUE(`type`) AS `type`, max(`scale`) AS `scale`, ANY_VALUE(`desc`) as `desc`, + ANY_VALUE(`created`) as `created` + FROM `photo` WHERE `uid` = %d AND `album` = '%s' AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d", intval($owner_uid), dbesc($album), @@ -1581,9 +1584,9 @@ function photos_content(App $a) { '$album' => array('albname', t('New album name'), $album_e,''), '$caption' => array('desc', t('Caption'), $caption_e, ''), '$tags' => array('newtag', t('Add a Tag'), "", t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')), - '$rotate_none' => array('rotate',t('Do not rotate'),0,'', true), - '$rotate_cw' => array('rotate',t('Rotate CW (right)'),1,''), - '$rotate_ccw' => array('rotate',t('Rotate CCW (left)'),2,''), + '$rotate_none' => array('rotate', t('Do not rotate'),0,'', true), + '$rotate_cw' => array('rotate', t('Rotate CW (right)'),1,''), + '$rotate_ccw' => array('rotate', t('Rotate CCW (left)'),2,''), '$nickname' => $a->data['user']['nickname'], '$resource_id' => $ph[0]['resource-id'], @@ -1840,7 +1843,9 @@ function photos_content(App $a) { $a->set_pager_itemspage(20); } - $r = qu("SELECT `resource-id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` + $r = qu("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, + ANY_VALUE(`type`) AS `type`, ANY_VALUE(`album`) AS `album`, max(`scale`) AS `scale`, + ANY_VALUE(`created`) AS `created` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", intval($a->data['user']['uid']), diff --git a/mod/ping.php b/mod/ping.php index b5330c7b3..ba496a70b 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -199,7 +199,7 @@ function ping_init(App $a) $cachekey = "ping_init:".local_user(); $ev = Cache::get($cachekey); if (is_null($ev)) { - $ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event` + $ev = qu("SELECT type, start, adjust FROM `event` WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0 ORDER BY `start` ASC ", intval(local_user()), @@ -212,7 +212,7 @@ function ping_init(App $a) } if (dbm::is_result($ev)) { - $all_events = intval($ev[0]['total']); + $all_events = count($ev); if ($all_events) { $str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d'); diff --git a/mod/probe.php b/mod/probe.php index 95f856bfa..8c951a7fc 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -4,6 +4,13 @@ require_once('include/Scrape.php'); function probe_content(App $a) { + if (!local_user()) { + http_status_exit(403, + array("title" => t("Public access denied."), + "description" => t("Only logged in users are permitted to perform a probing."))); + killme(); + } + $o .= 'Probe Diagnostic'; $o .= ''; diff --git a/mod/profile.php b/mod/profile.php index fbce509d2..a83cb076f 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -210,7 +210,7 @@ function profile_content(App $a, $update = 0) { if ($update) { - $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network` + $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`, `item`.`created` FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND diff --git a/mod/profiles.php b/mod/profiles.php index b73c46e71..bd57f106d 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -193,7 +193,7 @@ function profiles_post(App $a) { return; } - $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated? + $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0001-01-01'; // FIXME: Needs to be validated? $y = substr($dob, 0, 4); if ((! ctype_digit($y)) || ($y < 1900)) { @@ -201,15 +201,15 @@ function profiles_post(App $a) { } else { $ignore_year = false; } - if ($dob != '0000-00-00') { - if (strpos($dob, '0000-') === 0) { + if (!in_array($dob, array('0000-00-00', '0001-01-01'))) { + if (strpos($dob, '0000-') === 0 || strpos($dob, '0001-') === 0) { $ignore_year = true; $dob = substr($dob, 5); } $dob = datetime_convert('UTC', 'UTC', (($ignore_year) ? '1900-' . $dob : $dob), (($ignore_year) ? 'm-d' : 'Y-m-d')); if ($ignore_year) { - $dob = '0000-' . $dob; + $dob = '0001-' . $dob; } } @@ -637,7 +637,7 @@ function profiles_content(App $a) { t('Hide contacts and friends:'), //Label !!$r[0]['hide-friends'], //Value '', //Help string - array(t('No'),t('Yes')) //Off - On strings + array(t('No'), t('Yes')) //Off - On strings ), '$desc' => t('Hide your contact/friend list from viewers of this profile?'), '$yes_str' => t('Yes'), @@ -739,7 +739,7 @@ function profiles_content(App $a) { '$tv' => array('tv', t('Television'), $r[0]['tv']), '$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']), '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']), - '$romance' => array('romance',t('Love/romance'), $r[0]['romance']), + '$romance' => array('romance', t('Love/romance'), $r[0]['romance']), '$work' => array('work', t('Work/employment'), $r[0]['work']), '$education' => array('education', t('School/education'), $r[0]['education']), '$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']), diff --git a/mod/register.php b/mod/register.php index 81e8c3ad8..5e8da4685 100644 --- a/mod/register.php +++ b/mod/register.php @@ -282,7 +282,7 @@ function register_content(App $a) { '$passwords' => $passwords, '$password1' => array('password1', t('New Password:'), '', t('Leave empty for an auto generated password.')), '$password2' => array('confirm', t('Confirm:'), '', ''), - '$nickdesc' => str_replace('$sitename',$a->get_hostname(),t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.')), + '$nickdesc' => str_replace('$sitename',$a->get_hostname(), t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.')), '$nicklabel' => t('Choose a nickname: '), '$photo' => $photo, '$publish' => $profile_publish, diff --git a/mod/salmon.php b/mod/salmon.php index 69809f523..10b1046b0 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -79,7 +79,7 @@ function salmon_post(App $a) { $signed_data = $data . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg); - $compliant_format = str_replace('=','',$signed_data); + $compliant_format = str_replace('=', '', $signed_data); // decode the data @@ -115,24 +115,28 @@ function salmon_post(App $a) { // We should have everything we need now. Let's see if it verifies. - $verify = rsa_verify($compliant_format,$signature,$pubkey); + // Try GNU Social format + $verify = rsa_verify($signed_data, $signature, $pubkey); + $mode = 1; - if(! $verify) { - logger('mod-salmon: message did not verify using protocol. Trying padding hack.'); - $verify = rsa_verify($signed_data,$signature,$pubkey); + if (! $verify) { + logger('mod-salmon: message did not verify using protocol. Trying compliant format.'); + $verify = rsa_verify($compliant_format, $signature, $pubkey); + $mode = 2; } - if(! $verify) { - logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.'); - $verify = rsa_verify($stnet_signed_data,$signature,$pubkey); + if (! $verify) { + logger('mod-salmon: message did not verify using padding. Trying old statusnet format.'); + $verify = rsa_verify($stnet_signed_data, $signature, $pubkey); + $mode = 3; } - if(! $verify) { + if (! $verify) { logger('mod-salmon: Message did not verify. Discarding.'); http_status_exit(400); } - logger('mod-salmon: Message verified.'); + logger('mod-salmon: Message verified with mode '.$mode); /* diff --git a/mod/search.php b/mod/search.php index 7d588aa4d..a804ca32e 100644 --- a/mod/search.php +++ b/mod/search.php @@ -203,18 +203,13 @@ function search_content(App $a) { } else { logger("Start fulltext search for '".$search."'", LOGGER_DEBUG); - // Disabled until finally is decided how to proceed with this - //if (get_config('system','use_fulltext_engine')) { - // $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search))); - //} else { - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); - //} + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); $r = q("SELECT %s FROM `item` %s WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`)) $sql_extra - GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d", + GROUP BY `item`.`uri`, `item`.`id` ORDER BY `item`.`id` DESC LIMIT %d , %d", item_fieldlists(), item_joins(), item_condition(), intval(local_user()), intval($a->pager['start']), intval($a->pager['itemspage'])); diff --git a/mod/settings.php b/mod/settings.php index 5c9c439e0..1d83251d4 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -779,7 +779,7 @@ function settings_content(App $a) { $arr[$fname] = array(); $arr[$fname][0] = $fdata[0]; foreach (array_slice($fdata,1) as $f) { - $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); + $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'), t('On'))); } } @@ -1164,48 +1164,48 @@ function settings_content(App $a) { } $opt_tpl = get_markup_template("field_yesno.tpl"); - if(get_config('system','publish_all')) { + if (get_config('system','publish_all')) { $profile_in_dir = ''; } else { - $profile_in_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))), + $profile_in_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), array(t('No'), t('Yes'))) )); } if (strlen(get_config('system','directory'))) { - $profile_in_net_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))), + $profile_in_net_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'), t('Yes'))) )); } else { $profile_in_net_dir = ''; } $hide_friends = replace_macros($opt_tpl,array( - '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'),t('Yes'))), + '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'), t('Yes'))), )); $hide_wall = replace_macros($opt_tpl,array( - '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'),t('Yes'))), + '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'), t('Yes'))), )); $blockwall = replace_macros($opt_tpl,array( - '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'),t('Yes'))), + '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); $blocktags = replace_macros($opt_tpl,array( - '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'),t('Yes'))), + '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); $suggestme = replace_macros($opt_tpl,array( - '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'),t('Yes'))), + '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'), t('Yes'))), )); $unkmail = replace_macros($opt_tpl,array( - '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))), + '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'), t('Yes'))), )); @@ -1231,11 +1231,11 @@ function settings_content(App $a) { 'days' => array('expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')), 'advanced' => t('Advanced expiration settings'), 'label' => t('Advanced Expiration'), - 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'),t('Yes'))), - 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))), - 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))), - 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))), - 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'),t('Yes'))), + 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'), t('Yes'))), + 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'), t('Yes'))), + 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'), t('Yes'))), + 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'), t('Yes'))), + 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'), t('Yes'))), ); require_once('include/group.php'); @@ -1293,7 +1293,7 @@ function settings_content(App $a) { '$h_prv' => t('Security and Privacy Settings'), - '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq ,t("\x28to prevent spam abuse\x29")), + '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq , t("\x28to prevent spam abuse\x29")), '$permissions' => t('Default Post Permissions'), '$permdesc' => t("\x28click to open/close\x29"), '$visibility' => $profile['net-publish'], @@ -1323,7 +1323,7 @@ function settings_content(App $a) { '$hide_friends' => $hide_friends, '$hide_wall' => $hide_wall, '$unkmail' => $unkmail, - '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail ,t("\x28to prevent spam abuse\x29")), + '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail , t("\x28to prevent spam abuse\x29")), '$h_not' => t('Notification Settings'), diff --git a/mod/uexport.php b/mod/uexport.php index cada539bc..77a45f8a3 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -34,8 +34,8 @@ function uexport_content(App $a) { * list of array( 'link url', 'link text', 'help text' ) */ $options = array( - array('uexport/account',t('Export account'),t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')), - array('uexport/backup',t('Export all'),t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')), + array('uexport/account', t('Export account'), t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')), + array('uexport/backup', t('Export all'), t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')), ); call_hooks('uexport_options', $options); diff --git a/mod/videos.php b/mod/videos.php index 3828b8f1f..269d53785 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -356,7 +356,9 @@ function videos_content(App $a) { $a->set_pager_itemspage(20); } - $r = q("SELECT hash, `id`, `filename`, filetype FROM `attach` + $r = q("SELECT hash, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`created`) AS `created`, + ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`filetype`) as `filetype` + FROM `attach` WHERE `uid` = %d AND filetype LIKE '%%video%%' $sql_extra GROUP BY hash ORDER BY `created` DESC LIMIT %d , %d", intval($a->data['user']['uid']), diff --git a/mod/webfinger.php b/mod/webfinger.php index eee0580e3..d823bd2dc 100644 --- a/mod/webfinger.php +++ b/mod/webfinger.php @@ -3,6 +3,13 @@ require_once("include/Probe.php"); function webfinger_content(App $a) { + if (!local_user()) { + http_status_exit(403, + array("title" => t("Public access denied."), + "description" => t("Only logged in users are permitted to perform a probing."))); + killme(); + } + $o .= 'Webfinger Diagnostic'; $o .= ''; diff --git a/update.php b/update.php index 8404f5bf2..ea0c57535 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ /dev/null 2>&1; then + # Cygwin paths start with /cygdrive/ which will break windows PHP, + # so we need to translate the dir path to windows format. However + # we could be using cygwin PHP which does not require this, so we + # test if the path to PHP starts with /cygdrive/ rather than /usr/bin + if [[ $(which php) == /cygdrive/* ]]; then + dir=$(cygpath -m "$dir"); + fi +fi + +dir=$(echo $dir | sed 's/ /\ /g') +"${dir}/html-to-markdown" "$@" diff --git a/vendor/bin/html-to-markdown.bat b/vendor/bin/html-to-markdown.bat new file mode 100644 index 000000000..273f24a5d --- /dev/null +++ b/vendor/bin/html-to-markdown.bat @@ -0,0 +1,4 @@ +@ECHO OFF +setlocal DISABLEDELAYEDEXPANSION +SET BIN_TARGET=%~dp0/../league/html-to-markdown/bin/html-to-markdown +php "%BIN_TARGET%" %* diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 95407cff6..4553da2e2 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -241,6 +241,29 @@ return array( 'HTMLPurifier_VarParser_Flexible' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php', 'HTMLPurifier_VarParser_Native' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php', 'HTMLPurifier_Zipper' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php', + 'League\\HTMLToMarkdown\\Configuration' => $vendorDir . '/league/html-to-markdown/src/Configuration.php', + 'League\\HTMLToMarkdown\\ConfigurationAwareInterface' => $vendorDir . '/league/html-to-markdown/src/ConfigurationAwareInterface.php', + 'League\\HTMLToMarkdown\\Converter\\BlockquoteConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/BlockquoteConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CodeConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/CodeConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CommentConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/CommentConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ConverterInterface' => $vendorDir . '/league/html-to-markdown/src/Converter/ConverterInterface.php', + 'League\\HTMLToMarkdown\\Converter\\DefaultConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/DefaultConverter.php', + 'League\\HTMLToMarkdown\\Converter\\DivConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/DivConverter.php', + 'League\\HTMLToMarkdown\\Converter\\EmphasisConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/EmphasisConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HardBreakConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HardBreakConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HeaderConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HeaderConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HorizontalRuleConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ImageConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ImageConverter.php', + 'League\\HTMLToMarkdown\\Converter\\LinkConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/LinkConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListBlockConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListBlockConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListItemConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ParagraphConverter.php', + 'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/PreformattedConverter.php', + 'League\\HTMLToMarkdown\\Converter\\TextConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/TextConverter.php', + 'League\\HTMLToMarkdown\\Element' => $vendorDir . '/league/html-to-markdown/src/Element.php', + 'League\\HTMLToMarkdown\\ElementInterface' => $vendorDir . '/league/html-to-markdown/src/ElementInterface.php', + 'League\\HTMLToMarkdown\\Environment' => $vendorDir . '/league/html-to-markdown/src/Environment.php', + 'League\\HTMLToMarkdown\\HtmlConverter' => $vendorDir . '/league/html-to-markdown/src/HtmlConverter.php', 'Mobile_Detect' => $vendorDir . '/mobiledetect/mobiledetectlib/Mobile_Detect.php', 'OS_Guess' => $vendorDir . '/pear-pear.php.net/PEAR/OS/Guess.php', 'PEAR' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR.php', diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index a8d577d5e..61a440ffd 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -6,5 +6,6 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( + 'League\\HTMLToMarkdown\\' => array($vendorDir . '/league/html-to-markdown/src'), 'Friendica\\' => array($baseDir . '/src'), ); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 370e53218..37d3c878b 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -11,6 +11,10 @@ class ComposerStaticInitFriendica ); public static $prefixLengthsPsr4 = array ( + 'L' => + array ( + 'League\\HTMLToMarkdown\\' => 22, + ), 'F' => array ( 'Friendica\\' => 10, @@ -18,6 +22,10 @@ class ComposerStaticInitFriendica ); public static $prefixDirsPsr4 = array ( + 'League\\HTMLToMarkdown\\' => + array ( + 0 => __DIR__ . '/..' . '/league/html-to-markdown/src', + ), 'Friendica\\' => array ( 0 => __DIR__ . '/../..' . '/src', @@ -277,6 +285,29 @@ class ComposerStaticInitFriendica 'HTMLPurifier_VarParser_Flexible' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php', 'HTMLPurifier_VarParser_Native' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php', 'HTMLPurifier_Zipper' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php', + 'League\\HTMLToMarkdown\\Configuration' => __DIR__ . '/..' . '/league/html-to-markdown/src/Configuration.php', + 'League\\HTMLToMarkdown\\ConfigurationAwareInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/ConfigurationAwareInterface.php', + 'League\\HTMLToMarkdown\\Converter\\BlockquoteConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/BlockquoteConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CodeConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/CodeConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CommentConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/CommentConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ConverterInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ConverterInterface.php', + 'League\\HTMLToMarkdown\\Converter\\DefaultConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/DefaultConverter.php', + 'League\\HTMLToMarkdown\\Converter\\DivConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/DivConverter.php', + 'League\\HTMLToMarkdown\\Converter\\EmphasisConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/EmphasisConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HardBreakConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HardBreakConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HeaderConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HeaderConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HorizontalRuleConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ImageConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ImageConverter.php', + 'League\\HTMLToMarkdown\\Converter\\LinkConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/LinkConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListBlockConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ListBlockConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ListItemConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ParagraphConverter.php', + 'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/PreformattedConverter.php', + 'League\\HTMLToMarkdown\\Converter\\TextConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/TextConverter.php', + 'League\\HTMLToMarkdown\\Element' => __DIR__ . '/..' . '/league/html-to-markdown/src/Element.php', + 'League\\HTMLToMarkdown\\ElementInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/ElementInterface.php', + 'League\\HTMLToMarkdown\\Environment' => __DIR__ . '/..' . '/league/html-to-markdown/src/Environment.php', + 'League\\HTMLToMarkdown\\HtmlConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/HtmlConverter.php', 'Mobile_Detect' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/Mobile_Detect.php', 'OS_Guess' => __DIR__ . '/..' . '/pear-pear.php.net/PEAR/OS/Guess.php', 'PEAR' => __DIR__ . '/..' . '/pear-pear.php.net/PEAR/PEAR.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index d55aed01d..45038987b 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -330,5 +330,71 @@ "PHP License" ], "description": "Text_Highlighter is a package for syntax highlighting.\n\nIt provides a base class provining all the functionality,\nand a descendent classes geneator class.\n\nThe main idea is to simplify creation of subclasses\nimplementing syntax highlighting for particular language.\nSubclasses do not implement any new functioanality,\nthey just provide syntax highlighting rules.\nThe rules sources are in XML format.\n\nTo create a highlighter for a language, there is no need\nto code a new class manually. Simply describe the rules\nin XML file and use Text_Highlighter_Generator to create\na new class." + }, + { + "name": "league/html-to-markdown", + "version": "4.4.1", + "version_normalized": "4.4.1.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/html-to-markdown.git", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/82ea375b5b2b1da1da222644c0565c695bf88186", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xml": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "time": "2017-03-16T00:45:59+00:00", + "bin": [ + "bin/html-to-markdown" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "description": "An HTML-to-markdown conversion helper for PHP", + "homepage": "https://github.com/thephpleague/html-to-markdown", + "keywords": [ + "html", + "markdown" + ] } ] diff --git a/vendor/league/html-to-markdown/CHANGELOG.md b/vendor/league/html-to-markdown/CHANGELOG.md new file mode 100644 index 000000000..067864412 --- /dev/null +++ b/vendor/league/html-to-markdown/CHANGELOG.md @@ -0,0 +1,214 @@ +# Change Log +All notable changes to this project will be documented in this file. +Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles. + +## [Unreleased][unreleased] + +## [4.4.1] + +### Fixed + - Fixed autolinking of invalid URLs (#129) + +## [4.4.0] + +### Added + - Added `hard_break` configuration option (#112, #115) + - The `HtmlConverter` can now be instantiated with an `Environment` (#118) + +### Fixed + - Fixed handling of paragraphs in list item elements (#47, #110) + - Fixed phantom spaces when newlines follow `br` elements (#116, #117) + - Fixed link converter not sanitizing inner spaces properly (#119, #120) + +## [4.3.1] +### Changed + - Revised the sanitization implementation (#109) + +### Fixed + - Fixed tag-like content not being escaped (#67, #109) + - Fixed thematic break-like content not being escaped (#65, #109) + - Fixed codefence-like content not being escaped (#64, #109) + +## [4.3.0] +### Added + - Added full support for PHP 7.0 and 7.1 + +### Changed + - Changed `` and `` conversions to use backticks instead of indendation (#102) + +### Fixed + - Fixed issue where specified code language was not preserved (#70, #102) + - Fixed issue where `` tags nested in `` was not converted properly (#70, #102) + - Fixed header-like content not being escaped (#76, #105) + - Fixed blockquote-like content not being escaped (#77, #103) + - Fixed ordered list-like content not being escaped (#73, #106) + - Fixed unordered list-like content not being escaped (#71, #107) + +## [4.2.2] +### Fixed + - Fixed sanitization bug which sometimes removes desired content (#63, #101) + +## [4.2.1] +### Fixed + - Fixed path to autoload.php when used as a library (#98) + - Fixed edge case for tags containing only whitespace (#99) + +### Removed + - Removed double HTML entity decoding, as this is not desireable (#60) + +## [4.2.0] + +### Added + - Added the ability to invoke HtmlConverter objects as functions (#85) + +### Fixed + - Fixed improper handling of nested list items (#19 and #84) + - Fixed preceeding or trailing spaces within emphasis tags (#83) + +## [4.1.1] + +### Fixed + - Fixed conversion of empty paragraphs (#78) + - Fixed `preg_replace` so it wouldn't break UTF-8 characters (#79) + +## [4.1.0] + +### Added + - Added `bin/html-to-markdown` script + +### Changed + - Changed default italic character to `_` (#58) + +## [4.0.1] + +### Fixed + - Added escaping to avoid * and _ in a text being rendered as emphasis (#48) + +### Removed + - Removed the demo (#51) + - `.styleci.yml` and `CONTRIBUTING.md` are no longer included in distributions (#50) + +## [4.0.0] + +This release changes the visibility of several methods/properties. #42 and #43 brought to light that some visiblities were +not ideally set, so this releases fixes that. Moving forwards this should reduce the chance of introducing BC-breaking changes. + +### Added + - Added new `HtmlConverter::getEnvironment()` method to expose the `Environment` (#42, #43) + +### Changed + - Changed `Environment::addConverter()` from `protected` to `public`, enabling custom converters to be added (#42, #43) + - Changed `HtmlConverter::createDOMDocument()` from `protected` to `private` + - Changed `Element::nextCached` from `protected` to `private` + - Made the `Environment` class `final` + +## [3.1.1] +### Fixed + - Empty HTML strings now result in empty Markdown documents (#40, #41) + +## [3.1.0] +### Added + - Added new `equals` method to `Element` to check for equality + +### Changes + - Use Linux line endings consistently instead of plaform-specific line endings (#36) + +### Fixed + - Cleaned up code style + +## [3.0.0] +### Changed + - Changed namespace to `League\HTMLToMarkdown` + - Changed packagist name to `league/html-to-markdown` + - Re-organized code into several separate classes + - `` tags with identical href and inner text are now rendered using angular bracket syntax (#31) + - `` elements are now treated as block-level elements (#33) + +## [2.2.2] +### Added + - Added support for PHP 5.6 and HHVM + - Enabled testing against PHP 7 nightlies + - Added this CHANGELOG.md + +### Fixed + - Fixed whitespace preservation between inline elements (#9 and #10) + +## [2.2.1] +### Fixed + - Preserve placeholder links (#22) + +## [2.2.0] +### Added + - Added CircleCI config + +### Changed + - `` blocks are now treated as code elements + +### Removed + - Dropped support for PHP 5.2 + - Removed incorrect README comment regarding `#text` nodes (#17) + +## [2.1.2] +### Added + - Added the ability to blacklist/remove specific node types (#11) + +### Changed + - Line breaks are now placed after divs instead of before them + - Newlines inside of link texts are now removed + - Updated the minimum PHPUnit version to 4.* + +## [2.1.1] +### Added + - Added options to customize emphasis characters + +## [2.1.0] +### Added + - Added option to strip HTML tags without Markdown equivalents + - Added `convert()` method for converter reuse + - Added ability to set options after instance construction + - Documented the required PHP extensions (#4) + +### Changed + - ATX style now used for h1 and h2 tags inside blockquotes + +### Fixed + - Newlines inside blockquotes are now started with a bracket + - Fixed some incorrect docblocks + - `__toString()` now returns an empty string if input is empty + - Convert head tag if body tag is empty (#7) + - Preserve special characters inside tags without md equivalents (#6) + + +## [2.0.1] +### Fixed + - Fixed first line indentation for multi-line code blocks + - Fixed consecutive anchors get separating spaces stripped (#3) + +## [2.0.0] +### Added + - Initial release + +[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.4.1...master +[4.4.1]: https://github.com/thephpleague/html-to-markdown/compare/4.4.0...4.4.1 +[4.4.0]: https://github.com/thephpleague/html-to-markdown/compare/4.3.1...4.4.0 +[4.3.1]: https://github.com/thephpleague/html-to-markdown/compare/4.3.0...4.3.1 +[4.3.0]: https://github.com/thephpleague/html-to-markdown/compare/4.2.2...4.3.0 +[4.2.2]: https://github.com/thephpleague/html-to-markdown/compare/4.2.1...4.2.2 +[4.2.1]: https://github.com/thephpleague/html-to-markdown/compare/4.2.0...4.2.1 +[4.2.0]: https://github.com/thephpleague/html-to-markdown/compare/4.1.1...4.2.0 +[4.1.1]: https://github.com/thephpleague/html-to-markdown/compare/4.1.0...4.1.1 +[4.1.0]: https://github.com/thephpleague/html-to-markdown/compare/4.0.1...4.1.0 +[4.0.1]: https://github.com/thephpleague/html-to-markdown/compare/4.0.0...4.0.1 +[4.0.0]: https://github.com/thephpleague/html-to-markdown/compare/3.1.1...4.0.0 +[3.1.1]: https://github.com/thephpleague/html-to-markdown/compare/3.1.0...3.1.1 +[3.1.0]: https://github.com/thephpleague/html-to-markdown/compare/3.0.0...3.1.0 +[3.0.0]: https://github.com/thephpleague/html-to-markdown/compare/2.2.2...3.0.0 +[2.2.2]: https://github.com/thephpleague/html-to-markdown/compare/2.2.1...2.2.2 +[2.2.1]: https://github.com/thephpleague/html-to-markdown/compare/2.2.0...2.2.1 +[2.2.0]: https://github.com/thephpleague/html-to-markdown/compare/2.1.2...2.2.0 +[2.1.2]: https://github.com/thephpleague/html-to-markdown/compare/2.1.1...2.1.2 +[2.1.1]: https://github.com/thephpleague/html-to-markdown/compare/2.1.0...2.1.1 +[2.1.0]: https://github.com/thephpleague/html-to-markdown/compare/2.0.1...2.1.0 +[2.0.1]: https://github.com/thephpleague/html-to-markdown/compare/2.0.0...2.0.1 +[2.0.0]: https://github.com/thephpleague/html-to-markdown/compare/775f91e...2.0.0 + diff --git a/vendor/league/html-to-markdown/CONDUCT.md b/vendor/league/html-to-markdown/CONDUCT.md new file mode 100644 index 000000000..01b8644f1 --- /dev/null +++ b/vendor/league/html-to-markdown/CONDUCT.md @@ -0,0 +1,22 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) diff --git a/library/html-to-markdown/LICENSE b/vendor/league/html-to-markdown/LICENSE similarity index 93% rename from library/html-to-markdown/LICENSE rename to vendor/league/html-to-markdown/LICENSE index f538c2ac9..6c04a59dd 100644 --- a/library/html-to-markdown/LICENSE +++ b/vendor/league/html-to-markdown/LICENSE @@ -1,6 +1,8 @@ The MIT License (MIT) -Copyright (c) 2013 Nick Cernis +Copyright (c) 2015 Colin O'Dell + +Originally created by Nick Cernis Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/vendor/league/html-to-markdown/README.md b/vendor/league/html-to-markdown/README.md new file mode 100644 index 000000000..8d75649d6 --- /dev/null +++ b/vendor/league/html-to-markdown/README.md @@ -0,0 +1,196 @@ +HTML To Markdown for PHP +======================== + +[](https://gitter.im/thephpleague/html-to-markdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +[](https://packagist.org/packages/league/html-to-markdown) +[](LICENSE) +[](https://travis-ci.org/thephpleague/html-to-markdown) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown/code-structure) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown) +[](https://packagist.org/packages/league/html-to-markdown) + +Library which converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. + + +**Requires**: PHP 5.3+ + +**Lead Developer**: [@colinodell](http://twitter.com/colinodell) + +**Original Author**: [@nickcernis](http://twitter.com/nickcernis) + + +### Why convert HTML to Markdown? + +*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](https://github.com/thephpleague/commonmark),"* you continue, already labouring the question somewhat, *"but why go the other way?"* + +Typically you would convert HTML to Markdown if: + +1. You have an existing HTML document that needs to be edited by people with good taste. +2. You want to store new content in HTML format but edit it as Markdown. +3. You want to convert HTML email to plain text email. +4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. +5. You just really like Markdown. + +### How to use it + +Require the library by issuing this command: + +```bash +composer require league/html-to-markdown +``` + +Add `require 'vendor/autoload.php';` to the top of your script. + +Next, create a new HtmlConverter instance, passing in your valid HTML code to its `convert()` function: + +```php +use League\HTMLToMarkdown\HtmlConverter; + +$converter = new HtmlConverter(); + +$html = "Quick, to the Batpoles!"; +$markdown = $converter->convert($html); +``` + +The `$markdown` variable now contains the Markdown version of your HTML as a string: + +```php +echo $markdown; // ==> ### Quick, to the Batpoles! +``` + +The included `demo` directory contains an HTML->Markdown conversion form to try out. + +### Conversion options + +By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. + +To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: + +```php +$converter = new HtmlConverter(array('strip_tags' => true)); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Or more explicitly, like this: + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('strip_tags', true); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Note that only the tags themselves are stripped, not the content they hold. + +To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: + +```php +$converter = new HtmlConverter(array('remove_nodes' => 'span div')); + +$html = 'Turnips!Monkeys!'; +$markdown = $converter->convert($html); // $markdown now contains "" +``` + +### Style options + +Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('italic_style', '_'); +$converter->getConfig()->setOption('bold_style', '__'); + +$html = 'Italic and a bold'; +$markdown = $converter->convert($html); // $markdown now contains "_Italic_ and a __bold__" +``` + +### Line break options + +By default, `br` tags are converted to two spaces followed by a newline character as per [traditional Markdown](https://daringfireball.net/projects/markdown/syntax#p). Set `hard_break` to `true` to omit the two spaces, as per GitHub Flavored Markdown (GFM). + +```php +$converter = new HtmlConverter(); +$html = 'testline break'; + +$converter->getConfig()->setOption('hard_break', true); +$markdown = $converter->convert($html); // $markdown now contains "test\nline break" + +$converter->getConfig()->setOption('hard_break', false); // default +$markdown = $converter->convert($html); // $markdown now contains "test \nline break" +``` + +### Passing custom Environment object + +You can pass current `Environment` object to customize i.e. which converters should be used. + +```php +$environment = new Environment(array( + // your configuration here +)); +$environment->addConverter(new HeaderConverter()); // optionally - add converter manually + +$converter = new HtmlConverter($environment); + +$html = 'Header + +'; +$markdown = $converter->convert($html); // $markdown now contains "### Header" and "" +``` + +### Limitations + +- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. + +### Known issues + +- Nested lists and lists containing multiple paragraphs aren't converted correctly. +- Lists inside blockquotes aren't converted correctly. +- Any reported [open issues here](https://github.com/thephpleague/html-to-markdown/issues?state=open). + +[Report your issue or request a feature here.](https://github.com/thephpleague/html-to-markdown/issues/new) Issues with patches or failing tests are especially welcome. + +### Style notes + +- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: + + `$converter = new HtmlConverter(array('header_style'=>'atx'));` + + Headers of H3 priority and lower always use atx style. + +- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. +- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. + +### Dependencies + +HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. + +Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. + +### Contributors + +Many thanks to all [contributors](https://github.com/thephpleague/html-to-markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. + +### How it works + +HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. + +### To-do + +- Support for nested lists and lists inside blockquotes. +- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). + +### Trying to convert Markdown to HTML? + +Use one of these great libraries: + + - [league/commonmark](https://github.com/thephpleague/commonmark) (recommended) + - [cebe/markdown](https://github.com/cebe/markdown) + - [PHP Markdown](https://michelf.ca/projects/php-markdown/) + - [Parsedown](https://github.com/erusev/parsedown) + +No guarantees about the Elvish, though. + diff --git a/vendor/league/html-to-markdown/bin/html-to-markdown b/vendor/league/html-to-markdown/bin/html-to-markdown new file mode 100644 index 000000000..2815a7cef --- /dev/null +++ b/vendor/league/html-to-markdown/bin/html-to-markdown @@ -0,0 +1,108 @@ +#!/usr/bin/env php + $arg) { + if ($i === 0) { + continue; + } + + if (substr($arg, 0, 1) === '-') { + switch ($arg) { + case '-h': + case '--help': + echo getHelpText(); + exit(0); + default: + fail('Unknown option: ' . $arg); + } + } else { + $src = $argv[1]; + } +} + +if (isset($src)) { + if (!file_exists($src)) { + fail('File not found: ' . $src); + } + + $html = file_get_contents($src); +} else { + $stdin = fopen('php://stdin', 'r'); + stream_set_blocking($stdin, false); + $html = stream_get_contents($stdin); + fclose($stdin); + + if (empty($html)) { + fail(getHelpText()); + } +} + + +$converter = new League\HTMLToMarkdown\HtmlConverter(); +echo $converter->convert($html); + +/** + * Get help and usage info + * + * @return string + */ +function getHelpText() +{ + return << output.md + + Converting from STDIN: + + echo -e 'Hello World!' | html-to-markdown + + Converting from STDIN and saving the output: + + echo -e 'Hello World!' | html-to-markdown > output.md + +HELP; +} + +/** + * @param string $message Error message + */ +function fail($message) +{ + fwrite(STDERR, $message . "\n"); + exit(1); +} + +function requireAutoloader() +{ + $autoloadPaths = array( + // Local package usage + __DIR__ . '/../vendor/autoload.php', + // Package was included as a library + __DIR__ . '/../../../autoload.php', + ); + foreach ($autoloadPaths as $path) { + if (file_exists($path)) { + require_once $path; + break; + } + } +} diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json new file mode 100644 index 000000000..58764bcb5 --- /dev/null +++ b/vendor/league/html-to-markdown/composer.json @@ -0,0 +1,48 @@ +{ + "name": "league/html-to-markdown", + "type": "library", + "description": "An HTML-to-markdown conversion helper for PHP", + "keywords": ["markdown", "html"], + "homepage": "https://github.com/thephpleague/html-to-markdown", + "license": "MIT", + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "League\\HTMLToMarkdown\\Test\\": "tests" + } + }, + "require": { + "php": ">=5.3.3", + "ext-dom": "*", + "ext-xml": "*" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "bin": ["bin/html-to-markdown"], + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + } +} diff --git a/vendor/league/html-to-markdown/src/Configuration.php b/vendor/league/html-to-markdown/src/Configuration.php new file mode 100644 index 000000000..2943383aa --- /dev/null +++ b/vendor/league/html-to-markdown/src/Configuration.php @@ -0,0 +1,60 @@ +config = $config; + } + + /** + * @param array $config + */ + public function merge(array $config = array()) + { + $this->config = array_replace_recursive($this->config, $config); + } + + /** + * @param array $config + */ + public function replace(array $config = array()) + { + $this->config = $config; + } + + /** + * @param string $key + * @param mixed $value + */ + public function setOption($key, $value) + { + $this->config[$key] = $value; + } + + /** + * @param string|null $key + * @param mixed|null $default + * + * @return mixed|null + */ + public function getOption($key = null, $default = null) + { + if ($key === null) { + return $this->config; + } + + if (!isset($this->config[$key])) { + return $default; + } + + return $this->config[$key]; + } +} diff --git a/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php new file mode 100644 index 000000000..8aca530be --- /dev/null +++ b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php @@ -0,0 +1,11 @@ +' symbols to each line. + + $markdown = ''; + + $quote_content = trim($element->getValue()); + + $lines = preg_split('/\r\n|\r|\n/', $quote_content); + + $total_lines = count($lines); + + foreach ($lines as $i => $line) { + $markdown .= '> ' . $line . "\n"; + if ($i + 1 === $total_lines) { + $markdown .= "\n"; + } + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('blockquote'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php new file mode 100644 index 000000000..c8ec2c005 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php @@ -0,0 +1,62 @@ +getAttribute('class'); + + if ($classes) { + // Since tags can have more than one class, we need to find the one that starts with 'language-' + $classes = explode(' ', $classes); + foreach ($classes as $class) { + if (strpos($class, 'language-') !== false) { + // Found one, save it as the selected language and stop looping over the classes. + // The space after the language avoids gluing the actual code with the language tag + $language = str_replace('language-', '', $class) . ' '; + break; + } + } + } + + $markdown = ''; + $code = html_entity_decode($element->getChildrenAsString()); + + // In order to remove the code tags we need to search for them and, in the case of the opening tag + // use a regular expression to find the tag and the other attributes it might have + $code = preg_replace('/]*>/', '', $code); + $code = str_replace('', '', $code); + + // Checking if the code has multiple lines + $lines = preg_split('/\r\n|\r|\n/', $code); + if (count($lines) > 1) { + // Multiple lines detected, adding three backticks and newlines + $markdown .= '```' . $language . "\n" . $code . "\n" . '```'; + } else { + // One line of code, wrapping it on one backtick. + $markdown .= '`' . $language . $code . '`'; + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('code'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CommentConverter.php b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php new file mode 100644 index 000000000..55038b254 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php @@ -0,0 +1,26 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, + // such as nodes on their own. C14N() canonicalizes the node to a string. + // See: http://www.php.net/manual/en/domnode.c14n.php + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue(); + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array(self::DEFAULT_CONVERTER); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/DivConverter.php b/vendor/league/html-to-markdown/src/Converter/DivConverter.php new file mode 100644 index 000000000..656a0ba4d --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/DivConverter.php @@ -0,0 +1,45 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue() . "\n\n"; + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('div'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php new file mode 100644 index 000000000..67250769b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php @@ -0,0 +1,57 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $tag = $element->getTagName(); + $value = $element->getValue(); + + if (!trim($value)) { + return ''; + } + + if ($tag === 'i' || $tag === 'em') { + $style = $this->config->getOption('italic_style'); + } else { + $style = $this->config->getOption('bold_style'); + } + + $prefix = ltrim($value) !== $value ? ' ' : ''; + $suffix = rtrim($value) !== $value ? ' ' : ''; + + return $prefix . $style . trim($value) . $style . $suffix; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('em', 'i', 'strong', 'b'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php new file mode 100644 index 000000000..37cd44e73 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php @@ -0,0 +1,41 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + return $this->config->getOption('hard_break') ? "\n" : " \n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('br'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php new file mode 100644 index 000000000..d117e7d36 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php @@ -0,0 +1,78 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $level = (int) substr($element->getTagName(), 1, 1); + $style = $this->config->getOption('header_style', self::STYLE_SETEXT); + + if (($level === 1 || $level === 2) && !$element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) { + return $this->createSetextHeader($level, $element->getValue()); + } + + return $this->createAtxHeader($level, $element->getValue()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'); + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createSetextHeader($level, $content) + { + $length = function_exists('mb_strlen') ? mb_strlen($content, 'utf-8') : strlen($content); + $underline = ($level === 1) ? '=' : '-'; + + return $content . "\n" . str_repeat($underline, $length) . "\n\n"; + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createAtxHeader($level, $content) + { + $prefix = str_repeat('#', $level) . ' '; + + return $prefix . $content . "\n\n"; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php new file mode 100644 index 000000000..8f54f9397 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php @@ -0,0 +1,26 @@ +getAttribute('src'); + $alt = $element->getAttribute('alt'); + $title = $element->getAttribute('title'); + + if ($title !== '') { + // No newlines added. should be in a block-level element. + return ''; + } + + return ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('img'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php new file mode 100644 index 000000000..f0765f38b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php @@ -0,0 +1,52 @@ +getAttribute('href'); + $title = $element->getAttribute('title'); + $text = trim($element->getValue()); + + if ($title !== '') { + $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; + } elseif ($href === $text && $this->isValidAutolink($href)) { + $markdown = '<' . $href . '>'; + } else { + $markdown = '[' . $text . '](' . $href . ')'; + } + + if (!$href) { + $markdown = html_entity_decode($element->getChildrenAsString()); + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('a'); + } + + /** + * @param string $href + * + * @return bool + */ + private function isValidAutolink($href) + { + return preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php new file mode 100644 index 000000000..07a4c85a9 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php @@ -0,0 +1,26 @@ +getValue() . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('ol', 'ul'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php new file mode 100644 index 000000000..dafec077c --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php @@ -0,0 +1,47 @@ +getParent()->getTagName(); + + // Add spaces to start for nested list items + $level = $element->getListItemLevel($element); + + $prefixForParagraph = str_repeat(' ', $level + 1); + $value = trim(implode("\n" . $prefixForParagraph, explode("\n", trim($element->getValue())))); + + // If list item is the first in a nested list, add a newline before it + $prefix = ''; + if ($level > 0 && $element->getSiblingPosition() === 1) { + $prefix = "\n"; + } + + if ($list_type === 'ul') { + return $prefix . '- ' . $value . "\n"; + } + + $number = $element->getSiblingPosition(); + + return $prefix . $number . '. ' . $value . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('li'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php new file mode 100644 index 000000000..cf852bfcf --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php @@ -0,0 +1,124 @@ +getValue(); + + $markdown = ''; + + $lines = preg_split('/\r\n|\r|\n/', $value); + foreach ($lines as $line) { + /* + * Some special characters need to be escaped based on the position that they appear + * The following function will deal with those special cases. + */ + $markdown .= $this->escapeSpecialCharacters($line); + $markdown .= "\n"; + } + + return trim($markdown) !== '' ? rtrim($markdown) . "\n\n" : ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('p'); + } + + /** + * @param string $line + * + * @return string + */ + private function escapeSpecialCharacters($line) + { + $line = $this->escapeFirstCharacters($line); + $line = $this->escapeOtherCharacters($line); + $line = $this->escapeOtherCharactersRegex($line); + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeFirstCharacters($line) + { + $escapable = array( + '>', + '- ', + '+ ', + '--', + '~~~', + '---', + '- - -' + ); + + foreach ($escapable as $i) { + if (strpos(ltrim($line), $i) === 0) { + // Found a character that must be escaped, adding a backslash before + return '\\' . ltrim($line); + } + } + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeOtherCharacters($line) + { + $escapable = array( + ' {{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache_duration}} diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl index a8243b614..e65014413 100644 --- a/view/templates/admin_summary.tpl +++ b/view/templates/admin_summary.tpl @@ -11,7 +11,7 @@ {{$queues.label}} - {{$queues.deliverq}} - {{$queues.queue}} - {{$queues.workerq}} + {{$queues.queue}} - {{$queues.workerq}} {{$pending.0}} diff --git a/view/templates/head.tpl b/view/templates/head.tpl index 0772af0bc..e7df8a18c 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -7,7 +7,7 @@ - + @@ -19,6 +19,7 @@ +
with - $Text = preg_replace_callback("|(?!]*>)([^<]*)(?!]*>)|ism", 'bb_onelinecode_cb', $Text); + // Replace inline code blocks + $Text = preg_replace_callback("|(?!]*>)([^<]*)(?!]*>)|ism", + function ($match) use ($simplehtml) { + $return = '' . $match[1] . ''; + // Use for Diaspora inline code blocks + if ($simplehtml === 3) { + $return = '' . $match[1] . ''; + } + return $return; + } + , $Text); // Unhide all [noparse] contained bbtags unspacefying them // and triming the [noparse] tag. - $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim',$Text); - $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim',$Text); - $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim',$Text); + $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim', $Text); + $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim', $Text); + $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim', $Text); - $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/','&$1;',$Text); - $Text = preg_replace('/\&\#039\;/','\'',$Text); - $Text = preg_replace('/\"\;/','"',$Text); + $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/', '&$1;', $Text); + $Text = preg_replace('/\&\#039\;/', '\'', $Text); + $Text = preg_replace('/\"\;/', '"', $Text); // fix any escaped ampersands that may have been converted into links $Text = preg_replace('/\<([^>]*?)(src|href)=(.*?)\&\;(.*?)\>/ism', '<$1$2=$3&$4>', $Text); @@ -1178,7 +1266,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $regex = '#<([^>]*?)(href)="(?!' . implode('|', $allowed_link_protocols) . ')(.*?)"(.*?)>#ism'; $Text = preg_replace($regex, '<$1$2="javascript:void(0)"$4 class="invalid-href" title="' . t('Invalid link protocol') . '">', $Text); - if($saved_image) { + if ($saved_image) { $Text = bb_replace_images($Text, $saved_image); } @@ -1198,19 +1286,19 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $Text = $doc->saveHTML(); $Text = str_replace(array("", "", $doctype, $encoding), array("", "", "", ""), $Text); - $Text = str_replace('','', $Text); + $Text = str_replace('', '', $Text); //$Text = mb_convert_encoding($Text, "UTF-8", 'HTML-ENTITIES'); } // Clean up some useless linebreaks in lists - //$Text = str_replace('','', $Text); - //$Text = str_replace('','', $Text); - //$Text = str_replace('','', $Text); - // $Text = str_replace('', '', $Text); + //$Text = str_replace('', '', $Text); + //$Text = str_replace('', '', $Text); + //$Text = str_replace(' diff --git a/include/cli_startup.php b/include/cli_startup.php index 4b66b47a0..557d08c28 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -19,7 +19,7 @@ function cli_startup() { require_once("dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); - }; + }; require_once('include/session.php'); diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 56c032847..7069af066 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -9,12 +9,12 @@ function contact_profile_assign($current,$foreign_net) { $o .= "\r\n"; - $r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d", + $r = q("SELECT `id`, `profile-name`, `is-default` FROM `profile` WHERE `uid` = %d", intval($_SESSION['uid'])); if (dbm::is_result($r)) { foreach ($r as $rr) { - $selected = (($rr['id'] == $current) ? " selected=\"selected\" " : ""); + $selected = (($rr['id'] == $current || ($current == 0 && $rr['is-default'] == 1)) ? " selected=\"selected\" " : ""); $o .= "{$rr['profile-name']}\r\n"; } } @@ -37,7 +37,7 @@ function contact_reputation($current) { 5 => t('Reputable, has my trust') ); - foreach($rep as $k => $v) { + foreach ($rep as $k => $v) { $selected = (($k == $current) ? " selected=\"selected\" " : ""); $o .= "$v\r\n"; } @@ -61,7 +61,7 @@ function contact_poll_interval($current, $disabled = false) { 5 => t('Monthly') ); - foreach($rep as $k => $v) { + foreach ($rep as $k => $v) { $selected = (($k == $current) ? " selected=\"selected\" " : ""); $o .= "$v\r\n"; } diff --git a/include/contact_widgets.php b/include/contact_widgets.php index d077a065e..5dd3a8bb4 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -2,7 +2,7 @@ function follow_widget($value = "") { - return replace_macros(get_markup_template('follow.tpl'),array( + return replace_macros(get_markup_template('follow.tpl'), array( '$connect' => t('Add New Contact'), '$desc' => t('Enter address or web location'), '$hint' => t('Example: bob@example.com, http://example.com/barbara'), @@ -13,20 +13,20 @@ function follow_widget($value = "") { } function findpeople_widget() { - require_once('include/Contact.php'); + require_once 'include/Contact.php'; $a = get_app(); - if(get_config('system','invitation_only')) { - $x = get_pconfig(local_user(),'system','invites_remaining'); - if($x || is_site_admin()) { + if (get_config('system', 'invitation_only')) { + $x = get_pconfig(local_user(), 'system', 'invites_remaining'); + if ($x || is_site_admin()) { $a->page['aside'] .= '' - . sprintf( tt('%d invitation available','%d invitations available',$x), $x) + . sprintf( tt('%d invitation available', '%d invitations available', $x), $x) . '' . $inv; } } - return replace_macros(get_markup_template('peoplefind.tpl'),array( + return replace_macros(get_markup_template('peoplefind.tpl'), array( '$findpeople' => t('Find People'), '$desc' => t('Enter name or interest'), '$label' => t('Connect/Follow'), @@ -45,32 +45,41 @@ function unavailable_networks() { $networks = array(); - if (!plugin_enabled("appnet")) + if (!plugin_enabled("appnet")) { $networks[] = NETWORK_APPNET; + } - if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook")) + if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook")) { $networks[] = NETWORK_FACEBOOK; + } - if (!plugin_enabled("statusnet")) + if (!plugin_enabled("statusnet")) { $networks[] = NETWORK_STATUSNET; + } - if (!plugin_enabled("pumpio")) + if (!plugin_enabled("pumpio")) { $networks[] = NETWORK_PUMPIO; + } - if (!plugin_enabled("twitter")) + if (!plugin_enabled("twitter")) { $networks[] = NETWORK_TWITTER; + } - if (get_config("system","ostatus_disabled")) + if (get_config("system", "ostatus_disabled")) { $networks[] = NETWORK_OSTATUS; + } - if (!get_config("system","diaspora_enabled")) + if (!get_config("system", "diaspora_enabled")) { $networks[] = NETWORK_DIASPORA; + } - if (!plugin_enabled("pnut")) + if (!plugin_enabled("pnut")) { $networks[] = NETWORK_PNUT; + } - if (!sizeof($networks)) + if (!sizeof($networks)) { return ""; + } $network_filter = implode("','", $networks); @@ -79,7 +88,7 @@ function unavailable_networks() { return $network_filter; } -function networks_widget($baseurl,$selected = '') { +function networks_widget($baseurl, $selected = '') { $a = get_app(); @@ -87,7 +96,7 @@ function networks_widget($baseurl,$selected = '') { return ''; } - if (!feature_enabled(local_user(),'networks')) { + if (!feature_enabled(local_user(), 'networks')) { return ''; } @@ -99,7 +108,7 @@ function networks_widget($baseurl,$selected = '') { $nets = array(); if (dbm::is_result($r)) { - require_once('include/contact_selectors.php'); + require_once 'include/contact_selectors.php'; foreach ($r as $rr) { /// @TODO If 'network' is not there, this triggers an E_NOTICE if ($rr['network']) { @@ -108,10 +117,11 @@ function networks_widget($baseurl,$selected = '') { } } - if(count($nets) < 2) + if (count($nets) < 2) { return ''; + } - return replace_macros(get_markup_template('nets.tpl'),array( + return replace_macros(get_markup_template('nets.tpl'), array( '$title' => t('Networks'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -122,31 +132,31 @@ function networks_widget($baseurl,$selected = '') { )); } -function fileas_widget($baseurl,$selected = '') { +function fileas_widget($baseurl, $selected = '') { if (! local_user()) { return ''; } - if (! feature_enabled(local_user(),'filing')) { + if (! feature_enabled(local_user(), 'filing')) { return ''; } - $saved = get_pconfig(local_user(),'system','filetags'); + $saved = get_pconfig(local_user(), 'system', 'filetags'); if (! strlen($saved)) { return; } $matches = false; $terms = array(); - $cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { + foreach ($matches as $mtch) { $unescaped = xmlify(file_tag_decode($mtch[1])); - $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); + $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); } } - return replace_macros(get_markup_template('fileas_widget.tpl'),array( + return replace_macros(get_markup_template('fileas_widget.tpl'), array( '$title' => t('Saved Folders'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -157,30 +167,31 @@ function fileas_widget($baseurl,$selected = '') { )); } -function categories_widget($baseurl,$selected = '') { +function categories_widget($baseurl, $selected = '') { $a = get_app(); - if (! feature_enabled($a->profile['profile_uid'],'categories')) { + if (! feature_enabled($a->profile['profile_uid'], 'categories')) { return ''; } - $saved = get_pconfig($a->profile['profile_uid'],'system','filetags'); + $saved = get_pconfig($a->profile['profile_uid'], 'system', 'filetags'); if (! strlen($saved)) { return; } $matches = false; $terms = array(); - $cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER); - if($cnt) { - foreach($matches as $mtch) { - $unescaped = xmlify(file_tag_decode($mtch[1])); - $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); + $cnt = preg_match_all('/<(.*?)>/', $saved, $matches, PREG_SET_ORDER); + + if ($cnt) { + foreach ($matches as $mtch) { + $unescaped = xmlify(file_tag_decode($mtch[1])); + $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); } } - return replace_macros(get_markup_template('categories_widget.tpl'),array( + return replace_macros(get_markup_template('categories_widget.tpl'), array( '$title' => t('Categories'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -195,29 +206,30 @@ function common_friends_visitor_widget($profile_uid) { $a = get_app(); - if(local_user() == $profile_uid) + if (local_user() == $profile_uid) { return; + } $cid = $zcid = 0; - if(is_array($_SESSION['remote'])) { - foreach($_SESSION['remote'] as $visitor) { - if($visitor['uid'] == $profile_uid) { + if (is_array($_SESSION['remote'])) { + foreach ($_SESSION['remote'] as $visitor) { + if ($visitor['uid'] == $profile_uid) { $cid = $visitor['cid']; break; } } } - if(! $cid) { - if(get_my_url()) { + if (! $cid) { + if (get_my_url()) { $r = q("select id from contact where nurl = '%s' and uid = %d limit 1", dbesc(normalise_link(get_my_url())), intval($profile_uid) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $cid = $r[0]['id']; - else { + } else { $r = q("select id from gcontact where nurl = '%s' limit 1", dbesc(normalise_link(get_my_url())) ); @@ -227,22 +239,26 @@ function common_friends_visitor_widget($profile_uid) { } } - if($cid == 0 && $zcid == 0) + if ($cid == 0 && $zcid == 0) { return; + } - require_once('include/socgraph.php'); + require_once 'include/socgraph.php'; - if($cid) - $t = count_common_friends($profile_uid,$cid); - else - $t = count_common_friends_zcid($profile_uid,$zcid); - if(! $t) + if ($cid) { + $t = count_common_friends($profile_uid, $cid); + } else { + $t = count_common_friends_zcid($profile_uid, $zcid); + } + if (! $t) { return; + } - if($cid) - $r = common_friends($profile_uid,$cid,0,5,true); - else - $r = common_friends_zcid($profile_uid,$zcid,0,5,true); + if ($cid) { + $r = common_friends($profile_uid, $cid, 0, 5, true); + } else { + $r = common_friends_zcid($profile_uid, $zcid, 0, 5, true); + } return replace_macros(get_markup_template('remote_friends_common.tpl'), array( '$desc' => sprintf( tt("%d contact in common", "%d contacts in common", $t), $t), diff --git a/include/conversation.php b/include/conversation.php index 93c42cd7b..64204c696 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1,13 +1,15 @@ $new_body, 'images' => $saved_image); }} -if(! function_exists('item_redir_and_replace_images')) { +if (! function_exists('item_redir_and_replace_images')) { function item_redir_and_replace_images($body, $images, $cid) { $origbody = $body; @@ -57,7 +61,7 @@ function item_redir_and_replace_images($body, $images, $cid) { $cnt = 1; $pos = get_bb_tag_pos($origbody, 'url', 1); - while($pos !== false && $cnt < 1000) { + while ($pos !== false && $cnt < 1000) { $search = '/\[url\=(.*?)\]\[!#saved_image([0-9]*)#!\]\[\/url\]' . '/is'; $replace = '[url=' . z_path() . '/redir/' . $cid @@ -66,8 +70,9 @@ function item_redir_and_replace_images($body, $images, $cid) { $newbody .= substr($origbody, 0, $pos['start']['open']); $subject = substr($origbody, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']); $origbody = substr($origbody, $pos['end']['close']); - if($origbody === false) + if ($origbody === false) { $origbody = ''; + } $subject = preg_replace($search, $replace, $subject); $newbody .= $subject; @@ -79,45 +84,51 @@ function item_redir_and_replace_images($body, $images, $cid) { $cnt = 0; foreach ($images as $image) { - // We're depending on the property of 'foreach' (specified on the PHP website) that - // it loops over the array starting from the first element and going sequentially - // to the last element + /* + * We're depending on the property of 'foreach' (specified on the PHP website) that + * it loops over the array starting from the first element and going sequentially + * to the last element. + */ $newbody = str_replace('[!#saved_image' . $cnt . '#!]', '[img]' . $image . '[/img]', $newbody); $cnt++; } return $newbody; }} - - /** * Render actions localized */ -function localize_item(&$item){ +function localize_item(&$item) { $extracted = item_extract_images($item['body']); - if($extracted['images']) + if ($extracted['images']) { $item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']); + } - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - if (activity_match($item['verb'],ACTIVITY_LIKE) - || activity_match($item['verb'],ACTIVITY_DISLIKE) - || activity_match($item['verb'],ACTIVITY_ATTEND) - || activity_match($item['verb'],ACTIVITY_ATTENDNO) - || activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)){ + /// @Separted ??? + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; + if (activity_match($item['verb'], ACTIVITY_LIKE) + || activity_match($item['verb'], ACTIVITY_DISLIKE) + || activity_match($item['verb'], ACTIVITY_ATTEND) + || activity_match($item['verb'], ACTIVITY_ATTENDNO) + || activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) { - $r = q("SELECT * from `item`,`contact` WHERE - `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", - dbesc($item['parent-uri'])); - if (!dbm::is_result($r)) return; - $obj=$r[0]; + /// @TODO may hurt performance + $r = q("SELECT * FROM `item`, `contact` + WHERE `item`.`contact-id`=`contact`.`id` + AND `item`.`uri`='%s'", + dbesc($item['parent-uri'])); + if (!dbm::is_result($r)) { + return; + } + $obj = $r[0]; $author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; $objauthor = '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]'; - switch($obj['verb']){ + switch ($obj['verb']) { case ACTIVITY_POST: - switch ($obj['object-type']){ + switch ($obj['object-type']) { case ACTIVITY_OBJ_EVENT: $post_type = t('event'); break; @@ -126,9 +137,10 @@ function localize_item(&$item){ } break; default: - if($obj['resource-id']){ + if ($obj['resource-id']) { $post_type = t('photo'); - $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); + $m = array(); + preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); $rr['plink'] = $m[1]; } else { $post_type = t('status'); @@ -137,25 +149,25 @@ function localize_item(&$item){ $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; - if(activity_match($item['verb'],ACTIVITY_LIKE)) { + if (activity_match($item['verb'], ACTIVITY_LIKE)) { $bodyverb = t('%1$s likes %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_DISLIKE)) { + elseif (activity_match($item['verb'], ACTIVITY_DISLIKE)) { $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTEND)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTEND)) { $bodyverb = t('%1$s attends %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTENDNO)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTENDNO)) { $bodyverb = t('%1$s doesn\'t attend %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) { $bodyverb = t('%1$s attends maybe %2$s\'s %3$s'); } $item['body'] = sprintf($bodyverb, $author, $objauthor, $plink); } - if (activity_match($item['verb'],ACTIVITY_FRIEND)) { + if (activity_match($item['verb'], ACTIVITY_FRIEND)) { if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return; @@ -169,57 +181,65 @@ function localize_item(&$item){ $Bname = $obj->title; $Blink = ""; $Bphoto = ""; - foreach ($links->link as $l){ + foreach ($links->link as $l) { $atts = $l->attributes(); - switch($atts['rel']){ + switch ($atts['rel']) { case "alternate": $Blink = $atts['href']; case "photo": $Bphoto = $atts['href']; } - } $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; - if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]'; + if ($Bphoto != "") { + $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]'; + } $item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto; } - if (stristr($item['verb'],ACTIVITY_POKE)) { + if (stristr($item['verb'], ACTIVITY_POKE)) { $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); - if(! $verb) + if (! $verb) { return; - if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return; + } + if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) { + return; + } $Aname = $item['author-name']; $Alink = $item['author-link']; - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; $obj = parse_xml_string($xmlhead.$item['object']); $links = parse_xml_string($xmlhead."".unxmlify($obj->link).""); $Bname = $obj->title; - $Blink = ""; $Bphoto = ""; - foreach ($links->link as $l){ + $Blink = ""; + $Bphoto = ""; + foreach ($links->link as $l) { $atts = $l->attributes(); - switch($atts['rel']){ + switch ($atts['rel']) { case "alternate": $Blink = $atts['href']; case "photo": $Bphoto = $atts['href']; } - } $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; - if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]'; + if ($Bphoto != "") { + $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]'; + } - // we can't have a translation string with three positions but no distinguishable text - // So here is the translate string. + /* + * we can't have a translation string with three positions but no distinguishable text + * So here is the translate string. + */ $txt = t('%1$s poked %2$s'); // now translate the verb - $poked_t = trim(sprintf($txt, "","")); + $poked_t = trim(sprintf($txt, "", "")); $txt = str_replace( $poked_t, t($verb), $txt); // then do the sprintf on the translation string @@ -227,10 +247,11 @@ function localize_item(&$item){ $item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto; } - if (stristr($item['verb'],ACTIVITY_MOOD)) { - $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); - if(! $verb) + if (stristr($item['verb'], ACTIVITY_MOOD)) { + $verb = urldecode(substr($item['verb'], strpos($item['verb'], '#') + 1)); + if (! $verb) { return; + } $Aname = $item['author-name']; $Alink = $item['author-link']; @@ -241,19 +262,25 @@ function localize_item(&$item){ $item['body'] = sprintf($txt, $A, t($verb)); } - if (activity_match($item['verb'],ACTIVITY_TAG)) { - $r = q("SELECT * from `item`,`contact` WHERE - `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", - dbesc($item['parent-uri'])); - if (!dbm::is_result($r)) return; - $obj=$r[0]; + if (activity_match($item['verb'], ACTIVITY_TAG)) { + /// @TODO may hurt performance "joining" two tables + asterisk + $r = q("SELECT * FROM `item`, `contact` + WHERE `item`.`contact-id`=`contact`.`id` + AND `item`.`uri`='%s'", + dbesc($item['parent-uri'])); + + if (!dbm::is_result($r)) { + return; + } + + $obj = $r[0]; $author = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]'; $objauthor = '[url=' . zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]'; - switch($obj['verb']){ + switch ($obj['verb']) { case ACTIVITY_POST: - switch ($obj['object-type']){ + switch ($obj['object-type']) { case ACTIVITY_OBJ_EVENT: $post_type = t('event'); break; @@ -262,13 +289,15 @@ function localize_item(&$item){ } break; default: - if($obj['resource-id']){ + if ($obj['resource-id']) { $post_type = t('photo'); $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); $rr['plink'] = $m[1]; } else { $post_type = t('status'); } + // Let's break everthing ... ;-) + break; } $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; @@ -278,22 +307,24 @@ function localize_item(&$item){ $item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag ); } - if (activity_match($item['verb'],ACTIVITY_FAVORITE)){ + if (activity_match($item['verb'], ACTIVITY_FAVORITE)) { - if ($item['object-type']== "") + if ($item['object-type'] == "") { return; + } $Aname = $item['author-name']; $Alink = $item['author-link']; - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; $obj = parse_xml_string($xmlhead.$item['object']); - if(strlen($obj->id)) { - $r = q("select * from item where uri = '%s' and uid = %d limit 1", + if (strlen($obj->id)) { + $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($obj->id), intval($item['uid']) ); + if (dbm::is_result($r) && $r[0]['plink']) { $target = $r[0]; $Bname = $target['author-name']; @@ -302,21 +333,21 @@ function localize_item(&$item){ $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; $P = '[url=' . $target['plink'] . ']' . t('post/item') . '[/url]'; $item['body'] = sprintf( t('%1$s marked %2$s\'s %3$s as favorite'), $A, $B, $P)."\n"; - } } } $matches = null; - if(preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) { - foreach($matches as $mtch) { - if(! strpos($mtch[1],'zrl=')) - $item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']); + if (preg_match_all('/@\[url=(.*?)\]/is', $item['body'], $matches, PREG_SET_ORDER)) { + foreach ($matches as $mtch) { + if (! strpos($mtch[1], 'zrl=')) { + $item['body'] = str_replace($mtch[0], '@[url=' . zrl($mtch[1]) . ']', $item['body']); + } } } // add zrl's to public images $photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is"; - if(preg_match($photo_pattern,$item['body'])) { + if (preg_match($photo_pattern, $item['body'])) { $photo_replace = '[url=' . zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5' . '[/img][/url]'; $item['body'] = bb_tag_preg_replace($photo_pattern, $photo_replace, 'url', $item['body']); } @@ -326,27 +357,26 @@ function localize_item(&$item){ $x = stristr($item['plink'],'/display/'); if ($x) { $sparkle = false; - $y = best_link_url($item,$sparkle,true); + $y = best_link_url($item, $sparkle, true); - if (strstr($y,'/redir/')) { + if (strstr($y, '/redir/')) { $item['plink'] = $y . '?f=&url=' . $item['plink']; } } - - - } /** * Count the total of comments on this item and its desendants + * @TODO proper type-hint + doc-tag */ function count_descendants($item) { $total = count($item['children']); - if($total > 0) { - foreach($item['children'] as $child) { - if(! visible_activity($child)) + if ($total > 0) { + foreach ($item['children'] as $child) { + if (! visible_activity($child)) { $total --; + } $total += count_descendants($child); } } @@ -356,18 +386,19 @@ function count_descendants($item) { function visible_activity($item) { - // likes (etc.) can apply to other things besides posts. Check if they are post children, - // in which case we handle them specially - + /* + * likes (etc.) can apply to other things besides posts. Check if they are post children, + * in which case we handle them specially + */ $hidden_activities = array(ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE); - foreach($hidden_activities as $act) { - if(activity_match($item['verb'],$act)) { + foreach ($hidden_activities as $act) { + if (activity_match($item['verb'], $act)) { return false; } } - if(activity_match($item['verb'],ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) { - if(! (($item['self']) && ($item['uid'] == local_user()))) { + if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) { + if (! (($item['self']) && ($item['uid'] == local_user()))) { return false; } } @@ -379,9 +410,8 @@ function visible_activity($item) { * @brief SQL query for items */ function item_query() { - - return "SELECT ".item_fieldlists()." FROM `item` ". - item_joins()." WHERE ".item_condition(); + return "SELECT " . item_fieldlists() . " FROM `item` " . + item_joins() . " WHERE " . item_condition(); } /** @@ -439,7 +469,6 @@ These Fields are not added below (yet). They are here to for bug search. * @brief SQL join for contacts that are needed for displaying items */ function item_joins() { - return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`) LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` @@ -450,10 +479,10 @@ function item_joins() { * @brief SQL condition for items that are needed for displaying items */ function item_condition() { - return "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`"; } +if (!function_exists('conversation')) { /** * "Render" a conversation or list of items for HTML display. * There are two major forms of display: @@ -464,13 +493,11 @@ function item_condition() { * that are based on unique features of the calling module. * */ - -if(!function_exists('conversation')) { function conversation(App $a, $items, $mode, $update, $preview = false) { - require_once('include/bbcode.php'); - require_once('include/Contact.php'); - require_once('mod/proxy.php'); + require_once 'include/bbcode.php'; + require_once 'include/Contact.php'; + require_once 'mod/proxy.php'; $ssl_state = ((local_user()) ? true : false); @@ -480,100 +507,100 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $arr_blocked = null; - if(local_user()) { - $str_blocked = get_pconfig(local_user(),'system','blocked'); - if($str_blocked) { - $arr_blocked = explode(',',$str_blocked); - for($x = 0; $x < count($arr_blocked); $x ++) + if (local_user()) { + $str_blocked = get_pconfig(local_user(), 'system', 'blocked'); + if ($str_blocked) { + $arr_blocked = explode(',', $str_blocked); + for ($x = 0; $x < count($arr_blocked); $x ++) { $arr_blocked[$x] = trim($arr_blocked[$x]); + } } } $previewing = (($preview) ? ' preview ' : ''); - if($mode === 'network') { + if ($mode === 'network') { $profile_owner = local_user(); $page_writeable = true; - if(!$update) { - // The special div is needed for liveUpdate to kick in for this page. - // We only launch liveUpdate if you aren't filtering in some incompatible - // way and also you aren't writing a comment (discovered in javascript). - + if (!$update) { + /* + * The special div is needed for liveUpdate to kick in for this page. + * We only launch liveUpdate if you aren't filtering in some incompatible + * way and also you aren't writing a comment (discovered in javascript). + */ $live_update_div = '' . "\r\n" . "\r\n"; } - } - else if($mode === 'profile') { + } elseif ($mode === 'profile') { $profile_owner = $a->profile['profile_uid']; $page_writeable = can_write_wall($a,$profile_owner); - if(!$update) { + if (!$update) { $tab = notags(trim($_GET['tab'])); $tab = ( $tab ? $tab : 'posts' ); - if($tab === 'posts') { - // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, - // because browser prefetching might change it on us. We have to deliver it with the page. + if ($tab === 'posts') { + /* + * This is ugly, but we can't pass the profile_uid through the session to the ajax updater, + * because browser prefetching might change it on us. We have to deliver it with the page. + */ $live_update_div = '' . "\r\n" . "\r\n"; } } - } - else if($mode === 'notes') { + } elseif ($mode === 'notes') { $profile_owner = local_user(); $page_writeable = true; - if(!$update) { + if (!$update) { $live_update_div = '' . "\r\n" . "\r\n"; } - } - else if($mode === 'display') { + } elseif ($mode === 'display') { $profile_owner = $a->profile['uid']; $page_writeable = can_write_wall($a,$profile_owner); - if(!$update) { + if (!$update) { $live_update_div = '' . "\r\n" . ""; } - } - else if($mode === 'community') { + } elseif ($mode === 'community') { $profile_owner = 0; $page_writeable = false; - if(!$update) { + if (!$update) { $live_update_div = '' . "\r\n" . "\r\n"; } - } - else if($mode === 'search') { + } elseif ($mode === 'search') { $live_update_div = '' . "\r\n"; } $page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false); - if($update) + if ($update) { $return_url = $_SESSION['return_url']; - else + } else { $return_url = $_SESSION['return_url'] = $a->query_string; + } $cb = array('items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview); call_hooks('conversation_start',$cb); @@ -594,28 +621,32 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $page_template = get_markup_template("conversation.tpl"); - if($items && count($items)) { + if ($items && count($items)) { - if($mode === 'network-new' || $mode === 'search' || $mode === 'community') { + if ($mode === 'network-new' || $mode === 'search' || $mode === 'community') { - // "New Item View" on network page or search page results - // - just loop through the items and format them minimally for display + /* + * "New Item View" on network page or search page results + * - just loop through the items and format them minimally for display + */ -// $tpl = get_markup_template('search_item.tpl'); + /// @TODO old lost code? + // $tpl = get_markup_template('search_item.tpl'); $tpl = 'search_item.tpl'; - foreach($items as $item) { + foreach ($items as $item) { - if($arr_blocked) { + if ($arr_blocked) { $blocked = false; - foreach($arr_blocked as $b) { - if($b && link_compare($item['author-link'],$b)) { + foreach ($arr_blocked as $b) { + if ($b && link_compare($item['author-link'], $b)) { $blocked = true; break; } } - if($blocked) + if ($blocked) { continue; + } } @@ -626,70 +657,76 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $owner_name = ''; $sparkle = ''; - if($mode === 'search' || $mode === 'community') { - if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) + if ($mode === 'search' || $mode === 'community') { + if (((activity_match($item['verb'], ACTIVITY_LIKE)) || (activity_match($item['verb'], ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent'])) continue; $nickname = $item['nickname']; - } - else + } else { $nickname = $a->user['nickname']; + } // prevent private email from leaking. - if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) - continue; + if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { + continue; + } - $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); - if($item['author-link'] && (! $item['author-name'])) + $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); + if ($item['author-link'] && (! $item['author-name'])) { $profile_name = $item['author-link']; + } - - - $tags=array(); + $tags = array(); $hashtags = array(); $mentions = array(); $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`", intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION)); - foreach($taglist as $tag) { + foreach ($taglist as $tag) { - if ($tag["url"] == "") - $tag["url"] = $searchpath.strtolower($tag["term"]); + if ($tag["url"] == "") { + $tag["url"] = $searchpath . strtolower($tag["term"]); + } if ($tag["type"] == TERM_HASHTAG) { - $hashtags[] = "#".$tag["term"].""; + $hashtags[] = "#" . $tag["term"] . ""; $prefix = "#"; } elseif ($tag["type"] == TERM_MENTION) { - $mentions[] = "@".$tag["term"].""; + $mentions[] = "@" . $tag["term"] . ""; $prefix = "@"; } - $tags[] = $prefix."".$tag["term"].""; + $tags[] = $prefix."" . $tag["term"] . ""; } $sp = false; $profile_link = best_link_url($item,$sp); - if($profile_link === 'mailbox') + if ($profile_link === 'mailbox') { $profile_link = ''; - if($sp) - $sparkle = ' sparkle'; - else - $profile_link = zrl($profile_link); + } - if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) { + if ($sp) { + $sparkle = ' sparkle'; + } else { + $profile_link = zrl($profile_link); + } + + if (!x($item, 'author-thumb') OR ($item['author-thumb'] == "")) { $author_contact = get_contact_details_by_url($item['author-link'], $profile_owner); - if ($author_contact["thumb"]) + if ($author_contact["thumb"]) { $item['author-thumb'] = $author_contact["thumb"]; - else + } else { $item['author-thumb'] = $item['author-avatar']; + } } if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) { $owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner); - if ($owner_contact["thumb"]) + if ($owner_contact["thumb"]) { $item['owner-thumb'] = $owner_contact["thumb"]; - else + } else { $item['owner-thumb'] = $item['owner-avatar']; + } } $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); @@ -698,11 +735,11 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate)); localize_item($item); - if($mode === 'network-new') + if ($mode === 'network-new') { $dropping = true; - else + } else { $dropping = false; - + } $drop = array( 'dropping' => $dropping, @@ -718,12 +755,11 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $likebuttons = false; $shareable = false; - $body = prepare_body($item,true, $preview); - + $body = prepare_body($item, true, $preview); list($categories, $folders) = get_cats_and_terms($item); - if($a->theme['template_engine'] === 'internal') { + if ($a->theme['template_engine'] === 'internal') { $profile_name_e = template_escape($profile_name); $item['title_e'] = template_escape($item['title']); $body_e = template_escape($body); @@ -732,8 +768,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $mentions_e = template_escape($mentions); $location_e = template_escape($location); $owner_name_e = template_escape($owner_name); - } - else { + } else { $profile_name_e = $profile_name; $item['title_e'] = $item['title']; $body_e = $body; @@ -744,8 +779,9 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $owner_name_e = $owner_name; } - if ($item['item_network'] == "") + if ($item['item_network'] == "") { $item['item_network'] = $item['network']; + } $tmp_item = array( 'template' => $tpl, @@ -802,47 +838,45 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $threads[$threadsid]['items'] = array($arr['output']); } - } - else - { + } else { // Normal View $page_template = get_markup_template("threaded_conversation.tpl"); - require_once('object/Conversation.php'); - require_once('object/Item.php'); + require_once 'object/Conversation.php'; + require_once 'object/Item.php'; $conv = new Conversation($mode, $preview); - // get all the topmost parents - // this shouldn't be needed, as we should have only them in our array - // But for now, this array respects the old style, just in case - + /* + * get all the topmost parents + * this shouldn't be needed, as we should have only them in our array + * But for now, this array respects the old style, just in case + */ $threads = array(); - foreach($items as $item) { + foreach ($items as $item) { - if($arr_blocked) { + if ($arr_blocked) { $blocked = false; - foreach($arr_blocked as $b) { - - if($b && link_compare($item['author-link'],$b)) { + foreach ($arr_blocked as $b) { + if ($b && link_compare($item['author-link'], $b)) { $blocked = true; break; } } - if($blocked) + if ($blocked) { continue; + } } - - // Can we put this after the visibility check? builtin_activity_puller($item, $conv_responses); // Only add what is visible - if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { + if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { continue; } - if(! visible_activity($item)) { + + if (! visible_activity($item)) { continue; } @@ -850,7 +884,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $item['pagedrop'] = $page_dropping; - if($item['id'] == $item['parent']) { + if ($item['id'] == $item['parent']) { $item_object = new Item($item); $conv->add_thread($item_object); } @@ -858,7 +892,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $threads = $conv->get_template_data($conv_responses); - if(!$threads) { + if (!$threads) { logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG); $threads = array(); } @@ -873,13 +907,13 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { '$mode' => $mode, '$user' => $a->user, '$threads' => $threads, - '$dropping' => ($page_dropping && feature_enabled(local_user(),'multi_delete') ? t('Delete Selected Items') : False), + '$dropping' => ($page_dropping && feature_enabled(local_user(), 'multi_delete') ? t('Delete Selected Items') : False), )); return $o; }} -function best_link_url($item,&$sparkle,$ssl_state = false) { +function best_link_url($item, &$sparkle, $ssl_state = false) { $best_url = ''; $sparkle = false; @@ -889,16 +923,17 @@ function best_link_url($item,&$sparkle,$ssl_state = false) { if (local_user()) { $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' AND NOT `pending` LIMIT 1", dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url))); - if ($r) { - $best_url = 'redir/'.$r[0]['id']; + if (dbm::is_result($r)) { + $best_url = 'redir/' . $r[0]['id']; $sparkle = true; } } - if(! $best_url) { - if(strlen($item['author-link'])) + if (! $best_url) { + if (strlen($item['author-link'])) { $best_url = $item['author-link']; - else + } else { $best_url = $item['url']; + } } return $best_url; @@ -906,11 +941,10 @@ function best_link_url($item,&$sparkle,$ssl_state = false) { if (! function_exists('item_photo_menu')) { -function item_photo_menu($item) -{ +function item_photo_menu($item) { $ssl_state = false; - if(local_user()) { + if (local_user()) { $ssl_state = true; } @@ -938,13 +972,13 @@ function item_photo_menu($item) $rel = 0; $r = q("SELECT `id`, `network`, `rel` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1", intval(local_user()), dbesc(normalise_link($item['author-link']))); - if ($r) { + if (dbm::is_result($r)) { $cid = $r[0]['id']; $network = $r[0]['network']; $rel = $r[0]['rel']; } - if($sparkle) { + if ($sparkle) { $status_link = $profile_link . '?url=status'; $photos_link = $profile_link . '?url=photos'; $profile_link = $profile_link . '?url=profile'; @@ -964,7 +998,7 @@ function item_photo_menu($item) } if (local_user()) { - $menu = Array( + $menu = array( t('Follow Thread') => $sub_link, t('View Status') => $status_link, t('View Profile') => $profile_link, @@ -1004,6 +1038,7 @@ function item_photo_menu($item) return $o; }} +if (! function_exists('builtin_activity_puller')) { /** * @brief Checks item to see if it is one of the builtin activities (like/dislike, event attendance, consensus items, etc.) * Increments the count of each matching activity and adds a link to the author as needed. @@ -1012,13 +1047,12 @@ function item_photo_menu($item) * @param array &$conv_responses (already created with builtin activity structure) * @return void */ -if(! function_exists('builtin_activity_puller')) { function builtin_activity_puller($item, &$conv_responses) { - foreach($conv_responses as $mode => $v) { + foreach ($conv_responses as $mode => $v) { $url = ''; $sparkle = ''; - switch($mode) { + switch ($mode) { case 'like': $verb = ACTIVITY_LIKE; break; @@ -1039,32 +1073,36 @@ function builtin_activity_puller($item, &$conv_responses) { break; } - if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { + if ((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { $url = $item['author-link']; - if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) { + if ((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'], $item['url']))) { $url = 'redir/' . $item['contact-id']; $sparkle = ' class="sparkle" '; - } - else + } else { $url = zrl($url); + } $url = '' . htmlentities($item['author-name']) . ''; - if(! $item['thr-parent']) + if (! $item['thr-parent']) { $item['thr-parent'] = $item['parent-uri']; + } - if(! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l'])) - && (is_array($conv_responses[$mode][$item['thr-parent'] . '-l'])))) + if (! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l'])) + && (is_array($conv_responses[$mode][$item['thr-parent'] . '-l'])))) { $conv_responses[$mode][$item['thr-parent'] . '-l'] = array(); + } // only list each unique author once - if(in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) + if (in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) { continue; + } - if(! isset($conv_responses[$mode][$item['thr-parent']])) + if (! isset($conv_responses[$mode][$item['thr-parent']])) { $conv_responses[$mode][$item['thr-parent']] = 1; - else + } else { $conv_responses[$mode][$item['thr-parent']] ++; + } if (public_contact() == $item['author-id']) { $conv_responses[$mode][$item['thr-parent'] . '-self'] = 1; @@ -1078,24 +1116,25 @@ function builtin_activity_puller($item, &$conv_responses) { } }} -// Format the vote text for a profile item -// $cnt = number of people who vote the item -// $arr = array of pre-linked names of likers/dislikers -// $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe' -// $id = item id -// returns formatted text - -if(! function_exists('format_like')) { -function format_like($cnt,$arr,$type,$id) { +if (! function_exists('format_like')) { +/** + * Format the vote text for a profile item + * @param int $cnt = number of people who vote the item + * @param array $arr = array of pre-linked names of likers/dislikers + * @param string $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe' + * @param int $id = item id + * @return formatted text + */ +function format_like($cnt, array $arr, $type, $id) { $o = ''; $expanded = ''; - if($cnt == 1) { + if ($cnt == 1) { $likers = $arr[0]; // Phrase if there is only one liker. In other cases it will be uses for the expanded // list which show all likers - switch($type) { + switch ($type) { case 'like' : $phrase = sprintf( t('%s likes this.'), $likers); break; @@ -1114,16 +1153,17 @@ function format_like($cnt,$arr,$type,$id) { } } - if($cnt > 1) { + if ($cnt > 1) { $total = count($arr); - if($total >= MAX_LIKERS) + if ($total >= MAX_LIKERS) { $arr = array_slice($arr, 0, MAX_LIKERS - 1); - if($total < MAX_LIKERS) { + } + if ($total < MAX_LIKERS) { $last = t('and') . ' ' . $arr[count($arr)-1]; $arr2 = array_slice($arr, 0, -1); $str = implode(', ', $arr2) . ' ' . $last; } - if($total >= MAX_LIKERS) { + if ($total >= MAX_LIKERS) { $str = implode(', ', $arr); $str .= sprintf( t(', and %d other people'), $total - MAX_LIKERS ); } @@ -1132,7 +1172,7 @@ function format_like($cnt,$arr,$type,$id) { $spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\""; - switch($type) { + switch ($type) { case 'like': $phrase = sprintf( t('%2$d people like this'), $spanatts, $cnt); $explikers = sprintf( t('%s like this.'), $likers); @@ -1169,11 +1209,10 @@ function format_like($cnt,$arr,$type,$id) { return $o; }} - -function status_editor($a,$x, $notes_cid = 0, $popup=false) { +function status_editor(App $a, $x, $notes_cid = 0, $popup = false) { $o = ''; - $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); + $geotag = (x($x, 'allow_location') ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); $tpl = get_markup_template('jot-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array( @@ -1211,24 +1250,27 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { // Private/public post links for the non-JS ACL form $private_post = 1; - if($_REQUEST['public']) + if (x($_REQUEST, 'public')) { $private_post = 0; + } $query_str = $a->query_string; - if(strpos($query_str, 'public=1') !== false) + if (strpos($query_str, 'public=1') !== false) { $query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str); + } - // I think $a->query_string may never have ? in it, but I could be wrong - // It looks like it's from the index.php?q=[etc] rewrite that the web - // server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61 - if(strpos($query_str, '?') === false) + /* + * I think $a->query_string may never have ? in it, but I could be wrong + * It looks like it's from the index.php?q=[etc] rewrite that the web + * server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61 + */ + if (strpos($query_str, '?') === false) { $public_post_link = '?public=1'; - else + } else { $public_post_link = '&public=1'; + } - - -// $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); + // $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); $tpl = get_markup_template("jot.tpl"); $o .= replace_macros($tpl,array( @@ -1252,7 +1294,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$title' => $x['title'], '$placeholdertitle' => t('Set title'), '$category' => $x['category'], - '$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''), + '$placeholdercategory' => (feature_enabled(local_user(), 'categories') ? t('Categories (comma-separated list)') : ''), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$shortpermset' => t('permissions'), @@ -1290,9 +1332,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { )); - if ($popup==true){ + if ($popup == true) { $o = ''.$o.''; - } return $o; @@ -1302,20 +1343,20 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { function get_item_children($arr, $parent) { $children = array(); $a = get_app(); - foreach($arr as $item) { - if($item['id'] != $item['parent']) { - if(get_config('system','thread_allow') && $a->theme_thread_allow) { + foreach ($arr as $item) { + if ($item['id'] != $item['parent']) { + if (get_config('system', 'thread_allow') && $a->theme_thread_allow) { // Fallback to parent-uri if thr-parent is not set $thr_parent = $item['thr-parent']; - if($thr_parent == '') + if ($thr_parent == '') { $thr_parent = $item['parent-uri']; + } - if($thr_parent == $parent['uri']) { + if ($thr_parent == $parent['uri']) { $item['children'] = get_item_children($arr, $item); $children[] = $item; } - } - else if($item['parent'] == $parent['id']) { + } elseif ($item['parent'] == $parent['id']) { $children[] = $item; } } @@ -1323,66 +1364,82 @@ function get_item_children($arr, $parent) { return $children; } +/// @TODO Add type-hint function sort_item_children($items) { $result = $items; - usort($result,'sort_thr_created_rev'); - foreach($result as $k => $i) { - if(count($result[$k]['children'])) { + usort($result, 'sort_thr_created_rev'); + foreach ($result as $k => $i) { + if (count($result[$k]['children'])) { $result[$k]['children'] = sort_item_children($result[$k]['children']); } } return $result; } +/// @TODO Add type-hint function add_children_to_list($children, &$arr) { - foreach($children as $y) { + foreach ($children as $y) { $arr[] = $y; - if(count($y['children'])) + if (count($y['children'])) { add_children_to_list($y['children'], $arr); + } } } -function conv_sort($arr,$order) { +/// @TODO Add type-hint +function conv_sort($arr, $order) { - if((!(is_array($arr) && count($arr)))) + if ((!(is_array($arr) && count($arr)))) { return array(); + } $parents = array(); $children = array(); $newarr = array(); - // This is a preparation for having two different items with the same uri in one thread - // This will otherwise lead to an endless loop. - foreach($arr as $x) - if (!isset($newarr[$x['uri']])) + /* + * This is a preparation for having two different items with the same uri in one thread + * This will otherwise lead to an endless loop. + */ + foreach ($arr as $x) { + if (!isset($newarr[$x['uri']])) { $newarr[$x['uri']] = $x; + } + } $arr = $newarr; - foreach($arr as $x) - if($x['id'] == $x['parent']) - $parents[] = $x; + foreach ($arr as $x) { + if ($x['id'] == $x['parent']) { + $parents[] = $x; + } + } - if(stristr($order,'created')) - usort($parents,'sort_thr_created'); - elseif(stristr($order,'commented')) - usort($parents,'sort_thr_commented'); + if (stristr($order, 'created')) { + usort($parents, 'sort_thr_created'); + } elseif (stristr($order, 'commented')) { + usort($parents, 'sort_thr_commented'); + } - if(count($parents)) - foreach($parents as $i=>$_x) + if (count($parents)) { + foreach ($parents as $i => $_x) { $parents[$i]['children'] = get_item_children($arr, $_x); + } + } - /*foreach($arr as $x) { - if($x['id'] != $x['parent']) { + /// @TODO Old-lost code? + /*foreach ($arr as $x) { + if ($x['id'] != $x['parent']) { $p = find_thread_parent_index($parents,$x); - if($p !== false) + if ($p !== false) $parents[$p]['children'][] = $x; } }*/ - if(count($parents)) { - foreach($parents as $k => $v) { - if(count($parents[$k]['children'])) { + if (count($parents)) { + foreach ($parents as $k => $v) { + if (count($parents[$k]['children'])) { $parents[$k]['children'] = sort_item_children($parents[$k]['children']); + /// @TODO Old-lost code? /*$y = $parents[$k]['children']; usort($y,'sort_thr_created_rev'); $parents[$k]['children'] = $y;*/ @@ -1391,92 +1448,103 @@ function conv_sort($arr,$order) { } $ret = array(); - if(count($parents)) { - foreach($parents as $x) { + if (count($parents)) { + foreach ($parents as $x) { $ret[] = $x; - if(count($x['children'])) + if (count($x['children'])) { add_children_to_list($x['children'], $ret); - /*foreach($x['children'] as $y) + /// @TODO Old-lost code? + /*foreach ($x['children'] as $y) $ret[] = $y;*/ + } } } return $ret; } - -function sort_thr_created($a,$b) { - return strcmp($b['created'],$a['created']); +/// @TODO Add type-hint +function sort_thr_created($a, $b) { + return strcmp($b['created'], $a['created']); } -function sort_thr_created_rev($a,$b) { - return strcmp($a['created'],$b['created']); +/// @TODO Add type-hint +function sort_thr_created_rev($a, $b) { + return strcmp($a['created'], $b['created']); } -function sort_thr_commented($a,$b) { - return strcmp($b['commented'],$a['commented']); +/// @TODO Add type-hint +function sort_thr_commented($a, $b) { + return strcmp($b['commented'], $a['commented']); } -function find_thread_parent_index($arr,$x) { - foreach($arr as $k => $v) - if($v['id'] == $x['parent']) +/// @TODO Add type-hint +function find_thread_parent_index($arr, $x) { + foreach ($arr as $k => $v) { + if ($v['id'] == $x['parent']) { return $k; + } + } return false; } +/// @TODO Add type-hint function render_location_dummy($item) { - if ($item['location'] != "") + if ($item['location'] != "") { return $item['location']; + } - if ($item['coord'] != "") + if ($item['coord'] != "") { return $item['coord']; + } } -function get_responses($conv_responses,$response_verbs,$ob,$item) { +/// @TODO Add type-hint +function get_responses($conv_responses, $response_verbs, $ob, $item) { $ret = array(); - foreach($response_verbs as $v) { + foreach ($response_verbs as $v) { $ret[$v] = array(); - $ret[$v]['count'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri']] : ''); - $ret[$v]['list'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : ''); - $ret[$v]['self'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0'); - if(count($ret[$v]['list']) > MAX_LIKERS) { + $ret[$v]['count'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri']] : ''); + $ret[$v]['list'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : ''); + $ret[$v]['self'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0'); + if (count($ret[$v]['list']) > MAX_LIKERS) { $ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS); array_push($ret[$v]['list_part'], '' . t('View all') . ''); - } - else { + } else { $ret[$v]['list_part'] = ''; } - $ret[$v]['button'] = get_response_button_text($v,$ret[$v]['count']); + $ret[$v]['button'] = get_response_button_text($v, $ret[$v]['count']); $ret[$v]['title'] = $conv_responses[$v]['title']; } $count = 0; - foreach($ret as $key) { - if ($key['count'] == true) + foreach ($ret as $key) { + if ($key['count'] == true) { $count++; + } } $ret['count'] = $count; return $ret; } -function get_response_button_text($v,$count) { - switch($v) { +function get_response_button_text($v, $count) { + switch ($v) { case 'like': - return tt('Like','Likes',$count,'noun'); + return tt('Like', 'Likes', $count, 'noun'); break; case 'dislike': - return tt('Dislike','Dislikes',$count,'noun'); + return tt('Dislike', 'Dislikes', $count, 'noun'); break; case 'attendyes': - return tt('Attending','Attending',$count,'noun'); + return tt('Attending', 'Attending', $count, 'noun'); break; case 'attendno': - return tt('Not Attending','Not Attending',$count,'noun'); + return tt('Not Attending', 'Not Attending', $count, 'noun'); break; case 'attendmaybe': - return tt('Undecided','Undecided',$count,'noun'); + return tt('Undecided', 'Undecided', $count, 'noun'); break; } } diff --git a/include/cron.php b/include/cron.php index 58a3fcf9c..c4299dd4c 100644 --- a/include/cron.php +++ b/include/cron.php @@ -4,7 +4,7 @@ use \Friendica\Core\Config; function cron_run(&$argv, &$argc){ global $a; - require_once('include/datetime.php'); + require_once 'include/datetime.php'; // Poll contacts with specific parameters if ($argc > 1) { @@ -12,15 +12,16 @@ function cron_run(&$argv, &$argc){ return; } - $last = get_config('system','last_cron'); + $last = get_config('system', 'last_cron'); - $poll_interval = intval(get_config('system','cron_interval')); + $poll_interval = intval(get_config('system', 'cron_interval')); if (! $poll_interval) { $poll_interval = 10; } + if ($last) { $next = $last + ($poll_interval * 60); - if($next > time()) { + if ($next > time()) { logger('cron intervall not reached'); return; } @@ -62,10 +63,10 @@ function cron_run(&$argv, &$argc){ proc_run(PRIORITY_LOW, "include/cronjobs.php", "repair_database"); // once daily run birthday_updates and then expire in background - $d1 = get_config('system','last_expire_day'); - $d2 = intval(datetime_convert('UTC','UTC','now','d')); + $d1 = get_config('system', 'last_expire_day'); + $d2 = intval(datetime_convert('UTC', 'UTC', 'now', 'd')); - if($d2 != intval($d1)) { + if ($d2 != intval($d1)) { proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_contact_birthdays"); @@ -73,7 +74,7 @@ function cron_run(&$argv, &$argc){ proc_run(PRIORITY_LOW, "include/discover_poco.php", "suggestions"); - set_config('system','last_expire_day',$d2); + set_config('system', 'last_expire_day', $d2); proc_run(PRIORITY_LOW, 'include/expire.php'); @@ -87,7 +88,7 @@ function cron_run(&$argv, &$argc){ logger('cron: end'); - set_config('system','last_cron', time()); + set_config('system', 'last_cron', time()); return; } @@ -130,7 +131,7 @@ function cron_poll_contacts($argc, $argv) { // and which have a polling address and ignore Diaspora since // we are unable to match those posts with a Diaspora GUID and prevent duplicates. - $abandon_days = intval(get_config('system','account_abandon_days')); + $abandon_days = intval(get_config('system', 'account_abandon_days')); if ($abandon_days < 1) { $abandon_days = 0; } @@ -156,7 +157,7 @@ function cron_poll_contacts($argc, $argv) { dbesc(NETWORK_MAIL2) ); - if (!count($contacts)) { + if (!dbm::is_result($contacts)) { return; } @@ -170,7 +171,7 @@ function cron_poll_contacts($argc, $argv) { continue; } - foreach($res as $contact) { + foreach ($res as $contact) { $xml = false; @@ -183,49 +184,48 @@ function cron_poll_contacts($argc, $argv) { } if ($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) { - // We should be getting everything via a hub. But just to be sure, let's check once a day. - // (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately) - // This also lets us update our subscription to the hub, and add or replace hubs in case it - // changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. - - $poll_interval = get_config('system','pushpoll_frequency'); + /* + * We should be getting everything via a hub. But just to be sure, let's check once a day. + * (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately) + * This also lets us update our subscription to the hub, and add or replace hubs in case it + * changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. + */ + $poll_interval = get_config('system', 'pushpoll_frequency'); $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3); } - if($contact['priority'] AND !$force) { - - $update = false; + if ($contact['priority'] AND !$force) { + $update = false; $t = $contact['last-update']; - /** + /* * Based on $contact['priority'], should we poll this site now? Or later? */ - switch ($contact['priority']) { case 5: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 month")) { $update = true; } break; case 4: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 week")) { $update = true; } break; case 3: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day")) { $update = true; } break; case 2: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 12 hour")) { $update = true; } break; case 1: default: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 hour")) { $update = true; } break; @@ -235,7 +235,7 @@ function cron_poll_contacts($argc, $argv) { } } - logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]); + logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact["nick"] . " " . $contact["name"]); if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) { proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', intval($contact['id'])); diff --git a/include/cronhooks.php b/include/cronhooks.php index bea0f6a19..a519dee22 100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php @@ -2,43 +2,45 @@ use \Friendica\Core\Config; -function cronhooks_run(&$argv, &$argc){ +function cronhooks_run(&$argv, &$argc) { global $a; - require_once('include/datetime.php'); + require_once 'include/datetime.php'; if (($argc == 2) AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) { - foreach ($a->hooks["cron"] as $hook) + foreach ($a->hooks["cron"] as $hook) { if ($hook[1] == $argv[1]) { - logger("Calling cron hook '".$hook[1]."'", LOGGER_DEBUG); + logger("Calling cron hook '" . $hook[1] . "'", LOGGER_DEBUG); call_single_hook($a, $name, $hook, $data); } + } return; } $last = get_config('system', 'last_cronhook'); - $poll_interval = intval(get_config('system','cronhook_interval')); - if(! $poll_interval) + $poll_interval = intval(get_config('system', 'cronhook_interval')); + if (! $poll_interval) { $poll_interval = 9; + } - if($last) { + if ($last) { $next = $last + ($poll_interval * 60); - if($next > time()) { + if ($next > time()) { logger('cronhook intervall not reached'); return; } } - $a->set_baseurl(get_config('system','url')); + $a->set_baseurl(get_config('system', 'url')); logger('cronhooks: start'); $d = datetime_convert(); if (is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) { - foreach ($a->hooks["cron"] as $hook) { - logger("Calling cronhooks for '".$hook[1]."'", LOGGER_DEBUG); + foreach ($a->hooks["cron"] as $hook) { + logger("Calling cronhooks for '" . $hook[1] . "'", LOGGER_DEBUG); proc_run(PRIORITY_MEDIUM, "include/cronhooks.php", $hook[1]); } } diff --git a/include/datetime.php b/include/datetime.php index 9e1d4b55c..da454a32a 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -14,13 +14,20 @@ use \Friendica\Core\Config; * @return int */ function timezone_cmp($a, $b) { - if(strstr($a,'/') && strstr($b,'/')) { - if ( t($a) == t($b)) return 0; + if (strstr($a, '/') && strstr($b, '/')) { + if ( t($a) == t($b)) { + return 0; + } return ( t($a) < t($b)) ? -1 : 1; } - if(strstr($a,'/')) return -1; - if(strstr($b,'/')) return 1; - if ( t($a) == t($b)) return 0; + + if (strstr($a, '/')) { + return -1; + } elseif (strstr($b, '/')) { + return 1; + } elseif ( t($a) == t($b)) { + return 0; + } return ( t($a) < t($b)) ? -1 : 1; } @@ -39,23 +46,24 @@ function select_timezone($current = 'America/Los_Angeles') { usort($timezone_identifiers, 'timezone_cmp'); $continent = ''; - foreach($timezone_identifiers as $value) { + foreach ($timezone_identifiers as $value) { $ex = explode("/", $value); - if(count($ex) > 1) { - if($ex[0] != $continent) { - if($continent != '') + if (count($ex) > 1) { + if ($ex[0] != $continent) { + if ($continent != '') { $o .= ''; + } $continent = $ex[0]; $o .= ''; } - if(count($ex) > 2) + if (count($ex) > 2) { $city = substr($value,strpos($value,'/')+1); - else + } else { $city = $ex[1]; - } - else { + } + } else { $city = $ex[0]; - if($continent != t('Miscellaneous')) { + if ($continent != t('Miscellaneous')) { $o .= ''; $continent = t('Miscellaneous'); $o .= ''; @@ -114,48 +122,50 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d // Defaults to UTC if nothing is set, but throws an exception if set to empty string. // Provide some sane defaults regardless. - if($from === '') + if ($from === '') { $from = 'UTC'; - if($to === '') + } + if ($to === '') { $to = 'UTC'; - if( ($s === '') || (! is_string($s)) ) + } + if ( ($s === '') || (! is_string($s)) ) { $s = 'now'; + } - // Slight hackish adjustment so that 'zero' datetime actually returns what is intended - // otherwise we end up with -0001-11-30 ... - // add 32 days so that we at least get year 00, and then hack around the fact that - // months and days always start with 1. + /* + * Slight hackish adjustment so that 'zero' datetime actually returns what is intended + * otherwise we end up with -0001-11-30 ... + * add 32 days so that we at least get year 00, and then hack around the fact that + * months and days always start with 1. + */ - if(substr($s,0,10) == '0000-00-00') { + if (substr($s,0,10) <= '0001-01-01') { $d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC')); return str_replace('1','0',$d->format($fmt)); } try { $from_obj = new DateTimeZone($from); - } - catch(Exception $e) { + } catch (Exception $e) { $from_obj = new DateTimeZone('UTC'); } try { $d = new DateTime($s, $from_obj); - } - catch(Exception $e) { + } catch (Exception $e) { logger('datetime_convert: exception: ' . $e->getMessage()); $d = new DateTime('now', $from_obj); } try { $to_obj = new DateTimeZone($to); - } - catch(Exception $e) { + } catch (Exception $e) { $to_obj = new DateTimeZone('UTC'); } $d->setTimeZone($to_obj); - return($d->format($fmt)); + return $d->format($fmt); } @@ -169,12 +179,14 @@ function dob($dob) { list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d'); $f = get_config('system','birthday_input_format'); - if(! $f) + if (! $f) { $f = 'ymd'; - if($dob === '0000-00-00') + } + if ($dob <= '0001-01-01') { $value = ''; - else + } else { $value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d')); + } $age = ((intval($value)) ? age($value, $a->user["timezone"], $a->user["timezone"]) : ""); @@ -189,7 +201,8 @@ function dob($dob) { ) )); -// if ($dob && $dob != '0000-00-00') + /// @TODO Old-lost code? +// if ($dob && $dob > '0001-01-01') // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob'); // else // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),false,'dob'); @@ -214,7 +227,7 @@ function dob($dob) { * @return string Parsed HTML output. */ function datesel($format, $min, $max, $default, $id = 'datepicker') { - return datetimesel($format,$min,$max,$default,'',$id,true,false, '',''); + return datetimesel($format, $min, $max, $default, '', $id, true, false, '', ''); } /** @@ -231,8 +244,8 @@ function datesel($format, $min, $max, $default, $id = 'datepicker') { * * @return string Parsed HTML output. */ -function timesel($format, $h, $m, $id='timepicker') { - return datetimesel($format,new DateTime(),new DateTime(),new DateTime("$h:$m"),'',$id,false,true); +function timesel($format, $h, $m, $id = 'timepicker') { + return datetimesel($format, new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true); } /** @@ -267,7 +280,9 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke // First day of the week (0 = Sunday) $firstDay = get_pconfig(local_user(),'system','first_day_of_week'); - if ($firstDay === false) $firstDay=0; + if ($firstDay === false) { + $firstDay=0; + } $lang = substr(get_browser_language(), 0, 2); @@ -279,9 +294,15 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $o = ''; $dateformat = ''; - if($pickdate) $dateformat .= 'Y-m-d'; - if($pickdate && $picktime) $dateformat .= ' '; - if($picktime) $dateformat .= 'H:i'; + if ($pickdate) { + $dateformat .= 'Y-m-d'; + } + if ($pickdate && $picktime) { + $dateformat .= ' '; + } + if ($picktime) { + $dateformat .= 'H:i'; + } $minjs = $min ? ",minDate: new Date({$min->getTimestamp()}*1000), yearStart: " . $min->format('Y') : ''; $maxjs = $max ? ",maxDate: new Date({$max->getTimestamp()}*1000), yearEnd: " . $max->format('Y') : ''; @@ -290,15 +311,21 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $defaultdatejs = $default ? ",defaultDate: new Date({$default->getTimestamp()}*1000)" : ''; $pickers = ''; - if(!$pickdate) $pickers .= ',datepicker: false'; - if(!$picktime) $pickers .= ',timepicker: false'; + if (!$pickdate) { + $pickers .= ',datepicker: false'; + } + if (!$picktime) { + $pickers .= ',timepicker: false'; + } $extra_js = ''; $pickers .= ",dayOfWeekStart: ".$firstDay.",lang:'".$lang."'"; - if($minfrom != '') + if ($minfrom != '') { $extra_js .= "\$('#id_$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})"; - if($maxfrom != '') + } + if ($maxfrom != '') { $extra_js .= "\$('#id_$maxfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({maxDate: currentDateTime})}})"; + } $readable_format = $dateformat; $readable_format = str_replace('Y','yyyy',$readable_format); @@ -393,13 +420,16 @@ function relative_date($posted_date, $format = null) { * * @return int Age in years */ -function age($dob,$owner_tz = '',$viewer_tz = '') { - if(! intval($dob)) +function age($dob, $owner_tz = '', $viewer_tz = '') { + if (! intval($dob)) { return 0; - if(! $owner_tz) + } + if (! $owner_tz) { $owner_tz = date_default_timezone_get(); - if(! $viewer_tz) + } + if (! $viewer_tz) { $viewer_tz = date_default_timezone_get(); + } $birthdate = datetime_convert('UTC',$owner_tz,$dob . ' 00:00:00+00:00','Y-m-d'); list($year,$month,$day) = explode("-",$birthdate); @@ -407,8 +437,9 @@ function age($dob,$owner_tz = '',$viewer_tz = '') { $curr_month = datetime_convert('UTC',$viewer_tz,'now','m'); $curr_day = datetime_convert('UTC',$viewer_tz,'now','d'); - if(($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) + if (($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) { $year_diff--; + } return $year_diff; } @@ -430,11 +461,11 @@ function get_dim($y,$m) { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); - if($m != 2) + if ($m != 2) { return $dim[$m]; - - if(((($y % 4) == 0) && (($y % 100) != 0)) || (($y % 400) == 0)) + } elseif (((($y % 4) == 0) && (($y % 100) != 0)) || (($y % 400) == 0)) { return 29; + } return $dim[2]; } @@ -473,8 +504,6 @@ function get_first_dim($y,$m) { * @todo Provide (prev,next) links, define class variations for different size calendars */ function cal($y = 0,$m = 0, $links = false, $class='') { - - // month table - start at 1 to match human usage. $mtab = array(' ', @@ -486,10 +515,12 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); - if(! $y) + if (! $y) { $y = $thisyear; - if(! $m) + } + if (! $m) { $m = intval($thismonth); + } $dn = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'); $f = get_first_dim($y,$m); @@ -498,29 +529,33 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $dow = 0; $started = false; - if(($y == $thisyear) && ($m == $thismonth)) + if (($y == $thisyear) && ($m == $thismonth)) { $tddate = intval(datetime_convert('UTC',date_default_timezone_get(),'now','j')); + } $str_month = day_translate($mtab[$m]); $o = ''; $o .= "$str_month $y"; - for($a = 0; $a < 7; $a ++) + for ($a = 0; $a < 7; $a ++) { $o .= '' . mb_substr(day_translate($dn[$a]),0,3,'UTF-8') . ''; + } $o .= ''; - while($d <= $l) { - if(($dow == $f) && (! $started)) + while ($d <= $l) { + if (($dow == $f) && (! $started)) { $started = true; + } $today = (((isset($tddate)) && ($tddate == $d)) ? "class=\"today\" " : ''); $o .= ""; $day = str_replace(' ',' ',sprintf('%2.2d', $d)); - if($started) { - if(is_array($links) && isset($links[$d])) + if ($started) { + if (is_array($links) && isset($links[$d])) { $o .= "$day"; - else + } else { $o .= $day; + } $d ++; } else { @@ -529,14 +564,16 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $o .= ''; $dow ++; - if(($dow == 7) && ($d <= $l)) { + if (($dow == 7) && ($d <= $l)) { $dow = 0; $o .= ''; } } - if($dow) - for($a = $dow; $a < 7; $a ++) + if ($dow) { + for ($a = $dow; $a < 7; $a ++) { $o .= ' '; + } + } $o .= ''."\r\n"; @@ -553,7 +590,7 @@ function update_contact_birthdays() { // This only handles foreign or alien networks where a birthday has been provided. // In-network birthdays are handled within local_delivery - $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` != '0000-00-00' AND SUBSTRING(`bd`,1,4) != `bdyear` "); + $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`,1,4) != `bdyear` "); if (dbm::is_result($r)) { foreach ($r as $rr) { diff --git a/include/dba.php b/include/dba.php index 62728acae..5066dcd56 100644 --- a/include/dba.php +++ b/include/dba.php @@ -20,6 +20,7 @@ class dba { private $driver; public $connected = false; public $error = false; + private $_server_info = ''; function __construct($server, $user, $pass, $db, $install = false) { $a = get_app(); @@ -103,18 +104,20 @@ class dba { * @return string */ public function server_info() { - 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; + if ($this->_server_info == '') { + switch ($this->driver) { + case 'pdo': + $this->_server_info = $this->db->getAttribute(PDO::ATTR_SERVER_VERSION); + break; + case 'mysqli': + $this->_server_info = $this->db->server_info; + break; + case 'mysql': + $this->_server_info = mysql_get_server_info($this->db); + break; + } } - return $version; + return $this->_server_info; } /** @@ -474,6 +477,26 @@ class dba { } } } + + /** + * @brief Replaces ANY_VALUE() function by MIN() function, + * if the database server does not support ANY_VALUE(). + * + * Considerations for Standard SQL, or MySQL with ONLY_FULL_GROUP_BY (default since 5.7.5). + * ANY_VALUE() is available from MySQL 5.7.5 https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html + * A standard fall-back is to use MIN(). + * + * @param string $sql An SQL string without the values + * @return string The input SQL string modified if necessary. + */ + public function any_value_fallback($sql) { + $server_info = $this->server_info(); + if (version_compare($server_info, '5.7.5', '<') || + (stripos($server_info, 'MariaDB') !== false)) { + $sql = str_ireplace('ANY_VALUE(', 'MIN(', $sql); + } + return $sql; + } } function printable($s) { @@ -514,6 +537,7 @@ function q($sql) { unset($args[0]); if ($db && $db->connected) { + $sql = $db->any_value_fallback($sql); $stmt = @vsprintf($sql,$args); // Disabled warnings //logger("dba: q: $stmt", LOGGER_ALL); if ($stmt === false) @@ -550,6 +574,7 @@ function qu($sql) { unset($args[0]); if ($db && $db->connected) { + $sql = $db->any_value_fallback($sql); $stmt = @vsprintf($sql,$args); // Disabled warnings if ($stmt === false) logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG); diff --git a/include/dba_pdo.php b/include/dba_pdo.php index a44c447af..56692fbb3 100644 --- a/include/dba_pdo.php +++ b/include/dba_pdo.php @@ -34,7 +34,7 @@ $objDDDBLResultHandler->add('PDOStatement', array('HANDLER' => $cloPDOStatementR * */ -if(! class_exists('dba')) { +if (! class_exists('dba')) { class dba { private $debug = 0; @@ -66,9 +66,9 @@ class dba { return; } - if($install) { - if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { - if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { + 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->connected = false; $this->db = null; @@ -81,13 +81,13 @@ class dba { \DDDBL\connect(); $this->db = \DDDBL\getDB(); - if(\DDDBL\isConnected()) { + if (\DDDBL\isConnected()) { $this->connected = true; } - if(! $this->connected) { + if (! $this->connected) { $this->db = null; - if(! $install) + if (! $install) system_unavailable(); } @@ -109,11 +109,11 @@ class dba { $objPreparedQueryPool = new \DDDBL\DataObjectPool('Query-Definition'); # check if query do not exists till now, if so create its definition - if(!$objPreparedQueryPool->exists($strQueryAlias)) + if (!$objPreparedQueryPool->exists($strQueryAlias)) $objPreparedQueryPool->add($strQueryAlias, array('QUERY' => $sql, 'HANDLER' => $strHandler)); - if((! $this->db) || (! $this->connected)) + if ((! $this->db) || (! $this->connected)) return false; $this->error = ''; @@ -124,7 +124,7 @@ class dba { $r = \DDDBL\get($strQueryAlias); # bad workaround to emulate the bizzare behavior of mysql_query - if(in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) + if (in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) $result = true; $intErrorCode = false; @@ -138,7 +138,7 @@ class dba { $a->save_timestamp($stamp1, "database"); - if(x($a->config,'system') && x($a->config['system'],'db_log')) { + if (x($a->config,'system') && x($a->config['system'],'db_log')) { if (($duration > $a->config["system"]["db_loglimit"])) { $duration = round($duration, 3); $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); @@ -149,20 +149,20 @@ class dba { } } - if($intErrorCode) + if ($intErrorCode) $this->error = $intErrorCode; - if(strlen($this->error)) { + if (strlen($this->error)) { logger('dba: ' . $this->error); } - if($this->debug) { + if ($this->debug) { $mesg = ''; - if($result === false) + if ($result === false) $mesg = 'false'; - elseif($result === true) + elseif ($result === true) $mesg = 'true'; else { # this needs fixing, but is a bug itself @@ -182,13 +182,13 @@ class dba { * These usually indicate SQL syntax errors that need to be resolved. */ - if(isset($result) AND ($result === false)) { + if (isset($result) AND ($result === false)) { 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); } - if(isset($result) AND (($result === true) || ($result === false))) + if (isset($result) AND (($result === true) || ($result === false))) return $result; if ($onlyquery) { @@ -199,7 +199,7 @@ class dba { //$a->save_timestamp($stamp1, "database"); - if($this->debug) + if ($this->debug) logger('dba: ' . printable(print_r($r, true))); return($r); } @@ -223,7 +223,7 @@ class dba { } public function escape($str) { - if($this->db && $this->connected) { + if ($this->db && $this->connected) { $strQuoted = $this->db->quote($str); # this workaround is needed, because quote creates "'" and the beginning and the end # of the string, which is correct. but until now the queries set this delimiter manually, @@ -238,27 +238,27 @@ class dba { } }} -if(! function_exists('printable')) { +if (! function_exists('printable')) { function printable($s) { $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s); $s = str_replace("\x00",'.',$s); - if(x($_SERVER,'SERVER_NAME')) + if (x($_SERVER,'SERVER_NAME')) $s = escape_tags($s); return $s; }} // Procedural functions -if(! function_exists('dbg')) { +if (! function_exists('dbg')) { function dbg($state) { global $db; - if($db) + if ($db) $db->dbg($state); }} -if(! function_exists('dbesc')) { +if (! function_exists('dbesc')) { function dbesc($str) { global $db; - if($db && $db->connected) + if ($db && $db->connected) return($db->escape($str)); else return(str_replace("'","\\'",$str)); @@ -271,17 +271,17 @@ function dbesc($str) { // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", // 'user', 1); -if(! function_exists('q')) { +if (! function_exists('q')) { function q($sql) { global $db; $args = func_get_args(); unset($args[0]); - if($db && $db->connected) { + if ($db && $db->connected) { $stmt = @vsprintf($sql,$args); // Disabled warnings //logger("dba: q: $stmt", LOGGER_ALL); - if($stmt === false) + if ($stmt === false) logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG); return $db->q($stmt); } @@ -303,11 +303,11 @@ function q($sql) { * */ -if(! function_exists('dbq')) { +if (! function_exists('dbq')) { function dbq($sql) { global $db; - if($db && $db->connected) + if ($db && $db->connected) $ret = $db->q($sql); else $ret = false; @@ -321,21 +321,21 @@ function dbq($sql) { // cast to int to avoid trouble. -if(! function_exists('dbesc_array_cb')) { +if (! function_exists('dbesc_array_cb')) { function dbesc_array_cb(&$item, $key) { - if(is_string($item)) + if (is_string($item)) $item = dbesc($item); }} -if(! function_exists('dbesc_array')) { +if (! function_exists('dbesc_array')) { function dbesc_array(&$arr) { - if(is_array($arr) && count($arr)) { + if (is_array($arr) && count($arr)) { array_walk($arr,'dbesc_array_cb'); } }} -if(! function_exists('dba_timer')) { +if (! function_exists('dba_timer')) { function dba_timer() { return microtime(true); }} diff --git a/include/dbstructure.php b/include/dbstructure.php index 48cc02d2d..76f1bb000 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -78,8 +78,18 @@ function update_fail($update_id, $error_message){ function table_structure($table) { $structures = q("DESCRIBE `%s`", $table); + $full_columns = q("SHOW FULL COLUMNS FROM `%s`", $table); + $indexes = q("SHOW INDEX FROM `%s`", $table); + $table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table); + + if (dbm::is_result($table_status)) { + $table_status = $table_status[0]; + } else { + $table_status = array(); + } + $fielddata = array(); $indexdata = array(); @@ -104,7 +114,6 @@ function table_structure($table) { $indexdata[$index["Key_name"]][] = $column; } - if (dbm::is_result($structures)) { foreach ($structures AS $field) { $fielddata[$field["Field"]]["type"] = $field["Type"]; @@ -125,10 +134,16 @@ function table_structure($table) { } } } - return(array("fields"=>$fielddata, "indexes"=>$indexdata)); + if (dbm::is_result($full_columns)) { + foreach ($full_columns AS $column) { + $fielddata[$column["Field"]]["Collation"] = $column["Collation"]; + } + } + + return array("fields" => $fielddata, "indexes" => $indexdata, "table_status" => $table_status); } -function print_structure($database, $charset) { +function print_structure($database) { echo "-- ------------------------------------------\n"; echo "-- ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION." (".FRIENDICA_CODENAME,")\n"; echo "-- DB_UPDATE_VERSION ".DB_UPDATE_VERSION."\n"; @@ -137,24 +152,33 @@ function print_structure($database, $charset) { echo "--\n"; echo "-- TABLE $name\n"; echo "--\n"; - db_create_table($name, $structure['fields'], $charset, true, false, $structure["indexes"]); + db_create_table($name, $structure['fields'], true, false, $structure["indexes"]); echo "\n"; } } +/** + * @brief Print out database error messages + * + * @param object $db Database object + * @param string $message Message to be added to the error message + * + * @return string Error message + */ +function print_update_error($db, $message) { + echo sprintf(t("\nError %d occured during database update:\n%s\n"), + $db->errorno, $db->error); + + return t('Errors encountered performing database changes: ').$message.EOL; +} + function update_structure($verbose, $action, $tables=null, $definition=null) { global $a, $db; if ($action) { Config::set('system', 'maintenance', 1); - Config::set('system', 'maintenance_reason', 'Database update'); - } - - if (isset($a->config["system"]["db_charset"])) { - $charset = $a->config["system"]["db_charset"]; - } else { - $charset = "utf8"; + Config::set('system', 'maintenance_reason', sprintf(t(': Database update'), dbm::date().' '.date('e'))); } $errors = false; @@ -168,16 +192,18 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $tables = q("SHOW TABLES"); } - foreach ($tables AS $table) { - $table = current($table); + if (dbm::is_result($tables)) { + foreach ($tables AS $table) { + $table = current($table); - logger(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG); - $database[$table] = table_structure($table); + logger(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG); + $database[$table] = table_structure($table); + } } // Get the definition if (is_null($definition)) { - $definition = db_definition($charset); + $definition = db_definition(); } // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements @@ -194,9 +220,9 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $group_by = ""; $sql3 = ""; if (!isset($database[$name])) { - $r = db_create_table($name, $structure["fields"], $charset, $verbose, $action, $structure['indexes']); + $r = db_create_table($name, $structure["fields"], $verbose, $action, $structure['indexes']); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered creating database tables.').$name.EOL; + $errors .= print_update_error($db, $name); } $is_new_table = True; } else { @@ -252,17 +278,24 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { } } else { // Compare the field definition - $current_field_definition = implode(",",$database[$name]["fields"][$fieldname]); - $new_field_definition = implode(",",$parameters); + $field_definition = $database[$name]["fields"][$fieldname]; + + // We change the collation after the indexes had been changed. + // This is done to avoid index length problems. + // So here we always ensure that there is no need to change it. + unset($parameters['Collation']); + unset($field_definition['Collation']); + + $current_field_definition = implode(",", $field_definition); + $new_field_definition = implode(",", $parameters); if ($current_field_definition != $new_field_definition) { - $sql2=db_modify_table_field($fieldname, $parameters); + $sql2 = db_modify_table_field($fieldname, $parameters); if ($sql3 == "") { $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; } else { $sql3 .= ", ".$sql2; } } - } } } @@ -288,16 +321,59 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $group_by = db_group_by($indexname, $fieldnames); } if ($sql2 != "") { - if ($sql3 == "") + if ($sql3 == "") { $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; - else + } else { $sql3 .= ", ".$sql2; + } + } + } + } + + if (isset($database[$name]["table_status"]["Collation"])) { + if ($database[$name]["table_status"]["Collation"] != 'utf8mb4_general_ci') { + $sql2 = "DEFAULT COLLATE utf8mb4_general_ci"; + + if ($sql3 == "") { + $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; + } else { + $sql3 .= ", ".$sql2; + } + } + } + + if ($sql3 != "") { + $sql3 .= "; "; + } + + // Now have a look at the field collations + // Compare the field structure field by field + foreach ($structure["fields"] AS $fieldname => $parameters) { + // Compare the field definition + $field_definition = $database[$name]["fields"][$fieldname]; + + // Define the default collation if not given + if (!isset($parameters['Collation']) AND !is_null($field_definition['Collation'])) { + $parameters['Collation'] = 'utf8mb4_general_ci'; + } else { + $parameters['Collation'] = null; + } + + if ($field_definition['Collation'] != $parameters['Collation']) { + $sql2 = db_modify_table_field($fieldname, $parameters); + if (($sql3 == "") OR (substr($sql3, -2, 2) == "; ")) { + $sql3 .= "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; + } else { + $sql3 .= ", ".$sql2; } } } } + if ($sql3 != "") { - $sql3 .= ";"; + if (substr($sql3, -2, 2) != "; ") { + $sql3 .= ";"; + } if ($verbose) { // Ensure index conversion to unique removes duplicates @@ -323,6 +399,8 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { } if ($action) { + Config::set('system', 'maintenance_reason', sprintf(t('%s: updating %s table.'), dbm::date().' '.date('e'), $name)); + // Ensure index conversion to unique removes duplicates if ($is_unique) { if ($ignore != "") { @@ -330,33 +408,33 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { } else { $r = $db->q("CREATE TABLE `".$temp_name."` LIKE `".$name."`;"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } } } $r = @$db->q($sql3); - if (!dbm::is_result($r)) - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; - + if (!dbm::is_result($r)) { + $errors .= print_update_error($db, $sql3); + } if ($is_unique) { if ($ignore != "") { $db->q("SET session old_alter_table=0;"); } else { $r = $db->q("INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } $r = $db->q("DROP TABLE `".$name."`;"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } $r = $db->q("RENAME TABLE `".$temp_name."` TO `".$name."`;"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } } @@ -376,6 +454,10 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { function db_field_command($parameters, $create = true) { $fieldstruct = $parameters["type"]; + if (!is_null($parameters["Collation"])) { + $fieldstruct .= " COLLATE ".$parameters["Collation"]; + } + if ($parameters["not null"]) $fieldstruct .= " NOT NULL"; @@ -395,7 +477,7 @@ function db_field_command($parameters, $create = true) { return($fieldstruct); } -function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=null) { +function db_create_table($name, $fields, $verbose, $action, $indexes=null) { global $a, $db; $r = true; @@ -404,7 +486,7 @@ function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=n $sql_rows = array(); $primary_keys = array(); - foreach($fields AS $fieldname => $field) { + foreach ($fields AS $fieldname => $field) { $sql_rows[] = "`".dbesc($fieldname)."` ".db_field_command($field); if (x($field,'primary') and $field['primary']!=''){ $primary_keys[] = $fieldname; @@ -420,7 +502,7 @@ function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=n $sql = implode(",\n\t", $sql_rows); - $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=".$charset; + $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT COLLATE utf8mb4_general_ci"; if ($verbose) echo $sql.";\n"; @@ -503,18 +585,7 @@ function db_group_by($indexname, $fieldnames) { return $sql; } -function db_index_suffix($charset, $reduce = 0) { - if ($charset != "utf8mb4") { - return ""; - } - - // On utf8mb4 indexes can only have a length of 191 - $indexlength = 191 - $reduce; - - return "(".$indexlength.")"; -} - -function db_definition($charset) { +function db_definition() { $database = array(); @@ -671,7 +742,7 @@ function db_definition($charset) { "writable" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "forum" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "prv" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), - "contact-type" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"), + "contact-type" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "hidden" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "archive" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "pending" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"), @@ -681,7 +752,7 @@ function db_definition($charset) { "info" => array("type" => "mediumtext"), "profile-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "bdyear" => array("type" => "varchar(4)", "not null" => "1", "default" => ""), - "bd" => array("type" => "date", "not null" => "1", "default" => "0000-00-00"), + "bd" => array("type" => "date", "not null" => "1", "default" => "0001-01-01"), "notify_new_posts" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "fetch_further_information" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "ffi_keyword_blacklist" => array("type" => "text"), @@ -840,7 +911,7 @@ function db_definition($charset) { "about" => array("type" => "text"), "keywords" => array("type" => "text"), "gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""), - "birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"), + "birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0001-01-01"), "community" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "contact-type" => array("type" => "tinyint(1)", "not null" => "1", "default" => "-1"), "hide" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), @@ -1304,7 +1375,7 @@ function db_definition($charset) { "hide-friends" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "pdesc" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "dob" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"), + "dob" => array("type" => "varchar(32)", "not null" => "1", "default" => "0001-01-01"), "address" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "locality" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "region" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), @@ -1621,11 +1692,11 @@ function db_definition($charset) { function dbstructure_run(&$argv, &$argc) { global $a, $db; - if(is_null($a)){ + if (is_null($a)){ $a = new App; } - if(is_null($db)) { + if (is_null($db)) { @include(".htconfig.php"); require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); @@ -1650,7 +1721,7 @@ function dbstructure_run(&$argv, &$argc) { $current = intval(DB_UPDATE_VERSION); // run any left update_nnnn functions in update.php - for($x = $stored; $x < $current; $x ++) { + for ($x = $stored; $x < $current; $x ++) { $r = run_update_function($x); if (!$r) break; } @@ -1658,9 +1729,7 @@ function dbstructure_run(&$argv, &$argc) { set_config('system','build',DB_UPDATE_VERSION); return; case "dumpsql": - // For the dump that is used to create the database.sql we always assume utfmb4 - $charset = "utf8mb4"; - print_structure(db_definition($charset), $charset); + print_structure(db_definition()); return; } } diff --git a/include/dfrn.php b/include/dfrn.php index aae935963..a4651c6c8 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -554,8 +554,9 @@ class dfrn { xml::add_element($doc, $author, "poco:displayName", $profile["name"]); xml::add_element($doc, $author, "poco:updated", $namdate); - if (trim($profile["dob"]) != "0000-00-00") + if (trim($profile["dob"]) > '0001-01-01') { xml::add_element($doc, $author, "poco:birthday", "0000-".date("m-d", strtotime($profile["dob"]))); + } xml::add_element($doc, $author, "poco:note", $profile["about"]); xml::add_element($doc, $author, "poco:preferredUsername", $profile["nickname"]); @@ -867,7 +868,7 @@ class dfrn { // The signed text contains the content in Markdown, the sender handle and the signatur for the content // It is needed for relayed comments to Diaspora. - if($item['signed_text']) { + if ($item['signed_text']) { $sign = base64_encode(json_encode(array('signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer']))); xml::add_element($doc, $entry, "dfrn:diaspora_signature", $sign); } @@ -1287,7 +1288,7 @@ class dfrn { $href = ""; $width = 0; foreach ($avatar->attributes AS $attributes) { - /// @TODO Rewrite these similar if() to one switch + /// @TODO Rewrite these similar if () to one switch if ($attributes->name == "href") { $href = $attributes->textContent; } @@ -1402,7 +1403,7 @@ class dfrn { // "poco:birthday" is the birthday in the format "yyyy-mm-dd" $value = $xpath->evaluate($element . "/poco:birthday/text()", $context)->item(0)->nodeValue; - if (!in_array($value, array("", "0000-00-00"))) { + if (!in_array($value, array("", "0000-00-00", "0001-01-01"))) { $bdyear = date("Y"); $value = str_replace("0000", $bdyear, $value); @@ -2164,7 +2165,7 @@ class dfrn { $title = ""; foreach ($links AS $link) { foreach ($link->attributes AS $attributes) { - /// @TODO Rewrite these repeated (same) if() statements to a switch() + /// @TODO Rewrite these repeated (same) if () statements to a switch() if ($attributes->name == "href") { $href = $attributes->textContent; } @@ -2414,7 +2415,7 @@ class dfrn { // When activated, forums don't work. // And: Why should we disallow commenting by followers? // the behaviour is now similar to the Diaspora part. - //if($importer["rel"] == CONTACT_IS_FOLLOWER) { + //if ($importer["rel"] == CONTACT_IS_FOLLOWER) { // logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG); // return; //} @@ -2539,7 +2540,7 @@ class dfrn { logger("Item was stored with id ".$posted_id, LOGGER_DEBUG); - if(stristr($item["verb"],ACTIVITY_POKE)) + if (stristr($item["verb"],ACTIVITY_POKE)) self::do_poke($item, $importer, $posted_id); } } @@ -2666,7 +2667,7 @@ class dfrn { create_tags_from_itemuri($uri, $importer["uid"]); create_files_from_itemuri($uri, $importer["uid"]); update_thread_uri($uri, $importer["importer_uid"]); - if($item["last-child"]) { + if ($item["last-child"]) { // ensure that last-child is set in case the comment that had it just got wiped. q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ", dbesc(datetime_convert()), diff --git a/include/diaspora.php b/include/diaspora.php index bdedb9e0b..b8eff62b1 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -45,7 +45,7 @@ class Diaspora { $servers = explode(",", $serverdata); - foreach($servers AS $server) { + foreach ($servers AS $server) { $server = trim($server); $addr = "relay@".str_replace("http://", "", normalise_link($server)); $batch = $server."/receive/public"; @@ -207,7 +207,7 @@ class Diaspora { $children = $basedom->children('https://joindiaspora.com/protocol'); - if($children->header) { + if ($children->header) { $public = true; $author_link = str_replace('acct:','',$children->header->author_id); } else { @@ -240,11 +240,11 @@ class Diaspora { // figure out where in the DOM tree our data is hiding - if($dom->provenance->data) + if ($dom->provenance->data) $base = $dom->provenance; - elseif($dom->env->data) + elseif ($dom->env->data) $base = $dom->env; - elseif($dom->data) + elseif ($dom->data) $base = $dom; if (!$base) { @@ -277,7 +277,7 @@ class Diaspora { $data = base64url_decode($data); - if($public) + if ($public) $inner_decrypted = $data; else { @@ -578,7 +578,7 @@ class Diaspora { logger("Fetching diaspora key for: ".$handle); $r = self::person_by_handle($handle); - if($r) + if ($r) return $r["pubkey"]; return ""; @@ -634,7 +634,7 @@ class Diaspora { */ private static function add_fcontact($arr, $update = false) { - if($update) { + if ($update) { $r = q("UPDATE `fcontact` SET `name` = '%s', `photo` = '%s', @@ -818,7 +818,7 @@ class Diaspora { // perhaps we were already sharing with this person. Now they're sharing with us. // That makes us friends. // Normally this should have handled by getting a request - but this could get lost - if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { + if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d", intval(CONTACT_IS_FRIEND), intval($contact["id"]), @@ -828,12 +828,12 @@ class Diaspora { logger("defining user ".$contact["nick"]." as friend"); } - if(($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"])) + if (($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"])) return false; - if($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND) + if ($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND) return true; - if($contact["rel"] == CONTACT_IS_FOLLOWER) - if(($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment) + if ($contact["rel"] == CONTACT_IS_FOLLOWER) + if (($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment) return true; // Messages for the global users are always accepted @@ -991,7 +991,7 @@ class Diaspora { logger("Fetch post from ".$source_url, LOGGER_DEBUG); $envelope = fetch_url($source_url); - if($envelope) { + if ($envelope) { logger("Envelope was fetched.", LOGGER_DEBUG); $x = self::verify_magic_envelope($envelope); if (!$x) @@ -1007,7 +1007,7 @@ class Diaspora { logger("Fetch post from ".$source_url, LOGGER_DEBUG); $x = fetch_url($source_url); - if(!$x) + if (!$x) return false; } @@ -1064,7 +1064,7 @@ class Diaspora { FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", intval($uid), dbesc($guid)); - if(!$r) { + if (!$r) { $result = self::store_by_guid($guid, $contact["url"], $uid); if (!$result) { @@ -1325,7 +1325,7 @@ class Diaspora { } // If we are the origin of the parent we store the original data and notify our followers - if($message_id AND $parent_item["origin"]) { + if ($message_id AND $parent_item["origin"]) { // Formerly we stored the signed text, the signature and the author in different fields. // We now store the raw data so that we are more flexible. @@ -1502,7 +1502,7 @@ class Diaspora { intval($importer["uid"]), dbesc($guid) ); - if($c) + if ($c) $conversation = $c[0]; else { $r = q("INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`) @@ -1515,13 +1515,13 @@ class Diaspora { dbesc($subject), dbesc($participants) ); - if($r) + if ($r) $c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", intval($importer["uid"]), dbesc($guid) ); - if($c) + if ($c) $conversation = $c[0]; } if (!$conversation) { @@ -1529,7 +1529,7 @@ class Diaspora { return; } - foreach($messages as $mesg) + foreach ($messages as $mesg) self::receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation); return true; @@ -1659,7 +1659,7 @@ class Diaspora { logger("Stored like ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG); // If we are the origin of the parent we store the original data and notify our followers - if($message_id AND $parent_item["origin"]) { + if ($message_id AND $parent_item["origin"]) { // Formerly we stored the signed text, the signature and the author in different fields. // We now store the raw data so that we are more flexible. @@ -1834,10 +1834,10 @@ class Diaspora { $handle_parts = explode("@", $author); $nick = $handle_parts[0]; - if($name === "") + if ($name === "") $name = $handle_parts[0]; - if( preg_match("|^https?://|", $image_url) === 0) + if ( preg_match("|^https?://|", $image_url) === 0) $image_url = "http://".$handle_parts[1].$image_url; update_contact_avatar($image_url, $importer["uid"], $contact["id"]); @@ -1852,7 +1852,7 @@ class Diaspora { // this is to prevent multiple birthday notifications in a single year // if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year - if(substr($birthday,5) === substr($contact["bd"],5)) + if (substr($birthday,5) === substr($contact["bd"],5)) $birthday = $contact["bd"]; $r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s', @@ -1895,7 +1895,7 @@ class Diaspora { $a = get_app(); - if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { + if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d", intval(CONTACT_IS_FRIEND), intval($contact["id"]), @@ -1908,7 +1908,7 @@ class Diaspora { intval($importer["uid"]) ); - if($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) { + if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) { $self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1", intval($importer["uid"]) @@ -1916,7 +1916,7 @@ class Diaspora { // they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array - if($self && $contact["rel"] == CONTACT_IS_FOLLOWER) { + if ($self && $contact["rel"] == CONTACT_IS_FOLLOWER) { $arr = array(); $arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]); @@ -1947,7 +1947,7 @@ class Diaspora { $arr["deny_gid"] = $user[0]["deny_gid"]; $i = item_store($arr); - if($i) + if ($i) proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i); } } @@ -2086,12 +2086,12 @@ class Diaspora { $def_gid = get_default_group($importer['uid'], $ret["network"]); - if(intval($def_gid)) + if (intval($def_gid)) group_add_member($importer["uid"], "", $contact_record["id"], $def_gid); update_contact_avatar($ret["photo"], $importer['uid'], $contact_record["id"], true); - if($importer["page-flags"] == PAGE_NORMAL) { + if ($importer["page-flags"] == PAGE_NORMAL) { logger("Sending intra message for author ".$author.".", LOGGER_DEBUG); @@ -2141,7 +2141,7 @@ class Diaspora { ); $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"])); - if($u) { + if ($u) { logger("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], LOGGER_DEBUG); $ret = self::send_share($u[0], $contact_record); @@ -2765,7 +2765,7 @@ class Diaspora { $a = get_app(); $enabled = intval(get_config("system", "diaspora_enabled")); - if(!$enabled) + if (!$enabled) return 200; $logid = random_string(4); @@ -3104,14 +3104,14 @@ class Diaspora { $body = html_entity_decode(bb2diaspora($body)); // Adding the title - if(strlen($title)) + if (strlen($title)) $body = "## ".html_entity_decode($title)."\n\n".$body; if ($item["attach"]) { $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER); - if(cnt) { + if (cnt) { $body .= "\n".t("Attachments:")."\n"; - foreach($matches as $mtch) + foreach ($matches as $mtch) $body .= "[".$mtch[3]."](".$mtch[1].")\n"; } } @@ -3591,7 +3591,7 @@ class Diaspora { if ($searchable === 'true') { $dob = '1000-00-00'; - if (($profile['dob']) && ($profile['dob'] != '0000-00-00')) + if (($profile['dob']) && ($profile['dob'] > '0001-01-01')) $dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC','UTC',$profile['dob'],'m-d'); $about = $profile['about']; @@ -3604,7 +3604,7 @@ class Diaspora { $kw = str_replace(' ',' ',$kw); $arr = explode(' ',$profile['pub_keywords']); if (count($arr)) { - for($x = 0; $x < 5; $x ++) { + for ($x = 0; $x < 5; $x ++) { if (trim($arr[$x])) $tags .= '#'. trim($arr[$x]) .' '; } @@ -3626,7 +3626,7 @@ class Diaspora { "searchable" => $searchable, "tag_string" => $tags); - foreach($recips as $recip) { + foreach ($recips as $recip) { logger("Send updated profile data for user ".$uid." to contact ".$recip["id"], LOGGER_DEBUG); self::build_and_transmit($profile, $recip, "profile", $message, false, "", true); } @@ -3649,17 +3649,20 @@ class Diaspora { } $r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid'])); - if(!$r) + if (!dbm::is_result($r)) { return false; + } $contact["uprvkey"] = $r[0]['prvkey']; $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($post_id)); - if (!$r) + if (!dbm::is_result($r)) { return false; + } - if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) + if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) { return false; + } $message = self::construct_like($r[0], $contact); $message["author_signature"] = self::signature($contact, $message); diff --git a/include/directory.php b/include/directory.php index 088adbe78..41a3dd784 100644 --- a/include/directory.php +++ b/include/directory.php @@ -1,17 +1,19 @@ $argv[1]); @@ -22,5 +24,20 @@ function directory_run(&$argv, &$argc){ if (strlen($arr['url'])) { fetch_url($dir . '?url=' . bin2hex($arr['url'])); } + return; } + +function directory_update_all() { + $r = q("SELECT `url` FROM `contact` + INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid` + INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` + WHERE `contact`.`self` AND `profile`.`net-publish` AND `profile`.`is-default` AND + NOT `user`.`account_expired` AND `user`.`verified`"); + + if (dbm::is_result($r)) { + foreach ($r AS $user) { + proc_run(PRIORITY_LOW, 'include/directory.php', $user['url']); + } + } +} diff --git a/include/discover_poco.php b/include/discover_poco.php index bb53efb5c..ff97b0e59 100644 --- a/include/discover_poco.php +++ b/include/discover_poco.php @@ -209,10 +209,10 @@ function discover_directory($search) { $j = json_decode($x); if (count($j->results)) { - foreach($j->results as $jj) { + foreach ($j->results as $jj) { // Check if the contact already exists $exists = q("SELECT `id`, `last_contact`, `last_failure`, `updated` FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($jj->url)); - if ($exists) { + if (dbm::is_result($exists)) { logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG); if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) AND @@ -272,12 +272,16 @@ function gs_search_user($search) { if (!$result["success"]) { return false; } + $contacts = json_decode($result["body"]); if ($contacts->status == 'ERROR') { return false; } - foreach($contacts->data AS $user) { + + /// @TODO AS is considered as a notation for constants (as they usually being written all upper-case) + /// @TODO find all those and convert to all lower-case which is a keyword then + foreach ($contacts->data AS $user) { $contact = probe_url($user->site_address."/".$user->name); if ($contact["network"] != NETWORK_PHANTOM) { $contact["about"] = $user->description; diff --git a/include/email.php b/include/email.php index 42f80c242..b8d99433e 100644 --- a/include/email.php +++ b/include/email.php @@ -4,7 +4,7 @@ require_once('include/msgclean.php'); require_once('include/quoteconvert.php'); function email_connect($mailbox,$username,$password) { - if(! function_exists('imap_open')) + if (! function_exists('imap_open')) return false; $mbox = @imap_open($mailbox,$username,$password); @@ -14,23 +14,23 @@ function email_connect($mailbox,$username,$password) { function email_poll($mbox,$email_addr) { - if(! ($mbox && $email_addr)) + if (! ($mbox && $email_addr)) return array(); $search1 = @imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID); - if(! $search1) + if (! $search1) $search1 = array(); $search2 = @imap_search($mbox,'TO "' . $email_addr . '"', SE_UID); - if(! $search2) + if (! $search2) $search2 = array(); $search3 = @imap_search($mbox,'CC "' . $email_addr . '"', SE_UID); - if(! $search3) + if (! $search3) $search3 = array(); $search4 = @imap_search($mbox,'BCC "' . $email_addr . '"', SE_UID); - if(! $search4) + if (! $search4) $search4 = array(); $res = array_unique(array_merge($search1,$search2,$search3,$search4)); @@ -57,8 +57,8 @@ function email_msg_headers($mbox,$uid) { $raw_header = str_replace("\r",'',$raw_header); $ret = array(); $h = explode("\n",$raw_header); - if(count($h)) - foreach($h as $line ) { + if (count($h)) + foreach ($h as $line ) { if (preg_match("/^[a-zA-Z]/", $line)) { $key = substr($line,0,strpos($line,':')); $value = substr($line,strpos($line,':')+1); @@ -79,10 +79,10 @@ function email_get_msg($mbox,$uid, $reply) { $struc = (($mbox && $uid) ? @imap_fetchstructure($mbox,$uid,FT_UID) : null); - if(! $struc) + if (! $struc) return $ret; - if(! $struc->parts) { + if (! $struc->parts) { $ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html'); $html = $ret['body']; @@ -94,7 +94,7 @@ function email_get_msg($mbox,$uid, $reply) { else { $text = ''; $html = ''; - foreach($struc->parts as $ptop => $p) { + foreach ($struc->parts as $ptop => $p) { $x = email_get_part($mbox,$uid,$p,$ptop + 1, 'plain'); if ($x) { $text .= $x; @@ -206,16 +206,16 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) { function email_header_encode($in_str, $charset) { - $out_str = $in_str; + $out_str = $in_str; $need_to_convert = false; - for($x = 0; $x < strlen($in_str); $x ++) { - if((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) { + for ($x = 0; $x < strlen($in_str); $x ++) { + if ((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) { $need_to_convert = true; } } - if(! $need_to_convert) + if (! $need_to_convert) return $in_str; if ($out_str && $charset) { diff --git a/include/enotify.php b/include/enotify.php index ebc27309d..f86174bd4 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -411,10 +411,12 @@ function notification($params) { $hash = random_string(); $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", dbesc($hash)); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $dups = true; - } while($dups == true); + } + } while ($dups == true); + /// @TODO One statement is enough $datarray = array(); $datarray['hash'] = $hash; $datarray['name'] = $params['source_name']; diff --git a/include/event.php b/include/event.php index ebd4885c9..280b1380a 100644 --- a/include/event.php +++ b/include/event.php @@ -10,7 +10,7 @@ require_once 'include/datetime.php'; function format_event_html($ev, $simple = false) { - if(! ((is_array($ev)) && count($ev))) { + if (! ((is_array($ev)) && count($ev))) { return ''; } @@ -98,26 +98,26 @@ function parse_event($h) { logger('parse_event: parse error: ' . $e); } - if(! $dom) + if (! $dom) return $ret; $items = $dom->getElementsByTagName('*'); - foreach($items as $item) { - if(attribute_contains($item->getAttribute('class'), 'vevent')) { + foreach ($items as $item) { + if (attribute_contains($item->getAttribute('class'), 'vevent')) { $level2 = $item->getElementsByTagName('*'); - foreach($level2 as $x) { - if(attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) { + foreach ($level2 as $x) { + if (attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) { $ret['start'] = $x->getAttribute('title'); - if(! strpos($ret['start'],'Z')) + if (! strpos($ret['start'],'Z')) $ret['adjust'] = true; } - if(attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title')) + if (attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title')) $ret['finish'] = $x->getAttribute('title'); - if(attribute_contains($x->getAttribute('class'),'description')) + if (attribute_contains($x->getAttribute('class'),'description')) $ret['desc'] = $x->textContent; - if(attribute_contains($x->getAttribute('class'),'location')) + if (attribute_contains($x->getAttribute('class'),'location')) $ret['location'] = $x->textContent; } } @@ -125,23 +125,23 @@ function parse_event($h) { // sanitise - if((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) { + if ((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) { $config = HTMLPurifier_Config::createDefault(); $config->set('Cache.DefinitionImpl', null); $purifier = new HTMLPurifier($config); $ret['desc'] = html2bbcode($purifier->purify($ret['desc'])); } - if((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) { + if ((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) { $config = HTMLPurifier_Config::createDefault(); $config->set('Cache.DefinitionImpl', null); $purifier = new HTMLPurifier($config); $ret['location'] = html2bbcode($purifier->purify($ret['location'])); } - if(x($ret,'start')) + if (x($ret,'start')) $ret['start'] = datetime_convert('UTC','UTC',$ret['start']); - if(x($ret,'finish')) + if (x($ret,'finish')) $ret['finish'] = datetime_convert('UTC','UTC',$ret['finish']); return $ret; @@ -595,7 +595,7 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') { */ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') { // Only allow events if there is a valid owner_id - if($owner_uid == 0) { + if ($owner_uid == 0) { return; } diff --git a/include/expire.php b/include/expire.php index 35b109a50..098125a79 100644 --- a/include/expire.php +++ b/include/expire.php @@ -11,12 +11,13 @@ function expire_run(&$argv, &$argc){ // physically remove anything that has been deleted for more than two months - $r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY"); + $r = q("DELETE FROM `item` WHERE `deleted` = 1 AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"); // make this optional as it could have a performance impact on large sites - if(intval(get_config('system','optimize_items'))) - q("optimize table item"); + if (intval(get_config('system','optimize_items'))) { + q("OPTIMIZE TABLE `item`"); + } logger('expire: start'); diff --git a/include/feed.php b/include/feed.php index 295993370..2117676db 100644 --- a/include/feed.php +++ b/include/feed.php @@ -200,7 +200,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { 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; @@ -210,12 +209,17 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { if ($item["uri"] == "") { $item["uri"] = $item["plink"]; } + + $orig_plink = $item["plink"]; + + $item["plink"] = original_url($item["plink"]); + $item["parent-uri"] = $item["uri"]; if (!$simulate) { $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s', '%s')", intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED), dbesc(NETWORK_DFRN)); - if ($r) { + if (dbm::is_result($r)) { logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG); continue; } @@ -340,6 +344,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { // Distributed items should have a well formatted URI. // Additionally we have to avoid conflicts with identical URI between imported feeds and these items. if ($notify) { + $item['guid'] = uri_to_guid($orig_plink, $a->get_hostname()); unset($item['uri']); unset($item['parent-uri']); } diff --git a/include/identity.php b/include/identity.php index 8138e9b04..a21624a21 100644 --- a/include/identity.php +++ b/include/identity.php @@ -202,6 +202,9 @@ function profile_sidebar($profile, $block = 0) { $address = false; // $pdesc = true; + // This function can also use contact information in $profile + $is_contact = x($profile, 'cid'); + if((! is_array($profile)) && (! count($profile))) return $o; @@ -281,7 +284,7 @@ function profile_sidebar($profile, $block = 0) { } // show edit profile to yourself - if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) { + if (!$is_contact && $profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) { $profile['edit'] = array(App::get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles')); $r = q("SELECT * FROM `profile` WHERE `uid` = %d", local_user()); @@ -310,7 +313,7 @@ function profile_sidebar($profile, $block = 0) { } } - if ($profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) { + if (!$is_contact && $profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) { $profile['edit'] = array(App::get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile')); $profile['menu'] = array( 'chg_photo' => t('Change profile photo'), @@ -628,7 +631,7 @@ function advanced_profile(App $a) { if($a->profile['gender']) $profile['gender'] = array( t('Gender:'), $a->profile['gender'] ); - if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { + if(($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) { $year_bd_format = t('j F, Y'); $short_bd_format = t('j F'); diff --git a/include/items.php b/include/items.php index c2b3d7d1f..2500e08d5 100644 --- a/include/items.php +++ b/include/items.php @@ -6,31 +6,33 @@ use \Friendica\ParseUrl; -require_once('include/bbcode.php'); -require_once('include/oembed.php'); -require_once('include/salmon.php'); -require_once('include/crypto.php'); -require_once('include/Photo.php'); -require_once('include/tags.php'); -require_once('include/files.php'); -require_once('include/text.php'); -require_once('include/email.php'); -require_once('include/threads.php'); -require_once('include/socgraph.php'); -require_once('include/plaintext.php'); -require_once('include/ostatus.php'); -require_once('include/feed.php'); -require_once('include/Contact.php'); -require_once('mod/share.php'); -require_once('include/enotify.php'); -require_once('include/dfrn.php'); -require_once('include/group.php'); +require_once 'include/bbcode.php'; +require_once 'include/oembed.php'; +require_once 'include/salmon.php'; +require_once 'include/crypto.php'; +require_once 'include/Photo.php'; +require_once 'include/tags.php'; +require_once 'include/files.php'; +require_once 'include/text.php'; +require_once 'include/email.php'; +require_once 'include/threads.php'; +require_once 'include/socgraph.php'; +require_once 'include/plaintext.php'; +require_once 'include/ostatus.php'; +require_once 'include/feed.php'; +require_once 'include/Contact.php'; +require_once 'mod/share.php'; +require_once 'include/enotify.php'; +require_once 'include/dfrn.php'; +require_once 'include/group.php'; -require_once('library/defuse/php-encryption-1.2.1/Crypto.php'); +/// @TODO one day with composer autoloader no more needed +require_once 'library/defuse/php-encryption-1.2.1/Crypto.php'; function construct_verb($item) { - if ($item['verb']) + if ($item['verb']) { return $item['verb']; + } return ACTIVITY_POST; } @@ -60,7 +62,7 @@ function limit_body_size($body) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); - while(($img_st_close !== false) && ($img_end !== false)) { + while (($img_st_close !== false) && ($img_end !== false)) { $img_st_close++; // make it point to AFTER the closing bracket $img_end += $img_start; @@ -69,7 +71,7 @@ function limit_body_size($body) { if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { // This is an embedded image - if ( ($textlen + $img_start) > $maxlen ) { + if (($textlen + $img_start) > $maxlen ) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens before an embedded image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); @@ -83,7 +85,7 @@ function limit_body_size($body) { $new_body = $new_body . substr($orig_body, $img_start, $img_end - $img_start); } else { - if ( ($textlen + $img_end) > $maxlen ) { + if (($textlen + $img_end) > $maxlen ) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens before the end of a non-embedded image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); @@ -96,15 +98,17 @@ function limit_body_size($body) { } $orig_body = substr($orig_body, $img_end); - if ($orig_body === false) // in case the body ends on a closing image tag + if ($orig_body === false) { + // in case the body ends on a closing image tag $orig_body = ''; + } $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); } - if ( ($textlen + strlen($orig_body)) > $maxlen) { + if (($textlen + strlen($orig_body)) > $maxlen) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens after the end of the last image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); @@ -117,8 +121,9 @@ function limit_body_size($body) { } return $new_body; - } else + } else { return $body; + } }} function title_is_body($title, $body) { @@ -126,15 +131,16 @@ function title_is_body($title, $body) { $title = strip_tags($title); $title = trim($title); $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8'); - $title = str_replace(array("\n", "\r", "\t", " "), array("","","",""), $title); + $title = str_replace(array("\n", "\r", "\t", " "), array("", "", "", ""), $title); $body = strip_tags($body); $body = trim($body); $body = html_entity_decode($body, ENT_QUOTES, 'UTF-8'); - $body = str_replace(array("\n", "\r", "\t", " "), array("","","",""), $body); + $body = str_replace(array("\n", "\r", "\t", " "), array("", "", "", ""), $body); - if (strlen($title) < strlen($body)) + if (strlen($title) < strlen($body)) { $body = substr($body, 0, strlen($title)); + } if (($title != $body) and (substr($title, -3) == "...")) { $pos = strrpos($title, "..."); @@ -144,7 +150,7 @@ function title_is_body($title, $body) { } } - return($title == $body); + return ($title == $body); } function add_page_info_data($data) { @@ -212,8 +218,8 @@ function add_page_info_data($data) { foreach ($data["keywords"] AS $keyword) { /// @todo make a positive list of allowed characters $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"), - array("","", "", "", "", "", "", "", "", "", "", ""), $keyword); - $hashtags .= "#[url=".App::get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url] "; + array("", "", "", "", "", "", "", "", "", "", "", ""), $keyword); + $hashtags .= "#[url=" . App::get_baseurl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url] "; } } @@ -224,25 +230,28 @@ function query_page_info($url, $no_photos = false, $photo = "", $keywords = fals $data = ParseUrl::getSiteinfoCached($url, true); - if ($photo != "") + if ($photo != "") { $data["images"][0]["src"] = $photo; + } - logger('fetch page info for '.$url.' '.print_r($data, true), LOGGER_DEBUG); + logger('fetch page info for ' . $url . ' ' . print_r($data, true), LOGGER_DEBUG); - if (!$keywords AND isset($data["keywords"])) + if (!$keywords AND isset($data["keywords"])) { unset($data["keywords"]); + } if (($keyword_blacklist != "") AND isset($data["keywords"])) { - $list = explode(",", $keyword_blacklist); + $list = explode(", ", $keyword_blacklist); foreach ($list AS $keyword) { $keyword = trim($keyword); $index = array_search($keyword, $data["keywords"]); - if ($index !== false) + if ($index !== false) { unset($data["keywords"][$index]); + } } } - return($data); + return $data; } function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") { @@ -252,16 +261,17 @@ function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = fa if (isset($data["keywords"]) AND count($data["keywords"])) { foreach ($data["keywords"] AS $keyword) { $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'"), - array("","", "", "", "", ""), $keyword); + array("", "", "", "", "", ""), $keyword); - if ($tags != "") - $tags .= ","; + if ($tags != "") { + $tags .= ", "; + } - $tags .= "#[url=".App::get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url]"; + $tags .= "#[url=" . App::get_baseurl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]"; } } - return($tags); + return $tags; } function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") { @@ -269,52 +279,58 @@ function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $text = add_page_info_data($data); - return($text); + return $text; } function add_page_info_to_body($body, $texturl = false, $no_photos = false) { - logger('add_page_info_to_body: fetch page info for body '.$body, LOGGER_DEBUG); + logger('add_page_info_to_body: fetch page info for body ' . $body, LOGGER_DEBUG); $URLSearchString = "^\[\]"; // Fix for Mastodon where the mentions are in a different format $body = preg_replace("/\[url\=([$URLSearchString]*)\]([#!@])(.*?)\[\/url\]/ism", - '$2[url=$1]$3[/url]', $body); + '$2[url=$1]$3[/url]', $body); // Adding these spaces is a quick hack due to my problems with regular expressions :) - preg_match("/[^!#@]\[url\]([$URLSearchString]*)\[\/url\]/ism", " ".$body, $matches); + preg_match("/[^!#@]\[url\]([$URLSearchString]*)\[\/url\]/ism", " " . $body, $matches); - if (!$matches) - preg_match("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", " ".$body, $matches); + if (!$matches) { + preg_match("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", " " . $body, $matches); + } // Convert urls without bbcode elements if (!$matches AND $texturl) { preg_match("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", " ".$body, $matches); // Yeah, a hack. I really hate regular expressions :) - if ($matches) + if ($matches) { $matches[1] = $matches[2]; + } } - if ($matches) + if ($matches) { $footer = add_page_info($matches[1], $no_photos); + } // Remove the link from the body if the link is attached at the end of the post if (isset($footer) AND (trim($footer) != "") AND (strpos($footer, $matches[1]))) { $removedlink = trim(str_replace($matches[1], "", $body)); - if (($removedlink == "") OR strstr($body, $removedlink)) + if (($removedlink == "") OR strstr($body, $removedlink)) { $body = $removedlink; + } $url = str_replace(array('/', '.'), array('\/', '\.'), $matches[1]); - $removedlink = preg_replace("/\[url\=".$url."\](.*?)\[\/url\]/ism", '', $body); - if (($removedlink == "") OR strstr($body, $removedlink)) + $removedlink = preg_replace("/\[url\=" . $url . "\](.*?)\[\/url\]/ism", '', $body); + if (($removedlink == "") OR strstr($body, $removedlink)) { $body = $removedlink; + } } // Add the page information to the bottom - if (isset($footer) AND (trim($footer) != "")) + if (isset($footer) AND (trim($footer) != "")) { $body .= $footer; + } return $body; } @@ -328,12 +344,13 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) { */ function item_add_language_opt(&$arr) { - if (version_compare(PHP_VERSION, '5.3.0', '<')) return; // LanguageDetect.php not available ? + if (version_compare(PHP_VERSION, '5.3.0', '<')) { + // LanguageDetect.php not available ? + return; + } - if ( x($arr, 'postopts') ) - { - if ( strstr($arr['postopts'], 'lang=') ) - { + if (x($arr, 'postopts') ) { + if (strstr($arr['postopts'], 'lang=') ) { // do not override /// @TODO Add parameter to request overriding return; @@ -344,8 +361,9 @@ function item_add_language_opt(&$arr) { } require_once('library/langdet/Text/LanguageDetect.php'); - $naked_body = preg_replace('/\[(.+?)\]/','',$arr['body']); - $l = new Text_LanguageDetect; + + $naked_body = preg_replace('/\[(.+?)\]/','', $arr['body']); + $l = new Text_LanguageDetect(); //$lng = $l->detectConfidence($naked_body); //$arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : ''); $lng = $l->detect($naked_body, 3); @@ -355,7 +373,7 @@ function item_add_language_opt(&$arr) { $postopts .= 'lang='; $sep = ""; foreach ($lng as $language => $score) { - $postopts .= $sep . $language.";".$score; + $postopts .= $sep . $language . ";" . $score; $sep = ':'; } $arr['postopts'] = $postopts; @@ -392,7 +410,9 @@ function uri_to_guid($uri, $host = "") { return $guid_prefix.$host_hash; } -function item_store($arr,$force_parent = false, $notify = false, $dontcache = false) { +/// @TODO Maybe $arr must be called-by-reference? This function modifies it +/// @TODO add type-hint array +function item_store($arr, $force_parent = false, $notify = false, $dontcache = false) { $a = get_app(); @@ -407,18 +427,22 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri. // In difference to the call to "uri_to_guid" several lines below we add the hash of our own host. // This is done because our host is the original creator of the post. - if (isset($arr['plink'])) { - $arr['guid'] = uri_to_guid($arr['plink'], $a->get_hostname()); - } elseif (isset($arr['uri'])) { - $arr['guid'] = uri_to_guid($arr['uri'], $a->get_hostname()); + if (!isset($arr['guid'])) { + if (isset($arr['plink'])) { + $arr['guid'] = uri_to_guid($arr['plink'], $a->get_hostname()); + } elseif (isset($arr['uri'])) { + $arr['guid'] = uri_to_guid($arr['uri'], $a->get_hostname()); + } } } - // If a Diaspora signature structure was passed in, pull it out of the - // item array and set it aside for later storage. + /* + * If a Diaspora signature structure was passed in, pull it out of the + * item array and set it aside for later storage. + */ $dsprsig = null; - if (x($arr,'dsprsig')) { + if (x($arr, 'dsprsig')) { $encoded_signature = $arr['dsprsig']; $dsprsig = json_decode(base64_decode($arr['dsprsig'])); unset($arr['dsprsig']); @@ -426,27 +450,28 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // Converting the plink if ($arr['network'] == NETWORK_OSTATUS) { - if (isset($arr['plink'])) + if (isset($arr['plink'])) { $arr['plink'] = ostatus::convert_href($arr['plink']); - elseif (isset($arr['uri'])) + } elseif (isset($arr['uri'])) { $arr['plink'] = ostatus::convert_href($arr['uri']); + } } - if (x($arr, 'gravity')) + if (x($arr, 'gravity')) { $arr['gravity'] = intval($arr['gravity']); - elseif ($arr['parent-uri'] === $arr['uri']) + } elseif ($arr['parent-uri'] === $arr['uri']) { $arr['gravity'] = 0; - elseif (activity_match($arr['verb'],ACTIVITY_POST)) + } elseif (activity_match($arr['verb'],ACTIVITY_POST)) { $arr['gravity'] = 6; - else + } else { $arr['gravity'] = 6; // extensible catchall + } - if (! x($arr,'type')) + if (! x($arr, 'type')) { $arr['type'] = 'remote'; + } - - - /* check for create date and expire time */ + // check for create date and expire time $uid = intval($arr['uid']); $r = q("SELECT expire FROM user WHERE uid = %d", intval($uid)); if (dbm::is_result($r)) { @@ -461,8 +486,11 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa } } - // Do we already have this item? - // We have to check several networks since Friendica posts could be repeated via OStatus (maybe Diasporsa as well) + /* + * Do we already have this item? + * We have to check several networks since Friendica posts could be repeated + * via OStatus (maybe Diasporsa as well) + */ if (in_array(trim($arr['network']), array(NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS, ""))) { $r = q("SELECT `id`, `network` FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` IN ('%s', '%s', '%s') LIMIT 1", dbesc(trim($arr['uri'])), @@ -471,14 +499,17 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS) ); - if ($r) { + if (dbm::is_result($r)) { // We only log the entries with a different user id than 0. Otherwise we would have too many false positives - if ($uid != 0) + if ($uid != 0) { logger("Item with uri ".$arr['uri']." already existed for user ".$uid." with id ".$r[0]["id"]." target network ".$r[0]["network"]." - new network: ".$arr['network']); - return($r[0]["id"]); + } + + return $r[0]["id"]; } } + /// @TODO old-lost code? // Shouldn't happen but we want to make absolutely sure it doesn't leak from a plugin. // Deactivated, since the bbcode parser can handle with it - and it destroys posts with some smileys that contain "<" //if ((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false)) @@ -486,76 +517,79 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa item_add_language_opt($arr); - if ($notify) + if ($notify) { $guid_prefix = ""; - elseif ((trim($arr['guid']) == "") AND (trim($arr['plink']) != "")) + } elseif ((trim($arr['guid']) == "") AND (trim($arr['plink']) != "")) { $arr['guid'] = uri_to_guid($arr['plink']); - elseif ((trim($arr['guid']) == "") AND (trim($arr['uri']) != "")) + } elseif ((trim($arr['guid']) == "") AND (trim($arr['uri']) != "")) { $arr['guid'] = uri_to_guid($arr['uri']); - else { + } else { $parsed = parse_url($arr["author-link"]); $guid_prefix = hash("crc32", $parsed["host"]); } - $arr['wall'] = ((x($arr,'wall')) ? intval($arr['wall']) : 0); - $arr['guid'] = ((x($arr,'guid')) ? notags(trim($arr['guid'])) : get_guid(32, $guid_prefix)); - $arr['uri'] = ((x($arr,'uri')) ? notags(trim($arr['uri'])) : item_new_uri($a->get_hostname(), $uid, $arr['guid'])); - $arr['extid'] = ((x($arr,'extid')) ? notags(trim($arr['extid'])) : ''); - $arr['author-name'] = ((x($arr,'author-name')) ? trim($arr['author-name']) : ''); - $arr['author-link'] = ((x($arr,'author-link')) ? notags(trim($arr['author-link'])) : ''); - $arr['author-avatar'] = ((x($arr,'author-avatar')) ? notags(trim($arr['author-avatar'])) : ''); - $arr['owner-name'] = ((x($arr,'owner-name')) ? trim($arr['owner-name']) : ''); - $arr['owner-link'] = ((x($arr,'owner-link')) ? notags(trim($arr['owner-link'])) : ''); - $arr['owner-avatar'] = ((x($arr,'owner-avatar')) ? notags(trim($arr['owner-avatar'])) : ''); - $arr['created'] = ((x($arr,'created') !== false) ? datetime_convert('UTC','UTC',$arr['created']) : datetime_convert()); - $arr['edited'] = ((x($arr,'edited') !== false) ? datetime_convert('UTC','UTC',$arr['edited']) : datetime_convert()); - $arr['commented'] = ((x($arr,'commented') !== false) ? datetime_convert('UTC','UTC',$arr['commented']) : datetime_convert()); - $arr['received'] = ((x($arr,'received') !== false) ? datetime_convert('UTC','UTC',$arr['received']) : datetime_convert()); - $arr['changed'] = ((x($arr,'changed') !== false) ? datetime_convert('UTC','UTC',$arr['changed']) : datetime_convert()); - $arr['title'] = ((x($arr,'title')) ? trim($arr['title']) : ''); - $arr['location'] = ((x($arr,'location')) ? trim($arr['location']) : ''); - $arr['coord'] = ((x($arr,'coord')) ? notags(trim($arr['coord'])) : ''); - $arr['last-child'] = ((x($arr,'last-child')) ? intval($arr['last-child']) : 0 ); - $arr['visible'] = ((x($arr,'visible') !== false) ? intval($arr['visible']) : 1 ); + $arr['wall'] = ((x($arr, 'wall')) ? intval($arr['wall']) : 0); + $arr['guid'] = ((x($arr, 'guid')) ? notags(trim($arr['guid'])) : get_guid(32, $guid_prefix)); + $arr['uri'] = ((x($arr, 'uri')) ? notags(trim($arr['uri'])) : item_new_uri($a->get_hostname(), $uid, $arr['guid'])); + $arr['extid'] = ((x($arr, 'extid')) ? notags(trim($arr['extid'])) : ''); + $arr['author-name'] = ((x($arr, 'author-name')) ? trim($arr['author-name']) : ''); + $arr['author-link'] = ((x($arr, 'author-link')) ? notags(trim($arr['author-link'])) : ''); + $arr['author-avatar'] = ((x($arr, 'author-avatar')) ? notags(trim($arr['author-avatar'])) : ''); + $arr['owner-name'] = ((x($arr, 'owner-name')) ? trim($arr['owner-name']) : ''); + $arr['owner-link'] = ((x($arr, 'owner-link')) ? notags(trim($arr['owner-link'])) : ''); + $arr['owner-avatar'] = ((x($arr, 'owner-avatar')) ? notags(trim($arr['owner-avatar'])) : ''); + $arr['created'] = ((x($arr, 'created') !== false) ? datetime_convert('UTC','UTC', $arr['created']) : datetime_convert()); + $arr['edited'] = ((x($arr, 'edited') !== false) ? datetime_convert('UTC','UTC', $arr['edited']) : datetime_convert()); + $arr['commented'] = ((x($arr, 'commented') !== false) ? datetime_convert('UTC','UTC', $arr['commented']) : datetime_convert()); + $arr['received'] = ((x($arr, 'received') !== false) ? datetime_convert('UTC','UTC', $arr['received']) : datetime_convert()); + $arr['changed'] = ((x($arr, 'changed') !== false) ? datetime_convert('UTC','UTC', $arr['changed']) : datetime_convert()); + $arr['title'] = ((x($arr, 'title')) ? trim($arr['title']) : ''); + $arr['location'] = ((x($arr, 'location')) ? trim($arr['location']) : ''); + $arr['coord'] = ((x($arr, 'coord')) ? notags(trim($arr['coord'])) : ''); + $arr['last-child'] = ((x($arr, 'last-child')) ? intval($arr['last-child']) : 0 ); + $arr['visible'] = ((x($arr, 'visible') !== false) ? intval($arr['visible']) : 1 ); $arr['deleted'] = 0; - $arr['parent-uri'] = ((x($arr,'parent-uri')) ? notags(trim($arr['parent-uri'])) : $arr['uri']); - $arr['verb'] = ((x($arr,'verb')) ? notags(trim($arr['verb'])) : ''); - $arr['object-type'] = ((x($arr,'object-type')) ? notags(trim($arr['object-type'])) : ''); - $arr['object'] = ((x($arr,'object')) ? trim($arr['object']) : ''); - $arr['target-type'] = ((x($arr,'target-type')) ? notags(trim($arr['target-type'])) : ''); - $arr['target'] = ((x($arr,'target')) ? trim($arr['target']) : ''); - $arr['plink'] = ((x($arr,'plink')) ? notags(trim($arr['plink'])) : ''); - $arr['allow_cid'] = ((x($arr,'allow_cid')) ? trim($arr['allow_cid']) : ''); - $arr['allow_gid'] = ((x($arr,'allow_gid')) ? trim($arr['allow_gid']) : ''); - $arr['deny_cid'] = ((x($arr,'deny_cid')) ? trim($arr['deny_cid']) : ''); - $arr['deny_gid'] = ((x($arr,'deny_gid')) ? trim($arr['deny_gid']) : ''); - $arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0 ); - $arr['bookmark'] = ((x($arr,'bookmark')) ? intval($arr['bookmark']) : 0 ); - $arr['body'] = ((x($arr,'body')) ? trim($arr['body']) : ''); - $arr['tag'] = ((x($arr,'tag')) ? notags(trim($arr['tag'])) : ''); - $arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : ''); - $arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : ''); - $arr['origin'] = ((x($arr,'origin')) ? intval($arr['origin']) : 0 ); - $arr['network'] = ((x($arr,'network')) ? trim($arr['network']) : ''); - $arr['postopts'] = ((x($arr,'postopts')) ? trim($arr['postopts']) : ''); - $arr['resource-id'] = ((x($arr,'resource-id')) ? trim($arr['resource-id']) : ''); - $arr['event-id'] = ((x($arr,'event-id')) ? intval($arr['event-id']) : 0 ); - $arr['inform'] = ((x($arr,'inform')) ? trim($arr['inform']) : ''); - $arr['file'] = ((x($arr,'file')) ? trim($arr['file']) : ''); + $arr['parent-uri'] = ((x($arr, 'parent-uri')) ? notags(trim($arr['parent-uri'])) : $arr['uri']); + $arr['verb'] = ((x($arr, 'verb')) ? notags(trim($arr['verb'])) : ''); + $arr['object-type'] = ((x($arr, 'object-type')) ? notags(trim($arr['object-type'])) : ''); + $arr['object'] = ((x($arr, 'object')) ? trim($arr['object']) : ''); + $arr['target-type'] = ((x($arr, 'target-type')) ? notags(trim($arr['target-type'])) : ''); + $arr['target'] = ((x($arr, 'target')) ? trim($arr['target']) : ''); + $arr['plink'] = ((x($arr, 'plink')) ? notags(trim($arr['plink'])) : ''); + $arr['allow_cid'] = ((x($arr, 'allow_cid')) ? trim($arr['allow_cid']) : ''); + $arr['allow_gid'] = ((x($arr, 'allow_gid')) ? trim($arr['allow_gid']) : ''); + $arr['deny_cid'] = ((x($arr, 'deny_cid')) ? trim($arr['deny_cid']) : ''); + $arr['deny_gid'] = ((x($arr, 'deny_gid')) ? trim($arr['deny_gid']) : ''); + $arr['private'] = ((x($arr, 'private')) ? intval($arr['private']) : 0 ); + $arr['bookmark'] = ((x($arr, 'bookmark')) ? intval($arr['bookmark']) : 0 ); + $arr['body'] = ((x($arr, 'body')) ? trim($arr['body']) : ''); + $arr['tag'] = ((x($arr, 'tag')) ? notags(trim($arr['tag'])) : ''); + $arr['attach'] = ((x($arr, 'attach')) ? notags(trim($arr['attach'])) : ''); + $arr['app'] = ((x($arr, 'app')) ? notags(trim($arr['app'])) : ''); + $arr['origin'] = ((x($arr, 'origin')) ? intval($arr['origin']) : 0 ); + $arr['network'] = ((x($arr, 'network')) ? trim($arr['network']) : ''); + $arr['postopts'] = ((x($arr, 'postopts')) ? trim($arr['postopts']) : ''); + $arr['resource-id'] = ((x($arr, 'resource-id')) ? trim($arr['resource-id']) : ''); + $arr['event-id'] = ((x($arr, 'event-id')) ? intval($arr['event-id']) : 0 ); + $arr['inform'] = ((x($arr, 'inform')) ? trim($arr['inform']) : ''); + $arr['file'] = ((x($arr, 'file')) ? trim($arr['file']) : ''); // Items cannot be stored before they happen ... - if ($arr['created'] > datetime_convert()) + if ($arr['created'] > datetime_convert()) { $arr['created'] = datetime_convert(); + } // We haven't invented time travel by now. - if ($arr['edited'] > datetime_convert()) + if ($arr['edited'] > datetime_convert()) { $arr['edited'] = datetime_convert(); + } - if (($arr['author-link'] == "") AND ($arr['owner-link'] == "")) - logger("Both author-link and owner-link are empty. Called by: ".App::callstack(), LOGGER_DEBUG); + if (($arr['author-link'] == "") AND ($arr['owner-link'] == "")) { + logger("Both author-link and owner-link are empty. Called by: " . App::callstack(), LOGGER_DEBUG); + } if ($arr['plink'] == "") { - $arr['plink'] = App::get_baseurl().'/display/'.urlencode($arr['guid']); + $arr['plink'] = App::get_baseurl() . '/display/' . urlencode($arr['guid']); } if ($arr['network'] == "") { @@ -571,59 +605,74 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc(normalise_link($arr['author-link'])) ); - if (!dbm::is_result($r)) + if (!dbm::is_result($r)) { $r = q("SELECT `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($arr['contact-id']), intval($arr['uid']) ); + } - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $arr['network'] = $r[0]["network"]; + } // Fallback to friendica (why is it empty in some cases?) - if ($arr['network'] == "") + if ($arr['network'] == "") { $arr['network'] = NETWORK_DFRN; + } - logger("item_store: Set network to ".$arr["network"]." for ".$arr["uri"], LOGGER_DEBUG); + logger("item_store: Set network to " . $arr["network"] . " for " . $arr["uri"], LOGGER_DEBUG); } // The contact-id should be set before "item_store" was called - but there seems to be some issues if ($arr["contact-id"] == 0) { - // First we are looking for a suitable contact that matches with the author of the post - // This is done only for comments (See below explanation at "gcontact-id") - if ($arr['parent-uri'] != $arr['uri']) + /* + * First we are looking for a suitable contact that matches with the author of the post + * This is done only for comments (See below explanation at "gcontact-id") + */ + if ($arr['parent-uri'] != $arr['uri']) { $arr["contact-id"] = get_contact($arr['author-link'], $uid); + } // If not present then maybe the owner was found - if ($arr["contact-id"] == 0) + if ($arr["contact-id"] == 0) { $arr["contact-id"] = get_contact($arr['owner-link'], $uid); + } // Still missing? Then use the "self" contact of the current user if ($arr["contact-id"] == 0) { $r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid` = %d", intval($uid)); - if ($r) + + if (dbm::is_result($r)) { $arr["contact-id"] = $r[0]["id"]; + } } + logger("Contact-id was missing for post ".$arr["guid"]." from user id ".$uid." - now set to ".$arr["contact-id"], LOGGER_DEBUG); } if ($arr["gcontact-id"] == 0) { - // The gcontact should mostly behave like the contact. But is is supposed to be global for the system. - // This means that wall posts, repeated posts, etc. should have the gcontact id of the owner. - // On comments the author is the better choice. - if ($arr['parent-uri'] === $arr['uri']) + /* + * The gcontact should mostly behave like the contact. But is is supposed to be global for the system. + * This means that wall posts, repeated posts, etc. should have the gcontact id of the owner. + * On comments the author is the better choice. + */ + if ($arr['parent-uri'] === $arr['uri']) { $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['owner-link'], "network" => $arr['network'], "photo" => $arr['owner-avatar'], "name" => $arr['owner-name'])); - else + } else { $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['author-link'], "network" => $arr['network'], "photo" => $arr['author-avatar'], "name" => $arr['author-name'])); + } } - if ($arr["author-id"] == 0) + if ($arr["author-id"] == 0) { $arr["author-id"] = get_contact($arr["author-link"], 0); + } - if ($arr["owner-id"] == 0) + if ($arr["owner-id"] == 0) { $arr["owner-id"] = get_contact($arr["owner-link"], 0); + } if ($arr['guid'] != "") { // Checking if there is already an item with the same guid @@ -673,8 +722,10 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc($r[0]['parent-uri']), intval($arr['uid']) ); - if ($z && count($z)) + + if (dbm::is_result($z)) { $r = $z; + } } $parent_id = $r[0]['id']; @@ -686,20 +737,23 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa $arr['wall'] = $r[0]['wall']; $notify_type = 'comment-new'; - // if the parent is private, force privacy for the entire conversation - // This differs from the above settings as it subtly allows comments from - // email correspondents to be private even if the overall thread is not. - - if ($r[0]['private']) + /* + * If the parent is private, force privacy for the entire conversation + * This differs from the above settings as it subtly allows comments from + * email correspondents to be private even if the overall thread is not. + */ + if ($r[0]['private']) { $arr['private'] = $r[0]['private']; + } - // Edge case. We host a public forum that was originally posted to privately. - // The original author commented, but as this is a comment, the permissions - // weren't fixed up so it will still show the comment as private unless we fix it here. - - if ((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private'])) + /* + * Edge case. We host a public forum that was originally posted to privately. + * The original author commented, but as this is a comment, the permissions + * weren't fixed up so it will still show the comment as private unless we fix it here. + */ + if ((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private'])) { $arr['private'] = 0; - + } // If its a post from myself then tag the thread as "mention" logger("item_store: Checking if parent ".$parent_id." has to be tagged as mention for user ".$arr['uid'], LOGGER_DEBUG); @@ -714,10 +768,10 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa } } } else { - - // Allow one to see reply tweets from status.net even when - // we don't have or can't see the original post. - + /* + * Allow one to see reply tweets from status.net even when + * we don't have or can't see the original post. + */ if ($force_parent) { logger('item_store: $force_parent=true, reply converted to top-level post.'); $parent_id = 0; @@ -777,14 +831,15 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa } else { $isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `uri` = '%s'", dbesc($arr["uri"])); - $arr["global"] = (count($isglobal) > 0); + $arr["global"] = (dbm::is_result($isglobal) && count($isglobal) > 0); } // ACL settings - if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) + if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) { $private = 1; - else + } else { $private = $arr['private']; + } $arr["allow_cid"] = $allow_cid; $arr["allow_gid"] = $allow_gid; @@ -796,19 +851,22 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // Fill the cache field put_item_in_cache($arr); - if ($notify) - call_hooks('post_local',$arr); - else - call_hooks('post_remote',$arr); + if ($notify) { + call_hooks('post_local', $arr); + } else { + call_hooks('post_remote', $arr); + } - if (x($arr,'cancel')) { + if (x($arr, 'cancel')) { logger('item_store: post cancelled by plugin.'); return 0; } - // Check for already added items. - // There is a timing issue here that sometimes creates double postings. - // An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this. + /* + * Check for already added items. + * There is a timing issue here that sometimes creates double postings. + * An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this. + */ if ($arr["uid"] == 0) { $r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc(trim($arr['uri']))); if (dbm::is_result($r)) { @@ -893,7 +951,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa if ($r[0]["entries"] > 1) { // There are duplicates. We delete our just created entry. - logger('Duplicated post occurred. uri = '.$arr['uri'].' uid = '.$arr['uid']); + logger('Duplicated post occurred. uri = ' . $arr['uri'] . ' uid = ' . $arr['uid']); // Yes, we could do a rollback here - but we are having many users with MyISAM. q("DELETE FROM `item` WHERE `id` = %d", intval($current_post)); @@ -909,8 +967,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa logger('item_store: created item '.$current_post); item_set_last_item($arr); - if (!$parent_id || ($arr['parent-uri'] === $arr['uri'])) + if (!$parent_id || ($arr['parent-uri'] === $arr['uri'])) { $parent_id = $current_post; + } // Set parent id $r = q("UPDATE `item` SET `parent` = %d WHERE `id` = %d", @@ -923,28 +982,31 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // update the commented timestamp on the parent // Only update "commented" if it is really a comment - if (($arr['verb'] == ACTIVITY_POST) OR !get_config("system", "like_no_comment")) + if (($arr['verb'] == ACTIVITY_POST) OR !get_config("system", "like_no_comment")) { q("UPDATE `item` SET `commented` = '%s', `changed` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), dbesc(datetime_convert()), intval($parent_id) ); - else + } else { q("UPDATE `item` SET `changed` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($parent_id) ); + } if ($dsprsig) { - // Friendica servers lower than 3.4.3-2 had double encoded the signature ... - // We can check for this condition when we decode and encode the stuff again. + /* + * Friendica servers lower than 3.4.3-2 had double encoded the signature ... + * We can check for this condition when we decode and encode the stuff again. + */ if (base64_encode(base64_decode(base64_decode($dsprsig->signature))) == base64_decode($dsprsig->signature)) { $dsprsig->signature = base64_decode($dsprsig->signature); logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG); } - q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", + q("INSERT INTO `sign` (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", intval($current_post), dbesc($dsprsig->signed_text), dbesc($dsprsig->signature), @@ -952,10 +1014,12 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa ); } - $deleted = tag_deliver($arr['uid'],$current_post); + $deleted = tag_deliver($arr['uid'], $current_post); - // current post can be deleted if is for a community page and no mention are - // in it. + /* + * current post can be deleted if is for a community page and no mention are + * in it. + */ if (!$deleted AND !$dontcache) { $r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post)); @@ -978,13 +1042,17 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa q("COMMIT"); - // Due to deadlock issues with the "term" table we are doing these steps after the commit. - // This is not perfect - but a workable solution until we found the reason for the problem. + /* + * Due to deadlock issues with the "term" table we are doing these steps after the commit. + * This is not perfect - but a workable solution until we found the reason for the problem. + */ create_tags_from_item($current_post); create_files_from_item($current_post); - // If this is now the last-child, force all _other_ children of this parent to *not* be last-child - // It is done after the transaction to avoid dead locks. + /* + * If this is now the last-child, force all _other_ children of this parent to *not* be last-child + * It is done after the transaction to avoid dead locks. + */ if ($arr['last-child']) { $r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d AND `id` != %d", dbesc($arr['uri']), @@ -1025,7 +1093,7 @@ function item_set_last_item($arr) { if (!$update AND ($arr["network"] == NETWORK_DFRN) AND ($arr["parent-uri"] === $arr["uri"])) { $isforum = q("SELECT `forum` FROM `contact` WHERE `id` = %d AND `forum`", intval($arr['contact-id'])); - if ($isforum) { + if (dbm::is_result($isforum)) { $update = true; } } @@ -1060,8 +1128,9 @@ function item_body_set_hashtags(&$item) { $tags = get_tags($item["body"]); // No hashtags? - if (!count($tags)) - return(false); + if (!count($tags)) { + return false; + } // This sorting is important when there are hashtags that are part of other hashtags // Otherwise there could be problems with hashtags like #test and #test2 @@ -1071,6 +1140,7 @@ function item_body_set_hashtags(&$item) { $URLSearchString = "^\[\]"; + /// @TODO old-lost code? // All hashtags should point to the home server //$item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", // "#[url=".App::get_baseurl()."/search?tag=$2]$2[/url]", $item["body"]); @@ -1080,41 +1150,39 @@ function item_body_set_hashtags(&$item) { // mask hashtags inside of url, bookmarks and attachments to avoid urls in urls $item["body"] = preg_replace_callback("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", - function ($match){ - return("[url=".str_replace("#", "#", $match[1])."]".str_replace("#", "#", $match[2])."[/url]"); - },$item["body"]); + function ($match) { + return ("[url=" . str_replace("#", "#", $match[1]) . "]" . str_replace("#", "#", $match[2]) . "[/url]"); + }, $item["body"]); $item["body"] = preg_replace_callback("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", - function ($match){ - return("[bookmark=".str_replace("#", "#", $match[1])."]".str_replace("#", "#", $match[2])."[/bookmark]"); - },$item["body"]); + function ($match) { + return ("[bookmark=" . str_replace("#", "#", $match[1]) . "]" . str_replace("#", "#", $match[2]) . "[/bookmark]"); + }, $item["body"]); $item["body"] = preg_replace_callback("/\[attachment (.*)\](.*?)\[\/attachment\]/ism", - function ($match){ - return("[attachment ".str_replace("#", "#", $match[1])."]".$match[2]."[/attachment]"); - },$item["body"]); + function ($match) { + return ("[attachment " . str_replace("#", "#", $match[1]) . "]" . $match[2] . "[/attachment]"); + }, $item["body"]); // Repair recursive urls $item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", "#$2", $item["body"]); - - foreach($tags as $tag) { - if (strpos($tag,'#') !== 0) - continue; - - if (strpos($tag,'[url=')) + foreach ($tags as $tag) { + if ((strpos($tag, '#') !== 0) || (strpos($tag, '[url='))) { continue; + } $basetag = str_replace('_',' ',substr($tag,1)); - $newtag = '#[url='.App::get_baseurl().'/search?tag='.rawurlencode($basetag).']'.$basetag.'[/url]'; + $newtag = '#[url=' . App::get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; $item["body"] = str_replace($tag, $newtag, $item["body"]); - if (!stristr($item["tag"],"/search?tag=".$basetag."]".$basetag."[/url]")) { - if (strlen($item["tag"])) + if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) { + if (strlen($item["tag"])) { $item["tag"] = ','.$item["tag"]; + } $item["tag"] = $newtag.$item["tag"]; } } @@ -1125,10 +1193,12 @@ function item_body_set_hashtags(&$item) { function get_item_guid($id) { $r = q("SELECT `guid` FROM `item` WHERE `id` = %d LIMIT 1", intval($id)); - if (dbm::is_result($r)) - return($r[0]["guid"]); - else - return(""); + if (dbm::is_result($r)) { + return $r[0]["guid"]; + } else { + /// @TODO This else-block can be elimited again + return ""; + } } function get_item_id($guid, $uid = 0) { @@ -1136,8 +1206,9 @@ function get_item_id($guid, $uid = 0) { $nick = ""; $id = 0; - if ($uid == 0) + if ($uid == 0) { $uid == local_user(); + } // Does the given user have this item? if ($uid) { @@ -1163,14 +1234,15 @@ function get_item_id($guid, $uid = 0) { $nick = $r[0]["nickname"]; } } - return(array("nick" => $nick, "id" => $id)); + return array("nick" => $nick, "id" => $id); } // return - test -function get_item_contact($item,$contacts) { - if (! count($contacts) || (! is_array($item))) +function get_item_contact($item, $contacts) { + if (! count($contacts) || (! is_array($item))) { return false; - foreach($contacts as $contact) { + } + foreach ($contacts as $contact) { if ($contact['id'] == $item['contact-id']) { return $contact; break; // NOTREACHED @@ -1185,15 +1257,13 @@ function get_item_contact($item,$contacts) { * @param int $item_id * @return bool true if item was deleted, else false */ -function tag_deliver($uid,$item_id) { - - // +function tag_deliver($uid, $item_id) { $a = get_app(); $mention = false; - $u = q("select * from user where uid = %d limit 1", + $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid) ); @@ -1217,24 +1287,25 @@ function tag_deliver($uid,$item_id) { $link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']); - // Diaspora uses their own hardwired link URL in @-tags - // instead of the one we supply with webfinger - + /* + * Diaspora uses their own hardwired link URL in @-tags + * instead of the one we supply with webfinger + */ $dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']); - $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { - if (link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { + foreach ($matches as $mtch) { + if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) { $mention = true; logger('tag_deliver: mention found: ' . $mtch[2]); } } } - if (! $mention){ - if ( ($community_page || $prvgroup) && - (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])){ + if (! $mention) { + if (($community_page || $prvgroup) && + (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])) { // mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment) // delete it! logger("tag_deliver: no-mention top-level post to communuty or private group. delete."); @@ -1251,21 +1322,21 @@ function tag_deliver($uid,$item_id) { call_hooks('tagged', $arr); - if ((! $community_page) && (! $prvgroup)) + if ((! $community_page) && (! $prvgroup)) { return; + } - - // tgroup delivery - setup a second delivery chain - // prevent delivery looping - only proceed - // if the message originated elsewhere and is a top-level post - - if (($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) + /* + * tgroup delivery - setup a second delivery chain + * prevent delivery looping - only proceed + * if the message originated elsewhere and is a top-level post + */ + if (($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) { return; + } // now change this copy of the post to a forum head message and deliver to all the tgroup members - - - $c = q("select name, url, thumb from contact where self = 1 and uid = %d limit 1", + $c = q("SELECT `name`, `url`, `thumb` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", intval($u[0]['uid']) ); if (! dbm::is_result($c)) { @@ -1299,14 +1370,15 @@ function tag_deliver($uid,$item_id) { -function tgroup_check($uid,$item) { +function tgroup_check($uid, $item) { $mention = false; // check that the message originated elsewhere and is a top-level post - if (($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri'])) + if (($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri'])) { return false; + } /// @TODO Encapsulate this or find it encapsulated and replace all occurrances $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", @@ -1319,18 +1391,18 @@ function tgroup_check($uid,$item) { $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); $prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false); - $link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']); - // Diaspora uses their own hardwired link URL in @-tags - // instead of the one we supply with webfinger - + /* + * Diaspora uses their own hardwired link URL in @-tags + * instead of the one we supply with webfinger + */ $dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']); - $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) { foreach ($matches as $mtch) { - if (link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { + if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) { $mention = true; logger('tgroup_check: mention found: ' . $mtch[2]); } @@ -1341,23 +1413,25 @@ function tgroup_check($uid,$item) { return false; } - /// @TODO Combines both return statements into one + /// @TODO Combine both return statements into one return (($community_page) || ($prvgroup)); } -/* - This function returns true if $update has an edited timestamp newer - than $existing, i.e. $update contains new data which should override - what's already there. If there is no timestamp yet, the update is - assumed to be newer. If the update has no timestamp, the existing - item is assumed to be up-to-date. If the timestamps are equal it - assumes the update has been seen before and should be ignored. - */ -function edited_timestamp_is_newer($existing, $update) { - if (!x($existing,'edited') || !$existing['edited']) { +/** + * This function returns true if $update has an edited timestamp newer + * than $existing, i.e. $update contains new data which should override + * what's already there. If there is no timestamp yet, the update is + * assumed to be newer. If the update has no timestamp, the existing + * item is assumed to be up-to-date. If the timestamps are equal it + * assumes the update has been seen before and should be ignored. + * + * @todo fix type-hints (both array) + */ +function edited_timestamp_is_newer ($existing, $update) { + if (!x($existing, 'edited') || !$existing['edited']) { return true; } - if (!x($update,'edited') || !$update['edited']) { + if (!x($update, 'edited') || !$update['edited']) { return false; } @@ -1391,16 +1465,17 @@ function edited_timestamp_is_newer($existing, $update) { * model where comments can have sub-threads. That would require some massive sorting * to get all the feed items into a mostly linear ordering, and might still require * recursion. + * + * @todo find proper type-hints */ - -function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) { +function consume_feed($xml, $importer, &$contact, &$hub, $datedir = 0, $pass = 0) { if ($contact['network'] === NETWORK_OSTATUS) { if ($pass < 2) { // Test - remove before flight //$tempfile = tempnam(get_temppath(), "ostatus2"); //file_put_contents($tempfile, $xml); logger("Consume OStatus messages ", LOGGER_DEBUG); - ostatus::import($xml,$importer,$contact, $hub); + ostatus::import($xml, $importer, $contact, $hub); } return; } @@ -1408,7 +1483,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if ($contact['network'] === NETWORK_FEED) { if ($pass < 2) { logger("Consume feeds", LOGGER_DEBUG); - feed_import($xml,$importer,$contact, $hub); + feed_import($xml, $importer, $contact, $hub); } return; } @@ -1416,7 +1491,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if ($contact['network'] === NETWORK_DFRN) { logger("Consume DFRN messages", LOGGER_DEBUG); - $r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, + $r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, `contact`.`pubkey` AS `cpubkey`, `contact`.`prvkey` AS `cprvkey`, `contact`.`thumb` AS `thumb`, @@ -1428,34 +1503,40 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) WHERE `contact`.`id` = %d AND `user`.`uid` = %d", dbesc($contact["id"]), dbesc($importer["uid"]) ); - if ($r) { + if (dbm::is_result($r)) { logger("Now import the DFRN feed"); - dfrn::import($xml,$r[0], true); + dfrn::import($xml, $r[0], true); return; } } } +/// @TODO type-hint is array function item_is_remote_self($contact, &$datarray) { $a = get_app(); - if (!$contact['remote_self']) + if (!$contact['remote_self']) { return false; + } // Prevent the forwarding of posts that are forwarded - if ($datarray["extid"] == NETWORK_DFRN) + if ($datarray["extid"] == NETWORK_DFRN) { return false; + } // Prevent to forward already forwarded posts - if ($datarray["app"] == $a->get_hostname()) + if ($datarray["app"] == $a->get_hostname()) { return false; + } // Only forward posts - if ($datarray["verb"] != ACTIVITY_POST) + if ($datarray["verb"] != ACTIVITY_POST) { return false; + } - if (($contact['network'] != NETWORK_FEED) AND $datarray['private']) + if (($contact['network'] != NETWORK_FEED) AND $datarray['private']) { return false; + } $datarray2 = $datarray; logger('remote-self start - Contact '.$contact['url'].' - '.$contact['remote_self'].' Item '.print_r($datarray, true), LOGGER_DEBUG); @@ -1477,25 +1558,28 @@ function item_is_remote_self($contact, &$datarray) { if ($contact['network'] != NETWORK_FEED) { $datarray["guid"] = get_guid(32); unset($datarray["plink"]); - $datarray["uri"] = item_new_uri($a->get_hostname(),$contact['uid'], $datarray["guid"]); + $datarray["uri"] = item_new_uri($a->get_hostname(), $contact['uid'], $datarray["guid"]); $datarray["parent-uri"] = $datarray["uri"]; $datarray["extid"] = $contact['network']; $urlpart = parse_url($datarray2['author-link']); $datarray["app"] = $urlpart["host"]; - } else + } else { $datarray['private'] = 0; + } } if ($contact['network'] != NETWORK_FEED) { // Store the original post $r = item_store($datarray2, false, false); logger('remote-self post original item - Contact '.$contact['url'].' return '.$r.' Item '.print_r($datarray2, true), LOGGER_DEBUG); - } else + } else { $datarray["app"] = "Feed"; + } return true; } +/// @TODO find proper type-hints function new_follower($importer, $contact, $datarray, $item, $sharing = false) { $url = notags(trim($datarray['author-link'])); $name = notags(trim($datarray['author-name'])); @@ -1546,6 +1630,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) { update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true); } + /// @TODO Encapsulate this into a function/method $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer['uid']) ); @@ -1634,17 +1719,18 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { ); } - // Diaspora has different message-ids in feeds than they do - // through the direct Diaspora protocol. If we try and use - // the feed, we'll get duplicates. So don't. - - if ((! dbm::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) + /* + * Diaspora has different message-ids in feeds than they do + * through the direct Diaspora protocol. If we try and use + * the feed, we'll get duplicates. So don't. + */ + if ((! dbm::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) { return; + } $push_url = get_config('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id']; // Use a single verify token, even if multiple hubs - $verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string()); $params= 'hub.mode=' . $hubmode . '&hub.callback=' . urlencode($push_url) . '&hub.topic=' . urlencode($contact['poll']) . '&hub.verify=async&hub.verify_token=' . $verify_token; @@ -1658,7 +1744,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { ); } - post_url($url,$params); + post_url($url, $params); logger('subscribe_to_hub: returns: ' . $a->get_curl_code(), LOGGER_DEBUG); @@ -1668,8 +1754,9 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { function fix_private_photos($s, $uid, $item = null, $cid = 0) { - if (get_config('system','disable_embedded')) + if (get_config('system','disable_embedded')) { return $s; + } $a = get_app(); @@ -1682,7 +1769,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_len = ($img_start !== false ? strpos(substr($orig_body, $img_start + $img_st_close + 1), '[/img]') : false); - while( ($img_st_close !== false) && ($img_len !== false) ) { + while ( ($img_st_close !== false) && ($img_len !== false) ) { $img_st_close++; // make it point to AFTER the closing bracket $image = substr($orig_body, $img_start + $img_st_close, $img_len); @@ -1694,27 +1781,28 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { // Only embed locally hosted photos $replace = false; $i = basename($image); - $i = str_replace(array('.jpg','.png','.gif'),array('','',''),$i); - $x = strpos($i,'-'); + $i = str_replace(array('.jpg', '.png', '.gif'),array('', '',''), $i); + $x = strpos($i, '-'); if ($x) { - $res = substr($i,$x+1); - $i = substr($i,0,$x); + $res = substr($i, $x + 1); + $i = substr($i, 0, $x); $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d AND `uid` = %d", dbesc($i), intval($res), intval($uid) + ); - if ($r) { - - // Check to see if we should replace this photo link with an embedded image - // 1. No need to do so if the photo is public - // 2. If there's a contact-id provided, see if they're in the access list - // for the photo. If so, embed it. - // 3. Otherwise, if we have an item, see if the item permissions match the photo - // permissions, regardless of order but first check to see if they're an exact - // match to save some processing overhead. - + if (dbm::is_result($r)) { + /* + * Check to see if we should replace this photo link with an embedded image + * 1. No need to do so if the photo is public + * 2. If there's a contact-id provided, see if they're in the access list + * for the photo. If so, embed it. + * 3. Otherwise, if we have an item, see if the item permissions match the photo + * permissions, regardless of order but first check to see if they're an exact + * match to save some processing overhead. + */ if (has_permissions($r[0])) { if ($cid) { $recips = enumerate_permissions($r[0]); @@ -1722,8 +1810,9 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $replace = true; } } elseif ($item) { - if (compare_permissions($item,$r[0])) + if (compare_permissions($item, $r[0])) { $replace = true; + } } } if ($replace) { @@ -1755,8 +1844,9 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $new_body = $new_body . substr($orig_body, 0, $img_start + $img_st_close) . $image . '[/img]'; $orig_body = substr($orig_body, $img_start + $img_st_close + $img_len + strlen('[/img]')); - if ($orig_body === false) + if ($orig_body === false) { $orig_body = ''; + } $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); @@ -1765,63 +1855,75 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $new_body = $new_body . $orig_body; - return($new_body); + return $new_body; } +/// @TODO type-hint is array function has_permissions($obj) { - if (($obj['allow_cid'] != '') || ($obj['allow_gid'] != '') || ($obj['deny_cid'] != '') || ($obj['deny_gid'] != '')) - return true; - return false; + return ( + ( + x($obj, 'allow_cid') + ) || ( + x($obj, 'allow_gid') + ) || ( + x($obj, 'deny_cid') + ) || ( + x($obj, 'deny_gid') + ) + ); } -function compare_permissions($obj1,$obj2) { +/// @TODO type-hint is array +function compare_permissions($obj1, $obj2) { // first part is easy. Check that these are exactly the same. if (($obj1['allow_cid'] == $obj2['allow_cid']) && ($obj1['allow_gid'] == $obj2['allow_gid']) && ($obj1['deny_cid'] == $obj2['deny_cid']) - && ($obj1['deny_gid'] == $obj2['deny_gid'])) + && ($obj1['deny_gid'] == $obj2['deny_gid'])) { return true; + } // This is harder. Parse all the permissions and compare the resulting set. - $recipients1 = enumerate_permissions($obj1); $recipients2 = enumerate_permissions($obj2); sort($recipients1); sort($recipients2); - if ($recipients1 == $recipients2) - return true; - return false; + + /// @TODO Comparison of arrays, maybe use array_diff_assoc() here? + return ($recipients1 == $recipients2); } // returns an array of contact-ids that are allowed to see this object - +/// @TODO type-hint is array function enumerate_permissions($obj) { $allow_people = expand_acl($obj['allow_cid']); $allow_groups = expand_groups(expand_acl($obj['allow_gid'])); $deny_people = expand_acl($obj['deny_cid']); $deny_groups = expand_groups(expand_acl($obj['deny_gid'])); - $recipients = array_unique(array_merge($allow_people,$allow_groups)); - $deny = array_unique(array_merge($deny_people,$deny_groups)); - $recipients = array_diff($recipients,$deny); + $recipients = array_unique(array_merge($allow_people, $allow_groups)); + $deny = array_unique(array_merge($deny_people, $deny_groups)); + $recipients = array_diff($recipients, $deny); return $recipients; } function item_getfeedtags($item) { $ret = array(); $matches = false; - $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); + $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches); if ($cnt) { - for($x = 0; $x < $cnt; $x ++) { - if ($matches[1][$x]) - $ret[$matches[2][$x]] = array('#',$matches[1][$x], $matches[2][$x]); + for ($x = 0; $x < $cnt; $x ++) { + if ($matches[1][$x]) { + $ret[$matches[2][$x]] = array('#', $matches[1][$x], $matches[2][$x]); + } } } $matches = false; - $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); + $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches); if ($cnt) { - for($x = 0; $x < $cnt; $x ++) { - if ($matches[1][$x]) - $ret[] = array('@',$matches[1][$x], $matches[2][$x]); + for ($x = 0; $x < $cnt; $x ++) { + if ($matches[1][$x]) { + $ret[] = array('@', $matches[1][$x], $matches[2][$x]); + } } } return $ret; @@ -1829,23 +1931,29 @@ function item_getfeedtags($item) { function item_expire($uid, $days, $network = "", $force = false) { - if ((! $uid) || ($days < 1)) + if ((! $uid) || ($days < 1)) { return; + } - // $expire_network_only = save your own wall posts - // and just expire conversations started by others - - $expire_network_only = get_pconfig($uid,'expire','network_only'); + /* + * $expire_network_only = save your own wall posts + * and just expire conversations started by others + */ + $expire_network_only = get_pconfig($uid,'expire', 'network_only'); $sql_extra = ((intval($expire_network_only)) ? " AND wall = 0 " : ""); if ($network != "") { $sql_extra .= sprintf(" AND network = '%s' ", dbesc($network)); - // There is an index "uid_network_received" but not "uid_network_created" - // This avoids the creation of another index just for one purpose. - // And it doesn't really matter wether to look at "received" or "created" + + /* + * There is an index "uid_network_received" but not "uid_network_created" + * This avoids the creation of another index just for one purpose. + * And it doesn't really matter wether to look at "received" or "created" + */ $range = "AND `received` < UTC_TIMESTAMP() - INTERVAL %d DAY "; - } else + } else { $range = "AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY "; + } $r = q("SELECT `file`, `resource-id`, `starred`, `type`, `id` FROM `item` WHERE `uid` = %d $range @@ -1856,61 +1964,66 @@ function item_expire($uid, $days, $network = "", $force = false) { intval($days) ); - if (! dbm::is_result($r)) + if (! dbm::is_result($r)) { return; + } - $expire_items = get_pconfig($uid, 'expire','items'); - $expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1 + $expire_items = get_pconfig($uid, 'expire', 'items'); + $expire_items = (($expire_items === false) ? 1 : intval($expire_items)); // default if not set: 1 // Forcing expiring of items - but not notes and marked items - if ($force) + if ($force) { $expire_items = true; + } - $expire_notes = get_pconfig($uid, 'expire','notes'); - $expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1 + $expire_notes = get_pconfig($uid, 'expire', 'notes'); + $expire_notes = (($expire_notes === false) ? 1 : intval($expire_notes)); // default if not set: 1 - $expire_starred = get_pconfig($uid, 'expire','starred'); - $expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1 + $expire_starred = get_pconfig($uid, 'expire', 'starred'); + $expire_starred = (($expire_starred === false) ? 1 : intval($expire_starred)); // default if not set: 1 - $expire_photos = get_pconfig($uid, 'expire','photos'); - $expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0 + $expire_photos = get_pconfig($uid, 'expire', 'photos'); + $expire_photos = (($expire_photos === false) ? 0 : intval($expire_photos)); // default if not set: 0 logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); - foreach($r as $item) { + foreach ($r as $item) { // don't expire filed items - if (strpos($item['file'],'[') !== false) + if (strpos($item['file'],'[') !== false) { continue; + } // Only expire posts, not photos and photo comments - if ($expire_photos==0 && strlen($item['resource-id'])) + if ($expire_photos == 0 && strlen($item['resource-id'])) { continue; - if ($expire_starred==0 && intval($item['starred'])) + } elseif ($expire_starred == 0 && intval($item['starred'])) { continue; - if ($expire_notes==0 && $item['type']=='note') + } elseif ($expire_notes == 0 && $item['type'] == 'note') { continue; - if ($expire_items==0 && $item['type']!='note') + } elseif ($expire_items == 0 && $item['type'] != 'note') { continue; + } - drop_item($item['id'],false); + drop_item($item['id'], false); } - proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid); + proc_run(PRIORITY_HIGH, "include/notifier.php", "expire", $uid); } - +/// @TODO type-hint is array function drop_items($items) { $uid = 0; - if (! local_user() && ! remote_user()) + if (! local_user() && ! remote_user()) { return; + } if (count($items)) { - foreach($items as $item) { + foreach ($items as $item) { $owner = drop_item($item,false); if ($owner && ! $uid) $uid = $owner; @@ -1919,12 +2032,13 @@ function drop_items($items) { // multiple threads may have been deleted, send an expire notification - if ($uid) - proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid); + if ($uid) { + proc_run(PRIORITY_HIGH, "include/notifier.php", "expire", $uid); + } } -function drop_item($id,$interactive = true) { +function drop_item($id, $interactive = true) { $a = get_app(); @@ -1935,8 +2049,9 @@ function drop_item($id,$interactive = true) { ); if (! dbm::is_result($r)) { - if (! $interactive) + if (! $interactive) { return 0; + } notice( t('Item not found.') . EOL); goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); } @@ -1950,7 +2065,7 @@ function drop_item($id,$interactive = true) { // check if logged in user is either the author or owner of this item if (is_array($_SESSION['remote'])) { - foreach($_SESSION['remote'] as $visitor) { + foreach ($_SESSION['remote'] as $visitor) { if ($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) { $contact_id = $visitor['cid']; break; @@ -1967,7 +2082,7 @@ function drop_item($id,$interactive = true) { // so add any arguments as hidden inputs $query = explode_querystring($a->query_string); $inputs = array(); - foreach($query['args'] as $arg) { + foreach ($query['args'] as $arg) { if (strpos($arg, 'confirm=') === false) { $arg_parts = explode('=', $arg); $inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]); @@ -2004,27 +2119,28 @@ function drop_item($id,$interactive = true) { // clean up categories and tags so they don't end up as orphans $matches = false; - $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { - file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],true); + foreach ($matches as $mtch) { + file_tag_unsave_file($item['uid'], $item['id'], $mtch[1],true); } } $matches = false; - $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { - file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],false); + foreach ($matches as $mtch) { + file_tag_unsave_file($item['uid'], $item['id'], $mtch[1],false); } } - // If item is a link to a photo resource, nuke all the associated photos - // (visitors will not have photo resources) - // This only applies to photos uploaded from the photos page. Photos inserted into a post do not - // generate a resource-id and therefore aren't intimately linked to the item. - + /* + * If item is a link to a photo resource, nuke all the associated photos + * (visitors will not have photo resources) + * This only applies to photos uploaded from the photos page. Photos inserted into a post do not + * generate a resource-id and therefore aren't intimately linked to the item. + */ if (strlen($item['resource-id'])) { q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ", dbesc($item['resource-id']), @@ -2034,7 +2150,6 @@ function drop_item($id,$interactive = true) { } // If item is a link to an event, nuke the event record. - if (intval($item['event-id'])) { q("DELETE FROM `event` WHERE `id` = %d AND `uid` = %d", intval($item['event-id']), @@ -2044,8 +2159,7 @@ function drop_item($id,$interactive = true) { } // If item has attachments, drop them - - foreach(explode(",",$item['attach']) as $attach){ + foreach (explode(", ", $item['attach']) as $attach) { preg_match("|attach/(\d+)|", $attach, $matches); q("DELETE FROM `attach` WHERE `id` = %d AND `uid` = %d", intval($matches[1]), @@ -2058,7 +2172,7 @@ function drop_item($id,$interactive = true) { // clean up item_id and sign meta-data tables /* - // Old code - caused very long queries and warning entries in the mysql logfiles: + /// @TODO Old code - caused very long queries and warning entries in the mysql logfiles: $r = q("DELETE FROM item_id where iid in (select id from item where parent = %d and uid = %d)", intval($item['id']), @@ -2074,29 +2188,28 @@ function drop_item($id,$interactive = true) { // The new code splits the queries since the mysql optimizer really has bad problems with subqueries // Creating list of parents - $r = q("select id from item where parent = %d and uid = %d", + $r = q("SELECT `id` FROM `item` WHERE `parent` = %d AND `uid` = %d", intval($item['id']), intval($item['uid']) ); $parentid = ""; - foreach ($r AS $row) { - if ($parentid != "") + foreach ($r as $row) { + if ($parentid != "") { $parentid .= ", "; + } $parentid .= $row["id"]; } // Now delete them if ($parentid != "") { - $r = q("DELETE FROM item_id where iid in (%s)", dbesc($parentid)); - - $r = q("DELETE FROM sign where iid in (%s)", dbesc($parentid)); + $r = q("DELETE FROM `item_id` WHERE `iid` IN (%s)", dbesc($parentid)); + $r = q("DELETE FROM `sign` WHERE `iid` IN (%s)", dbesc($parentid)); } // If it's the parent of a comment thread, kill all the kids - if ($item['uri'] == $item['parent-uri']) { $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = '' WHERE `parent-uri` = '%s' AND `uid` = %d ", @@ -2132,15 +2245,17 @@ function drop_item($id,$interactive = true) { // send the notification upstream/downstream as the case may be - proc_run(PRIORITY_HIGH,"include/notifier.php", "drop", $drop_id); + proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id); - if (! $interactive) + if (! $interactive) { return $owner; + } goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); //NOTREACHED } else { - if (! $interactive) + if (! $interactive) { return 0; + } notice( t('Permission denied.') . EOL); goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); //NOTREACHED @@ -2149,101 +2264,113 @@ function drop_item($id,$interactive = true) { } -function first_post_date($uid,$wall = false) { - $r = q("select id, created from item - where uid = %d and wall = %d and deleted = 0 and visible = 1 AND moderated = 0 - and id = parent - order by created asc limit 1", +function first_post_date($uid, $wall = false) { + $r = q("SELECT `id`, `created` FROM `item` + WHERE `uid` = %d AND `wall` = %d AND `deleted` = 0 AND `visible` = 1 AND `moderated` = 0 + AND `id` = `parent` + ORDER BY `created` ASC LIMIT 1", intval($uid), intval($wall ? 1 : 0) ); if (dbm::is_result($r)) { -// logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA); - return substr(datetime_convert('',date_default_timezone_get(),$r[0]['created']),0,10); + // logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA); + return substr(datetime_convert('',date_default_timezone_get(), $r[0]['created']),0,10); } return false; } /* modified posted_dates() {below} to arrange the list in years */ function list_post_dates($uid, $wall) { - $dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d'); + $dnow = datetime_convert('',date_default_timezone_get(), 'now','Y-m-d'); $dthen = first_post_date($uid, $wall); - if (! $dthen) + if (! $dthen) { return array(); + } // Set the start and end date to the beginning of the month - $dnow = substr($dnow,0,8).'01'; - $dthen = substr($dthen,0,8).'01'; + $dnow = substr($dnow, 0, 8) . '01'; + $dthen = substr($dthen, 0, 8) . '01'; $ret = array(); - // Starting with the current month, get the first and last days of every - // month down to and including the month of the first post - while(substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { - $dyear = intval(substr($dnow,0,4)); - $dstart = substr($dnow,0,8) . '01'; - $dend = substr($dnow,0,8) . get_dim(intval($dnow),intval(substr($dnow,5))); - $start_month = datetime_convert('','',$dstart,'Y-m-d'); - $end_month = datetime_convert('','',$dend,'Y-m-d'); - $str = day_translate(datetime_convert('','',$dnow,'F')); - if (! $ret[$dyear]) + /* + * Starting with the current month, get the first and last days of every + * month down to and including the month of the first post + */ + while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { + $dyear = intval(substr($dnow, 0, 4)); + $dstart = substr($dnow, 0, 8) . '01'; + $dend = substr($dnow, 0, 8) . get_dim(intval($dnow), intval(substr($dnow, 5))); + $start_month = datetime_convert('', '', $dstart, 'Y-m-d'); + $end_month = datetime_convert('', '', $dend, 'Y-m-d'); + $str = day_translate(datetime_convert('', '', $dnow, 'F')); + if (!$ret[$dyear]) { $ret[$dyear] = array(); - $ret[$dyear][] = array($str,$end_month,$start_month); - $dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d'); + } + $ret[$dyear][] = array($str, $end_month, $start_month); + $dnow = datetime_convert('', '', $dnow . ' -1 month', 'Y-m-d'); } return $ret; } -function posted_dates($uid,$wall) { - $dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d'); +function posted_dates($uid, $wall) { + $dnow = datetime_convert('', date_default_timezone_get(), 'now', 'Y-m-d'); - $dthen = first_post_date($uid,$wall); - if (! $dthen) + $dthen = first_post_date($uid, $wall); + if (! $dthen) { return array(); + } // Set the start and end date to the beginning of the month - $dnow = substr($dnow,0,8).'01'; - $dthen = substr($dthen,0,8).'01'; + $dnow = substr($dnow, 0, 8) . '01'; + $dthen = substr($dthen, 0, 8) . '01'; $ret = array(); - // Starting with the current month, get the first and last days of every - // month down to and including the month of the first post - while(substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { - $dstart = substr($dnow,0,8) . '01'; - $dend = substr($dnow,0,8) . get_dim(intval($dnow),intval(substr($dnow,5))); - $start_month = datetime_convert('','',$dstart,'Y-m-d'); - $end_month = datetime_convert('','',$dend,'Y-m-d'); - $str = day_translate(datetime_convert('','',$dnow,'F Y')); - $ret[] = array($str,$end_month,$start_month); - $dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d'); + /* + * Starting with the current month, get the first and last days of every + * month down to and including the month of the first post + */ + while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { + $dstart = substr($dnow, 0, 8) . '01'; + $dend = substr($dnow, 0, 8) . get_dim(intval($dnow), intval(substr($dnow, 5))); + $start_month = datetime_convert('', '', $dstart, 'Y-m-d'); + $end_month = datetime_convert('', '', $dend, 'Y-m-d'); + $str = day_translate(datetime_convert('', '', $dnow, 'F Y')); + $ret[] = array($str, $end_month, $start_month); + $dnow = datetime_convert('', '', $dnow . ' -1 month', 'Y-m-d'); } return $ret; } -function posted_date_widget($url,$uid,$wall) { +function posted_date_widget($url, $uid, $wall) { $o = ''; - if (! feature_enabled($uid,'archives')) + if (! feature_enabled($uid, 'archives')) { return $o; + } // For former Facebook folks that left because of "timeline" - -/* if ($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget'))) - return $o;*/ + /* + * @TODO old-lost code? + if ($wall && intval(get_pconfig($uid, 'system', 'no_wall_archive_widget'))) + return $o; + */ $visible_years = get_pconfig($uid,'system','archive_visible_years'); - if (! $visible_years) + if (! $visible_years) { $visible_years = 5; + } - $ret = list_post_dates($uid,$wall); + $ret = list_post_dates($uid, $wall); - if (! dbm::is_result($ret)) + if (! dbm::is_result($ret)) { return $o; + } - $cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years; - $cutoff = ((array_key_exists($cutoff_year,$ret))? true : false); + $cutoff_year = intval(datetime_convert('',date_default_timezone_get(), 'now', 'Y')) - $visible_years; + $cutoff = ((array_key_exists($cutoff_year, $ret))? true : false); $o = replace_macros(get_markup_template('posted_date_widget.tpl'),array( '$title' => t('Archives'), diff --git a/include/notifier.php b/include/notifier.php index e3d7d10d6..370611b4e 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -516,7 +516,8 @@ function notifier_run(&$argv, &$argc){ $r0 = Diaspora::relay_list(); } - $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s' + $r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network` + FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()", dbesc(NETWORK_DIASPORA), intval($owner['uid']), diff --git a/include/ostatus.php b/include/ostatus.php index 9b7849509..c1d730eb1 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -355,6 +355,14 @@ class ostatus { $item["body"] = add_page_info_to_body(html2bbcode($xpath->query('atom:content/text()', $entry)->item(0)->nodeValue)); $item["object-type"] = $xpath->query('activity:object-type/text()', $entry)->item(0)->nodeValue; + $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue; + + // Mastodon Content Warning + if (($item["verb"] == ACTIVITY_POST) AND $xpath->evaluate('boolean(atom:summary)', $entry)) { + $clear_text = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue; + + $item["body"] = html2bbcode($clear_text) . '[spoiler]' . $item["body"] . '[/spoiler]'; + } if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) OR ($item["object-type"] == ACTIVITY_OBJ_EVENT)) { $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue; @@ -363,11 +371,10 @@ class ostatus { $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue; } $item["object"] = $xml; - $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue; /// @TODO /// Delete a message - if ($item["verb"] == "qvitter-delete-notice") { + if ($item["verb"] == "qvitter-delete-notice" || $item["verb"] == ACTIVITY_DELETE) { // ignore "Delete" messages (by now) logger("Ignore delete message ".print_r($item, true)); continue; @@ -713,11 +720,11 @@ class ostatus { $conversations = q("SELECT `term`.`oid`, `term`.`url`, `term`.`uid` FROM `term` STRAIGHT_JOIN `thread` ON `thread`.`iid` = `term`.`oid` AND `thread`.`uid` = `term`.`uid` WHERE `term`.`type` = 7 AND `term`.`term` > '%s' AND `thread`.`mention` - GROUP BY `term`.`url`, `term`.`uid` ORDER BY `term`.`term` DESC", dbesc($start)); + GROUP BY `term`.`url`, `term`.`uid`, `term`.`oid`, `term`.`term` ORDER BY `term`.`term` DESC", dbesc($start)); } else { $conversations = q("SELECT `oid`, `url`, `uid` FROM `term` WHERE `type` = 7 AND `term` > '%s' - GROUP BY `url`, `uid` ORDER BY `term` DESC", dbesc($start)); + GROUP BY `url`, `uid`, `oid`, `term` ORDER BY `term` DESC", dbesc($start)); } foreach ($conversations AS $conversation) { @@ -1472,15 +1479,7 @@ class ostatus { $o = ""; $siteinfo = get_attached_data($item["body"]); - switch($siteinfo["type"]) { - case 'link': - $attributes = array("rel" => "enclosure", - "href" => $siteinfo["url"], - "type" => "text/html; charset=UTF-8", - "length" => "", - "title" => $siteinfo["title"]); - xml::add_element($doc, $root, "link", "", $attributes); - break; + switch ($siteinfo["type"]) { case 'photo': $imgdata = get_photo_info($siteinfo["image"]); $attributes = array("rel" => "enclosure", @@ -1502,29 +1501,31 @@ class ostatus { } if (($siteinfo["type"] != "photo") AND isset($siteinfo["image"])) { - $photodata = get_photo_info($siteinfo["image"]); + $imgdata = get_photo_info($siteinfo["image"]); + $attributes = array("rel" => "enclosure", + "href" => $siteinfo["image"], + "type" => $imgdata["mime"], + "length" => intval($imgdata["size"])); - $attributes = array("rel" => "preview", "href" => $siteinfo["image"], "media:width" => $photodata[0], "media:height" => $photodata[1]); xml::add_element($doc, $root, "link", "", $attributes); } - - $arr = explode('[/attach],',$item['attach']); - if(count($arr)) { - foreach($arr as $r) { + $arr = explode('[/attach],', $item['attach']); + if (count($arr)) { + foreach ($arr as $r) { $matches = false; - $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches); - if($cnt) { + $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches); + if ($cnt) { $attributes = array("rel" => "enclosure", "href" => $matches[1], "type" => $matches[3]); - if(intval($matches[2])) + if (intval($matches[2])) { $attributes["length"] = intval($matches[2]); - - if(trim($matches[4]) != "") + } + if (trim($matches[4]) != "") { $attributes["title"] = trim($matches[4]); - + } xml::add_element($doc, $root, "link", "", $attributes); } } @@ -2052,7 +2053,7 @@ class ostatus { $mentioned = array(); - if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) { + if (($item['parent'] != $item['id']) OR ($item['parent-uri'] !== $item['uri']) OR (($item['thr-parent'] !== '') AND ($item['thr-parent'] !== $item['uri']))) { $parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"])); $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); @@ -2082,7 +2083,13 @@ class ostatus { if (intval($item["parent"]) > 0) { $conversation = App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]; xml::add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation", "href" => $conversation)); - xml::add_element($doc, $entry, "ostatus:conversation", $conversation); + + $attributes = array( + "href" => $conversation, + "local_id" => $item["parent"], + "ref" => $conversation); + + xml::add_element($doc, $entry, "ostatus:conversation", $conversation, $attributes); } $tags = item_getfeedtags($item); diff --git a/include/pgettext.php b/include/pgettext.php index 335869eda..b42dcec11 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -44,7 +44,7 @@ function get_browser_language() { // check if we have translations for the preferred languages and pick the 1st that has for ($i=0; $i 0) { for ($x = 0; $x < count($ret); $x ++) { - if (substr($ret[$x],0,5) === 'data:') { - if (strstr($ret[$x],',')) { - $ret[$x] = substr($ret[$x],strpos($ret[$x],',')+1); + if (substr($ret[$x], 0, 5) === 'data:') { + if (strstr($ret[$x], ',')) { + $ret[$x] = substr($ret[$x], strpos($ret[$x], ',') + 1); } else { - $ret[$x] = substr($ret[$x],5); + $ret[$x] = substr($ret[$x], 5); } } elseif (normalise_link($ret[$x]) == 'http://') { $ret[$x] = fetch_url($ret[$x]); @@ -39,7 +38,7 @@ function get_salmon_key($uri,$keyhash) { } - logger('Key located: ' . print_r($ret,true)); + logger('Key located: ' . print_r($ret, true)); if (count($ret) == 1) { @@ -50,10 +49,9 @@ function get_salmon_key($uri,$keyhash) { // have one key we'll be right. return $ret[0]; - } - else { + } else { foreach ($ret as $a) { - $hash = base64url_encode(hash('sha256',$a)); + $hash = base64url_encode(hash('sha256', $a)); if ($hash == $keyhash) { return $a; } @@ -65,17 +63,17 @@ function get_salmon_key($uri,$keyhash) { -function slapper($owner,$url,$slap) { +function slapper($owner, $url, $slap) { // does contact have a salmon endpoint? - if(! strlen($url)) + if (! strlen($url)) { return; + } - - if(! $owner['sprvkey']) { + if (! $owner['sprvkey']) { logger(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.", - $owner['username'],$owner['uid'])); + $owner['username'], $owner['uid'])); return; } @@ -87,30 +85,33 @@ function slapper($owner,$url,$slap) { $data_type = 'application/atom+xml'; $encoding = 'base64url'; $algorithm = 'RSA-SHA256'; - $keyhash = base64url_encode(hash('sha256',salmon_key($owner['spubkey'])),true); + $keyhash = base64url_encode(hash('sha256', salmon_key($owner['spubkey'])), true); - // precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods + $precomputed = '.' . base64url_encode($data_type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($algorithm); - $precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng=='; + // GNU Social format + $signature = base64url_encode(rsa_sign($data . $precomputed, $owner['sprvkey'])); - $signature = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),$owner['sprvkey'])); + // Compliant format + $signature2 = base64url_encode(rsa_sign(str_replace('=', '', $data . $precomputed), $owner['sprvkey'])); - $signature2 = base64url_encode(rsa_sign($data . $precomputed,$owner['sprvkey'])); + // Old Status.net format + $signature3 = base64url_encode(rsa_sign($data, $owner['sprvkey'])); - $signature3 = base64url_encode(rsa_sign($data,$owner['sprvkey'])); + // At first try the non compliant method that works for GNU Social + $xmldata = array("me:env" => array("me:data" => $data, + "@attributes" => array("type" => $data_type), + "me:encoding" => $encoding, + "me:alg" => $algorithm, + "me:sig" => $signature, + "@attributes2" => array("key_id" => $keyhash))); - $salmon_tpl = get_markup_template('magicsig.tpl'); + $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env"); - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature - )); + $salmon = xml::from_array($xmldata, $xml, false, $namespaces); // slap them - post_url($url,$salmon, array( + post_url($url, $salmon, array( 'Content-type: application/magic-envelope+xml', 'Content-length: ' . strlen($salmon) )); @@ -120,60 +121,59 @@ function slapper($owner,$url,$slap) { // check for success, e.g. 2xx - if($return_code > 299) { + if ($return_code > 299) { - logger('compliant salmon failed. Falling back to status.net hack2'); + logger('GNU Social salmon failed. Falling back to compliant mode'); - // Entirely likely that their salmon implementation is - // non-compliant. Let's try once more, this time only signing - // the data, without stripping '=' chars + // Now try the compliant mode that normally isn't used for GNU Social + $xmldata = array("me:env" => array("me:data" => $data, + "@attributes" => array("type" => $data_type), + "me:encoding" => $encoding, + "me:alg" => $algorithm, + "me:sig" => $signature2, + "@attributes2" => array("key_id" => $keyhash))); - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature2 - )); + $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env"); + + $salmon = xml::from_array($xmldata, $xml, false, $namespaces); // slap them - post_url($url,$salmon, array( + post_url($url, $salmon, array( 'Content-type: application/magic-envelope+xml', 'Content-length: ' . strlen($salmon) )); $return_code = $a->get_curl_code(); - - - if($return_code > 299) { - - logger('compliant salmon failed. Falling back to status.net hack3'); - - // Entirely likely that their salmon implementation is - // non-compliant. Let's try once more, this time only signing - // the data, without the precomputed blob - - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature3 - )); - - // slap them - post_url($url,$salmon, array( - 'Content-type: application/magic-envelope+xml', - 'Content-length: ' . strlen($salmon) - )); - $return_code = $a->get_curl_code(); - } } - logger('slapper for '.$url.' returned ' . $return_code); - if(! $return_code) - return(-1); - if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after'))) - return(-1); + if ($return_code > 299) { + logger('compliant salmon failed. Falling back to old status.net'); + + // Last try. This will most likely fail as well. + $xmldata = array("me:env" => array("me:data" => $data, + "@attributes" => array("type" => $data_type), + "me:encoding" => $encoding, + "me:alg" => $algorithm, + "me:sig" => $signature3, + "@attributes2" => array("key_id" => $keyhash))); + + $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env"); + + $salmon = xml::from_array($xmldata, $xml, false, $namespaces); + + // slap them + post_url($url, $salmon, array( + 'Content-type: application/magic-envelope+xml', + 'Content-length: ' . strlen($salmon) + )); + $return_code = $a->get_curl_code(); + } + + logger('slapper for '.$url.' returned ' . $return_code); + if (! $return_code) { + return(-1); + } + if (($return_code == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) { + return(-1); + } return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1); } - diff --git a/include/socgraph.php b/include/socgraph.php index 642d03d89..a39eca5e8 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -7,6 +7,8 @@ * @todo Detect if it is a forum */ +use \Friendica\Core\Config; + require_once('include/datetime.php'); require_once("include/Scrape.php"); require_once("include/network.php"); @@ -1656,6 +1658,20 @@ function poco_discover_federation() { } } + // Disvover Mastodon servers + if (!Config::get('system','ostatus_disabled')) { + $serverdata = fetch_url("https://instances.mastodon.xyz/instances.json"); + + if ($serverdata) { + $servers = json_decode($serverdata); + + foreach ($servers AS $server) { + $url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name; + proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($url)); + } + } + } + // Currently disabled, since the service isn't available anymore. // It is not removed since I hope that there will be a successor. // Discover GNU Social Servers. @@ -2096,7 +2112,7 @@ function update_gcontact($contact) { fix_alternate_contact_address($contact); if (!isset($contact["updated"])) - $contact["updated"] = datetime_convert(); + $contact["updated"] = dbm::date(); if ($contact["server_url"] == "") { $server_url = $contact["url"]; @@ -2151,7 +2167,7 @@ function update_gcontact($contact) { dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]), intval($contact["nsfw"]), intval($contact["contact-type"]), dbesc($contact["alias"]), dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]), - dbesc($contact["about"]), intval($contact["generation"]), dbesc($contact["updated"]), + dbesc($contact["about"]), intval($contact["generation"]), dbesc(dbm::date($contact["updated"])), dbesc($contact["server_url"]), dbesc($contact["connect"]), dbesc(normalise_link($contact["url"])), intval($contact["generation"])); diff --git a/js/acl.js b/js/acl.js index 4924ac128..054f50960 100644 --- a/js/acl.js +++ b/js/acl.js @@ -65,7 +65,7 @@ ACL.prototype.add_mention = function(id) { if (this.element.val().indexOf( searchText) >= 0 ) { return; } - this.element.val(searchText + this.element.val()); + this.element.val(searchText + this.element.val()).trigger('change'); } ACL.prototype.on_submit = function(){ diff --git a/js/autocomplete.js b/js/autocomplete.js index 8702abbcf..3ed9fa30f 100644 --- a/js/autocomplete.js +++ b/js/autocomplete.js @@ -166,7 +166,7 @@ function listNewLineAutocomplete(id) { if (word != null) { var textBefore = text.value.substring(0, caretPos); var textAfter = text.value.substring(caretPos, text.length); - $('#' + id).val(textBefore + '\r\n[*] ' + textAfter); + $('#' + id).val(textBefore + '\r\n[*] ' + textAfter).trigger('change'); setCaretPosition(text, caretPos + 5); return true; } diff --git a/js/main.js b/js/main.js index aaeef00cf..5df33ed59 100644 --- a/js/main.js +++ b/js/main.js @@ -101,6 +101,7 @@ var start = textarea.selectionStart; var end = textarea.selectionEnd; textarea.value = textarea.value.substring(0, start) + bbcode + textarea.value.substring(end, textarea.value.length); + $(textarea).trigger('change'); }); @@ -223,8 +224,11 @@ var nnm = $("#nav-notifications-menu"); nnm.html(notifications_all + notifications_mark); - var notification_lastitem = parseInt(localStorage.getItem("notification-lastitem")); + var lastItemStorageKey = "notification-lastitem:" + localUser; + var notification_lastitem = parseInt(localStorage.getItem(lastItemStorageKey)); var notification_id = 0; + + // Insert notifs into the notifications-menu $(data.notifications).each(function(key, notif){ var text = notif.message.format('' + notif.name + ''); var contact = ('' + notif.name + ''); @@ -232,19 +236,21 @@ var html = notifications_tpl.format( notif.href, // {0} // link to the source notif.photo, // {1} // photo of the contact - text, // {2} // preformatted text (autor + text) + text, // {2} // preformatted text (autor + text) notif.date, // {3} // date of notification (time ago) - seenclass, // {4} // visited status of the notification + seenclass, // {4} // visited status of the notification new Date(notif.timestamp*1000), // {5} // date of notification notif.url, // {6} // profile url of the contact notif.message.format(contact), // {7} // preformatted html (text including author profile url) - '' // {8} // Deprecated + '' // {8} // Deprecated ); nnm.append(html); }); + + // Desktop Notifications $(data.notifications.reverse()).each(function(key, e){ notification_id = parseInt(e.timestamp); - if (notification_lastitem !== null && notification_id > notification_lastitem) { + if (notification_lastitem !== null && notification_id > notification_lastitem && Number(e.seen) === 0) { if (getNotificationPermission() === "granted") { var notification = new Notification(document.title, { body: decodeHtml(e.message.replace('→ ', '').format(e.name)), @@ -259,7 +265,7 @@ }); notification_lastitem = notification_id; - localStorage.setItem("notification-lastitem", notification_lastitem) + localStorage.setItem(lastItemStorageKey, notification_lastitem) $("img[data-src]", nnm).each(function(i, el){ // Add src attribute for images with a data-src attribute @@ -285,7 +291,7 @@ $.jGrowl(message, {sticky: false, theme: 'info', life: 5000}); }); - /* update the js scrollbars */ + // Update the js scrollbars $('#nav-notifications-menu').perfectScrollbar('update'); }); @@ -317,6 +323,30 @@ } }); + // Scroll to the next/previous thread when pressing J and K + $(document).keydown(function (event) { + var threads = $('.thread_level_1'); + if ((event.keyCode === 74 || event.keyCode === 75) && !$(event.target).is('textarea, input')) { + var scrollTop = $(window).scrollTop(); + if (event.keyCode === 75) { + threads = $(threads.get().reverse()); + } + threads.each(function(key, item) { + var comparison; + var top = $(item).offset().top - 100; + if (event.keyCode === 74) { + comparison = top > scrollTop + 1; + } else if (event.keyCode === 75) { + comparison = top < scrollTop - 1; + } + if (comparison) { + $('html, body').animate({ scrollTop: top }, 200); + return false; + } + }); + } + }); + // Set an event listener for infinite scroll if(typeof infinite_scroll !== 'undefined') { $(window).scroll(function(e){ diff --git a/library/html-to-markdown/.gitignore b/library/html-to-markdown/.gitignore deleted file mode 100644 index aa429a9a1..000000000 --- a/library/html-to-markdown/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -~* -vendor -composer.lock \ No newline at end of file diff --git a/library/html-to-markdown/.travis.yml b/library/html-to-markdown/.travis.yml deleted file mode 100644 index 48b3e64a4..000000000 --- a/library/html-to-markdown/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -language: php -php: - - "5.5" - - "5.4" - - "5.3" -script: phpunit --no-configuration HTML_To_MarkdownTest ./tests/HTML_To_MarkdownTest.php \ No newline at end of file diff --git a/library/html-to-markdown/HTML_To_Markdown.php b/library/html-to-markdown/HTML_To_Markdown.php deleted file mode 100644 index 109780edd..000000000 --- a/library/html-to-markdown/HTML_To_Markdown.php +++ /dev/null @@ -1,598 +0,0 @@ - - * @link https://github.com/nickcernis/html2markdown/ Latest version on GitHub. - * @link http://twitter.com/nickcernis Nick on twitter. - * @license http://www.opensource.org/licenses/mit-license.php MIT - */ -class HTML_To_Markdown -{ - /** - * @var DOMDocument The root of the document tree that holds our HTML. - */ - private $document; - - /** - * @var string|boolean The Markdown version of the original HTML, or false if conversion failed - */ - private $output; - - /** - * @var array Class-wide options users can override. - */ - private $options = array( - 'header_style' => 'setext', // Set to "atx" to output H1 and H2 headers as # Header1 and ## Header2 - 'suppress_errors' => true, // Set to false to show warnings when loading malformed HTML - 'strip_tags' => false, // Set to true to strip tags that don't have markdown equivalents. N.B. Strips tags, not their content. Useful to clean MS Word HTML output. - 'bold_style' => '**', // Set to '__' if you prefer the underlined style - 'italic_style' => '*', // Set to '_' if you prefer the underlined style - 'remove_nodes' => '', // space-separated list of dom nodes that should be removed. example: "meta style script" - ); - - - /** - * Constructor - * - * Set up a new DOMDocument from the supplied HTML, convert it to Markdown, and store it in $this->$output. - * - * @param string $html The HTML to convert to Markdown. - * @param array $overrides [optional] List of style and error display overrides. - */ - public function __construct($html = null, $overrides = null) - { - if ($overrides) - $this->options = array_merge($this->options, $overrides); - - if ($html) - $this->convert($html); - } - - - /** - * Setter for conversion options - * - * @param $name - * @param $value - */ - public function set_option($name, $value) - { - $this->options[$name] = $value; - } - - - /** - * Convert - * - * Loads HTML and passes to get_markdown() - * - * @param $html - * @return string The Markdown version of the html - */ - public function convert($html) - { - $html = preg_replace('~>\s+<~', '><', $html); // Strip white space between tags to prevent creation of empty #text nodes - - $this->document = new DOMDocument(); - - if ($this->options['suppress_errors']) - libxml_use_internal_errors(true); // Suppress conversion errors (from http://bit.ly/pCCRSX ) - - $this->document->loadHTML('' . $html); // Hack to load utf-8 HTML (from http://bit.ly/pVDyCt ) - $this->document->encoding = 'UTF-8'; - - if ($this->options['suppress_errors']) - libxml_clear_errors(); - - return $this->get_markdown($html); - } - - - /** - * Is Child Of? - * - * Is the node a child of the given parent tag? - * - * @param $parent_name string|array The name of the parent node(s) to search for e.g. 'code' or array('pre', 'code') - * @param $node - * @return bool - */ - private static function is_child_of($parent_name, $node) - { - for ($p = $node->parentNode; $p != false; $p = $p->parentNode) { - if (is_null($p)) - return false; - - if ( is_array($parent_name) && in_array($p->nodeName, $parent_name) ) - return true; - - if ($p->nodeName == $parent_name) - return true; - } - return false; - } - - - /** - * Convert Children - * - * Recursive function to drill into the DOM and convert each node into Markdown from the inside out. - * - * Finds children of each node and convert those to #text nodes containing their Markdown equivalent, - * starting with the innermost element and working up to the outermost element. - * - * @param $node - */ - private function convert_children($node) - { - // Don't convert HTML code inside and blocks to Markdown - that should stay as HTML - if (self::is_child_of(array('pre', 'code'), $node)) - return; - - // If the node has children, convert those to Markdown first - if ($node->hasChildNodes()) { - $length = $node->childNodes->length; - - for ($i = 0; $i < $length; $i++) { - $child = $node->childNodes->item($i); - $this->convert_children($child); - } - } - - // Now that child nodes have been converted, convert the original node - $markdown = $this->convert_to_markdown($node); - - // Create a DOM text node containing the Markdown equivalent of the original node - $markdown_node = $this->document->createTextNode($markdown); - - // Replace the old $node e.g. "Title" with the new $markdown_node e.g. "### Title" - $node->parentNode->replaceChild($markdown_node, $node); - } - - - /** - * Get Markdown - * - * Sends the body node to convert_children() to change inner nodes to Markdown #text nodes, then saves and - * returns the resulting converted document as a string in Markdown format. - * - * @return string|boolean The converted HTML as Markdown, or false if conversion failed - */ - private function get_markdown() - { - // Work on the entire DOM tree (including head and body) - $input = $this->document->getElementsByTagName("html")->item(0); - - if (!$input) - return false; - - // Convert all children of this root element. The DOMDocument stored in $this->doc will - // then consist of #text nodes, each containing a Markdown version of the original node - // that it replaced. - $this->convert_children($input); - - // Sanitize and return the body contents as a string. - $markdown = $this->document->saveHTML(); // stores the DOMDocument as a string - $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8'); - $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8'); // Double decode to cover cases like http://www.php.net/manual/en/function.htmlentities.php#99984 - $markdown = preg_replace("/]+>/", "", $markdown); // Strip doctype declaration - $unwanted = array('', '', '', '', '', '', '', ' '); - $markdown = str_replace($unwanted, '', $markdown); // Strip unwanted tags - $markdown = trim($markdown, "\n\r\0\x0B"); - - $this->output = $markdown; - - return $markdown; - } - - - /** - * Convert to Markdown - * - * Converts an individual node into a #text node containing a string of its Markdown equivalent. - * - * Example: An node with text content of "Title" becomes a text node with content of "### Title" - * - * @param $node - * @return string The converted HTML as Markdown - */ - private function convert_to_markdown($node) - { - $tag = $node->nodeName; // the type of element, e.g. h1 - $value = $node->nodeValue; // the value of that element, e.g. The Title - - // Strip nodes named in remove_nodes - $tags_to_remove = explode(' ', $this->options['remove_nodes']); - if ( in_array($tag, $tags_to_remove) ) - return false; - - switch ($tag) { - case "p": - $markdown = (trim($value)) ? rtrim($value) . PHP_EOL . PHP_EOL : ''; - break; - case "pre": - $markdown = PHP_EOL . $this->convert_code($node) . PHP_EOL; - break; - case "h1": - case "h2": - $markdown = $this->convert_header($tag, $node); - break; - case "h3": - $markdown = "### " . $value . PHP_EOL . PHP_EOL; - break; - case "h4": - $markdown = "#### " . $value . PHP_EOL . PHP_EOL; - break; - case "h5": - $markdown = "##### " . $value . PHP_EOL . PHP_EOL; - break; - case "h6": - $markdown = "###### " . $value . PHP_EOL . PHP_EOL; - break; - case "em": - case "i": - case "strong": - case "b": - $markdown = $this->convert_emphasis($tag, $value); - break; - case "hr": - $markdown = "- - - - - -" . PHP_EOL . PHP_EOL; - break; - case "br": - $markdown = " " . PHP_EOL; - break; - case "blockquote": - $markdown = $this->convert_blockquote($node); - break; - case "code": - $markdown = $this->convert_code($node); - break; - case "ol": - case "ul": - $markdown = $value . PHP_EOL; - break; - case "li": - $markdown = $this->convert_list($node); - break; - case "img": - $markdown = $this->convert_image($node); - break; - case "a": - $markdown = $this->convert_anchor($node); - break; - case "#text": - $markdown = preg_replace('~\s+~', ' ', $value); - $markdown = preg_replace('~^#~', '\\\\#', $markdown); - break; - case "#comment": - $markdown = ''; - break; - case "div": - $markdown = ($this->options['strip_tags']) ? $value . PHP_EOL . PHP_EOL : html_entity_decode($node->C14N()); - break; - default: - // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, - // such as nodes on their own. C14N() canonicalizes the node to a string. - // See: http://www.php.net/manual/en/domnode.c14n.php - $markdown = ($this->options['strip_tags']) ? $value : html_entity_decode($node->C14N()); - } - - return $markdown; - } - - - /** - * Convert Header - * - * Converts h1 and h2 headers to Markdown-style headers in setext style, - * matching the number of underscores with the length of the title. - * - * e.g. Header 1 Header Two - * ======== ---------- - * - * Returns atx headers instead if $this->options['header_style'] is "atx" - * - * e.g. # Header 1 ## Header Two - * - * @param string $level The header level, including the "h". e.g. h1 - * @param string $node The node to convert. - * @return string The Markdown version of the header. - */ - private function convert_header($level, $node) - { - $content = $node->nodeValue; - - if (!$this->is_child_of('blockquote', $node) && $this->options['header_style'] == "setext") { - $length = (function_exists('mb_strlen')) ? mb_strlen($content, 'utf-8') : strlen($content); - $underline = ($level == "h1") ? "=" : "-"; - $markdown = $content . PHP_EOL . str_repeat($underline, $length) . PHP_EOL . PHP_EOL; // setext style - } else { - $prefix = ($level == "h1") ? "# " : "## "; - $markdown = $prefix . $content . PHP_EOL . PHP_EOL; // atx style - } - - return $markdown; - } - - - /** - * Converts inline styles - * This function is used to render strong and em tags - * - * eg bold text becomes **bold text** or __bold text__ - * - * @param string $tag - * @param string $value - * @return string - */ - private function convert_emphasis($tag, $value) - { - if ($tag == 'i' || $tag == 'em') { - $markdown = $this->options['italic_style'] . $value . $this->options['italic_style']; - } else { - $markdown = $this->options['bold_style'] . $value . $this->options['bold_style']; - } - - return $markdown; - } - - - /** - * Convert Image - * - * Converts tags to Markdown. - * - * e.g. - * becomes  - * - * @param $node - * @return string - */ - private function convert_image($node) - { - $src = $node->getAttribute('src'); - $alt = $node->getAttribute('alt'); - $title = $node->getAttribute('title'); - - if ($title != "") { - $markdown = ''; // No newlines added. should be in a block-level element. - } else { - $markdown = ''; - } - - return $markdown; - } - - - /** - * Convert Anchor - * - * Converts tags to Markdown. - * - * e.g. Modern Nerd - * becomes [Modern Nerd](http://modernnerd.net "Title") - * - * @param $node - * @return string - */ - private function convert_anchor($node) - { - $href = $node->getAttribute('href'); - $title = $node->getAttribute('title'); - $text = $node->nodeValue; - - if ($title != "") { - $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; - } else { - $markdown = '[' . $text . '](' . $href . ')'; - } - - if (! $href) - $markdown = html_entity_decode($node->C14N()); - - // Append a space if the node after this one is also an anchor - $next_node_name = $this->get_next_node_name($node); - - if ($next_node_name == 'a') - $markdown = $markdown . ' '; - - return $markdown; - } - - - /** - * Convert List - * - * Converts and lists to Markdown. - * - * @param $node - * @return string - */ - private function convert_list($node) - { - // If parent is an ol, use numbers, otherwise, use dashes - $list_type = $node->parentNode->nodeName; - $value = $node->nodeValue; - - if ($list_type == "ul") { - $markdown = "- " . trim($value) . PHP_EOL; - } else { - $number = $this->get_position($node); - $markdown = $number . ". " . trim($value) . PHP_EOL; - } - - return $markdown; - } - - - /** - * Convert Code - * - * Convert code tags by indenting blocks of code and wrapping single lines in backticks. - * - * @param DOMNode $node - * @return string - */ - private function convert_code($node) - { - // Store the content of the code block in an array, one entry for each line - - $markdown = ''; - - $code_content = html_entity_decode($node->C14N()); - $code_content = str_replace(array("", ""), "", $code_content); - $code_content = str_replace(array("", ""), "", $code_content); - - $lines = preg_split('/\r\n|\r|\n/', $code_content); - $total = count($lines); - - // If there's more than one line of code, prepend each line with four spaces and no backticks. - if ($total > 1 || $node->nodeName === 'pre') { - - // Remove the first and last line if they're empty - $first_line = trim($lines[0]); - $last_line = trim($lines[$total - 1]); - $first_line = trim($first_line, " "); //trim XML style carriage returns too - $last_line = trim($last_line, " "); - - if (empty($first_line)) - array_shift($lines); - - if (empty($last_line)) - array_pop($lines); - - $count = 1; - foreach ($lines as $line) { - $line = str_replace(' ', '', $line); - $markdown .= " " . $line; - // Add newlines, except final line of the code - if ($count != $total) - $markdown .= PHP_EOL; - $count++; - } - $markdown .= PHP_EOL; - - } else { // There's only one line of code. It's a code span, not a block. Just wrap it with backticks. - - $markdown .= "`" . $lines[0] . "`"; - - } - - return $markdown; - } - - - /** - * Convert blockquote - * - * Prepend blockquotes with > chars. - * - * @param $node - * @return string - */ - private function convert_blockquote($node) - { - // Contents should have already been converted to Markdown by this point, - // so we just need to add ">" symbols to each line. - - $markdown = ''; - - $quote_content = trim($node->nodeValue); - - $lines = preg_split('/\r\n|\r|\n/', $quote_content); - - $total_lines = count($lines); - - foreach ($lines as $i => $line) { - $markdown .= "> " . $line . PHP_EOL; - if ($i + 1 == $total_lines) - $markdown .= PHP_EOL; - } - - return $markdown; - } - - - /** - * Get Position - * - * Returns the numbered position of a node inside its parent - * - * @param $node - * @return int The numbered position of the node, starting at 1. - */ - private function get_position($node) - { - // Get all of the nodes inside the parent - $list_nodes = $node->parentNode->childNodes; - $total_nodes = $list_nodes->length; - - $position = 1; - - // Loop through all nodes and find the given $node - for ($a = 0; $a < $total_nodes; $a++) { - $current_node = $list_nodes->item($a); - - if ($current_node->isSameNode($node)) - $position = $a + 1; - } - - return $position; - } - - - /** - * Get Next Node Name - * - * Return the name of the node immediately after the passed one. - * - * @param $node - * @return string|null The node name (e.g. 'h1') or null. - */ - private function get_next_node_name($node) - { - $next_node_name = null; - - $current_position = $this->get_position($node); - $next_node = $node->parentNode->childNodes->item($current_position); - - if ($next_node) - $next_node_name = $next_node->nodeName; - - return $next_node_name; - } - - - /** - * To String - * - * Magic method to return Markdown output when HTML_To_Markdown instance is treated as a string. - * - * @return string - */ - public function __toString() - { - return $this->output(); - } - - - /** - * Output - * - * Getter for the converted Markdown contents stored in $this->output - * - * @return string - */ - public function output() - { - if (!$this->output) { - return ''; - } else { - return $this->output; - } - } -} diff --git a/library/html-to-markdown/README.md b/library/html-to-markdown/README.md deleted file mode 100644 index de91c9d08..000000000 --- a/library/html-to-markdown/README.md +++ /dev/null @@ -1,138 +0,0 @@ -HTML To Markdown for PHP -======================== - -A helper class that converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. - -[](https://travis-ci.org/nickcernis/html-to-markdown) - -**Version**: 2.2.1 -**Requires**: PHP 5.3+ -**Author**: [@nickcernis](http://twitter.com/nickcernis) -**License**: [MIT](http://www.opensource.org/licenses/mit-license.php) - -### Why convert HTML to Markdown? - -*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](http://michelf.com/projects/php-markdown/),"* you continue, already labouring the question somewhat, *"but why go the other way?"* - -Typically you would convert HTML to Markdown if: - -1. You have an existing HTML document that needs to be edited by people with good taste. -2. You want to store new content in HTML format but edit it as Markdown. -3. You want to convert HTML email to plain text email. -4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. -5. You just really like Markdown. - -### How to use it - -Either include HTML_To_Markdown.php directly: - - require_once( dirname( __FILE__) . '/HTML_To_Markdown.php' ); - -Or, require the library in your composer.json: - - { - "require": { - "nickcernis/html-to-markdown": "dev-master" - } - } - -Then `composer install` and add `require 'vendor/autoload.php';` to the top of your script. - -Next, create a new HTML_To_Markdown instance, passing in your valid HTML code: - - $html = "Quick, to the Batpoles!"; - $markdown = new HTML_To_Markdown($html); - -The `$markdown` object now contains the Markdown version of your HTML. Use it like a string: - - echo $markdown; // ==> ### Quick, to the Batpoles! - -Or access the Markdown output directly: - - $string = $markdown->output(); - -The included `demo` directory contains an HTML->Markdown conversion form to try out. - -### Conversion options - -By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. - -To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: - - $html = 'Turnips!'; - $markdown = new HTML_To_Markdown($html, array('strip_tags' => true)); // $markdown now contains "Turnips!" - -Or more explicitly, like this: - - $html = 'Turnips!'; - $markdown = new HTML_To_Markdown(); - $markdown->set_option('strip_tags', true); - $markdown->convert($html); // $markdown now contains "Turnips!" - -Note that only the tags themselves are stripped, not the content they hold. - -To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: - - $html = 'Turnips!Monkeys!'; - $markdown = new HTML_To_Markdown($html, array('remove_nodes' => 'span div')); // $markdown now contains "" - -### Style options - -Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. - - $html = 'Italic and a bold'; - $markdown = new HTML_To_Markdown(); - $markdown->set_option('italic_style', '_'); - $markdown->set_option('bold_style', '__'); - $markdown->convert($html); // $markdown now contains "_Italic_ and a __bold__" - -### Limitations - -- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. - -### Known issues - -- Nested lists and lists containing multiple paragraphs aren't converted correctly. -- Lists inside blockquotes aren't converted correctly. -- Any reported [open issues here](https://github.com/nickcernis/html-to-markdown/issues?state=open). - -[Report your issue or request a feature here.](https://github.com/nickcernis/html2markdown/issues/new) Issues with patches or failing tests are especially welcome. - -### Style notes - -- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: - - `$markdown = new HTML_To_Markdown( $html, array('header_style'=>'atx') );` - - Headers of H3 priority and lower always use atx style. - -- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. -- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. - -### Dependencies - -HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. - -Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. - -### Architecture notes - -HTML To Markdown is a single file that uses native DOM manipulation libraries (DOMDocument), not regex voodoo, to convert code. - -### Contributors - -Many thanks to all [contributors](https://github.com/nickcernis/html2markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. - -### How it works - -HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. - -### To-do - -- Support for nested lists and lists inside blockquotes. -- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). - -### Trying to convert Markdown to HTML? - -Use [PHP Markdown](http://michelf.com/projects/php-markdown/) from Michel Fortin. No guarantees about the Elvish, though. - diff --git a/library/html-to-markdown/circle.yml b/library/html-to-markdown/circle.yml deleted file mode 100644 index 9893a4b92..000000000 --- a/library/html-to-markdown/circle.yml +++ /dev/null @@ -1,4 +0,0 @@ -test: - override: - - phpunit --no-configuration HTML_To_MarkdownTest ./tests/HTML_To_MarkdownTest.php - diff --git a/library/html-to-markdown/composer.json b/library/html-to-markdown/composer.json deleted file mode 100644 index beb7faab4..000000000 --- a/library/html-to-markdown/composer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "nickcernis/html-to-markdown", - "type": "library", - "description": "An HTML-to-markdown conversion helper for PHP", - "keywords": ["markdown", "html"], - "homepage": "https://github.com/nickcernis/html-to-markdown", - "license": "MIT", - "authors": [ - { - "name": "Nick Cernis", - "email": "nick@cern.is", - "homepage": "http://modernnerd.net" - } - ], - "autoload": { - "classmap": [ "HTML_To_Markdown.php" ] - }, - "require": { - "php": ">=5.3" - }, - "require-dev": { - "php": ">=5.3.3", - "phpunit/phpunit": "4.*" - } -} diff --git a/mod/acl.php b/mod/acl.php index 04aa9f50a..9220bc77a 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -1,7 +1,7 @@ = `last_failure` ORDER BY `version` ASC;', $p); $total = $total + $c[0]['total']; @@ -474,9 +475,6 @@ function admin_page_summary(App $a) { $r = qu("SELECT COUNT(`id`) AS `count` FROM `register`"); $pending = $r[0]['count']; - $r = qu("SELECT COUNT(*) AS `total` FROM `deliverq` WHERE 1"); - $deliverq = (($r) ? $r[0]['total'] : 0); - $r = qu("SELECT COUNT(*) AS `total` FROM `queue` WHERE 1"); $queue = (($r) ? $r[0]['total'] : 0); @@ -485,7 +483,7 @@ function admin_page_summary(App $a) { // We can do better, but this is a quick queue status - $queues = array('label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue, 'workerq' => $workerqueue); + $queues = array('label' => t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue); $t = get_markup_template("admin_summary.tpl"); @@ -655,7 +653,6 @@ function admin_page_site_post(App $a) { $force_ssl = ((x($_POST,'force_ssl')) ? True : False); $hide_help = ((x($_POST,'hide_help')) ? True : False); $suppress_tags = ((x($_POST,'suppress_tags')) ? True : False); - $use_fulltext_engine = ((x($_POST,'use_fulltext_engine')) ? True : False); $itemcache = ((x($_POST,'itemcache')) ? notags(trim($_POST['itemcache'])) : ''); $itemcache_duration = ((x($_POST,'itemcache_duration')) ? intval($_POST['itemcache_duration']) : 0); $max_comments = ((x($_POST,'max_comments')) ? intval($_POST['max_comments']) : 0); @@ -670,6 +667,12 @@ function admin_page_site_post(App $a) { $worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False); $worker_frontend = ((x($_POST,'worker_frontend')) ? True : False); + // Has the directory url changed? If yes, then resubmit the existing profiles there + if ($global_directory != Config::get('system', 'directory') AND ($global_directory != '')) { + Config::set('system', 'directory', $global_directory); + proc_run(PRIORITY_LOW, 'include/directory.php'); + } + if ($a->get_path() != "") { $diaspora_enabled = false; } @@ -773,7 +776,6 @@ function admin_page_site_post(App $a) { set_config('system', 'allowed_email', $allowed_email); set_config('system', 'block_public', $block_public); set_config('system', 'publish_all', $force_publish); - set_config('system', 'directory', $global_directory); set_config('system', 'thread_allow', $thread_allow); set_config('system', 'newuser_private', $newuser_private); set_config('system', 'enotify_no_content', $enotify_no_content); @@ -799,7 +801,6 @@ function admin_page_site_post(App $a) { set_config('system', 'force_ssl', $force_ssl); set_config('system', 'hide_help', $hide_help); - set_config('system', 'use_fulltext_engine', $use_fulltext_engine); set_config('system', 'itemcache', $itemcache); set_config('system', 'itemcache_duration', $itemcache_duration); set_config('system', 'max_comments', $max_comments); @@ -971,7 +972,7 @@ function admin_page_site(App $a) { '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$shortcut_icon' => array('shortcut_icon', t("Shortcut icon"), get_config('system','shortcut_icon'), t("Link to an icon that will be used for browsers.")), '$touch_icon' => array('touch_icon', t("Touch icon"), get_config('system','touch_icon'), t("Link to an icon that will be used for tablets and mobiles.")), - '$info' => array('info',t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), + '$info' => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile), @@ -1028,7 +1029,6 @@ function admin_page_site(App $a) { '$nodeinfo' => array('nodeinfo', t("Publish server information"), get_config('system','nodeinfo'), t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details.")), - '$use_fulltext_engine' => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")), '$suppress_tags' => array('suppress_tags', t("Suppress Tags"), get_config('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")), '$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), t("The item caches buffers generated bbcode and external images.")), '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")), @@ -2058,8 +2058,8 @@ function admin_page_features(App $a) { $set = $f[3]; } $arr[$fname][1][] = array( - 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('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'))) ); } } diff --git a/mod/cal.php b/mod/cal.php index f43a4e8a7..7398426bc 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -269,8 +269,8 @@ function cal_content(App $a) { '$tabs' => $tabs, '$title' => t('Events'), '$view' => t('View'), - '$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''), - '$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''), + '$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth", t('Previous'),'',''), + '$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth", t('Next'),'',''), '$calendar' => cal($y,$m,$links, ' eventcal'), '$events' => $events, diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 52b5eb9f9..f3875ed8e 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -872,7 +872,7 @@ function dfrn_request_content(App $a) { '$header' => t('Friend/Connection Request'), '$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'), '$pls_answer' => t('Please answer the following:'), - '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'),t('Yes'))), + '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'), t('Yes'))), /*'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']), '$yes' => t('Yes'), '$no' => t('No'), */ diff --git a/mod/follow.php b/mod/follow.php index 2b564c1bf..6e1f90694 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -110,7 +110,7 @@ function follow_content(App $a) { //'$photo' => proxy_url($ret["photo"], false, PROXY_SIZE_SMALL), '$desc' => "", '$pls_answer' => t('Please answer the following:'), - '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'),t('Yes'))), + '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'), t('Yes'))), '$add_note' => t('Add a personal note:'), '$page_desc' => "", '$friendica' => "", diff --git a/mod/hovercard.php b/mod/hovercard.php index ec749db20..65b03f2b9 100644 --- a/mod/hovercard.php +++ b/mod/hovercard.php @@ -75,7 +75,7 @@ function hovercard_content() { 'tags' => $contact["keywords"], // 'nsfw' => intval($contact["nsfw"]), // 'server_url' => $contact["server_url"], - 'bd' => (($contact["birthday"] == "0000-00-00") ? "" : $contact["birthday"]), + 'bd' => (($contact["birthday"] <= '0001-01-01') ? "" : $contact["birthday"]), // 'generation' => $contact["generation"], 'account_type' => account_type($contact), 'actions' => $actions, diff --git a/mod/install.php b/mod/install.php index fbd296a9d..8854723b7 100755 --- a/mod/install.php +++ b/mod/install.php @@ -48,7 +48,7 @@ function install_post(App $a) { $db = new dba($dbhost, $dbuser, $dbpass, '', true); if(! get_db_errno()) { - $r = q("CREATE DATABASE '%s'", + $r = q("CREATE DATABASE '%s' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci", dbesc($dbdata) ); if ($r) { diff --git a/mod/manifest.php b/mod/manifest.php new file mode 100644 index 000000000..6dc0d10a2 --- /dev/null +++ b/mod/manifest.php @@ -0,0 +1,26 @@ + App::get_baseurl(), + '$touch_icon' => $touch_icon, + '$title' => Config::get('config', 'sitename', 'Friendica'), + )); + + echo $o; + + killme(); + + } +?> diff --git a/mod/message.php b/mod/message.php index 9e9669146..beaa7b1df 100644 --- a/mod/message.php +++ b/mod/message.php @@ -349,7 +349,7 @@ function message_content(App $a) { $o .= $header; - $r = q("SELECT count(*) AS `total` FROM `mail` + $r = q("SELECT count(*) AS `total` FROM `mail`, ANY_VALUE(`created`) AS `created` WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC", intval(local_user()) ); @@ -528,12 +528,20 @@ function message_content(App $a) { } function get_messages($user, $lstart, $lend) { - + //TODO: rewritte with a sub-query to get the first message of each private thread with certainty return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, - `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`, - count( * ) as count + ANY_VALUE(`mail`.`id`) AS `id`, ANY_VALUE(`mail`.`uid`) AS `uid`, ANY_VALUE(`mail`.`guid`) AS `guid`, + ANY_VALUE(`mail`.`from-name`) AS `from-name`, ANY_VALUE(`mail`.`from-photo`) AS `from-photo`, + ANY_VALUE(`mail`.`from-url`) AS `from-url`, ANY_VALUE(`mail`.`contact-id`) AS `contact-id`, + ANY_VALUE(`mail`.`convid`) AS `convid`, ANY_VALUE(`mail`.`title`) AS `title`, ANY_VALUE(`mail`.`body`) AS `body`, + ANY_VALUE(`mail`.`seen`) AS `seen`, ANY_VALUE(`mail`.`reply`) AS `reply`, ANY_VALUE(`mail`.`replied`) AS `replied`, + ANY_VALUE(`mail`.`unknown`) AS `unknown`, ANY_VALUE(`mail`.`uri`) AS `uri`, + `mail`.`parent-uri`, + ANY_VALUE(`mail`.`created`) AS `created`, ANY_VALUE(`contact`.`name`) AS `name`, ANY_VALUE(`contact`.`url`) AS `url`, + ANY_VALUE(`contact`.`thumb`) AS `thumb`, ANY_VALUE(`contact`.`network`) AS `network`, + count( * ) as `count` FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` - WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", + WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", intval($user), intval($lstart), intval($lend) ); } diff --git a/mod/network.php b/mod/network.php index 5e94429b5..db4bb9130 100644 --- a/mod/network.php +++ b/mod/network.php @@ -581,11 +581,7 @@ function network_content(App $a, $update = 0) { $sql_order = "`item`.`id`"; $order_mode = "id"; } else { - // Disabled until final decision what to do with this - //if (get_config('system','use_fulltext_engine')) - // $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search))); - //else - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); $sql_order = "`item`.`id`"; $order_mode = "id"; } diff --git a/mod/notifications.php b/mod/notifications.php index 0c08b66ce..bab5fd627 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -292,7 +292,7 @@ function notifications_content(App $a) { '$item_link' => $it['link'], '$item_image' => $it['image'], '$item_url' => $it['url'], - '$item_text' => htmlentities($it['text']), + '$item_text' => $it['text'], '$item_when' => $it['when'], '$item_ago' => $it['ago'], '$item_seen' => $it['seen'], diff --git a/mod/photos.php b/mod/photos.php index ddf081467..a22f919c8 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1240,7 +1240,10 @@ function photos_content(App $a) { $order = 'DESC'; } - $r = q("SELECT `resource-id`, `id`, `filename`, type, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' + $r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, + ANY_VALUE(`type`) AS `type`, max(`scale`) AS `scale`, ANY_VALUE(`desc`) as `desc`, + ANY_VALUE(`created`) as `created` + FROM `photo` WHERE `uid` = %d AND `album` = '%s' AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d", intval($owner_uid), dbesc($album), @@ -1581,9 +1584,9 @@ function photos_content(App $a) { '$album' => array('albname', t('New album name'), $album_e,''), '$caption' => array('desc', t('Caption'), $caption_e, ''), '$tags' => array('newtag', t('Add a Tag'), "", t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')), - '$rotate_none' => array('rotate',t('Do not rotate'),0,'', true), - '$rotate_cw' => array('rotate',t('Rotate CW (right)'),1,''), - '$rotate_ccw' => array('rotate',t('Rotate CCW (left)'),2,''), + '$rotate_none' => array('rotate', t('Do not rotate'),0,'', true), + '$rotate_cw' => array('rotate', t('Rotate CW (right)'),1,''), + '$rotate_ccw' => array('rotate', t('Rotate CCW (left)'),2,''), '$nickname' => $a->data['user']['nickname'], '$resource_id' => $ph[0]['resource-id'], @@ -1840,7 +1843,9 @@ function photos_content(App $a) { $a->set_pager_itemspage(20); } - $r = qu("SELECT `resource-id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` + $r = qu("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, + ANY_VALUE(`type`) AS `type`, ANY_VALUE(`album`) AS `album`, max(`scale`) AS `scale`, + ANY_VALUE(`created`) AS `created` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", intval($a->data['user']['uid']), diff --git a/mod/ping.php b/mod/ping.php index b5330c7b3..ba496a70b 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -199,7 +199,7 @@ function ping_init(App $a) $cachekey = "ping_init:".local_user(); $ev = Cache::get($cachekey); if (is_null($ev)) { - $ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event` + $ev = qu("SELECT type, start, adjust FROM `event` WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0 ORDER BY `start` ASC ", intval(local_user()), @@ -212,7 +212,7 @@ function ping_init(App $a) } if (dbm::is_result($ev)) { - $all_events = intval($ev[0]['total']); + $all_events = count($ev); if ($all_events) { $str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d'); diff --git a/mod/probe.php b/mod/probe.php index 95f856bfa..8c951a7fc 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -4,6 +4,13 @@ require_once('include/Scrape.php'); function probe_content(App $a) { + if (!local_user()) { + http_status_exit(403, + array("title" => t("Public access denied."), + "description" => t("Only logged in users are permitted to perform a probing."))); + killme(); + } + $o .= 'Probe Diagnostic'; $o .= ''; diff --git a/mod/profile.php b/mod/profile.php index fbce509d2..a83cb076f 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -210,7 +210,7 @@ function profile_content(App $a, $update = 0) { if ($update) { - $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network` + $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`, `item`.`created` FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND diff --git a/mod/profiles.php b/mod/profiles.php index b73c46e71..bd57f106d 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -193,7 +193,7 @@ function profiles_post(App $a) { return; } - $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated? + $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0001-01-01'; // FIXME: Needs to be validated? $y = substr($dob, 0, 4); if ((! ctype_digit($y)) || ($y < 1900)) { @@ -201,15 +201,15 @@ function profiles_post(App $a) { } else { $ignore_year = false; } - if ($dob != '0000-00-00') { - if (strpos($dob, '0000-') === 0) { + if (!in_array($dob, array('0000-00-00', '0001-01-01'))) { + if (strpos($dob, '0000-') === 0 || strpos($dob, '0001-') === 0) { $ignore_year = true; $dob = substr($dob, 5); } $dob = datetime_convert('UTC', 'UTC', (($ignore_year) ? '1900-' . $dob : $dob), (($ignore_year) ? 'm-d' : 'Y-m-d')); if ($ignore_year) { - $dob = '0000-' . $dob; + $dob = '0001-' . $dob; } } @@ -637,7 +637,7 @@ function profiles_content(App $a) { t('Hide contacts and friends:'), //Label !!$r[0]['hide-friends'], //Value '', //Help string - array(t('No'),t('Yes')) //Off - On strings + array(t('No'), t('Yes')) //Off - On strings ), '$desc' => t('Hide your contact/friend list from viewers of this profile?'), '$yes_str' => t('Yes'), @@ -739,7 +739,7 @@ function profiles_content(App $a) { '$tv' => array('tv', t('Television'), $r[0]['tv']), '$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']), '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']), - '$romance' => array('romance',t('Love/romance'), $r[0]['romance']), + '$romance' => array('romance', t('Love/romance'), $r[0]['romance']), '$work' => array('work', t('Work/employment'), $r[0]['work']), '$education' => array('education', t('School/education'), $r[0]['education']), '$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']), diff --git a/mod/register.php b/mod/register.php index 81e8c3ad8..5e8da4685 100644 --- a/mod/register.php +++ b/mod/register.php @@ -282,7 +282,7 @@ function register_content(App $a) { '$passwords' => $passwords, '$password1' => array('password1', t('New Password:'), '', t('Leave empty for an auto generated password.')), '$password2' => array('confirm', t('Confirm:'), '', ''), - '$nickdesc' => str_replace('$sitename',$a->get_hostname(),t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.')), + '$nickdesc' => str_replace('$sitename',$a->get_hostname(), t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.')), '$nicklabel' => t('Choose a nickname: '), '$photo' => $photo, '$publish' => $profile_publish, diff --git a/mod/salmon.php b/mod/salmon.php index 69809f523..10b1046b0 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -79,7 +79,7 @@ function salmon_post(App $a) { $signed_data = $data . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg); - $compliant_format = str_replace('=','',$signed_data); + $compliant_format = str_replace('=', '', $signed_data); // decode the data @@ -115,24 +115,28 @@ function salmon_post(App $a) { // We should have everything we need now. Let's see if it verifies. - $verify = rsa_verify($compliant_format,$signature,$pubkey); + // Try GNU Social format + $verify = rsa_verify($signed_data, $signature, $pubkey); + $mode = 1; - if(! $verify) { - logger('mod-salmon: message did not verify using protocol. Trying padding hack.'); - $verify = rsa_verify($signed_data,$signature,$pubkey); + if (! $verify) { + logger('mod-salmon: message did not verify using protocol. Trying compliant format.'); + $verify = rsa_verify($compliant_format, $signature, $pubkey); + $mode = 2; } - if(! $verify) { - logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.'); - $verify = rsa_verify($stnet_signed_data,$signature,$pubkey); + if (! $verify) { + logger('mod-salmon: message did not verify using padding. Trying old statusnet format.'); + $verify = rsa_verify($stnet_signed_data, $signature, $pubkey); + $mode = 3; } - if(! $verify) { + if (! $verify) { logger('mod-salmon: Message did not verify. Discarding.'); http_status_exit(400); } - logger('mod-salmon: Message verified.'); + logger('mod-salmon: Message verified with mode '.$mode); /* diff --git a/mod/search.php b/mod/search.php index 7d588aa4d..a804ca32e 100644 --- a/mod/search.php +++ b/mod/search.php @@ -203,18 +203,13 @@ function search_content(App $a) { } else { logger("Start fulltext search for '".$search."'", LOGGER_DEBUG); - // Disabled until finally is decided how to proceed with this - //if (get_config('system','use_fulltext_engine')) { - // $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search))); - //} else { - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); - //} + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); $r = q("SELECT %s FROM `item` %s WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`)) $sql_extra - GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d", + GROUP BY `item`.`uri`, `item`.`id` ORDER BY `item`.`id` DESC LIMIT %d , %d", item_fieldlists(), item_joins(), item_condition(), intval(local_user()), intval($a->pager['start']), intval($a->pager['itemspage'])); diff --git a/mod/settings.php b/mod/settings.php index 5c9c439e0..1d83251d4 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -779,7 +779,7 @@ function settings_content(App $a) { $arr[$fname] = array(); $arr[$fname][0] = $fdata[0]; foreach (array_slice($fdata,1) as $f) { - $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); + $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'), t('On'))); } } @@ -1164,48 +1164,48 @@ function settings_content(App $a) { } $opt_tpl = get_markup_template("field_yesno.tpl"); - if(get_config('system','publish_all')) { + if (get_config('system','publish_all')) { $profile_in_dir = ''; } else { - $profile_in_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))), + $profile_in_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), array(t('No'), t('Yes'))) )); } if (strlen(get_config('system','directory'))) { - $profile_in_net_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))), + $profile_in_net_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'), t('Yes'))) )); } else { $profile_in_net_dir = ''; } $hide_friends = replace_macros($opt_tpl,array( - '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'),t('Yes'))), + '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'), t('Yes'))), )); $hide_wall = replace_macros($opt_tpl,array( - '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'),t('Yes'))), + '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'), t('Yes'))), )); $blockwall = replace_macros($opt_tpl,array( - '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'),t('Yes'))), + '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); $blocktags = replace_macros($opt_tpl,array( - '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'),t('Yes'))), + '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); $suggestme = replace_macros($opt_tpl,array( - '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'),t('Yes'))), + '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'), t('Yes'))), )); $unkmail = replace_macros($opt_tpl,array( - '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))), + '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'), t('Yes'))), )); @@ -1231,11 +1231,11 @@ function settings_content(App $a) { 'days' => array('expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')), 'advanced' => t('Advanced expiration settings'), 'label' => t('Advanced Expiration'), - 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'),t('Yes'))), - 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))), - 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))), - 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))), - 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'),t('Yes'))), + 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'), t('Yes'))), + 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'), t('Yes'))), + 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'), t('Yes'))), + 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'), t('Yes'))), + 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'), t('Yes'))), ); require_once('include/group.php'); @@ -1293,7 +1293,7 @@ function settings_content(App $a) { '$h_prv' => t('Security and Privacy Settings'), - '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq ,t("\x28to prevent spam abuse\x29")), + '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq , t("\x28to prevent spam abuse\x29")), '$permissions' => t('Default Post Permissions'), '$permdesc' => t("\x28click to open/close\x29"), '$visibility' => $profile['net-publish'], @@ -1323,7 +1323,7 @@ function settings_content(App $a) { '$hide_friends' => $hide_friends, '$hide_wall' => $hide_wall, '$unkmail' => $unkmail, - '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail ,t("\x28to prevent spam abuse\x29")), + '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail , t("\x28to prevent spam abuse\x29")), '$h_not' => t('Notification Settings'), diff --git a/mod/uexport.php b/mod/uexport.php index cada539bc..77a45f8a3 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -34,8 +34,8 @@ function uexport_content(App $a) { * list of array( 'link url', 'link text', 'help text' ) */ $options = array( - array('uexport/account',t('Export account'),t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')), - array('uexport/backup',t('Export all'),t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')), + array('uexport/account', t('Export account'), t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')), + array('uexport/backup', t('Export all'), t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')), ); call_hooks('uexport_options', $options); diff --git a/mod/videos.php b/mod/videos.php index 3828b8f1f..269d53785 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -356,7 +356,9 @@ function videos_content(App $a) { $a->set_pager_itemspage(20); } - $r = q("SELECT hash, `id`, `filename`, filetype FROM `attach` + $r = q("SELECT hash, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`created`) AS `created`, + ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`filetype`) as `filetype` + FROM `attach` WHERE `uid` = %d AND filetype LIKE '%%video%%' $sql_extra GROUP BY hash ORDER BY `created` DESC LIMIT %d , %d", intval($a->data['user']['uid']), diff --git a/mod/webfinger.php b/mod/webfinger.php index eee0580e3..d823bd2dc 100644 --- a/mod/webfinger.php +++ b/mod/webfinger.php @@ -3,6 +3,13 @@ require_once("include/Probe.php"); function webfinger_content(App $a) { + if (!local_user()) { + http_status_exit(403, + array("title" => t("Public access denied."), + "description" => t("Only logged in users are permitted to perform a probing."))); + killme(); + } + $o .= 'Webfinger Diagnostic'; $o .= ''; diff --git a/update.php b/update.php index 8404f5bf2..ea0c57535 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ /dev/null 2>&1; then + # Cygwin paths start with /cygdrive/ which will break windows PHP, + # so we need to translate the dir path to windows format. However + # we could be using cygwin PHP which does not require this, so we + # test if the path to PHP starts with /cygdrive/ rather than /usr/bin + if [[ $(which php) == /cygdrive/* ]]; then + dir=$(cygpath -m "$dir"); + fi +fi + +dir=$(echo $dir | sed 's/ /\ /g') +"${dir}/html-to-markdown" "$@" diff --git a/vendor/bin/html-to-markdown.bat b/vendor/bin/html-to-markdown.bat new file mode 100644 index 000000000..273f24a5d --- /dev/null +++ b/vendor/bin/html-to-markdown.bat @@ -0,0 +1,4 @@ +@ECHO OFF +setlocal DISABLEDELAYEDEXPANSION +SET BIN_TARGET=%~dp0/../league/html-to-markdown/bin/html-to-markdown +php "%BIN_TARGET%" %* diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 95407cff6..4553da2e2 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -241,6 +241,29 @@ return array( 'HTMLPurifier_VarParser_Flexible' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php', 'HTMLPurifier_VarParser_Native' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php', 'HTMLPurifier_Zipper' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php', + 'League\\HTMLToMarkdown\\Configuration' => $vendorDir . '/league/html-to-markdown/src/Configuration.php', + 'League\\HTMLToMarkdown\\ConfigurationAwareInterface' => $vendorDir . '/league/html-to-markdown/src/ConfigurationAwareInterface.php', + 'League\\HTMLToMarkdown\\Converter\\BlockquoteConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/BlockquoteConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CodeConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/CodeConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CommentConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/CommentConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ConverterInterface' => $vendorDir . '/league/html-to-markdown/src/Converter/ConverterInterface.php', + 'League\\HTMLToMarkdown\\Converter\\DefaultConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/DefaultConverter.php', + 'League\\HTMLToMarkdown\\Converter\\DivConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/DivConverter.php', + 'League\\HTMLToMarkdown\\Converter\\EmphasisConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/EmphasisConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HardBreakConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HardBreakConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HeaderConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HeaderConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HorizontalRuleConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ImageConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ImageConverter.php', + 'League\\HTMLToMarkdown\\Converter\\LinkConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/LinkConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListBlockConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListBlockConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListItemConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ParagraphConverter.php', + 'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/PreformattedConverter.php', + 'League\\HTMLToMarkdown\\Converter\\TextConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/TextConverter.php', + 'League\\HTMLToMarkdown\\Element' => $vendorDir . '/league/html-to-markdown/src/Element.php', + 'League\\HTMLToMarkdown\\ElementInterface' => $vendorDir . '/league/html-to-markdown/src/ElementInterface.php', + 'League\\HTMLToMarkdown\\Environment' => $vendorDir . '/league/html-to-markdown/src/Environment.php', + 'League\\HTMLToMarkdown\\HtmlConverter' => $vendorDir . '/league/html-to-markdown/src/HtmlConverter.php', 'Mobile_Detect' => $vendorDir . '/mobiledetect/mobiledetectlib/Mobile_Detect.php', 'OS_Guess' => $vendorDir . '/pear-pear.php.net/PEAR/OS/Guess.php', 'PEAR' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR.php', diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index a8d577d5e..61a440ffd 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -6,5 +6,6 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( + 'League\\HTMLToMarkdown\\' => array($vendorDir . '/league/html-to-markdown/src'), 'Friendica\\' => array($baseDir . '/src'), ); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 370e53218..37d3c878b 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -11,6 +11,10 @@ class ComposerStaticInitFriendica ); public static $prefixLengthsPsr4 = array ( + 'L' => + array ( + 'League\\HTMLToMarkdown\\' => 22, + ), 'F' => array ( 'Friendica\\' => 10, @@ -18,6 +22,10 @@ class ComposerStaticInitFriendica ); public static $prefixDirsPsr4 = array ( + 'League\\HTMLToMarkdown\\' => + array ( + 0 => __DIR__ . '/..' . '/league/html-to-markdown/src', + ), 'Friendica\\' => array ( 0 => __DIR__ . '/../..' . '/src', @@ -277,6 +285,29 @@ class ComposerStaticInitFriendica 'HTMLPurifier_VarParser_Flexible' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php', 'HTMLPurifier_VarParser_Native' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php', 'HTMLPurifier_Zipper' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php', + 'League\\HTMLToMarkdown\\Configuration' => __DIR__ . '/..' . '/league/html-to-markdown/src/Configuration.php', + 'League\\HTMLToMarkdown\\ConfigurationAwareInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/ConfigurationAwareInterface.php', + 'League\\HTMLToMarkdown\\Converter\\BlockquoteConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/BlockquoteConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CodeConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/CodeConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CommentConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/CommentConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ConverterInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ConverterInterface.php', + 'League\\HTMLToMarkdown\\Converter\\DefaultConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/DefaultConverter.php', + 'League\\HTMLToMarkdown\\Converter\\DivConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/DivConverter.php', + 'League\\HTMLToMarkdown\\Converter\\EmphasisConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/EmphasisConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HardBreakConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HardBreakConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HeaderConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HeaderConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HorizontalRuleConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ImageConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ImageConverter.php', + 'League\\HTMLToMarkdown\\Converter\\LinkConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/LinkConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListBlockConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ListBlockConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ListItemConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ParagraphConverter.php', + 'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/PreformattedConverter.php', + 'League\\HTMLToMarkdown\\Converter\\TextConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/TextConverter.php', + 'League\\HTMLToMarkdown\\Element' => __DIR__ . '/..' . '/league/html-to-markdown/src/Element.php', + 'League\\HTMLToMarkdown\\ElementInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/ElementInterface.php', + 'League\\HTMLToMarkdown\\Environment' => __DIR__ . '/..' . '/league/html-to-markdown/src/Environment.php', + 'League\\HTMLToMarkdown\\HtmlConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/HtmlConverter.php', 'Mobile_Detect' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/Mobile_Detect.php', 'OS_Guess' => __DIR__ . '/..' . '/pear-pear.php.net/PEAR/OS/Guess.php', 'PEAR' => __DIR__ . '/..' . '/pear-pear.php.net/PEAR/PEAR.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index d55aed01d..45038987b 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -330,5 +330,71 @@ "PHP License" ], "description": "Text_Highlighter is a package for syntax highlighting.\n\nIt provides a base class provining all the functionality,\nand a descendent classes geneator class.\n\nThe main idea is to simplify creation of subclasses\nimplementing syntax highlighting for particular language.\nSubclasses do not implement any new functioanality,\nthey just provide syntax highlighting rules.\nThe rules sources are in XML format.\n\nTo create a highlighter for a language, there is no need\nto code a new class manually. Simply describe the rules\nin XML file and use Text_Highlighter_Generator to create\na new class." + }, + { + "name": "league/html-to-markdown", + "version": "4.4.1", + "version_normalized": "4.4.1.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/html-to-markdown.git", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/82ea375b5b2b1da1da222644c0565c695bf88186", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xml": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "time": "2017-03-16T00:45:59+00:00", + "bin": [ + "bin/html-to-markdown" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "description": "An HTML-to-markdown conversion helper for PHP", + "homepage": "https://github.com/thephpleague/html-to-markdown", + "keywords": [ + "html", + "markdown" + ] } ] diff --git a/vendor/league/html-to-markdown/CHANGELOG.md b/vendor/league/html-to-markdown/CHANGELOG.md new file mode 100644 index 000000000..067864412 --- /dev/null +++ b/vendor/league/html-to-markdown/CHANGELOG.md @@ -0,0 +1,214 @@ +# Change Log +All notable changes to this project will be documented in this file. +Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles. + +## [Unreleased][unreleased] + +## [4.4.1] + +### Fixed + - Fixed autolinking of invalid URLs (#129) + +## [4.4.0] + +### Added + - Added `hard_break` configuration option (#112, #115) + - The `HtmlConverter` can now be instantiated with an `Environment` (#118) + +### Fixed + - Fixed handling of paragraphs in list item elements (#47, #110) + - Fixed phantom spaces when newlines follow `br` elements (#116, #117) + - Fixed link converter not sanitizing inner spaces properly (#119, #120) + +## [4.3.1] +### Changed + - Revised the sanitization implementation (#109) + +### Fixed + - Fixed tag-like content not being escaped (#67, #109) + - Fixed thematic break-like content not being escaped (#65, #109) + - Fixed codefence-like content not being escaped (#64, #109) + +## [4.3.0] +### Added + - Added full support for PHP 7.0 and 7.1 + +### Changed + - Changed `` and `` conversions to use backticks instead of indendation (#102) + +### Fixed + - Fixed issue where specified code language was not preserved (#70, #102) + - Fixed issue where `` tags nested in `` was not converted properly (#70, #102) + - Fixed header-like content not being escaped (#76, #105) + - Fixed blockquote-like content not being escaped (#77, #103) + - Fixed ordered list-like content not being escaped (#73, #106) + - Fixed unordered list-like content not being escaped (#71, #107) + +## [4.2.2] +### Fixed + - Fixed sanitization bug which sometimes removes desired content (#63, #101) + +## [4.2.1] +### Fixed + - Fixed path to autoload.php when used as a library (#98) + - Fixed edge case for tags containing only whitespace (#99) + +### Removed + - Removed double HTML entity decoding, as this is not desireable (#60) + +## [4.2.0] + +### Added + - Added the ability to invoke HtmlConverter objects as functions (#85) + +### Fixed + - Fixed improper handling of nested list items (#19 and #84) + - Fixed preceeding or trailing spaces within emphasis tags (#83) + +## [4.1.1] + +### Fixed + - Fixed conversion of empty paragraphs (#78) + - Fixed `preg_replace` so it wouldn't break UTF-8 characters (#79) + +## [4.1.0] + +### Added + - Added `bin/html-to-markdown` script + +### Changed + - Changed default italic character to `_` (#58) + +## [4.0.1] + +### Fixed + - Added escaping to avoid * and _ in a text being rendered as emphasis (#48) + +### Removed + - Removed the demo (#51) + - `.styleci.yml` and `CONTRIBUTING.md` are no longer included in distributions (#50) + +## [4.0.0] + +This release changes the visibility of several methods/properties. #42 and #43 brought to light that some visiblities were +not ideally set, so this releases fixes that. Moving forwards this should reduce the chance of introducing BC-breaking changes. + +### Added + - Added new `HtmlConverter::getEnvironment()` method to expose the `Environment` (#42, #43) + +### Changed + - Changed `Environment::addConverter()` from `protected` to `public`, enabling custom converters to be added (#42, #43) + - Changed `HtmlConverter::createDOMDocument()` from `protected` to `private` + - Changed `Element::nextCached` from `protected` to `private` + - Made the `Environment` class `final` + +## [3.1.1] +### Fixed + - Empty HTML strings now result in empty Markdown documents (#40, #41) + +## [3.1.0] +### Added + - Added new `equals` method to `Element` to check for equality + +### Changes + - Use Linux line endings consistently instead of plaform-specific line endings (#36) + +### Fixed + - Cleaned up code style + +## [3.0.0] +### Changed + - Changed namespace to `League\HTMLToMarkdown` + - Changed packagist name to `league/html-to-markdown` + - Re-organized code into several separate classes + - `` tags with identical href and inner text are now rendered using angular bracket syntax (#31) + - `` elements are now treated as block-level elements (#33) + +## [2.2.2] +### Added + - Added support for PHP 5.6 and HHVM + - Enabled testing against PHP 7 nightlies + - Added this CHANGELOG.md + +### Fixed + - Fixed whitespace preservation between inline elements (#9 and #10) + +## [2.2.1] +### Fixed + - Preserve placeholder links (#22) + +## [2.2.0] +### Added + - Added CircleCI config + +### Changed + - `` blocks are now treated as code elements + +### Removed + - Dropped support for PHP 5.2 + - Removed incorrect README comment regarding `#text` nodes (#17) + +## [2.1.2] +### Added + - Added the ability to blacklist/remove specific node types (#11) + +### Changed + - Line breaks are now placed after divs instead of before them + - Newlines inside of link texts are now removed + - Updated the minimum PHPUnit version to 4.* + +## [2.1.1] +### Added + - Added options to customize emphasis characters + +## [2.1.0] +### Added + - Added option to strip HTML tags without Markdown equivalents + - Added `convert()` method for converter reuse + - Added ability to set options after instance construction + - Documented the required PHP extensions (#4) + +### Changed + - ATX style now used for h1 and h2 tags inside blockquotes + +### Fixed + - Newlines inside blockquotes are now started with a bracket + - Fixed some incorrect docblocks + - `__toString()` now returns an empty string if input is empty + - Convert head tag if body tag is empty (#7) + - Preserve special characters inside tags without md equivalents (#6) + + +## [2.0.1] +### Fixed + - Fixed first line indentation for multi-line code blocks + - Fixed consecutive anchors get separating spaces stripped (#3) + +## [2.0.0] +### Added + - Initial release + +[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.4.1...master +[4.4.1]: https://github.com/thephpleague/html-to-markdown/compare/4.4.0...4.4.1 +[4.4.0]: https://github.com/thephpleague/html-to-markdown/compare/4.3.1...4.4.0 +[4.3.1]: https://github.com/thephpleague/html-to-markdown/compare/4.3.0...4.3.1 +[4.3.0]: https://github.com/thephpleague/html-to-markdown/compare/4.2.2...4.3.0 +[4.2.2]: https://github.com/thephpleague/html-to-markdown/compare/4.2.1...4.2.2 +[4.2.1]: https://github.com/thephpleague/html-to-markdown/compare/4.2.0...4.2.1 +[4.2.0]: https://github.com/thephpleague/html-to-markdown/compare/4.1.1...4.2.0 +[4.1.1]: https://github.com/thephpleague/html-to-markdown/compare/4.1.0...4.1.1 +[4.1.0]: https://github.com/thephpleague/html-to-markdown/compare/4.0.1...4.1.0 +[4.0.1]: https://github.com/thephpleague/html-to-markdown/compare/4.0.0...4.0.1 +[4.0.0]: https://github.com/thephpleague/html-to-markdown/compare/3.1.1...4.0.0 +[3.1.1]: https://github.com/thephpleague/html-to-markdown/compare/3.1.0...3.1.1 +[3.1.0]: https://github.com/thephpleague/html-to-markdown/compare/3.0.0...3.1.0 +[3.0.0]: https://github.com/thephpleague/html-to-markdown/compare/2.2.2...3.0.0 +[2.2.2]: https://github.com/thephpleague/html-to-markdown/compare/2.2.1...2.2.2 +[2.2.1]: https://github.com/thephpleague/html-to-markdown/compare/2.2.0...2.2.1 +[2.2.0]: https://github.com/thephpleague/html-to-markdown/compare/2.1.2...2.2.0 +[2.1.2]: https://github.com/thephpleague/html-to-markdown/compare/2.1.1...2.1.2 +[2.1.1]: https://github.com/thephpleague/html-to-markdown/compare/2.1.0...2.1.1 +[2.1.0]: https://github.com/thephpleague/html-to-markdown/compare/2.0.1...2.1.0 +[2.0.1]: https://github.com/thephpleague/html-to-markdown/compare/2.0.0...2.0.1 +[2.0.0]: https://github.com/thephpleague/html-to-markdown/compare/775f91e...2.0.0 + diff --git a/vendor/league/html-to-markdown/CONDUCT.md b/vendor/league/html-to-markdown/CONDUCT.md new file mode 100644 index 000000000..01b8644f1 --- /dev/null +++ b/vendor/league/html-to-markdown/CONDUCT.md @@ -0,0 +1,22 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) diff --git a/library/html-to-markdown/LICENSE b/vendor/league/html-to-markdown/LICENSE similarity index 93% rename from library/html-to-markdown/LICENSE rename to vendor/league/html-to-markdown/LICENSE index f538c2ac9..6c04a59dd 100644 --- a/library/html-to-markdown/LICENSE +++ b/vendor/league/html-to-markdown/LICENSE @@ -1,6 +1,8 @@ The MIT License (MIT) -Copyright (c) 2013 Nick Cernis +Copyright (c) 2015 Colin O'Dell + +Originally created by Nick Cernis Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/vendor/league/html-to-markdown/README.md b/vendor/league/html-to-markdown/README.md new file mode 100644 index 000000000..8d75649d6 --- /dev/null +++ b/vendor/league/html-to-markdown/README.md @@ -0,0 +1,196 @@ +HTML To Markdown for PHP +======================== + +[](https://gitter.im/thephpleague/html-to-markdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +[](https://packagist.org/packages/league/html-to-markdown) +[](LICENSE) +[](https://travis-ci.org/thephpleague/html-to-markdown) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown/code-structure) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown) +[](https://packagist.org/packages/league/html-to-markdown) + +Library which converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. + + +**Requires**: PHP 5.3+ + +**Lead Developer**: [@colinodell](http://twitter.com/colinodell) + +**Original Author**: [@nickcernis](http://twitter.com/nickcernis) + + +### Why convert HTML to Markdown? + +*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](https://github.com/thephpleague/commonmark),"* you continue, already labouring the question somewhat, *"but why go the other way?"* + +Typically you would convert HTML to Markdown if: + +1. You have an existing HTML document that needs to be edited by people with good taste. +2. You want to store new content in HTML format but edit it as Markdown. +3. You want to convert HTML email to plain text email. +4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. +5. You just really like Markdown. + +### How to use it + +Require the library by issuing this command: + +```bash +composer require league/html-to-markdown +``` + +Add `require 'vendor/autoload.php';` to the top of your script. + +Next, create a new HtmlConverter instance, passing in your valid HTML code to its `convert()` function: + +```php +use League\HTMLToMarkdown\HtmlConverter; + +$converter = new HtmlConverter(); + +$html = "Quick, to the Batpoles!"; +$markdown = $converter->convert($html); +``` + +The `$markdown` variable now contains the Markdown version of your HTML as a string: + +```php +echo $markdown; // ==> ### Quick, to the Batpoles! +``` + +The included `demo` directory contains an HTML->Markdown conversion form to try out. + +### Conversion options + +By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. + +To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: + +```php +$converter = new HtmlConverter(array('strip_tags' => true)); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Or more explicitly, like this: + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('strip_tags', true); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Note that only the tags themselves are stripped, not the content they hold. + +To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: + +```php +$converter = new HtmlConverter(array('remove_nodes' => 'span div')); + +$html = 'Turnips!Monkeys!'; +$markdown = $converter->convert($html); // $markdown now contains "" +``` + +### Style options + +Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('italic_style', '_'); +$converter->getConfig()->setOption('bold_style', '__'); + +$html = 'Italic and a bold'; +$markdown = $converter->convert($html); // $markdown now contains "_Italic_ and a __bold__" +``` + +### Line break options + +By default, `br` tags are converted to two spaces followed by a newline character as per [traditional Markdown](https://daringfireball.net/projects/markdown/syntax#p). Set `hard_break` to `true` to omit the two spaces, as per GitHub Flavored Markdown (GFM). + +```php +$converter = new HtmlConverter(); +$html = 'testline break'; + +$converter->getConfig()->setOption('hard_break', true); +$markdown = $converter->convert($html); // $markdown now contains "test\nline break" + +$converter->getConfig()->setOption('hard_break', false); // default +$markdown = $converter->convert($html); // $markdown now contains "test \nline break" +``` + +### Passing custom Environment object + +You can pass current `Environment` object to customize i.e. which converters should be used. + +```php +$environment = new Environment(array( + // your configuration here +)); +$environment->addConverter(new HeaderConverter()); // optionally - add converter manually + +$converter = new HtmlConverter($environment); + +$html = 'Header + +'; +$markdown = $converter->convert($html); // $markdown now contains "### Header" and "" +``` + +### Limitations + +- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. + +### Known issues + +- Nested lists and lists containing multiple paragraphs aren't converted correctly. +- Lists inside blockquotes aren't converted correctly. +- Any reported [open issues here](https://github.com/thephpleague/html-to-markdown/issues?state=open). + +[Report your issue or request a feature here.](https://github.com/thephpleague/html-to-markdown/issues/new) Issues with patches or failing tests are especially welcome. + +### Style notes + +- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: + + `$converter = new HtmlConverter(array('header_style'=>'atx'));` + + Headers of H3 priority and lower always use atx style. + +- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. +- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. + +### Dependencies + +HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. + +Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. + +### Contributors + +Many thanks to all [contributors](https://github.com/thephpleague/html-to-markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. + +### How it works + +HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. + +### To-do + +- Support for nested lists and lists inside blockquotes. +- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). + +### Trying to convert Markdown to HTML? + +Use one of these great libraries: + + - [league/commonmark](https://github.com/thephpleague/commonmark) (recommended) + - [cebe/markdown](https://github.com/cebe/markdown) + - [PHP Markdown](https://michelf.ca/projects/php-markdown/) + - [Parsedown](https://github.com/erusev/parsedown) + +No guarantees about the Elvish, though. + diff --git a/vendor/league/html-to-markdown/bin/html-to-markdown b/vendor/league/html-to-markdown/bin/html-to-markdown new file mode 100644 index 000000000..2815a7cef --- /dev/null +++ b/vendor/league/html-to-markdown/bin/html-to-markdown @@ -0,0 +1,108 @@ +#!/usr/bin/env php + $arg) { + if ($i === 0) { + continue; + } + + if (substr($arg, 0, 1) === '-') { + switch ($arg) { + case '-h': + case '--help': + echo getHelpText(); + exit(0); + default: + fail('Unknown option: ' . $arg); + } + } else { + $src = $argv[1]; + } +} + +if (isset($src)) { + if (!file_exists($src)) { + fail('File not found: ' . $src); + } + + $html = file_get_contents($src); +} else { + $stdin = fopen('php://stdin', 'r'); + stream_set_blocking($stdin, false); + $html = stream_get_contents($stdin); + fclose($stdin); + + if (empty($html)) { + fail(getHelpText()); + } +} + + +$converter = new League\HTMLToMarkdown\HtmlConverter(); +echo $converter->convert($html); + +/** + * Get help and usage info + * + * @return string + */ +function getHelpText() +{ + return << output.md + + Converting from STDIN: + + echo -e 'Hello World!' | html-to-markdown + + Converting from STDIN and saving the output: + + echo -e 'Hello World!' | html-to-markdown > output.md + +HELP; +} + +/** + * @param string $message Error message + */ +function fail($message) +{ + fwrite(STDERR, $message . "\n"); + exit(1); +} + +function requireAutoloader() +{ + $autoloadPaths = array( + // Local package usage + __DIR__ . '/../vendor/autoload.php', + // Package was included as a library + __DIR__ . '/../../../autoload.php', + ); + foreach ($autoloadPaths as $path) { + if (file_exists($path)) { + require_once $path; + break; + } + } +} diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json new file mode 100644 index 000000000..58764bcb5 --- /dev/null +++ b/vendor/league/html-to-markdown/composer.json @@ -0,0 +1,48 @@ +{ + "name": "league/html-to-markdown", + "type": "library", + "description": "An HTML-to-markdown conversion helper for PHP", + "keywords": ["markdown", "html"], + "homepage": "https://github.com/thephpleague/html-to-markdown", + "license": "MIT", + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "League\\HTMLToMarkdown\\Test\\": "tests" + } + }, + "require": { + "php": ">=5.3.3", + "ext-dom": "*", + "ext-xml": "*" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "bin": ["bin/html-to-markdown"], + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + } +} diff --git a/vendor/league/html-to-markdown/src/Configuration.php b/vendor/league/html-to-markdown/src/Configuration.php new file mode 100644 index 000000000..2943383aa --- /dev/null +++ b/vendor/league/html-to-markdown/src/Configuration.php @@ -0,0 +1,60 @@ +config = $config; + } + + /** + * @param array $config + */ + public function merge(array $config = array()) + { + $this->config = array_replace_recursive($this->config, $config); + } + + /** + * @param array $config + */ + public function replace(array $config = array()) + { + $this->config = $config; + } + + /** + * @param string $key + * @param mixed $value + */ + public function setOption($key, $value) + { + $this->config[$key] = $value; + } + + /** + * @param string|null $key + * @param mixed|null $default + * + * @return mixed|null + */ + public function getOption($key = null, $default = null) + { + if ($key === null) { + return $this->config; + } + + if (!isset($this->config[$key])) { + return $default; + } + + return $this->config[$key]; + } +} diff --git a/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php new file mode 100644 index 000000000..8aca530be --- /dev/null +++ b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php @@ -0,0 +1,11 @@ +' symbols to each line. + + $markdown = ''; + + $quote_content = trim($element->getValue()); + + $lines = preg_split('/\r\n|\r|\n/', $quote_content); + + $total_lines = count($lines); + + foreach ($lines as $i => $line) { + $markdown .= '> ' . $line . "\n"; + if ($i + 1 === $total_lines) { + $markdown .= "\n"; + } + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('blockquote'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php new file mode 100644 index 000000000..c8ec2c005 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php @@ -0,0 +1,62 @@ +getAttribute('class'); + + if ($classes) { + // Since tags can have more than one class, we need to find the one that starts with 'language-' + $classes = explode(' ', $classes); + foreach ($classes as $class) { + if (strpos($class, 'language-') !== false) { + // Found one, save it as the selected language and stop looping over the classes. + // The space after the language avoids gluing the actual code with the language tag + $language = str_replace('language-', '', $class) . ' '; + break; + } + } + } + + $markdown = ''; + $code = html_entity_decode($element->getChildrenAsString()); + + // In order to remove the code tags we need to search for them and, in the case of the opening tag + // use a regular expression to find the tag and the other attributes it might have + $code = preg_replace('/]*>/', '', $code); + $code = str_replace('', '', $code); + + // Checking if the code has multiple lines + $lines = preg_split('/\r\n|\r|\n/', $code); + if (count($lines) > 1) { + // Multiple lines detected, adding three backticks and newlines + $markdown .= '```' . $language . "\n" . $code . "\n" . '```'; + } else { + // One line of code, wrapping it on one backtick. + $markdown .= '`' . $language . $code . '`'; + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('code'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CommentConverter.php b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php new file mode 100644 index 000000000..55038b254 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php @@ -0,0 +1,26 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, + // such as nodes on their own. C14N() canonicalizes the node to a string. + // See: http://www.php.net/manual/en/domnode.c14n.php + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue(); + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array(self::DEFAULT_CONVERTER); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/DivConverter.php b/vendor/league/html-to-markdown/src/Converter/DivConverter.php new file mode 100644 index 000000000..656a0ba4d --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/DivConverter.php @@ -0,0 +1,45 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue() . "\n\n"; + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('div'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php new file mode 100644 index 000000000..67250769b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php @@ -0,0 +1,57 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $tag = $element->getTagName(); + $value = $element->getValue(); + + if (!trim($value)) { + return ''; + } + + if ($tag === 'i' || $tag === 'em') { + $style = $this->config->getOption('italic_style'); + } else { + $style = $this->config->getOption('bold_style'); + } + + $prefix = ltrim($value) !== $value ? ' ' : ''; + $suffix = rtrim($value) !== $value ? ' ' : ''; + + return $prefix . $style . trim($value) . $style . $suffix; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('em', 'i', 'strong', 'b'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php new file mode 100644 index 000000000..37cd44e73 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php @@ -0,0 +1,41 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + return $this->config->getOption('hard_break') ? "\n" : " \n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('br'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php new file mode 100644 index 000000000..d117e7d36 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php @@ -0,0 +1,78 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $level = (int) substr($element->getTagName(), 1, 1); + $style = $this->config->getOption('header_style', self::STYLE_SETEXT); + + if (($level === 1 || $level === 2) && !$element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) { + return $this->createSetextHeader($level, $element->getValue()); + } + + return $this->createAtxHeader($level, $element->getValue()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'); + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createSetextHeader($level, $content) + { + $length = function_exists('mb_strlen') ? mb_strlen($content, 'utf-8') : strlen($content); + $underline = ($level === 1) ? '=' : '-'; + + return $content . "\n" . str_repeat($underline, $length) . "\n\n"; + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createAtxHeader($level, $content) + { + $prefix = str_repeat('#', $level) . ' '; + + return $prefix . $content . "\n\n"; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php new file mode 100644 index 000000000..8f54f9397 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php @@ -0,0 +1,26 @@ +getAttribute('src'); + $alt = $element->getAttribute('alt'); + $title = $element->getAttribute('title'); + + if ($title !== '') { + // No newlines added. should be in a block-level element. + return ''; + } + + return ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('img'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php new file mode 100644 index 000000000..f0765f38b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php @@ -0,0 +1,52 @@ +getAttribute('href'); + $title = $element->getAttribute('title'); + $text = trim($element->getValue()); + + if ($title !== '') { + $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; + } elseif ($href === $text && $this->isValidAutolink($href)) { + $markdown = '<' . $href . '>'; + } else { + $markdown = '[' . $text . '](' . $href . ')'; + } + + if (!$href) { + $markdown = html_entity_decode($element->getChildrenAsString()); + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('a'); + } + + /** + * @param string $href + * + * @return bool + */ + private function isValidAutolink($href) + { + return preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php new file mode 100644 index 000000000..07a4c85a9 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php @@ -0,0 +1,26 @@ +getValue() . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('ol', 'ul'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php new file mode 100644 index 000000000..dafec077c --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php @@ -0,0 +1,47 @@ +getParent()->getTagName(); + + // Add spaces to start for nested list items + $level = $element->getListItemLevel($element); + + $prefixForParagraph = str_repeat(' ', $level + 1); + $value = trim(implode("\n" . $prefixForParagraph, explode("\n", trim($element->getValue())))); + + // If list item is the first in a nested list, add a newline before it + $prefix = ''; + if ($level > 0 && $element->getSiblingPosition() === 1) { + $prefix = "\n"; + } + + if ($list_type === 'ul') { + return $prefix . '- ' . $value . "\n"; + } + + $number = $element->getSiblingPosition(); + + return $prefix . $number . '. ' . $value . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('li'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php new file mode 100644 index 000000000..cf852bfcf --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php @@ -0,0 +1,124 @@ +getValue(); + + $markdown = ''; + + $lines = preg_split('/\r\n|\r|\n/', $value); + foreach ($lines as $line) { + /* + * Some special characters need to be escaped based on the position that they appear + * The following function will deal with those special cases. + */ + $markdown .= $this->escapeSpecialCharacters($line); + $markdown .= "\n"; + } + + return trim($markdown) !== '' ? rtrim($markdown) . "\n\n" : ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('p'); + } + + /** + * @param string $line + * + * @return string + */ + private function escapeSpecialCharacters($line) + { + $line = $this->escapeFirstCharacters($line); + $line = $this->escapeOtherCharacters($line); + $line = $this->escapeOtherCharactersRegex($line); + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeFirstCharacters($line) + { + $escapable = array( + '>', + '- ', + '+ ', + '--', + '~~~', + '---', + '- - -' + ); + + foreach ($escapable as $i) { + if (strpos(ltrim($line), $i) === 0) { + // Found a character that must be escaped, adding a backslash before + return '\\' . ltrim($line); + } + } + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeOtherCharacters($line) + { + $escapable = array( + ' {{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache_duration}} diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl index a8243b614..e65014413 100644 --- a/view/templates/admin_summary.tpl +++ b/view/templates/admin_summary.tpl @@ -11,7 +11,7 @@ {{$queues.label}} - {{$queues.deliverq}} - {{$queues.queue}} - {{$queues.workerq}} + {{$queues.queue}} - {{$queues.workerq}} {{$pending.0}} diff --git a/view/templates/head.tpl b/view/templates/head.tpl index 0772af0bc..e7df8a18c 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -7,7 +7,7 @@ - + @@ -19,6 +19,7 @@ +
([^<]*)
for Diaspora inline code blocks + if ($simplehtml === 3) { + $return = '' . $match[1] . ''; + } + return $return; + } + , $Text); // Unhide all [noparse] contained bbtags unspacefying them // and triming the [noparse] tag. - $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim',$Text); - $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim',$Text); - $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim',$Text); + $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim', $Text); + $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim', $Text); + $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim', $Text); - $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/','&$1;',$Text); - $Text = preg_replace('/\&\#039\;/','\'',$Text); - $Text = preg_replace('/\"\;/','"',$Text); + $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/', '&$1;', $Text); + $Text = preg_replace('/\&\#039\;/', '\'', $Text); + $Text = preg_replace('/\"\;/', '"', $Text); // fix any escaped ampersands that may have been converted into links $Text = preg_replace('/\<([^>]*?)(src|href)=(.*?)\&\;(.*?)\>/ism', '<$1$2=$3&$4>', $Text); @@ -1178,7 +1266,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $regex = '#<([^>]*?)(href)="(?!' . implode('|', $allowed_link_protocols) . ')(.*?)"(.*?)>#ism'; $Text = preg_replace($regex, '<$1$2="javascript:void(0)"$4 class="invalid-href" title="' . t('Invalid link protocol') . '">', $Text); - if($saved_image) { + if ($saved_image) { $Text = bb_replace_images($Text, $saved_image); } @@ -1198,19 +1286,19 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $Text = $doc->saveHTML(); $Text = str_replace(array("", "", $doctype, $encoding), array("", "", "", ""), $Text); - $Text = str_replace('','', $Text); + $Text = str_replace('', '', $Text); //$Text = mb_convert_encoding($Text, "UTF-8", 'HTML-ENTITIES'); } // Clean up some useless linebreaks in lists - //$Text = str_replace('','', $Text); - //$Text = str_replace('','', $Text); - //$Text = str_replace('','', $Text); - // $Text = str_replace('', '', $Text); + //$Text = str_replace('', '', $Text); + //$Text = str_replace('', '', $Text); + //$Text = str_replace(' diff --git a/include/cli_startup.php b/include/cli_startup.php index 4b66b47a0..557d08c28 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -19,7 +19,7 @@ function cli_startup() { require_once("dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); - }; + }; require_once('include/session.php'); diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 56c032847..7069af066 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -9,12 +9,12 @@ function contact_profile_assign($current,$foreign_net) { $o .= "\r\n"; - $r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d", + $r = q("SELECT `id`, `profile-name`, `is-default` FROM `profile` WHERE `uid` = %d", intval($_SESSION['uid'])); if (dbm::is_result($r)) { foreach ($r as $rr) { - $selected = (($rr['id'] == $current) ? " selected=\"selected\" " : ""); + $selected = (($rr['id'] == $current || ($current == 0 && $rr['is-default'] == 1)) ? " selected=\"selected\" " : ""); $o .= "{$rr['profile-name']}\r\n"; } } @@ -37,7 +37,7 @@ function contact_reputation($current) { 5 => t('Reputable, has my trust') ); - foreach($rep as $k => $v) { + foreach ($rep as $k => $v) { $selected = (($k == $current) ? " selected=\"selected\" " : ""); $o .= "$v\r\n"; } @@ -61,7 +61,7 @@ function contact_poll_interval($current, $disabled = false) { 5 => t('Monthly') ); - foreach($rep as $k => $v) { + foreach ($rep as $k => $v) { $selected = (($k == $current) ? " selected=\"selected\" " : ""); $o .= "$v\r\n"; } diff --git a/include/contact_widgets.php b/include/contact_widgets.php index d077a065e..5dd3a8bb4 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -2,7 +2,7 @@ function follow_widget($value = "") { - return replace_macros(get_markup_template('follow.tpl'),array( + return replace_macros(get_markup_template('follow.tpl'), array( '$connect' => t('Add New Contact'), '$desc' => t('Enter address or web location'), '$hint' => t('Example: bob@example.com, http://example.com/barbara'), @@ -13,20 +13,20 @@ function follow_widget($value = "") { } function findpeople_widget() { - require_once('include/Contact.php'); + require_once 'include/Contact.php'; $a = get_app(); - if(get_config('system','invitation_only')) { - $x = get_pconfig(local_user(),'system','invites_remaining'); - if($x || is_site_admin()) { + if (get_config('system', 'invitation_only')) { + $x = get_pconfig(local_user(), 'system', 'invites_remaining'); + if ($x || is_site_admin()) { $a->page['aside'] .= '' - . sprintf( tt('%d invitation available','%d invitations available',$x), $x) + . sprintf( tt('%d invitation available', '%d invitations available', $x), $x) . '' . $inv; } } - return replace_macros(get_markup_template('peoplefind.tpl'),array( + return replace_macros(get_markup_template('peoplefind.tpl'), array( '$findpeople' => t('Find People'), '$desc' => t('Enter name or interest'), '$label' => t('Connect/Follow'), @@ -45,32 +45,41 @@ function unavailable_networks() { $networks = array(); - if (!plugin_enabled("appnet")) + if (!plugin_enabled("appnet")) { $networks[] = NETWORK_APPNET; + } - if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook")) + if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook")) { $networks[] = NETWORK_FACEBOOK; + } - if (!plugin_enabled("statusnet")) + if (!plugin_enabled("statusnet")) { $networks[] = NETWORK_STATUSNET; + } - if (!plugin_enabled("pumpio")) + if (!plugin_enabled("pumpio")) { $networks[] = NETWORK_PUMPIO; + } - if (!plugin_enabled("twitter")) + if (!plugin_enabled("twitter")) { $networks[] = NETWORK_TWITTER; + } - if (get_config("system","ostatus_disabled")) + if (get_config("system", "ostatus_disabled")) { $networks[] = NETWORK_OSTATUS; + } - if (!get_config("system","diaspora_enabled")) + if (!get_config("system", "diaspora_enabled")) { $networks[] = NETWORK_DIASPORA; + } - if (!plugin_enabled("pnut")) + if (!plugin_enabled("pnut")) { $networks[] = NETWORK_PNUT; + } - if (!sizeof($networks)) + if (!sizeof($networks)) { return ""; + } $network_filter = implode("','", $networks); @@ -79,7 +88,7 @@ function unavailable_networks() { return $network_filter; } -function networks_widget($baseurl,$selected = '') { +function networks_widget($baseurl, $selected = '') { $a = get_app(); @@ -87,7 +96,7 @@ function networks_widget($baseurl,$selected = '') { return ''; } - if (!feature_enabled(local_user(),'networks')) { + if (!feature_enabled(local_user(), 'networks')) { return ''; } @@ -99,7 +108,7 @@ function networks_widget($baseurl,$selected = '') { $nets = array(); if (dbm::is_result($r)) { - require_once('include/contact_selectors.php'); + require_once 'include/contact_selectors.php'; foreach ($r as $rr) { /// @TODO If 'network' is not there, this triggers an E_NOTICE if ($rr['network']) { @@ -108,10 +117,11 @@ function networks_widget($baseurl,$selected = '') { } } - if(count($nets) < 2) + if (count($nets) < 2) { return ''; + } - return replace_macros(get_markup_template('nets.tpl'),array( + return replace_macros(get_markup_template('nets.tpl'), array( '$title' => t('Networks'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -122,31 +132,31 @@ function networks_widget($baseurl,$selected = '') { )); } -function fileas_widget($baseurl,$selected = '') { +function fileas_widget($baseurl, $selected = '') { if (! local_user()) { return ''; } - if (! feature_enabled(local_user(),'filing')) { + if (! feature_enabled(local_user(), 'filing')) { return ''; } - $saved = get_pconfig(local_user(),'system','filetags'); + $saved = get_pconfig(local_user(), 'system', 'filetags'); if (! strlen($saved)) { return; } $matches = false; $terms = array(); - $cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { + foreach ($matches as $mtch) { $unescaped = xmlify(file_tag_decode($mtch[1])); - $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); + $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); } } - return replace_macros(get_markup_template('fileas_widget.tpl'),array( + return replace_macros(get_markup_template('fileas_widget.tpl'), array( '$title' => t('Saved Folders'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -157,30 +167,31 @@ function fileas_widget($baseurl,$selected = '') { )); } -function categories_widget($baseurl,$selected = '') { +function categories_widget($baseurl, $selected = '') { $a = get_app(); - if (! feature_enabled($a->profile['profile_uid'],'categories')) { + if (! feature_enabled($a->profile['profile_uid'], 'categories')) { return ''; } - $saved = get_pconfig($a->profile['profile_uid'],'system','filetags'); + $saved = get_pconfig($a->profile['profile_uid'], 'system', 'filetags'); if (! strlen($saved)) { return; } $matches = false; $terms = array(); - $cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER); - if($cnt) { - foreach($matches as $mtch) { - $unescaped = xmlify(file_tag_decode($mtch[1])); - $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); + $cnt = preg_match_all('/<(.*?)>/', $saved, $matches, PREG_SET_ORDER); + + if ($cnt) { + foreach ($matches as $mtch) { + $unescaped = xmlify(file_tag_decode($mtch[1])); + $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); } } - return replace_macros(get_markup_template('categories_widget.tpl'),array( + return replace_macros(get_markup_template('categories_widget.tpl'), array( '$title' => t('Categories'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -195,29 +206,30 @@ function common_friends_visitor_widget($profile_uid) { $a = get_app(); - if(local_user() == $profile_uid) + if (local_user() == $profile_uid) { return; + } $cid = $zcid = 0; - if(is_array($_SESSION['remote'])) { - foreach($_SESSION['remote'] as $visitor) { - if($visitor['uid'] == $profile_uid) { + if (is_array($_SESSION['remote'])) { + foreach ($_SESSION['remote'] as $visitor) { + if ($visitor['uid'] == $profile_uid) { $cid = $visitor['cid']; break; } } } - if(! $cid) { - if(get_my_url()) { + if (! $cid) { + if (get_my_url()) { $r = q("select id from contact where nurl = '%s' and uid = %d limit 1", dbesc(normalise_link(get_my_url())), intval($profile_uid) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $cid = $r[0]['id']; - else { + } else { $r = q("select id from gcontact where nurl = '%s' limit 1", dbesc(normalise_link(get_my_url())) ); @@ -227,22 +239,26 @@ function common_friends_visitor_widget($profile_uid) { } } - if($cid == 0 && $zcid == 0) + if ($cid == 0 && $zcid == 0) { return; + } - require_once('include/socgraph.php'); + require_once 'include/socgraph.php'; - if($cid) - $t = count_common_friends($profile_uid,$cid); - else - $t = count_common_friends_zcid($profile_uid,$zcid); - if(! $t) + if ($cid) { + $t = count_common_friends($profile_uid, $cid); + } else { + $t = count_common_friends_zcid($profile_uid, $zcid); + } + if (! $t) { return; + } - if($cid) - $r = common_friends($profile_uid,$cid,0,5,true); - else - $r = common_friends_zcid($profile_uid,$zcid,0,5,true); + if ($cid) { + $r = common_friends($profile_uid, $cid, 0, 5, true); + } else { + $r = common_friends_zcid($profile_uid, $zcid, 0, 5, true); + } return replace_macros(get_markup_template('remote_friends_common.tpl'), array( '$desc' => sprintf( tt("%d contact in common", "%d contacts in common", $t), $t), diff --git a/include/conversation.php b/include/conversation.php index 93c42cd7b..64204c696 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1,13 +1,15 @@ $new_body, 'images' => $saved_image); }} -if(! function_exists('item_redir_and_replace_images')) { +if (! function_exists('item_redir_and_replace_images')) { function item_redir_and_replace_images($body, $images, $cid) { $origbody = $body; @@ -57,7 +61,7 @@ function item_redir_and_replace_images($body, $images, $cid) { $cnt = 1; $pos = get_bb_tag_pos($origbody, 'url', 1); - while($pos !== false && $cnt < 1000) { + while ($pos !== false && $cnt < 1000) { $search = '/\[url\=(.*?)\]\[!#saved_image([0-9]*)#!\]\[\/url\]' . '/is'; $replace = '[url=' . z_path() . '/redir/' . $cid @@ -66,8 +70,9 @@ function item_redir_and_replace_images($body, $images, $cid) { $newbody .= substr($origbody, 0, $pos['start']['open']); $subject = substr($origbody, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']); $origbody = substr($origbody, $pos['end']['close']); - if($origbody === false) + if ($origbody === false) { $origbody = ''; + } $subject = preg_replace($search, $replace, $subject); $newbody .= $subject; @@ -79,45 +84,51 @@ function item_redir_and_replace_images($body, $images, $cid) { $cnt = 0; foreach ($images as $image) { - // We're depending on the property of 'foreach' (specified on the PHP website) that - // it loops over the array starting from the first element and going sequentially - // to the last element + /* + * We're depending on the property of 'foreach' (specified on the PHP website) that + * it loops over the array starting from the first element and going sequentially + * to the last element. + */ $newbody = str_replace('[!#saved_image' . $cnt . '#!]', '[img]' . $image . '[/img]', $newbody); $cnt++; } return $newbody; }} - - /** * Render actions localized */ -function localize_item(&$item){ +function localize_item(&$item) { $extracted = item_extract_images($item['body']); - if($extracted['images']) + if ($extracted['images']) { $item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']); + } - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - if (activity_match($item['verb'],ACTIVITY_LIKE) - || activity_match($item['verb'],ACTIVITY_DISLIKE) - || activity_match($item['verb'],ACTIVITY_ATTEND) - || activity_match($item['verb'],ACTIVITY_ATTENDNO) - || activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)){ + /// @Separted ??? + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; + if (activity_match($item['verb'], ACTIVITY_LIKE) + || activity_match($item['verb'], ACTIVITY_DISLIKE) + || activity_match($item['verb'], ACTIVITY_ATTEND) + || activity_match($item['verb'], ACTIVITY_ATTENDNO) + || activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) { - $r = q("SELECT * from `item`,`contact` WHERE - `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", - dbesc($item['parent-uri'])); - if (!dbm::is_result($r)) return; - $obj=$r[0]; + /// @TODO may hurt performance + $r = q("SELECT * FROM `item`, `contact` + WHERE `item`.`contact-id`=`contact`.`id` + AND `item`.`uri`='%s'", + dbesc($item['parent-uri'])); + if (!dbm::is_result($r)) { + return; + } + $obj = $r[0]; $author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; $objauthor = '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]'; - switch($obj['verb']){ + switch ($obj['verb']) { case ACTIVITY_POST: - switch ($obj['object-type']){ + switch ($obj['object-type']) { case ACTIVITY_OBJ_EVENT: $post_type = t('event'); break; @@ -126,9 +137,10 @@ function localize_item(&$item){ } break; default: - if($obj['resource-id']){ + if ($obj['resource-id']) { $post_type = t('photo'); - $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); + $m = array(); + preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); $rr['plink'] = $m[1]; } else { $post_type = t('status'); @@ -137,25 +149,25 @@ function localize_item(&$item){ $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; - if(activity_match($item['verb'],ACTIVITY_LIKE)) { + if (activity_match($item['verb'], ACTIVITY_LIKE)) { $bodyverb = t('%1$s likes %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_DISLIKE)) { + elseif (activity_match($item['verb'], ACTIVITY_DISLIKE)) { $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTEND)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTEND)) { $bodyverb = t('%1$s attends %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTENDNO)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTENDNO)) { $bodyverb = t('%1$s doesn\'t attend %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) { $bodyverb = t('%1$s attends maybe %2$s\'s %3$s'); } $item['body'] = sprintf($bodyverb, $author, $objauthor, $plink); } - if (activity_match($item['verb'],ACTIVITY_FRIEND)) { + if (activity_match($item['verb'], ACTIVITY_FRIEND)) { if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return; @@ -169,57 +181,65 @@ function localize_item(&$item){ $Bname = $obj->title; $Blink = ""; $Bphoto = ""; - foreach ($links->link as $l){ + foreach ($links->link as $l) { $atts = $l->attributes(); - switch($atts['rel']){ + switch ($atts['rel']) { case "alternate": $Blink = $atts['href']; case "photo": $Bphoto = $atts['href']; } - } $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; - if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]'; + if ($Bphoto != "") { + $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]'; + } $item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto; } - if (stristr($item['verb'],ACTIVITY_POKE)) { + if (stristr($item['verb'], ACTIVITY_POKE)) { $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); - if(! $verb) + if (! $verb) { return; - if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return; + } + if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) { + return; + } $Aname = $item['author-name']; $Alink = $item['author-link']; - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; $obj = parse_xml_string($xmlhead.$item['object']); $links = parse_xml_string($xmlhead."".unxmlify($obj->link).""); $Bname = $obj->title; - $Blink = ""; $Bphoto = ""; - foreach ($links->link as $l){ + $Blink = ""; + $Bphoto = ""; + foreach ($links->link as $l) { $atts = $l->attributes(); - switch($atts['rel']){ + switch ($atts['rel']) { case "alternate": $Blink = $atts['href']; case "photo": $Bphoto = $atts['href']; } - } $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; - if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]'; + if ($Bphoto != "") { + $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]'; + } - // we can't have a translation string with three positions but no distinguishable text - // So here is the translate string. + /* + * we can't have a translation string with three positions but no distinguishable text + * So here is the translate string. + */ $txt = t('%1$s poked %2$s'); // now translate the verb - $poked_t = trim(sprintf($txt, "","")); + $poked_t = trim(sprintf($txt, "", "")); $txt = str_replace( $poked_t, t($verb), $txt); // then do the sprintf on the translation string @@ -227,10 +247,11 @@ function localize_item(&$item){ $item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto; } - if (stristr($item['verb'],ACTIVITY_MOOD)) { - $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); - if(! $verb) + if (stristr($item['verb'], ACTIVITY_MOOD)) { + $verb = urldecode(substr($item['verb'], strpos($item['verb'], '#') + 1)); + if (! $verb) { return; + } $Aname = $item['author-name']; $Alink = $item['author-link']; @@ -241,19 +262,25 @@ function localize_item(&$item){ $item['body'] = sprintf($txt, $A, t($verb)); } - if (activity_match($item['verb'],ACTIVITY_TAG)) { - $r = q("SELECT * from `item`,`contact` WHERE - `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", - dbesc($item['parent-uri'])); - if (!dbm::is_result($r)) return; - $obj=$r[0]; + if (activity_match($item['verb'], ACTIVITY_TAG)) { + /// @TODO may hurt performance "joining" two tables + asterisk + $r = q("SELECT * FROM `item`, `contact` + WHERE `item`.`contact-id`=`contact`.`id` + AND `item`.`uri`='%s'", + dbesc($item['parent-uri'])); + + if (!dbm::is_result($r)) { + return; + } + + $obj = $r[0]; $author = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]'; $objauthor = '[url=' . zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]'; - switch($obj['verb']){ + switch ($obj['verb']) { case ACTIVITY_POST: - switch ($obj['object-type']){ + switch ($obj['object-type']) { case ACTIVITY_OBJ_EVENT: $post_type = t('event'); break; @@ -262,13 +289,15 @@ function localize_item(&$item){ } break; default: - if($obj['resource-id']){ + if ($obj['resource-id']) { $post_type = t('photo'); $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); $rr['plink'] = $m[1]; } else { $post_type = t('status'); } + // Let's break everthing ... ;-) + break; } $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; @@ -278,22 +307,24 @@ function localize_item(&$item){ $item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag ); } - if (activity_match($item['verb'],ACTIVITY_FAVORITE)){ + if (activity_match($item['verb'], ACTIVITY_FAVORITE)) { - if ($item['object-type']== "") + if ($item['object-type'] == "") { return; + } $Aname = $item['author-name']; $Alink = $item['author-link']; - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; $obj = parse_xml_string($xmlhead.$item['object']); - if(strlen($obj->id)) { - $r = q("select * from item where uri = '%s' and uid = %d limit 1", + if (strlen($obj->id)) { + $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($obj->id), intval($item['uid']) ); + if (dbm::is_result($r) && $r[0]['plink']) { $target = $r[0]; $Bname = $target['author-name']; @@ -302,21 +333,21 @@ function localize_item(&$item){ $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; $P = '[url=' . $target['plink'] . ']' . t('post/item') . '[/url]'; $item['body'] = sprintf( t('%1$s marked %2$s\'s %3$s as favorite'), $A, $B, $P)."\n"; - } } } $matches = null; - if(preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) { - foreach($matches as $mtch) { - if(! strpos($mtch[1],'zrl=')) - $item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']); + if (preg_match_all('/@\[url=(.*?)\]/is', $item['body'], $matches, PREG_SET_ORDER)) { + foreach ($matches as $mtch) { + if (! strpos($mtch[1], 'zrl=')) { + $item['body'] = str_replace($mtch[0], '@[url=' . zrl($mtch[1]) . ']', $item['body']); + } } } // add zrl's to public images $photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is"; - if(preg_match($photo_pattern,$item['body'])) { + if (preg_match($photo_pattern, $item['body'])) { $photo_replace = '[url=' . zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5' . '[/img][/url]'; $item['body'] = bb_tag_preg_replace($photo_pattern, $photo_replace, 'url', $item['body']); } @@ -326,27 +357,26 @@ function localize_item(&$item){ $x = stristr($item['plink'],'/display/'); if ($x) { $sparkle = false; - $y = best_link_url($item,$sparkle,true); + $y = best_link_url($item, $sparkle, true); - if (strstr($y,'/redir/')) { + if (strstr($y, '/redir/')) { $item['plink'] = $y . '?f=&url=' . $item['plink']; } } - - - } /** * Count the total of comments on this item and its desendants + * @TODO proper type-hint + doc-tag */ function count_descendants($item) { $total = count($item['children']); - if($total > 0) { - foreach($item['children'] as $child) { - if(! visible_activity($child)) + if ($total > 0) { + foreach ($item['children'] as $child) { + if (! visible_activity($child)) { $total --; + } $total += count_descendants($child); } } @@ -356,18 +386,19 @@ function count_descendants($item) { function visible_activity($item) { - // likes (etc.) can apply to other things besides posts. Check if they are post children, - // in which case we handle them specially - + /* + * likes (etc.) can apply to other things besides posts. Check if they are post children, + * in which case we handle them specially + */ $hidden_activities = array(ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE); - foreach($hidden_activities as $act) { - if(activity_match($item['verb'],$act)) { + foreach ($hidden_activities as $act) { + if (activity_match($item['verb'], $act)) { return false; } } - if(activity_match($item['verb'],ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) { - if(! (($item['self']) && ($item['uid'] == local_user()))) { + if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) { + if (! (($item['self']) && ($item['uid'] == local_user()))) { return false; } } @@ -379,9 +410,8 @@ function visible_activity($item) { * @brief SQL query for items */ function item_query() { - - return "SELECT ".item_fieldlists()." FROM `item` ". - item_joins()." WHERE ".item_condition(); + return "SELECT " . item_fieldlists() . " FROM `item` " . + item_joins() . " WHERE " . item_condition(); } /** @@ -439,7 +469,6 @@ These Fields are not added below (yet). They are here to for bug search. * @brief SQL join for contacts that are needed for displaying items */ function item_joins() { - return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`) LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` @@ -450,10 +479,10 @@ function item_joins() { * @brief SQL condition for items that are needed for displaying items */ function item_condition() { - return "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`"; } +if (!function_exists('conversation')) { /** * "Render" a conversation or list of items for HTML display. * There are two major forms of display: @@ -464,13 +493,11 @@ function item_condition() { * that are based on unique features of the calling module. * */ - -if(!function_exists('conversation')) { function conversation(App $a, $items, $mode, $update, $preview = false) { - require_once('include/bbcode.php'); - require_once('include/Contact.php'); - require_once('mod/proxy.php'); + require_once 'include/bbcode.php'; + require_once 'include/Contact.php'; + require_once 'mod/proxy.php'; $ssl_state = ((local_user()) ? true : false); @@ -480,100 +507,100 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $arr_blocked = null; - if(local_user()) { - $str_blocked = get_pconfig(local_user(),'system','blocked'); - if($str_blocked) { - $arr_blocked = explode(',',$str_blocked); - for($x = 0; $x < count($arr_blocked); $x ++) + if (local_user()) { + $str_blocked = get_pconfig(local_user(), 'system', 'blocked'); + if ($str_blocked) { + $arr_blocked = explode(',', $str_blocked); + for ($x = 0; $x < count($arr_blocked); $x ++) { $arr_blocked[$x] = trim($arr_blocked[$x]); + } } } $previewing = (($preview) ? ' preview ' : ''); - if($mode === 'network') { + if ($mode === 'network') { $profile_owner = local_user(); $page_writeable = true; - if(!$update) { - // The special div is needed for liveUpdate to kick in for this page. - // We only launch liveUpdate if you aren't filtering in some incompatible - // way and also you aren't writing a comment (discovered in javascript). - + if (!$update) { + /* + * The special div is needed for liveUpdate to kick in for this page. + * We only launch liveUpdate if you aren't filtering in some incompatible + * way and also you aren't writing a comment (discovered in javascript). + */ $live_update_div = '' . "\r\n" . "\r\n"; } - } - else if($mode === 'profile') { + } elseif ($mode === 'profile') { $profile_owner = $a->profile['profile_uid']; $page_writeable = can_write_wall($a,$profile_owner); - if(!$update) { + if (!$update) { $tab = notags(trim($_GET['tab'])); $tab = ( $tab ? $tab : 'posts' ); - if($tab === 'posts') { - // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, - // because browser prefetching might change it on us. We have to deliver it with the page. + if ($tab === 'posts') { + /* + * This is ugly, but we can't pass the profile_uid through the session to the ajax updater, + * because browser prefetching might change it on us. We have to deliver it with the page. + */ $live_update_div = '' . "\r\n" . "\r\n"; } } - } - else if($mode === 'notes') { + } elseif ($mode === 'notes') { $profile_owner = local_user(); $page_writeable = true; - if(!$update) { + if (!$update) { $live_update_div = '' . "\r\n" . "\r\n"; } - } - else if($mode === 'display') { + } elseif ($mode === 'display') { $profile_owner = $a->profile['uid']; $page_writeable = can_write_wall($a,$profile_owner); - if(!$update) { + if (!$update) { $live_update_div = '' . "\r\n" . ""; } - } - else if($mode === 'community') { + } elseif ($mode === 'community') { $profile_owner = 0; $page_writeable = false; - if(!$update) { + if (!$update) { $live_update_div = '' . "\r\n" . "\r\n"; } - } - else if($mode === 'search') { + } elseif ($mode === 'search') { $live_update_div = '' . "\r\n"; } $page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false); - if($update) + if ($update) { $return_url = $_SESSION['return_url']; - else + } else { $return_url = $_SESSION['return_url'] = $a->query_string; + } $cb = array('items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview); call_hooks('conversation_start',$cb); @@ -594,28 +621,32 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $page_template = get_markup_template("conversation.tpl"); - if($items && count($items)) { + if ($items && count($items)) { - if($mode === 'network-new' || $mode === 'search' || $mode === 'community') { + if ($mode === 'network-new' || $mode === 'search' || $mode === 'community') { - // "New Item View" on network page or search page results - // - just loop through the items and format them minimally for display + /* + * "New Item View" on network page or search page results + * - just loop through the items and format them minimally for display + */ -// $tpl = get_markup_template('search_item.tpl'); + /// @TODO old lost code? + // $tpl = get_markup_template('search_item.tpl'); $tpl = 'search_item.tpl'; - foreach($items as $item) { + foreach ($items as $item) { - if($arr_blocked) { + if ($arr_blocked) { $blocked = false; - foreach($arr_blocked as $b) { - if($b && link_compare($item['author-link'],$b)) { + foreach ($arr_blocked as $b) { + if ($b && link_compare($item['author-link'], $b)) { $blocked = true; break; } } - if($blocked) + if ($blocked) { continue; + } } @@ -626,70 +657,76 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $owner_name = ''; $sparkle = ''; - if($mode === 'search' || $mode === 'community') { - if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) + if ($mode === 'search' || $mode === 'community') { + if (((activity_match($item['verb'], ACTIVITY_LIKE)) || (activity_match($item['verb'], ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent'])) continue; $nickname = $item['nickname']; - } - else + } else { $nickname = $a->user['nickname']; + } // prevent private email from leaking. - if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) - continue; + if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { + continue; + } - $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); - if($item['author-link'] && (! $item['author-name'])) + $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); + if ($item['author-link'] && (! $item['author-name'])) { $profile_name = $item['author-link']; + } - - - $tags=array(); + $tags = array(); $hashtags = array(); $mentions = array(); $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`", intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION)); - foreach($taglist as $tag) { + foreach ($taglist as $tag) { - if ($tag["url"] == "") - $tag["url"] = $searchpath.strtolower($tag["term"]); + if ($tag["url"] == "") { + $tag["url"] = $searchpath . strtolower($tag["term"]); + } if ($tag["type"] == TERM_HASHTAG) { - $hashtags[] = "#".$tag["term"].""; + $hashtags[] = "#" . $tag["term"] . ""; $prefix = "#"; } elseif ($tag["type"] == TERM_MENTION) { - $mentions[] = "@".$tag["term"].""; + $mentions[] = "@" . $tag["term"] . ""; $prefix = "@"; } - $tags[] = $prefix."".$tag["term"].""; + $tags[] = $prefix."" . $tag["term"] . ""; } $sp = false; $profile_link = best_link_url($item,$sp); - if($profile_link === 'mailbox') + if ($profile_link === 'mailbox') { $profile_link = ''; - if($sp) - $sparkle = ' sparkle'; - else - $profile_link = zrl($profile_link); + } - if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) { + if ($sp) { + $sparkle = ' sparkle'; + } else { + $profile_link = zrl($profile_link); + } + + if (!x($item, 'author-thumb') OR ($item['author-thumb'] == "")) { $author_contact = get_contact_details_by_url($item['author-link'], $profile_owner); - if ($author_contact["thumb"]) + if ($author_contact["thumb"]) { $item['author-thumb'] = $author_contact["thumb"]; - else + } else { $item['author-thumb'] = $item['author-avatar']; + } } if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) { $owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner); - if ($owner_contact["thumb"]) + if ($owner_contact["thumb"]) { $item['owner-thumb'] = $owner_contact["thumb"]; - else + } else { $item['owner-thumb'] = $item['owner-avatar']; + } } $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); @@ -698,11 +735,11 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate)); localize_item($item); - if($mode === 'network-new') + if ($mode === 'network-new') { $dropping = true; - else + } else { $dropping = false; - + } $drop = array( 'dropping' => $dropping, @@ -718,12 +755,11 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $likebuttons = false; $shareable = false; - $body = prepare_body($item,true, $preview); - + $body = prepare_body($item, true, $preview); list($categories, $folders) = get_cats_and_terms($item); - if($a->theme['template_engine'] === 'internal') { + if ($a->theme['template_engine'] === 'internal') { $profile_name_e = template_escape($profile_name); $item['title_e'] = template_escape($item['title']); $body_e = template_escape($body); @@ -732,8 +768,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $mentions_e = template_escape($mentions); $location_e = template_escape($location); $owner_name_e = template_escape($owner_name); - } - else { + } else { $profile_name_e = $profile_name; $item['title_e'] = $item['title']; $body_e = $body; @@ -744,8 +779,9 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $owner_name_e = $owner_name; } - if ($item['item_network'] == "") + if ($item['item_network'] == "") { $item['item_network'] = $item['network']; + } $tmp_item = array( 'template' => $tpl, @@ -802,47 +838,45 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $threads[$threadsid]['items'] = array($arr['output']); } - } - else - { + } else { // Normal View $page_template = get_markup_template("threaded_conversation.tpl"); - require_once('object/Conversation.php'); - require_once('object/Item.php'); + require_once 'object/Conversation.php'; + require_once 'object/Item.php'; $conv = new Conversation($mode, $preview); - // get all the topmost parents - // this shouldn't be needed, as we should have only them in our array - // But for now, this array respects the old style, just in case - + /* + * get all the topmost parents + * this shouldn't be needed, as we should have only them in our array + * But for now, this array respects the old style, just in case + */ $threads = array(); - foreach($items as $item) { + foreach ($items as $item) { - if($arr_blocked) { + if ($arr_blocked) { $blocked = false; - foreach($arr_blocked as $b) { - - if($b && link_compare($item['author-link'],$b)) { + foreach ($arr_blocked as $b) { + if ($b && link_compare($item['author-link'], $b)) { $blocked = true; break; } } - if($blocked) + if ($blocked) { continue; + } } - - // Can we put this after the visibility check? builtin_activity_puller($item, $conv_responses); // Only add what is visible - if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { + if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { continue; } - if(! visible_activity($item)) { + + if (! visible_activity($item)) { continue; } @@ -850,7 +884,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $item['pagedrop'] = $page_dropping; - if($item['id'] == $item['parent']) { + if ($item['id'] == $item['parent']) { $item_object = new Item($item); $conv->add_thread($item_object); } @@ -858,7 +892,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $threads = $conv->get_template_data($conv_responses); - if(!$threads) { + if (!$threads) { logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG); $threads = array(); } @@ -873,13 +907,13 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { '$mode' => $mode, '$user' => $a->user, '$threads' => $threads, - '$dropping' => ($page_dropping && feature_enabled(local_user(),'multi_delete') ? t('Delete Selected Items') : False), + '$dropping' => ($page_dropping && feature_enabled(local_user(), 'multi_delete') ? t('Delete Selected Items') : False), )); return $o; }} -function best_link_url($item,&$sparkle,$ssl_state = false) { +function best_link_url($item, &$sparkle, $ssl_state = false) { $best_url = ''; $sparkle = false; @@ -889,16 +923,17 @@ function best_link_url($item,&$sparkle,$ssl_state = false) { if (local_user()) { $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' AND NOT `pending` LIMIT 1", dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url))); - if ($r) { - $best_url = 'redir/'.$r[0]['id']; + if (dbm::is_result($r)) { + $best_url = 'redir/' . $r[0]['id']; $sparkle = true; } } - if(! $best_url) { - if(strlen($item['author-link'])) + if (! $best_url) { + if (strlen($item['author-link'])) { $best_url = $item['author-link']; - else + } else { $best_url = $item['url']; + } } return $best_url; @@ -906,11 +941,10 @@ function best_link_url($item,&$sparkle,$ssl_state = false) { if (! function_exists('item_photo_menu')) { -function item_photo_menu($item) -{ +function item_photo_menu($item) { $ssl_state = false; - if(local_user()) { + if (local_user()) { $ssl_state = true; } @@ -938,13 +972,13 @@ function item_photo_menu($item) $rel = 0; $r = q("SELECT `id`, `network`, `rel` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1", intval(local_user()), dbesc(normalise_link($item['author-link']))); - if ($r) { + if (dbm::is_result($r)) { $cid = $r[0]['id']; $network = $r[0]['network']; $rel = $r[0]['rel']; } - if($sparkle) { + if ($sparkle) { $status_link = $profile_link . '?url=status'; $photos_link = $profile_link . '?url=photos'; $profile_link = $profile_link . '?url=profile'; @@ -964,7 +998,7 @@ function item_photo_menu($item) } if (local_user()) { - $menu = Array( + $menu = array( t('Follow Thread') => $sub_link, t('View Status') => $status_link, t('View Profile') => $profile_link, @@ -1004,6 +1038,7 @@ function item_photo_menu($item) return $o; }} +if (! function_exists('builtin_activity_puller')) { /** * @brief Checks item to see if it is one of the builtin activities (like/dislike, event attendance, consensus items, etc.) * Increments the count of each matching activity and adds a link to the author as needed. @@ -1012,13 +1047,12 @@ function item_photo_menu($item) * @param array &$conv_responses (already created with builtin activity structure) * @return void */ -if(! function_exists('builtin_activity_puller')) { function builtin_activity_puller($item, &$conv_responses) { - foreach($conv_responses as $mode => $v) { + foreach ($conv_responses as $mode => $v) { $url = ''; $sparkle = ''; - switch($mode) { + switch ($mode) { case 'like': $verb = ACTIVITY_LIKE; break; @@ -1039,32 +1073,36 @@ function builtin_activity_puller($item, &$conv_responses) { break; } - if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { + if ((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { $url = $item['author-link']; - if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) { + if ((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'], $item['url']))) { $url = 'redir/' . $item['contact-id']; $sparkle = ' class="sparkle" '; - } - else + } else { $url = zrl($url); + } $url = '' . htmlentities($item['author-name']) . ''; - if(! $item['thr-parent']) + if (! $item['thr-parent']) { $item['thr-parent'] = $item['parent-uri']; + } - if(! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l'])) - && (is_array($conv_responses[$mode][$item['thr-parent'] . '-l'])))) + if (! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l'])) + && (is_array($conv_responses[$mode][$item['thr-parent'] . '-l'])))) { $conv_responses[$mode][$item['thr-parent'] . '-l'] = array(); + } // only list each unique author once - if(in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) + if (in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) { continue; + } - if(! isset($conv_responses[$mode][$item['thr-parent']])) + if (! isset($conv_responses[$mode][$item['thr-parent']])) { $conv_responses[$mode][$item['thr-parent']] = 1; - else + } else { $conv_responses[$mode][$item['thr-parent']] ++; + } if (public_contact() == $item['author-id']) { $conv_responses[$mode][$item['thr-parent'] . '-self'] = 1; @@ -1078,24 +1116,25 @@ function builtin_activity_puller($item, &$conv_responses) { } }} -// Format the vote text for a profile item -// $cnt = number of people who vote the item -// $arr = array of pre-linked names of likers/dislikers -// $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe' -// $id = item id -// returns formatted text - -if(! function_exists('format_like')) { -function format_like($cnt,$arr,$type,$id) { +if (! function_exists('format_like')) { +/** + * Format the vote text for a profile item + * @param int $cnt = number of people who vote the item + * @param array $arr = array of pre-linked names of likers/dislikers + * @param string $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe' + * @param int $id = item id + * @return formatted text + */ +function format_like($cnt, array $arr, $type, $id) { $o = ''; $expanded = ''; - if($cnt == 1) { + if ($cnt == 1) { $likers = $arr[0]; // Phrase if there is only one liker. In other cases it will be uses for the expanded // list which show all likers - switch($type) { + switch ($type) { case 'like' : $phrase = sprintf( t('%s likes this.'), $likers); break; @@ -1114,16 +1153,17 @@ function format_like($cnt,$arr,$type,$id) { } } - if($cnt > 1) { + if ($cnt > 1) { $total = count($arr); - if($total >= MAX_LIKERS) + if ($total >= MAX_LIKERS) { $arr = array_slice($arr, 0, MAX_LIKERS - 1); - if($total < MAX_LIKERS) { + } + if ($total < MAX_LIKERS) { $last = t('and') . ' ' . $arr[count($arr)-1]; $arr2 = array_slice($arr, 0, -1); $str = implode(', ', $arr2) . ' ' . $last; } - if($total >= MAX_LIKERS) { + if ($total >= MAX_LIKERS) { $str = implode(', ', $arr); $str .= sprintf( t(', and %d other people'), $total - MAX_LIKERS ); } @@ -1132,7 +1172,7 @@ function format_like($cnt,$arr,$type,$id) { $spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\""; - switch($type) { + switch ($type) { case 'like': $phrase = sprintf( t('%2$d people like this'), $spanatts, $cnt); $explikers = sprintf( t('%s like this.'), $likers); @@ -1169,11 +1209,10 @@ function format_like($cnt,$arr,$type,$id) { return $o; }} - -function status_editor($a,$x, $notes_cid = 0, $popup=false) { +function status_editor(App $a, $x, $notes_cid = 0, $popup = false) { $o = ''; - $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); + $geotag = (x($x, 'allow_location') ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); $tpl = get_markup_template('jot-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array( @@ -1211,24 +1250,27 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { // Private/public post links for the non-JS ACL form $private_post = 1; - if($_REQUEST['public']) + if (x($_REQUEST, 'public')) { $private_post = 0; + } $query_str = $a->query_string; - if(strpos($query_str, 'public=1') !== false) + if (strpos($query_str, 'public=1') !== false) { $query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str); + } - // I think $a->query_string may never have ? in it, but I could be wrong - // It looks like it's from the index.php?q=[etc] rewrite that the web - // server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61 - if(strpos($query_str, '?') === false) + /* + * I think $a->query_string may never have ? in it, but I could be wrong + * It looks like it's from the index.php?q=[etc] rewrite that the web + * server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61 + */ + if (strpos($query_str, '?') === false) { $public_post_link = '?public=1'; - else + } else { $public_post_link = '&public=1'; + } - - -// $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); + // $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); $tpl = get_markup_template("jot.tpl"); $o .= replace_macros($tpl,array( @@ -1252,7 +1294,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$title' => $x['title'], '$placeholdertitle' => t('Set title'), '$category' => $x['category'], - '$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''), + '$placeholdercategory' => (feature_enabled(local_user(), 'categories') ? t('Categories (comma-separated list)') : ''), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$shortpermset' => t('permissions'), @@ -1290,9 +1332,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { )); - if ($popup==true){ + if ($popup == true) { $o = ''.$o.''; - } return $o; @@ -1302,20 +1343,20 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { function get_item_children($arr, $parent) { $children = array(); $a = get_app(); - foreach($arr as $item) { - if($item['id'] != $item['parent']) { - if(get_config('system','thread_allow') && $a->theme_thread_allow) { + foreach ($arr as $item) { + if ($item['id'] != $item['parent']) { + if (get_config('system', 'thread_allow') && $a->theme_thread_allow) { // Fallback to parent-uri if thr-parent is not set $thr_parent = $item['thr-parent']; - if($thr_parent == '') + if ($thr_parent == '') { $thr_parent = $item['parent-uri']; + } - if($thr_parent == $parent['uri']) { + if ($thr_parent == $parent['uri']) { $item['children'] = get_item_children($arr, $item); $children[] = $item; } - } - else if($item['parent'] == $parent['id']) { + } elseif ($item['parent'] == $parent['id']) { $children[] = $item; } } @@ -1323,66 +1364,82 @@ function get_item_children($arr, $parent) { return $children; } +/// @TODO Add type-hint function sort_item_children($items) { $result = $items; - usort($result,'sort_thr_created_rev'); - foreach($result as $k => $i) { - if(count($result[$k]['children'])) { + usort($result, 'sort_thr_created_rev'); + foreach ($result as $k => $i) { + if (count($result[$k]['children'])) { $result[$k]['children'] = sort_item_children($result[$k]['children']); } } return $result; } +/// @TODO Add type-hint function add_children_to_list($children, &$arr) { - foreach($children as $y) { + foreach ($children as $y) { $arr[] = $y; - if(count($y['children'])) + if (count($y['children'])) { add_children_to_list($y['children'], $arr); + } } } -function conv_sort($arr,$order) { +/// @TODO Add type-hint +function conv_sort($arr, $order) { - if((!(is_array($arr) && count($arr)))) + if ((!(is_array($arr) && count($arr)))) { return array(); + } $parents = array(); $children = array(); $newarr = array(); - // This is a preparation for having two different items with the same uri in one thread - // This will otherwise lead to an endless loop. - foreach($arr as $x) - if (!isset($newarr[$x['uri']])) + /* + * This is a preparation for having two different items with the same uri in one thread + * This will otherwise lead to an endless loop. + */ + foreach ($arr as $x) { + if (!isset($newarr[$x['uri']])) { $newarr[$x['uri']] = $x; + } + } $arr = $newarr; - foreach($arr as $x) - if($x['id'] == $x['parent']) - $parents[] = $x; + foreach ($arr as $x) { + if ($x['id'] == $x['parent']) { + $parents[] = $x; + } + } - if(stristr($order,'created')) - usort($parents,'sort_thr_created'); - elseif(stristr($order,'commented')) - usort($parents,'sort_thr_commented'); + if (stristr($order, 'created')) { + usort($parents, 'sort_thr_created'); + } elseif (stristr($order, 'commented')) { + usort($parents, 'sort_thr_commented'); + } - if(count($parents)) - foreach($parents as $i=>$_x) + if (count($parents)) { + foreach ($parents as $i => $_x) { $parents[$i]['children'] = get_item_children($arr, $_x); + } + } - /*foreach($arr as $x) { - if($x['id'] != $x['parent']) { + /// @TODO Old-lost code? + /*foreach ($arr as $x) { + if ($x['id'] != $x['parent']) { $p = find_thread_parent_index($parents,$x); - if($p !== false) + if ($p !== false) $parents[$p]['children'][] = $x; } }*/ - if(count($parents)) { - foreach($parents as $k => $v) { - if(count($parents[$k]['children'])) { + if (count($parents)) { + foreach ($parents as $k => $v) { + if (count($parents[$k]['children'])) { $parents[$k]['children'] = sort_item_children($parents[$k]['children']); + /// @TODO Old-lost code? /*$y = $parents[$k]['children']; usort($y,'sort_thr_created_rev'); $parents[$k]['children'] = $y;*/ @@ -1391,92 +1448,103 @@ function conv_sort($arr,$order) { } $ret = array(); - if(count($parents)) { - foreach($parents as $x) { + if (count($parents)) { + foreach ($parents as $x) { $ret[] = $x; - if(count($x['children'])) + if (count($x['children'])) { add_children_to_list($x['children'], $ret); - /*foreach($x['children'] as $y) + /// @TODO Old-lost code? + /*foreach ($x['children'] as $y) $ret[] = $y;*/ + } } } return $ret; } - -function sort_thr_created($a,$b) { - return strcmp($b['created'],$a['created']); +/// @TODO Add type-hint +function sort_thr_created($a, $b) { + return strcmp($b['created'], $a['created']); } -function sort_thr_created_rev($a,$b) { - return strcmp($a['created'],$b['created']); +/// @TODO Add type-hint +function sort_thr_created_rev($a, $b) { + return strcmp($a['created'], $b['created']); } -function sort_thr_commented($a,$b) { - return strcmp($b['commented'],$a['commented']); +/// @TODO Add type-hint +function sort_thr_commented($a, $b) { + return strcmp($b['commented'], $a['commented']); } -function find_thread_parent_index($arr,$x) { - foreach($arr as $k => $v) - if($v['id'] == $x['parent']) +/// @TODO Add type-hint +function find_thread_parent_index($arr, $x) { + foreach ($arr as $k => $v) { + if ($v['id'] == $x['parent']) { return $k; + } + } return false; } +/// @TODO Add type-hint function render_location_dummy($item) { - if ($item['location'] != "") + if ($item['location'] != "") { return $item['location']; + } - if ($item['coord'] != "") + if ($item['coord'] != "") { return $item['coord']; + } } -function get_responses($conv_responses,$response_verbs,$ob,$item) { +/// @TODO Add type-hint +function get_responses($conv_responses, $response_verbs, $ob, $item) { $ret = array(); - foreach($response_verbs as $v) { + foreach ($response_verbs as $v) { $ret[$v] = array(); - $ret[$v]['count'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri']] : ''); - $ret[$v]['list'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : ''); - $ret[$v]['self'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0'); - if(count($ret[$v]['list']) > MAX_LIKERS) { + $ret[$v]['count'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri']] : ''); + $ret[$v]['list'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : ''); + $ret[$v]['self'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0'); + if (count($ret[$v]['list']) > MAX_LIKERS) { $ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS); array_push($ret[$v]['list_part'], '' . t('View all') . ''); - } - else { + } else { $ret[$v]['list_part'] = ''; } - $ret[$v]['button'] = get_response_button_text($v,$ret[$v]['count']); + $ret[$v]['button'] = get_response_button_text($v, $ret[$v]['count']); $ret[$v]['title'] = $conv_responses[$v]['title']; } $count = 0; - foreach($ret as $key) { - if ($key['count'] == true) + foreach ($ret as $key) { + if ($key['count'] == true) { $count++; + } } $ret['count'] = $count; return $ret; } -function get_response_button_text($v,$count) { - switch($v) { +function get_response_button_text($v, $count) { + switch ($v) { case 'like': - return tt('Like','Likes',$count,'noun'); + return tt('Like', 'Likes', $count, 'noun'); break; case 'dislike': - return tt('Dislike','Dislikes',$count,'noun'); + return tt('Dislike', 'Dislikes', $count, 'noun'); break; case 'attendyes': - return tt('Attending','Attending',$count,'noun'); + return tt('Attending', 'Attending', $count, 'noun'); break; case 'attendno': - return tt('Not Attending','Not Attending',$count,'noun'); + return tt('Not Attending', 'Not Attending', $count, 'noun'); break; case 'attendmaybe': - return tt('Undecided','Undecided',$count,'noun'); + return tt('Undecided', 'Undecided', $count, 'noun'); break; } } diff --git a/include/cron.php b/include/cron.php index 58a3fcf9c..c4299dd4c 100644 --- a/include/cron.php +++ b/include/cron.php @@ -4,7 +4,7 @@ use \Friendica\Core\Config; function cron_run(&$argv, &$argc){ global $a; - require_once('include/datetime.php'); + require_once 'include/datetime.php'; // Poll contacts with specific parameters if ($argc > 1) { @@ -12,15 +12,16 @@ function cron_run(&$argv, &$argc){ return; } - $last = get_config('system','last_cron'); + $last = get_config('system', 'last_cron'); - $poll_interval = intval(get_config('system','cron_interval')); + $poll_interval = intval(get_config('system', 'cron_interval')); if (! $poll_interval) { $poll_interval = 10; } + if ($last) { $next = $last + ($poll_interval * 60); - if($next > time()) { + if ($next > time()) { logger('cron intervall not reached'); return; } @@ -62,10 +63,10 @@ function cron_run(&$argv, &$argc){ proc_run(PRIORITY_LOW, "include/cronjobs.php", "repair_database"); // once daily run birthday_updates and then expire in background - $d1 = get_config('system','last_expire_day'); - $d2 = intval(datetime_convert('UTC','UTC','now','d')); + $d1 = get_config('system', 'last_expire_day'); + $d2 = intval(datetime_convert('UTC', 'UTC', 'now', 'd')); - if($d2 != intval($d1)) { + if ($d2 != intval($d1)) { proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_contact_birthdays"); @@ -73,7 +74,7 @@ function cron_run(&$argv, &$argc){ proc_run(PRIORITY_LOW, "include/discover_poco.php", "suggestions"); - set_config('system','last_expire_day',$d2); + set_config('system', 'last_expire_day', $d2); proc_run(PRIORITY_LOW, 'include/expire.php'); @@ -87,7 +88,7 @@ function cron_run(&$argv, &$argc){ logger('cron: end'); - set_config('system','last_cron', time()); + set_config('system', 'last_cron', time()); return; } @@ -130,7 +131,7 @@ function cron_poll_contacts($argc, $argv) { // and which have a polling address and ignore Diaspora since // we are unable to match those posts with a Diaspora GUID and prevent duplicates. - $abandon_days = intval(get_config('system','account_abandon_days')); + $abandon_days = intval(get_config('system', 'account_abandon_days')); if ($abandon_days < 1) { $abandon_days = 0; } @@ -156,7 +157,7 @@ function cron_poll_contacts($argc, $argv) { dbesc(NETWORK_MAIL2) ); - if (!count($contacts)) { + if (!dbm::is_result($contacts)) { return; } @@ -170,7 +171,7 @@ function cron_poll_contacts($argc, $argv) { continue; } - foreach($res as $contact) { + foreach ($res as $contact) { $xml = false; @@ -183,49 +184,48 @@ function cron_poll_contacts($argc, $argv) { } if ($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) { - // We should be getting everything via a hub. But just to be sure, let's check once a day. - // (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately) - // This also lets us update our subscription to the hub, and add or replace hubs in case it - // changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. - - $poll_interval = get_config('system','pushpoll_frequency'); + /* + * We should be getting everything via a hub. But just to be sure, let's check once a day. + * (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately) + * This also lets us update our subscription to the hub, and add or replace hubs in case it + * changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. + */ + $poll_interval = get_config('system', 'pushpoll_frequency'); $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3); } - if($contact['priority'] AND !$force) { - - $update = false; + if ($contact['priority'] AND !$force) { + $update = false; $t = $contact['last-update']; - /** + /* * Based on $contact['priority'], should we poll this site now? Or later? */ - switch ($contact['priority']) { case 5: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 month")) { $update = true; } break; case 4: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 week")) { $update = true; } break; case 3: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day")) { $update = true; } break; case 2: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 12 hour")) { $update = true; } break; case 1: default: - if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour")) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 hour")) { $update = true; } break; @@ -235,7 +235,7 @@ function cron_poll_contacts($argc, $argv) { } } - logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]); + logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact["nick"] . " " . $contact["name"]); if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) { proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', intval($contact['id'])); diff --git a/include/cronhooks.php b/include/cronhooks.php index bea0f6a19..a519dee22 100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php @@ -2,43 +2,45 @@ use \Friendica\Core\Config; -function cronhooks_run(&$argv, &$argc){ +function cronhooks_run(&$argv, &$argc) { global $a; - require_once('include/datetime.php'); + require_once 'include/datetime.php'; if (($argc == 2) AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) { - foreach ($a->hooks["cron"] as $hook) + foreach ($a->hooks["cron"] as $hook) { if ($hook[1] == $argv[1]) { - logger("Calling cron hook '".$hook[1]."'", LOGGER_DEBUG); + logger("Calling cron hook '" . $hook[1] . "'", LOGGER_DEBUG); call_single_hook($a, $name, $hook, $data); } + } return; } $last = get_config('system', 'last_cronhook'); - $poll_interval = intval(get_config('system','cronhook_interval')); - if(! $poll_interval) + $poll_interval = intval(get_config('system', 'cronhook_interval')); + if (! $poll_interval) { $poll_interval = 9; + } - if($last) { + if ($last) { $next = $last + ($poll_interval * 60); - if($next > time()) { + if ($next > time()) { logger('cronhook intervall not reached'); return; } } - $a->set_baseurl(get_config('system','url')); + $a->set_baseurl(get_config('system', 'url')); logger('cronhooks: start'); $d = datetime_convert(); if (is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) { - foreach ($a->hooks["cron"] as $hook) { - logger("Calling cronhooks for '".$hook[1]."'", LOGGER_DEBUG); + foreach ($a->hooks["cron"] as $hook) { + logger("Calling cronhooks for '" . $hook[1] . "'", LOGGER_DEBUG); proc_run(PRIORITY_MEDIUM, "include/cronhooks.php", $hook[1]); } } diff --git a/include/datetime.php b/include/datetime.php index 9e1d4b55c..da454a32a 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -14,13 +14,20 @@ use \Friendica\Core\Config; * @return int */ function timezone_cmp($a, $b) { - if(strstr($a,'/') && strstr($b,'/')) { - if ( t($a) == t($b)) return 0; + if (strstr($a, '/') && strstr($b, '/')) { + if ( t($a) == t($b)) { + return 0; + } return ( t($a) < t($b)) ? -1 : 1; } - if(strstr($a,'/')) return -1; - if(strstr($b,'/')) return 1; - if ( t($a) == t($b)) return 0; + + if (strstr($a, '/')) { + return -1; + } elseif (strstr($b, '/')) { + return 1; + } elseif ( t($a) == t($b)) { + return 0; + } return ( t($a) < t($b)) ? -1 : 1; } @@ -39,23 +46,24 @@ function select_timezone($current = 'America/Los_Angeles') { usort($timezone_identifiers, 'timezone_cmp'); $continent = ''; - foreach($timezone_identifiers as $value) { + foreach ($timezone_identifiers as $value) { $ex = explode("/", $value); - if(count($ex) > 1) { - if($ex[0] != $continent) { - if($continent != '') + if (count($ex) > 1) { + if ($ex[0] != $continent) { + if ($continent != '') { $o .= ''; + } $continent = $ex[0]; $o .= ''; } - if(count($ex) > 2) + if (count($ex) > 2) { $city = substr($value,strpos($value,'/')+1); - else + } else { $city = $ex[1]; - } - else { + } + } else { $city = $ex[0]; - if($continent != t('Miscellaneous')) { + if ($continent != t('Miscellaneous')) { $o .= ''; $continent = t('Miscellaneous'); $o .= ''; @@ -114,48 +122,50 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d // Defaults to UTC if nothing is set, but throws an exception if set to empty string. // Provide some sane defaults regardless. - if($from === '') + if ($from === '') { $from = 'UTC'; - if($to === '') + } + if ($to === '') { $to = 'UTC'; - if( ($s === '') || (! is_string($s)) ) + } + if ( ($s === '') || (! is_string($s)) ) { $s = 'now'; + } - // Slight hackish adjustment so that 'zero' datetime actually returns what is intended - // otherwise we end up with -0001-11-30 ... - // add 32 days so that we at least get year 00, and then hack around the fact that - // months and days always start with 1. + /* + * Slight hackish adjustment so that 'zero' datetime actually returns what is intended + * otherwise we end up with -0001-11-30 ... + * add 32 days so that we at least get year 00, and then hack around the fact that + * months and days always start with 1. + */ - if(substr($s,0,10) == '0000-00-00') { + if (substr($s,0,10) <= '0001-01-01') { $d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC')); return str_replace('1','0',$d->format($fmt)); } try { $from_obj = new DateTimeZone($from); - } - catch(Exception $e) { + } catch (Exception $e) { $from_obj = new DateTimeZone('UTC'); } try { $d = new DateTime($s, $from_obj); - } - catch(Exception $e) { + } catch (Exception $e) { logger('datetime_convert: exception: ' . $e->getMessage()); $d = new DateTime('now', $from_obj); } try { $to_obj = new DateTimeZone($to); - } - catch(Exception $e) { + } catch (Exception $e) { $to_obj = new DateTimeZone('UTC'); } $d->setTimeZone($to_obj); - return($d->format($fmt)); + return $d->format($fmt); } @@ -169,12 +179,14 @@ function dob($dob) { list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d'); $f = get_config('system','birthday_input_format'); - if(! $f) + if (! $f) { $f = 'ymd'; - if($dob === '0000-00-00') + } + if ($dob <= '0001-01-01') { $value = ''; - else + } else { $value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d')); + } $age = ((intval($value)) ? age($value, $a->user["timezone"], $a->user["timezone"]) : ""); @@ -189,7 +201,8 @@ function dob($dob) { ) )); -// if ($dob && $dob != '0000-00-00') + /// @TODO Old-lost code? +// if ($dob && $dob > '0001-01-01') // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob'); // else // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),false,'dob'); @@ -214,7 +227,7 @@ function dob($dob) { * @return string Parsed HTML output. */ function datesel($format, $min, $max, $default, $id = 'datepicker') { - return datetimesel($format,$min,$max,$default,'',$id,true,false, '',''); + return datetimesel($format, $min, $max, $default, '', $id, true, false, '', ''); } /** @@ -231,8 +244,8 @@ function datesel($format, $min, $max, $default, $id = 'datepicker') { * * @return string Parsed HTML output. */ -function timesel($format, $h, $m, $id='timepicker') { - return datetimesel($format,new DateTime(),new DateTime(),new DateTime("$h:$m"),'',$id,false,true); +function timesel($format, $h, $m, $id = 'timepicker') { + return datetimesel($format, new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true); } /** @@ -267,7 +280,9 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke // First day of the week (0 = Sunday) $firstDay = get_pconfig(local_user(),'system','first_day_of_week'); - if ($firstDay === false) $firstDay=0; + if ($firstDay === false) { + $firstDay=0; + } $lang = substr(get_browser_language(), 0, 2); @@ -279,9 +294,15 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $o = ''; $dateformat = ''; - if($pickdate) $dateformat .= 'Y-m-d'; - if($pickdate && $picktime) $dateformat .= ' '; - if($picktime) $dateformat .= 'H:i'; + if ($pickdate) { + $dateformat .= 'Y-m-d'; + } + if ($pickdate && $picktime) { + $dateformat .= ' '; + } + if ($picktime) { + $dateformat .= 'H:i'; + } $minjs = $min ? ",minDate: new Date({$min->getTimestamp()}*1000), yearStart: " . $min->format('Y') : ''; $maxjs = $max ? ",maxDate: new Date({$max->getTimestamp()}*1000), yearEnd: " . $max->format('Y') : ''; @@ -290,15 +311,21 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $defaultdatejs = $default ? ",defaultDate: new Date({$default->getTimestamp()}*1000)" : ''; $pickers = ''; - if(!$pickdate) $pickers .= ',datepicker: false'; - if(!$picktime) $pickers .= ',timepicker: false'; + if (!$pickdate) { + $pickers .= ',datepicker: false'; + } + if (!$picktime) { + $pickers .= ',timepicker: false'; + } $extra_js = ''; $pickers .= ",dayOfWeekStart: ".$firstDay.",lang:'".$lang."'"; - if($minfrom != '') + if ($minfrom != '') { $extra_js .= "\$('#id_$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})"; - if($maxfrom != '') + } + if ($maxfrom != '') { $extra_js .= "\$('#id_$maxfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({maxDate: currentDateTime})}})"; + } $readable_format = $dateformat; $readable_format = str_replace('Y','yyyy',$readable_format); @@ -393,13 +420,16 @@ function relative_date($posted_date, $format = null) { * * @return int Age in years */ -function age($dob,$owner_tz = '',$viewer_tz = '') { - if(! intval($dob)) +function age($dob, $owner_tz = '', $viewer_tz = '') { + if (! intval($dob)) { return 0; - if(! $owner_tz) + } + if (! $owner_tz) { $owner_tz = date_default_timezone_get(); - if(! $viewer_tz) + } + if (! $viewer_tz) { $viewer_tz = date_default_timezone_get(); + } $birthdate = datetime_convert('UTC',$owner_tz,$dob . ' 00:00:00+00:00','Y-m-d'); list($year,$month,$day) = explode("-",$birthdate); @@ -407,8 +437,9 @@ function age($dob,$owner_tz = '',$viewer_tz = '') { $curr_month = datetime_convert('UTC',$viewer_tz,'now','m'); $curr_day = datetime_convert('UTC',$viewer_tz,'now','d'); - if(($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) + if (($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) { $year_diff--; + } return $year_diff; } @@ -430,11 +461,11 @@ function get_dim($y,$m) { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); - if($m != 2) + if ($m != 2) { return $dim[$m]; - - if(((($y % 4) == 0) && (($y % 100) != 0)) || (($y % 400) == 0)) + } elseif (((($y % 4) == 0) && (($y % 100) != 0)) || (($y % 400) == 0)) { return 29; + } return $dim[2]; } @@ -473,8 +504,6 @@ function get_first_dim($y,$m) { * @todo Provide (prev,next) links, define class variations for different size calendars */ function cal($y = 0,$m = 0, $links = false, $class='') { - - // month table - start at 1 to match human usage. $mtab = array(' ', @@ -486,10 +515,12 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); - if(! $y) + if (! $y) { $y = $thisyear; - if(! $m) + } + if (! $m) { $m = intval($thismonth); + } $dn = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'); $f = get_first_dim($y,$m); @@ -498,29 +529,33 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $dow = 0; $started = false; - if(($y == $thisyear) && ($m == $thismonth)) + if (($y == $thisyear) && ($m == $thismonth)) { $tddate = intval(datetime_convert('UTC',date_default_timezone_get(),'now','j')); + } $str_month = day_translate($mtab[$m]); $o = ''; $o .= "$str_month $y"; - for($a = 0; $a < 7; $a ++) + for ($a = 0; $a < 7; $a ++) { $o .= '' . mb_substr(day_translate($dn[$a]),0,3,'UTF-8') . ''; + } $o .= ''; - while($d <= $l) { - if(($dow == $f) && (! $started)) + while ($d <= $l) { + if (($dow == $f) && (! $started)) { $started = true; + } $today = (((isset($tddate)) && ($tddate == $d)) ? "class=\"today\" " : ''); $o .= ""; $day = str_replace(' ',' ',sprintf('%2.2d', $d)); - if($started) { - if(is_array($links) && isset($links[$d])) + if ($started) { + if (is_array($links) && isset($links[$d])) { $o .= "$day"; - else + } else { $o .= $day; + } $d ++; } else { @@ -529,14 +564,16 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $o .= ''; $dow ++; - if(($dow == 7) && ($d <= $l)) { + if (($dow == 7) && ($d <= $l)) { $dow = 0; $o .= ''; } } - if($dow) - for($a = $dow; $a < 7; $a ++) + if ($dow) { + for ($a = $dow; $a < 7; $a ++) { $o .= ' '; + } + } $o .= ''."\r\n"; @@ -553,7 +590,7 @@ function update_contact_birthdays() { // This only handles foreign or alien networks where a birthday has been provided. // In-network birthdays are handled within local_delivery - $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` != '0000-00-00' AND SUBSTRING(`bd`,1,4) != `bdyear` "); + $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`,1,4) != `bdyear` "); if (dbm::is_result($r)) { foreach ($r as $rr) { diff --git a/include/dba.php b/include/dba.php index 62728acae..5066dcd56 100644 --- a/include/dba.php +++ b/include/dba.php @@ -20,6 +20,7 @@ class dba { private $driver; public $connected = false; public $error = false; + private $_server_info = ''; function __construct($server, $user, $pass, $db, $install = false) { $a = get_app(); @@ -103,18 +104,20 @@ class dba { * @return string */ public function server_info() { - 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; + if ($this->_server_info == '') { + switch ($this->driver) { + case 'pdo': + $this->_server_info = $this->db->getAttribute(PDO::ATTR_SERVER_VERSION); + break; + case 'mysqli': + $this->_server_info = $this->db->server_info; + break; + case 'mysql': + $this->_server_info = mysql_get_server_info($this->db); + break; + } } - return $version; + return $this->_server_info; } /** @@ -474,6 +477,26 @@ class dba { } } } + + /** + * @brief Replaces ANY_VALUE() function by MIN() function, + * if the database server does not support ANY_VALUE(). + * + * Considerations for Standard SQL, or MySQL with ONLY_FULL_GROUP_BY (default since 5.7.5). + * ANY_VALUE() is available from MySQL 5.7.5 https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html + * A standard fall-back is to use MIN(). + * + * @param string $sql An SQL string without the values + * @return string The input SQL string modified if necessary. + */ + public function any_value_fallback($sql) { + $server_info = $this->server_info(); + if (version_compare($server_info, '5.7.5', '<') || + (stripos($server_info, 'MariaDB') !== false)) { + $sql = str_ireplace('ANY_VALUE(', 'MIN(', $sql); + } + return $sql; + } } function printable($s) { @@ -514,6 +537,7 @@ function q($sql) { unset($args[0]); if ($db && $db->connected) { + $sql = $db->any_value_fallback($sql); $stmt = @vsprintf($sql,$args); // Disabled warnings //logger("dba: q: $stmt", LOGGER_ALL); if ($stmt === false) @@ -550,6 +574,7 @@ function qu($sql) { unset($args[0]); if ($db && $db->connected) { + $sql = $db->any_value_fallback($sql); $stmt = @vsprintf($sql,$args); // Disabled warnings if ($stmt === false) logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG); diff --git a/include/dba_pdo.php b/include/dba_pdo.php index a44c447af..56692fbb3 100644 --- a/include/dba_pdo.php +++ b/include/dba_pdo.php @@ -34,7 +34,7 @@ $objDDDBLResultHandler->add('PDOStatement', array('HANDLER' => $cloPDOStatementR * */ -if(! class_exists('dba')) { +if (! class_exists('dba')) { class dba { private $debug = 0; @@ -66,9 +66,9 @@ class dba { return; } - if($install) { - if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { - if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { + 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->connected = false; $this->db = null; @@ -81,13 +81,13 @@ class dba { \DDDBL\connect(); $this->db = \DDDBL\getDB(); - if(\DDDBL\isConnected()) { + if (\DDDBL\isConnected()) { $this->connected = true; } - if(! $this->connected) { + if (! $this->connected) { $this->db = null; - if(! $install) + if (! $install) system_unavailable(); } @@ -109,11 +109,11 @@ class dba { $objPreparedQueryPool = new \DDDBL\DataObjectPool('Query-Definition'); # check if query do not exists till now, if so create its definition - if(!$objPreparedQueryPool->exists($strQueryAlias)) + if (!$objPreparedQueryPool->exists($strQueryAlias)) $objPreparedQueryPool->add($strQueryAlias, array('QUERY' => $sql, 'HANDLER' => $strHandler)); - if((! $this->db) || (! $this->connected)) + if ((! $this->db) || (! $this->connected)) return false; $this->error = ''; @@ -124,7 +124,7 @@ class dba { $r = \DDDBL\get($strQueryAlias); # bad workaround to emulate the bizzare behavior of mysql_query - if(in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) + if (in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) $result = true; $intErrorCode = false; @@ -138,7 +138,7 @@ class dba { $a->save_timestamp($stamp1, "database"); - if(x($a->config,'system') && x($a->config['system'],'db_log')) { + if (x($a->config,'system') && x($a->config['system'],'db_log')) { if (($duration > $a->config["system"]["db_loglimit"])) { $duration = round($duration, 3); $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); @@ -149,20 +149,20 @@ class dba { } } - if($intErrorCode) + if ($intErrorCode) $this->error = $intErrorCode; - if(strlen($this->error)) { + if (strlen($this->error)) { logger('dba: ' . $this->error); } - if($this->debug) { + if ($this->debug) { $mesg = ''; - if($result === false) + if ($result === false) $mesg = 'false'; - elseif($result === true) + elseif ($result === true) $mesg = 'true'; else { # this needs fixing, but is a bug itself @@ -182,13 +182,13 @@ class dba { * These usually indicate SQL syntax errors that need to be resolved. */ - if(isset($result) AND ($result === false)) { + if (isset($result) AND ($result === false)) { 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); } - if(isset($result) AND (($result === true) || ($result === false))) + if (isset($result) AND (($result === true) || ($result === false))) return $result; if ($onlyquery) { @@ -199,7 +199,7 @@ class dba { //$a->save_timestamp($stamp1, "database"); - if($this->debug) + if ($this->debug) logger('dba: ' . printable(print_r($r, true))); return($r); } @@ -223,7 +223,7 @@ class dba { } public function escape($str) { - if($this->db && $this->connected) { + if ($this->db && $this->connected) { $strQuoted = $this->db->quote($str); # this workaround is needed, because quote creates "'" and the beginning and the end # of the string, which is correct. but until now the queries set this delimiter manually, @@ -238,27 +238,27 @@ class dba { } }} -if(! function_exists('printable')) { +if (! function_exists('printable')) { function printable($s) { $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s); $s = str_replace("\x00",'.',$s); - if(x($_SERVER,'SERVER_NAME')) + if (x($_SERVER,'SERVER_NAME')) $s = escape_tags($s); return $s; }} // Procedural functions -if(! function_exists('dbg')) { +if (! function_exists('dbg')) { function dbg($state) { global $db; - if($db) + if ($db) $db->dbg($state); }} -if(! function_exists('dbesc')) { +if (! function_exists('dbesc')) { function dbesc($str) { global $db; - if($db && $db->connected) + if ($db && $db->connected) return($db->escape($str)); else return(str_replace("'","\\'",$str)); @@ -271,17 +271,17 @@ function dbesc($str) { // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", // 'user', 1); -if(! function_exists('q')) { +if (! function_exists('q')) { function q($sql) { global $db; $args = func_get_args(); unset($args[0]); - if($db && $db->connected) { + if ($db && $db->connected) { $stmt = @vsprintf($sql,$args); // Disabled warnings //logger("dba: q: $stmt", LOGGER_ALL); - if($stmt === false) + if ($stmt === false) logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG); return $db->q($stmt); } @@ -303,11 +303,11 @@ function q($sql) { * */ -if(! function_exists('dbq')) { +if (! function_exists('dbq')) { function dbq($sql) { global $db; - if($db && $db->connected) + if ($db && $db->connected) $ret = $db->q($sql); else $ret = false; @@ -321,21 +321,21 @@ function dbq($sql) { // cast to int to avoid trouble. -if(! function_exists('dbesc_array_cb')) { +if (! function_exists('dbesc_array_cb')) { function dbesc_array_cb(&$item, $key) { - if(is_string($item)) + if (is_string($item)) $item = dbesc($item); }} -if(! function_exists('dbesc_array')) { +if (! function_exists('dbesc_array')) { function dbesc_array(&$arr) { - if(is_array($arr) && count($arr)) { + if (is_array($arr) && count($arr)) { array_walk($arr,'dbesc_array_cb'); } }} -if(! function_exists('dba_timer')) { +if (! function_exists('dba_timer')) { function dba_timer() { return microtime(true); }} diff --git a/include/dbstructure.php b/include/dbstructure.php index 48cc02d2d..76f1bb000 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -78,8 +78,18 @@ function update_fail($update_id, $error_message){ function table_structure($table) { $structures = q("DESCRIBE `%s`", $table); + $full_columns = q("SHOW FULL COLUMNS FROM `%s`", $table); + $indexes = q("SHOW INDEX FROM `%s`", $table); + $table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table); + + if (dbm::is_result($table_status)) { + $table_status = $table_status[0]; + } else { + $table_status = array(); + } + $fielddata = array(); $indexdata = array(); @@ -104,7 +114,6 @@ function table_structure($table) { $indexdata[$index["Key_name"]][] = $column; } - if (dbm::is_result($structures)) { foreach ($structures AS $field) { $fielddata[$field["Field"]]["type"] = $field["Type"]; @@ -125,10 +134,16 @@ function table_structure($table) { } } } - return(array("fields"=>$fielddata, "indexes"=>$indexdata)); + if (dbm::is_result($full_columns)) { + foreach ($full_columns AS $column) { + $fielddata[$column["Field"]]["Collation"] = $column["Collation"]; + } + } + + return array("fields" => $fielddata, "indexes" => $indexdata, "table_status" => $table_status); } -function print_structure($database, $charset) { +function print_structure($database) { echo "-- ------------------------------------------\n"; echo "-- ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION." (".FRIENDICA_CODENAME,")\n"; echo "-- DB_UPDATE_VERSION ".DB_UPDATE_VERSION."\n"; @@ -137,24 +152,33 @@ function print_structure($database, $charset) { echo "--\n"; echo "-- TABLE $name\n"; echo "--\n"; - db_create_table($name, $structure['fields'], $charset, true, false, $structure["indexes"]); + db_create_table($name, $structure['fields'], true, false, $structure["indexes"]); echo "\n"; } } +/** + * @brief Print out database error messages + * + * @param object $db Database object + * @param string $message Message to be added to the error message + * + * @return string Error message + */ +function print_update_error($db, $message) { + echo sprintf(t("\nError %d occured during database update:\n%s\n"), + $db->errorno, $db->error); + + return t('Errors encountered performing database changes: ').$message.EOL; +} + function update_structure($verbose, $action, $tables=null, $definition=null) { global $a, $db; if ($action) { Config::set('system', 'maintenance', 1); - Config::set('system', 'maintenance_reason', 'Database update'); - } - - if (isset($a->config["system"]["db_charset"])) { - $charset = $a->config["system"]["db_charset"]; - } else { - $charset = "utf8"; + Config::set('system', 'maintenance_reason', sprintf(t(': Database update'), dbm::date().' '.date('e'))); } $errors = false; @@ -168,16 +192,18 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $tables = q("SHOW TABLES"); } - foreach ($tables AS $table) { - $table = current($table); + if (dbm::is_result($tables)) { + foreach ($tables AS $table) { + $table = current($table); - logger(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG); - $database[$table] = table_structure($table); + logger(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG); + $database[$table] = table_structure($table); + } } // Get the definition if (is_null($definition)) { - $definition = db_definition($charset); + $definition = db_definition(); } // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements @@ -194,9 +220,9 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $group_by = ""; $sql3 = ""; if (!isset($database[$name])) { - $r = db_create_table($name, $structure["fields"], $charset, $verbose, $action, $structure['indexes']); + $r = db_create_table($name, $structure["fields"], $verbose, $action, $structure['indexes']); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered creating database tables.').$name.EOL; + $errors .= print_update_error($db, $name); } $is_new_table = True; } else { @@ -252,17 +278,24 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { } } else { // Compare the field definition - $current_field_definition = implode(",",$database[$name]["fields"][$fieldname]); - $new_field_definition = implode(",",$parameters); + $field_definition = $database[$name]["fields"][$fieldname]; + + // We change the collation after the indexes had been changed. + // This is done to avoid index length problems. + // So here we always ensure that there is no need to change it. + unset($parameters['Collation']); + unset($field_definition['Collation']); + + $current_field_definition = implode(",", $field_definition); + $new_field_definition = implode(",", $parameters); if ($current_field_definition != $new_field_definition) { - $sql2=db_modify_table_field($fieldname, $parameters); + $sql2 = db_modify_table_field($fieldname, $parameters); if ($sql3 == "") { $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; } else { $sql3 .= ", ".$sql2; } } - } } } @@ -288,16 +321,59 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $group_by = db_group_by($indexname, $fieldnames); } if ($sql2 != "") { - if ($sql3 == "") + if ($sql3 == "") { $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; - else + } else { $sql3 .= ", ".$sql2; + } + } + } + } + + if (isset($database[$name]["table_status"]["Collation"])) { + if ($database[$name]["table_status"]["Collation"] != 'utf8mb4_general_ci') { + $sql2 = "DEFAULT COLLATE utf8mb4_general_ci"; + + if ($sql3 == "") { + $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; + } else { + $sql3 .= ", ".$sql2; + } + } + } + + if ($sql3 != "") { + $sql3 .= "; "; + } + + // Now have a look at the field collations + // Compare the field structure field by field + foreach ($structure["fields"] AS $fieldname => $parameters) { + // Compare the field definition + $field_definition = $database[$name]["fields"][$fieldname]; + + // Define the default collation if not given + if (!isset($parameters['Collation']) AND !is_null($field_definition['Collation'])) { + $parameters['Collation'] = 'utf8mb4_general_ci'; + } else { + $parameters['Collation'] = null; + } + + if ($field_definition['Collation'] != $parameters['Collation']) { + $sql2 = db_modify_table_field($fieldname, $parameters); + if (($sql3 == "") OR (substr($sql3, -2, 2) == "; ")) { + $sql3 .= "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; + } else { + $sql3 .= ", ".$sql2; } } } } + if ($sql3 != "") { - $sql3 .= ";"; + if (substr($sql3, -2, 2) != "; ") { + $sql3 .= ";"; + } if ($verbose) { // Ensure index conversion to unique removes duplicates @@ -323,6 +399,8 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { } if ($action) { + Config::set('system', 'maintenance_reason', sprintf(t('%s: updating %s table.'), dbm::date().' '.date('e'), $name)); + // Ensure index conversion to unique removes duplicates if ($is_unique) { if ($ignore != "") { @@ -330,33 +408,33 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { } else { $r = $db->q("CREATE TABLE `".$temp_name."` LIKE `".$name."`;"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } } } $r = @$db->q($sql3); - if (!dbm::is_result($r)) - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; - + if (!dbm::is_result($r)) { + $errors .= print_update_error($db, $sql3); + } if ($is_unique) { if ($ignore != "") { $db->q("SET session old_alter_table=0;"); } else { $r = $db->q("INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } $r = $db->q("DROP TABLE `".$name."`;"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } $r = $db->q("RENAME TABLE `".$temp_name."` TO `".$name."`;"); if (!dbm::is_result($r)) { - $errors .= t('Errors encountered performing database changes.').$sql3.EOL; + $errors .= print_update_error($db, $sql3); return $errors; } } @@ -376,6 +454,10 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { function db_field_command($parameters, $create = true) { $fieldstruct = $parameters["type"]; + if (!is_null($parameters["Collation"])) { + $fieldstruct .= " COLLATE ".$parameters["Collation"]; + } + if ($parameters["not null"]) $fieldstruct .= " NOT NULL"; @@ -395,7 +477,7 @@ function db_field_command($parameters, $create = true) { return($fieldstruct); } -function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=null) { +function db_create_table($name, $fields, $verbose, $action, $indexes=null) { global $a, $db; $r = true; @@ -404,7 +486,7 @@ function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=n $sql_rows = array(); $primary_keys = array(); - foreach($fields AS $fieldname => $field) { + foreach ($fields AS $fieldname => $field) { $sql_rows[] = "`".dbesc($fieldname)."` ".db_field_command($field); if (x($field,'primary') and $field['primary']!=''){ $primary_keys[] = $fieldname; @@ -420,7 +502,7 @@ function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=n $sql = implode(",\n\t", $sql_rows); - $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=".$charset; + $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT COLLATE utf8mb4_general_ci"; if ($verbose) echo $sql.";\n"; @@ -503,18 +585,7 @@ function db_group_by($indexname, $fieldnames) { return $sql; } -function db_index_suffix($charset, $reduce = 0) { - if ($charset != "utf8mb4") { - return ""; - } - - // On utf8mb4 indexes can only have a length of 191 - $indexlength = 191 - $reduce; - - return "(".$indexlength.")"; -} - -function db_definition($charset) { +function db_definition() { $database = array(); @@ -671,7 +742,7 @@ function db_definition($charset) { "writable" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "forum" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "prv" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), - "contact-type" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"), + "contact-type" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "hidden" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "archive" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "pending" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"), @@ -681,7 +752,7 @@ function db_definition($charset) { "info" => array("type" => "mediumtext"), "profile-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "bdyear" => array("type" => "varchar(4)", "not null" => "1", "default" => ""), - "bd" => array("type" => "date", "not null" => "1", "default" => "0000-00-00"), + "bd" => array("type" => "date", "not null" => "1", "default" => "0001-01-01"), "notify_new_posts" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "fetch_further_information" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "ffi_keyword_blacklist" => array("type" => "text"), @@ -840,7 +911,7 @@ function db_definition($charset) { "about" => array("type" => "text"), "keywords" => array("type" => "text"), "gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""), - "birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"), + "birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0001-01-01"), "community" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "contact-type" => array("type" => "tinyint(1)", "not null" => "1", "default" => "-1"), "hide" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), @@ -1304,7 +1375,7 @@ function db_definition($charset) { "hide-friends" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "pdesc" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "dob" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"), + "dob" => array("type" => "varchar(32)", "not null" => "1", "default" => "0001-01-01"), "address" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "locality" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "region" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), @@ -1621,11 +1692,11 @@ function db_definition($charset) { function dbstructure_run(&$argv, &$argc) { global $a, $db; - if(is_null($a)){ + if (is_null($a)){ $a = new App; } - if(is_null($db)) { + if (is_null($db)) { @include(".htconfig.php"); require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); @@ -1650,7 +1721,7 @@ function dbstructure_run(&$argv, &$argc) { $current = intval(DB_UPDATE_VERSION); // run any left update_nnnn functions in update.php - for($x = $stored; $x < $current; $x ++) { + for ($x = $stored; $x < $current; $x ++) { $r = run_update_function($x); if (!$r) break; } @@ -1658,9 +1729,7 @@ function dbstructure_run(&$argv, &$argc) { set_config('system','build',DB_UPDATE_VERSION); return; case "dumpsql": - // For the dump that is used to create the database.sql we always assume utfmb4 - $charset = "utf8mb4"; - print_structure(db_definition($charset), $charset); + print_structure(db_definition()); return; } } diff --git a/include/dfrn.php b/include/dfrn.php index aae935963..a4651c6c8 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -554,8 +554,9 @@ class dfrn { xml::add_element($doc, $author, "poco:displayName", $profile["name"]); xml::add_element($doc, $author, "poco:updated", $namdate); - if (trim($profile["dob"]) != "0000-00-00") + if (trim($profile["dob"]) > '0001-01-01') { xml::add_element($doc, $author, "poco:birthday", "0000-".date("m-d", strtotime($profile["dob"]))); + } xml::add_element($doc, $author, "poco:note", $profile["about"]); xml::add_element($doc, $author, "poco:preferredUsername", $profile["nickname"]); @@ -867,7 +868,7 @@ class dfrn { // The signed text contains the content in Markdown, the sender handle and the signatur for the content // It is needed for relayed comments to Diaspora. - if($item['signed_text']) { + if ($item['signed_text']) { $sign = base64_encode(json_encode(array('signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer']))); xml::add_element($doc, $entry, "dfrn:diaspora_signature", $sign); } @@ -1287,7 +1288,7 @@ class dfrn { $href = ""; $width = 0; foreach ($avatar->attributes AS $attributes) { - /// @TODO Rewrite these similar if() to one switch + /// @TODO Rewrite these similar if () to one switch if ($attributes->name == "href") { $href = $attributes->textContent; } @@ -1402,7 +1403,7 @@ class dfrn { // "poco:birthday" is the birthday in the format "yyyy-mm-dd" $value = $xpath->evaluate($element . "/poco:birthday/text()", $context)->item(0)->nodeValue; - if (!in_array($value, array("", "0000-00-00"))) { + if (!in_array($value, array("", "0000-00-00", "0001-01-01"))) { $bdyear = date("Y"); $value = str_replace("0000", $bdyear, $value); @@ -2164,7 +2165,7 @@ class dfrn { $title = ""; foreach ($links AS $link) { foreach ($link->attributes AS $attributes) { - /// @TODO Rewrite these repeated (same) if() statements to a switch() + /// @TODO Rewrite these repeated (same) if () statements to a switch() if ($attributes->name == "href") { $href = $attributes->textContent; } @@ -2414,7 +2415,7 @@ class dfrn { // When activated, forums don't work. // And: Why should we disallow commenting by followers? // the behaviour is now similar to the Diaspora part. - //if($importer["rel"] == CONTACT_IS_FOLLOWER) { + //if ($importer["rel"] == CONTACT_IS_FOLLOWER) { // logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG); // return; //} @@ -2539,7 +2540,7 @@ class dfrn { logger("Item was stored with id ".$posted_id, LOGGER_DEBUG); - if(stristr($item["verb"],ACTIVITY_POKE)) + if (stristr($item["verb"],ACTIVITY_POKE)) self::do_poke($item, $importer, $posted_id); } } @@ -2666,7 +2667,7 @@ class dfrn { create_tags_from_itemuri($uri, $importer["uid"]); create_files_from_itemuri($uri, $importer["uid"]); update_thread_uri($uri, $importer["importer_uid"]); - if($item["last-child"]) { + if ($item["last-child"]) { // ensure that last-child is set in case the comment that had it just got wiped. q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ", dbesc(datetime_convert()), diff --git a/include/diaspora.php b/include/diaspora.php index bdedb9e0b..b8eff62b1 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -45,7 +45,7 @@ class Diaspora { $servers = explode(",", $serverdata); - foreach($servers AS $server) { + foreach ($servers AS $server) { $server = trim($server); $addr = "relay@".str_replace("http://", "", normalise_link($server)); $batch = $server."/receive/public"; @@ -207,7 +207,7 @@ class Diaspora { $children = $basedom->children('https://joindiaspora.com/protocol'); - if($children->header) { + if ($children->header) { $public = true; $author_link = str_replace('acct:','',$children->header->author_id); } else { @@ -240,11 +240,11 @@ class Diaspora { // figure out where in the DOM tree our data is hiding - if($dom->provenance->data) + if ($dom->provenance->data) $base = $dom->provenance; - elseif($dom->env->data) + elseif ($dom->env->data) $base = $dom->env; - elseif($dom->data) + elseif ($dom->data) $base = $dom; if (!$base) { @@ -277,7 +277,7 @@ class Diaspora { $data = base64url_decode($data); - if($public) + if ($public) $inner_decrypted = $data; else { @@ -578,7 +578,7 @@ class Diaspora { logger("Fetching diaspora key for: ".$handle); $r = self::person_by_handle($handle); - if($r) + if ($r) return $r["pubkey"]; return ""; @@ -634,7 +634,7 @@ class Diaspora { */ private static function add_fcontact($arr, $update = false) { - if($update) { + if ($update) { $r = q("UPDATE `fcontact` SET `name` = '%s', `photo` = '%s', @@ -818,7 +818,7 @@ class Diaspora { // perhaps we were already sharing with this person. Now they're sharing with us. // That makes us friends. // Normally this should have handled by getting a request - but this could get lost - if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { + if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d", intval(CONTACT_IS_FRIEND), intval($contact["id"]), @@ -828,12 +828,12 @@ class Diaspora { logger("defining user ".$contact["nick"]." as friend"); } - if(($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"])) + if (($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"])) return false; - if($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND) + if ($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND) return true; - if($contact["rel"] == CONTACT_IS_FOLLOWER) - if(($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment) + if ($contact["rel"] == CONTACT_IS_FOLLOWER) + if (($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment) return true; // Messages for the global users are always accepted @@ -991,7 +991,7 @@ class Diaspora { logger("Fetch post from ".$source_url, LOGGER_DEBUG); $envelope = fetch_url($source_url); - if($envelope) { + if ($envelope) { logger("Envelope was fetched.", LOGGER_DEBUG); $x = self::verify_magic_envelope($envelope); if (!$x) @@ -1007,7 +1007,7 @@ class Diaspora { logger("Fetch post from ".$source_url, LOGGER_DEBUG); $x = fetch_url($source_url); - if(!$x) + if (!$x) return false; } @@ -1064,7 +1064,7 @@ class Diaspora { FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", intval($uid), dbesc($guid)); - if(!$r) { + if (!$r) { $result = self::store_by_guid($guid, $contact["url"], $uid); if (!$result) { @@ -1325,7 +1325,7 @@ class Diaspora { } // If we are the origin of the parent we store the original data and notify our followers - if($message_id AND $parent_item["origin"]) { + if ($message_id AND $parent_item["origin"]) { // Formerly we stored the signed text, the signature and the author in different fields. // We now store the raw data so that we are more flexible. @@ -1502,7 +1502,7 @@ class Diaspora { intval($importer["uid"]), dbesc($guid) ); - if($c) + if ($c) $conversation = $c[0]; else { $r = q("INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`) @@ -1515,13 +1515,13 @@ class Diaspora { dbesc($subject), dbesc($participants) ); - if($r) + if ($r) $c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", intval($importer["uid"]), dbesc($guid) ); - if($c) + if ($c) $conversation = $c[0]; } if (!$conversation) { @@ -1529,7 +1529,7 @@ class Diaspora { return; } - foreach($messages as $mesg) + foreach ($messages as $mesg) self::receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation); return true; @@ -1659,7 +1659,7 @@ class Diaspora { logger("Stored like ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG); // If we are the origin of the parent we store the original data and notify our followers - if($message_id AND $parent_item["origin"]) { + if ($message_id AND $parent_item["origin"]) { // Formerly we stored the signed text, the signature and the author in different fields. // We now store the raw data so that we are more flexible. @@ -1834,10 +1834,10 @@ class Diaspora { $handle_parts = explode("@", $author); $nick = $handle_parts[0]; - if($name === "") + if ($name === "") $name = $handle_parts[0]; - if( preg_match("|^https?://|", $image_url) === 0) + if ( preg_match("|^https?://|", $image_url) === 0) $image_url = "http://".$handle_parts[1].$image_url; update_contact_avatar($image_url, $importer["uid"], $contact["id"]); @@ -1852,7 +1852,7 @@ class Diaspora { // this is to prevent multiple birthday notifications in a single year // if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year - if(substr($birthday,5) === substr($contact["bd"],5)) + if (substr($birthday,5) === substr($contact["bd"],5)) $birthday = $contact["bd"]; $r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s', @@ -1895,7 +1895,7 @@ class Diaspora { $a = get_app(); - if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { + if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d", intval(CONTACT_IS_FRIEND), intval($contact["id"]), @@ -1908,7 +1908,7 @@ class Diaspora { intval($importer["uid"]) ); - if($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) { + if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) { $self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1", intval($importer["uid"]) @@ -1916,7 +1916,7 @@ class Diaspora { // they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array - if($self && $contact["rel"] == CONTACT_IS_FOLLOWER) { + if ($self && $contact["rel"] == CONTACT_IS_FOLLOWER) { $arr = array(); $arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]); @@ -1947,7 +1947,7 @@ class Diaspora { $arr["deny_gid"] = $user[0]["deny_gid"]; $i = item_store($arr); - if($i) + if ($i) proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i); } } @@ -2086,12 +2086,12 @@ class Diaspora { $def_gid = get_default_group($importer['uid'], $ret["network"]); - if(intval($def_gid)) + if (intval($def_gid)) group_add_member($importer["uid"], "", $contact_record["id"], $def_gid); update_contact_avatar($ret["photo"], $importer['uid'], $contact_record["id"], true); - if($importer["page-flags"] == PAGE_NORMAL) { + if ($importer["page-flags"] == PAGE_NORMAL) { logger("Sending intra message for author ".$author.".", LOGGER_DEBUG); @@ -2141,7 +2141,7 @@ class Diaspora { ); $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"])); - if($u) { + if ($u) { logger("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], LOGGER_DEBUG); $ret = self::send_share($u[0], $contact_record); @@ -2765,7 +2765,7 @@ class Diaspora { $a = get_app(); $enabled = intval(get_config("system", "diaspora_enabled")); - if(!$enabled) + if (!$enabled) return 200; $logid = random_string(4); @@ -3104,14 +3104,14 @@ class Diaspora { $body = html_entity_decode(bb2diaspora($body)); // Adding the title - if(strlen($title)) + if (strlen($title)) $body = "## ".html_entity_decode($title)."\n\n".$body; if ($item["attach"]) { $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER); - if(cnt) { + if (cnt) { $body .= "\n".t("Attachments:")."\n"; - foreach($matches as $mtch) + foreach ($matches as $mtch) $body .= "[".$mtch[3]."](".$mtch[1].")\n"; } } @@ -3591,7 +3591,7 @@ class Diaspora { if ($searchable === 'true') { $dob = '1000-00-00'; - if (($profile['dob']) && ($profile['dob'] != '0000-00-00')) + if (($profile['dob']) && ($profile['dob'] > '0001-01-01')) $dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC','UTC',$profile['dob'],'m-d'); $about = $profile['about']; @@ -3604,7 +3604,7 @@ class Diaspora { $kw = str_replace(' ',' ',$kw); $arr = explode(' ',$profile['pub_keywords']); if (count($arr)) { - for($x = 0; $x < 5; $x ++) { + for ($x = 0; $x < 5; $x ++) { if (trim($arr[$x])) $tags .= '#'. trim($arr[$x]) .' '; } @@ -3626,7 +3626,7 @@ class Diaspora { "searchable" => $searchable, "tag_string" => $tags); - foreach($recips as $recip) { + foreach ($recips as $recip) { logger("Send updated profile data for user ".$uid." to contact ".$recip["id"], LOGGER_DEBUG); self::build_and_transmit($profile, $recip, "profile", $message, false, "", true); } @@ -3649,17 +3649,20 @@ class Diaspora { } $r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid'])); - if(!$r) + if (!dbm::is_result($r)) { return false; + } $contact["uprvkey"] = $r[0]['prvkey']; $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($post_id)); - if (!$r) + if (!dbm::is_result($r)) { return false; + } - if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) + if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) { return false; + } $message = self::construct_like($r[0], $contact); $message["author_signature"] = self::signature($contact, $message); diff --git a/include/directory.php b/include/directory.php index 088adbe78..41a3dd784 100644 --- a/include/directory.php +++ b/include/directory.php @@ -1,17 +1,19 @@ $argv[1]); @@ -22,5 +24,20 @@ function directory_run(&$argv, &$argc){ if (strlen($arr['url'])) { fetch_url($dir . '?url=' . bin2hex($arr['url'])); } + return; } + +function directory_update_all() { + $r = q("SELECT `url` FROM `contact` + INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid` + INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` + WHERE `contact`.`self` AND `profile`.`net-publish` AND `profile`.`is-default` AND + NOT `user`.`account_expired` AND `user`.`verified`"); + + if (dbm::is_result($r)) { + foreach ($r AS $user) { + proc_run(PRIORITY_LOW, 'include/directory.php', $user['url']); + } + } +} diff --git a/include/discover_poco.php b/include/discover_poco.php index bb53efb5c..ff97b0e59 100644 --- a/include/discover_poco.php +++ b/include/discover_poco.php @@ -209,10 +209,10 @@ function discover_directory($search) { $j = json_decode($x); if (count($j->results)) { - foreach($j->results as $jj) { + foreach ($j->results as $jj) { // Check if the contact already exists $exists = q("SELECT `id`, `last_contact`, `last_failure`, `updated` FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($jj->url)); - if ($exists) { + if (dbm::is_result($exists)) { logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG); if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) AND @@ -272,12 +272,16 @@ function gs_search_user($search) { if (!$result["success"]) { return false; } + $contacts = json_decode($result["body"]); if ($contacts->status == 'ERROR') { return false; } - foreach($contacts->data AS $user) { + + /// @TODO AS is considered as a notation for constants (as they usually being written all upper-case) + /// @TODO find all those and convert to all lower-case which is a keyword then + foreach ($contacts->data AS $user) { $contact = probe_url($user->site_address."/".$user->name); if ($contact["network"] != NETWORK_PHANTOM) { $contact["about"] = $user->description; diff --git a/include/email.php b/include/email.php index 42f80c242..b8d99433e 100644 --- a/include/email.php +++ b/include/email.php @@ -4,7 +4,7 @@ require_once('include/msgclean.php'); require_once('include/quoteconvert.php'); function email_connect($mailbox,$username,$password) { - if(! function_exists('imap_open')) + if (! function_exists('imap_open')) return false; $mbox = @imap_open($mailbox,$username,$password); @@ -14,23 +14,23 @@ function email_connect($mailbox,$username,$password) { function email_poll($mbox,$email_addr) { - if(! ($mbox && $email_addr)) + if (! ($mbox && $email_addr)) return array(); $search1 = @imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID); - if(! $search1) + if (! $search1) $search1 = array(); $search2 = @imap_search($mbox,'TO "' . $email_addr . '"', SE_UID); - if(! $search2) + if (! $search2) $search2 = array(); $search3 = @imap_search($mbox,'CC "' . $email_addr . '"', SE_UID); - if(! $search3) + if (! $search3) $search3 = array(); $search4 = @imap_search($mbox,'BCC "' . $email_addr . '"', SE_UID); - if(! $search4) + if (! $search4) $search4 = array(); $res = array_unique(array_merge($search1,$search2,$search3,$search4)); @@ -57,8 +57,8 @@ function email_msg_headers($mbox,$uid) { $raw_header = str_replace("\r",'',$raw_header); $ret = array(); $h = explode("\n",$raw_header); - if(count($h)) - foreach($h as $line ) { + if (count($h)) + foreach ($h as $line ) { if (preg_match("/^[a-zA-Z]/", $line)) { $key = substr($line,0,strpos($line,':')); $value = substr($line,strpos($line,':')+1); @@ -79,10 +79,10 @@ function email_get_msg($mbox,$uid, $reply) { $struc = (($mbox && $uid) ? @imap_fetchstructure($mbox,$uid,FT_UID) : null); - if(! $struc) + if (! $struc) return $ret; - if(! $struc->parts) { + if (! $struc->parts) { $ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html'); $html = $ret['body']; @@ -94,7 +94,7 @@ function email_get_msg($mbox,$uid, $reply) { else { $text = ''; $html = ''; - foreach($struc->parts as $ptop => $p) { + foreach ($struc->parts as $ptop => $p) { $x = email_get_part($mbox,$uid,$p,$ptop + 1, 'plain'); if ($x) { $text .= $x; @@ -206,16 +206,16 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) { function email_header_encode($in_str, $charset) { - $out_str = $in_str; + $out_str = $in_str; $need_to_convert = false; - for($x = 0; $x < strlen($in_str); $x ++) { - if((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) { + for ($x = 0; $x < strlen($in_str); $x ++) { + if ((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) { $need_to_convert = true; } } - if(! $need_to_convert) + if (! $need_to_convert) return $in_str; if ($out_str && $charset) { diff --git a/include/enotify.php b/include/enotify.php index ebc27309d..f86174bd4 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -411,10 +411,12 @@ function notification($params) { $hash = random_string(); $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", dbesc($hash)); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $dups = true; - } while($dups == true); + } + } while ($dups == true); + /// @TODO One statement is enough $datarray = array(); $datarray['hash'] = $hash; $datarray['name'] = $params['source_name']; diff --git a/include/event.php b/include/event.php index ebd4885c9..280b1380a 100644 --- a/include/event.php +++ b/include/event.php @@ -10,7 +10,7 @@ require_once 'include/datetime.php'; function format_event_html($ev, $simple = false) { - if(! ((is_array($ev)) && count($ev))) { + if (! ((is_array($ev)) && count($ev))) { return ''; } @@ -98,26 +98,26 @@ function parse_event($h) { logger('parse_event: parse error: ' . $e); } - if(! $dom) + if (! $dom) return $ret; $items = $dom->getElementsByTagName('*'); - foreach($items as $item) { - if(attribute_contains($item->getAttribute('class'), 'vevent')) { + foreach ($items as $item) { + if (attribute_contains($item->getAttribute('class'), 'vevent')) { $level2 = $item->getElementsByTagName('*'); - foreach($level2 as $x) { - if(attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) { + foreach ($level2 as $x) { + if (attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) { $ret['start'] = $x->getAttribute('title'); - if(! strpos($ret['start'],'Z')) + if (! strpos($ret['start'],'Z')) $ret['adjust'] = true; } - if(attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title')) + if (attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title')) $ret['finish'] = $x->getAttribute('title'); - if(attribute_contains($x->getAttribute('class'),'description')) + if (attribute_contains($x->getAttribute('class'),'description')) $ret['desc'] = $x->textContent; - if(attribute_contains($x->getAttribute('class'),'location')) + if (attribute_contains($x->getAttribute('class'),'location')) $ret['location'] = $x->textContent; } } @@ -125,23 +125,23 @@ function parse_event($h) { // sanitise - if((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) { + if ((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) { $config = HTMLPurifier_Config::createDefault(); $config->set('Cache.DefinitionImpl', null); $purifier = new HTMLPurifier($config); $ret['desc'] = html2bbcode($purifier->purify($ret['desc'])); } - if((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) { + if ((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) { $config = HTMLPurifier_Config::createDefault(); $config->set('Cache.DefinitionImpl', null); $purifier = new HTMLPurifier($config); $ret['location'] = html2bbcode($purifier->purify($ret['location'])); } - if(x($ret,'start')) + if (x($ret,'start')) $ret['start'] = datetime_convert('UTC','UTC',$ret['start']); - if(x($ret,'finish')) + if (x($ret,'finish')) $ret['finish'] = datetime_convert('UTC','UTC',$ret['finish']); return $ret; @@ -595,7 +595,7 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') { */ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') { // Only allow events if there is a valid owner_id - if($owner_uid == 0) { + if ($owner_uid == 0) { return; } diff --git a/include/expire.php b/include/expire.php index 35b109a50..098125a79 100644 --- a/include/expire.php +++ b/include/expire.php @@ -11,12 +11,13 @@ function expire_run(&$argv, &$argc){ // physically remove anything that has been deleted for more than two months - $r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY"); + $r = q("DELETE FROM `item` WHERE `deleted` = 1 AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"); // make this optional as it could have a performance impact on large sites - if(intval(get_config('system','optimize_items'))) - q("optimize table item"); + if (intval(get_config('system','optimize_items'))) { + q("OPTIMIZE TABLE `item`"); + } logger('expire: start'); diff --git a/include/feed.php b/include/feed.php index 295993370..2117676db 100644 --- a/include/feed.php +++ b/include/feed.php @@ -200,7 +200,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { 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; @@ -210,12 +209,17 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { if ($item["uri"] == "") { $item["uri"] = $item["plink"]; } + + $orig_plink = $item["plink"]; + + $item["plink"] = original_url($item["plink"]); + $item["parent-uri"] = $item["uri"]; if (!$simulate) { $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s', '%s')", intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED), dbesc(NETWORK_DFRN)); - if ($r) { + if (dbm::is_result($r)) { logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG); continue; } @@ -340,6 +344,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { // Distributed items should have a well formatted URI. // Additionally we have to avoid conflicts with identical URI between imported feeds and these items. if ($notify) { + $item['guid'] = uri_to_guid($orig_plink, $a->get_hostname()); unset($item['uri']); unset($item['parent-uri']); } diff --git a/include/identity.php b/include/identity.php index 8138e9b04..a21624a21 100644 --- a/include/identity.php +++ b/include/identity.php @@ -202,6 +202,9 @@ function profile_sidebar($profile, $block = 0) { $address = false; // $pdesc = true; + // This function can also use contact information in $profile + $is_contact = x($profile, 'cid'); + if((! is_array($profile)) && (! count($profile))) return $o; @@ -281,7 +284,7 @@ function profile_sidebar($profile, $block = 0) { } // show edit profile to yourself - if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) { + if (!$is_contact && $profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) { $profile['edit'] = array(App::get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles')); $r = q("SELECT * FROM `profile` WHERE `uid` = %d", local_user()); @@ -310,7 +313,7 @@ function profile_sidebar($profile, $block = 0) { } } - if ($profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) { + if (!$is_contact && $profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) { $profile['edit'] = array(App::get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile')); $profile['menu'] = array( 'chg_photo' => t('Change profile photo'), @@ -628,7 +631,7 @@ function advanced_profile(App $a) { if($a->profile['gender']) $profile['gender'] = array( t('Gender:'), $a->profile['gender'] ); - if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { + if(($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) { $year_bd_format = t('j F, Y'); $short_bd_format = t('j F'); diff --git a/include/items.php b/include/items.php index c2b3d7d1f..2500e08d5 100644 --- a/include/items.php +++ b/include/items.php @@ -6,31 +6,33 @@ use \Friendica\ParseUrl; -require_once('include/bbcode.php'); -require_once('include/oembed.php'); -require_once('include/salmon.php'); -require_once('include/crypto.php'); -require_once('include/Photo.php'); -require_once('include/tags.php'); -require_once('include/files.php'); -require_once('include/text.php'); -require_once('include/email.php'); -require_once('include/threads.php'); -require_once('include/socgraph.php'); -require_once('include/plaintext.php'); -require_once('include/ostatus.php'); -require_once('include/feed.php'); -require_once('include/Contact.php'); -require_once('mod/share.php'); -require_once('include/enotify.php'); -require_once('include/dfrn.php'); -require_once('include/group.php'); +require_once 'include/bbcode.php'; +require_once 'include/oembed.php'; +require_once 'include/salmon.php'; +require_once 'include/crypto.php'; +require_once 'include/Photo.php'; +require_once 'include/tags.php'; +require_once 'include/files.php'; +require_once 'include/text.php'; +require_once 'include/email.php'; +require_once 'include/threads.php'; +require_once 'include/socgraph.php'; +require_once 'include/plaintext.php'; +require_once 'include/ostatus.php'; +require_once 'include/feed.php'; +require_once 'include/Contact.php'; +require_once 'mod/share.php'; +require_once 'include/enotify.php'; +require_once 'include/dfrn.php'; +require_once 'include/group.php'; -require_once('library/defuse/php-encryption-1.2.1/Crypto.php'); +/// @TODO one day with composer autoloader no more needed +require_once 'library/defuse/php-encryption-1.2.1/Crypto.php'; function construct_verb($item) { - if ($item['verb']) + if ($item['verb']) { return $item['verb']; + } return ACTIVITY_POST; } @@ -60,7 +62,7 @@ function limit_body_size($body) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); - while(($img_st_close !== false) && ($img_end !== false)) { + while (($img_st_close !== false) && ($img_end !== false)) { $img_st_close++; // make it point to AFTER the closing bracket $img_end += $img_start; @@ -69,7 +71,7 @@ function limit_body_size($body) { if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { // This is an embedded image - if ( ($textlen + $img_start) > $maxlen ) { + if (($textlen + $img_start) > $maxlen ) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens before an embedded image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); @@ -83,7 +85,7 @@ function limit_body_size($body) { $new_body = $new_body . substr($orig_body, $img_start, $img_end - $img_start); } else { - if ( ($textlen + $img_end) > $maxlen ) { + if (($textlen + $img_end) > $maxlen ) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens before the end of a non-embedded image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); @@ -96,15 +98,17 @@ function limit_body_size($body) { } $orig_body = substr($orig_body, $img_end); - if ($orig_body === false) // in case the body ends on a closing image tag + if ($orig_body === false) { + // in case the body ends on a closing image tag $orig_body = ''; + } $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); } - if ( ($textlen + strlen($orig_body)) > $maxlen) { + if (($textlen + strlen($orig_body)) > $maxlen) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens after the end of the last image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); @@ -117,8 +121,9 @@ function limit_body_size($body) { } return $new_body; - } else + } else { return $body; + } }} function title_is_body($title, $body) { @@ -126,15 +131,16 @@ function title_is_body($title, $body) { $title = strip_tags($title); $title = trim($title); $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8'); - $title = str_replace(array("\n", "\r", "\t", " "), array("","","",""), $title); + $title = str_replace(array("\n", "\r", "\t", " "), array("", "", "", ""), $title); $body = strip_tags($body); $body = trim($body); $body = html_entity_decode($body, ENT_QUOTES, 'UTF-8'); - $body = str_replace(array("\n", "\r", "\t", " "), array("","","",""), $body); + $body = str_replace(array("\n", "\r", "\t", " "), array("", "", "", ""), $body); - if (strlen($title) < strlen($body)) + if (strlen($title) < strlen($body)) { $body = substr($body, 0, strlen($title)); + } if (($title != $body) and (substr($title, -3) == "...")) { $pos = strrpos($title, "..."); @@ -144,7 +150,7 @@ function title_is_body($title, $body) { } } - return($title == $body); + return ($title == $body); } function add_page_info_data($data) { @@ -212,8 +218,8 @@ function add_page_info_data($data) { foreach ($data["keywords"] AS $keyword) { /// @todo make a positive list of allowed characters $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"), - array("","", "", "", "", "", "", "", "", "", "", ""), $keyword); - $hashtags .= "#[url=".App::get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url] "; + array("", "", "", "", "", "", "", "", "", "", "", ""), $keyword); + $hashtags .= "#[url=" . App::get_baseurl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url] "; } } @@ -224,25 +230,28 @@ function query_page_info($url, $no_photos = false, $photo = "", $keywords = fals $data = ParseUrl::getSiteinfoCached($url, true); - if ($photo != "") + if ($photo != "") { $data["images"][0]["src"] = $photo; + } - logger('fetch page info for '.$url.' '.print_r($data, true), LOGGER_DEBUG); + logger('fetch page info for ' . $url . ' ' . print_r($data, true), LOGGER_DEBUG); - if (!$keywords AND isset($data["keywords"])) + if (!$keywords AND isset($data["keywords"])) { unset($data["keywords"]); + } if (($keyword_blacklist != "") AND isset($data["keywords"])) { - $list = explode(",", $keyword_blacklist); + $list = explode(", ", $keyword_blacklist); foreach ($list AS $keyword) { $keyword = trim($keyword); $index = array_search($keyword, $data["keywords"]); - if ($index !== false) + if ($index !== false) { unset($data["keywords"][$index]); + } } } - return($data); + return $data; } function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") { @@ -252,16 +261,17 @@ function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = fa if (isset($data["keywords"]) AND count($data["keywords"])) { foreach ($data["keywords"] AS $keyword) { $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'"), - array("","", "", "", "", ""), $keyword); + array("", "", "", "", "", ""), $keyword); - if ($tags != "") - $tags .= ","; + if ($tags != "") { + $tags .= ", "; + } - $tags .= "#[url=".App::get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url]"; + $tags .= "#[url=" . App::get_baseurl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]"; } } - return($tags); + return $tags; } function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") { @@ -269,52 +279,58 @@ function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $text = add_page_info_data($data); - return($text); + return $text; } function add_page_info_to_body($body, $texturl = false, $no_photos = false) { - logger('add_page_info_to_body: fetch page info for body '.$body, LOGGER_DEBUG); + logger('add_page_info_to_body: fetch page info for body ' . $body, LOGGER_DEBUG); $URLSearchString = "^\[\]"; // Fix for Mastodon where the mentions are in a different format $body = preg_replace("/\[url\=([$URLSearchString]*)\]([#!@])(.*?)\[\/url\]/ism", - '$2[url=$1]$3[/url]', $body); + '$2[url=$1]$3[/url]', $body); // Adding these spaces is a quick hack due to my problems with regular expressions :) - preg_match("/[^!#@]\[url\]([$URLSearchString]*)\[\/url\]/ism", " ".$body, $matches); + preg_match("/[^!#@]\[url\]([$URLSearchString]*)\[\/url\]/ism", " " . $body, $matches); - if (!$matches) - preg_match("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", " ".$body, $matches); + if (!$matches) { + preg_match("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", " " . $body, $matches); + } // Convert urls without bbcode elements if (!$matches AND $texturl) { preg_match("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", " ".$body, $matches); // Yeah, a hack. I really hate regular expressions :) - if ($matches) + if ($matches) { $matches[1] = $matches[2]; + } } - if ($matches) + if ($matches) { $footer = add_page_info($matches[1], $no_photos); + } // Remove the link from the body if the link is attached at the end of the post if (isset($footer) AND (trim($footer) != "") AND (strpos($footer, $matches[1]))) { $removedlink = trim(str_replace($matches[1], "", $body)); - if (($removedlink == "") OR strstr($body, $removedlink)) + if (($removedlink == "") OR strstr($body, $removedlink)) { $body = $removedlink; + } $url = str_replace(array('/', '.'), array('\/', '\.'), $matches[1]); - $removedlink = preg_replace("/\[url\=".$url."\](.*?)\[\/url\]/ism", '', $body); - if (($removedlink == "") OR strstr($body, $removedlink)) + $removedlink = preg_replace("/\[url\=" . $url . "\](.*?)\[\/url\]/ism", '', $body); + if (($removedlink == "") OR strstr($body, $removedlink)) { $body = $removedlink; + } } // Add the page information to the bottom - if (isset($footer) AND (trim($footer) != "")) + if (isset($footer) AND (trim($footer) != "")) { $body .= $footer; + } return $body; } @@ -328,12 +344,13 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) { */ function item_add_language_opt(&$arr) { - if (version_compare(PHP_VERSION, '5.3.0', '<')) return; // LanguageDetect.php not available ? + if (version_compare(PHP_VERSION, '5.3.0', '<')) { + // LanguageDetect.php not available ? + return; + } - if ( x($arr, 'postopts') ) - { - if ( strstr($arr['postopts'], 'lang=') ) - { + if (x($arr, 'postopts') ) { + if (strstr($arr['postopts'], 'lang=') ) { // do not override /// @TODO Add parameter to request overriding return; @@ -344,8 +361,9 @@ function item_add_language_opt(&$arr) { } require_once('library/langdet/Text/LanguageDetect.php'); - $naked_body = preg_replace('/\[(.+?)\]/','',$arr['body']); - $l = new Text_LanguageDetect; + + $naked_body = preg_replace('/\[(.+?)\]/','', $arr['body']); + $l = new Text_LanguageDetect(); //$lng = $l->detectConfidence($naked_body); //$arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : ''); $lng = $l->detect($naked_body, 3); @@ -355,7 +373,7 @@ function item_add_language_opt(&$arr) { $postopts .= 'lang='; $sep = ""; foreach ($lng as $language => $score) { - $postopts .= $sep . $language.";".$score; + $postopts .= $sep . $language . ";" . $score; $sep = ':'; } $arr['postopts'] = $postopts; @@ -392,7 +410,9 @@ function uri_to_guid($uri, $host = "") { return $guid_prefix.$host_hash; } -function item_store($arr,$force_parent = false, $notify = false, $dontcache = false) { +/// @TODO Maybe $arr must be called-by-reference? This function modifies it +/// @TODO add type-hint array +function item_store($arr, $force_parent = false, $notify = false, $dontcache = false) { $a = get_app(); @@ -407,18 +427,22 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri. // In difference to the call to "uri_to_guid" several lines below we add the hash of our own host. // This is done because our host is the original creator of the post. - if (isset($arr['plink'])) { - $arr['guid'] = uri_to_guid($arr['plink'], $a->get_hostname()); - } elseif (isset($arr['uri'])) { - $arr['guid'] = uri_to_guid($arr['uri'], $a->get_hostname()); + if (!isset($arr['guid'])) { + if (isset($arr['plink'])) { + $arr['guid'] = uri_to_guid($arr['plink'], $a->get_hostname()); + } elseif (isset($arr['uri'])) { + $arr['guid'] = uri_to_guid($arr['uri'], $a->get_hostname()); + } } } - // If a Diaspora signature structure was passed in, pull it out of the - // item array and set it aside for later storage. + /* + * If a Diaspora signature structure was passed in, pull it out of the + * item array and set it aside for later storage. + */ $dsprsig = null; - if (x($arr,'dsprsig')) { + if (x($arr, 'dsprsig')) { $encoded_signature = $arr['dsprsig']; $dsprsig = json_decode(base64_decode($arr['dsprsig'])); unset($arr['dsprsig']); @@ -426,27 +450,28 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // Converting the plink if ($arr['network'] == NETWORK_OSTATUS) { - if (isset($arr['plink'])) + if (isset($arr['plink'])) { $arr['plink'] = ostatus::convert_href($arr['plink']); - elseif (isset($arr['uri'])) + } elseif (isset($arr['uri'])) { $arr['plink'] = ostatus::convert_href($arr['uri']); + } } - if (x($arr, 'gravity')) + if (x($arr, 'gravity')) { $arr['gravity'] = intval($arr['gravity']); - elseif ($arr['parent-uri'] === $arr['uri']) + } elseif ($arr['parent-uri'] === $arr['uri']) { $arr['gravity'] = 0; - elseif (activity_match($arr['verb'],ACTIVITY_POST)) + } elseif (activity_match($arr['verb'],ACTIVITY_POST)) { $arr['gravity'] = 6; - else + } else { $arr['gravity'] = 6; // extensible catchall + } - if (! x($arr,'type')) + if (! x($arr, 'type')) { $arr['type'] = 'remote'; + } - - - /* check for create date and expire time */ + // check for create date and expire time $uid = intval($arr['uid']); $r = q("SELECT expire FROM user WHERE uid = %d", intval($uid)); if (dbm::is_result($r)) { @@ -461,8 +486,11 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa } } - // Do we already have this item? - // We have to check several networks since Friendica posts could be repeated via OStatus (maybe Diasporsa as well) + /* + * Do we already have this item? + * We have to check several networks since Friendica posts could be repeated + * via OStatus (maybe Diasporsa as well) + */ if (in_array(trim($arr['network']), array(NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS, ""))) { $r = q("SELECT `id`, `network` FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` IN ('%s', '%s', '%s') LIMIT 1", dbesc(trim($arr['uri'])), @@ -471,14 +499,17 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS) ); - if ($r) { + if (dbm::is_result($r)) { // We only log the entries with a different user id than 0. Otherwise we would have too many false positives - if ($uid != 0) + if ($uid != 0) { logger("Item with uri ".$arr['uri']." already existed for user ".$uid." with id ".$r[0]["id"]." target network ".$r[0]["network"]." - new network: ".$arr['network']); - return($r[0]["id"]); + } + + return $r[0]["id"]; } } + /// @TODO old-lost code? // Shouldn't happen but we want to make absolutely sure it doesn't leak from a plugin. // Deactivated, since the bbcode parser can handle with it - and it destroys posts with some smileys that contain "<" //if ((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false)) @@ -486,76 +517,79 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa item_add_language_opt($arr); - if ($notify) + if ($notify) { $guid_prefix = ""; - elseif ((trim($arr['guid']) == "") AND (trim($arr['plink']) != "")) + } elseif ((trim($arr['guid']) == "") AND (trim($arr['plink']) != "")) { $arr['guid'] = uri_to_guid($arr['plink']); - elseif ((trim($arr['guid']) == "") AND (trim($arr['uri']) != "")) + } elseif ((trim($arr['guid']) == "") AND (trim($arr['uri']) != "")) { $arr['guid'] = uri_to_guid($arr['uri']); - else { + } else { $parsed = parse_url($arr["author-link"]); $guid_prefix = hash("crc32", $parsed["host"]); } - $arr['wall'] = ((x($arr,'wall')) ? intval($arr['wall']) : 0); - $arr['guid'] = ((x($arr,'guid')) ? notags(trim($arr['guid'])) : get_guid(32, $guid_prefix)); - $arr['uri'] = ((x($arr,'uri')) ? notags(trim($arr['uri'])) : item_new_uri($a->get_hostname(), $uid, $arr['guid'])); - $arr['extid'] = ((x($arr,'extid')) ? notags(trim($arr['extid'])) : ''); - $arr['author-name'] = ((x($arr,'author-name')) ? trim($arr['author-name']) : ''); - $arr['author-link'] = ((x($arr,'author-link')) ? notags(trim($arr['author-link'])) : ''); - $arr['author-avatar'] = ((x($arr,'author-avatar')) ? notags(trim($arr['author-avatar'])) : ''); - $arr['owner-name'] = ((x($arr,'owner-name')) ? trim($arr['owner-name']) : ''); - $arr['owner-link'] = ((x($arr,'owner-link')) ? notags(trim($arr['owner-link'])) : ''); - $arr['owner-avatar'] = ((x($arr,'owner-avatar')) ? notags(trim($arr['owner-avatar'])) : ''); - $arr['created'] = ((x($arr,'created') !== false) ? datetime_convert('UTC','UTC',$arr['created']) : datetime_convert()); - $arr['edited'] = ((x($arr,'edited') !== false) ? datetime_convert('UTC','UTC',$arr['edited']) : datetime_convert()); - $arr['commented'] = ((x($arr,'commented') !== false) ? datetime_convert('UTC','UTC',$arr['commented']) : datetime_convert()); - $arr['received'] = ((x($arr,'received') !== false) ? datetime_convert('UTC','UTC',$arr['received']) : datetime_convert()); - $arr['changed'] = ((x($arr,'changed') !== false) ? datetime_convert('UTC','UTC',$arr['changed']) : datetime_convert()); - $arr['title'] = ((x($arr,'title')) ? trim($arr['title']) : ''); - $arr['location'] = ((x($arr,'location')) ? trim($arr['location']) : ''); - $arr['coord'] = ((x($arr,'coord')) ? notags(trim($arr['coord'])) : ''); - $arr['last-child'] = ((x($arr,'last-child')) ? intval($arr['last-child']) : 0 ); - $arr['visible'] = ((x($arr,'visible') !== false) ? intval($arr['visible']) : 1 ); + $arr['wall'] = ((x($arr, 'wall')) ? intval($arr['wall']) : 0); + $arr['guid'] = ((x($arr, 'guid')) ? notags(trim($arr['guid'])) : get_guid(32, $guid_prefix)); + $arr['uri'] = ((x($arr, 'uri')) ? notags(trim($arr['uri'])) : item_new_uri($a->get_hostname(), $uid, $arr['guid'])); + $arr['extid'] = ((x($arr, 'extid')) ? notags(trim($arr['extid'])) : ''); + $arr['author-name'] = ((x($arr, 'author-name')) ? trim($arr['author-name']) : ''); + $arr['author-link'] = ((x($arr, 'author-link')) ? notags(trim($arr['author-link'])) : ''); + $arr['author-avatar'] = ((x($arr, 'author-avatar')) ? notags(trim($arr['author-avatar'])) : ''); + $arr['owner-name'] = ((x($arr, 'owner-name')) ? trim($arr['owner-name']) : ''); + $arr['owner-link'] = ((x($arr, 'owner-link')) ? notags(trim($arr['owner-link'])) : ''); + $arr['owner-avatar'] = ((x($arr, 'owner-avatar')) ? notags(trim($arr['owner-avatar'])) : ''); + $arr['created'] = ((x($arr, 'created') !== false) ? datetime_convert('UTC','UTC', $arr['created']) : datetime_convert()); + $arr['edited'] = ((x($arr, 'edited') !== false) ? datetime_convert('UTC','UTC', $arr['edited']) : datetime_convert()); + $arr['commented'] = ((x($arr, 'commented') !== false) ? datetime_convert('UTC','UTC', $arr['commented']) : datetime_convert()); + $arr['received'] = ((x($arr, 'received') !== false) ? datetime_convert('UTC','UTC', $arr['received']) : datetime_convert()); + $arr['changed'] = ((x($arr, 'changed') !== false) ? datetime_convert('UTC','UTC', $arr['changed']) : datetime_convert()); + $arr['title'] = ((x($arr, 'title')) ? trim($arr['title']) : ''); + $arr['location'] = ((x($arr, 'location')) ? trim($arr['location']) : ''); + $arr['coord'] = ((x($arr, 'coord')) ? notags(trim($arr['coord'])) : ''); + $arr['last-child'] = ((x($arr, 'last-child')) ? intval($arr['last-child']) : 0 ); + $arr['visible'] = ((x($arr, 'visible') !== false) ? intval($arr['visible']) : 1 ); $arr['deleted'] = 0; - $arr['parent-uri'] = ((x($arr,'parent-uri')) ? notags(trim($arr['parent-uri'])) : $arr['uri']); - $arr['verb'] = ((x($arr,'verb')) ? notags(trim($arr['verb'])) : ''); - $arr['object-type'] = ((x($arr,'object-type')) ? notags(trim($arr['object-type'])) : ''); - $arr['object'] = ((x($arr,'object')) ? trim($arr['object']) : ''); - $arr['target-type'] = ((x($arr,'target-type')) ? notags(trim($arr['target-type'])) : ''); - $arr['target'] = ((x($arr,'target')) ? trim($arr['target']) : ''); - $arr['plink'] = ((x($arr,'plink')) ? notags(trim($arr['plink'])) : ''); - $arr['allow_cid'] = ((x($arr,'allow_cid')) ? trim($arr['allow_cid']) : ''); - $arr['allow_gid'] = ((x($arr,'allow_gid')) ? trim($arr['allow_gid']) : ''); - $arr['deny_cid'] = ((x($arr,'deny_cid')) ? trim($arr['deny_cid']) : ''); - $arr['deny_gid'] = ((x($arr,'deny_gid')) ? trim($arr['deny_gid']) : ''); - $arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0 ); - $arr['bookmark'] = ((x($arr,'bookmark')) ? intval($arr['bookmark']) : 0 ); - $arr['body'] = ((x($arr,'body')) ? trim($arr['body']) : ''); - $arr['tag'] = ((x($arr,'tag')) ? notags(trim($arr['tag'])) : ''); - $arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : ''); - $arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : ''); - $arr['origin'] = ((x($arr,'origin')) ? intval($arr['origin']) : 0 ); - $arr['network'] = ((x($arr,'network')) ? trim($arr['network']) : ''); - $arr['postopts'] = ((x($arr,'postopts')) ? trim($arr['postopts']) : ''); - $arr['resource-id'] = ((x($arr,'resource-id')) ? trim($arr['resource-id']) : ''); - $arr['event-id'] = ((x($arr,'event-id')) ? intval($arr['event-id']) : 0 ); - $arr['inform'] = ((x($arr,'inform')) ? trim($arr['inform']) : ''); - $arr['file'] = ((x($arr,'file')) ? trim($arr['file']) : ''); + $arr['parent-uri'] = ((x($arr, 'parent-uri')) ? notags(trim($arr['parent-uri'])) : $arr['uri']); + $arr['verb'] = ((x($arr, 'verb')) ? notags(trim($arr['verb'])) : ''); + $arr['object-type'] = ((x($arr, 'object-type')) ? notags(trim($arr['object-type'])) : ''); + $arr['object'] = ((x($arr, 'object')) ? trim($arr['object']) : ''); + $arr['target-type'] = ((x($arr, 'target-type')) ? notags(trim($arr['target-type'])) : ''); + $arr['target'] = ((x($arr, 'target')) ? trim($arr['target']) : ''); + $arr['plink'] = ((x($arr, 'plink')) ? notags(trim($arr['plink'])) : ''); + $arr['allow_cid'] = ((x($arr, 'allow_cid')) ? trim($arr['allow_cid']) : ''); + $arr['allow_gid'] = ((x($arr, 'allow_gid')) ? trim($arr['allow_gid']) : ''); + $arr['deny_cid'] = ((x($arr, 'deny_cid')) ? trim($arr['deny_cid']) : ''); + $arr['deny_gid'] = ((x($arr, 'deny_gid')) ? trim($arr['deny_gid']) : ''); + $arr['private'] = ((x($arr, 'private')) ? intval($arr['private']) : 0 ); + $arr['bookmark'] = ((x($arr, 'bookmark')) ? intval($arr['bookmark']) : 0 ); + $arr['body'] = ((x($arr, 'body')) ? trim($arr['body']) : ''); + $arr['tag'] = ((x($arr, 'tag')) ? notags(trim($arr['tag'])) : ''); + $arr['attach'] = ((x($arr, 'attach')) ? notags(trim($arr['attach'])) : ''); + $arr['app'] = ((x($arr, 'app')) ? notags(trim($arr['app'])) : ''); + $arr['origin'] = ((x($arr, 'origin')) ? intval($arr['origin']) : 0 ); + $arr['network'] = ((x($arr, 'network')) ? trim($arr['network']) : ''); + $arr['postopts'] = ((x($arr, 'postopts')) ? trim($arr['postopts']) : ''); + $arr['resource-id'] = ((x($arr, 'resource-id')) ? trim($arr['resource-id']) : ''); + $arr['event-id'] = ((x($arr, 'event-id')) ? intval($arr['event-id']) : 0 ); + $arr['inform'] = ((x($arr, 'inform')) ? trim($arr['inform']) : ''); + $arr['file'] = ((x($arr, 'file')) ? trim($arr['file']) : ''); // Items cannot be stored before they happen ... - if ($arr['created'] > datetime_convert()) + if ($arr['created'] > datetime_convert()) { $arr['created'] = datetime_convert(); + } // We haven't invented time travel by now. - if ($arr['edited'] > datetime_convert()) + if ($arr['edited'] > datetime_convert()) { $arr['edited'] = datetime_convert(); + } - if (($arr['author-link'] == "") AND ($arr['owner-link'] == "")) - logger("Both author-link and owner-link are empty. Called by: ".App::callstack(), LOGGER_DEBUG); + if (($arr['author-link'] == "") AND ($arr['owner-link'] == "")) { + logger("Both author-link and owner-link are empty. Called by: " . App::callstack(), LOGGER_DEBUG); + } if ($arr['plink'] == "") { - $arr['plink'] = App::get_baseurl().'/display/'.urlencode($arr['guid']); + $arr['plink'] = App::get_baseurl() . '/display/' . urlencode($arr['guid']); } if ($arr['network'] == "") { @@ -571,59 +605,74 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc(normalise_link($arr['author-link'])) ); - if (!dbm::is_result($r)) + if (!dbm::is_result($r)) { $r = q("SELECT `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($arr['contact-id']), intval($arr['uid']) ); + } - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $arr['network'] = $r[0]["network"]; + } // Fallback to friendica (why is it empty in some cases?) - if ($arr['network'] == "") + if ($arr['network'] == "") { $arr['network'] = NETWORK_DFRN; + } - logger("item_store: Set network to ".$arr["network"]." for ".$arr["uri"], LOGGER_DEBUG); + logger("item_store: Set network to " . $arr["network"] . " for " . $arr["uri"], LOGGER_DEBUG); } // The contact-id should be set before "item_store" was called - but there seems to be some issues if ($arr["contact-id"] == 0) { - // First we are looking for a suitable contact that matches with the author of the post - // This is done only for comments (See below explanation at "gcontact-id") - if ($arr['parent-uri'] != $arr['uri']) + /* + * First we are looking for a suitable contact that matches with the author of the post + * This is done only for comments (See below explanation at "gcontact-id") + */ + if ($arr['parent-uri'] != $arr['uri']) { $arr["contact-id"] = get_contact($arr['author-link'], $uid); + } // If not present then maybe the owner was found - if ($arr["contact-id"] == 0) + if ($arr["contact-id"] == 0) { $arr["contact-id"] = get_contact($arr['owner-link'], $uid); + } // Still missing? Then use the "self" contact of the current user if ($arr["contact-id"] == 0) { $r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid` = %d", intval($uid)); - if ($r) + + if (dbm::is_result($r)) { $arr["contact-id"] = $r[0]["id"]; + } } + logger("Contact-id was missing for post ".$arr["guid"]." from user id ".$uid." - now set to ".$arr["contact-id"], LOGGER_DEBUG); } if ($arr["gcontact-id"] == 0) { - // The gcontact should mostly behave like the contact. But is is supposed to be global for the system. - // This means that wall posts, repeated posts, etc. should have the gcontact id of the owner. - // On comments the author is the better choice. - if ($arr['parent-uri'] === $arr['uri']) + /* + * The gcontact should mostly behave like the contact. But is is supposed to be global for the system. + * This means that wall posts, repeated posts, etc. should have the gcontact id of the owner. + * On comments the author is the better choice. + */ + if ($arr['parent-uri'] === $arr['uri']) { $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['owner-link'], "network" => $arr['network'], "photo" => $arr['owner-avatar'], "name" => $arr['owner-name'])); - else + } else { $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['author-link'], "network" => $arr['network'], "photo" => $arr['author-avatar'], "name" => $arr['author-name'])); + } } - if ($arr["author-id"] == 0) + if ($arr["author-id"] == 0) { $arr["author-id"] = get_contact($arr["author-link"], 0); + } - if ($arr["owner-id"] == 0) + if ($arr["owner-id"] == 0) { $arr["owner-id"] = get_contact($arr["owner-link"], 0); + } if ($arr['guid'] != "") { // Checking if there is already an item with the same guid @@ -673,8 +722,10 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc($r[0]['parent-uri']), intval($arr['uid']) ); - if ($z && count($z)) + + if (dbm::is_result($z)) { $r = $z; + } } $parent_id = $r[0]['id']; @@ -686,20 +737,23 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa $arr['wall'] = $r[0]['wall']; $notify_type = 'comment-new'; - // if the parent is private, force privacy for the entire conversation - // This differs from the above settings as it subtly allows comments from - // email correspondents to be private even if the overall thread is not. - - if ($r[0]['private']) + /* + * If the parent is private, force privacy for the entire conversation + * This differs from the above settings as it subtly allows comments from + * email correspondents to be private even if the overall thread is not. + */ + if ($r[0]['private']) { $arr['private'] = $r[0]['private']; + } - // Edge case. We host a public forum that was originally posted to privately. - // The original author commented, but as this is a comment, the permissions - // weren't fixed up so it will still show the comment as private unless we fix it here. - - if ((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private'])) + /* + * Edge case. We host a public forum that was originally posted to privately. + * The original author commented, but as this is a comment, the permissions + * weren't fixed up so it will still show the comment as private unless we fix it here. + */ + if ((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private'])) { $arr['private'] = 0; - + } // If its a post from myself then tag the thread as "mention" logger("item_store: Checking if parent ".$parent_id." has to be tagged as mention for user ".$arr['uid'], LOGGER_DEBUG); @@ -714,10 +768,10 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa } } } else { - - // Allow one to see reply tweets from status.net even when - // we don't have or can't see the original post. - + /* + * Allow one to see reply tweets from status.net even when + * we don't have or can't see the original post. + */ if ($force_parent) { logger('item_store: $force_parent=true, reply converted to top-level post.'); $parent_id = 0; @@ -777,14 +831,15 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa } else { $isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `uri` = '%s'", dbesc($arr["uri"])); - $arr["global"] = (count($isglobal) > 0); + $arr["global"] = (dbm::is_result($isglobal) && count($isglobal) > 0); } // ACL settings - if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) + if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) { $private = 1; - else + } else { $private = $arr['private']; + } $arr["allow_cid"] = $allow_cid; $arr["allow_gid"] = $allow_gid; @@ -796,19 +851,22 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // Fill the cache field put_item_in_cache($arr); - if ($notify) - call_hooks('post_local',$arr); - else - call_hooks('post_remote',$arr); + if ($notify) { + call_hooks('post_local', $arr); + } else { + call_hooks('post_remote', $arr); + } - if (x($arr,'cancel')) { + if (x($arr, 'cancel')) { logger('item_store: post cancelled by plugin.'); return 0; } - // Check for already added items. - // There is a timing issue here that sometimes creates double postings. - // An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this. + /* + * Check for already added items. + * There is a timing issue here that sometimes creates double postings. + * An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this. + */ if ($arr["uid"] == 0) { $r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc(trim($arr['uri']))); if (dbm::is_result($r)) { @@ -893,7 +951,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa if ($r[0]["entries"] > 1) { // There are duplicates. We delete our just created entry. - logger('Duplicated post occurred. uri = '.$arr['uri'].' uid = '.$arr['uid']); + logger('Duplicated post occurred. uri = ' . $arr['uri'] . ' uid = ' . $arr['uid']); // Yes, we could do a rollback here - but we are having many users with MyISAM. q("DELETE FROM `item` WHERE `id` = %d", intval($current_post)); @@ -909,8 +967,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa logger('item_store: created item '.$current_post); item_set_last_item($arr); - if (!$parent_id || ($arr['parent-uri'] === $arr['uri'])) + if (!$parent_id || ($arr['parent-uri'] === $arr['uri'])) { $parent_id = $current_post; + } // Set parent id $r = q("UPDATE `item` SET `parent` = %d WHERE `id` = %d", @@ -923,28 +982,31 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // update the commented timestamp on the parent // Only update "commented" if it is really a comment - if (($arr['verb'] == ACTIVITY_POST) OR !get_config("system", "like_no_comment")) + if (($arr['verb'] == ACTIVITY_POST) OR !get_config("system", "like_no_comment")) { q("UPDATE `item` SET `commented` = '%s', `changed` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), dbesc(datetime_convert()), intval($parent_id) ); - else + } else { q("UPDATE `item` SET `changed` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($parent_id) ); + } if ($dsprsig) { - // Friendica servers lower than 3.4.3-2 had double encoded the signature ... - // We can check for this condition when we decode and encode the stuff again. + /* + * Friendica servers lower than 3.4.3-2 had double encoded the signature ... + * We can check for this condition when we decode and encode the stuff again. + */ if (base64_encode(base64_decode(base64_decode($dsprsig->signature))) == base64_decode($dsprsig->signature)) { $dsprsig->signature = base64_decode($dsprsig->signature); logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG); } - q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", + q("INSERT INTO `sign` (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", intval($current_post), dbesc($dsprsig->signed_text), dbesc($dsprsig->signature), @@ -952,10 +1014,12 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa ); } - $deleted = tag_deliver($arr['uid'],$current_post); + $deleted = tag_deliver($arr['uid'], $current_post); - // current post can be deleted if is for a community page and no mention are - // in it. + /* + * current post can be deleted if is for a community page and no mention are + * in it. + */ if (!$deleted AND !$dontcache) { $r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post)); @@ -978,13 +1042,17 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa q("COMMIT"); - // Due to deadlock issues with the "term" table we are doing these steps after the commit. - // This is not perfect - but a workable solution until we found the reason for the problem. + /* + * Due to deadlock issues with the "term" table we are doing these steps after the commit. + * This is not perfect - but a workable solution until we found the reason for the problem. + */ create_tags_from_item($current_post); create_files_from_item($current_post); - // If this is now the last-child, force all _other_ children of this parent to *not* be last-child - // It is done after the transaction to avoid dead locks. + /* + * If this is now the last-child, force all _other_ children of this parent to *not* be last-child + * It is done after the transaction to avoid dead locks. + */ if ($arr['last-child']) { $r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d AND `id` != %d", dbesc($arr['uri']), @@ -1025,7 +1093,7 @@ function item_set_last_item($arr) { if (!$update AND ($arr["network"] == NETWORK_DFRN) AND ($arr["parent-uri"] === $arr["uri"])) { $isforum = q("SELECT `forum` FROM `contact` WHERE `id` = %d AND `forum`", intval($arr['contact-id'])); - if ($isforum) { + if (dbm::is_result($isforum)) { $update = true; } } @@ -1060,8 +1128,9 @@ function item_body_set_hashtags(&$item) { $tags = get_tags($item["body"]); // No hashtags? - if (!count($tags)) - return(false); + if (!count($tags)) { + return false; + } // This sorting is important when there are hashtags that are part of other hashtags // Otherwise there could be problems with hashtags like #test and #test2 @@ -1071,6 +1140,7 @@ function item_body_set_hashtags(&$item) { $URLSearchString = "^\[\]"; + /// @TODO old-lost code? // All hashtags should point to the home server //$item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", // "#[url=".App::get_baseurl()."/search?tag=$2]$2[/url]", $item["body"]); @@ -1080,41 +1150,39 @@ function item_body_set_hashtags(&$item) { // mask hashtags inside of url, bookmarks and attachments to avoid urls in urls $item["body"] = preg_replace_callback("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", - function ($match){ - return("[url=".str_replace("#", "#", $match[1])."]".str_replace("#", "#", $match[2])."[/url]"); - },$item["body"]); + function ($match) { + return ("[url=" . str_replace("#", "#", $match[1]) . "]" . str_replace("#", "#", $match[2]) . "[/url]"); + }, $item["body"]); $item["body"] = preg_replace_callback("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", - function ($match){ - return("[bookmark=".str_replace("#", "#", $match[1])."]".str_replace("#", "#", $match[2])."[/bookmark]"); - },$item["body"]); + function ($match) { + return ("[bookmark=" . str_replace("#", "#", $match[1]) . "]" . str_replace("#", "#", $match[2]) . "[/bookmark]"); + }, $item["body"]); $item["body"] = preg_replace_callback("/\[attachment (.*)\](.*?)\[\/attachment\]/ism", - function ($match){ - return("[attachment ".str_replace("#", "#", $match[1])."]".$match[2]."[/attachment]"); - },$item["body"]); + function ($match) { + return ("[attachment " . str_replace("#", "#", $match[1]) . "]" . $match[2] . "[/attachment]"); + }, $item["body"]); // Repair recursive urls $item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", "#$2", $item["body"]); - - foreach($tags as $tag) { - if (strpos($tag,'#') !== 0) - continue; - - if (strpos($tag,'[url=')) + foreach ($tags as $tag) { + if ((strpos($tag, '#') !== 0) || (strpos($tag, '[url='))) { continue; + } $basetag = str_replace('_',' ',substr($tag,1)); - $newtag = '#[url='.App::get_baseurl().'/search?tag='.rawurlencode($basetag).']'.$basetag.'[/url]'; + $newtag = '#[url=' . App::get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; $item["body"] = str_replace($tag, $newtag, $item["body"]); - if (!stristr($item["tag"],"/search?tag=".$basetag."]".$basetag."[/url]")) { - if (strlen($item["tag"])) + if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) { + if (strlen($item["tag"])) { $item["tag"] = ','.$item["tag"]; + } $item["tag"] = $newtag.$item["tag"]; } } @@ -1125,10 +1193,12 @@ function item_body_set_hashtags(&$item) { function get_item_guid($id) { $r = q("SELECT `guid` FROM `item` WHERE `id` = %d LIMIT 1", intval($id)); - if (dbm::is_result($r)) - return($r[0]["guid"]); - else - return(""); + if (dbm::is_result($r)) { + return $r[0]["guid"]; + } else { + /// @TODO This else-block can be elimited again + return ""; + } } function get_item_id($guid, $uid = 0) { @@ -1136,8 +1206,9 @@ function get_item_id($guid, $uid = 0) { $nick = ""; $id = 0; - if ($uid == 0) + if ($uid == 0) { $uid == local_user(); + } // Does the given user have this item? if ($uid) { @@ -1163,14 +1234,15 @@ function get_item_id($guid, $uid = 0) { $nick = $r[0]["nickname"]; } } - return(array("nick" => $nick, "id" => $id)); + return array("nick" => $nick, "id" => $id); } // return - test -function get_item_contact($item,$contacts) { - if (! count($contacts) || (! is_array($item))) +function get_item_contact($item, $contacts) { + if (! count($contacts) || (! is_array($item))) { return false; - foreach($contacts as $contact) { + } + foreach ($contacts as $contact) { if ($contact['id'] == $item['contact-id']) { return $contact; break; // NOTREACHED @@ -1185,15 +1257,13 @@ function get_item_contact($item,$contacts) { * @param int $item_id * @return bool true if item was deleted, else false */ -function tag_deliver($uid,$item_id) { - - // +function tag_deliver($uid, $item_id) { $a = get_app(); $mention = false; - $u = q("select * from user where uid = %d limit 1", + $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid) ); @@ -1217,24 +1287,25 @@ function tag_deliver($uid,$item_id) { $link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']); - // Diaspora uses their own hardwired link URL in @-tags - // instead of the one we supply with webfinger - + /* + * Diaspora uses their own hardwired link URL in @-tags + * instead of the one we supply with webfinger + */ $dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']); - $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { - if (link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { + foreach ($matches as $mtch) { + if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) { $mention = true; logger('tag_deliver: mention found: ' . $mtch[2]); } } } - if (! $mention){ - if ( ($community_page || $prvgroup) && - (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])){ + if (! $mention) { + if (($community_page || $prvgroup) && + (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])) { // mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment) // delete it! logger("tag_deliver: no-mention top-level post to communuty or private group. delete."); @@ -1251,21 +1322,21 @@ function tag_deliver($uid,$item_id) { call_hooks('tagged', $arr); - if ((! $community_page) && (! $prvgroup)) + if ((! $community_page) && (! $prvgroup)) { return; + } - - // tgroup delivery - setup a second delivery chain - // prevent delivery looping - only proceed - // if the message originated elsewhere and is a top-level post - - if (($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) + /* + * tgroup delivery - setup a second delivery chain + * prevent delivery looping - only proceed + * if the message originated elsewhere and is a top-level post + */ + if (($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) { return; + } // now change this copy of the post to a forum head message and deliver to all the tgroup members - - - $c = q("select name, url, thumb from contact where self = 1 and uid = %d limit 1", + $c = q("SELECT `name`, `url`, `thumb` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", intval($u[0]['uid']) ); if (! dbm::is_result($c)) { @@ -1299,14 +1370,15 @@ function tag_deliver($uid,$item_id) { -function tgroup_check($uid,$item) { +function tgroup_check($uid, $item) { $mention = false; // check that the message originated elsewhere and is a top-level post - if (($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri'])) + if (($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri'])) { return false; + } /// @TODO Encapsulate this or find it encapsulated and replace all occurrances $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", @@ -1319,18 +1391,18 @@ function tgroup_check($uid,$item) { $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); $prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false); - $link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']); - // Diaspora uses their own hardwired link URL in @-tags - // instead of the one we supply with webfinger - + /* + * Diaspora uses their own hardwired link URL in @-tags + * instead of the one we supply with webfinger + */ $dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']); - $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) { foreach ($matches as $mtch) { - if (link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { + if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) { $mention = true; logger('tgroup_check: mention found: ' . $mtch[2]); } @@ -1341,23 +1413,25 @@ function tgroup_check($uid,$item) { return false; } - /// @TODO Combines both return statements into one + /// @TODO Combine both return statements into one return (($community_page) || ($prvgroup)); } -/* - This function returns true if $update has an edited timestamp newer - than $existing, i.e. $update contains new data which should override - what's already there. If there is no timestamp yet, the update is - assumed to be newer. If the update has no timestamp, the existing - item is assumed to be up-to-date. If the timestamps are equal it - assumes the update has been seen before and should be ignored. - */ -function edited_timestamp_is_newer($existing, $update) { - if (!x($existing,'edited') || !$existing['edited']) { +/** + * This function returns true if $update has an edited timestamp newer + * than $existing, i.e. $update contains new data which should override + * what's already there. If there is no timestamp yet, the update is + * assumed to be newer. If the update has no timestamp, the existing + * item is assumed to be up-to-date. If the timestamps are equal it + * assumes the update has been seen before and should be ignored. + * + * @todo fix type-hints (both array) + */ +function edited_timestamp_is_newer ($existing, $update) { + if (!x($existing, 'edited') || !$existing['edited']) { return true; } - if (!x($update,'edited') || !$update['edited']) { + if (!x($update, 'edited') || !$update['edited']) { return false; } @@ -1391,16 +1465,17 @@ function edited_timestamp_is_newer($existing, $update) { * model where comments can have sub-threads. That would require some massive sorting * to get all the feed items into a mostly linear ordering, and might still require * recursion. + * + * @todo find proper type-hints */ - -function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) { +function consume_feed($xml, $importer, &$contact, &$hub, $datedir = 0, $pass = 0) { if ($contact['network'] === NETWORK_OSTATUS) { if ($pass < 2) { // Test - remove before flight //$tempfile = tempnam(get_temppath(), "ostatus2"); //file_put_contents($tempfile, $xml); logger("Consume OStatus messages ", LOGGER_DEBUG); - ostatus::import($xml,$importer,$contact, $hub); + ostatus::import($xml, $importer, $contact, $hub); } return; } @@ -1408,7 +1483,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if ($contact['network'] === NETWORK_FEED) { if ($pass < 2) { logger("Consume feeds", LOGGER_DEBUG); - feed_import($xml,$importer,$contact, $hub); + feed_import($xml, $importer, $contact, $hub); } return; } @@ -1416,7 +1491,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if ($contact['network'] === NETWORK_DFRN) { logger("Consume DFRN messages", LOGGER_DEBUG); - $r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, + $r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, `contact`.`pubkey` AS `cpubkey`, `contact`.`prvkey` AS `cprvkey`, `contact`.`thumb` AS `thumb`, @@ -1428,34 +1503,40 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) WHERE `contact`.`id` = %d AND `user`.`uid` = %d", dbesc($contact["id"]), dbesc($importer["uid"]) ); - if ($r) { + if (dbm::is_result($r)) { logger("Now import the DFRN feed"); - dfrn::import($xml,$r[0], true); + dfrn::import($xml, $r[0], true); return; } } } +/// @TODO type-hint is array function item_is_remote_self($contact, &$datarray) { $a = get_app(); - if (!$contact['remote_self']) + if (!$contact['remote_self']) { return false; + } // Prevent the forwarding of posts that are forwarded - if ($datarray["extid"] == NETWORK_DFRN) + if ($datarray["extid"] == NETWORK_DFRN) { return false; + } // Prevent to forward already forwarded posts - if ($datarray["app"] == $a->get_hostname()) + if ($datarray["app"] == $a->get_hostname()) { return false; + } // Only forward posts - if ($datarray["verb"] != ACTIVITY_POST) + if ($datarray["verb"] != ACTIVITY_POST) { return false; + } - if (($contact['network'] != NETWORK_FEED) AND $datarray['private']) + if (($contact['network'] != NETWORK_FEED) AND $datarray['private']) { return false; + } $datarray2 = $datarray; logger('remote-self start - Contact '.$contact['url'].' - '.$contact['remote_self'].' Item '.print_r($datarray, true), LOGGER_DEBUG); @@ -1477,25 +1558,28 @@ function item_is_remote_self($contact, &$datarray) { if ($contact['network'] != NETWORK_FEED) { $datarray["guid"] = get_guid(32); unset($datarray["plink"]); - $datarray["uri"] = item_new_uri($a->get_hostname(),$contact['uid'], $datarray["guid"]); + $datarray["uri"] = item_new_uri($a->get_hostname(), $contact['uid'], $datarray["guid"]); $datarray["parent-uri"] = $datarray["uri"]; $datarray["extid"] = $contact['network']; $urlpart = parse_url($datarray2['author-link']); $datarray["app"] = $urlpart["host"]; - } else + } else { $datarray['private'] = 0; + } } if ($contact['network'] != NETWORK_FEED) { // Store the original post $r = item_store($datarray2, false, false); logger('remote-self post original item - Contact '.$contact['url'].' return '.$r.' Item '.print_r($datarray2, true), LOGGER_DEBUG); - } else + } else { $datarray["app"] = "Feed"; + } return true; } +/// @TODO find proper type-hints function new_follower($importer, $contact, $datarray, $item, $sharing = false) { $url = notags(trim($datarray['author-link'])); $name = notags(trim($datarray['author-name'])); @@ -1546,6 +1630,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) { update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true); } + /// @TODO Encapsulate this into a function/method $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer['uid']) ); @@ -1634,17 +1719,18 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { ); } - // Diaspora has different message-ids in feeds than they do - // through the direct Diaspora protocol. If we try and use - // the feed, we'll get duplicates. So don't. - - if ((! dbm::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) + /* + * Diaspora has different message-ids in feeds than they do + * through the direct Diaspora protocol. If we try and use + * the feed, we'll get duplicates. So don't. + */ + if ((! dbm::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) { return; + } $push_url = get_config('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id']; // Use a single verify token, even if multiple hubs - $verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string()); $params= 'hub.mode=' . $hubmode . '&hub.callback=' . urlencode($push_url) . '&hub.topic=' . urlencode($contact['poll']) . '&hub.verify=async&hub.verify_token=' . $verify_token; @@ -1658,7 +1744,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { ); } - post_url($url,$params); + post_url($url, $params); logger('subscribe_to_hub: returns: ' . $a->get_curl_code(), LOGGER_DEBUG); @@ -1668,8 +1754,9 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { function fix_private_photos($s, $uid, $item = null, $cid = 0) { - if (get_config('system','disable_embedded')) + if (get_config('system','disable_embedded')) { return $s; + } $a = get_app(); @@ -1682,7 +1769,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_len = ($img_start !== false ? strpos(substr($orig_body, $img_start + $img_st_close + 1), '[/img]') : false); - while( ($img_st_close !== false) && ($img_len !== false) ) { + while ( ($img_st_close !== false) && ($img_len !== false) ) { $img_st_close++; // make it point to AFTER the closing bracket $image = substr($orig_body, $img_start + $img_st_close, $img_len); @@ -1694,27 +1781,28 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { // Only embed locally hosted photos $replace = false; $i = basename($image); - $i = str_replace(array('.jpg','.png','.gif'),array('','',''),$i); - $x = strpos($i,'-'); + $i = str_replace(array('.jpg', '.png', '.gif'),array('', '',''), $i); + $x = strpos($i, '-'); if ($x) { - $res = substr($i,$x+1); - $i = substr($i,0,$x); + $res = substr($i, $x + 1); + $i = substr($i, 0, $x); $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d AND `uid` = %d", dbesc($i), intval($res), intval($uid) + ); - if ($r) { - - // Check to see if we should replace this photo link with an embedded image - // 1. No need to do so if the photo is public - // 2. If there's a contact-id provided, see if they're in the access list - // for the photo. If so, embed it. - // 3. Otherwise, if we have an item, see if the item permissions match the photo - // permissions, regardless of order but first check to see if they're an exact - // match to save some processing overhead. - + if (dbm::is_result($r)) { + /* + * Check to see if we should replace this photo link with an embedded image + * 1. No need to do so if the photo is public + * 2. If there's a contact-id provided, see if they're in the access list + * for the photo. If so, embed it. + * 3. Otherwise, if we have an item, see if the item permissions match the photo + * permissions, regardless of order but first check to see if they're an exact + * match to save some processing overhead. + */ if (has_permissions($r[0])) { if ($cid) { $recips = enumerate_permissions($r[0]); @@ -1722,8 +1810,9 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $replace = true; } } elseif ($item) { - if (compare_permissions($item,$r[0])) + if (compare_permissions($item, $r[0])) { $replace = true; + } } } if ($replace) { @@ -1755,8 +1844,9 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $new_body = $new_body . substr($orig_body, 0, $img_start + $img_st_close) . $image . '[/img]'; $orig_body = substr($orig_body, $img_start + $img_st_close + $img_len + strlen('[/img]')); - if ($orig_body === false) + if ($orig_body === false) { $orig_body = ''; + } $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); @@ -1765,63 +1855,75 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $new_body = $new_body . $orig_body; - return($new_body); + return $new_body; } +/// @TODO type-hint is array function has_permissions($obj) { - if (($obj['allow_cid'] != '') || ($obj['allow_gid'] != '') || ($obj['deny_cid'] != '') || ($obj['deny_gid'] != '')) - return true; - return false; + return ( + ( + x($obj, 'allow_cid') + ) || ( + x($obj, 'allow_gid') + ) || ( + x($obj, 'deny_cid') + ) || ( + x($obj, 'deny_gid') + ) + ); } -function compare_permissions($obj1,$obj2) { +/// @TODO type-hint is array +function compare_permissions($obj1, $obj2) { // first part is easy. Check that these are exactly the same. if (($obj1['allow_cid'] == $obj2['allow_cid']) && ($obj1['allow_gid'] == $obj2['allow_gid']) && ($obj1['deny_cid'] == $obj2['deny_cid']) - && ($obj1['deny_gid'] == $obj2['deny_gid'])) + && ($obj1['deny_gid'] == $obj2['deny_gid'])) { return true; + } // This is harder. Parse all the permissions and compare the resulting set. - $recipients1 = enumerate_permissions($obj1); $recipients2 = enumerate_permissions($obj2); sort($recipients1); sort($recipients2); - if ($recipients1 == $recipients2) - return true; - return false; + + /// @TODO Comparison of arrays, maybe use array_diff_assoc() here? + return ($recipients1 == $recipients2); } // returns an array of contact-ids that are allowed to see this object - +/// @TODO type-hint is array function enumerate_permissions($obj) { $allow_people = expand_acl($obj['allow_cid']); $allow_groups = expand_groups(expand_acl($obj['allow_gid'])); $deny_people = expand_acl($obj['deny_cid']); $deny_groups = expand_groups(expand_acl($obj['deny_gid'])); - $recipients = array_unique(array_merge($allow_people,$allow_groups)); - $deny = array_unique(array_merge($deny_people,$deny_groups)); - $recipients = array_diff($recipients,$deny); + $recipients = array_unique(array_merge($allow_people, $allow_groups)); + $deny = array_unique(array_merge($deny_people, $deny_groups)); + $recipients = array_diff($recipients, $deny); return $recipients; } function item_getfeedtags($item) { $ret = array(); $matches = false; - $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); + $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches); if ($cnt) { - for($x = 0; $x < $cnt; $x ++) { - if ($matches[1][$x]) - $ret[$matches[2][$x]] = array('#',$matches[1][$x], $matches[2][$x]); + for ($x = 0; $x < $cnt; $x ++) { + if ($matches[1][$x]) { + $ret[$matches[2][$x]] = array('#', $matches[1][$x], $matches[2][$x]); + } } } $matches = false; - $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); + $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches); if ($cnt) { - for($x = 0; $x < $cnt; $x ++) { - if ($matches[1][$x]) - $ret[] = array('@',$matches[1][$x], $matches[2][$x]); + for ($x = 0; $x < $cnt; $x ++) { + if ($matches[1][$x]) { + $ret[] = array('@', $matches[1][$x], $matches[2][$x]); + } } } return $ret; @@ -1829,23 +1931,29 @@ function item_getfeedtags($item) { function item_expire($uid, $days, $network = "", $force = false) { - if ((! $uid) || ($days < 1)) + if ((! $uid) || ($days < 1)) { return; + } - // $expire_network_only = save your own wall posts - // and just expire conversations started by others - - $expire_network_only = get_pconfig($uid,'expire','network_only'); + /* + * $expire_network_only = save your own wall posts + * and just expire conversations started by others + */ + $expire_network_only = get_pconfig($uid,'expire', 'network_only'); $sql_extra = ((intval($expire_network_only)) ? " AND wall = 0 " : ""); if ($network != "") { $sql_extra .= sprintf(" AND network = '%s' ", dbesc($network)); - // There is an index "uid_network_received" but not "uid_network_created" - // This avoids the creation of another index just for one purpose. - // And it doesn't really matter wether to look at "received" or "created" + + /* + * There is an index "uid_network_received" but not "uid_network_created" + * This avoids the creation of another index just for one purpose. + * And it doesn't really matter wether to look at "received" or "created" + */ $range = "AND `received` < UTC_TIMESTAMP() - INTERVAL %d DAY "; - } else + } else { $range = "AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY "; + } $r = q("SELECT `file`, `resource-id`, `starred`, `type`, `id` FROM `item` WHERE `uid` = %d $range @@ -1856,61 +1964,66 @@ function item_expire($uid, $days, $network = "", $force = false) { intval($days) ); - if (! dbm::is_result($r)) + if (! dbm::is_result($r)) { return; + } - $expire_items = get_pconfig($uid, 'expire','items'); - $expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1 + $expire_items = get_pconfig($uid, 'expire', 'items'); + $expire_items = (($expire_items === false) ? 1 : intval($expire_items)); // default if not set: 1 // Forcing expiring of items - but not notes and marked items - if ($force) + if ($force) { $expire_items = true; + } - $expire_notes = get_pconfig($uid, 'expire','notes'); - $expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1 + $expire_notes = get_pconfig($uid, 'expire', 'notes'); + $expire_notes = (($expire_notes === false) ? 1 : intval($expire_notes)); // default if not set: 1 - $expire_starred = get_pconfig($uid, 'expire','starred'); - $expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1 + $expire_starred = get_pconfig($uid, 'expire', 'starred'); + $expire_starred = (($expire_starred === false) ? 1 : intval($expire_starred)); // default if not set: 1 - $expire_photos = get_pconfig($uid, 'expire','photos'); - $expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0 + $expire_photos = get_pconfig($uid, 'expire', 'photos'); + $expire_photos = (($expire_photos === false) ? 0 : intval($expire_photos)); // default if not set: 0 logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); - foreach($r as $item) { + foreach ($r as $item) { // don't expire filed items - if (strpos($item['file'],'[') !== false) + if (strpos($item['file'],'[') !== false) { continue; + } // Only expire posts, not photos and photo comments - if ($expire_photos==0 && strlen($item['resource-id'])) + if ($expire_photos == 0 && strlen($item['resource-id'])) { continue; - if ($expire_starred==0 && intval($item['starred'])) + } elseif ($expire_starred == 0 && intval($item['starred'])) { continue; - if ($expire_notes==0 && $item['type']=='note') + } elseif ($expire_notes == 0 && $item['type'] == 'note') { continue; - if ($expire_items==0 && $item['type']!='note') + } elseif ($expire_items == 0 && $item['type'] != 'note') { continue; + } - drop_item($item['id'],false); + drop_item($item['id'], false); } - proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid); + proc_run(PRIORITY_HIGH, "include/notifier.php", "expire", $uid); } - +/// @TODO type-hint is array function drop_items($items) { $uid = 0; - if (! local_user() && ! remote_user()) + if (! local_user() && ! remote_user()) { return; + } if (count($items)) { - foreach($items as $item) { + foreach ($items as $item) { $owner = drop_item($item,false); if ($owner && ! $uid) $uid = $owner; @@ -1919,12 +2032,13 @@ function drop_items($items) { // multiple threads may have been deleted, send an expire notification - if ($uid) - proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid); + if ($uid) { + proc_run(PRIORITY_HIGH, "include/notifier.php", "expire", $uid); + } } -function drop_item($id,$interactive = true) { +function drop_item($id, $interactive = true) { $a = get_app(); @@ -1935,8 +2049,9 @@ function drop_item($id,$interactive = true) { ); if (! dbm::is_result($r)) { - if (! $interactive) + if (! $interactive) { return 0; + } notice( t('Item not found.') . EOL); goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); } @@ -1950,7 +2065,7 @@ function drop_item($id,$interactive = true) { // check if logged in user is either the author or owner of this item if (is_array($_SESSION['remote'])) { - foreach($_SESSION['remote'] as $visitor) { + foreach ($_SESSION['remote'] as $visitor) { if ($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) { $contact_id = $visitor['cid']; break; @@ -1967,7 +2082,7 @@ function drop_item($id,$interactive = true) { // so add any arguments as hidden inputs $query = explode_querystring($a->query_string); $inputs = array(); - foreach($query['args'] as $arg) { + foreach ($query['args'] as $arg) { if (strpos($arg, 'confirm=') === false) { $arg_parts = explode('=', $arg); $inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]); @@ -2004,27 +2119,28 @@ function drop_item($id,$interactive = true) { // clean up categories and tags so they don't end up as orphans $matches = false; - $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { - file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],true); + foreach ($matches as $mtch) { + file_tag_unsave_file($item['uid'], $item['id'], $mtch[1],true); } } $matches = false; - $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { - file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],false); + foreach ($matches as $mtch) { + file_tag_unsave_file($item['uid'], $item['id'], $mtch[1],false); } } - // If item is a link to a photo resource, nuke all the associated photos - // (visitors will not have photo resources) - // This only applies to photos uploaded from the photos page. Photos inserted into a post do not - // generate a resource-id and therefore aren't intimately linked to the item. - + /* + * If item is a link to a photo resource, nuke all the associated photos + * (visitors will not have photo resources) + * This only applies to photos uploaded from the photos page. Photos inserted into a post do not + * generate a resource-id and therefore aren't intimately linked to the item. + */ if (strlen($item['resource-id'])) { q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ", dbesc($item['resource-id']), @@ -2034,7 +2150,6 @@ function drop_item($id,$interactive = true) { } // If item is a link to an event, nuke the event record. - if (intval($item['event-id'])) { q("DELETE FROM `event` WHERE `id` = %d AND `uid` = %d", intval($item['event-id']), @@ -2044,8 +2159,7 @@ function drop_item($id,$interactive = true) { } // If item has attachments, drop them - - foreach(explode(",",$item['attach']) as $attach){ + foreach (explode(", ", $item['attach']) as $attach) { preg_match("|attach/(\d+)|", $attach, $matches); q("DELETE FROM `attach` WHERE `id` = %d AND `uid` = %d", intval($matches[1]), @@ -2058,7 +2172,7 @@ function drop_item($id,$interactive = true) { // clean up item_id and sign meta-data tables /* - // Old code - caused very long queries and warning entries in the mysql logfiles: + /// @TODO Old code - caused very long queries and warning entries in the mysql logfiles: $r = q("DELETE FROM item_id where iid in (select id from item where parent = %d and uid = %d)", intval($item['id']), @@ -2074,29 +2188,28 @@ function drop_item($id,$interactive = true) { // The new code splits the queries since the mysql optimizer really has bad problems with subqueries // Creating list of parents - $r = q("select id from item where parent = %d and uid = %d", + $r = q("SELECT `id` FROM `item` WHERE `parent` = %d AND `uid` = %d", intval($item['id']), intval($item['uid']) ); $parentid = ""; - foreach ($r AS $row) { - if ($parentid != "") + foreach ($r as $row) { + if ($parentid != "") { $parentid .= ", "; + } $parentid .= $row["id"]; } // Now delete them if ($parentid != "") { - $r = q("DELETE FROM item_id where iid in (%s)", dbesc($parentid)); - - $r = q("DELETE FROM sign where iid in (%s)", dbesc($parentid)); + $r = q("DELETE FROM `item_id` WHERE `iid` IN (%s)", dbesc($parentid)); + $r = q("DELETE FROM `sign` WHERE `iid` IN (%s)", dbesc($parentid)); } // If it's the parent of a comment thread, kill all the kids - if ($item['uri'] == $item['parent-uri']) { $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = '' WHERE `parent-uri` = '%s' AND `uid` = %d ", @@ -2132,15 +2245,17 @@ function drop_item($id,$interactive = true) { // send the notification upstream/downstream as the case may be - proc_run(PRIORITY_HIGH,"include/notifier.php", "drop", $drop_id); + proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id); - if (! $interactive) + if (! $interactive) { return $owner; + } goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); //NOTREACHED } else { - if (! $interactive) + if (! $interactive) { return 0; + } notice( t('Permission denied.') . EOL); goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); //NOTREACHED @@ -2149,101 +2264,113 @@ function drop_item($id,$interactive = true) { } -function first_post_date($uid,$wall = false) { - $r = q("select id, created from item - where uid = %d and wall = %d and deleted = 0 and visible = 1 AND moderated = 0 - and id = parent - order by created asc limit 1", +function first_post_date($uid, $wall = false) { + $r = q("SELECT `id`, `created` FROM `item` + WHERE `uid` = %d AND `wall` = %d AND `deleted` = 0 AND `visible` = 1 AND `moderated` = 0 + AND `id` = `parent` + ORDER BY `created` ASC LIMIT 1", intval($uid), intval($wall ? 1 : 0) ); if (dbm::is_result($r)) { -// logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA); - return substr(datetime_convert('',date_default_timezone_get(),$r[0]['created']),0,10); + // logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA); + return substr(datetime_convert('',date_default_timezone_get(), $r[0]['created']),0,10); } return false; } /* modified posted_dates() {below} to arrange the list in years */ function list_post_dates($uid, $wall) { - $dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d'); + $dnow = datetime_convert('',date_default_timezone_get(), 'now','Y-m-d'); $dthen = first_post_date($uid, $wall); - if (! $dthen) + if (! $dthen) { return array(); + } // Set the start and end date to the beginning of the month - $dnow = substr($dnow,0,8).'01'; - $dthen = substr($dthen,0,8).'01'; + $dnow = substr($dnow, 0, 8) . '01'; + $dthen = substr($dthen, 0, 8) . '01'; $ret = array(); - // Starting with the current month, get the first and last days of every - // month down to and including the month of the first post - while(substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { - $dyear = intval(substr($dnow,0,4)); - $dstart = substr($dnow,0,8) . '01'; - $dend = substr($dnow,0,8) . get_dim(intval($dnow),intval(substr($dnow,5))); - $start_month = datetime_convert('','',$dstart,'Y-m-d'); - $end_month = datetime_convert('','',$dend,'Y-m-d'); - $str = day_translate(datetime_convert('','',$dnow,'F')); - if (! $ret[$dyear]) + /* + * Starting with the current month, get the first and last days of every + * month down to and including the month of the first post + */ + while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { + $dyear = intval(substr($dnow, 0, 4)); + $dstart = substr($dnow, 0, 8) . '01'; + $dend = substr($dnow, 0, 8) . get_dim(intval($dnow), intval(substr($dnow, 5))); + $start_month = datetime_convert('', '', $dstart, 'Y-m-d'); + $end_month = datetime_convert('', '', $dend, 'Y-m-d'); + $str = day_translate(datetime_convert('', '', $dnow, 'F')); + if (!$ret[$dyear]) { $ret[$dyear] = array(); - $ret[$dyear][] = array($str,$end_month,$start_month); - $dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d'); + } + $ret[$dyear][] = array($str, $end_month, $start_month); + $dnow = datetime_convert('', '', $dnow . ' -1 month', 'Y-m-d'); } return $ret; } -function posted_dates($uid,$wall) { - $dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d'); +function posted_dates($uid, $wall) { + $dnow = datetime_convert('', date_default_timezone_get(), 'now', 'Y-m-d'); - $dthen = first_post_date($uid,$wall); - if (! $dthen) + $dthen = first_post_date($uid, $wall); + if (! $dthen) { return array(); + } // Set the start and end date to the beginning of the month - $dnow = substr($dnow,0,8).'01'; - $dthen = substr($dthen,0,8).'01'; + $dnow = substr($dnow, 0, 8) . '01'; + $dthen = substr($dthen, 0, 8) . '01'; $ret = array(); - // Starting with the current month, get the first and last days of every - // month down to and including the month of the first post - while(substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { - $dstart = substr($dnow,0,8) . '01'; - $dend = substr($dnow,0,8) . get_dim(intval($dnow),intval(substr($dnow,5))); - $start_month = datetime_convert('','',$dstart,'Y-m-d'); - $end_month = datetime_convert('','',$dend,'Y-m-d'); - $str = day_translate(datetime_convert('','',$dnow,'F Y')); - $ret[] = array($str,$end_month,$start_month); - $dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d'); + /* + * Starting with the current month, get the first and last days of every + * month down to and including the month of the first post + */ + while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { + $dstart = substr($dnow, 0, 8) . '01'; + $dend = substr($dnow, 0, 8) . get_dim(intval($dnow), intval(substr($dnow, 5))); + $start_month = datetime_convert('', '', $dstart, 'Y-m-d'); + $end_month = datetime_convert('', '', $dend, 'Y-m-d'); + $str = day_translate(datetime_convert('', '', $dnow, 'F Y')); + $ret[] = array($str, $end_month, $start_month); + $dnow = datetime_convert('', '', $dnow . ' -1 month', 'Y-m-d'); } return $ret; } -function posted_date_widget($url,$uid,$wall) { +function posted_date_widget($url, $uid, $wall) { $o = ''; - if (! feature_enabled($uid,'archives')) + if (! feature_enabled($uid, 'archives')) { return $o; + } // For former Facebook folks that left because of "timeline" - -/* if ($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget'))) - return $o;*/ + /* + * @TODO old-lost code? + if ($wall && intval(get_pconfig($uid, 'system', 'no_wall_archive_widget'))) + return $o; + */ $visible_years = get_pconfig($uid,'system','archive_visible_years'); - if (! $visible_years) + if (! $visible_years) { $visible_years = 5; + } - $ret = list_post_dates($uid,$wall); + $ret = list_post_dates($uid, $wall); - if (! dbm::is_result($ret)) + if (! dbm::is_result($ret)) { return $o; + } - $cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years; - $cutoff = ((array_key_exists($cutoff_year,$ret))? true : false); + $cutoff_year = intval(datetime_convert('',date_default_timezone_get(), 'now', 'Y')) - $visible_years; + $cutoff = ((array_key_exists($cutoff_year, $ret))? true : false); $o = replace_macros(get_markup_template('posted_date_widget.tpl'),array( '$title' => t('Archives'), diff --git a/include/notifier.php b/include/notifier.php index e3d7d10d6..370611b4e 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -516,7 +516,8 @@ function notifier_run(&$argv, &$argc){ $r0 = Diaspora::relay_list(); } - $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s' + $r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network` + FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()", dbesc(NETWORK_DIASPORA), intval($owner['uid']), diff --git a/include/ostatus.php b/include/ostatus.php index 9b7849509..c1d730eb1 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -355,6 +355,14 @@ class ostatus { $item["body"] = add_page_info_to_body(html2bbcode($xpath->query('atom:content/text()', $entry)->item(0)->nodeValue)); $item["object-type"] = $xpath->query('activity:object-type/text()', $entry)->item(0)->nodeValue; + $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue; + + // Mastodon Content Warning + if (($item["verb"] == ACTIVITY_POST) AND $xpath->evaluate('boolean(atom:summary)', $entry)) { + $clear_text = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue; + + $item["body"] = html2bbcode($clear_text) . '[spoiler]' . $item["body"] . '[/spoiler]'; + } if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) OR ($item["object-type"] == ACTIVITY_OBJ_EVENT)) { $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue; @@ -363,11 +371,10 @@ class ostatus { $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue; } $item["object"] = $xml; - $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue; /// @TODO /// Delete a message - if ($item["verb"] == "qvitter-delete-notice") { + if ($item["verb"] == "qvitter-delete-notice" || $item["verb"] == ACTIVITY_DELETE) { // ignore "Delete" messages (by now) logger("Ignore delete message ".print_r($item, true)); continue; @@ -713,11 +720,11 @@ class ostatus { $conversations = q("SELECT `term`.`oid`, `term`.`url`, `term`.`uid` FROM `term` STRAIGHT_JOIN `thread` ON `thread`.`iid` = `term`.`oid` AND `thread`.`uid` = `term`.`uid` WHERE `term`.`type` = 7 AND `term`.`term` > '%s' AND `thread`.`mention` - GROUP BY `term`.`url`, `term`.`uid` ORDER BY `term`.`term` DESC", dbesc($start)); + GROUP BY `term`.`url`, `term`.`uid`, `term`.`oid`, `term`.`term` ORDER BY `term`.`term` DESC", dbesc($start)); } else { $conversations = q("SELECT `oid`, `url`, `uid` FROM `term` WHERE `type` = 7 AND `term` > '%s' - GROUP BY `url`, `uid` ORDER BY `term` DESC", dbesc($start)); + GROUP BY `url`, `uid`, `oid`, `term` ORDER BY `term` DESC", dbesc($start)); } foreach ($conversations AS $conversation) { @@ -1472,15 +1479,7 @@ class ostatus { $o = ""; $siteinfo = get_attached_data($item["body"]); - switch($siteinfo["type"]) { - case 'link': - $attributes = array("rel" => "enclosure", - "href" => $siteinfo["url"], - "type" => "text/html; charset=UTF-8", - "length" => "", - "title" => $siteinfo["title"]); - xml::add_element($doc, $root, "link", "", $attributes); - break; + switch ($siteinfo["type"]) { case 'photo': $imgdata = get_photo_info($siteinfo["image"]); $attributes = array("rel" => "enclosure", @@ -1502,29 +1501,31 @@ class ostatus { } if (($siteinfo["type"] != "photo") AND isset($siteinfo["image"])) { - $photodata = get_photo_info($siteinfo["image"]); + $imgdata = get_photo_info($siteinfo["image"]); + $attributes = array("rel" => "enclosure", + "href" => $siteinfo["image"], + "type" => $imgdata["mime"], + "length" => intval($imgdata["size"])); - $attributes = array("rel" => "preview", "href" => $siteinfo["image"], "media:width" => $photodata[0], "media:height" => $photodata[1]); xml::add_element($doc, $root, "link", "", $attributes); } - - $arr = explode('[/attach],',$item['attach']); - if(count($arr)) { - foreach($arr as $r) { + $arr = explode('[/attach],', $item['attach']); + if (count($arr)) { + foreach ($arr as $r) { $matches = false; - $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches); - if($cnt) { + $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches); + if ($cnt) { $attributes = array("rel" => "enclosure", "href" => $matches[1], "type" => $matches[3]); - if(intval($matches[2])) + if (intval($matches[2])) { $attributes["length"] = intval($matches[2]); - - if(trim($matches[4]) != "") + } + if (trim($matches[4]) != "") { $attributes["title"] = trim($matches[4]); - + } xml::add_element($doc, $root, "link", "", $attributes); } } @@ -2052,7 +2053,7 @@ class ostatus { $mentioned = array(); - if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) { + if (($item['parent'] != $item['id']) OR ($item['parent-uri'] !== $item['uri']) OR (($item['thr-parent'] !== '') AND ($item['thr-parent'] !== $item['uri']))) { $parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"])); $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); @@ -2082,7 +2083,13 @@ class ostatus { if (intval($item["parent"]) > 0) { $conversation = App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]; xml::add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation", "href" => $conversation)); - xml::add_element($doc, $entry, "ostatus:conversation", $conversation); + + $attributes = array( + "href" => $conversation, + "local_id" => $item["parent"], + "ref" => $conversation); + + xml::add_element($doc, $entry, "ostatus:conversation", $conversation, $attributes); } $tags = item_getfeedtags($item); diff --git a/include/pgettext.php b/include/pgettext.php index 335869eda..b42dcec11 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -44,7 +44,7 @@ function get_browser_language() { // check if we have translations for the preferred languages and pick the 1st that has for ($i=0; $i 0) { for ($x = 0; $x < count($ret); $x ++) { - if (substr($ret[$x],0,5) === 'data:') { - if (strstr($ret[$x],',')) { - $ret[$x] = substr($ret[$x],strpos($ret[$x],',')+1); + if (substr($ret[$x], 0, 5) === 'data:') { + if (strstr($ret[$x], ',')) { + $ret[$x] = substr($ret[$x], strpos($ret[$x], ',') + 1); } else { - $ret[$x] = substr($ret[$x],5); + $ret[$x] = substr($ret[$x], 5); } } elseif (normalise_link($ret[$x]) == 'http://') { $ret[$x] = fetch_url($ret[$x]); @@ -39,7 +38,7 @@ function get_salmon_key($uri,$keyhash) { } - logger('Key located: ' . print_r($ret,true)); + logger('Key located: ' . print_r($ret, true)); if (count($ret) == 1) { @@ -50,10 +49,9 @@ function get_salmon_key($uri,$keyhash) { // have one key we'll be right. return $ret[0]; - } - else { + } else { foreach ($ret as $a) { - $hash = base64url_encode(hash('sha256',$a)); + $hash = base64url_encode(hash('sha256', $a)); if ($hash == $keyhash) { return $a; } @@ -65,17 +63,17 @@ function get_salmon_key($uri,$keyhash) { -function slapper($owner,$url,$slap) { +function slapper($owner, $url, $slap) { // does contact have a salmon endpoint? - if(! strlen($url)) + if (! strlen($url)) { return; + } - - if(! $owner['sprvkey']) { + if (! $owner['sprvkey']) { logger(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.", - $owner['username'],$owner['uid'])); + $owner['username'], $owner['uid'])); return; } @@ -87,30 +85,33 @@ function slapper($owner,$url,$slap) { $data_type = 'application/atom+xml'; $encoding = 'base64url'; $algorithm = 'RSA-SHA256'; - $keyhash = base64url_encode(hash('sha256',salmon_key($owner['spubkey'])),true); + $keyhash = base64url_encode(hash('sha256', salmon_key($owner['spubkey'])), true); - // precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods + $precomputed = '.' . base64url_encode($data_type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($algorithm); - $precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng=='; + // GNU Social format + $signature = base64url_encode(rsa_sign($data . $precomputed, $owner['sprvkey'])); - $signature = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),$owner['sprvkey'])); + // Compliant format + $signature2 = base64url_encode(rsa_sign(str_replace('=', '', $data . $precomputed), $owner['sprvkey'])); - $signature2 = base64url_encode(rsa_sign($data . $precomputed,$owner['sprvkey'])); + // Old Status.net format + $signature3 = base64url_encode(rsa_sign($data, $owner['sprvkey'])); - $signature3 = base64url_encode(rsa_sign($data,$owner['sprvkey'])); + // At first try the non compliant method that works for GNU Social + $xmldata = array("me:env" => array("me:data" => $data, + "@attributes" => array("type" => $data_type), + "me:encoding" => $encoding, + "me:alg" => $algorithm, + "me:sig" => $signature, + "@attributes2" => array("key_id" => $keyhash))); - $salmon_tpl = get_markup_template('magicsig.tpl'); + $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env"); - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature - )); + $salmon = xml::from_array($xmldata, $xml, false, $namespaces); // slap them - post_url($url,$salmon, array( + post_url($url, $salmon, array( 'Content-type: application/magic-envelope+xml', 'Content-length: ' . strlen($salmon) )); @@ -120,60 +121,59 @@ function slapper($owner,$url,$slap) { // check for success, e.g. 2xx - if($return_code > 299) { + if ($return_code > 299) { - logger('compliant salmon failed. Falling back to status.net hack2'); + logger('GNU Social salmon failed. Falling back to compliant mode'); - // Entirely likely that their salmon implementation is - // non-compliant. Let's try once more, this time only signing - // the data, without stripping '=' chars + // Now try the compliant mode that normally isn't used for GNU Social + $xmldata = array("me:env" => array("me:data" => $data, + "@attributes" => array("type" => $data_type), + "me:encoding" => $encoding, + "me:alg" => $algorithm, + "me:sig" => $signature2, + "@attributes2" => array("key_id" => $keyhash))); - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature2 - )); + $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env"); + + $salmon = xml::from_array($xmldata, $xml, false, $namespaces); // slap them - post_url($url,$salmon, array( + post_url($url, $salmon, array( 'Content-type: application/magic-envelope+xml', 'Content-length: ' . strlen($salmon) )); $return_code = $a->get_curl_code(); - - - if($return_code > 299) { - - logger('compliant salmon failed. Falling back to status.net hack3'); - - // Entirely likely that their salmon implementation is - // non-compliant. Let's try once more, this time only signing - // the data, without the precomputed blob - - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature3 - )); - - // slap them - post_url($url,$salmon, array( - 'Content-type: application/magic-envelope+xml', - 'Content-length: ' . strlen($salmon) - )); - $return_code = $a->get_curl_code(); - } } - logger('slapper for '.$url.' returned ' . $return_code); - if(! $return_code) - return(-1); - if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after'))) - return(-1); + if ($return_code > 299) { + logger('compliant salmon failed. Falling back to old status.net'); + + // Last try. This will most likely fail as well. + $xmldata = array("me:env" => array("me:data" => $data, + "@attributes" => array("type" => $data_type), + "me:encoding" => $encoding, + "me:alg" => $algorithm, + "me:sig" => $signature3, + "@attributes2" => array("key_id" => $keyhash))); + + $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env"); + + $salmon = xml::from_array($xmldata, $xml, false, $namespaces); + + // slap them + post_url($url, $salmon, array( + 'Content-type: application/magic-envelope+xml', + 'Content-length: ' . strlen($salmon) + )); + $return_code = $a->get_curl_code(); + } + + logger('slapper for '.$url.' returned ' . $return_code); + if (! $return_code) { + return(-1); + } + if (($return_code == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) { + return(-1); + } return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1); } - diff --git a/include/socgraph.php b/include/socgraph.php index 642d03d89..a39eca5e8 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -7,6 +7,8 @@ * @todo Detect if it is a forum */ +use \Friendica\Core\Config; + require_once('include/datetime.php'); require_once("include/Scrape.php"); require_once("include/network.php"); @@ -1656,6 +1658,20 @@ function poco_discover_federation() { } } + // Disvover Mastodon servers + if (!Config::get('system','ostatus_disabled')) { + $serverdata = fetch_url("https://instances.mastodon.xyz/instances.json"); + + if ($serverdata) { + $servers = json_decode($serverdata); + + foreach ($servers AS $server) { + $url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name; + proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($url)); + } + } + } + // Currently disabled, since the service isn't available anymore. // It is not removed since I hope that there will be a successor. // Discover GNU Social Servers. @@ -2096,7 +2112,7 @@ function update_gcontact($contact) { fix_alternate_contact_address($contact); if (!isset($contact["updated"])) - $contact["updated"] = datetime_convert(); + $contact["updated"] = dbm::date(); if ($contact["server_url"] == "") { $server_url = $contact["url"]; @@ -2151,7 +2167,7 @@ function update_gcontact($contact) { dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]), intval($contact["nsfw"]), intval($contact["contact-type"]), dbesc($contact["alias"]), dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]), - dbesc($contact["about"]), intval($contact["generation"]), dbesc($contact["updated"]), + dbesc($contact["about"]), intval($contact["generation"]), dbesc(dbm::date($contact["updated"])), dbesc($contact["server_url"]), dbesc($contact["connect"]), dbesc(normalise_link($contact["url"])), intval($contact["generation"])); diff --git a/js/acl.js b/js/acl.js index 4924ac128..054f50960 100644 --- a/js/acl.js +++ b/js/acl.js @@ -65,7 +65,7 @@ ACL.prototype.add_mention = function(id) { if (this.element.val().indexOf( searchText) >= 0 ) { return; } - this.element.val(searchText + this.element.val()); + this.element.val(searchText + this.element.val()).trigger('change'); } ACL.prototype.on_submit = function(){ diff --git a/js/autocomplete.js b/js/autocomplete.js index 8702abbcf..3ed9fa30f 100644 --- a/js/autocomplete.js +++ b/js/autocomplete.js @@ -166,7 +166,7 @@ function listNewLineAutocomplete(id) { if (word != null) { var textBefore = text.value.substring(0, caretPos); var textAfter = text.value.substring(caretPos, text.length); - $('#' + id).val(textBefore + '\r\n[*] ' + textAfter); + $('#' + id).val(textBefore + '\r\n[*] ' + textAfter).trigger('change'); setCaretPosition(text, caretPos + 5); return true; } diff --git a/js/main.js b/js/main.js index aaeef00cf..5df33ed59 100644 --- a/js/main.js +++ b/js/main.js @@ -101,6 +101,7 @@ var start = textarea.selectionStart; var end = textarea.selectionEnd; textarea.value = textarea.value.substring(0, start) + bbcode + textarea.value.substring(end, textarea.value.length); + $(textarea).trigger('change'); }); @@ -223,8 +224,11 @@ var nnm = $("#nav-notifications-menu"); nnm.html(notifications_all + notifications_mark); - var notification_lastitem = parseInt(localStorage.getItem("notification-lastitem")); + var lastItemStorageKey = "notification-lastitem:" + localUser; + var notification_lastitem = parseInt(localStorage.getItem(lastItemStorageKey)); var notification_id = 0; + + // Insert notifs into the notifications-menu $(data.notifications).each(function(key, notif){ var text = notif.message.format('' + notif.name + ''); var contact = ('' + notif.name + ''); @@ -232,19 +236,21 @@ var html = notifications_tpl.format( notif.href, // {0} // link to the source notif.photo, // {1} // photo of the contact - text, // {2} // preformatted text (autor + text) + text, // {2} // preformatted text (autor + text) notif.date, // {3} // date of notification (time ago) - seenclass, // {4} // visited status of the notification + seenclass, // {4} // visited status of the notification new Date(notif.timestamp*1000), // {5} // date of notification notif.url, // {6} // profile url of the contact notif.message.format(contact), // {7} // preformatted html (text including author profile url) - '' // {8} // Deprecated + '' // {8} // Deprecated ); nnm.append(html); }); + + // Desktop Notifications $(data.notifications.reverse()).each(function(key, e){ notification_id = parseInt(e.timestamp); - if (notification_lastitem !== null && notification_id > notification_lastitem) { + if (notification_lastitem !== null && notification_id > notification_lastitem && Number(e.seen) === 0) { if (getNotificationPermission() === "granted") { var notification = new Notification(document.title, { body: decodeHtml(e.message.replace('→ ', '').format(e.name)), @@ -259,7 +265,7 @@ }); notification_lastitem = notification_id; - localStorage.setItem("notification-lastitem", notification_lastitem) + localStorage.setItem(lastItemStorageKey, notification_lastitem) $("img[data-src]", nnm).each(function(i, el){ // Add src attribute for images with a data-src attribute @@ -285,7 +291,7 @@ $.jGrowl(message, {sticky: false, theme: 'info', life: 5000}); }); - /* update the js scrollbars */ + // Update the js scrollbars $('#nav-notifications-menu').perfectScrollbar('update'); }); @@ -317,6 +323,30 @@ } }); + // Scroll to the next/previous thread when pressing J and K + $(document).keydown(function (event) { + var threads = $('.thread_level_1'); + if ((event.keyCode === 74 || event.keyCode === 75) && !$(event.target).is('textarea, input')) { + var scrollTop = $(window).scrollTop(); + if (event.keyCode === 75) { + threads = $(threads.get().reverse()); + } + threads.each(function(key, item) { + var comparison; + var top = $(item).offset().top - 100; + if (event.keyCode === 74) { + comparison = top > scrollTop + 1; + } else if (event.keyCode === 75) { + comparison = top < scrollTop - 1; + } + if (comparison) { + $('html, body').animate({ scrollTop: top }, 200); + return false; + } + }); + } + }); + // Set an event listener for infinite scroll if(typeof infinite_scroll !== 'undefined') { $(window).scroll(function(e){ diff --git a/library/html-to-markdown/.gitignore b/library/html-to-markdown/.gitignore deleted file mode 100644 index aa429a9a1..000000000 --- a/library/html-to-markdown/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -~* -vendor -composer.lock \ No newline at end of file diff --git a/library/html-to-markdown/.travis.yml b/library/html-to-markdown/.travis.yml deleted file mode 100644 index 48b3e64a4..000000000 --- a/library/html-to-markdown/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -language: php -php: - - "5.5" - - "5.4" - - "5.3" -script: phpunit --no-configuration HTML_To_MarkdownTest ./tests/HTML_To_MarkdownTest.php \ No newline at end of file diff --git a/library/html-to-markdown/HTML_To_Markdown.php b/library/html-to-markdown/HTML_To_Markdown.php deleted file mode 100644 index 109780edd..000000000 --- a/library/html-to-markdown/HTML_To_Markdown.php +++ /dev/null @@ -1,598 +0,0 @@ - - * @link https://github.com/nickcernis/html2markdown/ Latest version on GitHub. - * @link http://twitter.com/nickcernis Nick on twitter. - * @license http://www.opensource.org/licenses/mit-license.php MIT - */ -class HTML_To_Markdown -{ - /** - * @var DOMDocument The root of the document tree that holds our HTML. - */ - private $document; - - /** - * @var string|boolean The Markdown version of the original HTML, or false if conversion failed - */ - private $output; - - /** - * @var array Class-wide options users can override. - */ - private $options = array( - 'header_style' => 'setext', // Set to "atx" to output H1 and H2 headers as # Header1 and ## Header2 - 'suppress_errors' => true, // Set to false to show warnings when loading malformed HTML - 'strip_tags' => false, // Set to true to strip tags that don't have markdown equivalents. N.B. Strips tags, not their content. Useful to clean MS Word HTML output. - 'bold_style' => '**', // Set to '__' if you prefer the underlined style - 'italic_style' => '*', // Set to '_' if you prefer the underlined style - 'remove_nodes' => '', // space-separated list of dom nodes that should be removed. example: "meta style script" - ); - - - /** - * Constructor - * - * Set up a new DOMDocument from the supplied HTML, convert it to Markdown, and store it in $this->$output. - * - * @param string $html The HTML to convert to Markdown. - * @param array $overrides [optional] List of style and error display overrides. - */ - public function __construct($html = null, $overrides = null) - { - if ($overrides) - $this->options = array_merge($this->options, $overrides); - - if ($html) - $this->convert($html); - } - - - /** - * Setter for conversion options - * - * @param $name - * @param $value - */ - public function set_option($name, $value) - { - $this->options[$name] = $value; - } - - - /** - * Convert - * - * Loads HTML and passes to get_markdown() - * - * @param $html - * @return string The Markdown version of the html - */ - public function convert($html) - { - $html = preg_replace('~>\s+<~', '><', $html); // Strip white space between tags to prevent creation of empty #text nodes - - $this->document = new DOMDocument(); - - if ($this->options['suppress_errors']) - libxml_use_internal_errors(true); // Suppress conversion errors (from http://bit.ly/pCCRSX ) - - $this->document->loadHTML('' . $html); // Hack to load utf-8 HTML (from http://bit.ly/pVDyCt ) - $this->document->encoding = 'UTF-8'; - - if ($this->options['suppress_errors']) - libxml_clear_errors(); - - return $this->get_markdown($html); - } - - - /** - * Is Child Of? - * - * Is the node a child of the given parent tag? - * - * @param $parent_name string|array The name of the parent node(s) to search for e.g. 'code' or array('pre', 'code') - * @param $node - * @return bool - */ - private static function is_child_of($parent_name, $node) - { - for ($p = $node->parentNode; $p != false; $p = $p->parentNode) { - if (is_null($p)) - return false; - - if ( is_array($parent_name) && in_array($p->nodeName, $parent_name) ) - return true; - - if ($p->nodeName == $parent_name) - return true; - } - return false; - } - - - /** - * Convert Children - * - * Recursive function to drill into the DOM and convert each node into Markdown from the inside out. - * - * Finds children of each node and convert those to #text nodes containing their Markdown equivalent, - * starting with the innermost element and working up to the outermost element. - * - * @param $node - */ - private function convert_children($node) - { - // Don't convert HTML code inside and blocks to Markdown - that should stay as HTML - if (self::is_child_of(array('pre', 'code'), $node)) - return; - - // If the node has children, convert those to Markdown first - if ($node->hasChildNodes()) { - $length = $node->childNodes->length; - - for ($i = 0; $i < $length; $i++) { - $child = $node->childNodes->item($i); - $this->convert_children($child); - } - } - - // Now that child nodes have been converted, convert the original node - $markdown = $this->convert_to_markdown($node); - - // Create a DOM text node containing the Markdown equivalent of the original node - $markdown_node = $this->document->createTextNode($markdown); - - // Replace the old $node e.g. "Title" with the new $markdown_node e.g. "### Title" - $node->parentNode->replaceChild($markdown_node, $node); - } - - - /** - * Get Markdown - * - * Sends the body node to convert_children() to change inner nodes to Markdown #text nodes, then saves and - * returns the resulting converted document as a string in Markdown format. - * - * @return string|boolean The converted HTML as Markdown, or false if conversion failed - */ - private function get_markdown() - { - // Work on the entire DOM tree (including head and body) - $input = $this->document->getElementsByTagName("html")->item(0); - - if (!$input) - return false; - - // Convert all children of this root element. The DOMDocument stored in $this->doc will - // then consist of #text nodes, each containing a Markdown version of the original node - // that it replaced. - $this->convert_children($input); - - // Sanitize and return the body contents as a string. - $markdown = $this->document->saveHTML(); // stores the DOMDocument as a string - $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8'); - $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8'); // Double decode to cover cases like http://www.php.net/manual/en/function.htmlentities.php#99984 - $markdown = preg_replace("/]+>/", "", $markdown); // Strip doctype declaration - $unwanted = array('', '', '', '', '', '', '', ' '); - $markdown = str_replace($unwanted, '', $markdown); // Strip unwanted tags - $markdown = trim($markdown, "\n\r\0\x0B"); - - $this->output = $markdown; - - return $markdown; - } - - - /** - * Convert to Markdown - * - * Converts an individual node into a #text node containing a string of its Markdown equivalent. - * - * Example: An node with text content of "Title" becomes a text node with content of "### Title" - * - * @param $node - * @return string The converted HTML as Markdown - */ - private function convert_to_markdown($node) - { - $tag = $node->nodeName; // the type of element, e.g. h1 - $value = $node->nodeValue; // the value of that element, e.g. The Title - - // Strip nodes named in remove_nodes - $tags_to_remove = explode(' ', $this->options['remove_nodes']); - if ( in_array($tag, $tags_to_remove) ) - return false; - - switch ($tag) { - case "p": - $markdown = (trim($value)) ? rtrim($value) . PHP_EOL . PHP_EOL : ''; - break; - case "pre": - $markdown = PHP_EOL . $this->convert_code($node) . PHP_EOL; - break; - case "h1": - case "h2": - $markdown = $this->convert_header($tag, $node); - break; - case "h3": - $markdown = "### " . $value . PHP_EOL . PHP_EOL; - break; - case "h4": - $markdown = "#### " . $value . PHP_EOL . PHP_EOL; - break; - case "h5": - $markdown = "##### " . $value . PHP_EOL . PHP_EOL; - break; - case "h6": - $markdown = "###### " . $value . PHP_EOL . PHP_EOL; - break; - case "em": - case "i": - case "strong": - case "b": - $markdown = $this->convert_emphasis($tag, $value); - break; - case "hr": - $markdown = "- - - - - -" . PHP_EOL . PHP_EOL; - break; - case "br": - $markdown = " " . PHP_EOL; - break; - case "blockquote": - $markdown = $this->convert_blockquote($node); - break; - case "code": - $markdown = $this->convert_code($node); - break; - case "ol": - case "ul": - $markdown = $value . PHP_EOL; - break; - case "li": - $markdown = $this->convert_list($node); - break; - case "img": - $markdown = $this->convert_image($node); - break; - case "a": - $markdown = $this->convert_anchor($node); - break; - case "#text": - $markdown = preg_replace('~\s+~', ' ', $value); - $markdown = preg_replace('~^#~', '\\\\#', $markdown); - break; - case "#comment": - $markdown = ''; - break; - case "div": - $markdown = ($this->options['strip_tags']) ? $value . PHP_EOL . PHP_EOL : html_entity_decode($node->C14N()); - break; - default: - // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, - // such as nodes on their own. C14N() canonicalizes the node to a string. - // See: http://www.php.net/manual/en/domnode.c14n.php - $markdown = ($this->options['strip_tags']) ? $value : html_entity_decode($node->C14N()); - } - - return $markdown; - } - - - /** - * Convert Header - * - * Converts h1 and h2 headers to Markdown-style headers in setext style, - * matching the number of underscores with the length of the title. - * - * e.g. Header 1 Header Two - * ======== ---------- - * - * Returns atx headers instead if $this->options['header_style'] is "atx" - * - * e.g. # Header 1 ## Header Two - * - * @param string $level The header level, including the "h". e.g. h1 - * @param string $node The node to convert. - * @return string The Markdown version of the header. - */ - private function convert_header($level, $node) - { - $content = $node->nodeValue; - - if (!$this->is_child_of('blockquote', $node) && $this->options['header_style'] == "setext") { - $length = (function_exists('mb_strlen')) ? mb_strlen($content, 'utf-8') : strlen($content); - $underline = ($level == "h1") ? "=" : "-"; - $markdown = $content . PHP_EOL . str_repeat($underline, $length) . PHP_EOL . PHP_EOL; // setext style - } else { - $prefix = ($level == "h1") ? "# " : "## "; - $markdown = $prefix . $content . PHP_EOL . PHP_EOL; // atx style - } - - return $markdown; - } - - - /** - * Converts inline styles - * This function is used to render strong and em tags - * - * eg bold text becomes **bold text** or __bold text__ - * - * @param string $tag - * @param string $value - * @return string - */ - private function convert_emphasis($tag, $value) - { - if ($tag == 'i' || $tag == 'em') { - $markdown = $this->options['italic_style'] . $value . $this->options['italic_style']; - } else { - $markdown = $this->options['bold_style'] . $value . $this->options['bold_style']; - } - - return $markdown; - } - - - /** - * Convert Image - * - * Converts tags to Markdown. - * - * e.g. - * becomes  - * - * @param $node - * @return string - */ - private function convert_image($node) - { - $src = $node->getAttribute('src'); - $alt = $node->getAttribute('alt'); - $title = $node->getAttribute('title'); - - if ($title != "") { - $markdown = ''; // No newlines added. should be in a block-level element. - } else { - $markdown = ''; - } - - return $markdown; - } - - - /** - * Convert Anchor - * - * Converts tags to Markdown. - * - * e.g. Modern Nerd - * becomes [Modern Nerd](http://modernnerd.net "Title") - * - * @param $node - * @return string - */ - private function convert_anchor($node) - { - $href = $node->getAttribute('href'); - $title = $node->getAttribute('title'); - $text = $node->nodeValue; - - if ($title != "") { - $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; - } else { - $markdown = '[' . $text . '](' . $href . ')'; - } - - if (! $href) - $markdown = html_entity_decode($node->C14N()); - - // Append a space if the node after this one is also an anchor - $next_node_name = $this->get_next_node_name($node); - - if ($next_node_name == 'a') - $markdown = $markdown . ' '; - - return $markdown; - } - - - /** - * Convert List - * - * Converts and lists to Markdown. - * - * @param $node - * @return string - */ - private function convert_list($node) - { - // If parent is an ol, use numbers, otherwise, use dashes - $list_type = $node->parentNode->nodeName; - $value = $node->nodeValue; - - if ($list_type == "ul") { - $markdown = "- " . trim($value) . PHP_EOL; - } else { - $number = $this->get_position($node); - $markdown = $number . ". " . trim($value) . PHP_EOL; - } - - return $markdown; - } - - - /** - * Convert Code - * - * Convert code tags by indenting blocks of code and wrapping single lines in backticks. - * - * @param DOMNode $node - * @return string - */ - private function convert_code($node) - { - // Store the content of the code block in an array, one entry for each line - - $markdown = ''; - - $code_content = html_entity_decode($node->C14N()); - $code_content = str_replace(array("", ""), "", $code_content); - $code_content = str_replace(array("", ""), "", $code_content); - - $lines = preg_split('/\r\n|\r|\n/', $code_content); - $total = count($lines); - - // If there's more than one line of code, prepend each line with four spaces and no backticks. - if ($total > 1 || $node->nodeName === 'pre') { - - // Remove the first and last line if they're empty - $first_line = trim($lines[0]); - $last_line = trim($lines[$total - 1]); - $first_line = trim($first_line, " "); //trim XML style carriage returns too - $last_line = trim($last_line, " "); - - if (empty($first_line)) - array_shift($lines); - - if (empty($last_line)) - array_pop($lines); - - $count = 1; - foreach ($lines as $line) { - $line = str_replace(' ', '', $line); - $markdown .= " " . $line; - // Add newlines, except final line of the code - if ($count != $total) - $markdown .= PHP_EOL; - $count++; - } - $markdown .= PHP_EOL; - - } else { // There's only one line of code. It's a code span, not a block. Just wrap it with backticks. - - $markdown .= "`" . $lines[0] . "`"; - - } - - return $markdown; - } - - - /** - * Convert blockquote - * - * Prepend blockquotes with > chars. - * - * @param $node - * @return string - */ - private function convert_blockquote($node) - { - // Contents should have already been converted to Markdown by this point, - // so we just need to add ">" symbols to each line. - - $markdown = ''; - - $quote_content = trim($node->nodeValue); - - $lines = preg_split('/\r\n|\r|\n/', $quote_content); - - $total_lines = count($lines); - - foreach ($lines as $i => $line) { - $markdown .= "> " . $line . PHP_EOL; - if ($i + 1 == $total_lines) - $markdown .= PHP_EOL; - } - - return $markdown; - } - - - /** - * Get Position - * - * Returns the numbered position of a node inside its parent - * - * @param $node - * @return int The numbered position of the node, starting at 1. - */ - private function get_position($node) - { - // Get all of the nodes inside the parent - $list_nodes = $node->parentNode->childNodes; - $total_nodes = $list_nodes->length; - - $position = 1; - - // Loop through all nodes and find the given $node - for ($a = 0; $a < $total_nodes; $a++) { - $current_node = $list_nodes->item($a); - - if ($current_node->isSameNode($node)) - $position = $a + 1; - } - - return $position; - } - - - /** - * Get Next Node Name - * - * Return the name of the node immediately after the passed one. - * - * @param $node - * @return string|null The node name (e.g. 'h1') or null. - */ - private function get_next_node_name($node) - { - $next_node_name = null; - - $current_position = $this->get_position($node); - $next_node = $node->parentNode->childNodes->item($current_position); - - if ($next_node) - $next_node_name = $next_node->nodeName; - - return $next_node_name; - } - - - /** - * To String - * - * Magic method to return Markdown output when HTML_To_Markdown instance is treated as a string. - * - * @return string - */ - public function __toString() - { - return $this->output(); - } - - - /** - * Output - * - * Getter for the converted Markdown contents stored in $this->output - * - * @return string - */ - public function output() - { - if (!$this->output) { - return ''; - } else { - return $this->output; - } - } -} diff --git a/library/html-to-markdown/README.md b/library/html-to-markdown/README.md deleted file mode 100644 index de91c9d08..000000000 --- a/library/html-to-markdown/README.md +++ /dev/null @@ -1,138 +0,0 @@ -HTML To Markdown for PHP -======================== - -A helper class that converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. - -[](https://travis-ci.org/nickcernis/html-to-markdown) - -**Version**: 2.2.1 -**Requires**: PHP 5.3+ -**Author**: [@nickcernis](http://twitter.com/nickcernis) -**License**: [MIT](http://www.opensource.org/licenses/mit-license.php) - -### Why convert HTML to Markdown? - -*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](http://michelf.com/projects/php-markdown/),"* you continue, already labouring the question somewhat, *"but why go the other way?"* - -Typically you would convert HTML to Markdown if: - -1. You have an existing HTML document that needs to be edited by people with good taste. -2. You want to store new content in HTML format but edit it as Markdown. -3. You want to convert HTML email to plain text email. -4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. -5. You just really like Markdown. - -### How to use it - -Either include HTML_To_Markdown.php directly: - - require_once( dirname( __FILE__) . '/HTML_To_Markdown.php' ); - -Or, require the library in your composer.json: - - { - "require": { - "nickcernis/html-to-markdown": "dev-master" - } - } - -Then `composer install` and add `require 'vendor/autoload.php';` to the top of your script. - -Next, create a new HTML_To_Markdown instance, passing in your valid HTML code: - - $html = "Quick, to the Batpoles!"; - $markdown = new HTML_To_Markdown($html); - -The `$markdown` object now contains the Markdown version of your HTML. Use it like a string: - - echo $markdown; // ==> ### Quick, to the Batpoles! - -Or access the Markdown output directly: - - $string = $markdown->output(); - -The included `demo` directory contains an HTML->Markdown conversion form to try out. - -### Conversion options - -By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. - -To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: - - $html = 'Turnips!'; - $markdown = new HTML_To_Markdown($html, array('strip_tags' => true)); // $markdown now contains "Turnips!" - -Or more explicitly, like this: - - $html = 'Turnips!'; - $markdown = new HTML_To_Markdown(); - $markdown->set_option('strip_tags', true); - $markdown->convert($html); // $markdown now contains "Turnips!" - -Note that only the tags themselves are stripped, not the content they hold. - -To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: - - $html = 'Turnips!Monkeys!'; - $markdown = new HTML_To_Markdown($html, array('remove_nodes' => 'span div')); // $markdown now contains "" - -### Style options - -Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. - - $html = 'Italic and a bold'; - $markdown = new HTML_To_Markdown(); - $markdown->set_option('italic_style', '_'); - $markdown->set_option('bold_style', '__'); - $markdown->convert($html); // $markdown now contains "_Italic_ and a __bold__" - -### Limitations - -- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. - -### Known issues - -- Nested lists and lists containing multiple paragraphs aren't converted correctly. -- Lists inside blockquotes aren't converted correctly. -- Any reported [open issues here](https://github.com/nickcernis/html-to-markdown/issues?state=open). - -[Report your issue or request a feature here.](https://github.com/nickcernis/html2markdown/issues/new) Issues with patches or failing tests are especially welcome. - -### Style notes - -- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: - - `$markdown = new HTML_To_Markdown( $html, array('header_style'=>'atx') );` - - Headers of H3 priority and lower always use atx style. - -- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. -- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. - -### Dependencies - -HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. - -Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. - -### Architecture notes - -HTML To Markdown is a single file that uses native DOM manipulation libraries (DOMDocument), not regex voodoo, to convert code. - -### Contributors - -Many thanks to all [contributors](https://github.com/nickcernis/html2markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. - -### How it works - -HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. - -### To-do - -- Support for nested lists and lists inside blockquotes. -- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). - -### Trying to convert Markdown to HTML? - -Use [PHP Markdown](http://michelf.com/projects/php-markdown/) from Michel Fortin. No guarantees about the Elvish, though. - diff --git a/library/html-to-markdown/circle.yml b/library/html-to-markdown/circle.yml deleted file mode 100644 index 9893a4b92..000000000 --- a/library/html-to-markdown/circle.yml +++ /dev/null @@ -1,4 +0,0 @@ -test: - override: - - phpunit --no-configuration HTML_To_MarkdownTest ./tests/HTML_To_MarkdownTest.php - diff --git a/library/html-to-markdown/composer.json b/library/html-to-markdown/composer.json deleted file mode 100644 index beb7faab4..000000000 --- a/library/html-to-markdown/composer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "nickcernis/html-to-markdown", - "type": "library", - "description": "An HTML-to-markdown conversion helper for PHP", - "keywords": ["markdown", "html"], - "homepage": "https://github.com/nickcernis/html-to-markdown", - "license": "MIT", - "authors": [ - { - "name": "Nick Cernis", - "email": "nick@cern.is", - "homepage": "http://modernnerd.net" - } - ], - "autoload": { - "classmap": [ "HTML_To_Markdown.php" ] - }, - "require": { - "php": ">=5.3" - }, - "require-dev": { - "php": ">=5.3.3", - "phpunit/phpunit": "4.*" - } -} diff --git a/mod/acl.php b/mod/acl.php index 04aa9f50a..9220bc77a 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -1,7 +1,7 @@ = `last_failure` ORDER BY `version` ASC;', $p); $total = $total + $c[0]['total']; @@ -474,9 +475,6 @@ function admin_page_summary(App $a) { $r = qu("SELECT COUNT(`id`) AS `count` FROM `register`"); $pending = $r[0]['count']; - $r = qu("SELECT COUNT(*) AS `total` FROM `deliverq` WHERE 1"); - $deliverq = (($r) ? $r[0]['total'] : 0); - $r = qu("SELECT COUNT(*) AS `total` FROM `queue` WHERE 1"); $queue = (($r) ? $r[0]['total'] : 0); @@ -485,7 +483,7 @@ function admin_page_summary(App $a) { // We can do better, but this is a quick queue status - $queues = array('label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue, 'workerq' => $workerqueue); + $queues = array('label' => t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue); $t = get_markup_template("admin_summary.tpl"); @@ -655,7 +653,6 @@ function admin_page_site_post(App $a) { $force_ssl = ((x($_POST,'force_ssl')) ? True : False); $hide_help = ((x($_POST,'hide_help')) ? True : False); $suppress_tags = ((x($_POST,'suppress_tags')) ? True : False); - $use_fulltext_engine = ((x($_POST,'use_fulltext_engine')) ? True : False); $itemcache = ((x($_POST,'itemcache')) ? notags(trim($_POST['itemcache'])) : ''); $itemcache_duration = ((x($_POST,'itemcache_duration')) ? intval($_POST['itemcache_duration']) : 0); $max_comments = ((x($_POST,'max_comments')) ? intval($_POST['max_comments']) : 0); @@ -670,6 +667,12 @@ function admin_page_site_post(App $a) { $worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False); $worker_frontend = ((x($_POST,'worker_frontend')) ? True : False); + // Has the directory url changed? If yes, then resubmit the existing profiles there + if ($global_directory != Config::get('system', 'directory') AND ($global_directory != '')) { + Config::set('system', 'directory', $global_directory); + proc_run(PRIORITY_LOW, 'include/directory.php'); + } + if ($a->get_path() != "") { $diaspora_enabled = false; } @@ -773,7 +776,6 @@ function admin_page_site_post(App $a) { set_config('system', 'allowed_email', $allowed_email); set_config('system', 'block_public', $block_public); set_config('system', 'publish_all', $force_publish); - set_config('system', 'directory', $global_directory); set_config('system', 'thread_allow', $thread_allow); set_config('system', 'newuser_private', $newuser_private); set_config('system', 'enotify_no_content', $enotify_no_content); @@ -799,7 +801,6 @@ function admin_page_site_post(App $a) { set_config('system', 'force_ssl', $force_ssl); set_config('system', 'hide_help', $hide_help); - set_config('system', 'use_fulltext_engine', $use_fulltext_engine); set_config('system', 'itemcache', $itemcache); set_config('system', 'itemcache_duration', $itemcache_duration); set_config('system', 'max_comments', $max_comments); @@ -971,7 +972,7 @@ function admin_page_site(App $a) { '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$shortcut_icon' => array('shortcut_icon', t("Shortcut icon"), get_config('system','shortcut_icon'), t("Link to an icon that will be used for browsers.")), '$touch_icon' => array('touch_icon', t("Touch icon"), get_config('system','touch_icon'), t("Link to an icon that will be used for tablets and mobiles.")), - '$info' => array('info',t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), + '$info' => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile), @@ -1028,7 +1029,6 @@ function admin_page_site(App $a) { '$nodeinfo' => array('nodeinfo', t("Publish server information"), get_config('system','nodeinfo'), t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details.")), - '$use_fulltext_engine' => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")), '$suppress_tags' => array('suppress_tags', t("Suppress Tags"), get_config('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")), '$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), t("The item caches buffers generated bbcode and external images.")), '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")), @@ -2058,8 +2058,8 @@ function admin_page_features(App $a) { $set = $f[3]; } $arr[$fname][1][] = array( - 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('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'))) ); } } diff --git a/mod/cal.php b/mod/cal.php index f43a4e8a7..7398426bc 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -269,8 +269,8 @@ function cal_content(App $a) { '$tabs' => $tabs, '$title' => t('Events'), '$view' => t('View'), - '$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''), - '$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''), + '$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth", t('Previous'),'',''), + '$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth", t('Next'),'',''), '$calendar' => cal($y,$m,$links, ' eventcal'), '$events' => $events, diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 52b5eb9f9..f3875ed8e 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -872,7 +872,7 @@ function dfrn_request_content(App $a) { '$header' => t('Friend/Connection Request'), '$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'), '$pls_answer' => t('Please answer the following:'), - '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'),t('Yes'))), + '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'), t('Yes'))), /*'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']), '$yes' => t('Yes'), '$no' => t('No'), */ diff --git a/mod/follow.php b/mod/follow.php index 2b564c1bf..6e1f90694 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -110,7 +110,7 @@ function follow_content(App $a) { //'$photo' => proxy_url($ret["photo"], false, PROXY_SIZE_SMALL), '$desc' => "", '$pls_answer' => t('Please answer the following:'), - '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'),t('Yes'))), + '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'), t('Yes'))), '$add_note' => t('Add a personal note:'), '$page_desc' => "", '$friendica' => "", diff --git a/mod/hovercard.php b/mod/hovercard.php index ec749db20..65b03f2b9 100644 --- a/mod/hovercard.php +++ b/mod/hovercard.php @@ -75,7 +75,7 @@ function hovercard_content() { 'tags' => $contact["keywords"], // 'nsfw' => intval($contact["nsfw"]), // 'server_url' => $contact["server_url"], - 'bd' => (($contact["birthday"] == "0000-00-00") ? "" : $contact["birthday"]), + 'bd' => (($contact["birthday"] <= '0001-01-01') ? "" : $contact["birthday"]), // 'generation' => $contact["generation"], 'account_type' => account_type($contact), 'actions' => $actions, diff --git a/mod/install.php b/mod/install.php index fbd296a9d..8854723b7 100755 --- a/mod/install.php +++ b/mod/install.php @@ -48,7 +48,7 @@ function install_post(App $a) { $db = new dba($dbhost, $dbuser, $dbpass, '', true); if(! get_db_errno()) { - $r = q("CREATE DATABASE '%s'", + $r = q("CREATE DATABASE '%s' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci", dbesc($dbdata) ); if ($r) { diff --git a/mod/manifest.php b/mod/manifest.php new file mode 100644 index 000000000..6dc0d10a2 --- /dev/null +++ b/mod/manifest.php @@ -0,0 +1,26 @@ + App::get_baseurl(), + '$touch_icon' => $touch_icon, + '$title' => Config::get('config', 'sitename', 'Friendica'), + )); + + echo $o; + + killme(); + + } +?> diff --git a/mod/message.php b/mod/message.php index 9e9669146..beaa7b1df 100644 --- a/mod/message.php +++ b/mod/message.php @@ -349,7 +349,7 @@ function message_content(App $a) { $o .= $header; - $r = q("SELECT count(*) AS `total` FROM `mail` + $r = q("SELECT count(*) AS `total` FROM `mail`, ANY_VALUE(`created`) AS `created` WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC", intval(local_user()) ); @@ -528,12 +528,20 @@ function message_content(App $a) { } function get_messages($user, $lstart, $lend) { - + //TODO: rewritte with a sub-query to get the first message of each private thread with certainty return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, - `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`, - count( * ) as count + ANY_VALUE(`mail`.`id`) AS `id`, ANY_VALUE(`mail`.`uid`) AS `uid`, ANY_VALUE(`mail`.`guid`) AS `guid`, + ANY_VALUE(`mail`.`from-name`) AS `from-name`, ANY_VALUE(`mail`.`from-photo`) AS `from-photo`, + ANY_VALUE(`mail`.`from-url`) AS `from-url`, ANY_VALUE(`mail`.`contact-id`) AS `contact-id`, + ANY_VALUE(`mail`.`convid`) AS `convid`, ANY_VALUE(`mail`.`title`) AS `title`, ANY_VALUE(`mail`.`body`) AS `body`, + ANY_VALUE(`mail`.`seen`) AS `seen`, ANY_VALUE(`mail`.`reply`) AS `reply`, ANY_VALUE(`mail`.`replied`) AS `replied`, + ANY_VALUE(`mail`.`unknown`) AS `unknown`, ANY_VALUE(`mail`.`uri`) AS `uri`, + `mail`.`parent-uri`, + ANY_VALUE(`mail`.`created`) AS `created`, ANY_VALUE(`contact`.`name`) AS `name`, ANY_VALUE(`contact`.`url`) AS `url`, + ANY_VALUE(`contact`.`thumb`) AS `thumb`, ANY_VALUE(`contact`.`network`) AS `network`, + count( * ) as `count` FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` - WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", + WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", intval($user), intval($lstart), intval($lend) ); } diff --git a/mod/network.php b/mod/network.php index 5e94429b5..db4bb9130 100644 --- a/mod/network.php +++ b/mod/network.php @@ -581,11 +581,7 @@ function network_content(App $a, $update = 0) { $sql_order = "`item`.`id`"; $order_mode = "id"; } else { - // Disabled until final decision what to do with this - //if (get_config('system','use_fulltext_engine')) - // $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search))); - //else - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); $sql_order = "`item`.`id`"; $order_mode = "id"; } diff --git a/mod/notifications.php b/mod/notifications.php index 0c08b66ce..bab5fd627 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -292,7 +292,7 @@ function notifications_content(App $a) { '$item_link' => $it['link'], '$item_image' => $it['image'], '$item_url' => $it['url'], - '$item_text' => htmlentities($it['text']), + '$item_text' => $it['text'], '$item_when' => $it['when'], '$item_ago' => $it['ago'], '$item_seen' => $it['seen'], diff --git a/mod/photos.php b/mod/photos.php index ddf081467..a22f919c8 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1240,7 +1240,10 @@ function photos_content(App $a) { $order = 'DESC'; } - $r = q("SELECT `resource-id`, `id`, `filename`, type, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' + $r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, + ANY_VALUE(`type`) AS `type`, max(`scale`) AS `scale`, ANY_VALUE(`desc`) as `desc`, + ANY_VALUE(`created`) as `created` + FROM `photo` WHERE `uid` = %d AND `album` = '%s' AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d", intval($owner_uid), dbesc($album), @@ -1581,9 +1584,9 @@ function photos_content(App $a) { '$album' => array('albname', t('New album name'), $album_e,''), '$caption' => array('desc', t('Caption'), $caption_e, ''), '$tags' => array('newtag', t('Add a Tag'), "", t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')), - '$rotate_none' => array('rotate',t('Do not rotate'),0,'', true), - '$rotate_cw' => array('rotate',t('Rotate CW (right)'),1,''), - '$rotate_ccw' => array('rotate',t('Rotate CCW (left)'),2,''), + '$rotate_none' => array('rotate', t('Do not rotate'),0,'', true), + '$rotate_cw' => array('rotate', t('Rotate CW (right)'),1,''), + '$rotate_ccw' => array('rotate', t('Rotate CCW (left)'),2,''), '$nickname' => $a->data['user']['nickname'], '$resource_id' => $ph[0]['resource-id'], @@ -1840,7 +1843,9 @@ function photos_content(App $a) { $a->set_pager_itemspage(20); } - $r = qu("SELECT `resource-id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` + $r = qu("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, + ANY_VALUE(`type`) AS `type`, ANY_VALUE(`album`) AS `album`, max(`scale`) AS `scale`, + ANY_VALUE(`created`) AS `created` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", intval($a->data['user']['uid']), diff --git a/mod/ping.php b/mod/ping.php index b5330c7b3..ba496a70b 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -199,7 +199,7 @@ function ping_init(App $a) $cachekey = "ping_init:".local_user(); $ev = Cache::get($cachekey); if (is_null($ev)) { - $ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event` + $ev = qu("SELECT type, start, adjust FROM `event` WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0 ORDER BY `start` ASC ", intval(local_user()), @@ -212,7 +212,7 @@ function ping_init(App $a) } if (dbm::is_result($ev)) { - $all_events = intval($ev[0]['total']); + $all_events = count($ev); if ($all_events) { $str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d'); diff --git a/mod/probe.php b/mod/probe.php index 95f856bfa..8c951a7fc 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -4,6 +4,13 @@ require_once('include/Scrape.php'); function probe_content(App $a) { + if (!local_user()) { + http_status_exit(403, + array("title" => t("Public access denied."), + "description" => t("Only logged in users are permitted to perform a probing."))); + killme(); + } + $o .= 'Probe Diagnostic'; $o .= ''; diff --git a/mod/profile.php b/mod/profile.php index fbce509d2..a83cb076f 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -210,7 +210,7 @@ function profile_content(App $a, $update = 0) { if ($update) { - $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network` + $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`, `item`.`created` FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND diff --git a/mod/profiles.php b/mod/profiles.php index b73c46e71..bd57f106d 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -193,7 +193,7 @@ function profiles_post(App $a) { return; } - $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated? + $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0001-01-01'; // FIXME: Needs to be validated? $y = substr($dob, 0, 4); if ((! ctype_digit($y)) || ($y < 1900)) { @@ -201,15 +201,15 @@ function profiles_post(App $a) { } else { $ignore_year = false; } - if ($dob != '0000-00-00') { - if (strpos($dob, '0000-') === 0) { + if (!in_array($dob, array('0000-00-00', '0001-01-01'))) { + if (strpos($dob, '0000-') === 0 || strpos($dob, '0001-') === 0) { $ignore_year = true; $dob = substr($dob, 5); } $dob = datetime_convert('UTC', 'UTC', (($ignore_year) ? '1900-' . $dob : $dob), (($ignore_year) ? 'm-d' : 'Y-m-d')); if ($ignore_year) { - $dob = '0000-' . $dob; + $dob = '0001-' . $dob; } } @@ -637,7 +637,7 @@ function profiles_content(App $a) { t('Hide contacts and friends:'), //Label !!$r[0]['hide-friends'], //Value '', //Help string - array(t('No'),t('Yes')) //Off - On strings + array(t('No'), t('Yes')) //Off - On strings ), '$desc' => t('Hide your contact/friend list from viewers of this profile?'), '$yes_str' => t('Yes'), @@ -739,7 +739,7 @@ function profiles_content(App $a) { '$tv' => array('tv', t('Television'), $r[0]['tv']), '$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']), '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']), - '$romance' => array('romance',t('Love/romance'), $r[0]['romance']), + '$romance' => array('romance', t('Love/romance'), $r[0]['romance']), '$work' => array('work', t('Work/employment'), $r[0]['work']), '$education' => array('education', t('School/education'), $r[0]['education']), '$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']), diff --git a/mod/register.php b/mod/register.php index 81e8c3ad8..5e8da4685 100644 --- a/mod/register.php +++ b/mod/register.php @@ -282,7 +282,7 @@ function register_content(App $a) { '$passwords' => $passwords, '$password1' => array('password1', t('New Password:'), '', t('Leave empty for an auto generated password.')), '$password2' => array('confirm', t('Confirm:'), '', ''), - '$nickdesc' => str_replace('$sitename',$a->get_hostname(),t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.')), + '$nickdesc' => str_replace('$sitename',$a->get_hostname(), t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.')), '$nicklabel' => t('Choose a nickname: '), '$photo' => $photo, '$publish' => $profile_publish, diff --git a/mod/salmon.php b/mod/salmon.php index 69809f523..10b1046b0 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -79,7 +79,7 @@ function salmon_post(App $a) { $signed_data = $data . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg); - $compliant_format = str_replace('=','',$signed_data); + $compliant_format = str_replace('=', '', $signed_data); // decode the data @@ -115,24 +115,28 @@ function salmon_post(App $a) { // We should have everything we need now. Let's see if it verifies. - $verify = rsa_verify($compliant_format,$signature,$pubkey); + // Try GNU Social format + $verify = rsa_verify($signed_data, $signature, $pubkey); + $mode = 1; - if(! $verify) { - logger('mod-salmon: message did not verify using protocol. Trying padding hack.'); - $verify = rsa_verify($signed_data,$signature,$pubkey); + if (! $verify) { + logger('mod-salmon: message did not verify using protocol. Trying compliant format.'); + $verify = rsa_verify($compliant_format, $signature, $pubkey); + $mode = 2; } - if(! $verify) { - logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.'); - $verify = rsa_verify($stnet_signed_data,$signature,$pubkey); + if (! $verify) { + logger('mod-salmon: message did not verify using padding. Trying old statusnet format.'); + $verify = rsa_verify($stnet_signed_data, $signature, $pubkey); + $mode = 3; } - if(! $verify) { + if (! $verify) { logger('mod-salmon: Message did not verify. Discarding.'); http_status_exit(400); } - logger('mod-salmon: Message verified.'); + logger('mod-salmon: Message verified with mode '.$mode); /* diff --git a/mod/search.php b/mod/search.php index 7d588aa4d..a804ca32e 100644 --- a/mod/search.php +++ b/mod/search.php @@ -203,18 +203,13 @@ function search_content(App $a) { } else { logger("Start fulltext search for '".$search."'", LOGGER_DEBUG); - // Disabled until finally is decided how to proceed with this - //if (get_config('system','use_fulltext_engine')) { - // $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search))); - //} else { - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); - //} + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); $r = q("SELECT %s FROM `item` %s WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`)) $sql_extra - GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d", + GROUP BY `item`.`uri`, `item`.`id` ORDER BY `item`.`id` DESC LIMIT %d , %d", item_fieldlists(), item_joins(), item_condition(), intval(local_user()), intval($a->pager['start']), intval($a->pager['itemspage'])); diff --git a/mod/settings.php b/mod/settings.php index 5c9c439e0..1d83251d4 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -779,7 +779,7 @@ function settings_content(App $a) { $arr[$fname] = array(); $arr[$fname][0] = $fdata[0]; foreach (array_slice($fdata,1) as $f) { - $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); + $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'), t('On'))); } } @@ -1164,48 +1164,48 @@ function settings_content(App $a) { } $opt_tpl = get_markup_template("field_yesno.tpl"); - if(get_config('system','publish_all')) { + if (get_config('system','publish_all')) { $profile_in_dir = ''; } else { - $profile_in_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))), + $profile_in_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), array(t('No'), t('Yes'))) )); } if (strlen(get_config('system','directory'))) { - $profile_in_net_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))), + $profile_in_net_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'), t('Yes'))) )); } else { $profile_in_net_dir = ''; } $hide_friends = replace_macros($opt_tpl,array( - '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'),t('Yes'))), + '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'), t('Yes'))), )); $hide_wall = replace_macros($opt_tpl,array( - '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'),t('Yes'))), + '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'), t('Yes'))), )); $blockwall = replace_macros($opt_tpl,array( - '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'),t('Yes'))), + '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); $blocktags = replace_macros($opt_tpl,array( - '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'),t('Yes'))), + '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); $suggestme = replace_macros($opt_tpl,array( - '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'),t('Yes'))), + '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'), t('Yes'))), )); $unkmail = replace_macros($opt_tpl,array( - '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))), + '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'), t('Yes'))), )); @@ -1231,11 +1231,11 @@ function settings_content(App $a) { 'days' => array('expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')), 'advanced' => t('Advanced expiration settings'), 'label' => t('Advanced Expiration'), - 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'),t('Yes'))), - 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))), - 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))), - 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))), - 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'),t('Yes'))), + 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'), t('Yes'))), + 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'), t('Yes'))), + 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'), t('Yes'))), + 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'), t('Yes'))), + 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'), t('Yes'))), ); require_once('include/group.php'); @@ -1293,7 +1293,7 @@ function settings_content(App $a) { '$h_prv' => t('Security and Privacy Settings'), - '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq ,t("\x28to prevent spam abuse\x29")), + '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq , t("\x28to prevent spam abuse\x29")), '$permissions' => t('Default Post Permissions'), '$permdesc' => t("\x28click to open/close\x29"), '$visibility' => $profile['net-publish'], @@ -1323,7 +1323,7 @@ function settings_content(App $a) { '$hide_friends' => $hide_friends, '$hide_wall' => $hide_wall, '$unkmail' => $unkmail, - '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail ,t("\x28to prevent spam abuse\x29")), + '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail , t("\x28to prevent spam abuse\x29")), '$h_not' => t('Notification Settings'), diff --git a/mod/uexport.php b/mod/uexport.php index cada539bc..77a45f8a3 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -34,8 +34,8 @@ function uexport_content(App $a) { * list of array( 'link url', 'link text', 'help text' ) */ $options = array( - array('uexport/account',t('Export account'),t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')), - array('uexport/backup',t('Export all'),t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')), + array('uexport/account', t('Export account'), t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')), + array('uexport/backup', t('Export all'), t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')), ); call_hooks('uexport_options', $options); diff --git a/mod/videos.php b/mod/videos.php index 3828b8f1f..269d53785 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -356,7 +356,9 @@ function videos_content(App $a) { $a->set_pager_itemspage(20); } - $r = q("SELECT hash, `id`, `filename`, filetype FROM `attach` + $r = q("SELECT hash, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`created`) AS `created`, + ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`filetype`) as `filetype` + FROM `attach` WHERE `uid` = %d AND filetype LIKE '%%video%%' $sql_extra GROUP BY hash ORDER BY `created` DESC LIMIT %d , %d", intval($a->data['user']['uid']), diff --git a/mod/webfinger.php b/mod/webfinger.php index eee0580e3..d823bd2dc 100644 --- a/mod/webfinger.php +++ b/mod/webfinger.php @@ -3,6 +3,13 @@ require_once("include/Probe.php"); function webfinger_content(App $a) { + if (!local_user()) { + http_status_exit(403, + array("title" => t("Public access denied."), + "description" => t("Only logged in users are permitted to perform a probing."))); + killme(); + } + $o .= 'Webfinger Diagnostic'; $o .= ''; diff --git a/update.php b/update.php index 8404f5bf2..ea0c57535 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ /dev/null 2>&1; then + # Cygwin paths start with /cygdrive/ which will break windows PHP, + # so we need to translate the dir path to windows format. However + # we could be using cygwin PHP which does not require this, so we + # test if the path to PHP starts with /cygdrive/ rather than /usr/bin + if [[ $(which php) == /cygdrive/* ]]; then + dir=$(cygpath -m "$dir"); + fi +fi + +dir=$(echo $dir | sed 's/ /\ /g') +"${dir}/html-to-markdown" "$@" diff --git a/vendor/bin/html-to-markdown.bat b/vendor/bin/html-to-markdown.bat new file mode 100644 index 000000000..273f24a5d --- /dev/null +++ b/vendor/bin/html-to-markdown.bat @@ -0,0 +1,4 @@ +@ECHO OFF +setlocal DISABLEDELAYEDEXPANSION +SET BIN_TARGET=%~dp0/../league/html-to-markdown/bin/html-to-markdown +php "%BIN_TARGET%" %* diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 95407cff6..4553da2e2 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -241,6 +241,29 @@ return array( 'HTMLPurifier_VarParser_Flexible' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php', 'HTMLPurifier_VarParser_Native' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php', 'HTMLPurifier_Zipper' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php', + 'League\\HTMLToMarkdown\\Configuration' => $vendorDir . '/league/html-to-markdown/src/Configuration.php', + 'League\\HTMLToMarkdown\\ConfigurationAwareInterface' => $vendorDir . '/league/html-to-markdown/src/ConfigurationAwareInterface.php', + 'League\\HTMLToMarkdown\\Converter\\BlockquoteConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/BlockquoteConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CodeConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/CodeConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CommentConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/CommentConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ConverterInterface' => $vendorDir . '/league/html-to-markdown/src/Converter/ConverterInterface.php', + 'League\\HTMLToMarkdown\\Converter\\DefaultConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/DefaultConverter.php', + 'League\\HTMLToMarkdown\\Converter\\DivConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/DivConverter.php', + 'League\\HTMLToMarkdown\\Converter\\EmphasisConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/EmphasisConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HardBreakConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HardBreakConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HeaderConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HeaderConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HorizontalRuleConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ImageConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ImageConverter.php', + 'League\\HTMLToMarkdown\\Converter\\LinkConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/LinkConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListBlockConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListBlockConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListItemConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ParagraphConverter.php', + 'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/PreformattedConverter.php', + 'League\\HTMLToMarkdown\\Converter\\TextConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/TextConverter.php', + 'League\\HTMLToMarkdown\\Element' => $vendorDir . '/league/html-to-markdown/src/Element.php', + 'League\\HTMLToMarkdown\\ElementInterface' => $vendorDir . '/league/html-to-markdown/src/ElementInterface.php', + 'League\\HTMLToMarkdown\\Environment' => $vendorDir . '/league/html-to-markdown/src/Environment.php', + 'League\\HTMLToMarkdown\\HtmlConverter' => $vendorDir . '/league/html-to-markdown/src/HtmlConverter.php', 'Mobile_Detect' => $vendorDir . '/mobiledetect/mobiledetectlib/Mobile_Detect.php', 'OS_Guess' => $vendorDir . '/pear-pear.php.net/PEAR/OS/Guess.php', 'PEAR' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR.php', diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index a8d577d5e..61a440ffd 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -6,5 +6,6 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( + 'League\\HTMLToMarkdown\\' => array($vendorDir . '/league/html-to-markdown/src'), 'Friendica\\' => array($baseDir . '/src'), ); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 370e53218..37d3c878b 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -11,6 +11,10 @@ class ComposerStaticInitFriendica ); public static $prefixLengthsPsr4 = array ( + 'L' => + array ( + 'League\\HTMLToMarkdown\\' => 22, + ), 'F' => array ( 'Friendica\\' => 10, @@ -18,6 +22,10 @@ class ComposerStaticInitFriendica ); public static $prefixDirsPsr4 = array ( + 'League\\HTMLToMarkdown\\' => + array ( + 0 => __DIR__ . '/..' . '/league/html-to-markdown/src', + ), 'Friendica\\' => array ( 0 => __DIR__ . '/../..' . '/src', @@ -277,6 +285,29 @@ class ComposerStaticInitFriendica 'HTMLPurifier_VarParser_Flexible' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php', 'HTMLPurifier_VarParser_Native' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php', 'HTMLPurifier_Zipper' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php', + 'League\\HTMLToMarkdown\\Configuration' => __DIR__ . '/..' . '/league/html-to-markdown/src/Configuration.php', + 'League\\HTMLToMarkdown\\ConfigurationAwareInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/ConfigurationAwareInterface.php', + 'League\\HTMLToMarkdown\\Converter\\BlockquoteConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/BlockquoteConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CodeConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/CodeConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CommentConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/CommentConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ConverterInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ConverterInterface.php', + 'League\\HTMLToMarkdown\\Converter\\DefaultConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/DefaultConverter.php', + 'League\\HTMLToMarkdown\\Converter\\DivConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/DivConverter.php', + 'League\\HTMLToMarkdown\\Converter\\EmphasisConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/EmphasisConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HardBreakConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HardBreakConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HeaderConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HeaderConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HorizontalRuleConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ImageConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ImageConverter.php', + 'League\\HTMLToMarkdown\\Converter\\LinkConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/LinkConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListBlockConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ListBlockConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ListItemConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ParagraphConverter.php', + 'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/PreformattedConverter.php', + 'League\\HTMLToMarkdown\\Converter\\TextConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/TextConverter.php', + 'League\\HTMLToMarkdown\\Element' => __DIR__ . '/..' . '/league/html-to-markdown/src/Element.php', + 'League\\HTMLToMarkdown\\ElementInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/ElementInterface.php', + 'League\\HTMLToMarkdown\\Environment' => __DIR__ . '/..' . '/league/html-to-markdown/src/Environment.php', + 'League\\HTMLToMarkdown\\HtmlConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/HtmlConverter.php', 'Mobile_Detect' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/Mobile_Detect.php', 'OS_Guess' => __DIR__ . '/..' . '/pear-pear.php.net/PEAR/OS/Guess.php', 'PEAR' => __DIR__ . '/..' . '/pear-pear.php.net/PEAR/PEAR.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index d55aed01d..45038987b 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -330,5 +330,71 @@ "PHP License" ], "description": "Text_Highlighter is a package for syntax highlighting.\n\nIt provides a base class provining all the functionality,\nand a descendent classes geneator class.\n\nThe main idea is to simplify creation of subclasses\nimplementing syntax highlighting for particular language.\nSubclasses do not implement any new functioanality,\nthey just provide syntax highlighting rules.\nThe rules sources are in XML format.\n\nTo create a highlighter for a language, there is no need\nto code a new class manually. Simply describe the rules\nin XML file and use Text_Highlighter_Generator to create\na new class." + }, + { + "name": "league/html-to-markdown", + "version": "4.4.1", + "version_normalized": "4.4.1.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/html-to-markdown.git", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/82ea375b5b2b1da1da222644c0565c695bf88186", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xml": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "time": "2017-03-16T00:45:59+00:00", + "bin": [ + "bin/html-to-markdown" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "description": "An HTML-to-markdown conversion helper for PHP", + "homepage": "https://github.com/thephpleague/html-to-markdown", + "keywords": [ + "html", + "markdown" + ] } ] diff --git a/vendor/league/html-to-markdown/CHANGELOG.md b/vendor/league/html-to-markdown/CHANGELOG.md new file mode 100644 index 000000000..067864412 --- /dev/null +++ b/vendor/league/html-to-markdown/CHANGELOG.md @@ -0,0 +1,214 @@ +# Change Log +All notable changes to this project will be documented in this file. +Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles. + +## [Unreleased][unreleased] + +## [4.4.1] + +### Fixed + - Fixed autolinking of invalid URLs (#129) + +## [4.4.0] + +### Added + - Added `hard_break` configuration option (#112, #115) + - The `HtmlConverter` can now be instantiated with an `Environment` (#118) + +### Fixed + - Fixed handling of paragraphs in list item elements (#47, #110) + - Fixed phantom spaces when newlines follow `br` elements (#116, #117) + - Fixed link converter not sanitizing inner spaces properly (#119, #120) + +## [4.3.1] +### Changed + - Revised the sanitization implementation (#109) + +### Fixed + - Fixed tag-like content not being escaped (#67, #109) + - Fixed thematic break-like content not being escaped (#65, #109) + - Fixed codefence-like content not being escaped (#64, #109) + +## [4.3.0] +### Added + - Added full support for PHP 7.0 and 7.1 + +### Changed + - Changed `` and `` conversions to use backticks instead of indendation (#102) + +### Fixed + - Fixed issue where specified code language was not preserved (#70, #102) + - Fixed issue where `` tags nested in `` was not converted properly (#70, #102) + - Fixed header-like content not being escaped (#76, #105) + - Fixed blockquote-like content not being escaped (#77, #103) + - Fixed ordered list-like content not being escaped (#73, #106) + - Fixed unordered list-like content not being escaped (#71, #107) + +## [4.2.2] +### Fixed + - Fixed sanitization bug which sometimes removes desired content (#63, #101) + +## [4.2.1] +### Fixed + - Fixed path to autoload.php when used as a library (#98) + - Fixed edge case for tags containing only whitespace (#99) + +### Removed + - Removed double HTML entity decoding, as this is not desireable (#60) + +## [4.2.0] + +### Added + - Added the ability to invoke HtmlConverter objects as functions (#85) + +### Fixed + - Fixed improper handling of nested list items (#19 and #84) + - Fixed preceeding or trailing spaces within emphasis tags (#83) + +## [4.1.1] + +### Fixed + - Fixed conversion of empty paragraphs (#78) + - Fixed `preg_replace` so it wouldn't break UTF-8 characters (#79) + +## [4.1.0] + +### Added + - Added `bin/html-to-markdown` script + +### Changed + - Changed default italic character to `_` (#58) + +## [4.0.1] + +### Fixed + - Added escaping to avoid * and _ in a text being rendered as emphasis (#48) + +### Removed + - Removed the demo (#51) + - `.styleci.yml` and `CONTRIBUTING.md` are no longer included in distributions (#50) + +## [4.0.0] + +This release changes the visibility of several methods/properties. #42 and #43 brought to light that some visiblities were +not ideally set, so this releases fixes that. Moving forwards this should reduce the chance of introducing BC-breaking changes. + +### Added + - Added new `HtmlConverter::getEnvironment()` method to expose the `Environment` (#42, #43) + +### Changed + - Changed `Environment::addConverter()` from `protected` to `public`, enabling custom converters to be added (#42, #43) + - Changed `HtmlConverter::createDOMDocument()` from `protected` to `private` + - Changed `Element::nextCached` from `protected` to `private` + - Made the `Environment` class `final` + +## [3.1.1] +### Fixed + - Empty HTML strings now result in empty Markdown documents (#40, #41) + +## [3.1.0] +### Added + - Added new `equals` method to `Element` to check for equality + +### Changes + - Use Linux line endings consistently instead of plaform-specific line endings (#36) + +### Fixed + - Cleaned up code style + +## [3.0.0] +### Changed + - Changed namespace to `League\HTMLToMarkdown` + - Changed packagist name to `league/html-to-markdown` + - Re-organized code into several separate classes + - `` tags with identical href and inner text are now rendered using angular bracket syntax (#31) + - `` elements are now treated as block-level elements (#33) + +## [2.2.2] +### Added + - Added support for PHP 5.6 and HHVM + - Enabled testing against PHP 7 nightlies + - Added this CHANGELOG.md + +### Fixed + - Fixed whitespace preservation between inline elements (#9 and #10) + +## [2.2.1] +### Fixed + - Preserve placeholder links (#22) + +## [2.2.0] +### Added + - Added CircleCI config + +### Changed + - `` blocks are now treated as code elements + +### Removed + - Dropped support for PHP 5.2 + - Removed incorrect README comment regarding `#text` nodes (#17) + +## [2.1.2] +### Added + - Added the ability to blacklist/remove specific node types (#11) + +### Changed + - Line breaks are now placed after divs instead of before them + - Newlines inside of link texts are now removed + - Updated the minimum PHPUnit version to 4.* + +## [2.1.1] +### Added + - Added options to customize emphasis characters + +## [2.1.0] +### Added + - Added option to strip HTML tags without Markdown equivalents + - Added `convert()` method for converter reuse + - Added ability to set options after instance construction + - Documented the required PHP extensions (#4) + +### Changed + - ATX style now used for h1 and h2 tags inside blockquotes + +### Fixed + - Newlines inside blockquotes are now started with a bracket + - Fixed some incorrect docblocks + - `__toString()` now returns an empty string if input is empty + - Convert head tag if body tag is empty (#7) + - Preserve special characters inside tags without md equivalents (#6) + + +## [2.0.1] +### Fixed + - Fixed first line indentation for multi-line code blocks + - Fixed consecutive anchors get separating spaces stripped (#3) + +## [2.0.0] +### Added + - Initial release + +[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.4.1...master +[4.4.1]: https://github.com/thephpleague/html-to-markdown/compare/4.4.0...4.4.1 +[4.4.0]: https://github.com/thephpleague/html-to-markdown/compare/4.3.1...4.4.0 +[4.3.1]: https://github.com/thephpleague/html-to-markdown/compare/4.3.0...4.3.1 +[4.3.0]: https://github.com/thephpleague/html-to-markdown/compare/4.2.2...4.3.0 +[4.2.2]: https://github.com/thephpleague/html-to-markdown/compare/4.2.1...4.2.2 +[4.2.1]: https://github.com/thephpleague/html-to-markdown/compare/4.2.0...4.2.1 +[4.2.0]: https://github.com/thephpleague/html-to-markdown/compare/4.1.1...4.2.0 +[4.1.1]: https://github.com/thephpleague/html-to-markdown/compare/4.1.0...4.1.1 +[4.1.0]: https://github.com/thephpleague/html-to-markdown/compare/4.0.1...4.1.0 +[4.0.1]: https://github.com/thephpleague/html-to-markdown/compare/4.0.0...4.0.1 +[4.0.0]: https://github.com/thephpleague/html-to-markdown/compare/3.1.1...4.0.0 +[3.1.1]: https://github.com/thephpleague/html-to-markdown/compare/3.1.0...3.1.1 +[3.1.0]: https://github.com/thephpleague/html-to-markdown/compare/3.0.0...3.1.0 +[3.0.0]: https://github.com/thephpleague/html-to-markdown/compare/2.2.2...3.0.0 +[2.2.2]: https://github.com/thephpleague/html-to-markdown/compare/2.2.1...2.2.2 +[2.2.1]: https://github.com/thephpleague/html-to-markdown/compare/2.2.0...2.2.1 +[2.2.0]: https://github.com/thephpleague/html-to-markdown/compare/2.1.2...2.2.0 +[2.1.2]: https://github.com/thephpleague/html-to-markdown/compare/2.1.1...2.1.2 +[2.1.1]: https://github.com/thephpleague/html-to-markdown/compare/2.1.0...2.1.1 +[2.1.0]: https://github.com/thephpleague/html-to-markdown/compare/2.0.1...2.1.0 +[2.0.1]: https://github.com/thephpleague/html-to-markdown/compare/2.0.0...2.0.1 +[2.0.0]: https://github.com/thephpleague/html-to-markdown/compare/775f91e...2.0.0 + diff --git a/vendor/league/html-to-markdown/CONDUCT.md b/vendor/league/html-to-markdown/CONDUCT.md new file mode 100644 index 000000000..01b8644f1 --- /dev/null +++ b/vendor/league/html-to-markdown/CONDUCT.md @@ -0,0 +1,22 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) diff --git a/library/html-to-markdown/LICENSE b/vendor/league/html-to-markdown/LICENSE similarity index 93% rename from library/html-to-markdown/LICENSE rename to vendor/league/html-to-markdown/LICENSE index f538c2ac9..6c04a59dd 100644 --- a/library/html-to-markdown/LICENSE +++ b/vendor/league/html-to-markdown/LICENSE @@ -1,6 +1,8 @@ The MIT License (MIT) -Copyright (c) 2013 Nick Cernis +Copyright (c) 2015 Colin O'Dell + +Originally created by Nick Cernis Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/vendor/league/html-to-markdown/README.md b/vendor/league/html-to-markdown/README.md new file mode 100644 index 000000000..8d75649d6 --- /dev/null +++ b/vendor/league/html-to-markdown/README.md @@ -0,0 +1,196 @@ +HTML To Markdown for PHP +======================== + +[](https://gitter.im/thephpleague/html-to-markdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +[](https://packagist.org/packages/league/html-to-markdown) +[](LICENSE) +[](https://travis-ci.org/thephpleague/html-to-markdown) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown/code-structure) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown) +[](https://packagist.org/packages/league/html-to-markdown) + +Library which converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. + + +**Requires**: PHP 5.3+ + +**Lead Developer**: [@colinodell](http://twitter.com/colinodell) + +**Original Author**: [@nickcernis](http://twitter.com/nickcernis) + + +### Why convert HTML to Markdown? + +*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](https://github.com/thephpleague/commonmark),"* you continue, already labouring the question somewhat, *"but why go the other way?"* + +Typically you would convert HTML to Markdown if: + +1. You have an existing HTML document that needs to be edited by people with good taste. +2. You want to store new content in HTML format but edit it as Markdown. +3. You want to convert HTML email to plain text email. +4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. +5. You just really like Markdown. + +### How to use it + +Require the library by issuing this command: + +```bash +composer require league/html-to-markdown +``` + +Add `require 'vendor/autoload.php';` to the top of your script. + +Next, create a new HtmlConverter instance, passing in your valid HTML code to its `convert()` function: + +```php +use League\HTMLToMarkdown\HtmlConverter; + +$converter = new HtmlConverter(); + +$html = "Quick, to the Batpoles!"; +$markdown = $converter->convert($html); +``` + +The `$markdown` variable now contains the Markdown version of your HTML as a string: + +```php +echo $markdown; // ==> ### Quick, to the Batpoles! +``` + +The included `demo` directory contains an HTML->Markdown conversion form to try out. + +### Conversion options + +By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. + +To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: + +```php +$converter = new HtmlConverter(array('strip_tags' => true)); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Or more explicitly, like this: + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('strip_tags', true); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Note that only the tags themselves are stripped, not the content they hold. + +To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: + +```php +$converter = new HtmlConverter(array('remove_nodes' => 'span div')); + +$html = 'Turnips!Monkeys!'; +$markdown = $converter->convert($html); // $markdown now contains "" +``` + +### Style options + +Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('italic_style', '_'); +$converter->getConfig()->setOption('bold_style', '__'); + +$html = 'Italic and a bold'; +$markdown = $converter->convert($html); // $markdown now contains "_Italic_ and a __bold__" +``` + +### Line break options + +By default, `br` tags are converted to two spaces followed by a newline character as per [traditional Markdown](https://daringfireball.net/projects/markdown/syntax#p). Set `hard_break` to `true` to omit the two spaces, as per GitHub Flavored Markdown (GFM). + +```php +$converter = new HtmlConverter(); +$html = 'testline break'; + +$converter->getConfig()->setOption('hard_break', true); +$markdown = $converter->convert($html); // $markdown now contains "test\nline break" + +$converter->getConfig()->setOption('hard_break', false); // default +$markdown = $converter->convert($html); // $markdown now contains "test \nline break" +``` + +### Passing custom Environment object + +You can pass current `Environment` object to customize i.e. which converters should be used. + +```php +$environment = new Environment(array( + // your configuration here +)); +$environment->addConverter(new HeaderConverter()); // optionally - add converter manually + +$converter = new HtmlConverter($environment); + +$html = 'Header + +'; +$markdown = $converter->convert($html); // $markdown now contains "### Header" and "" +``` + +### Limitations + +- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. + +### Known issues + +- Nested lists and lists containing multiple paragraphs aren't converted correctly. +- Lists inside blockquotes aren't converted correctly. +- Any reported [open issues here](https://github.com/thephpleague/html-to-markdown/issues?state=open). + +[Report your issue or request a feature here.](https://github.com/thephpleague/html-to-markdown/issues/new) Issues with patches or failing tests are especially welcome. + +### Style notes + +- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: + + `$converter = new HtmlConverter(array('header_style'=>'atx'));` + + Headers of H3 priority and lower always use atx style. + +- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. +- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. + +### Dependencies + +HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. + +Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. + +### Contributors + +Many thanks to all [contributors](https://github.com/thephpleague/html-to-markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. + +### How it works + +HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. + +### To-do + +- Support for nested lists and lists inside blockquotes. +- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). + +### Trying to convert Markdown to HTML? + +Use one of these great libraries: + + - [league/commonmark](https://github.com/thephpleague/commonmark) (recommended) + - [cebe/markdown](https://github.com/cebe/markdown) + - [PHP Markdown](https://michelf.ca/projects/php-markdown/) + - [Parsedown](https://github.com/erusev/parsedown) + +No guarantees about the Elvish, though. + diff --git a/vendor/league/html-to-markdown/bin/html-to-markdown b/vendor/league/html-to-markdown/bin/html-to-markdown new file mode 100644 index 000000000..2815a7cef --- /dev/null +++ b/vendor/league/html-to-markdown/bin/html-to-markdown @@ -0,0 +1,108 @@ +#!/usr/bin/env php + $arg) { + if ($i === 0) { + continue; + } + + if (substr($arg, 0, 1) === '-') { + switch ($arg) { + case '-h': + case '--help': + echo getHelpText(); + exit(0); + default: + fail('Unknown option: ' . $arg); + } + } else { + $src = $argv[1]; + } +} + +if (isset($src)) { + if (!file_exists($src)) { + fail('File not found: ' . $src); + } + + $html = file_get_contents($src); +} else { + $stdin = fopen('php://stdin', 'r'); + stream_set_blocking($stdin, false); + $html = stream_get_contents($stdin); + fclose($stdin); + + if (empty($html)) { + fail(getHelpText()); + } +} + + +$converter = new League\HTMLToMarkdown\HtmlConverter(); +echo $converter->convert($html); + +/** + * Get help and usage info + * + * @return string + */ +function getHelpText() +{ + return << output.md + + Converting from STDIN: + + echo -e 'Hello World!' | html-to-markdown + + Converting from STDIN and saving the output: + + echo -e 'Hello World!' | html-to-markdown > output.md + +HELP; +} + +/** + * @param string $message Error message + */ +function fail($message) +{ + fwrite(STDERR, $message . "\n"); + exit(1); +} + +function requireAutoloader() +{ + $autoloadPaths = array( + // Local package usage + __DIR__ . '/../vendor/autoload.php', + // Package was included as a library + __DIR__ . '/../../../autoload.php', + ); + foreach ($autoloadPaths as $path) { + if (file_exists($path)) { + require_once $path; + break; + } + } +} diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json new file mode 100644 index 000000000..58764bcb5 --- /dev/null +++ b/vendor/league/html-to-markdown/composer.json @@ -0,0 +1,48 @@ +{ + "name": "league/html-to-markdown", + "type": "library", + "description": "An HTML-to-markdown conversion helper for PHP", + "keywords": ["markdown", "html"], + "homepage": "https://github.com/thephpleague/html-to-markdown", + "license": "MIT", + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "League\\HTMLToMarkdown\\Test\\": "tests" + } + }, + "require": { + "php": ">=5.3.3", + "ext-dom": "*", + "ext-xml": "*" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "bin": ["bin/html-to-markdown"], + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + } +} diff --git a/vendor/league/html-to-markdown/src/Configuration.php b/vendor/league/html-to-markdown/src/Configuration.php new file mode 100644 index 000000000..2943383aa --- /dev/null +++ b/vendor/league/html-to-markdown/src/Configuration.php @@ -0,0 +1,60 @@ +config = $config; + } + + /** + * @param array $config + */ + public function merge(array $config = array()) + { + $this->config = array_replace_recursive($this->config, $config); + } + + /** + * @param array $config + */ + public function replace(array $config = array()) + { + $this->config = $config; + } + + /** + * @param string $key + * @param mixed $value + */ + public function setOption($key, $value) + { + $this->config[$key] = $value; + } + + /** + * @param string|null $key + * @param mixed|null $default + * + * @return mixed|null + */ + public function getOption($key = null, $default = null) + { + if ($key === null) { + return $this->config; + } + + if (!isset($this->config[$key])) { + return $default; + } + + return $this->config[$key]; + } +} diff --git a/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php new file mode 100644 index 000000000..8aca530be --- /dev/null +++ b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php @@ -0,0 +1,11 @@ +' symbols to each line. + + $markdown = ''; + + $quote_content = trim($element->getValue()); + + $lines = preg_split('/\r\n|\r|\n/', $quote_content); + + $total_lines = count($lines); + + foreach ($lines as $i => $line) { + $markdown .= '> ' . $line . "\n"; + if ($i + 1 === $total_lines) { + $markdown .= "\n"; + } + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('blockquote'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php new file mode 100644 index 000000000..c8ec2c005 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php @@ -0,0 +1,62 @@ +getAttribute('class'); + + if ($classes) { + // Since tags can have more than one class, we need to find the one that starts with 'language-' + $classes = explode(' ', $classes); + foreach ($classes as $class) { + if (strpos($class, 'language-') !== false) { + // Found one, save it as the selected language and stop looping over the classes. + // The space after the language avoids gluing the actual code with the language tag + $language = str_replace('language-', '', $class) . ' '; + break; + } + } + } + + $markdown = ''; + $code = html_entity_decode($element->getChildrenAsString()); + + // In order to remove the code tags we need to search for them and, in the case of the opening tag + // use a regular expression to find the tag and the other attributes it might have + $code = preg_replace('/]*>/', '', $code); + $code = str_replace('', '', $code); + + // Checking if the code has multiple lines + $lines = preg_split('/\r\n|\r|\n/', $code); + if (count($lines) > 1) { + // Multiple lines detected, adding three backticks and newlines + $markdown .= '```' . $language . "\n" . $code . "\n" . '```'; + } else { + // One line of code, wrapping it on one backtick. + $markdown .= '`' . $language . $code . '`'; + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('code'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CommentConverter.php b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php new file mode 100644 index 000000000..55038b254 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php @@ -0,0 +1,26 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, + // such as nodes on their own. C14N() canonicalizes the node to a string. + // See: http://www.php.net/manual/en/domnode.c14n.php + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue(); + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array(self::DEFAULT_CONVERTER); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/DivConverter.php b/vendor/league/html-to-markdown/src/Converter/DivConverter.php new file mode 100644 index 000000000..656a0ba4d --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/DivConverter.php @@ -0,0 +1,45 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue() . "\n\n"; + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('div'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php new file mode 100644 index 000000000..67250769b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php @@ -0,0 +1,57 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $tag = $element->getTagName(); + $value = $element->getValue(); + + if (!trim($value)) { + return ''; + } + + if ($tag === 'i' || $tag === 'em') { + $style = $this->config->getOption('italic_style'); + } else { + $style = $this->config->getOption('bold_style'); + } + + $prefix = ltrim($value) !== $value ? ' ' : ''; + $suffix = rtrim($value) !== $value ? ' ' : ''; + + return $prefix . $style . trim($value) . $style . $suffix; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('em', 'i', 'strong', 'b'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php new file mode 100644 index 000000000..37cd44e73 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php @@ -0,0 +1,41 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + return $this->config->getOption('hard_break') ? "\n" : " \n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('br'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php new file mode 100644 index 000000000..d117e7d36 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php @@ -0,0 +1,78 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $level = (int) substr($element->getTagName(), 1, 1); + $style = $this->config->getOption('header_style', self::STYLE_SETEXT); + + if (($level === 1 || $level === 2) && !$element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) { + return $this->createSetextHeader($level, $element->getValue()); + } + + return $this->createAtxHeader($level, $element->getValue()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'); + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createSetextHeader($level, $content) + { + $length = function_exists('mb_strlen') ? mb_strlen($content, 'utf-8') : strlen($content); + $underline = ($level === 1) ? '=' : '-'; + + return $content . "\n" . str_repeat($underline, $length) . "\n\n"; + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createAtxHeader($level, $content) + { + $prefix = str_repeat('#', $level) . ' '; + + return $prefix . $content . "\n\n"; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php new file mode 100644 index 000000000..8f54f9397 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php @@ -0,0 +1,26 @@ +getAttribute('src'); + $alt = $element->getAttribute('alt'); + $title = $element->getAttribute('title'); + + if ($title !== '') { + // No newlines added. should be in a block-level element. + return ''; + } + + return ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('img'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php new file mode 100644 index 000000000..f0765f38b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php @@ -0,0 +1,52 @@ +getAttribute('href'); + $title = $element->getAttribute('title'); + $text = trim($element->getValue()); + + if ($title !== '') { + $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; + } elseif ($href === $text && $this->isValidAutolink($href)) { + $markdown = '<' . $href . '>'; + } else { + $markdown = '[' . $text . '](' . $href . ')'; + } + + if (!$href) { + $markdown = html_entity_decode($element->getChildrenAsString()); + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('a'); + } + + /** + * @param string $href + * + * @return bool + */ + private function isValidAutolink($href) + { + return preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php new file mode 100644 index 000000000..07a4c85a9 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php @@ -0,0 +1,26 @@ +getValue() . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('ol', 'ul'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php new file mode 100644 index 000000000..dafec077c --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php @@ -0,0 +1,47 @@ +getParent()->getTagName(); + + // Add spaces to start for nested list items + $level = $element->getListItemLevel($element); + + $prefixForParagraph = str_repeat(' ', $level + 1); + $value = trim(implode("\n" . $prefixForParagraph, explode("\n", trim($element->getValue())))); + + // If list item is the first in a nested list, add a newline before it + $prefix = ''; + if ($level > 0 && $element->getSiblingPosition() === 1) { + $prefix = "\n"; + } + + if ($list_type === 'ul') { + return $prefix . '- ' . $value . "\n"; + } + + $number = $element->getSiblingPosition(); + + return $prefix . $number . '. ' . $value . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('li'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php new file mode 100644 index 000000000..cf852bfcf --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php @@ -0,0 +1,124 @@ +getValue(); + + $markdown = ''; + + $lines = preg_split('/\r\n|\r|\n/', $value); + foreach ($lines as $line) { + /* + * Some special characters need to be escaped based on the position that they appear + * The following function will deal with those special cases. + */ + $markdown .= $this->escapeSpecialCharacters($line); + $markdown .= "\n"; + } + + return trim($markdown) !== '' ? rtrim($markdown) . "\n\n" : ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('p'); + } + + /** + * @param string $line + * + * @return string + */ + private function escapeSpecialCharacters($line) + { + $line = $this->escapeFirstCharacters($line); + $line = $this->escapeOtherCharacters($line); + $line = $this->escapeOtherCharactersRegex($line); + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeFirstCharacters($line) + { + $escapable = array( + '>', + '- ', + '+ ', + '--', + '~~~', + '---', + '- - -' + ); + + foreach ($escapable as $i) { + if (strpos(ltrim($line), $i) === 0) { + // Found a character that must be escaped, adding a backslash before + return '\\' . ltrim($line); + } + } + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeOtherCharacters($line) + { + $escapable = array( + ' {{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache_duration}} diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl index a8243b614..e65014413 100644 --- a/view/templates/admin_summary.tpl +++ b/view/templates/admin_summary.tpl @@ -11,7 +11,7 @@ {{$queues.label}} - {{$queues.deliverq}} - {{$queues.queue}} - {{$queues.workerq}} + {{$queues.queue}} - {{$queues.workerq}} {{$pending.0}} diff --git a/view/templates/head.tpl b/view/templates/head.tpl index 0772af0bc..e7df8a18c 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -7,7 +7,7 @@ - + @@ -19,6 +19,7 @@ +
' . $match[1] . '
and blocks to Markdown - that should stay as HTML - if (self::is_child_of(array('pre', 'code'), $node)) - return; - - // If the node has children, convert those to Markdown first - if ($node->hasChildNodes()) { - $length = $node->childNodes->length; - - for ($i = 0; $i < $length; $i++) { - $child = $node->childNodes->item($i); - $this->convert_children($child); - } - } - - // Now that child nodes have been converted, convert the original node - $markdown = $this->convert_to_markdown($node); - - // Create a DOM text node containing the Markdown equivalent of the original node - $markdown_node = $this->document->createTextNode($markdown); - - // Replace the old $node e.g. "Title" with the new $markdown_node e.g. "### Title" - $node->parentNode->replaceChild($markdown_node, $node); - } - - - /** - * Get Markdown - * - * Sends the body node to convert_children() to change inner nodes to Markdown #text nodes, then saves and - * returns the resulting converted document as a string in Markdown format. - * - * @return string|boolean The converted HTML as Markdown, or false if conversion failed - */ - private function get_markdown() - { - // Work on the entire DOM tree (including head and body) - $input = $this->document->getElementsByTagName("html")->item(0); - - if (!$input) - return false; - - // Convert all children of this root element. The DOMDocument stored in $this->doc will - // then consist of #text nodes, each containing a Markdown version of the original node - // that it replaced. - $this->convert_children($input); - - // Sanitize and return the body contents as a string. - $markdown = $this->document->saveHTML(); // stores the DOMDocument as a string - $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8'); - $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8'); // Double decode to cover cases like http://www.php.net/manual/en/function.htmlentities.php#99984 - $markdown = preg_replace("/]+>/", "", $markdown); // Strip doctype declaration - $unwanted = array('', '', '', '', '', '', '', ' '); - $markdown = str_replace($unwanted, '', $markdown); // Strip unwanted tags - $markdown = trim($markdown, "\n\r\0\x0B"); - - $this->output = $markdown; - - return $markdown; - } - - - /** - * Convert to Markdown - * - * Converts an individual node into a #text node containing a string of its Markdown equivalent. - * - * Example: An node with text content of "Title" becomes a text node with content of "### Title" - * - * @param $node - * @return string The converted HTML as Markdown - */ - private function convert_to_markdown($node) - { - $tag = $node->nodeName; // the type of element, e.g. h1 - $value = $node->nodeValue; // the value of that element, e.g. The Title - - // Strip nodes named in remove_nodes - $tags_to_remove = explode(' ', $this->options['remove_nodes']); - if ( in_array($tag, $tags_to_remove) ) - return false; - - switch ($tag) { - case "p": - $markdown = (trim($value)) ? rtrim($value) . PHP_EOL . PHP_EOL : ''; - break; - case "pre": - $markdown = PHP_EOL . $this->convert_code($node) . PHP_EOL; - break; - case "h1": - case "h2": - $markdown = $this->convert_header($tag, $node); - break; - case "h3": - $markdown = "### " . $value . PHP_EOL . PHP_EOL; - break; - case "h4": - $markdown = "#### " . $value . PHP_EOL . PHP_EOL; - break; - case "h5": - $markdown = "##### " . $value . PHP_EOL . PHP_EOL; - break; - case "h6": - $markdown = "###### " . $value . PHP_EOL . PHP_EOL; - break; - case "em": - case "i": - case "strong": - case "b": - $markdown = $this->convert_emphasis($tag, $value); - break; - case "hr": - $markdown = "- - - - - -" . PHP_EOL . PHP_EOL; - break; - case "br": - $markdown = " " . PHP_EOL; - break; - case "blockquote": - $markdown = $this->convert_blockquote($node); - break; - case "code": - $markdown = $this->convert_code($node); - break; - case "ol": - case "ul": - $markdown = $value . PHP_EOL; - break; - case "li": - $markdown = $this->convert_list($node); - break; - case "img": - $markdown = $this->convert_image($node); - break; - case "a": - $markdown = $this->convert_anchor($node); - break; - case "#text": - $markdown = preg_replace('~\s+~', ' ', $value); - $markdown = preg_replace('~^#~', '\\\\#', $markdown); - break; - case "#comment": - $markdown = ''; - break; - case "div": - $markdown = ($this->options['strip_tags']) ? $value . PHP_EOL . PHP_EOL : html_entity_decode($node->C14N()); - break; - default: - // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, - // such as nodes on their own. C14N() canonicalizes the node to a string. - // See: http://www.php.net/manual/en/domnode.c14n.php - $markdown = ($this->options['strip_tags']) ? $value : html_entity_decode($node->C14N()); - } - - return $markdown; - } - - - /** - * Convert Header - * - * Converts h1 and h2 headers to Markdown-style headers in setext style, - * matching the number of underscores with the length of the title. - * - * e.g. Header 1 Header Two - * ======== ---------- - * - * Returns atx headers instead if $this->options['header_style'] is "atx" - * - * e.g. # Header 1 ## Header Two - * - * @param string $level The header level, including the "h". e.g. h1 - * @param string $node The node to convert. - * @return string The Markdown version of the header. - */ - private function convert_header($level, $node) - { - $content = $node->nodeValue; - - if (!$this->is_child_of('blockquote', $node) && $this->options['header_style'] == "setext") { - $length = (function_exists('mb_strlen')) ? mb_strlen($content, 'utf-8') : strlen($content); - $underline = ($level == "h1") ? "=" : "-"; - $markdown = $content . PHP_EOL . str_repeat($underline, $length) . PHP_EOL . PHP_EOL; // setext style - } else { - $prefix = ($level == "h1") ? "# " : "## "; - $markdown = $prefix . $content . PHP_EOL . PHP_EOL; // atx style - } - - return $markdown; - } - - - /** - * Converts inline styles - * This function is used to render strong and em tags - * - * eg bold text becomes **bold text** or __bold text__ - * - * @param string $tag - * @param string $value - * @return string - */ - private function convert_emphasis($tag, $value) - { - if ($tag == 'i' || $tag == 'em') { - $markdown = $this->options['italic_style'] . $value . $this->options['italic_style']; - } else { - $markdown = $this->options['bold_style'] . $value . $this->options['bold_style']; - } - - return $markdown; - } - - - /** - * Convert Image - * - * Converts tags to Markdown. - * - * e.g. - * becomes  - * - * @param $node - * @return string - */ - private function convert_image($node) - { - $src = $node->getAttribute('src'); - $alt = $node->getAttribute('alt'); - $title = $node->getAttribute('title'); - - if ($title != "") { - $markdown = ''; // No newlines added. should be in a block-level element. - } else { - $markdown = ''; - } - - return $markdown; - } - - - /** - * Convert Anchor - * - * Converts tags to Markdown. - * - * e.g. Modern Nerd - * becomes [Modern Nerd](http://modernnerd.net "Title") - * - * @param $node - * @return string - */ - private function convert_anchor($node) - { - $href = $node->getAttribute('href'); - $title = $node->getAttribute('title'); - $text = $node->nodeValue; - - if ($title != "") { - $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; - } else { - $markdown = '[' . $text . '](' . $href . ')'; - } - - if (! $href) - $markdown = html_entity_decode($node->C14N()); - - // Append a space if the node after this one is also an anchor - $next_node_name = $this->get_next_node_name($node); - - if ($next_node_name == 'a') - $markdown = $markdown . ' '; - - return $markdown; - } - - - /** - * Convert List - * - * Converts and lists to Markdown. - * - * @param $node - * @return string - */ - private function convert_list($node) - { - // If parent is an ol, use numbers, otherwise, use dashes - $list_type = $node->parentNode->nodeName; - $value = $node->nodeValue; - - if ($list_type == "ul") { - $markdown = "- " . trim($value) . PHP_EOL; - } else { - $number = $this->get_position($node); - $markdown = $number . ". " . trim($value) . PHP_EOL; - } - - return $markdown; - } - - - /** - * Convert Code - * - * Convert code tags by indenting blocks of code and wrapping single lines in backticks. - * - * @param DOMNode $node - * @return string - */ - private function convert_code($node) - { - // Store the content of the code block in an array, one entry for each line - - $markdown = ''; - - $code_content = html_entity_decode($node->C14N()); - $code_content = str_replace(array("", ""), "", $code_content); - $code_content = str_replace(array("", ""), "", $code_content); - - $lines = preg_split('/\r\n|\r|\n/', $code_content); - $total = count($lines); - - // If there's more than one line of code, prepend each line with four spaces and no backticks. - if ($total > 1 || $node->nodeName === 'pre') { - - // Remove the first and last line if they're empty - $first_line = trim($lines[0]); - $last_line = trim($lines[$total - 1]); - $first_line = trim($first_line, " "); //trim XML style carriage returns too - $last_line = trim($last_line, " "); - - if (empty($first_line)) - array_shift($lines); - - if (empty($last_line)) - array_pop($lines); - - $count = 1; - foreach ($lines as $line) { - $line = str_replace(' ', '', $line); - $markdown .= " " . $line; - // Add newlines, except final line of the code - if ($count != $total) - $markdown .= PHP_EOL; - $count++; - } - $markdown .= PHP_EOL; - - } else { // There's only one line of code. It's a code span, not a block. Just wrap it with backticks. - - $markdown .= "`" . $lines[0] . "`"; - - } - - return $markdown; - } - - - /** - * Convert blockquote - * - * Prepend blockquotes with > chars. - * - * @param $node - * @return string - */ - private function convert_blockquote($node) - { - // Contents should have already been converted to Markdown by this point, - // so we just need to add ">" symbols to each line. - - $markdown = ''; - - $quote_content = trim($node->nodeValue); - - $lines = preg_split('/\r\n|\r|\n/', $quote_content); - - $total_lines = count($lines); - - foreach ($lines as $i => $line) { - $markdown .= "> " . $line . PHP_EOL; - if ($i + 1 == $total_lines) - $markdown .= PHP_EOL; - } - - return $markdown; - } - - - /** - * Get Position - * - * Returns the numbered position of a node inside its parent - * - * @param $node - * @return int The numbered position of the node, starting at 1. - */ - private function get_position($node) - { - // Get all of the nodes inside the parent - $list_nodes = $node->parentNode->childNodes; - $total_nodes = $list_nodes->length; - - $position = 1; - - // Loop through all nodes and find the given $node - for ($a = 0; $a < $total_nodes; $a++) { - $current_node = $list_nodes->item($a); - - if ($current_node->isSameNode($node)) - $position = $a + 1; - } - - return $position; - } - - - /** - * Get Next Node Name - * - * Return the name of the node immediately after the passed one. - * - * @param $node - * @return string|null The node name (e.g. 'h1') or null. - */ - private function get_next_node_name($node) - { - $next_node_name = null; - - $current_position = $this->get_position($node); - $next_node = $node->parentNode->childNodes->item($current_position); - - if ($next_node) - $next_node_name = $next_node->nodeName; - - return $next_node_name; - } - - - /** - * To String - * - * Magic method to return Markdown output when HTML_To_Markdown instance is treated as a string. - * - * @return string - */ - public function __toString() - { - return $this->output(); - } - - - /** - * Output - * - * Getter for the converted Markdown contents stored in $this->output - * - * @return string - */ - public function output() - { - if (!$this->output) { - return ''; - } else { - return $this->output; - } - } -} diff --git a/library/html-to-markdown/README.md b/library/html-to-markdown/README.md deleted file mode 100644 index de91c9d08..000000000 --- a/library/html-to-markdown/README.md +++ /dev/null @@ -1,138 +0,0 @@ -HTML To Markdown for PHP -======================== - -A helper class that converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. - -[](https://travis-ci.org/nickcernis/html-to-markdown) - -**Version**: 2.2.1 -**Requires**: PHP 5.3+ -**Author**: [@nickcernis](http://twitter.com/nickcernis) -**License**: [MIT](http://www.opensource.org/licenses/mit-license.php) - -### Why convert HTML to Markdown? - -*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](http://michelf.com/projects/php-markdown/),"* you continue, already labouring the question somewhat, *"but why go the other way?"* - -Typically you would convert HTML to Markdown if: - -1. You have an existing HTML document that needs to be edited by people with good taste. -2. You want to store new content in HTML format but edit it as Markdown. -3. You want to convert HTML email to plain text email. -4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. -5. You just really like Markdown. - -### How to use it - -Either include HTML_To_Markdown.php directly: - - require_once( dirname( __FILE__) . '/HTML_To_Markdown.php' ); - -Or, require the library in your composer.json: - - { - "require": { - "nickcernis/html-to-markdown": "dev-master" - } - } - -Then `composer install` and add `require 'vendor/autoload.php';` to the top of your script. - -Next, create a new HTML_To_Markdown instance, passing in your valid HTML code: - - $html = "Quick, to the Batpoles!"; - $markdown = new HTML_To_Markdown($html); - -The `$markdown` object now contains the Markdown version of your HTML. Use it like a string: - - echo $markdown; // ==> ### Quick, to the Batpoles! - -Or access the Markdown output directly: - - $string = $markdown->output(); - -The included `demo` directory contains an HTML->Markdown conversion form to try out. - -### Conversion options - -By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. - -To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: - - $html = 'Turnips!'; - $markdown = new HTML_To_Markdown($html, array('strip_tags' => true)); // $markdown now contains "Turnips!" - -Or more explicitly, like this: - - $html = 'Turnips!'; - $markdown = new HTML_To_Markdown(); - $markdown->set_option('strip_tags', true); - $markdown->convert($html); // $markdown now contains "Turnips!" - -Note that only the tags themselves are stripped, not the content they hold. - -To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: - - $html = 'Turnips!Monkeys!'; - $markdown = new HTML_To_Markdown($html, array('remove_nodes' => 'span div')); // $markdown now contains "" - -### Style options - -Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. - - $html = 'Italic and a bold'; - $markdown = new HTML_To_Markdown(); - $markdown->set_option('italic_style', '_'); - $markdown->set_option('bold_style', '__'); - $markdown->convert($html); // $markdown now contains "_Italic_ and a __bold__" - -### Limitations - -- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. - -### Known issues - -- Nested lists and lists containing multiple paragraphs aren't converted correctly. -- Lists inside blockquotes aren't converted correctly. -- Any reported [open issues here](https://github.com/nickcernis/html-to-markdown/issues?state=open). - -[Report your issue or request a feature here.](https://github.com/nickcernis/html2markdown/issues/new) Issues with patches or failing tests are especially welcome. - -### Style notes - -- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: - - `$markdown = new HTML_To_Markdown( $html, array('header_style'=>'atx') );` - - Headers of H3 priority and lower always use atx style. - -- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. -- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. - -### Dependencies - -HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. - -Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. - -### Architecture notes - -HTML To Markdown is a single file that uses native DOM manipulation libraries (DOMDocument), not regex voodoo, to convert code. - -### Contributors - -Many thanks to all [contributors](https://github.com/nickcernis/html2markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. - -### How it works - -HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. - -### To-do - -- Support for nested lists and lists inside blockquotes. -- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). - -### Trying to convert Markdown to HTML? - -Use [PHP Markdown](http://michelf.com/projects/php-markdown/) from Michel Fortin. No guarantees about the Elvish, though. - diff --git a/library/html-to-markdown/circle.yml b/library/html-to-markdown/circle.yml deleted file mode 100644 index 9893a4b92..000000000 --- a/library/html-to-markdown/circle.yml +++ /dev/null @@ -1,4 +0,0 @@ -test: - override: - - phpunit --no-configuration HTML_To_MarkdownTest ./tests/HTML_To_MarkdownTest.php - diff --git a/library/html-to-markdown/composer.json b/library/html-to-markdown/composer.json deleted file mode 100644 index beb7faab4..000000000 --- a/library/html-to-markdown/composer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "nickcernis/html-to-markdown", - "type": "library", - "description": "An HTML-to-markdown conversion helper for PHP", - "keywords": ["markdown", "html"], - "homepage": "https://github.com/nickcernis/html-to-markdown", - "license": "MIT", - "authors": [ - { - "name": "Nick Cernis", - "email": "nick@cern.is", - "homepage": "http://modernnerd.net" - } - ], - "autoload": { - "classmap": [ "HTML_To_Markdown.php" ] - }, - "require": { - "php": ">=5.3" - }, - "require-dev": { - "php": ">=5.3.3", - "phpunit/phpunit": "4.*" - } -} diff --git a/mod/acl.php b/mod/acl.php index 04aa9f50a..9220bc77a 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -1,7 +1,7 @@ = `last_failure` ORDER BY `version` ASC;', $p); $total = $total + $c[0]['total']; @@ -474,9 +475,6 @@ function admin_page_summary(App $a) { $r = qu("SELECT COUNT(`id`) AS `count` FROM `register`"); $pending = $r[0]['count']; - $r = qu("SELECT COUNT(*) AS `total` FROM `deliverq` WHERE 1"); - $deliverq = (($r) ? $r[0]['total'] : 0); - $r = qu("SELECT COUNT(*) AS `total` FROM `queue` WHERE 1"); $queue = (($r) ? $r[0]['total'] : 0); @@ -485,7 +483,7 @@ function admin_page_summary(App $a) { // We can do better, but this is a quick queue status - $queues = array('label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue, 'workerq' => $workerqueue); + $queues = array('label' => t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue); $t = get_markup_template("admin_summary.tpl"); @@ -655,7 +653,6 @@ function admin_page_site_post(App $a) { $force_ssl = ((x($_POST,'force_ssl')) ? True : False); $hide_help = ((x($_POST,'hide_help')) ? True : False); $suppress_tags = ((x($_POST,'suppress_tags')) ? True : False); - $use_fulltext_engine = ((x($_POST,'use_fulltext_engine')) ? True : False); $itemcache = ((x($_POST,'itemcache')) ? notags(trim($_POST['itemcache'])) : ''); $itemcache_duration = ((x($_POST,'itemcache_duration')) ? intval($_POST['itemcache_duration']) : 0); $max_comments = ((x($_POST,'max_comments')) ? intval($_POST['max_comments']) : 0); @@ -670,6 +667,12 @@ function admin_page_site_post(App $a) { $worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False); $worker_frontend = ((x($_POST,'worker_frontend')) ? True : False); + // Has the directory url changed? If yes, then resubmit the existing profiles there + if ($global_directory != Config::get('system', 'directory') AND ($global_directory != '')) { + Config::set('system', 'directory', $global_directory); + proc_run(PRIORITY_LOW, 'include/directory.php'); + } + if ($a->get_path() != "") { $diaspora_enabled = false; } @@ -773,7 +776,6 @@ function admin_page_site_post(App $a) { set_config('system', 'allowed_email', $allowed_email); set_config('system', 'block_public', $block_public); set_config('system', 'publish_all', $force_publish); - set_config('system', 'directory', $global_directory); set_config('system', 'thread_allow', $thread_allow); set_config('system', 'newuser_private', $newuser_private); set_config('system', 'enotify_no_content', $enotify_no_content); @@ -799,7 +801,6 @@ function admin_page_site_post(App $a) { set_config('system', 'force_ssl', $force_ssl); set_config('system', 'hide_help', $hide_help); - set_config('system', 'use_fulltext_engine', $use_fulltext_engine); set_config('system', 'itemcache', $itemcache); set_config('system', 'itemcache_duration', $itemcache_duration); set_config('system', 'max_comments', $max_comments); @@ -971,7 +972,7 @@ function admin_page_site(App $a) { '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$shortcut_icon' => array('shortcut_icon', t("Shortcut icon"), get_config('system','shortcut_icon'), t("Link to an icon that will be used for browsers.")), '$touch_icon' => array('touch_icon', t("Touch icon"), get_config('system','touch_icon'), t("Link to an icon that will be used for tablets and mobiles.")), - '$info' => array('info',t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), + '$info' => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile), @@ -1028,7 +1029,6 @@ function admin_page_site(App $a) { '$nodeinfo' => array('nodeinfo', t("Publish server information"), get_config('system','nodeinfo'), t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details.")), - '$use_fulltext_engine' => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")), '$suppress_tags' => array('suppress_tags', t("Suppress Tags"), get_config('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")), '$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), t("The item caches buffers generated bbcode and external images.")), '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")), @@ -2058,8 +2058,8 @@ function admin_page_features(App $a) { $set = $f[3]; } $arr[$fname][1][] = array( - 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('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'))) ); } } diff --git a/mod/cal.php b/mod/cal.php index f43a4e8a7..7398426bc 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -269,8 +269,8 @@ function cal_content(App $a) { '$tabs' => $tabs, '$title' => t('Events'), '$view' => t('View'), - '$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''), - '$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''), + '$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth", t('Previous'),'',''), + '$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth", t('Next'),'',''), '$calendar' => cal($y,$m,$links, ' eventcal'), '$events' => $events, diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 52b5eb9f9..f3875ed8e 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -872,7 +872,7 @@ function dfrn_request_content(App $a) { '$header' => t('Friend/Connection Request'), '$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'), '$pls_answer' => t('Please answer the following:'), - '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'),t('Yes'))), + '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'), t('Yes'))), /*'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']), '$yes' => t('Yes'), '$no' => t('No'), */ diff --git a/mod/follow.php b/mod/follow.php index 2b564c1bf..6e1f90694 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -110,7 +110,7 @@ function follow_content(App $a) { //'$photo' => proxy_url($ret["photo"], false, PROXY_SIZE_SMALL), '$desc' => "", '$pls_answer' => t('Please answer the following:'), - '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'),t('Yes'))), + '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'), t('Yes'))), '$add_note' => t('Add a personal note:'), '$page_desc' => "", '$friendica' => "", diff --git a/mod/hovercard.php b/mod/hovercard.php index ec749db20..65b03f2b9 100644 --- a/mod/hovercard.php +++ b/mod/hovercard.php @@ -75,7 +75,7 @@ function hovercard_content() { 'tags' => $contact["keywords"], // 'nsfw' => intval($contact["nsfw"]), // 'server_url' => $contact["server_url"], - 'bd' => (($contact["birthday"] == "0000-00-00") ? "" : $contact["birthday"]), + 'bd' => (($contact["birthday"] <= '0001-01-01') ? "" : $contact["birthday"]), // 'generation' => $contact["generation"], 'account_type' => account_type($contact), 'actions' => $actions, diff --git a/mod/install.php b/mod/install.php index fbd296a9d..8854723b7 100755 --- a/mod/install.php +++ b/mod/install.php @@ -48,7 +48,7 @@ function install_post(App $a) { $db = new dba($dbhost, $dbuser, $dbpass, '', true); if(! get_db_errno()) { - $r = q("CREATE DATABASE '%s'", + $r = q("CREATE DATABASE '%s' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci", dbesc($dbdata) ); if ($r) { diff --git a/mod/manifest.php b/mod/manifest.php new file mode 100644 index 000000000..6dc0d10a2 --- /dev/null +++ b/mod/manifest.php @@ -0,0 +1,26 @@ + App::get_baseurl(), + '$touch_icon' => $touch_icon, + '$title' => Config::get('config', 'sitename', 'Friendica'), + )); + + echo $o; + + killme(); + + } +?> diff --git a/mod/message.php b/mod/message.php index 9e9669146..beaa7b1df 100644 --- a/mod/message.php +++ b/mod/message.php @@ -349,7 +349,7 @@ function message_content(App $a) { $o .= $header; - $r = q("SELECT count(*) AS `total` FROM `mail` + $r = q("SELECT count(*) AS `total` FROM `mail`, ANY_VALUE(`created`) AS `created` WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC", intval(local_user()) ); @@ -528,12 +528,20 @@ function message_content(App $a) { } function get_messages($user, $lstart, $lend) { - + //TODO: rewritte with a sub-query to get the first message of each private thread with certainty return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, - `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`, - count( * ) as count + ANY_VALUE(`mail`.`id`) AS `id`, ANY_VALUE(`mail`.`uid`) AS `uid`, ANY_VALUE(`mail`.`guid`) AS `guid`, + ANY_VALUE(`mail`.`from-name`) AS `from-name`, ANY_VALUE(`mail`.`from-photo`) AS `from-photo`, + ANY_VALUE(`mail`.`from-url`) AS `from-url`, ANY_VALUE(`mail`.`contact-id`) AS `contact-id`, + ANY_VALUE(`mail`.`convid`) AS `convid`, ANY_VALUE(`mail`.`title`) AS `title`, ANY_VALUE(`mail`.`body`) AS `body`, + ANY_VALUE(`mail`.`seen`) AS `seen`, ANY_VALUE(`mail`.`reply`) AS `reply`, ANY_VALUE(`mail`.`replied`) AS `replied`, + ANY_VALUE(`mail`.`unknown`) AS `unknown`, ANY_VALUE(`mail`.`uri`) AS `uri`, + `mail`.`parent-uri`, + ANY_VALUE(`mail`.`created`) AS `created`, ANY_VALUE(`contact`.`name`) AS `name`, ANY_VALUE(`contact`.`url`) AS `url`, + ANY_VALUE(`contact`.`thumb`) AS `thumb`, ANY_VALUE(`contact`.`network`) AS `network`, + count( * ) as `count` FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` - WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", + WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", intval($user), intval($lstart), intval($lend) ); } diff --git a/mod/network.php b/mod/network.php index 5e94429b5..db4bb9130 100644 --- a/mod/network.php +++ b/mod/network.php @@ -581,11 +581,7 @@ function network_content(App $a, $update = 0) { $sql_order = "`item`.`id`"; $order_mode = "id"; } else { - // Disabled until final decision what to do with this - //if (get_config('system','use_fulltext_engine')) - // $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search))); - //else - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); $sql_order = "`item`.`id`"; $order_mode = "id"; } diff --git a/mod/notifications.php b/mod/notifications.php index 0c08b66ce..bab5fd627 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -292,7 +292,7 @@ function notifications_content(App $a) { '$item_link' => $it['link'], '$item_image' => $it['image'], '$item_url' => $it['url'], - '$item_text' => htmlentities($it['text']), + '$item_text' => $it['text'], '$item_when' => $it['when'], '$item_ago' => $it['ago'], '$item_seen' => $it['seen'], diff --git a/mod/photos.php b/mod/photos.php index ddf081467..a22f919c8 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1240,7 +1240,10 @@ function photos_content(App $a) { $order = 'DESC'; } - $r = q("SELECT `resource-id`, `id`, `filename`, type, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' + $r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, + ANY_VALUE(`type`) AS `type`, max(`scale`) AS `scale`, ANY_VALUE(`desc`) as `desc`, + ANY_VALUE(`created`) as `created` + FROM `photo` WHERE `uid` = %d AND `album` = '%s' AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d", intval($owner_uid), dbesc($album), @@ -1581,9 +1584,9 @@ function photos_content(App $a) { '$album' => array('albname', t('New album name'), $album_e,''), '$caption' => array('desc', t('Caption'), $caption_e, ''), '$tags' => array('newtag', t('Add a Tag'), "", t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')), - '$rotate_none' => array('rotate',t('Do not rotate'),0,'', true), - '$rotate_cw' => array('rotate',t('Rotate CW (right)'),1,''), - '$rotate_ccw' => array('rotate',t('Rotate CCW (left)'),2,''), + '$rotate_none' => array('rotate', t('Do not rotate'),0,'', true), + '$rotate_cw' => array('rotate', t('Rotate CW (right)'),1,''), + '$rotate_ccw' => array('rotate', t('Rotate CCW (left)'),2,''), '$nickname' => $a->data['user']['nickname'], '$resource_id' => $ph[0]['resource-id'], @@ -1840,7 +1843,9 @@ function photos_content(App $a) { $a->set_pager_itemspage(20); } - $r = qu("SELECT `resource-id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` + $r = qu("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, + ANY_VALUE(`type`) AS `type`, ANY_VALUE(`album`) AS `album`, max(`scale`) AS `scale`, + ANY_VALUE(`created`) AS `created` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", intval($a->data['user']['uid']), diff --git a/mod/ping.php b/mod/ping.php index b5330c7b3..ba496a70b 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -199,7 +199,7 @@ function ping_init(App $a) $cachekey = "ping_init:".local_user(); $ev = Cache::get($cachekey); if (is_null($ev)) { - $ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event` + $ev = qu("SELECT type, start, adjust FROM `event` WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0 ORDER BY `start` ASC ", intval(local_user()), @@ -212,7 +212,7 @@ function ping_init(App $a) } if (dbm::is_result($ev)) { - $all_events = intval($ev[0]['total']); + $all_events = count($ev); if ($all_events) { $str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d'); diff --git a/mod/probe.php b/mod/probe.php index 95f856bfa..8c951a7fc 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -4,6 +4,13 @@ require_once('include/Scrape.php'); function probe_content(App $a) { + if (!local_user()) { + http_status_exit(403, + array("title" => t("Public access denied."), + "description" => t("Only logged in users are permitted to perform a probing."))); + killme(); + } + $o .= 'Probe Diagnostic'; $o .= ''; diff --git a/mod/profile.php b/mod/profile.php index fbce509d2..a83cb076f 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -210,7 +210,7 @@ function profile_content(App $a, $update = 0) { if ($update) { - $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network` + $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`, `item`.`created` FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND diff --git a/mod/profiles.php b/mod/profiles.php index b73c46e71..bd57f106d 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -193,7 +193,7 @@ function profiles_post(App $a) { return; } - $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated? + $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0001-01-01'; // FIXME: Needs to be validated? $y = substr($dob, 0, 4); if ((! ctype_digit($y)) || ($y < 1900)) { @@ -201,15 +201,15 @@ function profiles_post(App $a) { } else { $ignore_year = false; } - if ($dob != '0000-00-00') { - if (strpos($dob, '0000-') === 0) { + if (!in_array($dob, array('0000-00-00', '0001-01-01'))) { + if (strpos($dob, '0000-') === 0 || strpos($dob, '0001-') === 0) { $ignore_year = true; $dob = substr($dob, 5); } $dob = datetime_convert('UTC', 'UTC', (($ignore_year) ? '1900-' . $dob : $dob), (($ignore_year) ? 'm-d' : 'Y-m-d')); if ($ignore_year) { - $dob = '0000-' . $dob; + $dob = '0001-' . $dob; } } @@ -637,7 +637,7 @@ function profiles_content(App $a) { t('Hide contacts and friends:'), //Label !!$r[0]['hide-friends'], //Value '', //Help string - array(t('No'),t('Yes')) //Off - On strings + array(t('No'), t('Yes')) //Off - On strings ), '$desc' => t('Hide your contact/friend list from viewers of this profile?'), '$yes_str' => t('Yes'), @@ -739,7 +739,7 @@ function profiles_content(App $a) { '$tv' => array('tv', t('Television'), $r[0]['tv']), '$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']), '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']), - '$romance' => array('romance',t('Love/romance'), $r[0]['romance']), + '$romance' => array('romance', t('Love/romance'), $r[0]['romance']), '$work' => array('work', t('Work/employment'), $r[0]['work']), '$education' => array('education', t('School/education'), $r[0]['education']), '$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']), diff --git a/mod/register.php b/mod/register.php index 81e8c3ad8..5e8da4685 100644 --- a/mod/register.php +++ b/mod/register.php @@ -282,7 +282,7 @@ function register_content(App $a) { '$passwords' => $passwords, '$password1' => array('password1', t('New Password:'), '', t('Leave empty for an auto generated password.')), '$password2' => array('confirm', t('Confirm:'), '', ''), - '$nickdesc' => str_replace('$sitename',$a->get_hostname(),t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.')), + '$nickdesc' => str_replace('$sitename',$a->get_hostname(), t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.')), '$nicklabel' => t('Choose a nickname: '), '$photo' => $photo, '$publish' => $profile_publish, diff --git a/mod/salmon.php b/mod/salmon.php index 69809f523..10b1046b0 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -79,7 +79,7 @@ function salmon_post(App $a) { $signed_data = $data . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg); - $compliant_format = str_replace('=','',$signed_data); + $compliant_format = str_replace('=', '', $signed_data); // decode the data @@ -115,24 +115,28 @@ function salmon_post(App $a) { // We should have everything we need now. Let's see if it verifies. - $verify = rsa_verify($compliant_format,$signature,$pubkey); + // Try GNU Social format + $verify = rsa_verify($signed_data, $signature, $pubkey); + $mode = 1; - if(! $verify) { - logger('mod-salmon: message did not verify using protocol. Trying padding hack.'); - $verify = rsa_verify($signed_data,$signature,$pubkey); + if (! $verify) { + logger('mod-salmon: message did not verify using protocol. Trying compliant format.'); + $verify = rsa_verify($compliant_format, $signature, $pubkey); + $mode = 2; } - if(! $verify) { - logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.'); - $verify = rsa_verify($stnet_signed_data,$signature,$pubkey); + if (! $verify) { + logger('mod-salmon: message did not verify using padding. Trying old statusnet format.'); + $verify = rsa_verify($stnet_signed_data, $signature, $pubkey); + $mode = 3; } - if(! $verify) { + if (! $verify) { logger('mod-salmon: Message did not verify. Discarding.'); http_status_exit(400); } - logger('mod-salmon: Message verified.'); + logger('mod-salmon: Message verified with mode '.$mode); /* diff --git a/mod/search.php b/mod/search.php index 7d588aa4d..a804ca32e 100644 --- a/mod/search.php +++ b/mod/search.php @@ -203,18 +203,13 @@ function search_content(App $a) { } else { logger("Start fulltext search for '".$search."'", LOGGER_DEBUG); - // Disabled until finally is decided how to proceed with this - //if (get_config('system','use_fulltext_engine')) { - // $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search))); - //} else { - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); - //} + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); $r = q("SELECT %s FROM `item` %s WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`)) $sql_extra - GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d", + GROUP BY `item`.`uri`, `item`.`id` ORDER BY `item`.`id` DESC LIMIT %d , %d", item_fieldlists(), item_joins(), item_condition(), intval(local_user()), intval($a->pager['start']), intval($a->pager['itemspage'])); diff --git a/mod/settings.php b/mod/settings.php index 5c9c439e0..1d83251d4 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -779,7 +779,7 @@ function settings_content(App $a) { $arr[$fname] = array(); $arr[$fname][0] = $fdata[0]; foreach (array_slice($fdata,1) as $f) { - $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); + $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'), t('On'))); } } @@ -1164,48 +1164,48 @@ function settings_content(App $a) { } $opt_tpl = get_markup_template("field_yesno.tpl"); - if(get_config('system','publish_all')) { + if (get_config('system','publish_all')) { $profile_in_dir = ''; } else { - $profile_in_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))), + $profile_in_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), array(t('No'), t('Yes'))) )); } if (strlen(get_config('system','directory'))) { - $profile_in_net_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))), + $profile_in_net_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'), t('Yes'))) )); } else { $profile_in_net_dir = ''; } $hide_friends = replace_macros($opt_tpl,array( - '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'),t('Yes'))), + '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'), t('Yes'))), )); $hide_wall = replace_macros($opt_tpl,array( - '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'),t('Yes'))), + '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'), t('Yes'))), )); $blockwall = replace_macros($opt_tpl,array( - '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'),t('Yes'))), + '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); $blocktags = replace_macros($opt_tpl,array( - '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'),t('Yes'))), + '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); $suggestme = replace_macros($opt_tpl,array( - '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'),t('Yes'))), + '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'), t('Yes'))), )); $unkmail = replace_macros($opt_tpl,array( - '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))), + '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'), t('Yes'))), )); @@ -1231,11 +1231,11 @@ function settings_content(App $a) { 'days' => array('expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')), 'advanced' => t('Advanced expiration settings'), 'label' => t('Advanced Expiration'), - 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'),t('Yes'))), - 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))), - 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))), - 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))), - 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'),t('Yes'))), + 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'), t('Yes'))), + 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'), t('Yes'))), + 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'), t('Yes'))), + 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'), t('Yes'))), + 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'), t('Yes'))), ); require_once('include/group.php'); @@ -1293,7 +1293,7 @@ function settings_content(App $a) { '$h_prv' => t('Security and Privacy Settings'), - '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq ,t("\x28to prevent spam abuse\x29")), + '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq , t("\x28to prevent spam abuse\x29")), '$permissions' => t('Default Post Permissions'), '$permdesc' => t("\x28click to open/close\x29"), '$visibility' => $profile['net-publish'], @@ -1323,7 +1323,7 @@ function settings_content(App $a) { '$hide_friends' => $hide_friends, '$hide_wall' => $hide_wall, '$unkmail' => $unkmail, - '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail ,t("\x28to prevent spam abuse\x29")), + '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail , t("\x28to prevent spam abuse\x29")), '$h_not' => t('Notification Settings'), diff --git a/mod/uexport.php b/mod/uexport.php index cada539bc..77a45f8a3 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -34,8 +34,8 @@ function uexport_content(App $a) { * list of array( 'link url', 'link text', 'help text' ) */ $options = array( - array('uexport/account',t('Export account'),t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')), - array('uexport/backup',t('Export all'),t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')), + array('uexport/account', t('Export account'), t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')), + array('uexport/backup', t('Export all'), t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')), ); call_hooks('uexport_options', $options); diff --git a/mod/videos.php b/mod/videos.php index 3828b8f1f..269d53785 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -356,7 +356,9 @@ function videos_content(App $a) { $a->set_pager_itemspage(20); } - $r = q("SELECT hash, `id`, `filename`, filetype FROM `attach` + $r = q("SELECT hash, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`created`) AS `created`, + ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`filetype`) as `filetype` + FROM `attach` WHERE `uid` = %d AND filetype LIKE '%%video%%' $sql_extra GROUP BY hash ORDER BY `created` DESC LIMIT %d , %d", intval($a->data['user']['uid']), diff --git a/mod/webfinger.php b/mod/webfinger.php index eee0580e3..d823bd2dc 100644 --- a/mod/webfinger.php +++ b/mod/webfinger.php @@ -3,6 +3,13 @@ require_once("include/Probe.php"); function webfinger_content(App $a) { + if (!local_user()) { + http_status_exit(403, + array("title" => t("Public access denied."), + "description" => t("Only logged in users are permitted to perform a probing."))); + killme(); + } + $o .= 'Webfinger Diagnostic'; $o .= ''; diff --git a/update.php b/update.php index 8404f5bf2..ea0c57535 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ /dev/null 2>&1; then + # Cygwin paths start with /cygdrive/ which will break windows PHP, + # so we need to translate the dir path to windows format. However + # we could be using cygwin PHP which does not require this, so we + # test if the path to PHP starts with /cygdrive/ rather than /usr/bin + if [[ $(which php) == /cygdrive/* ]]; then + dir=$(cygpath -m "$dir"); + fi +fi + +dir=$(echo $dir | sed 's/ /\ /g') +"${dir}/html-to-markdown" "$@" diff --git a/vendor/bin/html-to-markdown.bat b/vendor/bin/html-to-markdown.bat new file mode 100644 index 000000000..273f24a5d --- /dev/null +++ b/vendor/bin/html-to-markdown.bat @@ -0,0 +1,4 @@ +@ECHO OFF +setlocal DISABLEDELAYEDEXPANSION +SET BIN_TARGET=%~dp0/../league/html-to-markdown/bin/html-to-markdown +php "%BIN_TARGET%" %* diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 95407cff6..4553da2e2 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -241,6 +241,29 @@ return array( 'HTMLPurifier_VarParser_Flexible' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php', 'HTMLPurifier_VarParser_Native' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php', 'HTMLPurifier_Zipper' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php', + 'League\\HTMLToMarkdown\\Configuration' => $vendorDir . '/league/html-to-markdown/src/Configuration.php', + 'League\\HTMLToMarkdown\\ConfigurationAwareInterface' => $vendorDir . '/league/html-to-markdown/src/ConfigurationAwareInterface.php', + 'League\\HTMLToMarkdown\\Converter\\BlockquoteConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/BlockquoteConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CodeConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/CodeConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CommentConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/CommentConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ConverterInterface' => $vendorDir . '/league/html-to-markdown/src/Converter/ConverterInterface.php', + 'League\\HTMLToMarkdown\\Converter\\DefaultConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/DefaultConverter.php', + 'League\\HTMLToMarkdown\\Converter\\DivConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/DivConverter.php', + 'League\\HTMLToMarkdown\\Converter\\EmphasisConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/EmphasisConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HardBreakConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HardBreakConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HeaderConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HeaderConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HorizontalRuleConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ImageConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ImageConverter.php', + 'League\\HTMLToMarkdown\\Converter\\LinkConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/LinkConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListBlockConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListBlockConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListItemConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ParagraphConverter.php', + 'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/PreformattedConverter.php', + 'League\\HTMLToMarkdown\\Converter\\TextConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/TextConverter.php', + 'League\\HTMLToMarkdown\\Element' => $vendorDir . '/league/html-to-markdown/src/Element.php', + 'League\\HTMLToMarkdown\\ElementInterface' => $vendorDir . '/league/html-to-markdown/src/ElementInterface.php', + 'League\\HTMLToMarkdown\\Environment' => $vendorDir . '/league/html-to-markdown/src/Environment.php', + 'League\\HTMLToMarkdown\\HtmlConverter' => $vendorDir . '/league/html-to-markdown/src/HtmlConverter.php', 'Mobile_Detect' => $vendorDir . '/mobiledetect/mobiledetectlib/Mobile_Detect.php', 'OS_Guess' => $vendorDir . '/pear-pear.php.net/PEAR/OS/Guess.php', 'PEAR' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR.php', diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index a8d577d5e..61a440ffd 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -6,5 +6,6 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( + 'League\\HTMLToMarkdown\\' => array($vendorDir . '/league/html-to-markdown/src'), 'Friendica\\' => array($baseDir . '/src'), ); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 370e53218..37d3c878b 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -11,6 +11,10 @@ class ComposerStaticInitFriendica ); public static $prefixLengthsPsr4 = array ( + 'L' => + array ( + 'League\\HTMLToMarkdown\\' => 22, + ), 'F' => array ( 'Friendica\\' => 10, @@ -18,6 +22,10 @@ class ComposerStaticInitFriendica ); public static $prefixDirsPsr4 = array ( + 'League\\HTMLToMarkdown\\' => + array ( + 0 => __DIR__ . '/..' . '/league/html-to-markdown/src', + ), 'Friendica\\' => array ( 0 => __DIR__ . '/../..' . '/src', @@ -277,6 +285,29 @@ class ComposerStaticInitFriendica 'HTMLPurifier_VarParser_Flexible' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php', 'HTMLPurifier_VarParser_Native' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php', 'HTMLPurifier_Zipper' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php', + 'League\\HTMLToMarkdown\\Configuration' => __DIR__ . '/..' . '/league/html-to-markdown/src/Configuration.php', + 'League\\HTMLToMarkdown\\ConfigurationAwareInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/ConfigurationAwareInterface.php', + 'League\\HTMLToMarkdown\\Converter\\BlockquoteConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/BlockquoteConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CodeConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/CodeConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CommentConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/CommentConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ConverterInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ConverterInterface.php', + 'League\\HTMLToMarkdown\\Converter\\DefaultConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/DefaultConverter.php', + 'League\\HTMLToMarkdown\\Converter\\DivConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/DivConverter.php', + 'League\\HTMLToMarkdown\\Converter\\EmphasisConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/EmphasisConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HardBreakConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HardBreakConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HeaderConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HeaderConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HorizontalRuleConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ImageConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ImageConverter.php', + 'League\\HTMLToMarkdown\\Converter\\LinkConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/LinkConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListBlockConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ListBlockConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ListItemConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ParagraphConverter.php', + 'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/PreformattedConverter.php', + 'League\\HTMLToMarkdown\\Converter\\TextConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/TextConverter.php', + 'League\\HTMLToMarkdown\\Element' => __DIR__ . '/..' . '/league/html-to-markdown/src/Element.php', + 'League\\HTMLToMarkdown\\ElementInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/ElementInterface.php', + 'League\\HTMLToMarkdown\\Environment' => __DIR__ . '/..' . '/league/html-to-markdown/src/Environment.php', + 'League\\HTMLToMarkdown\\HtmlConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/HtmlConverter.php', 'Mobile_Detect' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/Mobile_Detect.php', 'OS_Guess' => __DIR__ . '/..' . '/pear-pear.php.net/PEAR/OS/Guess.php', 'PEAR' => __DIR__ . '/..' . '/pear-pear.php.net/PEAR/PEAR.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index d55aed01d..45038987b 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -330,5 +330,71 @@ "PHP License" ], "description": "Text_Highlighter is a package for syntax highlighting.\n\nIt provides a base class provining all the functionality,\nand a descendent classes geneator class.\n\nThe main idea is to simplify creation of subclasses\nimplementing syntax highlighting for particular language.\nSubclasses do not implement any new functioanality,\nthey just provide syntax highlighting rules.\nThe rules sources are in XML format.\n\nTo create a highlighter for a language, there is no need\nto code a new class manually. Simply describe the rules\nin XML file and use Text_Highlighter_Generator to create\na new class." + }, + { + "name": "league/html-to-markdown", + "version": "4.4.1", + "version_normalized": "4.4.1.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/html-to-markdown.git", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/82ea375b5b2b1da1da222644c0565c695bf88186", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xml": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "time": "2017-03-16T00:45:59+00:00", + "bin": [ + "bin/html-to-markdown" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "description": "An HTML-to-markdown conversion helper for PHP", + "homepage": "https://github.com/thephpleague/html-to-markdown", + "keywords": [ + "html", + "markdown" + ] } ] diff --git a/vendor/league/html-to-markdown/CHANGELOG.md b/vendor/league/html-to-markdown/CHANGELOG.md new file mode 100644 index 000000000..067864412 --- /dev/null +++ b/vendor/league/html-to-markdown/CHANGELOG.md @@ -0,0 +1,214 @@ +# Change Log +All notable changes to this project will be documented in this file. +Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles. + +## [Unreleased][unreleased] + +## [4.4.1] + +### Fixed + - Fixed autolinking of invalid URLs (#129) + +## [4.4.0] + +### Added + - Added `hard_break` configuration option (#112, #115) + - The `HtmlConverter` can now be instantiated with an `Environment` (#118) + +### Fixed + - Fixed handling of paragraphs in list item elements (#47, #110) + - Fixed phantom spaces when newlines follow `br` elements (#116, #117) + - Fixed link converter not sanitizing inner spaces properly (#119, #120) + +## [4.3.1] +### Changed + - Revised the sanitization implementation (#109) + +### Fixed + - Fixed tag-like content not being escaped (#67, #109) + - Fixed thematic break-like content not being escaped (#65, #109) + - Fixed codefence-like content not being escaped (#64, #109) + +## [4.3.0] +### Added + - Added full support for PHP 7.0 and 7.1 + +### Changed + - Changed `` and `` conversions to use backticks instead of indendation (#102) + +### Fixed + - Fixed issue where specified code language was not preserved (#70, #102) + - Fixed issue where `` tags nested in `` was not converted properly (#70, #102) + - Fixed header-like content not being escaped (#76, #105) + - Fixed blockquote-like content not being escaped (#77, #103) + - Fixed ordered list-like content not being escaped (#73, #106) + - Fixed unordered list-like content not being escaped (#71, #107) + +## [4.2.2] +### Fixed + - Fixed sanitization bug which sometimes removes desired content (#63, #101) + +## [4.2.1] +### Fixed + - Fixed path to autoload.php when used as a library (#98) + - Fixed edge case for tags containing only whitespace (#99) + +### Removed + - Removed double HTML entity decoding, as this is not desireable (#60) + +## [4.2.0] + +### Added + - Added the ability to invoke HtmlConverter objects as functions (#85) + +### Fixed + - Fixed improper handling of nested list items (#19 and #84) + - Fixed preceeding or trailing spaces within emphasis tags (#83) + +## [4.1.1] + +### Fixed + - Fixed conversion of empty paragraphs (#78) + - Fixed `preg_replace` so it wouldn't break UTF-8 characters (#79) + +## [4.1.0] + +### Added + - Added `bin/html-to-markdown` script + +### Changed + - Changed default italic character to `_` (#58) + +## [4.0.1] + +### Fixed + - Added escaping to avoid * and _ in a text being rendered as emphasis (#48) + +### Removed + - Removed the demo (#51) + - `.styleci.yml` and `CONTRIBUTING.md` are no longer included in distributions (#50) + +## [4.0.0] + +This release changes the visibility of several methods/properties. #42 and #43 brought to light that some visiblities were +not ideally set, so this releases fixes that. Moving forwards this should reduce the chance of introducing BC-breaking changes. + +### Added + - Added new `HtmlConverter::getEnvironment()` method to expose the `Environment` (#42, #43) + +### Changed + - Changed `Environment::addConverter()` from `protected` to `public`, enabling custom converters to be added (#42, #43) + - Changed `HtmlConverter::createDOMDocument()` from `protected` to `private` + - Changed `Element::nextCached` from `protected` to `private` + - Made the `Environment` class `final` + +## [3.1.1] +### Fixed + - Empty HTML strings now result in empty Markdown documents (#40, #41) + +## [3.1.0] +### Added + - Added new `equals` method to `Element` to check for equality + +### Changes + - Use Linux line endings consistently instead of plaform-specific line endings (#36) + +### Fixed + - Cleaned up code style + +## [3.0.0] +### Changed + - Changed namespace to `League\HTMLToMarkdown` + - Changed packagist name to `league/html-to-markdown` + - Re-organized code into several separate classes + - `` tags with identical href and inner text are now rendered using angular bracket syntax (#31) + - `` elements are now treated as block-level elements (#33) + +## [2.2.2] +### Added + - Added support for PHP 5.6 and HHVM + - Enabled testing against PHP 7 nightlies + - Added this CHANGELOG.md + +### Fixed + - Fixed whitespace preservation between inline elements (#9 and #10) + +## [2.2.1] +### Fixed + - Preserve placeholder links (#22) + +## [2.2.0] +### Added + - Added CircleCI config + +### Changed + - `` blocks are now treated as code elements + +### Removed + - Dropped support for PHP 5.2 + - Removed incorrect README comment regarding `#text` nodes (#17) + +## [2.1.2] +### Added + - Added the ability to blacklist/remove specific node types (#11) + +### Changed + - Line breaks are now placed after divs instead of before them + - Newlines inside of link texts are now removed + - Updated the minimum PHPUnit version to 4.* + +## [2.1.1] +### Added + - Added options to customize emphasis characters + +## [2.1.0] +### Added + - Added option to strip HTML tags without Markdown equivalents + - Added `convert()` method for converter reuse + - Added ability to set options after instance construction + - Documented the required PHP extensions (#4) + +### Changed + - ATX style now used for h1 and h2 tags inside blockquotes + +### Fixed + - Newlines inside blockquotes are now started with a bracket + - Fixed some incorrect docblocks + - `__toString()` now returns an empty string if input is empty + - Convert head tag if body tag is empty (#7) + - Preserve special characters inside tags without md equivalents (#6) + + +## [2.0.1] +### Fixed + - Fixed first line indentation for multi-line code blocks + - Fixed consecutive anchors get separating spaces stripped (#3) + +## [2.0.0] +### Added + - Initial release + +[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.4.1...master +[4.4.1]: https://github.com/thephpleague/html-to-markdown/compare/4.4.0...4.4.1 +[4.4.0]: https://github.com/thephpleague/html-to-markdown/compare/4.3.1...4.4.0 +[4.3.1]: https://github.com/thephpleague/html-to-markdown/compare/4.3.0...4.3.1 +[4.3.0]: https://github.com/thephpleague/html-to-markdown/compare/4.2.2...4.3.0 +[4.2.2]: https://github.com/thephpleague/html-to-markdown/compare/4.2.1...4.2.2 +[4.2.1]: https://github.com/thephpleague/html-to-markdown/compare/4.2.0...4.2.1 +[4.2.0]: https://github.com/thephpleague/html-to-markdown/compare/4.1.1...4.2.0 +[4.1.1]: https://github.com/thephpleague/html-to-markdown/compare/4.1.0...4.1.1 +[4.1.0]: https://github.com/thephpleague/html-to-markdown/compare/4.0.1...4.1.0 +[4.0.1]: https://github.com/thephpleague/html-to-markdown/compare/4.0.0...4.0.1 +[4.0.0]: https://github.com/thephpleague/html-to-markdown/compare/3.1.1...4.0.0 +[3.1.1]: https://github.com/thephpleague/html-to-markdown/compare/3.1.0...3.1.1 +[3.1.0]: https://github.com/thephpleague/html-to-markdown/compare/3.0.0...3.1.0 +[3.0.0]: https://github.com/thephpleague/html-to-markdown/compare/2.2.2...3.0.0 +[2.2.2]: https://github.com/thephpleague/html-to-markdown/compare/2.2.1...2.2.2 +[2.2.1]: https://github.com/thephpleague/html-to-markdown/compare/2.2.0...2.2.1 +[2.2.0]: https://github.com/thephpleague/html-to-markdown/compare/2.1.2...2.2.0 +[2.1.2]: https://github.com/thephpleague/html-to-markdown/compare/2.1.1...2.1.2 +[2.1.1]: https://github.com/thephpleague/html-to-markdown/compare/2.1.0...2.1.1 +[2.1.0]: https://github.com/thephpleague/html-to-markdown/compare/2.0.1...2.1.0 +[2.0.1]: https://github.com/thephpleague/html-to-markdown/compare/2.0.0...2.0.1 +[2.0.0]: https://github.com/thephpleague/html-to-markdown/compare/775f91e...2.0.0 + diff --git a/vendor/league/html-to-markdown/CONDUCT.md b/vendor/league/html-to-markdown/CONDUCT.md new file mode 100644 index 000000000..01b8644f1 --- /dev/null +++ b/vendor/league/html-to-markdown/CONDUCT.md @@ -0,0 +1,22 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) diff --git a/library/html-to-markdown/LICENSE b/vendor/league/html-to-markdown/LICENSE similarity index 93% rename from library/html-to-markdown/LICENSE rename to vendor/league/html-to-markdown/LICENSE index f538c2ac9..6c04a59dd 100644 --- a/library/html-to-markdown/LICENSE +++ b/vendor/league/html-to-markdown/LICENSE @@ -1,6 +1,8 @@ The MIT License (MIT) -Copyright (c) 2013 Nick Cernis +Copyright (c) 2015 Colin O'Dell + +Originally created by Nick Cernis Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/vendor/league/html-to-markdown/README.md b/vendor/league/html-to-markdown/README.md new file mode 100644 index 000000000..8d75649d6 --- /dev/null +++ b/vendor/league/html-to-markdown/README.md @@ -0,0 +1,196 @@ +HTML To Markdown for PHP +======================== + +[](https://gitter.im/thephpleague/html-to-markdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +[](https://packagist.org/packages/league/html-to-markdown) +[](LICENSE) +[](https://travis-ci.org/thephpleague/html-to-markdown) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown/code-structure) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown) +[](https://packagist.org/packages/league/html-to-markdown) + +Library which converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. + + +**Requires**: PHP 5.3+ + +**Lead Developer**: [@colinodell](http://twitter.com/colinodell) + +**Original Author**: [@nickcernis](http://twitter.com/nickcernis) + + +### Why convert HTML to Markdown? + +*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](https://github.com/thephpleague/commonmark),"* you continue, already labouring the question somewhat, *"but why go the other way?"* + +Typically you would convert HTML to Markdown if: + +1. You have an existing HTML document that needs to be edited by people with good taste. +2. You want to store new content in HTML format but edit it as Markdown. +3. You want to convert HTML email to plain text email. +4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. +5. You just really like Markdown. + +### How to use it + +Require the library by issuing this command: + +```bash +composer require league/html-to-markdown +``` + +Add `require 'vendor/autoload.php';` to the top of your script. + +Next, create a new HtmlConverter instance, passing in your valid HTML code to its `convert()` function: + +```php +use League\HTMLToMarkdown\HtmlConverter; + +$converter = new HtmlConverter(); + +$html = "Quick, to the Batpoles!"; +$markdown = $converter->convert($html); +``` + +The `$markdown` variable now contains the Markdown version of your HTML as a string: + +```php +echo $markdown; // ==> ### Quick, to the Batpoles! +``` + +The included `demo` directory contains an HTML->Markdown conversion form to try out. + +### Conversion options + +By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. + +To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: + +```php +$converter = new HtmlConverter(array('strip_tags' => true)); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Or more explicitly, like this: + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('strip_tags', true); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Note that only the tags themselves are stripped, not the content they hold. + +To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: + +```php +$converter = new HtmlConverter(array('remove_nodes' => 'span div')); + +$html = 'Turnips!Monkeys!'; +$markdown = $converter->convert($html); // $markdown now contains "" +``` + +### Style options + +Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('italic_style', '_'); +$converter->getConfig()->setOption('bold_style', '__'); + +$html = 'Italic and a bold'; +$markdown = $converter->convert($html); // $markdown now contains "_Italic_ and a __bold__" +``` + +### Line break options + +By default, `br` tags are converted to two spaces followed by a newline character as per [traditional Markdown](https://daringfireball.net/projects/markdown/syntax#p). Set `hard_break` to `true` to omit the two spaces, as per GitHub Flavored Markdown (GFM). + +```php +$converter = new HtmlConverter(); +$html = 'testline break'; + +$converter->getConfig()->setOption('hard_break', true); +$markdown = $converter->convert($html); // $markdown now contains "test\nline break" + +$converter->getConfig()->setOption('hard_break', false); // default +$markdown = $converter->convert($html); // $markdown now contains "test \nline break" +``` + +### Passing custom Environment object + +You can pass current `Environment` object to customize i.e. which converters should be used. + +```php +$environment = new Environment(array( + // your configuration here +)); +$environment->addConverter(new HeaderConverter()); // optionally - add converter manually + +$converter = new HtmlConverter($environment); + +$html = 'Header + +'; +$markdown = $converter->convert($html); // $markdown now contains "### Header" and "" +``` + +### Limitations + +- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. + +### Known issues + +- Nested lists and lists containing multiple paragraphs aren't converted correctly. +- Lists inside blockquotes aren't converted correctly. +- Any reported [open issues here](https://github.com/thephpleague/html-to-markdown/issues?state=open). + +[Report your issue or request a feature here.](https://github.com/thephpleague/html-to-markdown/issues/new) Issues with patches or failing tests are especially welcome. + +### Style notes + +- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: + + `$converter = new HtmlConverter(array('header_style'=>'atx'));` + + Headers of H3 priority and lower always use atx style. + +- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. +- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. + +### Dependencies + +HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. + +Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. + +### Contributors + +Many thanks to all [contributors](https://github.com/thephpleague/html-to-markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. + +### How it works + +HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. + +### To-do + +- Support for nested lists and lists inside blockquotes. +- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). + +### Trying to convert Markdown to HTML? + +Use one of these great libraries: + + - [league/commonmark](https://github.com/thephpleague/commonmark) (recommended) + - [cebe/markdown](https://github.com/cebe/markdown) + - [PHP Markdown](https://michelf.ca/projects/php-markdown/) + - [Parsedown](https://github.com/erusev/parsedown) + +No guarantees about the Elvish, though. + diff --git a/vendor/league/html-to-markdown/bin/html-to-markdown b/vendor/league/html-to-markdown/bin/html-to-markdown new file mode 100644 index 000000000..2815a7cef --- /dev/null +++ b/vendor/league/html-to-markdown/bin/html-to-markdown @@ -0,0 +1,108 @@ +#!/usr/bin/env php + $arg) { + if ($i === 0) { + continue; + } + + if (substr($arg, 0, 1) === '-') { + switch ($arg) { + case '-h': + case '--help': + echo getHelpText(); + exit(0); + default: + fail('Unknown option: ' . $arg); + } + } else { + $src = $argv[1]; + } +} + +if (isset($src)) { + if (!file_exists($src)) { + fail('File not found: ' . $src); + } + + $html = file_get_contents($src); +} else { + $stdin = fopen('php://stdin', 'r'); + stream_set_blocking($stdin, false); + $html = stream_get_contents($stdin); + fclose($stdin); + + if (empty($html)) { + fail(getHelpText()); + } +} + + +$converter = new League\HTMLToMarkdown\HtmlConverter(); +echo $converter->convert($html); + +/** + * Get help and usage info + * + * @return string + */ +function getHelpText() +{ + return << output.md + + Converting from STDIN: + + echo -e 'Hello World!' | html-to-markdown + + Converting from STDIN and saving the output: + + echo -e 'Hello World!' | html-to-markdown > output.md + +HELP; +} + +/** + * @param string $message Error message + */ +function fail($message) +{ + fwrite(STDERR, $message . "\n"); + exit(1); +} + +function requireAutoloader() +{ + $autoloadPaths = array( + // Local package usage + __DIR__ . '/../vendor/autoload.php', + // Package was included as a library + __DIR__ . '/../../../autoload.php', + ); + foreach ($autoloadPaths as $path) { + if (file_exists($path)) { + require_once $path; + break; + } + } +} diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json new file mode 100644 index 000000000..58764bcb5 --- /dev/null +++ b/vendor/league/html-to-markdown/composer.json @@ -0,0 +1,48 @@ +{ + "name": "league/html-to-markdown", + "type": "library", + "description": "An HTML-to-markdown conversion helper for PHP", + "keywords": ["markdown", "html"], + "homepage": "https://github.com/thephpleague/html-to-markdown", + "license": "MIT", + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "League\\HTMLToMarkdown\\Test\\": "tests" + } + }, + "require": { + "php": ">=5.3.3", + "ext-dom": "*", + "ext-xml": "*" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "bin": ["bin/html-to-markdown"], + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + } +} diff --git a/vendor/league/html-to-markdown/src/Configuration.php b/vendor/league/html-to-markdown/src/Configuration.php new file mode 100644 index 000000000..2943383aa --- /dev/null +++ b/vendor/league/html-to-markdown/src/Configuration.php @@ -0,0 +1,60 @@ +config = $config; + } + + /** + * @param array $config + */ + public function merge(array $config = array()) + { + $this->config = array_replace_recursive($this->config, $config); + } + + /** + * @param array $config + */ + public function replace(array $config = array()) + { + $this->config = $config; + } + + /** + * @param string $key + * @param mixed $value + */ + public function setOption($key, $value) + { + $this->config[$key] = $value; + } + + /** + * @param string|null $key + * @param mixed|null $default + * + * @return mixed|null + */ + public function getOption($key = null, $default = null) + { + if ($key === null) { + return $this->config; + } + + if (!isset($this->config[$key])) { + return $default; + } + + return $this->config[$key]; + } +} diff --git a/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php new file mode 100644 index 000000000..8aca530be --- /dev/null +++ b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php @@ -0,0 +1,11 @@ +' symbols to each line. + + $markdown = ''; + + $quote_content = trim($element->getValue()); + + $lines = preg_split('/\r\n|\r|\n/', $quote_content); + + $total_lines = count($lines); + + foreach ($lines as $i => $line) { + $markdown .= '> ' . $line . "\n"; + if ($i + 1 === $total_lines) { + $markdown .= "\n"; + } + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('blockquote'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php new file mode 100644 index 000000000..c8ec2c005 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php @@ -0,0 +1,62 @@ +getAttribute('class'); + + if ($classes) { + // Since tags can have more than one class, we need to find the one that starts with 'language-' + $classes = explode(' ', $classes); + foreach ($classes as $class) { + if (strpos($class, 'language-') !== false) { + // Found one, save it as the selected language and stop looping over the classes. + // The space after the language avoids gluing the actual code with the language tag + $language = str_replace('language-', '', $class) . ' '; + break; + } + } + } + + $markdown = ''; + $code = html_entity_decode($element->getChildrenAsString()); + + // In order to remove the code tags we need to search for them and, in the case of the opening tag + // use a regular expression to find the tag and the other attributes it might have + $code = preg_replace('/]*>/', '', $code); + $code = str_replace('', '', $code); + + // Checking if the code has multiple lines + $lines = preg_split('/\r\n|\r|\n/', $code); + if (count($lines) > 1) { + // Multiple lines detected, adding three backticks and newlines + $markdown .= '```' . $language . "\n" . $code . "\n" . '```'; + } else { + // One line of code, wrapping it on one backtick. + $markdown .= '`' . $language . $code . '`'; + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('code'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CommentConverter.php b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php new file mode 100644 index 000000000..55038b254 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php @@ -0,0 +1,26 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, + // such as nodes on their own. C14N() canonicalizes the node to a string. + // See: http://www.php.net/manual/en/domnode.c14n.php + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue(); + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array(self::DEFAULT_CONVERTER); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/DivConverter.php b/vendor/league/html-to-markdown/src/Converter/DivConverter.php new file mode 100644 index 000000000..656a0ba4d --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/DivConverter.php @@ -0,0 +1,45 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue() . "\n\n"; + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('div'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php new file mode 100644 index 000000000..67250769b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php @@ -0,0 +1,57 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $tag = $element->getTagName(); + $value = $element->getValue(); + + if (!trim($value)) { + return ''; + } + + if ($tag === 'i' || $tag === 'em') { + $style = $this->config->getOption('italic_style'); + } else { + $style = $this->config->getOption('bold_style'); + } + + $prefix = ltrim($value) !== $value ? ' ' : ''; + $suffix = rtrim($value) !== $value ? ' ' : ''; + + return $prefix . $style . trim($value) . $style . $suffix; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('em', 'i', 'strong', 'b'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php new file mode 100644 index 000000000..37cd44e73 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php @@ -0,0 +1,41 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + return $this->config->getOption('hard_break') ? "\n" : " \n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('br'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php new file mode 100644 index 000000000..d117e7d36 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php @@ -0,0 +1,78 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $level = (int) substr($element->getTagName(), 1, 1); + $style = $this->config->getOption('header_style', self::STYLE_SETEXT); + + if (($level === 1 || $level === 2) && !$element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) { + return $this->createSetextHeader($level, $element->getValue()); + } + + return $this->createAtxHeader($level, $element->getValue()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'); + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createSetextHeader($level, $content) + { + $length = function_exists('mb_strlen') ? mb_strlen($content, 'utf-8') : strlen($content); + $underline = ($level === 1) ? '=' : '-'; + + return $content . "\n" . str_repeat($underline, $length) . "\n\n"; + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createAtxHeader($level, $content) + { + $prefix = str_repeat('#', $level) . ' '; + + return $prefix . $content . "\n\n"; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php new file mode 100644 index 000000000..8f54f9397 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php @@ -0,0 +1,26 @@ +getAttribute('src'); + $alt = $element->getAttribute('alt'); + $title = $element->getAttribute('title'); + + if ($title !== '') { + // No newlines added. should be in a block-level element. + return ''; + } + + return ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('img'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php new file mode 100644 index 000000000..f0765f38b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php @@ -0,0 +1,52 @@ +getAttribute('href'); + $title = $element->getAttribute('title'); + $text = trim($element->getValue()); + + if ($title !== '') { + $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; + } elseif ($href === $text && $this->isValidAutolink($href)) { + $markdown = '<' . $href . '>'; + } else { + $markdown = '[' . $text . '](' . $href . ')'; + } + + if (!$href) { + $markdown = html_entity_decode($element->getChildrenAsString()); + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('a'); + } + + /** + * @param string $href + * + * @return bool + */ + private function isValidAutolink($href) + { + return preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php new file mode 100644 index 000000000..07a4c85a9 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php @@ -0,0 +1,26 @@ +getValue() . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('ol', 'ul'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php new file mode 100644 index 000000000..dafec077c --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php @@ -0,0 +1,47 @@ +getParent()->getTagName(); + + // Add spaces to start for nested list items + $level = $element->getListItemLevel($element); + + $prefixForParagraph = str_repeat(' ', $level + 1); + $value = trim(implode("\n" . $prefixForParagraph, explode("\n", trim($element->getValue())))); + + // If list item is the first in a nested list, add a newline before it + $prefix = ''; + if ($level > 0 && $element->getSiblingPosition() === 1) { + $prefix = "\n"; + } + + if ($list_type === 'ul') { + return $prefix . '- ' . $value . "\n"; + } + + $number = $element->getSiblingPosition(); + + return $prefix . $number . '. ' . $value . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('li'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php new file mode 100644 index 000000000..cf852bfcf --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php @@ -0,0 +1,124 @@ +getValue(); + + $markdown = ''; + + $lines = preg_split('/\r\n|\r|\n/', $value); + foreach ($lines as $line) { + /* + * Some special characters need to be escaped based on the position that they appear + * The following function will deal with those special cases. + */ + $markdown .= $this->escapeSpecialCharacters($line); + $markdown .= "\n"; + } + + return trim($markdown) !== '' ? rtrim($markdown) . "\n\n" : ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('p'); + } + + /** + * @param string $line + * + * @return string + */ + private function escapeSpecialCharacters($line) + { + $line = $this->escapeFirstCharacters($line); + $line = $this->escapeOtherCharacters($line); + $line = $this->escapeOtherCharactersRegex($line); + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeFirstCharacters($line) + { + $escapable = array( + '>', + '- ', + '+ ', + '--', + '~~~', + '---', + '- - -' + ); + + foreach ($escapable as $i) { + if (strpos(ltrim($line), $i) === 0) { + // Found a character that must be escaped, adding a backslash before + return '\\' . ltrim($line); + } + } + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeOtherCharacters($line) + { + $escapable = array( + ' {{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache_duration}} diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl index a8243b614..e65014413 100644 --- a/view/templates/admin_summary.tpl +++ b/view/templates/admin_summary.tpl @@ -11,7 +11,7 @@ {{$queues.label}} - {{$queues.deliverq}} - {{$queues.queue}} - {{$queues.workerq}} + {{$queues.queue}} - {{$queues.workerq}} {{$pending.0}} diff --git a/view/templates/head.tpl b/view/templates/head.tpl index 0772af0bc..e7df8a18c 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -7,7 +7,7 @@ - + @@ -19,6 +19,7 @@ +
blocks to Markdown - that should stay as HTML - if (self::is_child_of(array('pre', 'code'), $node)) - return; - - // If the node has children, convert those to Markdown first - if ($node->hasChildNodes()) { - $length = $node->childNodes->length; - - for ($i = 0; $i < $length; $i++) { - $child = $node->childNodes->item($i); - $this->convert_children($child); - } - } - - // Now that child nodes have been converted, convert the original node - $markdown = $this->convert_to_markdown($node); - - // Create a DOM text node containing the Markdown equivalent of the original node - $markdown_node = $this->document->createTextNode($markdown); - - // Replace the old $node e.g. "Title" with the new $markdown_node e.g. "### Title" - $node->parentNode->replaceChild($markdown_node, $node); - } - - - /** - * Get Markdown - * - * Sends the body node to convert_children() to change inner nodes to Markdown #text nodes, then saves and - * returns the resulting converted document as a string in Markdown format. - * - * @return string|boolean The converted HTML as Markdown, or false if conversion failed - */ - private function get_markdown() - { - // Work on the entire DOM tree (including head and body) - $input = $this->document->getElementsByTagName("html")->item(0); - - if (!$input) - return false; - - // Convert all children of this root element. The DOMDocument stored in $this->doc will - // then consist of #text nodes, each containing a Markdown version of the original node - // that it replaced. - $this->convert_children($input); - - // Sanitize and return the body contents as a string. - $markdown = $this->document->saveHTML(); // stores the DOMDocument as a string - $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8'); - $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8'); // Double decode to cover cases like http://www.php.net/manual/en/function.htmlentities.php#99984 - $markdown = preg_replace("/]+>/", "", $markdown); // Strip doctype declaration - $unwanted = array('', '', '', '', '', '', '', ' '); - $markdown = str_replace($unwanted, '', $markdown); // Strip unwanted tags - $markdown = trim($markdown, "\n\r\0\x0B"); - - $this->output = $markdown; - - return $markdown; - } - - - /** - * Convert to Markdown - * - * Converts an individual node into a #text node containing a string of its Markdown equivalent. - * - * Example: An node with text content of "Title" becomes a text node with content of "### Title" - * - * @param $node - * @return string The converted HTML as Markdown - */ - private function convert_to_markdown($node) - { - $tag = $node->nodeName; // the type of element, e.g. h1 - $value = $node->nodeValue; // the value of that element, e.g. The Title - - // Strip nodes named in remove_nodes - $tags_to_remove = explode(' ', $this->options['remove_nodes']); - if ( in_array($tag, $tags_to_remove) ) - return false; - - switch ($tag) { - case "p": - $markdown = (trim($value)) ? rtrim($value) . PHP_EOL . PHP_EOL : ''; - break; - case "pre": - $markdown = PHP_EOL . $this->convert_code($node) . PHP_EOL; - break; - case "h1": - case "h2": - $markdown = $this->convert_header($tag, $node); - break; - case "h3": - $markdown = "### " . $value . PHP_EOL . PHP_EOL; - break; - case "h4": - $markdown = "#### " . $value . PHP_EOL . PHP_EOL; - break; - case "h5": - $markdown = "##### " . $value . PHP_EOL . PHP_EOL; - break; - case "h6": - $markdown = "###### " . $value . PHP_EOL . PHP_EOL; - break; - case "em": - case "i": - case "strong": - case "b": - $markdown = $this->convert_emphasis($tag, $value); - break; - case "hr": - $markdown = "- - - - - -" . PHP_EOL . PHP_EOL; - break; - case "br": - $markdown = " " . PHP_EOL; - break; - case "blockquote": - $markdown = $this->convert_blockquote($node); - break; - case "code": - $markdown = $this->convert_code($node); - break; - case "ol": - case "ul": - $markdown = $value . PHP_EOL; - break; - case "li": - $markdown = $this->convert_list($node); - break; - case "img": - $markdown = $this->convert_image($node); - break; - case "a": - $markdown = $this->convert_anchor($node); - break; - case "#text": - $markdown = preg_replace('~\s+~', ' ', $value); - $markdown = preg_replace('~^#~', '\\\\#', $markdown); - break; - case "#comment": - $markdown = ''; - break; - case "div": - $markdown = ($this->options['strip_tags']) ? $value . PHP_EOL . PHP_EOL : html_entity_decode($node->C14N()); - break; - default: - // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, - // such as nodes on their own. C14N() canonicalizes the node to a string. - // See: http://www.php.net/manual/en/domnode.c14n.php - $markdown = ($this->options['strip_tags']) ? $value : html_entity_decode($node->C14N()); - } - - return $markdown; - } - - - /** - * Convert Header - * - * Converts h1 and h2 headers to Markdown-style headers in setext style, - * matching the number of underscores with the length of the title. - * - * e.g. Header 1 Header Two - * ======== ---------- - * - * Returns atx headers instead if $this->options['header_style'] is "atx" - * - * e.g. # Header 1 ## Header Two - * - * @param string $level The header level, including the "h". e.g. h1 - * @param string $node The node to convert. - * @return string The Markdown version of the header. - */ - private function convert_header($level, $node) - { - $content = $node->nodeValue; - - if (!$this->is_child_of('blockquote', $node) && $this->options['header_style'] == "setext") { - $length = (function_exists('mb_strlen')) ? mb_strlen($content, 'utf-8') : strlen($content); - $underline = ($level == "h1") ? "=" : "-"; - $markdown = $content . PHP_EOL . str_repeat($underline, $length) . PHP_EOL . PHP_EOL; // setext style - } else { - $prefix = ($level == "h1") ? "# " : "## "; - $markdown = $prefix . $content . PHP_EOL . PHP_EOL; // atx style - } - - return $markdown; - } - - - /** - * Converts inline styles - * This function is used to render strong and em tags - * - * eg bold text becomes **bold text** or __bold text__ - * - * @param string $tag - * @param string $value - * @return string - */ - private function convert_emphasis($tag, $value) - { - if ($tag == 'i' || $tag == 'em') { - $markdown = $this->options['italic_style'] . $value . $this->options['italic_style']; - } else { - $markdown = $this->options['bold_style'] . $value . $this->options['bold_style']; - } - - return $markdown; - } - - - /** - * Convert Image - * - * Converts tags to Markdown. - * - * e.g. - * becomes  - * - * @param $node - * @return string - */ - private function convert_image($node) - { - $src = $node->getAttribute('src'); - $alt = $node->getAttribute('alt'); - $title = $node->getAttribute('title'); - - if ($title != "") { - $markdown = ''; // No newlines added. should be in a block-level element. - } else { - $markdown = ''; - } - - return $markdown; - } - - - /** - * Convert Anchor - * - * Converts tags to Markdown. - * - * e.g. Modern Nerd - * becomes [Modern Nerd](http://modernnerd.net "Title") - * - * @param $node - * @return string - */ - private function convert_anchor($node) - { - $href = $node->getAttribute('href'); - $title = $node->getAttribute('title'); - $text = $node->nodeValue; - - if ($title != "") { - $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; - } else { - $markdown = '[' . $text . '](' . $href . ')'; - } - - if (! $href) - $markdown = html_entity_decode($node->C14N()); - - // Append a space if the node after this one is also an anchor - $next_node_name = $this->get_next_node_name($node); - - if ($next_node_name == 'a') - $markdown = $markdown . ' '; - - return $markdown; - } - - - /** - * Convert List - * - * Converts and lists to Markdown. - * - * @param $node - * @return string - */ - private function convert_list($node) - { - // If parent is an ol, use numbers, otherwise, use dashes - $list_type = $node->parentNode->nodeName; - $value = $node->nodeValue; - - if ($list_type == "ul") { - $markdown = "- " . trim($value) . PHP_EOL; - } else { - $number = $this->get_position($node); - $markdown = $number . ". " . trim($value) . PHP_EOL; - } - - return $markdown; - } - - - /** - * Convert Code - * - * Convert code tags by indenting blocks of code and wrapping single lines in backticks. - * - * @param DOMNode $node - * @return string - */ - private function convert_code($node) - { - // Store the content of the code block in an array, one entry for each line - - $markdown = ''; - - $code_content = html_entity_decode($node->C14N()); - $code_content = str_replace(array("", ""), "", $code_content); - $code_content = str_replace(array("", ""), "", $code_content); - - $lines = preg_split('/\r\n|\r|\n/', $code_content); - $total = count($lines); - - // If there's more than one line of code, prepend each line with four spaces and no backticks. - if ($total > 1 || $node->nodeName === 'pre') { - - // Remove the first and last line if they're empty - $first_line = trim($lines[0]); - $last_line = trim($lines[$total - 1]); - $first_line = trim($first_line, " "); //trim XML style carriage returns too - $last_line = trim($last_line, " "); - - if (empty($first_line)) - array_shift($lines); - - if (empty($last_line)) - array_pop($lines); - - $count = 1; - foreach ($lines as $line) { - $line = str_replace(' ', '', $line); - $markdown .= " " . $line; - // Add newlines, except final line of the code - if ($count != $total) - $markdown .= PHP_EOL; - $count++; - } - $markdown .= PHP_EOL; - - } else { // There's only one line of code. It's a code span, not a block. Just wrap it with backticks. - - $markdown .= "`" . $lines[0] . "`"; - - } - - return $markdown; - } - - - /** - * Convert blockquote - * - * Prepend blockquotes with > chars. - * - * @param $node - * @return string - */ - private function convert_blockquote($node) - { - // Contents should have already been converted to Markdown by this point, - // so we just need to add ">" symbols to each line. - - $markdown = ''; - - $quote_content = trim($node->nodeValue); - - $lines = preg_split('/\r\n|\r|\n/', $quote_content); - - $total_lines = count($lines); - - foreach ($lines as $i => $line) { - $markdown .= "> " . $line . PHP_EOL; - if ($i + 1 == $total_lines) - $markdown .= PHP_EOL; - } - - return $markdown; - } - - - /** - * Get Position - * - * Returns the numbered position of a node inside its parent - * - * @param $node - * @return int The numbered position of the node, starting at 1. - */ - private function get_position($node) - { - // Get all of the nodes inside the parent - $list_nodes = $node->parentNode->childNodes; - $total_nodes = $list_nodes->length; - - $position = 1; - - // Loop through all nodes and find the given $node - for ($a = 0; $a < $total_nodes; $a++) { - $current_node = $list_nodes->item($a); - - if ($current_node->isSameNode($node)) - $position = $a + 1; - } - - return $position; - } - - - /** - * Get Next Node Name - * - * Return the name of the node immediately after the passed one. - * - * @param $node - * @return string|null The node name (e.g. 'h1') or null. - */ - private function get_next_node_name($node) - { - $next_node_name = null; - - $current_position = $this->get_position($node); - $next_node = $node->parentNode->childNodes->item($current_position); - - if ($next_node) - $next_node_name = $next_node->nodeName; - - return $next_node_name; - } - - - /** - * To String - * - * Magic method to return Markdown output when HTML_To_Markdown instance is treated as a string. - * - * @return string - */ - public function __toString() - { - return $this->output(); - } - - - /** - * Output - * - * Getter for the converted Markdown contents stored in $this->output - * - * @return string - */ - public function output() - { - if (!$this->output) { - return ''; - } else { - return $this->output; - } - } -} diff --git a/library/html-to-markdown/README.md b/library/html-to-markdown/README.md deleted file mode 100644 index de91c9d08..000000000 --- a/library/html-to-markdown/README.md +++ /dev/null @@ -1,138 +0,0 @@ -HTML To Markdown for PHP -======================== - -A helper class that converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. - -[](https://travis-ci.org/nickcernis/html-to-markdown) - -**Version**: 2.2.1 -**Requires**: PHP 5.3+ -**Author**: [@nickcernis](http://twitter.com/nickcernis) -**License**: [MIT](http://www.opensource.org/licenses/mit-license.php) - -### Why convert HTML to Markdown? - -*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](http://michelf.com/projects/php-markdown/),"* you continue, already labouring the question somewhat, *"but why go the other way?"* - -Typically you would convert HTML to Markdown if: - -1. You have an existing HTML document that needs to be edited by people with good taste. -2. You want to store new content in HTML format but edit it as Markdown. -3. You want to convert HTML email to plain text email. -4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. -5. You just really like Markdown. - -### How to use it - -Either include HTML_To_Markdown.php directly: - - require_once( dirname( __FILE__) . '/HTML_To_Markdown.php' ); - -Or, require the library in your composer.json: - - { - "require": { - "nickcernis/html-to-markdown": "dev-master" - } - } - -Then `composer install` and add `require 'vendor/autoload.php';` to the top of your script. - -Next, create a new HTML_To_Markdown instance, passing in your valid HTML code: - - $html = "Quick, to the Batpoles!"; - $markdown = new HTML_To_Markdown($html); - -The `$markdown` object now contains the Markdown version of your HTML. Use it like a string: - - echo $markdown; // ==> ### Quick, to the Batpoles! - -Or access the Markdown output directly: - - $string = $markdown->output(); - -The included `demo` directory contains an HTML->Markdown conversion form to try out. - -### Conversion options - -By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. - -To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: - - $html = 'Turnips!'; - $markdown = new HTML_To_Markdown($html, array('strip_tags' => true)); // $markdown now contains "Turnips!" - -Or more explicitly, like this: - - $html = 'Turnips!'; - $markdown = new HTML_To_Markdown(); - $markdown->set_option('strip_tags', true); - $markdown->convert($html); // $markdown now contains "Turnips!" - -Note that only the tags themselves are stripped, not the content they hold. - -To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: - - $html = 'Turnips!Monkeys!'; - $markdown = new HTML_To_Markdown($html, array('remove_nodes' => 'span div')); // $markdown now contains "" - -### Style options - -Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. - - $html = 'Italic and a bold'; - $markdown = new HTML_To_Markdown(); - $markdown->set_option('italic_style', '_'); - $markdown->set_option('bold_style', '__'); - $markdown->convert($html); // $markdown now contains "_Italic_ and a __bold__" - -### Limitations - -- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. - -### Known issues - -- Nested lists and lists containing multiple paragraphs aren't converted correctly. -- Lists inside blockquotes aren't converted correctly. -- Any reported [open issues here](https://github.com/nickcernis/html-to-markdown/issues?state=open). - -[Report your issue or request a feature here.](https://github.com/nickcernis/html2markdown/issues/new) Issues with patches or failing tests are especially welcome. - -### Style notes - -- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: - - `$markdown = new HTML_To_Markdown( $html, array('header_style'=>'atx') );` - - Headers of H3 priority and lower always use atx style. - -- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. -- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. - -### Dependencies - -HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. - -Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. - -### Architecture notes - -HTML To Markdown is a single file that uses native DOM manipulation libraries (DOMDocument), not regex voodoo, to convert code. - -### Contributors - -Many thanks to all [contributors](https://github.com/nickcernis/html2markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. - -### How it works - -HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. - -### To-do - -- Support for nested lists and lists inside blockquotes. -- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). - -### Trying to convert Markdown to HTML? - -Use [PHP Markdown](http://michelf.com/projects/php-markdown/) from Michel Fortin. No guarantees about the Elvish, though. - diff --git a/library/html-to-markdown/circle.yml b/library/html-to-markdown/circle.yml deleted file mode 100644 index 9893a4b92..000000000 --- a/library/html-to-markdown/circle.yml +++ /dev/null @@ -1,4 +0,0 @@ -test: - override: - - phpunit --no-configuration HTML_To_MarkdownTest ./tests/HTML_To_MarkdownTest.php - diff --git a/library/html-to-markdown/composer.json b/library/html-to-markdown/composer.json deleted file mode 100644 index beb7faab4..000000000 --- a/library/html-to-markdown/composer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "nickcernis/html-to-markdown", - "type": "library", - "description": "An HTML-to-markdown conversion helper for PHP", - "keywords": ["markdown", "html"], - "homepage": "https://github.com/nickcernis/html-to-markdown", - "license": "MIT", - "authors": [ - { - "name": "Nick Cernis", - "email": "nick@cern.is", - "homepage": "http://modernnerd.net" - } - ], - "autoload": { - "classmap": [ "HTML_To_Markdown.php" ] - }, - "require": { - "php": ">=5.3" - }, - "require-dev": { - "php": ">=5.3.3", - "phpunit/phpunit": "4.*" - } -} diff --git a/mod/acl.php b/mod/acl.php index 04aa9f50a..9220bc77a 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -1,7 +1,7 @@ = `last_failure` ORDER BY `version` ASC;', $p); $total = $total + $c[0]['total']; @@ -474,9 +475,6 @@ function admin_page_summary(App $a) { $r = qu("SELECT COUNT(`id`) AS `count` FROM `register`"); $pending = $r[0]['count']; - $r = qu("SELECT COUNT(*) AS `total` FROM `deliverq` WHERE 1"); - $deliverq = (($r) ? $r[0]['total'] : 0); - $r = qu("SELECT COUNT(*) AS `total` FROM `queue` WHERE 1"); $queue = (($r) ? $r[0]['total'] : 0); @@ -485,7 +483,7 @@ function admin_page_summary(App $a) { // We can do better, but this is a quick queue status - $queues = array('label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue, 'workerq' => $workerqueue); + $queues = array('label' => t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue); $t = get_markup_template("admin_summary.tpl"); @@ -655,7 +653,6 @@ function admin_page_site_post(App $a) { $force_ssl = ((x($_POST,'force_ssl')) ? True : False); $hide_help = ((x($_POST,'hide_help')) ? True : False); $suppress_tags = ((x($_POST,'suppress_tags')) ? True : False); - $use_fulltext_engine = ((x($_POST,'use_fulltext_engine')) ? True : False); $itemcache = ((x($_POST,'itemcache')) ? notags(trim($_POST['itemcache'])) : ''); $itemcache_duration = ((x($_POST,'itemcache_duration')) ? intval($_POST['itemcache_duration']) : 0); $max_comments = ((x($_POST,'max_comments')) ? intval($_POST['max_comments']) : 0); @@ -670,6 +667,12 @@ function admin_page_site_post(App $a) { $worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False); $worker_frontend = ((x($_POST,'worker_frontend')) ? True : False); + // Has the directory url changed? If yes, then resubmit the existing profiles there + if ($global_directory != Config::get('system', 'directory') AND ($global_directory != '')) { + Config::set('system', 'directory', $global_directory); + proc_run(PRIORITY_LOW, 'include/directory.php'); + } + if ($a->get_path() != "") { $diaspora_enabled = false; } @@ -773,7 +776,6 @@ function admin_page_site_post(App $a) { set_config('system', 'allowed_email', $allowed_email); set_config('system', 'block_public', $block_public); set_config('system', 'publish_all', $force_publish); - set_config('system', 'directory', $global_directory); set_config('system', 'thread_allow', $thread_allow); set_config('system', 'newuser_private', $newuser_private); set_config('system', 'enotify_no_content', $enotify_no_content); @@ -799,7 +801,6 @@ function admin_page_site_post(App $a) { set_config('system', 'force_ssl', $force_ssl); set_config('system', 'hide_help', $hide_help); - set_config('system', 'use_fulltext_engine', $use_fulltext_engine); set_config('system', 'itemcache', $itemcache); set_config('system', 'itemcache_duration', $itemcache_duration); set_config('system', 'max_comments', $max_comments); @@ -971,7 +972,7 @@ function admin_page_site(App $a) { '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$shortcut_icon' => array('shortcut_icon', t("Shortcut icon"), get_config('system','shortcut_icon'), t("Link to an icon that will be used for browsers.")), '$touch_icon' => array('touch_icon', t("Touch icon"), get_config('system','touch_icon'), t("Link to an icon that will be used for tablets and mobiles.")), - '$info' => array('info',t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), + '$info' => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile), @@ -1028,7 +1029,6 @@ function admin_page_site(App $a) { '$nodeinfo' => array('nodeinfo', t("Publish server information"), get_config('system','nodeinfo'), t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details.")), - '$use_fulltext_engine' => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")), '$suppress_tags' => array('suppress_tags', t("Suppress Tags"), get_config('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")), '$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), t("The item caches buffers generated bbcode and external images.")), '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")), @@ -2058,8 +2058,8 @@ function admin_page_features(App $a) { $set = $f[3]; } $arr[$fname][1][] = array( - 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('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'))) ); } } diff --git a/mod/cal.php b/mod/cal.php index f43a4e8a7..7398426bc 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -269,8 +269,8 @@ function cal_content(App $a) { '$tabs' => $tabs, '$title' => t('Events'), '$view' => t('View'), - '$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''), - '$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''), + '$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth", t('Previous'),'',''), + '$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth", t('Next'),'',''), '$calendar' => cal($y,$m,$links, ' eventcal'), '$events' => $events, diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 52b5eb9f9..f3875ed8e 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -872,7 +872,7 @@ function dfrn_request_content(App $a) { '$header' => t('Friend/Connection Request'), '$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'), '$pls_answer' => t('Please answer the following:'), - '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'),t('Yes'))), + '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'), t('Yes'))), /*'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']), '$yes' => t('Yes'), '$no' => t('No'), */ diff --git a/mod/follow.php b/mod/follow.php index 2b564c1bf..6e1f90694 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -110,7 +110,7 @@ function follow_content(App $a) { //'$photo' => proxy_url($ret["photo"], false, PROXY_SIZE_SMALL), '$desc' => "", '$pls_answer' => t('Please answer the following:'), - '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'),t('Yes'))), + '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'), t('Yes'))), '$add_note' => t('Add a personal note:'), '$page_desc' => "", '$friendica' => "", diff --git a/mod/hovercard.php b/mod/hovercard.php index ec749db20..65b03f2b9 100644 --- a/mod/hovercard.php +++ b/mod/hovercard.php @@ -75,7 +75,7 @@ function hovercard_content() { 'tags' => $contact["keywords"], // 'nsfw' => intval($contact["nsfw"]), // 'server_url' => $contact["server_url"], - 'bd' => (($contact["birthday"] == "0000-00-00") ? "" : $contact["birthday"]), + 'bd' => (($contact["birthday"] <= '0001-01-01') ? "" : $contact["birthday"]), // 'generation' => $contact["generation"], 'account_type' => account_type($contact), 'actions' => $actions, diff --git a/mod/install.php b/mod/install.php index fbd296a9d..8854723b7 100755 --- a/mod/install.php +++ b/mod/install.php @@ -48,7 +48,7 @@ function install_post(App $a) { $db = new dba($dbhost, $dbuser, $dbpass, '', true); if(! get_db_errno()) { - $r = q("CREATE DATABASE '%s'", + $r = q("CREATE DATABASE '%s' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci", dbesc($dbdata) ); if ($r) { diff --git a/mod/manifest.php b/mod/manifest.php new file mode 100644 index 000000000..6dc0d10a2 --- /dev/null +++ b/mod/manifest.php @@ -0,0 +1,26 @@ + App::get_baseurl(), + '$touch_icon' => $touch_icon, + '$title' => Config::get('config', 'sitename', 'Friendica'), + )); + + echo $o; + + killme(); + + } +?> diff --git a/mod/message.php b/mod/message.php index 9e9669146..beaa7b1df 100644 --- a/mod/message.php +++ b/mod/message.php @@ -349,7 +349,7 @@ function message_content(App $a) { $o .= $header; - $r = q("SELECT count(*) AS `total` FROM `mail` + $r = q("SELECT count(*) AS `total` FROM `mail`, ANY_VALUE(`created`) AS `created` WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC", intval(local_user()) ); @@ -528,12 +528,20 @@ function message_content(App $a) { } function get_messages($user, $lstart, $lend) { - + //TODO: rewritte with a sub-query to get the first message of each private thread with certainty return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, - `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`, - count( * ) as count + ANY_VALUE(`mail`.`id`) AS `id`, ANY_VALUE(`mail`.`uid`) AS `uid`, ANY_VALUE(`mail`.`guid`) AS `guid`, + ANY_VALUE(`mail`.`from-name`) AS `from-name`, ANY_VALUE(`mail`.`from-photo`) AS `from-photo`, + ANY_VALUE(`mail`.`from-url`) AS `from-url`, ANY_VALUE(`mail`.`contact-id`) AS `contact-id`, + ANY_VALUE(`mail`.`convid`) AS `convid`, ANY_VALUE(`mail`.`title`) AS `title`, ANY_VALUE(`mail`.`body`) AS `body`, + ANY_VALUE(`mail`.`seen`) AS `seen`, ANY_VALUE(`mail`.`reply`) AS `reply`, ANY_VALUE(`mail`.`replied`) AS `replied`, + ANY_VALUE(`mail`.`unknown`) AS `unknown`, ANY_VALUE(`mail`.`uri`) AS `uri`, + `mail`.`parent-uri`, + ANY_VALUE(`mail`.`created`) AS `created`, ANY_VALUE(`contact`.`name`) AS `name`, ANY_VALUE(`contact`.`url`) AS `url`, + ANY_VALUE(`contact`.`thumb`) AS `thumb`, ANY_VALUE(`contact`.`network`) AS `network`, + count( * ) as `count` FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` - WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", + WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", intval($user), intval($lstart), intval($lend) ); } diff --git a/mod/network.php b/mod/network.php index 5e94429b5..db4bb9130 100644 --- a/mod/network.php +++ b/mod/network.php @@ -581,11 +581,7 @@ function network_content(App $a, $update = 0) { $sql_order = "`item`.`id`"; $order_mode = "id"; } else { - // Disabled until final decision what to do with this - //if (get_config('system','use_fulltext_engine')) - // $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search))); - //else - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); $sql_order = "`item`.`id`"; $order_mode = "id"; } diff --git a/mod/notifications.php b/mod/notifications.php index 0c08b66ce..bab5fd627 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -292,7 +292,7 @@ function notifications_content(App $a) { '$item_link' => $it['link'], '$item_image' => $it['image'], '$item_url' => $it['url'], - '$item_text' => htmlentities($it['text']), + '$item_text' => $it['text'], '$item_when' => $it['when'], '$item_ago' => $it['ago'], '$item_seen' => $it['seen'], diff --git a/mod/photos.php b/mod/photos.php index ddf081467..a22f919c8 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1240,7 +1240,10 @@ function photos_content(App $a) { $order = 'DESC'; } - $r = q("SELECT `resource-id`, `id`, `filename`, type, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' + $r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, + ANY_VALUE(`type`) AS `type`, max(`scale`) AS `scale`, ANY_VALUE(`desc`) as `desc`, + ANY_VALUE(`created`) as `created` + FROM `photo` WHERE `uid` = %d AND `album` = '%s' AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d", intval($owner_uid), dbesc($album), @@ -1581,9 +1584,9 @@ function photos_content(App $a) { '$album' => array('albname', t('New album name'), $album_e,''), '$caption' => array('desc', t('Caption'), $caption_e, ''), '$tags' => array('newtag', t('Add a Tag'), "", t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')), - '$rotate_none' => array('rotate',t('Do not rotate'),0,'', true), - '$rotate_cw' => array('rotate',t('Rotate CW (right)'),1,''), - '$rotate_ccw' => array('rotate',t('Rotate CCW (left)'),2,''), + '$rotate_none' => array('rotate', t('Do not rotate'),0,'', true), + '$rotate_cw' => array('rotate', t('Rotate CW (right)'),1,''), + '$rotate_ccw' => array('rotate', t('Rotate CCW (left)'),2,''), '$nickname' => $a->data['user']['nickname'], '$resource_id' => $ph[0]['resource-id'], @@ -1840,7 +1843,9 @@ function photos_content(App $a) { $a->set_pager_itemspage(20); } - $r = qu("SELECT `resource-id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` + $r = qu("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, + ANY_VALUE(`type`) AS `type`, ANY_VALUE(`album`) AS `album`, max(`scale`) AS `scale`, + ANY_VALUE(`created`) AS `created` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", intval($a->data['user']['uid']), diff --git a/mod/ping.php b/mod/ping.php index b5330c7b3..ba496a70b 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -199,7 +199,7 @@ function ping_init(App $a) $cachekey = "ping_init:".local_user(); $ev = Cache::get($cachekey); if (is_null($ev)) { - $ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event` + $ev = qu("SELECT type, start, adjust FROM `event` WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0 ORDER BY `start` ASC ", intval(local_user()), @@ -212,7 +212,7 @@ function ping_init(App $a) } if (dbm::is_result($ev)) { - $all_events = intval($ev[0]['total']); + $all_events = count($ev); if ($all_events) { $str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d'); diff --git a/mod/probe.php b/mod/probe.php index 95f856bfa..8c951a7fc 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -4,6 +4,13 @@ require_once('include/Scrape.php'); function probe_content(App $a) { + if (!local_user()) { + http_status_exit(403, + array("title" => t("Public access denied."), + "description" => t("Only logged in users are permitted to perform a probing."))); + killme(); + } + $o .= 'Probe Diagnostic'; $o .= ''; diff --git a/mod/profile.php b/mod/profile.php index fbce509d2..a83cb076f 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -210,7 +210,7 @@ function profile_content(App $a, $update = 0) { if ($update) { - $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network` + $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`, `item`.`created` FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND diff --git a/mod/profiles.php b/mod/profiles.php index b73c46e71..bd57f106d 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -193,7 +193,7 @@ function profiles_post(App $a) { return; } - $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated? + $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0001-01-01'; // FIXME: Needs to be validated? $y = substr($dob, 0, 4); if ((! ctype_digit($y)) || ($y < 1900)) { @@ -201,15 +201,15 @@ function profiles_post(App $a) { } else { $ignore_year = false; } - if ($dob != '0000-00-00') { - if (strpos($dob, '0000-') === 0) { + if (!in_array($dob, array('0000-00-00', '0001-01-01'))) { + if (strpos($dob, '0000-') === 0 || strpos($dob, '0001-') === 0) { $ignore_year = true; $dob = substr($dob, 5); } $dob = datetime_convert('UTC', 'UTC', (($ignore_year) ? '1900-' . $dob : $dob), (($ignore_year) ? 'm-d' : 'Y-m-d')); if ($ignore_year) { - $dob = '0000-' . $dob; + $dob = '0001-' . $dob; } } @@ -637,7 +637,7 @@ function profiles_content(App $a) { t('Hide contacts and friends:'), //Label !!$r[0]['hide-friends'], //Value '', //Help string - array(t('No'),t('Yes')) //Off - On strings + array(t('No'), t('Yes')) //Off - On strings ), '$desc' => t('Hide your contact/friend list from viewers of this profile?'), '$yes_str' => t('Yes'), @@ -739,7 +739,7 @@ function profiles_content(App $a) { '$tv' => array('tv', t('Television'), $r[0]['tv']), '$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']), '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']), - '$romance' => array('romance',t('Love/romance'), $r[0]['romance']), + '$romance' => array('romance', t('Love/romance'), $r[0]['romance']), '$work' => array('work', t('Work/employment'), $r[0]['work']), '$education' => array('education', t('School/education'), $r[0]['education']), '$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']), diff --git a/mod/register.php b/mod/register.php index 81e8c3ad8..5e8da4685 100644 --- a/mod/register.php +++ b/mod/register.php @@ -282,7 +282,7 @@ function register_content(App $a) { '$passwords' => $passwords, '$password1' => array('password1', t('New Password:'), '', t('Leave empty for an auto generated password.')), '$password2' => array('confirm', t('Confirm:'), '', ''), - '$nickdesc' => str_replace('$sitename',$a->get_hostname(),t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.')), + '$nickdesc' => str_replace('$sitename',$a->get_hostname(), t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.')), '$nicklabel' => t('Choose a nickname: '), '$photo' => $photo, '$publish' => $profile_publish, diff --git a/mod/salmon.php b/mod/salmon.php index 69809f523..10b1046b0 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -79,7 +79,7 @@ function salmon_post(App $a) { $signed_data = $data . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg); - $compliant_format = str_replace('=','',$signed_data); + $compliant_format = str_replace('=', '', $signed_data); // decode the data @@ -115,24 +115,28 @@ function salmon_post(App $a) { // We should have everything we need now. Let's see if it verifies. - $verify = rsa_verify($compliant_format,$signature,$pubkey); + // Try GNU Social format + $verify = rsa_verify($signed_data, $signature, $pubkey); + $mode = 1; - if(! $verify) { - logger('mod-salmon: message did not verify using protocol. Trying padding hack.'); - $verify = rsa_verify($signed_data,$signature,$pubkey); + if (! $verify) { + logger('mod-salmon: message did not verify using protocol. Trying compliant format.'); + $verify = rsa_verify($compliant_format, $signature, $pubkey); + $mode = 2; } - if(! $verify) { - logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.'); - $verify = rsa_verify($stnet_signed_data,$signature,$pubkey); + if (! $verify) { + logger('mod-salmon: message did not verify using padding. Trying old statusnet format.'); + $verify = rsa_verify($stnet_signed_data, $signature, $pubkey); + $mode = 3; } - if(! $verify) { + if (! $verify) { logger('mod-salmon: Message did not verify. Discarding.'); http_status_exit(400); } - logger('mod-salmon: Message verified.'); + logger('mod-salmon: Message verified with mode '.$mode); /* diff --git a/mod/search.php b/mod/search.php index 7d588aa4d..a804ca32e 100644 --- a/mod/search.php +++ b/mod/search.php @@ -203,18 +203,13 @@ function search_content(App $a) { } else { logger("Start fulltext search for '".$search."'", LOGGER_DEBUG); - // Disabled until finally is decided how to proceed with this - //if (get_config('system','use_fulltext_engine')) { - // $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search))); - //} else { - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); - //} + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); $r = q("SELECT %s FROM `item` %s WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`)) $sql_extra - GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d", + GROUP BY `item`.`uri`, `item`.`id` ORDER BY `item`.`id` DESC LIMIT %d , %d", item_fieldlists(), item_joins(), item_condition(), intval(local_user()), intval($a->pager['start']), intval($a->pager['itemspage'])); diff --git a/mod/settings.php b/mod/settings.php index 5c9c439e0..1d83251d4 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -779,7 +779,7 @@ function settings_content(App $a) { $arr[$fname] = array(); $arr[$fname][0] = $fdata[0]; foreach (array_slice($fdata,1) as $f) { - $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); + $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'), t('On'))); } } @@ -1164,48 +1164,48 @@ function settings_content(App $a) { } $opt_tpl = get_markup_template("field_yesno.tpl"); - if(get_config('system','publish_all')) { + if (get_config('system','publish_all')) { $profile_in_dir = ''; } else { - $profile_in_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))), + $profile_in_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), array(t('No'), t('Yes'))) )); } if (strlen(get_config('system','directory'))) { - $profile_in_net_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))), + $profile_in_net_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'), t('Yes'))) )); } else { $profile_in_net_dir = ''; } $hide_friends = replace_macros($opt_tpl,array( - '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'),t('Yes'))), + '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'), t('Yes'))), )); $hide_wall = replace_macros($opt_tpl,array( - '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'),t('Yes'))), + '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'), t('Yes'))), )); $blockwall = replace_macros($opt_tpl,array( - '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'),t('Yes'))), + '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); $blocktags = replace_macros($opt_tpl,array( - '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'),t('Yes'))), + '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); $suggestme = replace_macros($opt_tpl,array( - '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'),t('Yes'))), + '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'), t('Yes'))), )); $unkmail = replace_macros($opt_tpl,array( - '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))), + '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'), t('Yes'))), )); @@ -1231,11 +1231,11 @@ function settings_content(App $a) { 'days' => array('expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')), 'advanced' => t('Advanced expiration settings'), 'label' => t('Advanced Expiration'), - 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'),t('Yes'))), - 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))), - 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))), - 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))), - 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'),t('Yes'))), + 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'), t('Yes'))), + 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'), t('Yes'))), + 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'), t('Yes'))), + 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'), t('Yes'))), + 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'), t('Yes'))), ); require_once('include/group.php'); @@ -1293,7 +1293,7 @@ function settings_content(App $a) { '$h_prv' => t('Security and Privacy Settings'), - '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq ,t("\x28to prevent spam abuse\x29")), + '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq , t("\x28to prevent spam abuse\x29")), '$permissions' => t('Default Post Permissions'), '$permdesc' => t("\x28click to open/close\x29"), '$visibility' => $profile['net-publish'], @@ -1323,7 +1323,7 @@ function settings_content(App $a) { '$hide_friends' => $hide_friends, '$hide_wall' => $hide_wall, '$unkmail' => $unkmail, - '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail ,t("\x28to prevent spam abuse\x29")), + '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail , t("\x28to prevent spam abuse\x29")), '$h_not' => t('Notification Settings'), diff --git a/mod/uexport.php b/mod/uexport.php index cada539bc..77a45f8a3 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -34,8 +34,8 @@ function uexport_content(App $a) { * list of array( 'link url', 'link text', 'help text' ) */ $options = array( - array('uexport/account',t('Export account'),t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')), - array('uexport/backup',t('Export all'),t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')), + array('uexport/account', t('Export account'), t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')), + array('uexport/backup', t('Export all'), t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')), ); call_hooks('uexport_options', $options); diff --git a/mod/videos.php b/mod/videos.php index 3828b8f1f..269d53785 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -356,7 +356,9 @@ function videos_content(App $a) { $a->set_pager_itemspage(20); } - $r = q("SELECT hash, `id`, `filename`, filetype FROM `attach` + $r = q("SELECT hash, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`created`) AS `created`, + ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`filetype`) as `filetype` + FROM `attach` WHERE `uid` = %d AND filetype LIKE '%%video%%' $sql_extra GROUP BY hash ORDER BY `created` DESC LIMIT %d , %d", intval($a->data['user']['uid']), diff --git a/mod/webfinger.php b/mod/webfinger.php index eee0580e3..d823bd2dc 100644 --- a/mod/webfinger.php +++ b/mod/webfinger.php @@ -3,6 +3,13 @@ require_once("include/Probe.php"); function webfinger_content(App $a) { + if (!local_user()) { + http_status_exit(403, + array("title" => t("Public access denied."), + "description" => t("Only logged in users are permitted to perform a probing."))); + killme(); + } + $o .= 'Webfinger Diagnostic'; $o .= ''; diff --git a/update.php b/update.php index 8404f5bf2..ea0c57535 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ /dev/null 2>&1; then + # Cygwin paths start with /cygdrive/ which will break windows PHP, + # so we need to translate the dir path to windows format. However + # we could be using cygwin PHP which does not require this, so we + # test if the path to PHP starts with /cygdrive/ rather than /usr/bin + if [[ $(which php) == /cygdrive/* ]]; then + dir=$(cygpath -m "$dir"); + fi +fi + +dir=$(echo $dir | sed 's/ /\ /g') +"${dir}/html-to-markdown" "$@" diff --git a/vendor/bin/html-to-markdown.bat b/vendor/bin/html-to-markdown.bat new file mode 100644 index 000000000..273f24a5d --- /dev/null +++ b/vendor/bin/html-to-markdown.bat @@ -0,0 +1,4 @@ +@ECHO OFF +setlocal DISABLEDELAYEDEXPANSION +SET BIN_TARGET=%~dp0/../league/html-to-markdown/bin/html-to-markdown +php "%BIN_TARGET%" %* diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 95407cff6..4553da2e2 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -241,6 +241,29 @@ return array( 'HTMLPurifier_VarParser_Flexible' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php', 'HTMLPurifier_VarParser_Native' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php', 'HTMLPurifier_Zipper' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php', + 'League\\HTMLToMarkdown\\Configuration' => $vendorDir . '/league/html-to-markdown/src/Configuration.php', + 'League\\HTMLToMarkdown\\ConfigurationAwareInterface' => $vendorDir . '/league/html-to-markdown/src/ConfigurationAwareInterface.php', + 'League\\HTMLToMarkdown\\Converter\\BlockquoteConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/BlockquoteConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CodeConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/CodeConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CommentConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/CommentConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ConverterInterface' => $vendorDir . '/league/html-to-markdown/src/Converter/ConverterInterface.php', + 'League\\HTMLToMarkdown\\Converter\\DefaultConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/DefaultConverter.php', + 'League\\HTMLToMarkdown\\Converter\\DivConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/DivConverter.php', + 'League\\HTMLToMarkdown\\Converter\\EmphasisConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/EmphasisConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HardBreakConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HardBreakConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HeaderConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HeaderConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HorizontalRuleConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ImageConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ImageConverter.php', + 'League\\HTMLToMarkdown\\Converter\\LinkConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/LinkConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListBlockConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListBlockConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListItemConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ParagraphConverter.php', + 'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/PreformattedConverter.php', + 'League\\HTMLToMarkdown\\Converter\\TextConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/TextConverter.php', + 'League\\HTMLToMarkdown\\Element' => $vendorDir . '/league/html-to-markdown/src/Element.php', + 'League\\HTMLToMarkdown\\ElementInterface' => $vendorDir . '/league/html-to-markdown/src/ElementInterface.php', + 'League\\HTMLToMarkdown\\Environment' => $vendorDir . '/league/html-to-markdown/src/Environment.php', + 'League\\HTMLToMarkdown\\HtmlConverter' => $vendorDir . '/league/html-to-markdown/src/HtmlConverter.php', 'Mobile_Detect' => $vendorDir . '/mobiledetect/mobiledetectlib/Mobile_Detect.php', 'OS_Guess' => $vendorDir . '/pear-pear.php.net/PEAR/OS/Guess.php', 'PEAR' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR.php', diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index a8d577d5e..61a440ffd 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -6,5 +6,6 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( + 'League\\HTMLToMarkdown\\' => array($vendorDir . '/league/html-to-markdown/src'), 'Friendica\\' => array($baseDir . '/src'), ); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 370e53218..37d3c878b 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -11,6 +11,10 @@ class ComposerStaticInitFriendica ); public static $prefixLengthsPsr4 = array ( + 'L' => + array ( + 'League\\HTMLToMarkdown\\' => 22, + ), 'F' => array ( 'Friendica\\' => 10, @@ -18,6 +22,10 @@ class ComposerStaticInitFriendica ); public static $prefixDirsPsr4 = array ( + 'League\\HTMLToMarkdown\\' => + array ( + 0 => __DIR__ . '/..' . '/league/html-to-markdown/src', + ), 'Friendica\\' => array ( 0 => __DIR__ . '/../..' . '/src', @@ -277,6 +285,29 @@ class ComposerStaticInitFriendica 'HTMLPurifier_VarParser_Flexible' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php', 'HTMLPurifier_VarParser_Native' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php', 'HTMLPurifier_Zipper' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php', + 'League\\HTMLToMarkdown\\Configuration' => __DIR__ . '/..' . '/league/html-to-markdown/src/Configuration.php', + 'League\\HTMLToMarkdown\\ConfigurationAwareInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/ConfigurationAwareInterface.php', + 'League\\HTMLToMarkdown\\Converter\\BlockquoteConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/BlockquoteConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CodeConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/CodeConverter.php', + 'League\\HTMLToMarkdown\\Converter\\CommentConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/CommentConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ConverterInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ConverterInterface.php', + 'League\\HTMLToMarkdown\\Converter\\DefaultConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/DefaultConverter.php', + 'League\\HTMLToMarkdown\\Converter\\DivConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/DivConverter.php', + 'League\\HTMLToMarkdown\\Converter\\EmphasisConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/EmphasisConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HardBreakConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HardBreakConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HeaderConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HeaderConverter.php', + 'League\\HTMLToMarkdown\\Converter\\HorizontalRuleConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ImageConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ImageConverter.php', + 'League\\HTMLToMarkdown\\Converter\\LinkConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/LinkConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListBlockConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ListBlockConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ListItemConverter.php', + 'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ParagraphConverter.php', + 'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/PreformattedConverter.php', + 'League\\HTMLToMarkdown\\Converter\\TextConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/TextConverter.php', + 'League\\HTMLToMarkdown\\Element' => __DIR__ . '/..' . '/league/html-to-markdown/src/Element.php', + 'League\\HTMLToMarkdown\\ElementInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/ElementInterface.php', + 'League\\HTMLToMarkdown\\Environment' => __DIR__ . '/..' . '/league/html-to-markdown/src/Environment.php', + 'League\\HTMLToMarkdown\\HtmlConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/HtmlConverter.php', 'Mobile_Detect' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/Mobile_Detect.php', 'OS_Guess' => __DIR__ . '/..' . '/pear-pear.php.net/PEAR/OS/Guess.php', 'PEAR' => __DIR__ . '/..' . '/pear-pear.php.net/PEAR/PEAR.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index d55aed01d..45038987b 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -330,5 +330,71 @@ "PHP License" ], "description": "Text_Highlighter is a package for syntax highlighting.\n\nIt provides a base class provining all the functionality,\nand a descendent classes geneator class.\n\nThe main idea is to simplify creation of subclasses\nimplementing syntax highlighting for particular language.\nSubclasses do not implement any new functioanality,\nthey just provide syntax highlighting rules.\nThe rules sources are in XML format.\n\nTo create a highlighter for a language, there is no need\nto code a new class manually. Simply describe the rules\nin XML file and use Text_Highlighter_Generator to create\na new class." + }, + { + "name": "league/html-to-markdown", + "version": "4.4.1", + "version_normalized": "4.4.1.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/html-to-markdown.git", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/82ea375b5b2b1da1da222644c0565c695bf88186", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xml": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "time": "2017-03-16T00:45:59+00:00", + "bin": [ + "bin/html-to-markdown" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "description": "An HTML-to-markdown conversion helper for PHP", + "homepage": "https://github.com/thephpleague/html-to-markdown", + "keywords": [ + "html", + "markdown" + ] } ] diff --git a/vendor/league/html-to-markdown/CHANGELOG.md b/vendor/league/html-to-markdown/CHANGELOG.md new file mode 100644 index 000000000..067864412 --- /dev/null +++ b/vendor/league/html-to-markdown/CHANGELOG.md @@ -0,0 +1,214 @@ +# Change Log +All notable changes to this project will be documented in this file. +Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles. + +## [Unreleased][unreleased] + +## [4.4.1] + +### Fixed + - Fixed autolinking of invalid URLs (#129) + +## [4.4.0] + +### Added + - Added `hard_break` configuration option (#112, #115) + - The `HtmlConverter` can now be instantiated with an `Environment` (#118) + +### Fixed + - Fixed handling of paragraphs in list item elements (#47, #110) + - Fixed phantom spaces when newlines follow `br` elements (#116, #117) + - Fixed link converter not sanitizing inner spaces properly (#119, #120) + +## [4.3.1] +### Changed + - Revised the sanitization implementation (#109) + +### Fixed + - Fixed tag-like content not being escaped (#67, #109) + - Fixed thematic break-like content not being escaped (#65, #109) + - Fixed codefence-like content not being escaped (#64, #109) + +## [4.3.0] +### Added + - Added full support for PHP 7.0 and 7.1 + +### Changed + - Changed `` and `` conversions to use backticks instead of indendation (#102) + +### Fixed + - Fixed issue where specified code language was not preserved (#70, #102) + - Fixed issue where `` tags nested in `` was not converted properly (#70, #102) + - Fixed header-like content not being escaped (#76, #105) + - Fixed blockquote-like content not being escaped (#77, #103) + - Fixed ordered list-like content not being escaped (#73, #106) + - Fixed unordered list-like content not being escaped (#71, #107) + +## [4.2.2] +### Fixed + - Fixed sanitization bug which sometimes removes desired content (#63, #101) + +## [4.2.1] +### Fixed + - Fixed path to autoload.php when used as a library (#98) + - Fixed edge case for tags containing only whitespace (#99) + +### Removed + - Removed double HTML entity decoding, as this is not desireable (#60) + +## [4.2.0] + +### Added + - Added the ability to invoke HtmlConverter objects as functions (#85) + +### Fixed + - Fixed improper handling of nested list items (#19 and #84) + - Fixed preceeding or trailing spaces within emphasis tags (#83) + +## [4.1.1] + +### Fixed + - Fixed conversion of empty paragraphs (#78) + - Fixed `preg_replace` so it wouldn't break UTF-8 characters (#79) + +## [4.1.0] + +### Added + - Added `bin/html-to-markdown` script + +### Changed + - Changed default italic character to `_` (#58) + +## [4.0.1] + +### Fixed + - Added escaping to avoid * and _ in a text being rendered as emphasis (#48) + +### Removed + - Removed the demo (#51) + - `.styleci.yml` and `CONTRIBUTING.md` are no longer included in distributions (#50) + +## [4.0.0] + +This release changes the visibility of several methods/properties. #42 and #43 brought to light that some visiblities were +not ideally set, so this releases fixes that. Moving forwards this should reduce the chance of introducing BC-breaking changes. + +### Added + - Added new `HtmlConverter::getEnvironment()` method to expose the `Environment` (#42, #43) + +### Changed + - Changed `Environment::addConverter()` from `protected` to `public`, enabling custom converters to be added (#42, #43) + - Changed `HtmlConverter::createDOMDocument()` from `protected` to `private` + - Changed `Element::nextCached` from `protected` to `private` + - Made the `Environment` class `final` + +## [3.1.1] +### Fixed + - Empty HTML strings now result in empty Markdown documents (#40, #41) + +## [3.1.0] +### Added + - Added new `equals` method to `Element` to check for equality + +### Changes + - Use Linux line endings consistently instead of plaform-specific line endings (#36) + +### Fixed + - Cleaned up code style + +## [3.0.0] +### Changed + - Changed namespace to `League\HTMLToMarkdown` + - Changed packagist name to `league/html-to-markdown` + - Re-organized code into several separate classes + - `` tags with identical href and inner text are now rendered using angular bracket syntax (#31) + - `` elements are now treated as block-level elements (#33) + +## [2.2.2] +### Added + - Added support for PHP 5.6 and HHVM + - Enabled testing against PHP 7 nightlies + - Added this CHANGELOG.md + +### Fixed + - Fixed whitespace preservation between inline elements (#9 and #10) + +## [2.2.1] +### Fixed + - Preserve placeholder links (#22) + +## [2.2.0] +### Added + - Added CircleCI config + +### Changed + - `` blocks are now treated as code elements + +### Removed + - Dropped support for PHP 5.2 + - Removed incorrect README comment regarding `#text` nodes (#17) + +## [2.1.2] +### Added + - Added the ability to blacklist/remove specific node types (#11) + +### Changed + - Line breaks are now placed after divs instead of before them + - Newlines inside of link texts are now removed + - Updated the minimum PHPUnit version to 4.* + +## [2.1.1] +### Added + - Added options to customize emphasis characters + +## [2.1.0] +### Added + - Added option to strip HTML tags without Markdown equivalents + - Added `convert()` method for converter reuse + - Added ability to set options after instance construction + - Documented the required PHP extensions (#4) + +### Changed + - ATX style now used for h1 and h2 tags inside blockquotes + +### Fixed + - Newlines inside blockquotes are now started with a bracket + - Fixed some incorrect docblocks + - `__toString()` now returns an empty string if input is empty + - Convert head tag if body tag is empty (#7) + - Preserve special characters inside tags without md equivalents (#6) + + +## [2.0.1] +### Fixed + - Fixed first line indentation for multi-line code blocks + - Fixed consecutive anchors get separating spaces stripped (#3) + +## [2.0.0] +### Added + - Initial release + +[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.4.1...master +[4.4.1]: https://github.com/thephpleague/html-to-markdown/compare/4.4.0...4.4.1 +[4.4.0]: https://github.com/thephpleague/html-to-markdown/compare/4.3.1...4.4.0 +[4.3.1]: https://github.com/thephpleague/html-to-markdown/compare/4.3.0...4.3.1 +[4.3.0]: https://github.com/thephpleague/html-to-markdown/compare/4.2.2...4.3.0 +[4.2.2]: https://github.com/thephpleague/html-to-markdown/compare/4.2.1...4.2.2 +[4.2.1]: https://github.com/thephpleague/html-to-markdown/compare/4.2.0...4.2.1 +[4.2.0]: https://github.com/thephpleague/html-to-markdown/compare/4.1.1...4.2.0 +[4.1.1]: https://github.com/thephpleague/html-to-markdown/compare/4.1.0...4.1.1 +[4.1.0]: https://github.com/thephpleague/html-to-markdown/compare/4.0.1...4.1.0 +[4.0.1]: https://github.com/thephpleague/html-to-markdown/compare/4.0.0...4.0.1 +[4.0.0]: https://github.com/thephpleague/html-to-markdown/compare/3.1.1...4.0.0 +[3.1.1]: https://github.com/thephpleague/html-to-markdown/compare/3.1.0...3.1.1 +[3.1.0]: https://github.com/thephpleague/html-to-markdown/compare/3.0.0...3.1.0 +[3.0.0]: https://github.com/thephpleague/html-to-markdown/compare/2.2.2...3.0.0 +[2.2.2]: https://github.com/thephpleague/html-to-markdown/compare/2.2.1...2.2.2 +[2.2.1]: https://github.com/thephpleague/html-to-markdown/compare/2.2.0...2.2.1 +[2.2.0]: https://github.com/thephpleague/html-to-markdown/compare/2.1.2...2.2.0 +[2.1.2]: https://github.com/thephpleague/html-to-markdown/compare/2.1.1...2.1.2 +[2.1.1]: https://github.com/thephpleague/html-to-markdown/compare/2.1.0...2.1.1 +[2.1.0]: https://github.com/thephpleague/html-to-markdown/compare/2.0.1...2.1.0 +[2.0.1]: https://github.com/thephpleague/html-to-markdown/compare/2.0.0...2.0.1 +[2.0.0]: https://github.com/thephpleague/html-to-markdown/compare/775f91e...2.0.0 + diff --git a/vendor/league/html-to-markdown/CONDUCT.md b/vendor/league/html-to-markdown/CONDUCT.md new file mode 100644 index 000000000..01b8644f1 --- /dev/null +++ b/vendor/league/html-to-markdown/CONDUCT.md @@ -0,0 +1,22 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) diff --git a/library/html-to-markdown/LICENSE b/vendor/league/html-to-markdown/LICENSE similarity index 93% rename from library/html-to-markdown/LICENSE rename to vendor/league/html-to-markdown/LICENSE index f538c2ac9..6c04a59dd 100644 --- a/library/html-to-markdown/LICENSE +++ b/vendor/league/html-to-markdown/LICENSE @@ -1,6 +1,8 @@ The MIT License (MIT) -Copyright (c) 2013 Nick Cernis +Copyright (c) 2015 Colin O'Dell + +Originally created by Nick Cernis Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/vendor/league/html-to-markdown/README.md b/vendor/league/html-to-markdown/README.md new file mode 100644 index 000000000..8d75649d6 --- /dev/null +++ b/vendor/league/html-to-markdown/README.md @@ -0,0 +1,196 @@ +HTML To Markdown for PHP +======================== + +[](https://gitter.im/thephpleague/html-to-markdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +[](https://packagist.org/packages/league/html-to-markdown) +[](LICENSE) +[](https://travis-ci.org/thephpleague/html-to-markdown) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown/code-structure) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown) +[](https://packagist.org/packages/league/html-to-markdown) + +Library which converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. + + +**Requires**: PHP 5.3+ + +**Lead Developer**: [@colinodell](http://twitter.com/colinodell) + +**Original Author**: [@nickcernis](http://twitter.com/nickcernis) + + +### Why convert HTML to Markdown? + +*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](https://github.com/thephpleague/commonmark),"* you continue, already labouring the question somewhat, *"but why go the other way?"* + +Typically you would convert HTML to Markdown if: + +1. You have an existing HTML document that needs to be edited by people with good taste. +2. You want to store new content in HTML format but edit it as Markdown. +3. You want to convert HTML email to plain text email. +4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. +5. You just really like Markdown. + +### How to use it + +Require the library by issuing this command: + +```bash +composer require league/html-to-markdown +``` + +Add `require 'vendor/autoload.php';` to the top of your script. + +Next, create a new HtmlConverter instance, passing in your valid HTML code to its `convert()` function: + +```php +use League\HTMLToMarkdown\HtmlConverter; + +$converter = new HtmlConverter(); + +$html = "Quick, to the Batpoles!"; +$markdown = $converter->convert($html); +``` + +The `$markdown` variable now contains the Markdown version of your HTML as a string: + +```php +echo $markdown; // ==> ### Quick, to the Batpoles! +``` + +The included `demo` directory contains an HTML->Markdown conversion form to try out. + +### Conversion options + +By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. + +To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: + +```php +$converter = new HtmlConverter(array('strip_tags' => true)); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Or more explicitly, like this: + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('strip_tags', true); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Note that only the tags themselves are stripped, not the content they hold. + +To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: + +```php +$converter = new HtmlConverter(array('remove_nodes' => 'span div')); + +$html = 'Turnips!Monkeys!'; +$markdown = $converter->convert($html); // $markdown now contains "" +``` + +### Style options + +Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('italic_style', '_'); +$converter->getConfig()->setOption('bold_style', '__'); + +$html = 'Italic and a bold'; +$markdown = $converter->convert($html); // $markdown now contains "_Italic_ and a __bold__" +``` + +### Line break options + +By default, `br` tags are converted to two spaces followed by a newline character as per [traditional Markdown](https://daringfireball.net/projects/markdown/syntax#p). Set `hard_break` to `true` to omit the two spaces, as per GitHub Flavored Markdown (GFM). + +```php +$converter = new HtmlConverter(); +$html = 'testline break'; + +$converter->getConfig()->setOption('hard_break', true); +$markdown = $converter->convert($html); // $markdown now contains "test\nline break" + +$converter->getConfig()->setOption('hard_break', false); // default +$markdown = $converter->convert($html); // $markdown now contains "test \nline break" +``` + +### Passing custom Environment object + +You can pass current `Environment` object to customize i.e. which converters should be used. + +```php +$environment = new Environment(array( + // your configuration here +)); +$environment->addConverter(new HeaderConverter()); // optionally - add converter manually + +$converter = new HtmlConverter($environment); + +$html = 'Header + +'; +$markdown = $converter->convert($html); // $markdown now contains "### Header" and "" +``` + +### Limitations + +- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. + +### Known issues + +- Nested lists and lists containing multiple paragraphs aren't converted correctly. +- Lists inside blockquotes aren't converted correctly. +- Any reported [open issues here](https://github.com/thephpleague/html-to-markdown/issues?state=open). + +[Report your issue or request a feature here.](https://github.com/thephpleague/html-to-markdown/issues/new) Issues with patches or failing tests are especially welcome. + +### Style notes + +- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: + + `$converter = new HtmlConverter(array('header_style'=>'atx'));` + + Headers of H3 priority and lower always use atx style. + +- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. +- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. + +### Dependencies + +HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. + +Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. + +### Contributors + +Many thanks to all [contributors](https://github.com/thephpleague/html-to-markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. + +### How it works + +HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. + +### To-do + +- Support for nested lists and lists inside blockquotes. +- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). + +### Trying to convert Markdown to HTML? + +Use one of these great libraries: + + - [league/commonmark](https://github.com/thephpleague/commonmark) (recommended) + - [cebe/markdown](https://github.com/cebe/markdown) + - [PHP Markdown](https://michelf.ca/projects/php-markdown/) + - [Parsedown](https://github.com/erusev/parsedown) + +No guarantees about the Elvish, though. + diff --git a/vendor/league/html-to-markdown/bin/html-to-markdown b/vendor/league/html-to-markdown/bin/html-to-markdown new file mode 100644 index 000000000..2815a7cef --- /dev/null +++ b/vendor/league/html-to-markdown/bin/html-to-markdown @@ -0,0 +1,108 @@ +#!/usr/bin/env php + $arg) { + if ($i === 0) { + continue; + } + + if (substr($arg, 0, 1) === '-') { + switch ($arg) { + case '-h': + case '--help': + echo getHelpText(); + exit(0); + default: + fail('Unknown option: ' . $arg); + } + } else { + $src = $argv[1]; + } +} + +if (isset($src)) { + if (!file_exists($src)) { + fail('File not found: ' . $src); + } + + $html = file_get_contents($src); +} else { + $stdin = fopen('php://stdin', 'r'); + stream_set_blocking($stdin, false); + $html = stream_get_contents($stdin); + fclose($stdin); + + if (empty($html)) { + fail(getHelpText()); + } +} + + +$converter = new League\HTMLToMarkdown\HtmlConverter(); +echo $converter->convert($html); + +/** + * Get help and usage info + * + * @return string + */ +function getHelpText() +{ + return << output.md + + Converting from STDIN: + + echo -e 'Hello World!' | html-to-markdown + + Converting from STDIN and saving the output: + + echo -e 'Hello World!' | html-to-markdown > output.md + +HELP; +} + +/** + * @param string $message Error message + */ +function fail($message) +{ + fwrite(STDERR, $message . "\n"); + exit(1); +} + +function requireAutoloader() +{ + $autoloadPaths = array( + // Local package usage + __DIR__ . '/../vendor/autoload.php', + // Package was included as a library + __DIR__ . '/../../../autoload.php', + ); + foreach ($autoloadPaths as $path) { + if (file_exists($path)) { + require_once $path; + break; + } + } +} diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json new file mode 100644 index 000000000..58764bcb5 --- /dev/null +++ b/vendor/league/html-to-markdown/composer.json @@ -0,0 +1,48 @@ +{ + "name": "league/html-to-markdown", + "type": "library", + "description": "An HTML-to-markdown conversion helper for PHP", + "keywords": ["markdown", "html"], + "homepage": "https://github.com/thephpleague/html-to-markdown", + "license": "MIT", + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "League\\HTMLToMarkdown\\Test\\": "tests" + } + }, + "require": { + "php": ">=5.3.3", + "ext-dom": "*", + "ext-xml": "*" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "bin": ["bin/html-to-markdown"], + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + } +} diff --git a/vendor/league/html-to-markdown/src/Configuration.php b/vendor/league/html-to-markdown/src/Configuration.php new file mode 100644 index 000000000..2943383aa --- /dev/null +++ b/vendor/league/html-to-markdown/src/Configuration.php @@ -0,0 +1,60 @@ +config = $config; + } + + /** + * @param array $config + */ + public function merge(array $config = array()) + { + $this->config = array_replace_recursive($this->config, $config); + } + + /** + * @param array $config + */ + public function replace(array $config = array()) + { + $this->config = $config; + } + + /** + * @param string $key + * @param mixed $value + */ + public function setOption($key, $value) + { + $this->config[$key] = $value; + } + + /** + * @param string|null $key + * @param mixed|null $default + * + * @return mixed|null + */ + public function getOption($key = null, $default = null) + { + if ($key === null) { + return $this->config; + } + + if (!isset($this->config[$key])) { + return $default; + } + + return $this->config[$key]; + } +} diff --git a/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php new file mode 100644 index 000000000..8aca530be --- /dev/null +++ b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php @@ -0,0 +1,11 @@ +' symbols to each line. + + $markdown = ''; + + $quote_content = trim($element->getValue()); + + $lines = preg_split('/\r\n|\r|\n/', $quote_content); + + $total_lines = count($lines); + + foreach ($lines as $i => $line) { + $markdown .= '> ' . $line . "\n"; + if ($i + 1 === $total_lines) { + $markdown .= "\n"; + } + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('blockquote'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php new file mode 100644 index 000000000..c8ec2c005 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php @@ -0,0 +1,62 @@ +getAttribute('class'); + + if ($classes) { + // Since tags can have more than one class, we need to find the one that starts with 'language-' + $classes = explode(' ', $classes); + foreach ($classes as $class) { + if (strpos($class, 'language-') !== false) { + // Found one, save it as the selected language and stop looping over the classes. + // The space after the language avoids gluing the actual code with the language tag + $language = str_replace('language-', '', $class) . ' '; + break; + } + } + } + + $markdown = ''; + $code = html_entity_decode($element->getChildrenAsString()); + + // In order to remove the code tags we need to search for them and, in the case of the opening tag + // use a regular expression to find the tag and the other attributes it might have + $code = preg_replace('/]*>/', '', $code); + $code = str_replace('', '', $code); + + // Checking if the code has multiple lines + $lines = preg_split('/\r\n|\r|\n/', $code); + if (count($lines) > 1) { + // Multiple lines detected, adding three backticks and newlines + $markdown .= '```' . $language . "\n" . $code . "\n" . '```'; + } else { + // One line of code, wrapping it on one backtick. + $markdown .= '`' . $language . $code . '`'; + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('code'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CommentConverter.php b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php new file mode 100644 index 000000000..55038b254 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php @@ -0,0 +1,26 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, + // such as nodes on their own. C14N() canonicalizes the node to a string. + // See: http://www.php.net/manual/en/domnode.c14n.php + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue(); + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array(self::DEFAULT_CONVERTER); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/DivConverter.php b/vendor/league/html-to-markdown/src/Converter/DivConverter.php new file mode 100644 index 000000000..656a0ba4d --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/DivConverter.php @@ -0,0 +1,45 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue() . "\n\n"; + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('div'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php new file mode 100644 index 000000000..67250769b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php @@ -0,0 +1,57 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $tag = $element->getTagName(); + $value = $element->getValue(); + + if (!trim($value)) { + return ''; + } + + if ($tag === 'i' || $tag === 'em') { + $style = $this->config->getOption('italic_style'); + } else { + $style = $this->config->getOption('bold_style'); + } + + $prefix = ltrim($value) !== $value ? ' ' : ''; + $suffix = rtrim($value) !== $value ? ' ' : ''; + + return $prefix . $style . trim($value) . $style . $suffix; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('em', 'i', 'strong', 'b'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php new file mode 100644 index 000000000..37cd44e73 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php @@ -0,0 +1,41 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + return $this->config->getOption('hard_break') ? "\n" : " \n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('br'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php new file mode 100644 index 000000000..d117e7d36 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php @@ -0,0 +1,78 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $level = (int) substr($element->getTagName(), 1, 1); + $style = $this->config->getOption('header_style', self::STYLE_SETEXT); + + if (($level === 1 || $level === 2) && !$element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) { + return $this->createSetextHeader($level, $element->getValue()); + } + + return $this->createAtxHeader($level, $element->getValue()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'); + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createSetextHeader($level, $content) + { + $length = function_exists('mb_strlen') ? mb_strlen($content, 'utf-8') : strlen($content); + $underline = ($level === 1) ? '=' : '-'; + + return $content . "\n" . str_repeat($underline, $length) . "\n\n"; + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createAtxHeader($level, $content) + { + $prefix = str_repeat('#', $level) . ' '; + + return $prefix . $content . "\n\n"; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php new file mode 100644 index 000000000..8f54f9397 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php @@ -0,0 +1,26 @@ +getAttribute('src'); + $alt = $element->getAttribute('alt'); + $title = $element->getAttribute('title'); + + if ($title !== '') { + // No newlines added. should be in a block-level element. + return ''; + } + + return ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('img'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php new file mode 100644 index 000000000..f0765f38b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php @@ -0,0 +1,52 @@ +getAttribute('href'); + $title = $element->getAttribute('title'); + $text = trim($element->getValue()); + + if ($title !== '') { + $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; + } elseif ($href === $text && $this->isValidAutolink($href)) { + $markdown = '<' . $href . '>'; + } else { + $markdown = '[' . $text . '](' . $href . ')'; + } + + if (!$href) { + $markdown = html_entity_decode($element->getChildrenAsString()); + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('a'); + } + + /** + * @param string $href + * + * @return bool + */ + private function isValidAutolink($href) + { + return preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php new file mode 100644 index 000000000..07a4c85a9 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php @@ -0,0 +1,26 @@ +getValue() . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('ol', 'ul'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php new file mode 100644 index 000000000..dafec077c --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php @@ -0,0 +1,47 @@ +getParent()->getTagName(); + + // Add spaces to start for nested list items + $level = $element->getListItemLevel($element); + + $prefixForParagraph = str_repeat(' ', $level + 1); + $value = trim(implode("\n" . $prefixForParagraph, explode("\n", trim($element->getValue())))); + + // If list item is the first in a nested list, add a newline before it + $prefix = ''; + if ($level > 0 && $element->getSiblingPosition() === 1) { + $prefix = "\n"; + } + + if ($list_type === 'ul') { + return $prefix . '- ' . $value . "\n"; + } + + $number = $element->getSiblingPosition(); + + return $prefix . $number . '. ' . $value . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('li'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php new file mode 100644 index 000000000..cf852bfcf --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php @@ -0,0 +1,124 @@ +getValue(); + + $markdown = ''; + + $lines = preg_split('/\r\n|\r|\n/', $value); + foreach ($lines as $line) { + /* + * Some special characters need to be escaped based on the position that they appear + * The following function will deal with those special cases. + */ + $markdown .= $this->escapeSpecialCharacters($line); + $markdown .= "\n"; + } + + return trim($markdown) !== '' ? rtrim($markdown) . "\n\n" : ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('p'); + } + + /** + * @param string $line + * + * @return string + */ + private function escapeSpecialCharacters($line) + { + $line = $this->escapeFirstCharacters($line); + $line = $this->escapeOtherCharacters($line); + $line = $this->escapeOtherCharactersRegex($line); + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeFirstCharacters($line) + { + $escapable = array( + '>', + '- ', + '+ ', + '--', + '~~~', + '---', + '- - -' + ); + + foreach ($escapable as $i) { + if (strpos(ltrim($line), $i) === 0) { + // Found a character that must be escaped, adding a backslash before + return '\\' . ltrim($line); + } + } + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeOtherCharacters($line) + { + $escapable = array( + ' {{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache_duration}} diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl index a8243b614..e65014413 100644 --- a/view/templates/admin_summary.tpl +++ b/view/templates/admin_summary.tpl @@ -11,7 +11,7 @@ {{$queues.label}} - {{$queues.deliverq}} - {{$queues.queue}} - {{$queues.workerq}} + {{$queues.queue}} - {{$queues.workerq}} {{$pending.0}} diff --git a/view/templates/head.tpl b/view/templates/head.tpl index 0772af0bc..e7df8a18c 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -7,7 +7,7 @@ - + @@ -19,6 +19,7 @@ +
", "
` and `` conversions to use backticks instead of indendation (#102) + +### Fixed + - Fixed issue where specified code language was not preserved (#70, #102) + - Fixed issue where `` tags nested in `` was not converted properly (#70, #102) + - Fixed header-like content not being escaped (#76, #105) + - Fixed blockquote-like content not being escaped (#77, #103) + - Fixed ordered list-like content not being escaped (#73, #106) + - Fixed unordered list-like content not being escaped (#71, #107) + +## [4.2.2] +### Fixed + - Fixed sanitization bug which sometimes removes desired content (#63, #101) + +## [4.2.1] +### Fixed + - Fixed path to autoload.php when used as a library (#98) + - Fixed edge case for tags containing only whitespace (#99) + +### Removed + - Removed double HTML entity decoding, as this is not desireable (#60) + +## [4.2.0] + +### Added + - Added the ability to invoke HtmlConverter objects as functions (#85) + +### Fixed + - Fixed improper handling of nested list items (#19 and #84) + - Fixed preceeding or trailing spaces within emphasis tags (#83) + +## [4.1.1] + +### Fixed + - Fixed conversion of empty paragraphs (#78) + - Fixed `preg_replace` so it wouldn't break UTF-8 characters (#79) + +## [4.1.0] + +### Added + - Added `bin/html-to-markdown` script + +### Changed + - Changed default italic character to `_` (#58) + +## [4.0.1] + +### Fixed + - Added escaping to avoid * and _ in a text being rendered as emphasis (#48) + +### Removed + - Removed the demo (#51) + - `.styleci.yml` and `CONTRIBUTING.md` are no longer included in distributions (#50) + +## [4.0.0] + +This release changes the visibility of several methods/properties. #42 and #43 brought to light that some visiblities were +not ideally set, so this releases fixes that. Moving forwards this should reduce the chance of introducing BC-breaking changes. + +### Added + - Added new `HtmlConverter::getEnvironment()` method to expose the `Environment` (#42, #43) + +### Changed + - Changed `Environment::addConverter()` from `protected` to `public`, enabling custom converters to be added (#42, #43) + - Changed `HtmlConverter::createDOMDocument()` from `protected` to `private` + - Changed `Element::nextCached` from `protected` to `private` + - Made the `Environment` class `final` + +## [3.1.1] +### Fixed + - Empty HTML strings now result in empty Markdown documents (#40, #41) + +## [3.1.0] +### Added + - Added new `equals` method to `Element` to check for equality + +### Changes + - Use Linux line endings consistently instead of plaform-specific line endings (#36) + +### Fixed + - Cleaned up code style + +## [3.0.0] +### Changed + - Changed namespace to `League\HTMLToMarkdown` + - Changed packagist name to `league/html-to-markdown` + - Re-organized code into several separate classes + - `` tags with identical href and inner text are now rendered using angular bracket syntax (#31) + - `` elements are now treated as block-level elements (#33) + +## [2.2.2] +### Added + - Added support for PHP 5.6 and HHVM + - Enabled testing against PHP 7 nightlies + - Added this CHANGELOG.md + +### Fixed + - Fixed whitespace preservation between inline elements (#9 and #10) + +## [2.2.1] +### Fixed + - Preserve placeholder links (#22) + +## [2.2.0] +### Added + - Added CircleCI config + +### Changed + - `` blocks are now treated as code elements + +### Removed + - Dropped support for PHP 5.2 + - Removed incorrect README comment regarding `#text` nodes (#17) + +## [2.1.2] +### Added + - Added the ability to blacklist/remove specific node types (#11) + +### Changed + - Line breaks are now placed after divs instead of before them + - Newlines inside of link texts are now removed + - Updated the minimum PHPUnit version to 4.* + +## [2.1.1] +### Added + - Added options to customize emphasis characters + +## [2.1.0] +### Added + - Added option to strip HTML tags without Markdown equivalents + - Added `convert()` method for converter reuse + - Added ability to set options after instance construction + - Documented the required PHP extensions (#4) + +### Changed + - ATX style now used for h1 and h2 tags inside blockquotes + +### Fixed + - Newlines inside blockquotes are now started with a bracket + - Fixed some incorrect docblocks + - `__toString()` now returns an empty string if input is empty + - Convert head tag if body tag is empty (#7) + - Preserve special characters inside tags without md equivalents (#6) + + +## [2.0.1] +### Fixed + - Fixed first line indentation for multi-line code blocks + - Fixed consecutive anchors get separating spaces stripped (#3) + +## [2.0.0] +### Added + - Initial release + +[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.4.1...master +[4.4.1]: https://github.com/thephpleague/html-to-markdown/compare/4.4.0...4.4.1 +[4.4.0]: https://github.com/thephpleague/html-to-markdown/compare/4.3.1...4.4.0 +[4.3.1]: https://github.com/thephpleague/html-to-markdown/compare/4.3.0...4.3.1 +[4.3.0]: https://github.com/thephpleague/html-to-markdown/compare/4.2.2...4.3.0 +[4.2.2]: https://github.com/thephpleague/html-to-markdown/compare/4.2.1...4.2.2 +[4.2.1]: https://github.com/thephpleague/html-to-markdown/compare/4.2.0...4.2.1 +[4.2.0]: https://github.com/thephpleague/html-to-markdown/compare/4.1.1...4.2.0 +[4.1.1]: https://github.com/thephpleague/html-to-markdown/compare/4.1.0...4.1.1 +[4.1.0]: https://github.com/thephpleague/html-to-markdown/compare/4.0.1...4.1.0 +[4.0.1]: https://github.com/thephpleague/html-to-markdown/compare/4.0.0...4.0.1 +[4.0.0]: https://github.com/thephpleague/html-to-markdown/compare/3.1.1...4.0.0 +[3.1.1]: https://github.com/thephpleague/html-to-markdown/compare/3.1.0...3.1.1 +[3.1.0]: https://github.com/thephpleague/html-to-markdown/compare/3.0.0...3.1.0 +[3.0.0]: https://github.com/thephpleague/html-to-markdown/compare/2.2.2...3.0.0 +[2.2.2]: https://github.com/thephpleague/html-to-markdown/compare/2.2.1...2.2.2 +[2.2.1]: https://github.com/thephpleague/html-to-markdown/compare/2.2.0...2.2.1 +[2.2.0]: https://github.com/thephpleague/html-to-markdown/compare/2.1.2...2.2.0 +[2.1.2]: https://github.com/thephpleague/html-to-markdown/compare/2.1.1...2.1.2 +[2.1.1]: https://github.com/thephpleague/html-to-markdown/compare/2.1.0...2.1.1 +[2.1.0]: https://github.com/thephpleague/html-to-markdown/compare/2.0.1...2.1.0 +[2.0.1]: https://github.com/thephpleague/html-to-markdown/compare/2.0.0...2.0.1 +[2.0.0]: https://github.com/thephpleague/html-to-markdown/compare/775f91e...2.0.0 + diff --git a/vendor/league/html-to-markdown/CONDUCT.md b/vendor/league/html-to-markdown/CONDUCT.md new file mode 100644 index 000000000..01b8644f1 --- /dev/null +++ b/vendor/league/html-to-markdown/CONDUCT.md @@ -0,0 +1,22 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) diff --git a/library/html-to-markdown/LICENSE b/vendor/league/html-to-markdown/LICENSE similarity index 93% rename from library/html-to-markdown/LICENSE rename to vendor/league/html-to-markdown/LICENSE index f538c2ac9..6c04a59dd 100644 --- a/library/html-to-markdown/LICENSE +++ b/vendor/league/html-to-markdown/LICENSE @@ -1,6 +1,8 @@ The MIT License (MIT) -Copyright (c) 2013 Nick Cernis +Copyright (c) 2015 Colin O'Dell + +Originally created by Nick Cernis Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/vendor/league/html-to-markdown/README.md b/vendor/league/html-to-markdown/README.md new file mode 100644 index 000000000..8d75649d6 --- /dev/null +++ b/vendor/league/html-to-markdown/README.md @@ -0,0 +1,196 @@ +HTML To Markdown for PHP +======================== + +[](https://gitter.im/thephpleague/html-to-markdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +[](https://packagist.org/packages/league/html-to-markdown) +[](LICENSE) +[](https://travis-ci.org/thephpleague/html-to-markdown) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown/code-structure) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown) +[](https://packagist.org/packages/league/html-to-markdown) + +Library which converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. + + +**Requires**: PHP 5.3+ + +**Lead Developer**: [@colinodell](http://twitter.com/colinodell) + +**Original Author**: [@nickcernis](http://twitter.com/nickcernis) + + +### Why convert HTML to Markdown? + +*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](https://github.com/thephpleague/commonmark),"* you continue, already labouring the question somewhat, *"but why go the other way?"* + +Typically you would convert HTML to Markdown if: + +1. You have an existing HTML document that needs to be edited by people with good taste. +2. You want to store new content in HTML format but edit it as Markdown. +3. You want to convert HTML email to plain text email. +4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. +5. You just really like Markdown. + +### How to use it + +Require the library by issuing this command: + +```bash +composer require league/html-to-markdown +``` + +Add `require 'vendor/autoload.php';` to the top of your script. + +Next, create a new HtmlConverter instance, passing in your valid HTML code to its `convert()` function: + +```php +use League\HTMLToMarkdown\HtmlConverter; + +$converter = new HtmlConverter(); + +$html = "Quick, to the Batpoles!"; +$markdown = $converter->convert($html); +``` + +The `$markdown` variable now contains the Markdown version of your HTML as a string: + +```php +echo $markdown; // ==> ### Quick, to the Batpoles! +``` + +The included `demo` directory contains an HTML->Markdown conversion form to try out. + +### Conversion options + +By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. + +To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: + +```php +$converter = new HtmlConverter(array('strip_tags' => true)); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Or more explicitly, like this: + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('strip_tags', true); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Note that only the tags themselves are stripped, not the content they hold. + +To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: + +```php +$converter = new HtmlConverter(array('remove_nodes' => 'span div')); + +$html = 'Turnips!Monkeys!'; +$markdown = $converter->convert($html); // $markdown now contains "" +``` + +### Style options + +Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('italic_style', '_'); +$converter->getConfig()->setOption('bold_style', '__'); + +$html = 'Italic and a bold'; +$markdown = $converter->convert($html); // $markdown now contains "_Italic_ and a __bold__" +``` + +### Line break options + +By default, `br` tags are converted to two spaces followed by a newline character as per [traditional Markdown](https://daringfireball.net/projects/markdown/syntax#p). Set `hard_break` to `true` to omit the two spaces, as per GitHub Flavored Markdown (GFM). + +```php +$converter = new HtmlConverter(); +$html = 'testline break'; + +$converter->getConfig()->setOption('hard_break', true); +$markdown = $converter->convert($html); // $markdown now contains "test\nline break" + +$converter->getConfig()->setOption('hard_break', false); // default +$markdown = $converter->convert($html); // $markdown now contains "test \nline break" +``` + +### Passing custom Environment object + +You can pass current `Environment` object to customize i.e. which converters should be used. + +```php +$environment = new Environment(array( + // your configuration here +)); +$environment->addConverter(new HeaderConverter()); // optionally - add converter manually + +$converter = new HtmlConverter($environment); + +$html = 'Header + +'; +$markdown = $converter->convert($html); // $markdown now contains "### Header" and "" +``` + +### Limitations + +- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. + +### Known issues + +- Nested lists and lists containing multiple paragraphs aren't converted correctly. +- Lists inside blockquotes aren't converted correctly. +- Any reported [open issues here](https://github.com/thephpleague/html-to-markdown/issues?state=open). + +[Report your issue or request a feature here.](https://github.com/thephpleague/html-to-markdown/issues/new) Issues with patches or failing tests are especially welcome. + +### Style notes + +- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: + + `$converter = new HtmlConverter(array('header_style'=>'atx'));` + + Headers of H3 priority and lower always use atx style. + +- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. +- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. + +### Dependencies + +HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. + +Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. + +### Contributors + +Many thanks to all [contributors](https://github.com/thephpleague/html-to-markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. + +### How it works + +HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. + +### To-do + +- Support for nested lists and lists inside blockquotes. +- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). + +### Trying to convert Markdown to HTML? + +Use one of these great libraries: + + - [league/commonmark](https://github.com/thephpleague/commonmark) (recommended) + - [cebe/markdown](https://github.com/cebe/markdown) + - [PHP Markdown](https://michelf.ca/projects/php-markdown/) + - [Parsedown](https://github.com/erusev/parsedown) + +No guarantees about the Elvish, though. + diff --git a/vendor/league/html-to-markdown/bin/html-to-markdown b/vendor/league/html-to-markdown/bin/html-to-markdown new file mode 100644 index 000000000..2815a7cef --- /dev/null +++ b/vendor/league/html-to-markdown/bin/html-to-markdown @@ -0,0 +1,108 @@ +#!/usr/bin/env php + $arg) { + if ($i === 0) { + continue; + } + + if (substr($arg, 0, 1) === '-') { + switch ($arg) { + case '-h': + case '--help': + echo getHelpText(); + exit(0); + default: + fail('Unknown option: ' . $arg); + } + } else { + $src = $argv[1]; + } +} + +if (isset($src)) { + if (!file_exists($src)) { + fail('File not found: ' . $src); + } + + $html = file_get_contents($src); +} else { + $stdin = fopen('php://stdin', 'r'); + stream_set_blocking($stdin, false); + $html = stream_get_contents($stdin); + fclose($stdin); + + if (empty($html)) { + fail(getHelpText()); + } +} + + +$converter = new League\HTMLToMarkdown\HtmlConverter(); +echo $converter->convert($html); + +/** + * Get help and usage info + * + * @return string + */ +function getHelpText() +{ + return << output.md + + Converting from STDIN: + + echo -e 'Hello World!' | html-to-markdown + + Converting from STDIN and saving the output: + + echo -e 'Hello World!' | html-to-markdown > output.md + +HELP; +} + +/** + * @param string $message Error message + */ +function fail($message) +{ + fwrite(STDERR, $message . "\n"); + exit(1); +} + +function requireAutoloader() +{ + $autoloadPaths = array( + // Local package usage + __DIR__ . '/../vendor/autoload.php', + // Package was included as a library + __DIR__ . '/../../../autoload.php', + ); + foreach ($autoloadPaths as $path) { + if (file_exists($path)) { + require_once $path; + break; + } + } +} diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json new file mode 100644 index 000000000..58764bcb5 --- /dev/null +++ b/vendor/league/html-to-markdown/composer.json @@ -0,0 +1,48 @@ +{ + "name": "league/html-to-markdown", + "type": "library", + "description": "An HTML-to-markdown conversion helper for PHP", + "keywords": ["markdown", "html"], + "homepage": "https://github.com/thephpleague/html-to-markdown", + "license": "MIT", + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "League\\HTMLToMarkdown\\Test\\": "tests" + } + }, + "require": { + "php": ">=5.3.3", + "ext-dom": "*", + "ext-xml": "*" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "bin": ["bin/html-to-markdown"], + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + } +} diff --git a/vendor/league/html-to-markdown/src/Configuration.php b/vendor/league/html-to-markdown/src/Configuration.php new file mode 100644 index 000000000..2943383aa --- /dev/null +++ b/vendor/league/html-to-markdown/src/Configuration.php @@ -0,0 +1,60 @@ +config = $config; + } + + /** + * @param array $config + */ + public function merge(array $config = array()) + { + $this->config = array_replace_recursive($this->config, $config); + } + + /** + * @param array $config + */ + public function replace(array $config = array()) + { + $this->config = $config; + } + + /** + * @param string $key + * @param mixed $value + */ + public function setOption($key, $value) + { + $this->config[$key] = $value; + } + + /** + * @param string|null $key + * @param mixed|null $default + * + * @return mixed|null + */ + public function getOption($key = null, $default = null) + { + if ($key === null) { + return $this->config; + } + + if (!isset($this->config[$key])) { + return $default; + } + + return $this->config[$key]; + } +} diff --git a/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php new file mode 100644 index 000000000..8aca530be --- /dev/null +++ b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php @@ -0,0 +1,11 @@ +' symbols to each line. + + $markdown = ''; + + $quote_content = trim($element->getValue()); + + $lines = preg_split('/\r\n|\r|\n/', $quote_content); + + $total_lines = count($lines); + + foreach ($lines as $i => $line) { + $markdown .= '> ' . $line . "\n"; + if ($i + 1 === $total_lines) { + $markdown .= "\n"; + } + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('blockquote'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php new file mode 100644 index 000000000..c8ec2c005 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php @@ -0,0 +1,62 @@ +getAttribute('class'); + + if ($classes) { + // Since tags can have more than one class, we need to find the one that starts with 'language-' + $classes = explode(' ', $classes); + foreach ($classes as $class) { + if (strpos($class, 'language-') !== false) { + // Found one, save it as the selected language and stop looping over the classes. + // The space after the language avoids gluing the actual code with the language tag + $language = str_replace('language-', '', $class) . ' '; + break; + } + } + } + + $markdown = ''; + $code = html_entity_decode($element->getChildrenAsString()); + + // In order to remove the code tags we need to search for them and, in the case of the opening tag + // use a regular expression to find the tag and the other attributes it might have + $code = preg_replace('/]*>/', '', $code); + $code = str_replace('', '', $code); + + // Checking if the code has multiple lines + $lines = preg_split('/\r\n|\r|\n/', $code); + if (count($lines) > 1) { + // Multiple lines detected, adding three backticks and newlines + $markdown .= '```' . $language . "\n" . $code . "\n" . '```'; + } else { + // One line of code, wrapping it on one backtick. + $markdown .= '`' . $language . $code . '`'; + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('code'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CommentConverter.php b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php new file mode 100644 index 000000000..55038b254 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php @@ -0,0 +1,26 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, + // such as nodes on their own. C14N() canonicalizes the node to a string. + // See: http://www.php.net/manual/en/domnode.c14n.php + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue(); + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array(self::DEFAULT_CONVERTER); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/DivConverter.php b/vendor/league/html-to-markdown/src/Converter/DivConverter.php new file mode 100644 index 000000000..656a0ba4d --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/DivConverter.php @@ -0,0 +1,45 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue() . "\n\n"; + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('div'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php new file mode 100644 index 000000000..67250769b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php @@ -0,0 +1,57 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $tag = $element->getTagName(); + $value = $element->getValue(); + + if (!trim($value)) { + return ''; + } + + if ($tag === 'i' || $tag === 'em') { + $style = $this->config->getOption('italic_style'); + } else { + $style = $this->config->getOption('bold_style'); + } + + $prefix = ltrim($value) !== $value ? ' ' : ''; + $suffix = rtrim($value) !== $value ? ' ' : ''; + + return $prefix . $style . trim($value) . $style . $suffix; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('em', 'i', 'strong', 'b'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php new file mode 100644 index 000000000..37cd44e73 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php @@ -0,0 +1,41 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + return $this->config->getOption('hard_break') ? "\n" : " \n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('br'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php new file mode 100644 index 000000000..d117e7d36 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php @@ -0,0 +1,78 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $level = (int) substr($element->getTagName(), 1, 1); + $style = $this->config->getOption('header_style', self::STYLE_SETEXT); + + if (($level === 1 || $level === 2) && !$element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) { + return $this->createSetextHeader($level, $element->getValue()); + } + + return $this->createAtxHeader($level, $element->getValue()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'); + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createSetextHeader($level, $content) + { + $length = function_exists('mb_strlen') ? mb_strlen($content, 'utf-8') : strlen($content); + $underline = ($level === 1) ? '=' : '-'; + + return $content . "\n" . str_repeat($underline, $length) . "\n\n"; + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createAtxHeader($level, $content) + { + $prefix = str_repeat('#', $level) . ' '; + + return $prefix . $content . "\n\n"; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php new file mode 100644 index 000000000..8f54f9397 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php @@ -0,0 +1,26 @@ +getAttribute('src'); + $alt = $element->getAttribute('alt'); + $title = $element->getAttribute('title'); + + if ($title !== '') { + // No newlines added. should be in a block-level element. + return ''; + } + + return ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('img'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php new file mode 100644 index 000000000..f0765f38b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php @@ -0,0 +1,52 @@ +getAttribute('href'); + $title = $element->getAttribute('title'); + $text = trim($element->getValue()); + + if ($title !== '') { + $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; + } elseif ($href === $text && $this->isValidAutolink($href)) { + $markdown = '<' . $href . '>'; + } else { + $markdown = '[' . $text . '](' . $href . ')'; + } + + if (!$href) { + $markdown = html_entity_decode($element->getChildrenAsString()); + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('a'); + } + + /** + * @param string $href + * + * @return bool + */ + private function isValidAutolink($href) + { + return preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php new file mode 100644 index 000000000..07a4c85a9 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php @@ -0,0 +1,26 @@ +getValue() . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('ol', 'ul'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php new file mode 100644 index 000000000..dafec077c --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php @@ -0,0 +1,47 @@ +getParent()->getTagName(); + + // Add spaces to start for nested list items + $level = $element->getListItemLevel($element); + + $prefixForParagraph = str_repeat(' ', $level + 1); + $value = trim(implode("\n" . $prefixForParagraph, explode("\n", trim($element->getValue())))); + + // If list item is the first in a nested list, add a newline before it + $prefix = ''; + if ($level > 0 && $element->getSiblingPosition() === 1) { + $prefix = "\n"; + } + + if ($list_type === 'ul') { + return $prefix . '- ' . $value . "\n"; + } + + $number = $element->getSiblingPosition(); + + return $prefix . $number . '. ' . $value . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('li'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php new file mode 100644 index 000000000..cf852bfcf --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php @@ -0,0 +1,124 @@ +getValue(); + + $markdown = ''; + + $lines = preg_split('/\r\n|\r|\n/', $value); + foreach ($lines as $line) { + /* + * Some special characters need to be escaped based on the position that they appear + * The following function will deal with those special cases. + */ + $markdown .= $this->escapeSpecialCharacters($line); + $markdown .= "\n"; + } + + return trim($markdown) !== '' ? rtrim($markdown) . "\n\n" : ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('p'); + } + + /** + * @param string $line + * + * @return string + */ + private function escapeSpecialCharacters($line) + { + $line = $this->escapeFirstCharacters($line); + $line = $this->escapeOtherCharacters($line); + $line = $this->escapeOtherCharactersRegex($line); + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeFirstCharacters($line) + { + $escapable = array( + '>', + '- ', + '+ ', + '--', + '~~~', + '---', + '- - -' + ); + + foreach ($escapable as $i) { + if (strpos(ltrim($line), $i) === 0) { + // Found a character that must be escaped, adding a backslash before + return '\\' . ltrim($line); + } + } + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeOtherCharacters($line) + { + $escapable = array( + ' {{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache_duration}} diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl index a8243b614..e65014413 100644 --- a/view/templates/admin_summary.tpl +++ b/view/templates/admin_summary.tpl @@ -11,7 +11,7 @@ {{$queues.label}} - {{$queues.deliverq}} - {{$queues.queue}} - {{$queues.workerq}} + {{$queues.queue}} - {{$queues.workerq}} {{$pending.0}} diff --git a/view/templates/head.tpl b/view/templates/head.tpl index 0772af0bc..e7df8a18c 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -7,7 +7,7 @@ - + @@ -19,6 +19,7 @@ +
` conversions to use backticks instead of indendation (#102) + +### Fixed + - Fixed issue where specified code language was not preserved (#70, #102) + - Fixed issue where `` tags nested in `` was not converted properly (#70, #102) + - Fixed header-like content not being escaped (#76, #105) + - Fixed blockquote-like content not being escaped (#77, #103) + - Fixed ordered list-like content not being escaped (#73, #106) + - Fixed unordered list-like content not being escaped (#71, #107) + +## [4.2.2] +### Fixed + - Fixed sanitization bug which sometimes removes desired content (#63, #101) + +## [4.2.1] +### Fixed + - Fixed path to autoload.php when used as a library (#98) + - Fixed edge case for tags containing only whitespace (#99) + +### Removed + - Removed double HTML entity decoding, as this is not desireable (#60) + +## [4.2.0] + +### Added + - Added the ability to invoke HtmlConverter objects as functions (#85) + +### Fixed + - Fixed improper handling of nested list items (#19 and #84) + - Fixed preceeding or trailing spaces within emphasis tags (#83) + +## [4.1.1] + +### Fixed + - Fixed conversion of empty paragraphs (#78) + - Fixed `preg_replace` so it wouldn't break UTF-8 characters (#79) + +## [4.1.0] + +### Added + - Added `bin/html-to-markdown` script + +### Changed + - Changed default italic character to `_` (#58) + +## [4.0.1] + +### Fixed + - Added escaping to avoid * and _ in a text being rendered as emphasis (#48) + +### Removed + - Removed the demo (#51) + - `.styleci.yml` and `CONTRIBUTING.md` are no longer included in distributions (#50) + +## [4.0.0] + +This release changes the visibility of several methods/properties. #42 and #43 brought to light that some visiblities were +not ideally set, so this releases fixes that. Moving forwards this should reduce the chance of introducing BC-breaking changes. + +### Added + - Added new `HtmlConverter::getEnvironment()` method to expose the `Environment` (#42, #43) + +### Changed + - Changed `Environment::addConverter()` from `protected` to `public`, enabling custom converters to be added (#42, #43) + - Changed `HtmlConverter::createDOMDocument()` from `protected` to `private` + - Changed `Element::nextCached` from `protected` to `private` + - Made the `Environment` class `final` + +## [3.1.1] +### Fixed + - Empty HTML strings now result in empty Markdown documents (#40, #41) + +## [3.1.0] +### Added + - Added new `equals` method to `Element` to check for equality + +### Changes + - Use Linux line endings consistently instead of plaform-specific line endings (#36) + +### Fixed + - Cleaned up code style + +## [3.0.0] +### Changed + - Changed namespace to `League\HTMLToMarkdown` + - Changed packagist name to `league/html-to-markdown` + - Re-organized code into several separate classes + - `` tags with identical href and inner text are now rendered using angular bracket syntax (#31) + - `` elements are now treated as block-level elements (#33) + +## [2.2.2] +### Added + - Added support for PHP 5.6 and HHVM + - Enabled testing against PHP 7 nightlies + - Added this CHANGELOG.md + +### Fixed + - Fixed whitespace preservation between inline elements (#9 and #10) + +## [2.2.1] +### Fixed + - Preserve placeholder links (#22) + +## [2.2.0] +### Added + - Added CircleCI config + +### Changed + - `` blocks are now treated as code elements + +### Removed + - Dropped support for PHP 5.2 + - Removed incorrect README comment regarding `#text` nodes (#17) + +## [2.1.2] +### Added + - Added the ability to blacklist/remove specific node types (#11) + +### Changed + - Line breaks are now placed after divs instead of before them + - Newlines inside of link texts are now removed + - Updated the minimum PHPUnit version to 4.* + +## [2.1.1] +### Added + - Added options to customize emphasis characters + +## [2.1.0] +### Added + - Added option to strip HTML tags without Markdown equivalents + - Added `convert()` method for converter reuse + - Added ability to set options after instance construction + - Documented the required PHP extensions (#4) + +### Changed + - ATX style now used for h1 and h2 tags inside blockquotes + +### Fixed + - Newlines inside blockquotes are now started with a bracket + - Fixed some incorrect docblocks + - `__toString()` now returns an empty string if input is empty + - Convert head tag if body tag is empty (#7) + - Preserve special characters inside tags without md equivalents (#6) + + +## [2.0.1] +### Fixed + - Fixed first line indentation for multi-line code blocks + - Fixed consecutive anchors get separating spaces stripped (#3) + +## [2.0.0] +### Added + - Initial release + +[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.4.1...master +[4.4.1]: https://github.com/thephpleague/html-to-markdown/compare/4.4.0...4.4.1 +[4.4.0]: https://github.com/thephpleague/html-to-markdown/compare/4.3.1...4.4.0 +[4.3.1]: https://github.com/thephpleague/html-to-markdown/compare/4.3.0...4.3.1 +[4.3.0]: https://github.com/thephpleague/html-to-markdown/compare/4.2.2...4.3.0 +[4.2.2]: https://github.com/thephpleague/html-to-markdown/compare/4.2.1...4.2.2 +[4.2.1]: https://github.com/thephpleague/html-to-markdown/compare/4.2.0...4.2.1 +[4.2.0]: https://github.com/thephpleague/html-to-markdown/compare/4.1.1...4.2.0 +[4.1.1]: https://github.com/thephpleague/html-to-markdown/compare/4.1.0...4.1.1 +[4.1.0]: https://github.com/thephpleague/html-to-markdown/compare/4.0.1...4.1.0 +[4.0.1]: https://github.com/thephpleague/html-to-markdown/compare/4.0.0...4.0.1 +[4.0.0]: https://github.com/thephpleague/html-to-markdown/compare/3.1.1...4.0.0 +[3.1.1]: https://github.com/thephpleague/html-to-markdown/compare/3.1.0...3.1.1 +[3.1.0]: https://github.com/thephpleague/html-to-markdown/compare/3.0.0...3.1.0 +[3.0.0]: https://github.com/thephpleague/html-to-markdown/compare/2.2.2...3.0.0 +[2.2.2]: https://github.com/thephpleague/html-to-markdown/compare/2.2.1...2.2.2 +[2.2.1]: https://github.com/thephpleague/html-to-markdown/compare/2.2.0...2.2.1 +[2.2.0]: https://github.com/thephpleague/html-to-markdown/compare/2.1.2...2.2.0 +[2.1.2]: https://github.com/thephpleague/html-to-markdown/compare/2.1.1...2.1.2 +[2.1.1]: https://github.com/thephpleague/html-to-markdown/compare/2.1.0...2.1.1 +[2.1.0]: https://github.com/thephpleague/html-to-markdown/compare/2.0.1...2.1.0 +[2.0.1]: https://github.com/thephpleague/html-to-markdown/compare/2.0.0...2.0.1 +[2.0.0]: https://github.com/thephpleague/html-to-markdown/compare/775f91e...2.0.0 + diff --git a/vendor/league/html-to-markdown/CONDUCT.md b/vendor/league/html-to-markdown/CONDUCT.md new file mode 100644 index 000000000..01b8644f1 --- /dev/null +++ b/vendor/league/html-to-markdown/CONDUCT.md @@ -0,0 +1,22 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) diff --git a/library/html-to-markdown/LICENSE b/vendor/league/html-to-markdown/LICENSE similarity index 93% rename from library/html-to-markdown/LICENSE rename to vendor/league/html-to-markdown/LICENSE index f538c2ac9..6c04a59dd 100644 --- a/library/html-to-markdown/LICENSE +++ b/vendor/league/html-to-markdown/LICENSE @@ -1,6 +1,8 @@ The MIT License (MIT) -Copyright (c) 2013 Nick Cernis +Copyright (c) 2015 Colin O'Dell + +Originally created by Nick Cernis Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/vendor/league/html-to-markdown/README.md b/vendor/league/html-to-markdown/README.md new file mode 100644 index 000000000..8d75649d6 --- /dev/null +++ b/vendor/league/html-to-markdown/README.md @@ -0,0 +1,196 @@ +HTML To Markdown for PHP +======================== + +[](https://gitter.im/thephpleague/html-to-markdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +[](https://packagist.org/packages/league/html-to-markdown) +[](LICENSE) +[](https://travis-ci.org/thephpleague/html-to-markdown) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown/code-structure) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown) +[](https://packagist.org/packages/league/html-to-markdown) + +Library which converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. + + +**Requires**: PHP 5.3+ + +**Lead Developer**: [@colinodell](http://twitter.com/colinodell) + +**Original Author**: [@nickcernis](http://twitter.com/nickcernis) + + +### Why convert HTML to Markdown? + +*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](https://github.com/thephpleague/commonmark),"* you continue, already labouring the question somewhat, *"but why go the other way?"* + +Typically you would convert HTML to Markdown if: + +1. You have an existing HTML document that needs to be edited by people with good taste. +2. You want to store new content in HTML format but edit it as Markdown. +3. You want to convert HTML email to plain text email. +4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. +5. You just really like Markdown. + +### How to use it + +Require the library by issuing this command: + +```bash +composer require league/html-to-markdown +``` + +Add `require 'vendor/autoload.php';` to the top of your script. + +Next, create a new HtmlConverter instance, passing in your valid HTML code to its `convert()` function: + +```php +use League\HTMLToMarkdown\HtmlConverter; + +$converter = new HtmlConverter(); + +$html = "Quick, to the Batpoles!"; +$markdown = $converter->convert($html); +``` + +The `$markdown` variable now contains the Markdown version of your HTML as a string: + +```php +echo $markdown; // ==> ### Quick, to the Batpoles! +``` + +The included `demo` directory contains an HTML->Markdown conversion form to try out. + +### Conversion options + +By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. + +To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: + +```php +$converter = new HtmlConverter(array('strip_tags' => true)); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Or more explicitly, like this: + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('strip_tags', true); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Note that only the tags themselves are stripped, not the content they hold. + +To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: + +```php +$converter = new HtmlConverter(array('remove_nodes' => 'span div')); + +$html = 'Turnips!Monkeys!'; +$markdown = $converter->convert($html); // $markdown now contains "" +``` + +### Style options + +Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('italic_style', '_'); +$converter->getConfig()->setOption('bold_style', '__'); + +$html = 'Italic and a bold'; +$markdown = $converter->convert($html); // $markdown now contains "_Italic_ and a __bold__" +``` + +### Line break options + +By default, `br` tags are converted to two spaces followed by a newline character as per [traditional Markdown](https://daringfireball.net/projects/markdown/syntax#p). Set `hard_break` to `true` to omit the two spaces, as per GitHub Flavored Markdown (GFM). + +```php +$converter = new HtmlConverter(); +$html = 'testline break'; + +$converter->getConfig()->setOption('hard_break', true); +$markdown = $converter->convert($html); // $markdown now contains "test\nline break" + +$converter->getConfig()->setOption('hard_break', false); // default +$markdown = $converter->convert($html); // $markdown now contains "test \nline break" +``` + +### Passing custom Environment object + +You can pass current `Environment` object to customize i.e. which converters should be used. + +```php +$environment = new Environment(array( + // your configuration here +)); +$environment->addConverter(new HeaderConverter()); // optionally - add converter manually + +$converter = new HtmlConverter($environment); + +$html = 'Header + +'; +$markdown = $converter->convert($html); // $markdown now contains "### Header" and "" +``` + +### Limitations + +- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. + +### Known issues + +- Nested lists and lists containing multiple paragraphs aren't converted correctly. +- Lists inside blockquotes aren't converted correctly. +- Any reported [open issues here](https://github.com/thephpleague/html-to-markdown/issues?state=open). + +[Report your issue or request a feature here.](https://github.com/thephpleague/html-to-markdown/issues/new) Issues with patches or failing tests are especially welcome. + +### Style notes + +- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: + + `$converter = new HtmlConverter(array('header_style'=>'atx'));` + + Headers of H3 priority and lower always use atx style. + +- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. +- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. + +### Dependencies + +HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. + +Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. + +### Contributors + +Many thanks to all [contributors](https://github.com/thephpleague/html-to-markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. + +### How it works + +HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. + +### To-do + +- Support for nested lists and lists inside blockquotes. +- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). + +### Trying to convert Markdown to HTML? + +Use one of these great libraries: + + - [league/commonmark](https://github.com/thephpleague/commonmark) (recommended) + - [cebe/markdown](https://github.com/cebe/markdown) + - [PHP Markdown](https://michelf.ca/projects/php-markdown/) + - [Parsedown](https://github.com/erusev/parsedown) + +No guarantees about the Elvish, though. + diff --git a/vendor/league/html-to-markdown/bin/html-to-markdown b/vendor/league/html-to-markdown/bin/html-to-markdown new file mode 100644 index 000000000..2815a7cef --- /dev/null +++ b/vendor/league/html-to-markdown/bin/html-to-markdown @@ -0,0 +1,108 @@ +#!/usr/bin/env php + $arg) { + if ($i === 0) { + continue; + } + + if (substr($arg, 0, 1) === '-') { + switch ($arg) { + case '-h': + case '--help': + echo getHelpText(); + exit(0); + default: + fail('Unknown option: ' . $arg); + } + } else { + $src = $argv[1]; + } +} + +if (isset($src)) { + if (!file_exists($src)) { + fail('File not found: ' . $src); + } + + $html = file_get_contents($src); +} else { + $stdin = fopen('php://stdin', 'r'); + stream_set_blocking($stdin, false); + $html = stream_get_contents($stdin); + fclose($stdin); + + if (empty($html)) { + fail(getHelpText()); + } +} + + +$converter = new League\HTMLToMarkdown\HtmlConverter(); +echo $converter->convert($html); + +/** + * Get help and usage info + * + * @return string + */ +function getHelpText() +{ + return << output.md + + Converting from STDIN: + + echo -e 'Hello World!' | html-to-markdown + + Converting from STDIN and saving the output: + + echo -e 'Hello World!' | html-to-markdown > output.md + +HELP; +} + +/** + * @param string $message Error message + */ +function fail($message) +{ + fwrite(STDERR, $message . "\n"); + exit(1); +} + +function requireAutoloader() +{ + $autoloadPaths = array( + // Local package usage + __DIR__ . '/../vendor/autoload.php', + // Package was included as a library + __DIR__ . '/../../../autoload.php', + ); + foreach ($autoloadPaths as $path) { + if (file_exists($path)) { + require_once $path; + break; + } + } +} diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json new file mode 100644 index 000000000..58764bcb5 --- /dev/null +++ b/vendor/league/html-to-markdown/composer.json @@ -0,0 +1,48 @@ +{ + "name": "league/html-to-markdown", + "type": "library", + "description": "An HTML-to-markdown conversion helper for PHP", + "keywords": ["markdown", "html"], + "homepage": "https://github.com/thephpleague/html-to-markdown", + "license": "MIT", + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "League\\HTMLToMarkdown\\Test\\": "tests" + } + }, + "require": { + "php": ">=5.3.3", + "ext-dom": "*", + "ext-xml": "*" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "bin": ["bin/html-to-markdown"], + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + } +} diff --git a/vendor/league/html-to-markdown/src/Configuration.php b/vendor/league/html-to-markdown/src/Configuration.php new file mode 100644 index 000000000..2943383aa --- /dev/null +++ b/vendor/league/html-to-markdown/src/Configuration.php @@ -0,0 +1,60 @@ +config = $config; + } + + /** + * @param array $config + */ + public function merge(array $config = array()) + { + $this->config = array_replace_recursive($this->config, $config); + } + + /** + * @param array $config + */ + public function replace(array $config = array()) + { + $this->config = $config; + } + + /** + * @param string $key + * @param mixed $value + */ + public function setOption($key, $value) + { + $this->config[$key] = $value; + } + + /** + * @param string|null $key + * @param mixed|null $default + * + * @return mixed|null + */ + public function getOption($key = null, $default = null) + { + if ($key === null) { + return $this->config; + } + + if (!isset($this->config[$key])) { + return $default; + } + + return $this->config[$key]; + } +} diff --git a/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php new file mode 100644 index 000000000..8aca530be --- /dev/null +++ b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php @@ -0,0 +1,11 @@ +' symbols to each line. + + $markdown = ''; + + $quote_content = trim($element->getValue()); + + $lines = preg_split('/\r\n|\r|\n/', $quote_content); + + $total_lines = count($lines); + + foreach ($lines as $i => $line) { + $markdown .= '> ' . $line . "\n"; + if ($i + 1 === $total_lines) { + $markdown .= "\n"; + } + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('blockquote'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php new file mode 100644 index 000000000..c8ec2c005 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php @@ -0,0 +1,62 @@ +getAttribute('class'); + + if ($classes) { + // Since tags can have more than one class, we need to find the one that starts with 'language-' + $classes = explode(' ', $classes); + foreach ($classes as $class) { + if (strpos($class, 'language-') !== false) { + // Found one, save it as the selected language and stop looping over the classes. + // The space after the language avoids gluing the actual code with the language tag + $language = str_replace('language-', '', $class) . ' '; + break; + } + } + } + + $markdown = ''; + $code = html_entity_decode($element->getChildrenAsString()); + + // In order to remove the code tags we need to search for them and, in the case of the opening tag + // use a regular expression to find the tag and the other attributes it might have + $code = preg_replace('/]*>/', '', $code); + $code = str_replace('', '', $code); + + // Checking if the code has multiple lines + $lines = preg_split('/\r\n|\r|\n/', $code); + if (count($lines) > 1) { + // Multiple lines detected, adding three backticks and newlines + $markdown .= '```' . $language . "\n" . $code . "\n" . '```'; + } else { + // One line of code, wrapping it on one backtick. + $markdown .= '`' . $language . $code . '`'; + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('code'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CommentConverter.php b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php new file mode 100644 index 000000000..55038b254 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php @@ -0,0 +1,26 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, + // such as nodes on their own. C14N() canonicalizes the node to a string. + // See: http://www.php.net/manual/en/domnode.c14n.php + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue(); + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array(self::DEFAULT_CONVERTER); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/DivConverter.php b/vendor/league/html-to-markdown/src/Converter/DivConverter.php new file mode 100644 index 000000000..656a0ba4d --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/DivConverter.php @@ -0,0 +1,45 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue() . "\n\n"; + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('div'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php new file mode 100644 index 000000000..67250769b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php @@ -0,0 +1,57 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $tag = $element->getTagName(); + $value = $element->getValue(); + + if (!trim($value)) { + return ''; + } + + if ($tag === 'i' || $tag === 'em') { + $style = $this->config->getOption('italic_style'); + } else { + $style = $this->config->getOption('bold_style'); + } + + $prefix = ltrim($value) !== $value ? ' ' : ''; + $suffix = rtrim($value) !== $value ? ' ' : ''; + + return $prefix . $style . trim($value) . $style . $suffix; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('em', 'i', 'strong', 'b'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php new file mode 100644 index 000000000..37cd44e73 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php @@ -0,0 +1,41 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + return $this->config->getOption('hard_break') ? "\n" : " \n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('br'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php new file mode 100644 index 000000000..d117e7d36 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php @@ -0,0 +1,78 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $level = (int) substr($element->getTagName(), 1, 1); + $style = $this->config->getOption('header_style', self::STYLE_SETEXT); + + if (($level === 1 || $level === 2) && !$element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) { + return $this->createSetextHeader($level, $element->getValue()); + } + + return $this->createAtxHeader($level, $element->getValue()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'); + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createSetextHeader($level, $content) + { + $length = function_exists('mb_strlen') ? mb_strlen($content, 'utf-8') : strlen($content); + $underline = ($level === 1) ? '=' : '-'; + + return $content . "\n" . str_repeat($underline, $length) . "\n\n"; + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createAtxHeader($level, $content) + { + $prefix = str_repeat('#', $level) . ' '; + + return $prefix . $content . "\n\n"; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php new file mode 100644 index 000000000..8f54f9397 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php @@ -0,0 +1,26 @@ +getAttribute('src'); + $alt = $element->getAttribute('alt'); + $title = $element->getAttribute('title'); + + if ($title !== '') { + // No newlines added. should be in a block-level element. + return ''; + } + + return ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('img'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php new file mode 100644 index 000000000..f0765f38b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php @@ -0,0 +1,52 @@ +getAttribute('href'); + $title = $element->getAttribute('title'); + $text = trim($element->getValue()); + + if ($title !== '') { + $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; + } elseif ($href === $text && $this->isValidAutolink($href)) { + $markdown = '<' . $href . '>'; + } else { + $markdown = '[' . $text . '](' . $href . ')'; + } + + if (!$href) { + $markdown = html_entity_decode($element->getChildrenAsString()); + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('a'); + } + + /** + * @param string $href + * + * @return bool + */ + private function isValidAutolink($href) + { + return preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php new file mode 100644 index 000000000..07a4c85a9 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php @@ -0,0 +1,26 @@ +getValue() . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('ol', 'ul'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php new file mode 100644 index 000000000..dafec077c --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php @@ -0,0 +1,47 @@ +getParent()->getTagName(); + + // Add spaces to start for nested list items + $level = $element->getListItemLevel($element); + + $prefixForParagraph = str_repeat(' ', $level + 1); + $value = trim(implode("\n" . $prefixForParagraph, explode("\n", trim($element->getValue())))); + + // If list item is the first in a nested list, add a newline before it + $prefix = ''; + if ($level > 0 && $element->getSiblingPosition() === 1) { + $prefix = "\n"; + } + + if ($list_type === 'ul') { + return $prefix . '- ' . $value . "\n"; + } + + $number = $element->getSiblingPosition(); + + return $prefix . $number . '. ' . $value . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('li'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php new file mode 100644 index 000000000..cf852bfcf --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php @@ -0,0 +1,124 @@ +getValue(); + + $markdown = ''; + + $lines = preg_split('/\r\n|\r|\n/', $value); + foreach ($lines as $line) { + /* + * Some special characters need to be escaped based on the position that they appear + * The following function will deal with those special cases. + */ + $markdown .= $this->escapeSpecialCharacters($line); + $markdown .= "\n"; + } + + return trim($markdown) !== '' ? rtrim($markdown) . "\n\n" : ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('p'); + } + + /** + * @param string $line + * + * @return string + */ + private function escapeSpecialCharacters($line) + { + $line = $this->escapeFirstCharacters($line); + $line = $this->escapeOtherCharacters($line); + $line = $this->escapeOtherCharactersRegex($line); + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeFirstCharacters($line) + { + $escapable = array( + '>', + '- ', + '+ ', + '--', + '~~~', + '---', + '- - -' + ); + + foreach ($escapable as $i) { + if (strpos(ltrim($line), $i) === 0) { + // Found a character that must be escaped, adding a backslash before + return '\\' . ltrim($line); + } + } + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeOtherCharacters($line) + { + $escapable = array( + ' {{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache_duration}} diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl index a8243b614..e65014413 100644 --- a/view/templates/admin_summary.tpl +++ b/view/templates/admin_summary.tpl @@ -11,7 +11,7 @@ {{$queues.label}} - {{$queues.deliverq}} - {{$queues.queue}} - {{$queues.workerq}} + {{$queues.queue}} - {{$queues.workerq}} {{$pending.0}} diff --git a/view/templates/head.tpl b/view/templates/head.tpl index 0772af0bc..e7df8a18c 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -7,7 +7,7 @@ - + @@ -19,6 +19,7 @@ +
` tags nested in `` was not converted properly (#70, #102) + - Fixed header-like content not being escaped (#76, #105) + - Fixed blockquote-like content not being escaped (#77, #103) + - Fixed ordered list-like content not being escaped (#73, #106) + - Fixed unordered list-like content not being escaped (#71, #107) + +## [4.2.2] +### Fixed + - Fixed sanitization bug which sometimes removes desired content (#63, #101) + +## [4.2.1] +### Fixed + - Fixed path to autoload.php when used as a library (#98) + - Fixed edge case for tags containing only whitespace (#99) + +### Removed + - Removed double HTML entity decoding, as this is not desireable (#60) + +## [4.2.0] + +### Added + - Added the ability to invoke HtmlConverter objects as functions (#85) + +### Fixed + - Fixed improper handling of nested list items (#19 and #84) + - Fixed preceeding or trailing spaces within emphasis tags (#83) + +## [4.1.1] + +### Fixed + - Fixed conversion of empty paragraphs (#78) + - Fixed `preg_replace` so it wouldn't break UTF-8 characters (#79) + +## [4.1.0] + +### Added + - Added `bin/html-to-markdown` script + +### Changed + - Changed default italic character to `_` (#58) + +## [4.0.1] + +### Fixed + - Added escaping to avoid * and _ in a text being rendered as emphasis (#48) + +### Removed + - Removed the demo (#51) + - `.styleci.yml` and `CONTRIBUTING.md` are no longer included in distributions (#50) + +## [4.0.0] + +This release changes the visibility of several methods/properties. #42 and #43 brought to light that some visiblities were +not ideally set, so this releases fixes that. Moving forwards this should reduce the chance of introducing BC-breaking changes. + +### Added + - Added new `HtmlConverter::getEnvironment()` method to expose the `Environment` (#42, #43) + +### Changed + - Changed `Environment::addConverter()` from `protected` to `public`, enabling custom converters to be added (#42, #43) + - Changed `HtmlConverter::createDOMDocument()` from `protected` to `private` + - Changed `Element::nextCached` from `protected` to `private` + - Made the `Environment` class `final` + +## [3.1.1] +### Fixed + - Empty HTML strings now result in empty Markdown documents (#40, #41) + +## [3.1.0] +### Added + - Added new `equals` method to `Element` to check for equality + +### Changes + - Use Linux line endings consistently instead of plaform-specific line endings (#36) + +### Fixed + - Cleaned up code style + +## [3.0.0] +### Changed + - Changed namespace to `League\HTMLToMarkdown` + - Changed packagist name to `league/html-to-markdown` + - Re-organized code into several separate classes + - `` tags with identical href and inner text are now rendered using angular bracket syntax (#31) + - `` elements are now treated as block-level elements (#33) + +## [2.2.2] +### Added + - Added support for PHP 5.6 and HHVM + - Enabled testing against PHP 7 nightlies + - Added this CHANGELOG.md + +### Fixed + - Fixed whitespace preservation between inline elements (#9 and #10) + +## [2.2.1] +### Fixed + - Preserve placeholder links (#22) + +## [2.2.0] +### Added + - Added CircleCI config + +### Changed + - `` blocks are now treated as code elements + +### Removed + - Dropped support for PHP 5.2 + - Removed incorrect README comment regarding `#text` nodes (#17) + +## [2.1.2] +### Added + - Added the ability to blacklist/remove specific node types (#11) + +### Changed + - Line breaks are now placed after divs instead of before them + - Newlines inside of link texts are now removed + - Updated the minimum PHPUnit version to 4.* + +## [2.1.1] +### Added + - Added options to customize emphasis characters + +## [2.1.0] +### Added + - Added option to strip HTML tags without Markdown equivalents + - Added `convert()` method for converter reuse + - Added ability to set options after instance construction + - Documented the required PHP extensions (#4) + +### Changed + - ATX style now used for h1 and h2 tags inside blockquotes + +### Fixed + - Newlines inside blockquotes are now started with a bracket + - Fixed some incorrect docblocks + - `__toString()` now returns an empty string if input is empty + - Convert head tag if body tag is empty (#7) + - Preserve special characters inside tags without md equivalents (#6) + + +## [2.0.1] +### Fixed + - Fixed first line indentation for multi-line code blocks + - Fixed consecutive anchors get separating spaces stripped (#3) + +## [2.0.0] +### Added + - Initial release + +[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.4.1...master +[4.4.1]: https://github.com/thephpleague/html-to-markdown/compare/4.4.0...4.4.1 +[4.4.0]: https://github.com/thephpleague/html-to-markdown/compare/4.3.1...4.4.0 +[4.3.1]: https://github.com/thephpleague/html-to-markdown/compare/4.3.0...4.3.1 +[4.3.0]: https://github.com/thephpleague/html-to-markdown/compare/4.2.2...4.3.0 +[4.2.2]: https://github.com/thephpleague/html-to-markdown/compare/4.2.1...4.2.2 +[4.2.1]: https://github.com/thephpleague/html-to-markdown/compare/4.2.0...4.2.1 +[4.2.0]: https://github.com/thephpleague/html-to-markdown/compare/4.1.1...4.2.0 +[4.1.1]: https://github.com/thephpleague/html-to-markdown/compare/4.1.0...4.1.1 +[4.1.0]: https://github.com/thephpleague/html-to-markdown/compare/4.0.1...4.1.0 +[4.0.1]: https://github.com/thephpleague/html-to-markdown/compare/4.0.0...4.0.1 +[4.0.0]: https://github.com/thephpleague/html-to-markdown/compare/3.1.1...4.0.0 +[3.1.1]: https://github.com/thephpleague/html-to-markdown/compare/3.1.0...3.1.1 +[3.1.0]: https://github.com/thephpleague/html-to-markdown/compare/3.0.0...3.1.0 +[3.0.0]: https://github.com/thephpleague/html-to-markdown/compare/2.2.2...3.0.0 +[2.2.2]: https://github.com/thephpleague/html-to-markdown/compare/2.2.1...2.2.2 +[2.2.1]: https://github.com/thephpleague/html-to-markdown/compare/2.2.0...2.2.1 +[2.2.0]: https://github.com/thephpleague/html-to-markdown/compare/2.1.2...2.2.0 +[2.1.2]: https://github.com/thephpleague/html-to-markdown/compare/2.1.1...2.1.2 +[2.1.1]: https://github.com/thephpleague/html-to-markdown/compare/2.1.0...2.1.1 +[2.1.0]: https://github.com/thephpleague/html-to-markdown/compare/2.0.1...2.1.0 +[2.0.1]: https://github.com/thephpleague/html-to-markdown/compare/2.0.0...2.0.1 +[2.0.0]: https://github.com/thephpleague/html-to-markdown/compare/775f91e...2.0.0 + diff --git a/vendor/league/html-to-markdown/CONDUCT.md b/vendor/league/html-to-markdown/CONDUCT.md new file mode 100644 index 000000000..01b8644f1 --- /dev/null +++ b/vendor/league/html-to-markdown/CONDUCT.md @@ -0,0 +1,22 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) diff --git a/library/html-to-markdown/LICENSE b/vendor/league/html-to-markdown/LICENSE similarity index 93% rename from library/html-to-markdown/LICENSE rename to vendor/league/html-to-markdown/LICENSE index f538c2ac9..6c04a59dd 100644 --- a/library/html-to-markdown/LICENSE +++ b/vendor/league/html-to-markdown/LICENSE @@ -1,6 +1,8 @@ The MIT License (MIT) -Copyright (c) 2013 Nick Cernis +Copyright (c) 2015 Colin O'Dell + +Originally created by Nick Cernis Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/vendor/league/html-to-markdown/README.md b/vendor/league/html-to-markdown/README.md new file mode 100644 index 000000000..8d75649d6 --- /dev/null +++ b/vendor/league/html-to-markdown/README.md @@ -0,0 +1,196 @@ +HTML To Markdown for PHP +======================== + +[](https://gitter.im/thephpleague/html-to-markdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +[](https://packagist.org/packages/league/html-to-markdown) +[](LICENSE) +[](https://travis-ci.org/thephpleague/html-to-markdown) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown/code-structure) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown) +[](https://packagist.org/packages/league/html-to-markdown) + +Library which converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. + + +**Requires**: PHP 5.3+ + +**Lead Developer**: [@colinodell](http://twitter.com/colinodell) + +**Original Author**: [@nickcernis](http://twitter.com/nickcernis) + + +### Why convert HTML to Markdown? + +*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](https://github.com/thephpleague/commonmark),"* you continue, already labouring the question somewhat, *"but why go the other way?"* + +Typically you would convert HTML to Markdown if: + +1. You have an existing HTML document that needs to be edited by people with good taste. +2. You want to store new content in HTML format but edit it as Markdown. +3. You want to convert HTML email to plain text email. +4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. +5. You just really like Markdown. + +### How to use it + +Require the library by issuing this command: + +```bash +composer require league/html-to-markdown +``` + +Add `require 'vendor/autoload.php';` to the top of your script. + +Next, create a new HtmlConverter instance, passing in your valid HTML code to its `convert()` function: + +```php +use League\HTMLToMarkdown\HtmlConverter; + +$converter = new HtmlConverter(); + +$html = "Quick, to the Batpoles!"; +$markdown = $converter->convert($html); +``` + +The `$markdown` variable now contains the Markdown version of your HTML as a string: + +```php +echo $markdown; // ==> ### Quick, to the Batpoles! +``` + +The included `demo` directory contains an HTML->Markdown conversion form to try out. + +### Conversion options + +By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. + +To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: + +```php +$converter = new HtmlConverter(array('strip_tags' => true)); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Or more explicitly, like this: + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('strip_tags', true); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Note that only the tags themselves are stripped, not the content they hold. + +To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: + +```php +$converter = new HtmlConverter(array('remove_nodes' => 'span div')); + +$html = 'Turnips!Monkeys!'; +$markdown = $converter->convert($html); // $markdown now contains "" +``` + +### Style options + +Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('italic_style', '_'); +$converter->getConfig()->setOption('bold_style', '__'); + +$html = 'Italic and a bold'; +$markdown = $converter->convert($html); // $markdown now contains "_Italic_ and a __bold__" +``` + +### Line break options + +By default, `br` tags are converted to two spaces followed by a newline character as per [traditional Markdown](https://daringfireball.net/projects/markdown/syntax#p). Set `hard_break` to `true` to omit the two spaces, as per GitHub Flavored Markdown (GFM). + +```php +$converter = new HtmlConverter(); +$html = 'testline break'; + +$converter->getConfig()->setOption('hard_break', true); +$markdown = $converter->convert($html); // $markdown now contains "test\nline break" + +$converter->getConfig()->setOption('hard_break', false); // default +$markdown = $converter->convert($html); // $markdown now contains "test \nline break" +``` + +### Passing custom Environment object + +You can pass current `Environment` object to customize i.e. which converters should be used. + +```php +$environment = new Environment(array( + // your configuration here +)); +$environment->addConverter(new HeaderConverter()); // optionally - add converter manually + +$converter = new HtmlConverter($environment); + +$html = 'Header + +'; +$markdown = $converter->convert($html); // $markdown now contains "### Header" and "" +``` + +### Limitations + +- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. + +### Known issues + +- Nested lists and lists containing multiple paragraphs aren't converted correctly. +- Lists inside blockquotes aren't converted correctly. +- Any reported [open issues here](https://github.com/thephpleague/html-to-markdown/issues?state=open). + +[Report your issue or request a feature here.](https://github.com/thephpleague/html-to-markdown/issues/new) Issues with patches or failing tests are especially welcome. + +### Style notes + +- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: + + `$converter = new HtmlConverter(array('header_style'=>'atx'));` + + Headers of H3 priority and lower always use atx style. + +- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. +- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. + +### Dependencies + +HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. + +Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. + +### Contributors + +Many thanks to all [contributors](https://github.com/thephpleague/html-to-markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. + +### How it works + +HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. + +### To-do + +- Support for nested lists and lists inside blockquotes. +- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). + +### Trying to convert Markdown to HTML? + +Use one of these great libraries: + + - [league/commonmark](https://github.com/thephpleague/commonmark) (recommended) + - [cebe/markdown](https://github.com/cebe/markdown) + - [PHP Markdown](https://michelf.ca/projects/php-markdown/) + - [Parsedown](https://github.com/erusev/parsedown) + +No guarantees about the Elvish, though. + diff --git a/vendor/league/html-to-markdown/bin/html-to-markdown b/vendor/league/html-to-markdown/bin/html-to-markdown new file mode 100644 index 000000000..2815a7cef --- /dev/null +++ b/vendor/league/html-to-markdown/bin/html-to-markdown @@ -0,0 +1,108 @@ +#!/usr/bin/env php + $arg) { + if ($i === 0) { + continue; + } + + if (substr($arg, 0, 1) === '-') { + switch ($arg) { + case '-h': + case '--help': + echo getHelpText(); + exit(0); + default: + fail('Unknown option: ' . $arg); + } + } else { + $src = $argv[1]; + } +} + +if (isset($src)) { + if (!file_exists($src)) { + fail('File not found: ' . $src); + } + + $html = file_get_contents($src); +} else { + $stdin = fopen('php://stdin', 'r'); + stream_set_blocking($stdin, false); + $html = stream_get_contents($stdin); + fclose($stdin); + + if (empty($html)) { + fail(getHelpText()); + } +} + + +$converter = new League\HTMLToMarkdown\HtmlConverter(); +echo $converter->convert($html); + +/** + * Get help and usage info + * + * @return string + */ +function getHelpText() +{ + return << output.md + + Converting from STDIN: + + echo -e 'Hello World!' | html-to-markdown + + Converting from STDIN and saving the output: + + echo -e 'Hello World!' | html-to-markdown > output.md + +HELP; +} + +/** + * @param string $message Error message + */ +function fail($message) +{ + fwrite(STDERR, $message . "\n"); + exit(1); +} + +function requireAutoloader() +{ + $autoloadPaths = array( + // Local package usage + __DIR__ . '/../vendor/autoload.php', + // Package was included as a library + __DIR__ . '/../../../autoload.php', + ); + foreach ($autoloadPaths as $path) { + if (file_exists($path)) { + require_once $path; + break; + } + } +} diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json new file mode 100644 index 000000000..58764bcb5 --- /dev/null +++ b/vendor/league/html-to-markdown/composer.json @@ -0,0 +1,48 @@ +{ + "name": "league/html-to-markdown", + "type": "library", + "description": "An HTML-to-markdown conversion helper for PHP", + "keywords": ["markdown", "html"], + "homepage": "https://github.com/thephpleague/html-to-markdown", + "license": "MIT", + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "League\\HTMLToMarkdown\\Test\\": "tests" + } + }, + "require": { + "php": ">=5.3.3", + "ext-dom": "*", + "ext-xml": "*" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "bin": ["bin/html-to-markdown"], + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + } +} diff --git a/vendor/league/html-to-markdown/src/Configuration.php b/vendor/league/html-to-markdown/src/Configuration.php new file mode 100644 index 000000000..2943383aa --- /dev/null +++ b/vendor/league/html-to-markdown/src/Configuration.php @@ -0,0 +1,60 @@ +config = $config; + } + + /** + * @param array $config + */ + public function merge(array $config = array()) + { + $this->config = array_replace_recursive($this->config, $config); + } + + /** + * @param array $config + */ + public function replace(array $config = array()) + { + $this->config = $config; + } + + /** + * @param string $key + * @param mixed $value + */ + public function setOption($key, $value) + { + $this->config[$key] = $value; + } + + /** + * @param string|null $key + * @param mixed|null $default + * + * @return mixed|null + */ + public function getOption($key = null, $default = null) + { + if ($key === null) { + return $this->config; + } + + if (!isset($this->config[$key])) { + return $default; + } + + return $this->config[$key]; + } +} diff --git a/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php new file mode 100644 index 000000000..8aca530be --- /dev/null +++ b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php @@ -0,0 +1,11 @@ +' symbols to each line. + + $markdown = ''; + + $quote_content = trim($element->getValue()); + + $lines = preg_split('/\r\n|\r|\n/', $quote_content); + + $total_lines = count($lines); + + foreach ($lines as $i => $line) { + $markdown .= '> ' . $line . "\n"; + if ($i + 1 === $total_lines) { + $markdown .= "\n"; + } + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('blockquote'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php new file mode 100644 index 000000000..c8ec2c005 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php @@ -0,0 +1,62 @@ +getAttribute('class'); + + if ($classes) { + // Since tags can have more than one class, we need to find the one that starts with 'language-' + $classes = explode(' ', $classes); + foreach ($classes as $class) { + if (strpos($class, 'language-') !== false) { + // Found one, save it as the selected language and stop looping over the classes. + // The space after the language avoids gluing the actual code with the language tag + $language = str_replace('language-', '', $class) . ' '; + break; + } + } + } + + $markdown = ''; + $code = html_entity_decode($element->getChildrenAsString()); + + // In order to remove the code tags we need to search for them and, in the case of the opening tag + // use a regular expression to find the tag and the other attributes it might have + $code = preg_replace('/]*>/', '', $code); + $code = str_replace('', '', $code); + + // Checking if the code has multiple lines + $lines = preg_split('/\r\n|\r|\n/', $code); + if (count($lines) > 1) { + // Multiple lines detected, adding three backticks and newlines + $markdown .= '```' . $language . "\n" . $code . "\n" . '```'; + } else { + // One line of code, wrapping it on one backtick. + $markdown .= '`' . $language . $code . '`'; + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('code'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CommentConverter.php b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php new file mode 100644 index 000000000..55038b254 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php @@ -0,0 +1,26 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, + // such as nodes on their own. C14N() canonicalizes the node to a string. + // See: http://www.php.net/manual/en/domnode.c14n.php + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue(); + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array(self::DEFAULT_CONVERTER); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/DivConverter.php b/vendor/league/html-to-markdown/src/Converter/DivConverter.php new file mode 100644 index 000000000..656a0ba4d --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/DivConverter.php @@ -0,0 +1,45 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue() . "\n\n"; + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('div'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php new file mode 100644 index 000000000..67250769b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php @@ -0,0 +1,57 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $tag = $element->getTagName(); + $value = $element->getValue(); + + if (!trim($value)) { + return ''; + } + + if ($tag === 'i' || $tag === 'em') { + $style = $this->config->getOption('italic_style'); + } else { + $style = $this->config->getOption('bold_style'); + } + + $prefix = ltrim($value) !== $value ? ' ' : ''; + $suffix = rtrim($value) !== $value ? ' ' : ''; + + return $prefix . $style . trim($value) . $style . $suffix; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('em', 'i', 'strong', 'b'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php new file mode 100644 index 000000000..37cd44e73 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php @@ -0,0 +1,41 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + return $this->config->getOption('hard_break') ? "\n" : " \n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('br'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php new file mode 100644 index 000000000..d117e7d36 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php @@ -0,0 +1,78 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $level = (int) substr($element->getTagName(), 1, 1); + $style = $this->config->getOption('header_style', self::STYLE_SETEXT); + + if (($level === 1 || $level === 2) && !$element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) { + return $this->createSetextHeader($level, $element->getValue()); + } + + return $this->createAtxHeader($level, $element->getValue()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'); + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createSetextHeader($level, $content) + { + $length = function_exists('mb_strlen') ? mb_strlen($content, 'utf-8') : strlen($content); + $underline = ($level === 1) ? '=' : '-'; + + return $content . "\n" . str_repeat($underline, $length) . "\n\n"; + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createAtxHeader($level, $content) + { + $prefix = str_repeat('#', $level) . ' '; + + return $prefix . $content . "\n\n"; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php new file mode 100644 index 000000000..8f54f9397 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php @@ -0,0 +1,26 @@ +getAttribute('src'); + $alt = $element->getAttribute('alt'); + $title = $element->getAttribute('title'); + + if ($title !== '') { + // No newlines added. should be in a block-level element. + return ''; + } + + return ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('img'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php new file mode 100644 index 000000000..f0765f38b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php @@ -0,0 +1,52 @@ +getAttribute('href'); + $title = $element->getAttribute('title'); + $text = trim($element->getValue()); + + if ($title !== '') { + $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; + } elseif ($href === $text && $this->isValidAutolink($href)) { + $markdown = '<' . $href . '>'; + } else { + $markdown = '[' . $text . '](' . $href . ')'; + } + + if (!$href) { + $markdown = html_entity_decode($element->getChildrenAsString()); + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('a'); + } + + /** + * @param string $href + * + * @return bool + */ + private function isValidAutolink($href) + { + return preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php new file mode 100644 index 000000000..07a4c85a9 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php @@ -0,0 +1,26 @@ +getValue() . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('ol', 'ul'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php new file mode 100644 index 000000000..dafec077c --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php @@ -0,0 +1,47 @@ +getParent()->getTagName(); + + // Add spaces to start for nested list items + $level = $element->getListItemLevel($element); + + $prefixForParagraph = str_repeat(' ', $level + 1); + $value = trim(implode("\n" . $prefixForParagraph, explode("\n", trim($element->getValue())))); + + // If list item is the first in a nested list, add a newline before it + $prefix = ''; + if ($level > 0 && $element->getSiblingPosition() === 1) { + $prefix = "\n"; + } + + if ($list_type === 'ul') { + return $prefix . '- ' . $value . "\n"; + } + + $number = $element->getSiblingPosition(); + + return $prefix . $number . '. ' . $value . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('li'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php new file mode 100644 index 000000000..cf852bfcf --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php @@ -0,0 +1,124 @@ +getValue(); + + $markdown = ''; + + $lines = preg_split('/\r\n|\r|\n/', $value); + foreach ($lines as $line) { + /* + * Some special characters need to be escaped based on the position that they appear + * The following function will deal with those special cases. + */ + $markdown .= $this->escapeSpecialCharacters($line); + $markdown .= "\n"; + } + + return trim($markdown) !== '' ? rtrim($markdown) . "\n\n" : ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('p'); + } + + /** + * @param string $line + * + * @return string + */ + private function escapeSpecialCharacters($line) + { + $line = $this->escapeFirstCharacters($line); + $line = $this->escapeOtherCharacters($line); + $line = $this->escapeOtherCharactersRegex($line); + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeFirstCharacters($line) + { + $escapable = array( + '>', + '- ', + '+ ', + '--', + '~~~', + '---', + '- - -' + ); + + foreach ($escapable as $i) { + if (strpos(ltrim($line), $i) === 0) { + // Found a character that must be escaped, adding a backslash before + return '\\' . ltrim($line); + } + } + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeOtherCharacters($line) + { + $escapable = array( + ' {{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache_duration}} diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl index a8243b614..e65014413 100644 --- a/view/templates/admin_summary.tpl +++ b/view/templates/admin_summary.tpl @@ -11,7 +11,7 @@ {{$queues.label}} - {{$queues.deliverq}} - {{$queues.queue}} - {{$queues.workerq}} + {{$queues.queue}} - {{$queues.workerq}} {{$pending.0}} diff --git a/view/templates/head.tpl b/view/templates/head.tpl index 0772af0bc..e7df8a18c 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -7,7 +7,7 @@ - + @@ -19,6 +19,7 @@ +
` was not converted properly (#70, #102) + - Fixed header-like content not being escaped (#76, #105) + - Fixed blockquote-like content not being escaped (#77, #103) + - Fixed ordered list-like content not being escaped (#73, #106) + - Fixed unordered list-like content not being escaped (#71, #107) + +## [4.2.2] +### Fixed + - Fixed sanitization bug which sometimes removes desired content (#63, #101) + +## [4.2.1] +### Fixed + - Fixed path to autoload.php when used as a library (#98) + - Fixed edge case for tags containing only whitespace (#99) + +### Removed + - Removed double HTML entity decoding, as this is not desireable (#60) + +## [4.2.0] + +### Added + - Added the ability to invoke HtmlConverter objects as functions (#85) + +### Fixed + - Fixed improper handling of nested list items (#19 and #84) + - Fixed preceeding or trailing spaces within emphasis tags (#83) + +## [4.1.1] + +### Fixed + - Fixed conversion of empty paragraphs (#78) + - Fixed `preg_replace` so it wouldn't break UTF-8 characters (#79) + +## [4.1.0] + +### Added + - Added `bin/html-to-markdown` script + +### Changed + - Changed default italic character to `_` (#58) + +## [4.0.1] + +### Fixed + - Added escaping to avoid * and _ in a text being rendered as emphasis (#48) + +### Removed + - Removed the demo (#51) + - `.styleci.yml` and `CONTRIBUTING.md` are no longer included in distributions (#50) + +## [4.0.0] + +This release changes the visibility of several methods/properties. #42 and #43 brought to light that some visiblities were +not ideally set, so this releases fixes that. Moving forwards this should reduce the chance of introducing BC-breaking changes. + +### Added + - Added new `HtmlConverter::getEnvironment()` method to expose the `Environment` (#42, #43) + +### Changed + - Changed `Environment::addConverter()` from `protected` to `public`, enabling custom converters to be added (#42, #43) + - Changed `HtmlConverter::createDOMDocument()` from `protected` to `private` + - Changed `Element::nextCached` from `protected` to `private` + - Made the `Environment` class `final` + +## [3.1.1] +### Fixed + - Empty HTML strings now result in empty Markdown documents (#40, #41) + +## [3.1.0] +### Added + - Added new `equals` method to `Element` to check for equality + +### Changes + - Use Linux line endings consistently instead of plaform-specific line endings (#36) + +### Fixed + - Cleaned up code style + +## [3.0.0] +### Changed + - Changed namespace to `League\HTMLToMarkdown` + - Changed packagist name to `league/html-to-markdown` + - Re-organized code into several separate classes + - `` tags with identical href and inner text are now rendered using angular bracket syntax (#31) + - `` elements are now treated as block-level elements (#33) + +## [2.2.2] +### Added + - Added support for PHP 5.6 and HHVM + - Enabled testing against PHP 7 nightlies + - Added this CHANGELOG.md + +### Fixed + - Fixed whitespace preservation between inline elements (#9 and #10) + +## [2.2.1] +### Fixed + - Preserve placeholder links (#22) + +## [2.2.0] +### Added + - Added CircleCI config + +### Changed + - `` blocks are now treated as code elements + +### Removed + - Dropped support for PHP 5.2 + - Removed incorrect README comment regarding `#text` nodes (#17) + +## [2.1.2] +### Added + - Added the ability to blacklist/remove specific node types (#11) + +### Changed + - Line breaks are now placed after divs instead of before them + - Newlines inside of link texts are now removed + - Updated the minimum PHPUnit version to 4.* + +## [2.1.1] +### Added + - Added options to customize emphasis characters + +## [2.1.0] +### Added + - Added option to strip HTML tags without Markdown equivalents + - Added `convert()` method for converter reuse + - Added ability to set options after instance construction + - Documented the required PHP extensions (#4) + +### Changed + - ATX style now used for h1 and h2 tags inside blockquotes + +### Fixed + - Newlines inside blockquotes are now started with a bracket + - Fixed some incorrect docblocks + - `__toString()` now returns an empty string if input is empty + - Convert head tag if body tag is empty (#7) + - Preserve special characters inside tags without md equivalents (#6) + + +## [2.0.1] +### Fixed + - Fixed first line indentation for multi-line code blocks + - Fixed consecutive anchors get separating spaces stripped (#3) + +## [2.0.0] +### Added + - Initial release + +[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.4.1...master +[4.4.1]: https://github.com/thephpleague/html-to-markdown/compare/4.4.0...4.4.1 +[4.4.0]: https://github.com/thephpleague/html-to-markdown/compare/4.3.1...4.4.0 +[4.3.1]: https://github.com/thephpleague/html-to-markdown/compare/4.3.0...4.3.1 +[4.3.0]: https://github.com/thephpleague/html-to-markdown/compare/4.2.2...4.3.0 +[4.2.2]: https://github.com/thephpleague/html-to-markdown/compare/4.2.1...4.2.2 +[4.2.1]: https://github.com/thephpleague/html-to-markdown/compare/4.2.0...4.2.1 +[4.2.0]: https://github.com/thephpleague/html-to-markdown/compare/4.1.1...4.2.0 +[4.1.1]: https://github.com/thephpleague/html-to-markdown/compare/4.1.0...4.1.1 +[4.1.0]: https://github.com/thephpleague/html-to-markdown/compare/4.0.1...4.1.0 +[4.0.1]: https://github.com/thephpleague/html-to-markdown/compare/4.0.0...4.0.1 +[4.0.0]: https://github.com/thephpleague/html-to-markdown/compare/3.1.1...4.0.0 +[3.1.1]: https://github.com/thephpleague/html-to-markdown/compare/3.1.0...3.1.1 +[3.1.0]: https://github.com/thephpleague/html-to-markdown/compare/3.0.0...3.1.0 +[3.0.0]: https://github.com/thephpleague/html-to-markdown/compare/2.2.2...3.0.0 +[2.2.2]: https://github.com/thephpleague/html-to-markdown/compare/2.2.1...2.2.2 +[2.2.1]: https://github.com/thephpleague/html-to-markdown/compare/2.2.0...2.2.1 +[2.2.0]: https://github.com/thephpleague/html-to-markdown/compare/2.1.2...2.2.0 +[2.1.2]: https://github.com/thephpleague/html-to-markdown/compare/2.1.1...2.1.2 +[2.1.1]: https://github.com/thephpleague/html-to-markdown/compare/2.1.0...2.1.1 +[2.1.0]: https://github.com/thephpleague/html-to-markdown/compare/2.0.1...2.1.0 +[2.0.1]: https://github.com/thephpleague/html-to-markdown/compare/2.0.0...2.0.1 +[2.0.0]: https://github.com/thephpleague/html-to-markdown/compare/775f91e...2.0.0 + diff --git a/vendor/league/html-to-markdown/CONDUCT.md b/vendor/league/html-to-markdown/CONDUCT.md new file mode 100644 index 000000000..01b8644f1 --- /dev/null +++ b/vendor/league/html-to-markdown/CONDUCT.md @@ -0,0 +1,22 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) diff --git a/library/html-to-markdown/LICENSE b/vendor/league/html-to-markdown/LICENSE similarity index 93% rename from library/html-to-markdown/LICENSE rename to vendor/league/html-to-markdown/LICENSE index f538c2ac9..6c04a59dd 100644 --- a/library/html-to-markdown/LICENSE +++ b/vendor/league/html-to-markdown/LICENSE @@ -1,6 +1,8 @@ The MIT License (MIT) -Copyright (c) 2013 Nick Cernis +Copyright (c) 2015 Colin O'Dell + +Originally created by Nick Cernis Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/vendor/league/html-to-markdown/README.md b/vendor/league/html-to-markdown/README.md new file mode 100644 index 000000000..8d75649d6 --- /dev/null +++ b/vendor/league/html-to-markdown/README.md @@ -0,0 +1,196 @@ +HTML To Markdown for PHP +======================== + +[](https://gitter.im/thephpleague/html-to-markdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +[](https://packagist.org/packages/league/html-to-markdown) +[](LICENSE) +[](https://travis-ci.org/thephpleague/html-to-markdown) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown/code-structure) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown) +[](https://packagist.org/packages/league/html-to-markdown) + +Library which converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. + + +**Requires**: PHP 5.3+ + +**Lead Developer**: [@colinodell](http://twitter.com/colinodell) + +**Original Author**: [@nickcernis](http://twitter.com/nickcernis) + + +### Why convert HTML to Markdown? + +*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](https://github.com/thephpleague/commonmark),"* you continue, already labouring the question somewhat, *"but why go the other way?"* + +Typically you would convert HTML to Markdown if: + +1. You have an existing HTML document that needs to be edited by people with good taste. +2. You want to store new content in HTML format but edit it as Markdown. +3. You want to convert HTML email to plain text email. +4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. +5. You just really like Markdown. + +### How to use it + +Require the library by issuing this command: + +```bash +composer require league/html-to-markdown +``` + +Add `require 'vendor/autoload.php';` to the top of your script. + +Next, create a new HtmlConverter instance, passing in your valid HTML code to its `convert()` function: + +```php +use League\HTMLToMarkdown\HtmlConverter; + +$converter = new HtmlConverter(); + +$html = "Quick, to the Batpoles!"; +$markdown = $converter->convert($html); +``` + +The `$markdown` variable now contains the Markdown version of your HTML as a string: + +```php +echo $markdown; // ==> ### Quick, to the Batpoles! +``` + +The included `demo` directory contains an HTML->Markdown conversion form to try out. + +### Conversion options + +By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. + +To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: + +```php +$converter = new HtmlConverter(array('strip_tags' => true)); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Or more explicitly, like this: + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('strip_tags', true); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Note that only the tags themselves are stripped, not the content they hold. + +To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: + +```php +$converter = new HtmlConverter(array('remove_nodes' => 'span div')); + +$html = 'Turnips!Monkeys!'; +$markdown = $converter->convert($html); // $markdown now contains "" +``` + +### Style options + +Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('italic_style', '_'); +$converter->getConfig()->setOption('bold_style', '__'); + +$html = 'Italic and a bold'; +$markdown = $converter->convert($html); // $markdown now contains "_Italic_ and a __bold__" +``` + +### Line break options + +By default, `br` tags are converted to two spaces followed by a newline character as per [traditional Markdown](https://daringfireball.net/projects/markdown/syntax#p). Set `hard_break` to `true` to omit the two spaces, as per GitHub Flavored Markdown (GFM). + +```php +$converter = new HtmlConverter(); +$html = 'testline break'; + +$converter->getConfig()->setOption('hard_break', true); +$markdown = $converter->convert($html); // $markdown now contains "test\nline break" + +$converter->getConfig()->setOption('hard_break', false); // default +$markdown = $converter->convert($html); // $markdown now contains "test \nline break" +``` + +### Passing custom Environment object + +You can pass current `Environment` object to customize i.e. which converters should be used. + +```php +$environment = new Environment(array( + // your configuration here +)); +$environment->addConverter(new HeaderConverter()); // optionally - add converter manually + +$converter = new HtmlConverter($environment); + +$html = 'Header + +'; +$markdown = $converter->convert($html); // $markdown now contains "### Header" and "" +``` + +### Limitations + +- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. + +### Known issues + +- Nested lists and lists containing multiple paragraphs aren't converted correctly. +- Lists inside blockquotes aren't converted correctly. +- Any reported [open issues here](https://github.com/thephpleague/html-to-markdown/issues?state=open). + +[Report your issue or request a feature here.](https://github.com/thephpleague/html-to-markdown/issues/new) Issues with patches or failing tests are especially welcome. + +### Style notes + +- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: + + `$converter = new HtmlConverter(array('header_style'=>'atx'));` + + Headers of H3 priority and lower always use atx style. + +- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. +- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. + +### Dependencies + +HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. + +Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. + +### Contributors + +Many thanks to all [contributors](https://github.com/thephpleague/html-to-markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. + +### How it works + +HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. + +### To-do + +- Support for nested lists and lists inside blockquotes. +- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). + +### Trying to convert Markdown to HTML? + +Use one of these great libraries: + + - [league/commonmark](https://github.com/thephpleague/commonmark) (recommended) + - [cebe/markdown](https://github.com/cebe/markdown) + - [PHP Markdown](https://michelf.ca/projects/php-markdown/) + - [Parsedown](https://github.com/erusev/parsedown) + +No guarantees about the Elvish, though. + diff --git a/vendor/league/html-to-markdown/bin/html-to-markdown b/vendor/league/html-to-markdown/bin/html-to-markdown new file mode 100644 index 000000000..2815a7cef --- /dev/null +++ b/vendor/league/html-to-markdown/bin/html-to-markdown @@ -0,0 +1,108 @@ +#!/usr/bin/env php + $arg) { + if ($i === 0) { + continue; + } + + if (substr($arg, 0, 1) === '-') { + switch ($arg) { + case '-h': + case '--help': + echo getHelpText(); + exit(0); + default: + fail('Unknown option: ' . $arg); + } + } else { + $src = $argv[1]; + } +} + +if (isset($src)) { + if (!file_exists($src)) { + fail('File not found: ' . $src); + } + + $html = file_get_contents($src); +} else { + $stdin = fopen('php://stdin', 'r'); + stream_set_blocking($stdin, false); + $html = stream_get_contents($stdin); + fclose($stdin); + + if (empty($html)) { + fail(getHelpText()); + } +} + + +$converter = new League\HTMLToMarkdown\HtmlConverter(); +echo $converter->convert($html); + +/** + * Get help and usage info + * + * @return string + */ +function getHelpText() +{ + return << output.md + + Converting from STDIN: + + echo -e 'Hello World!' | html-to-markdown + + Converting from STDIN and saving the output: + + echo -e 'Hello World!' | html-to-markdown > output.md + +HELP; +} + +/** + * @param string $message Error message + */ +function fail($message) +{ + fwrite(STDERR, $message . "\n"); + exit(1); +} + +function requireAutoloader() +{ + $autoloadPaths = array( + // Local package usage + __DIR__ . '/../vendor/autoload.php', + // Package was included as a library + __DIR__ . '/../../../autoload.php', + ); + foreach ($autoloadPaths as $path) { + if (file_exists($path)) { + require_once $path; + break; + } + } +} diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json new file mode 100644 index 000000000..58764bcb5 --- /dev/null +++ b/vendor/league/html-to-markdown/composer.json @@ -0,0 +1,48 @@ +{ + "name": "league/html-to-markdown", + "type": "library", + "description": "An HTML-to-markdown conversion helper for PHP", + "keywords": ["markdown", "html"], + "homepage": "https://github.com/thephpleague/html-to-markdown", + "license": "MIT", + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "League\\HTMLToMarkdown\\Test\\": "tests" + } + }, + "require": { + "php": ">=5.3.3", + "ext-dom": "*", + "ext-xml": "*" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "bin": ["bin/html-to-markdown"], + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + } +} diff --git a/vendor/league/html-to-markdown/src/Configuration.php b/vendor/league/html-to-markdown/src/Configuration.php new file mode 100644 index 000000000..2943383aa --- /dev/null +++ b/vendor/league/html-to-markdown/src/Configuration.php @@ -0,0 +1,60 @@ +config = $config; + } + + /** + * @param array $config + */ + public function merge(array $config = array()) + { + $this->config = array_replace_recursive($this->config, $config); + } + + /** + * @param array $config + */ + public function replace(array $config = array()) + { + $this->config = $config; + } + + /** + * @param string $key + * @param mixed $value + */ + public function setOption($key, $value) + { + $this->config[$key] = $value; + } + + /** + * @param string|null $key + * @param mixed|null $default + * + * @return mixed|null + */ + public function getOption($key = null, $default = null) + { + if ($key === null) { + return $this->config; + } + + if (!isset($this->config[$key])) { + return $default; + } + + return $this->config[$key]; + } +} diff --git a/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php new file mode 100644 index 000000000..8aca530be --- /dev/null +++ b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php @@ -0,0 +1,11 @@ +' symbols to each line. + + $markdown = ''; + + $quote_content = trim($element->getValue()); + + $lines = preg_split('/\r\n|\r|\n/', $quote_content); + + $total_lines = count($lines); + + foreach ($lines as $i => $line) { + $markdown .= '> ' . $line . "\n"; + if ($i + 1 === $total_lines) { + $markdown .= "\n"; + } + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('blockquote'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php new file mode 100644 index 000000000..c8ec2c005 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php @@ -0,0 +1,62 @@ +getAttribute('class'); + + if ($classes) { + // Since tags can have more than one class, we need to find the one that starts with 'language-' + $classes = explode(' ', $classes); + foreach ($classes as $class) { + if (strpos($class, 'language-') !== false) { + // Found one, save it as the selected language and stop looping over the classes. + // The space after the language avoids gluing the actual code with the language tag + $language = str_replace('language-', '', $class) . ' '; + break; + } + } + } + + $markdown = ''; + $code = html_entity_decode($element->getChildrenAsString()); + + // In order to remove the code tags we need to search for them and, in the case of the opening tag + // use a regular expression to find the tag and the other attributes it might have + $code = preg_replace('/]*>/', '', $code); + $code = str_replace('', '', $code); + + // Checking if the code has multiple lines + $lines = preg_split('/\r\n|\r|\n/', $code); + if (count($lines) > 1) { + // Multiple lines detected, adding three backticks and newlines + $markdown .= '```' . $language . "\n" . $code . "\n" . '```'; + } else { + // One line of code, wrapping it on one backtick. + $markdown .= '`' . $language . $code . '`'; + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('code'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CommentConverter.php b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php new file mode 100644 index 000000000..55038b254 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php @@ -0,0 +1,26 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, + // such as nodes on their own. C14N() canonicalizes the node to a string. + // See: http://www.php.net/manual/en/domnode.c14n.php + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue(); + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array(self::DEFAULT_CONVERTER); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/DivConverter.php b/vendor/league/html-to-markdown/src/Converter/DivConverter.php new file mode 100644 index 000000000..656a0ba4d --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/DivConverter.php @@ -0,0 +1,45 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue() . "\n\n"; + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('div'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php new file mode 100644 index 000000000..67250769b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php @@ -0,0 +1,57 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $tag = $element->getTagName(); + $value = $element->getValue(); + + if (!trim($value)) { + return ''; + } + + if ($tag === 'i' || $tag === 'em') { + $style = $this->config->getOption('italic_style'); + } else { + $style = $this->config->getOption('bold_style'); + } + + $prefix = ltrim($value) !== $value ? ' ' : ''; + $suffix = rtrim($value) !== $value ? ' ' : ''; + + return $prefix . $style . trim($value) . $style . $suffix; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('em', 'i', 'strong', 'b'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php new file mode 100644 index 000000000..37cd44e73 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php @@ -0,0 +1,41 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + return $this->config->getOption('hard_break') ? "\n" : " \n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('br'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php new file mode 100644 index 000000000..d117e7d36 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php @@ -0,0 +1,78 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $level = (int) substr($element->getTagName(), 1, 1); + $style = $this->config->getOption('header_style', self::STYLE_SETEXT); + + if (($level === 1 || $level === 2) && !$element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) { + return $this->createSetextHeader($level, $element->getValue()); + } + + return $this->createAtxHeader($level, $element->getValue()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'); + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createSetextHeader($level, $content) + { + $length = function_exists('mb_strlen') ? mb_strlen($content, 'utf-8') : strlen($content); + $underline = ($level === 1) ? '=' : '-'; + + return $content . "\n" . str_repeat($underline, $length) . "\n\n"; + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createAtxHeader($level, $content) + { + $prefix = str_repeat('#', $level) . ' '; + + return $prefix . $content . "\n\n"; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php new file mode 100644 index 000000000..8f54f9397 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php @@ -0,0 +1,26 @@ +getAttribute('src'); + $alt = $element->getAttribute('alt'); + $title = $element->getAttribute('title'); + + if ($title !== '') { + // No newlines added. should be in a block-level element. + return ''; + } + + return ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('img'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php new file mode 100644 index 000000000..f0765f38b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php @@ -0,0 +1,52 @@ +getAttribute('href'); + $title = $element->getAttribute('title'); + $text = trim($element->getValue()); + + if ($title !== '') { + $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; + } elseif ($href === $text && $this->isValidAutolink($href)) { + $markdown = '<' . $href . '>'; + } else { + $markdown = '[' . $text . '](' . $href . ')'; + } + + if (!$href) { + $markdown = html_entity_decode($element->getChildrenAsString()); + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('a'); + } + + /** + * @param string $href + * + * @return bool + */ + private function isValidAutolink($href) + { + return preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php new file mode 100644 index 000000000..07a4c85a9 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php @@ -0,0 +1,26 @@ +getValue() . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('ol', 'ul'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php new file mode 100644 index 000000000..dafec077c --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php @@ -0,0 +1,47 @@ +getParent()->getTagName(); + + // Add spaces to start for nested list items + $level = $element->getListItemLevel($element); + + $prefixForParagraph = str_repeat(' ', $level + 1); + $value = trim(implode("\n" . $prefixForParagraph, explode("\n", trim($element->getValue())))); + + // If list item is the first in a nested list, add a newline before it + $prefix = ''; + if ($level > 0 && $element->getSiblingPosition() === 1) { + $prefix = "\n"; + } + + if ($list_type === 'ul') { + return $prefix . '- ' . $value . "\n"; + } + + $number = $element->getSiblingPosition(); + + return $prefix . $number . '. ' . $value . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('li'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php new file mode 100644 index 000000000..cf852bfcf --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php @@ -0,0 +1,124 @@ +getValue(); + + $markdown = ''; + + $lines = preg_split('/\r\n|\r|\n/', $value); + foreach ($lines as $line) { + /* + * Some special characters need to be escaped based on the position that they appear + * The following function will deal with those special cases. + */ + $markdown .= $this->escapeSpecialCharacters($line); + $markdown .= "\n"; + } + + return trim($markdown) !== '' ? rtrim($markdown) . "\n\n" : ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('p'); + } + + /** + * @param string $line + * + * @return string + */ + private function escapeSpecialCharacters($line) + { + $line = $this->escapeFirstCharacters($line); + $line = $this->escapeOtherCharacters($line); + $line = $this->escapeOtherCharactersRegex($line); + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeFirstCharacters($line) + { + $escapable = array( + '>', + '- ', + '+ ', + '--', + '~~~', + '---', + '- - -' + ); + + foreach ($escapable as $i) { + if (strpos(ltrim($line), $i) === 0) { + // Found a character that must be escaped, adding a backslash before + return '\\' . ltrim($line); + } + } + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeOtherCharacters($line) + { + $escapable = array( + ' {{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache_duration}} diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl index a8243b614..e65014413 100644 --- a/view/templates/admin_summary.tpl +++ b/view/templates/admin_summary.tpl @@ -11,7 +11,7 @@ {{$queues.label}} - {{$queues.deliverq}} - {{$queues.queue}} - {{$queues.workerq}} + {{$queues.queue}} - {{$queues.workerq}} {{$pending.0}} diff --git a/view/templates/head.tpl b/view/templates/head.tpl index 0772af0bc..e7df8a18c 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -7,7 +7,7 @@ - + @@ -19,6 +19,7 @@ +
` blocks are now treated as code elements + +### Removed + - Dropped support for PHP 5.2 + - Removed incorrect README comment regarding `#text` nodes (#17) + +## [2.1.2] +### Added + - Added the ability to blacklist/remove specific node types (#11) + +### Changed + - Line breaks are now placed after divs instead of before them + - Newlines inside of link texts are now removed + - Updated the minimum PHPUnit version to 4.* + +## [2.1.1] +### Added + - Added options to customize emphasis characters + +## [2.1.0] +### Added + - Added option to strip HTML tags without Markdown equivalents + - Added `convert()` method for converter reuse + - Added ability to set options after instance construction + - Documented the required PHP extensions (#4) + +### Changed + - ATX style now used for h1 and h2 tags inside blockquotes + +### Fixed + - Newlines inside blockquotes are now started with a bracket + - Fixed some incorrect docblocks + - `__toString()` now returns an empty string if input is empty + - Convert head tag if body tag is empty (#7) + - Preserve special characters inside tags without md equivalents (#6) + + +## [2.0.1] +### Fixed + - Fixed first line indentation for multi-line code blocks + - Fixed consecutive anchors get separating spaces stripped (#3) + +## [2.0.0] +### Added + - Initial release + +[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.4.1...master +[4.4.1]: https://github.com/thephpleague/html-to-markdown/compare/4.4.0...4.4.1 +[4.4.0]: https://github.com/thephpleague/html-to-markdown/compare/4.3.1...4.4.0 +[4.3.1]: https://github.com/thephpleague/html-to-markdown/compare/4.3.0...4.3.1 +[4.3.0]: https://github.com/thephpleague/html-to-markdown/compare/4.2.2...4.3.0 +[4.2.2]: https://github.com/thephpleague/html-to-markdown/compare/4.2.1...4.2.2 +[4.2.1]: https://github.com/thephpleague/html-to-markdown/compare/4.2.0...4.2.1 +[4.2.0]: https://github.com/thephpleague/html-to-markdown/compare/4.1.1...4.2.0 +[4.1.1]: https://github.com/thephpleague/html-to-markdown/compare/4.1.0...4.1.1 +[4.1.0]: https://github.com/thephpleague/html-to-markdown/compare/4.0.1...4.1.0 +[4.0.1]: https://github.com/thephpleague/html-to-markdown/compare/4.0.0...4.0.1 +[4.0.0]: https://github.com/thephpleague/html-to-markdown/compare/3.1.1...4.0.0 +[3.1.1]: https://github.com/thephpleague/html-to-markdown/compare/3.1.0...3.1.1 +[3.1.0]: https://github.com/thephpleague/html-to-markdown/compare/3.0.0...3.1.0 +[3.0.0]: https://github.com/thephpleague/html-to-markdown/compare/2.2.2...3.0.0 +[2.2.2]: https://github.com/thephpleague/html-to-markdown/compare/2.2.1...2.2.2 +[2.2.1]: https://github.com/thephpleague/html-to-markdown/compare/2.2.0...2.2.1 +[2.2.0]: https://github.com/thephpleague/html-to-markdown/compare/2.1.2...2.2.0 +[2.1.2]: https://github.com/thephpleague/html-to-markdown/compare/2.1.1...2.1.2 +[2.1.1]: https://github.com/thephpleague/html-to-markdown/compare/2.1.0...2.1.1 +[2.1.0]: https://github.com/thephpleague/html-to-markdown/compare/2.0.1...2.1.0 +[2.0.1]: https://github.com/thephpleague/html-to-markdown/compare/2.0.0...2.0.1 +[2.0.0]: https://github.com/thephpleague/html-to-markdown/compare/775f91e...2.0.0 + diff --git a/vendor/league/html-to-markdown/CONDUCT.md b/vendor/league/html-to-markdown/CONDUCT.md new file mode 100644 index 000000000..01b8644f1 --- /dev/null +++ b/vendor/league/html-to-markdown/CONDUCT.md @@ -0,0 +1,22 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) diff --git a/library/html-to-markdown/LICENSE b/vendor/league/html-to-markdown/LICENSE similarity index 93% rename from library/html-to-markdown/LICENSE rename to vendor/league/html-to-markdown/LICENSE index f538c2ac9..6c04a59dd 100644 --- a/library/html-to-markdown/LICENSE +++ b/vendor/league/html-to-markdown/LICENSE @@ -1,6 +1,8 @@ The MIT License (MIT) -Copyright (c) 2013 Nick Cernis +Copyright (c) 2015 Colin O'Dell + +Originally created by Nick Cernis Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/vendor/league/html-to-markdown/README.md b/vendor/league/html-to-markdown/README.md new file mode 100644 index 000000000..8d75649d6 --- /dev/null +++ b/vendor/league/html-to-markdown/README.md @@ -0,0 +1,196 @@ +HTML To Markdown for PHP +======================== + +[](https://gitter.im/thephpleague/html-to-markdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +[](https://packagist.org/packages/league/html-to-markdown) +[](LICENSE) +[](https://travis-ci.org/thephpleague/html-to-markdown) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown/code-structure) +[](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown) +[](https://packagist.org/packages/league/html-to-markdown) + +Library which converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience. + + +**Requires**: PHP 5.3+ + +**Lead Developer**: [@colinodell](http://twitter.com/colinodell) + +**Original Author**: [@nickcernis](http://twitter.com/nickcernis) + + +### Why convert HTML to Markdown? + +*"What alchemy is this?"* you mutter. *"I can see why you'd convert [Markdown to HTML](https://github.com/thephpleague/commonmark),"* you continue, already labouring the question somewhat, *"but why go the other way?"* + +Typically you would convert HTML to Markdown if: + +1. You have an existing HTML document that needs to be edited by people with good taste. +2. You want to store new content in HTML format but edit it as Markdown. +3. You want to convert HTML email to plain text email. +4. You know a guy who's been converting HTML to Markdown for years, and now he can speak Elvish. You'd quite like to be able to speak Elvish. +5. You just really like Markdown. + +### How to use it + +Require the library by issuing this command: + +```bash +composer require league/html-to-markdown +``` + +Add `require 'vendor/autoload.php';` to the top of your script. + +Next, create a new HtmlConverter instance, passing in your valid HTML code to its `convert()` function: + +```php +use League\HTMLToMarkdown\HtmlConverter; + +$converter = new HtmlConverter(); + +$html = "Quick, to the Batpoles!"; +$markdown = $converter->convert($html); +``` + +The `$markdown` variable now contains the Markdown version of your HTML as a string: + +```php +echo $markdown; // ==> ### Quick, to the Batpoles! +``` + +The included `demo` directory contains an HTML->Markdown conversion form to try out. + +### Conversion options + +By default, HTML To Markdown preserves HTML tags without Markdown equivalents, like `` and ``. + +To strip HTML tags that don't have a Markdown equivalent while preserving the content inside them, set `strip_tags` to true, like this: + +```php +$converter = new HtmlConverter(array('strip_tags' => true)); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Or more explicitly, like this: + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('strip_tags', true); + +$html = 'Turnips!'; +$markdown = $converter->convert($html); // $markdown now contains "Turnips!" +``` + +Note that only the tags themselves are stripped, not the content they hold. + +To strip tags and their content, pass a space-separated list of tags in `remove_nodes`, like this: + +```php +$converter = new HtmlConverter(array('remove_nodes' => 'span div')); + +$html = 'Turnips!Monkeys!'; +$markdown = $converter->convert($html); // $markdown now contains "" +``` + +### Style options + +Bold and italic tags are converted using the asterisk syntax by default. Change this to the underlined syntax using the `bold_style` and `italic_style` options. + +```php +$converter = new HtmlConverter(); +$converter->getConfig()->setOption('italic_style', '_'); +$converter->getConfig()->setOption('bold_style', '__'); + +$html = 'Italic and a bold'; +$markdown = $converter->convert($html); // $markdown now contains "_Italic_ and a __bold__" +``` + +### Line break options + +By default, `br` tags are converted to two spaces followed by a newline character as per [traditional Markdown](https://daringfireball.net/projects/markdown/syntax#p). Set `hard_break` to `true` to omit the two spaces, as per GitHub Flavored Markdown (GFM). + +```php +$converter = new HtmlConverter(); +$html = 'testline break'; + +$converter->getConfig()->setOption('hard_break', true); +$markdown = $converter->convert($html); // $markdown now contains "test\nline break" + +$converter->getConfig()->setOption('hard_break', false); // default +$markdown = $converter->convert($html); // $markdown now contains "test \nline break" +``` + +### Passing custom Environment object + +You can pass current `Environment` object to customize i.e. which converters should be used. + +```php +$environment = new Environment(array( + // your configuration here +)); +$environment->addConverter(new HeaderConverter()); // optionally - add converter manually + +$converter = new HtmlConverter($environment); + +$html = 'Header + +'; +$markdown = $converter->convert($html); // $markdown now contains "### Header" and "" +``` + +### Limitations + +- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown. + +### Known issues + +- Nested lists and lists containing multiple paragraphs aren't converted correctly. +- Lists inside blockquotes aren't converted correctly. +- Any reported [open issues here](https://github.com/thephpleague/html-to-markdown/issues?state=open). + +[Report your issue or request a feature here.](https://github.com/thephpleague/html-to-markdown/issues/new) Issues with patches or failing tests are especially welcome. + +### Style notes + +- Setext (underlined) headers are the default for H1 and H2. If you prefer the ATX style for H1 and H2 (# Header 1 and ## Header 2), set `header_style` to 'atx' in the options array when you instantiate the object: + + `$converter = new HtmlConverter(array('header_style'=>'atx'));` + + Headers of H3 priority and lower always use atx style. + +- Links and images are referenced inline. Footnote references (where image src and anchor href attributes are listed in the footnotes) are not used. +- Blockquotes aren't line wrapped – it makes the converted Markdown easier to edit. + +### Dependencies + +HTML To Markdown requires PHP's [xml](http://www.php.net/manual/en/xml.installation.php), [lib-xml](http://www.php.net/manual/en/libxml.installation.php), and [dom](http://www.php.net/manual/en/dom.installation.php) extensions, all of which are enabled by default on most distributions. + +Errors such as "Fatal error: Class 'DOMDocument' not found" on distributions such as CentOS that disable PHP's xml extension can be resolved by installing php-xml. + +### Contributors + +Many thanks to all [contributors](https://github.com/thephpleague/html-to-markdown/graphs/contributors) so far. Further improvements and feature suggestions are very welcome. + +### How it works + +HTML To Markdown creates a DOMDocument from the supplied HTML, walks through the tree, and converts each node to a text node containing the equivalent markdown, starting from the most deeply nested node and working inwards towards the root node. + +### To-do + +- Support for nested lists and lists inside blockquotes. +- Offer an option to preserve tags as HTML if they contain attributes that can't be represented with Markdown (e.g. `style`). + +### Trying to convert Markdown to HTML? + +Use one of these great libraries: + + - [league/commonmark](https://github.com/thephpleague/commonmark) (recommended) + - [cebe/markdown](https://github.com/cebe/markdown) + - [PHP Markdown](https://michelf.ca/projects/php-markdown/) + - [Parsedown](https://github.com/erusev/parsedown) + +No guarantees about the Elvish, though. + diff --git a/vendor/league/html-to-markdown/bin/html-to-markdown b/vendor/league/html-to-markdown/bin/html-to-markdown new file mode 100644 index 000000000..2815a7cef --- /dev/null +++ b/vendor/league/html-to-markdown/bin/html-to-markdown @@ -0,0 +1,108 @@ +#!/usr/bin/env php + $arg) { + if ($i === 0) { + continue; + } + + if (substr($arg, 0, 1) === '-') { + switch ($arg) { + case '-h': + case '--help': + echo getHelpText(); + exit(0); + default: + fail('Unknown option: ' . $arg); + } + } else { + $src = $argv[1]; + } +} + +if (isset($src)) { + if (!file_exists($src)) { + fail('File not found: ' . $src); + } + + $html = file_get_contents($src); +} else { + $stdin = fopen('php://stdin', 'r'); + stream_set_blocking($stdin, false); + $html = stream_get_contents($stdin); + fclose($stdin); + + if (empty($html)) { + fail(getHelpText()); + } +} + + +$converter = new League\HTMLToMarkdown\HtmlConverter(); +echo $converter->convert($html); + +/** + * Get help and usage info + * + * @return string + */ +function getHelpText() +{ + return << output.md + + Converting from STDIN: + + echo -e 'Hello World!' | html-to-markdown + + Converting from STDIN and saving the output: + + echo -e 'Hello World!' | html-to-markdown > output.md + +HELP; +} + +/** + * @param string $message Error message + */ +function fail($message) +{ + fwrite(STDERR, $message . "\n"); + exit(1); +} + +function requireAutoloader() +{ + $autoloadPaths = array( + // Local package usage + __DIR__ . '/../vendor/autoload.php', + // Package was included as a library + __DIR__ . '/../../../autoload.php', + ); + foreach ($autoloadPaths as $path) { + if (file_exists($path)) { + require_once $path; + break; + } + } +} diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json new file mode 100644 index 000000000..58764bcb5 --- /dev/null +++ b/vendor/league/html-to-markdown/composer.json @@ -0,0 +1,48 @@ +{ + "name": "league/html-to-markdown", + "type": "library", + "description": "An HTML-to-markdown conversion helper for PHP", + "keywords": ["markdown", "html"], + "homepage": "https://github.com/thephpleague/html-to-markdown", + "license": "MIT", + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "League\\HTMLToMarkdown\\Test\\": "tests" + } + }, + "require": { + "php": ">=5.3.3", + "ext-dom": "*", + "ext-xml": "*" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "bin": ["bin/html-to-markdown"], + "extra": { + "branch-alias": { + "dev-master": "4.5-dev" + } + } +} diff --git a/vendor/league/html-to-markdown/src/Configuration.php b/vendor/league/html-to-markdown/src/Configuration.php new file mode 100644 index 000000000..2943383aa --- /dev/null +++ b/vendor/league/html-to-markdown/src/Configuration.php @@ -0,0 +1,60 @@ +config = $config; + } + + /** + * @param array $config + */ + public function merge(array $config = array()) + { + $this->config = array_replace_recursive($this->config, $config); + } + + /** + * @param array $config + */ + public function replace(array $config = array()) + { + $this->config = $config; + } + + /** + * @param string $key + * @param mixed $value + */ + public function setOption($key, $value) + { + $this->config[$key] = $value; + } + + /** + * @param string|null $key + * @param mixed|null $default + * + * @return mixed|null + */ + public function getOption($key = null, $default = null) + { + if ($key === null) { + return $this->config; + } + + if (!isset($this->config[$key])) { + return $default; + } + + return $this->config[$key]; + } +} diff --git a/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php new file mode 100644 index 000000000..8aca530be --- /dev/null +++ b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php @@ -0,0 +1,11 @@ +' symbols to each line. + + $markdown = ''; + + $quote_content = trim($element->getValue()); + + $lines = preg_split('/\r\n|\r|\n/', $quote_content); + + $total_lines = count($lines); + + foreach ($lines as $i => $line) { + $markdown .= '> ' . $line . "\n"; + if ($i + 1 === $total_lines) { + $markdown .= "\n"; + } + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('blockquote'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php new file mode 100644 index 000000000..c8ec2c005 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php @@ -0,0 +1,62 @@ +getAttribute('class'); + + if ($classes) { + // Since tags can have more than one class, we need to find the one that starts with 'language-' + $classes = explode(' ', $classes); + foreach ($classes as $class) { + if (strpos($class, 'language-') !== false) { + // Found one, save it as the selected language and stop looping over the classes. + // The space after the language avoids gluing the actual code with the language tag + $language = str_replace('language-', '', $class) . ' '; + break; + } + } + } + + $markdown = ''; + $code = html_entity_decode($element->getChildrenAsString()); + + // In order to remove the code tags we need to search for them and, in the case of the opening tag + // use a regular expression to find the tag and the other attributes it might have + $code = preg_replace('/]*>/', '', $code); + $code = str_replace('', '', $code); + + // Checking if the code has multiple lines + $lines = preg_split('/\r\n|\r|\n/', $code); + if (count($lines) > 1) { + // Multiple lines detected, adding three backticks and newlines + $markdown .= '```' . $language . "\n" . $code . "\n" . '```'; + } else { + // One line of code, wrapping it on one backtick. + $markdown .= '`' . $language . $code . '`'; + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('code'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/CommentConverter.php b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php new file mode 100644 index 000000000..55038b254 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php @@ -0,0 +1,26 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents, + // such as nodes on their own. C14N() canonicalizes the node to a string. + // See: http://www.php.net/manual/en/domnode.c14n.php + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue(); + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array(self::DEFAULT_CONVERTER); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/DivConverter.php b/vendor/league/html-to-markdown/src/Converter/DivConverter.php new file mode 100644 index 000000000..656a0ba4d --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/DivConverter.php @@ -0,0 +1,45 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + if ($this->config->getOption('strip_tags', false)) { + return $element->getValue() . "\n\n"; + } + + return html_entity_decode($element->getChildrenAsString()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('div'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php new file mode 100644 index 000000000..67250769b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php @@ -0,0 +1,57 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $tag = $element->getTagName(); + $value = $element->getValue(); + + if (!trim($value)) { + return ''; + } + + if ($tag === 'i' || $tag === 'em') { + $style = $this->config->getOption('italic_style'); + } else { + $style = $this->config->getOption('bold_style'); + } + + $prefix = ltrim($value) !== $value ? ' ' : ''; + $suffix = rtrim($value) !== $value ? ' ' : ''; + + return $prefix . $style . trim($value) . $style . $suffix; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('em', 'i', 'strong', 'b'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php new file mode 100644 index 000000000..37cd44e73 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php @@ -0,0 +1,41 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + return $this->config->getOption('hard_break') ? "\n" : " \n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('br'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php new file mode 100644 index 000000000..d117e7d36 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php @@ -0,0 +1,78 @@ +config = $config; + } + + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + $level = (int) substr($element->getTagName(), 1, 1); + $style = $this->config->getOption('header_style', self::STYLE_SETEXT); + + if (($level === 1 || $level === 2) && !$element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) { + return $this->createSetextHeader($level, $element->getValue()); + } + + return $this->createAtxHeader($level, $element->getValue()); + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'); + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createSetextHeader($level, $content) + { + $length = function_exists('mb_strlen') ? mb_strlen($content, 'utf-8') : strlen($content); + $underline = ($level === 1) ? '=' : '-'; + + return $content . "\n" . str_repeat($underline, $length) . "\n\n"; + } + + /** + * @param int $level + * @param string $content + * + * @return string + */ + private function createAtxHeader($level, $content) + { + $prefix = str_repeat('#', $level) . ' '; + + return $prefix . $content . "\n\n"; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php new file mode 100644 index 000000000..8f54f9397 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php @@ -0,0 +1,26 @@ +getAttribute('src'); + $alt = $element->getAttribute('alt'); + $title = $element->getAttribute('title'); + + if ($title !== '') { + // No newlines added. should be in a block-level element. + return ''; + } + + return ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('img'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php new file mode 100644 index 000000000..f0765f38b --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php @@ -0,0 +1,52 @@ +getAttribute('href'); + $title = $element->getAttribute('title'); + $text = trim($element->getValue()); + + if ($title !== '') { + $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; + } elseif ($href === $text && $this->isValidAutolink($href)) { + $markdown = '<' . $href . '>'; + } else { + $markdown = '[' . $text . '](' . $href . ')'; + } + + if (!$href) { + $markdown = html_entity_decode($element->getChildrenAsString()); + } + + return $markdown; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('a'); + } + + /** + * @param string $href + * + * @return bool + */ + private function isValidAutolink($href) + { + return preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1; + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php new file mode 100644 index 000000000..07a4c85a9 --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php @@ -0,0 +1,26 @@ +getValue() . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('ol', 'ul'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php new file mode 100644 index 000000000..dafec077c --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php @@ -0,0 +1,47 @@ +getParent()->getTagName(); + + // Add spaces to start for nested list items + $level = $element->getListItemLevel($element); + + $prefixForParagraph = str_repeat(' ', $level + 1); + $value = trim(implode("\n" . $prefixForParagraph, explode("\n", trim($element->getValue())))); + + // If list item is the first in a nested list, add a newline before it + $prefix = ''; + if ($level > 0 && $element->getSiblingPosition() === 1) { + $prefix = "\n"; + } + + if ($list_type === 'ul') { + return $prefix . '- ' . $value . "\n"; + } + + $number = $element->getSiblingPosition(); + + return $prefix . $number . '. ' . $value . "\n"; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('li'); + } +} diff --git a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php new file mode 100644 index 000000000..cf852bfcf --- /dev/null +++ b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php @@ -0,0 +1,124 @@ +getValue(); + + $markdown = ''; + + $lines = preg_split('/\r\n|\r|\n/', $value); + foreach ($lines as $line) { + /* + * Some special characters need to be escaped based on the position that they appear + * The following function will deal with those special cases. + */ + $markdown .= $this->escapeSpecialCharacters($line); + $markdown .= "\n"; + } + + return trim($markdown) !== '' ? rtrim($markdown) . "\n\n" : ''; + } + + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('p'); + } + + /** + * @param string $line + * + * @return string + */ + private function escapeSpecialCharacters($line) + { + $line = $this->escapeFirstCharacters($line); + $line = $this->escapeOtherCharacters($line); + $line = $this->escapeOtherCharactersRegex($line); + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeFirstCharacters($line) + { + $escapable = array( + '>', + '- ', + '+ ', + '--', + '~~~', + '---', + '- - -' + ); + + foreach ($escapable as $i) { + if (strpos(ltrim($line), $i) === 0) { + // Found a character that must be escaped, adding a backslash before + return '\\' . ltrim($line); + } + } + + return $line; + } + + /** + * @param string $line + * + * @return string + */ + private function escapeOtherCharacters($line) + { + $escapable = array( + ' {{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache_duration}} diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl index a8243b614..e65014413 100644 --- a/view/templates/admin_summary.tpl +++ b/view/templates/admin_summary.tpl @@ -11,7 +11,7 @@ {{$queues.label}} - {{$queues.deliverq}} - {{$queues.queue}} - {{$queues.workerq}} + {{$queues.queue}} - {{$queues.workerq}} {{$pending.0}} diff --git a/view/templates/head.tpl b/view/templates/head.tpl index 0772af0bc..e7df8a18c 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -7,7 +7,7 @@ - + @@ -19,6 +19,7 @@ +
testline break