X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fframework.php;h=8f6f3c9d54b727a24c8a82b599369afba80e38da;hb=586fb5a5175d7a10f5f78dd026434e48202e5451;hp=229de8b79323f6bf22e3211e42b01ac88c60693b;hpb=ede6dcd4ac4cd6b39e2e4ebe8dcc4e4ec693742c;p=quix0rs-gnu-social.git diff --git a/lib/framework.php b/lib/framework.php index 229de8b793..8f6f3c9d54 100644 --- a/lib/framework.php +++ b/lib/framework.php @@ -22,8 +22,8 @@ if (!defined('GNUSOCIAL')) { exit(1); } define('GNUSOCIAL_ENGINE', 'GNU social'); define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/'); -define('GNUSOCIAL_BASE_VERSION', '1.2.0'); -define('GNUSOCIAL_LIFECYCLE', 'beta4'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' +define('GNUSOCIAL_BASE_VERSION', '1.3.0'); +define('GNUSOCIAL_LIFECYCLE', 'beta5'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE); @@ -46,6 +46,7 @@ define('PROFILES_PER_MINILIST', 8); define('FOREIGN_NOTICE_SEND', 1); define('FOREIGN_NOTICE_RECV', 2); define('FOREIGN_NOTICE_SEND_REPLY', 4); +define('FOREIGN_NOTICE_SEND_REPEAT', 8); define('FOREIGN_FRIEND_SEND', 1); define('FOREIGN_FRIEND_RECV', 2); @@ -62,10 +63,11 @@ define('NOTICE_INBOX_SOURCE_GATEWAY', -1); * Some of those characters can be troublesome when auto-linking plain text. Such as "http://some.com/)" * URL encoding should be used whenever a weird character is used, the following strings are not definitive. */ -define('URL_REGEX_VALID_PATH_CHARS', '\pN\pL\,\!\.\:\-\_\+\/\=\;\%\~\*'); +define('URL_REGEX_VALID_PATH_CHARS', '\pN\pL\,\!\.\:\-\_\+\/\@\=\;\%\~\*'); define('URL_REGEX_VALID_QSTRING_CHARS', URL_REGEX_VALID_PATH_CHARS . '\&'); define('URL_REGEX_VALID_FRAGMENT_CHARS', URL_REGEX_VALID_QSTRING_CHARS . '\?\#'); define('URL_REGEX_EXCLUDED_END_CHARS', '\?\.\,\!\#\:\''); // don't include these if they are directly after a URL +define('URL_REGEX_DOMAIN_NAME', '(?:(?!-)[A-Za-z0-9\-]{1,63}(?