diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-15 21:49:28 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-15 21:49:28 -0800 |
| commit | 05f9f0a393d7e414481f3e33e651d33f341e59b0 (patch) | |
| tree | 093113813f751891d6f1686e9351727b449c102b /include | |
| parent | 76c8bbf7b83d6cdbd0b16ebbdaa4cab48662221f (diff) | |
| parent | 746ea5a3691a67ceb176352e8b6fcfe0f2dc99d6 (diff) | |
| download | volse-hubzilla-05f9f0a393d7e414481f3e33e651d33f341e59b0.tar.gz volse-hubzilla-05f9f0a393d7e414481f3e33e651d33f341e59b0.tar.bz2 volse-hubzilla-05f9f0a393d7e414481f3e33e651d33f341e59b0.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto.php | 4 | ||||
| -rw-r--r-- | include/features.php | 15 | ||||
| -rw-r--r-- | include/html2bbcode.php | 17 |
3 files changed, 15 insertions, 21 deletions
diff --git a/include/crypto.php b/include/crypto.php index 622add4dc..b990b18d9 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -22,13 +22,13 @@ function rsa_verify($data,$sig,$key,$alg = 'sha256') { $alg = OPENSSL_ALGO_SHA256; $verify = @openssl_verify($data,$sig,$key,$alg); - if(! $verify) { + if($verify === (-1)) { while($msg = openssl_error_string()) logger('openssl_verify: ' . $msg,LOGGER_NORMAL,LOG_ERR); btlogger('openssl_verify: key: ' . $key, LOGGER_DEBUG, LOG_ERR); } - return $verify; + return (($verify > 0) ? true : false); } function pkcs5_pad ($text, $blocksize) diff --git a/include/features.php b/include/features.php index 8601ff79e..69eeed3e8 100644 --- a/include/features.php +++ b/include/features.php @@ -374,15 +374,6 @@ function get_features($filtered = true) { t('Post/Comment Tools'), [ - 'markdown', - t('Markdown'), - t('Use markdown for editing posts'), - false, - get_config('feature_lock','markdown'), - feature_level('markdown',2), - ], - - [ 'commtag', t('Community Tagging'), t('Ability to tag existing posts'), @@ -490,6 +481,8 @@ function get_features($filtered = true) { else { $narr = $arr; } - call_hooks('get_features',$narr); - return $narr; + + $x = [ 'features' => $narr, 'filtered' => $filtered, 'techlevel' => $techlevel ]; + call_hooks('get_features',$x); + return $x['features']; } diff --git a/include/html2bbcode.php b/include/html2bbcode.php index f67231847..4166299db 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -188,13 +188,14 @@ function html2bbcode($message) node2bbcode($doc, 'hr', array(), "[hr]", ""); - node2bbcode($doc, 'table', array(), "", ""); - node2bbcode($doc, 'tr', array(), "\n", ""); - node2bbcode($doc, 'td', array(), "\t", ""); - //node2bbcode($doc, 'table', array(), "[table]", "[/table]"); - //node2bbcode($doc, 'th', array(), "[th]", "[/th]"); - //node2bbcode($doc, 'tr', array(), "[tr]", "[/tr]"); - //node2bbcode($doc, 'td', array(), "[td]", "[/td]"); +// node2bbcode($doc, 'table', array(), "", ""); +// node2bbcode($doc, 'tr', array(), "\n", ""); +// node2bbcode($doc, 'td', array(), "\t", ""); + + node2bbcode($doc, 'table', array(), "[table]", "[/table]"); + node2bbcode($doc, 'th', array(), "[th]", "[/th]"); + node2bbcode($doc, 'tr', array(), "[tr]", "[/tr]"); + node2bbcode($doc, 'td', array(), "[td]", "[/td]"); node2bbcode($doc, 'h1', array(), "\n\n[h1]", "[/h1]\n"); node2bbcode($doc, 'h2', array(), "\n\n[h2]", "[/h2]\n"); @@ -211,7 +212,7 @@ function html2bbcode($message) node2bbcode($doc, 'video', array('src'=>'/(.+)/'), '[video]$1', '[/video]'); node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]'); - node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]'); +// node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]'); node2bbcode($doc, 'code', array(), '[code]', '[/code]'); |