diff --git a/common.php b/common.php index f58aa9a..c1b9099 100644 --- a/common.php +++ b/common.php @@ -6,7 +6,7 @@ if (file_exists(__DIR__.'/config.php')) { require __DIR__.'/config.php'; } -defined('APP_VERSION') or define('APP_VERSION', Helper\parseAppVersion('$Format:%d$','$Format:%H$')); +defined('APP_VERSION') or define('APP_VERSION', Helper\parse_app_version('$Format:%d$','$Format:%H$')); defined('HTTP_TIMEOUT') or define('HTTP_TIMEOUT', 20); defined('BASE_URL_DIRECTORY') or define('BASE_URL_DIRECTORY', dirname($_SERVER['PHP_SELF'])); diff --git a/lib/helpers.php b/lib/helpers.php index 3ebe424..ac12c5f 100644 --- a/lib/helpers.php +++ b/lib/helpers.php @@ -10,7 +10,7 @@ function isSecureConnection() /* * get Version number from git archive output */ -function parseAppVersion($refnames, $commithash) +function parse_app_version($refnames, $commithash) { $version = 'master'; @@ -38,7 +38,7 @@ function favicon(array $favicons, $feed_id) return ''; } -function isRTL(array $item) +function is_rtl(array $item) { return ! empty($item['rtl']) || \PicoFeed\Parser\Parser::isLanguageRTL($item['language']); } diff --git a/models/proxy.php b/models/proxy.php index 5b38056..835bfb6 100644 --- a/models/proxy.php +++ b/models/proxy.php @@ -11,7 +11,7 @@ use PicoFeed\Logging\Logger; function addProxyToLink($link) { - if (Helper\isSecureConnection() && strpos($link, 'http:') === 0) { + if (Helper\is_secure_connection() && strpos($link, 'http:') === 0) { $link = '?action=proxy&url='.rawurlencode($link); } @@ -22,7 +22,7 @@ function addProxyToTags($html, $website, $proxy_images, $cloak_referrer) { if ($html === '' // no content, no proxy || (! $cloak_referrer && ! $proxy_images) // neither cloaking nor proxing enabled - || (! $cloak_referrer && $proxy_images && ! Helper\isSecureConnection())) { // only proxy enabled, but not connected via HTTPS + || (! $cloak_referrer && $proxy_images && ! Helper\is_secure_connection())) { // only proxy enabled, but not connected via HTTPS return $html; } @@ -35,7 +35,7 @@ function addProxyToTags($html, $website, $proxy_images, $cloak_referrer) // they do not trigger mixed content warnings. $config->setFilterImageProxyProtocol('http'); } - elseif (! $proxy_images && $cloak_referrer && Helper\isSecureConnection()) { + elseif (! $proxy_images && $cloak_referrer && Helper\is_secure_connection()) { // cloaking mode only: if a request from a HTTPS connection to a HTTP // connection is made, the referrer will be omitted by the browser. // Only the referrer for HTTPS to HTTPs requests needs to be cloaked. diff --git a/models/remember_me.php b/models/remember_me.php index a712093..7e12491 100644 --- a/models/remember_me.php +++ b/models/remember_me.php @@ -266,7 +266,7 @@ function write_cookie($token, $sequence, $expiration) $expiration, BASE_URL_DIRECTORY, null, - \Helper\isSecureConnection(), + \Helper\is_secure_connection(), true ); } @@ -299,7 +299,7 @@ function delete_cookie() time() - 3600, BASE_URL_DIRECTORY, null, - \Helper\isSecureConnection(), + \Helper\is_secure_connection(), true ); } diff --git a/templates/item.php b/templates/item.php index 3d77dcb..3f3580d 100644 --- a/templates/item.php +++ b/templates/item.php @@ -6,7 +6,7 @@ data-item-bookmark="= $item['bookmark'] ?>" = $hide ? 'data-hide="true"' : '' ?> > -
> +
> = Helper\escape(Helper\summary(strip_tags($item['content']), 50, 300)) ?>
diff --git a/templates/show_item.php b/templates/show_item.php index f51decf..23869d5 100644 --- a/templates/show_item.php +++ b/templates/show_item.php @@ -29,7 +29,7 @@ -