Tobias Hößl
9 years ago
57 changed files with 2380 additions and 1256 deletions
Split View
Diff Options
-
+2 -2boot.php
-
+15 -1database.sql
-
+24 -8include/Scrape.php
-
+4 -3include/bbcode.php
-
+12 -2include/conversation.php
-
+26 -12include/delivery.php
-
+136 -64include/email.php
-
+97 -50include/enotify.php
-
+2 -2include/html2bbcode.php
-
+180 -0include/html2plain.php
-
+12 -7include/network.php
-
+16 -8include/notifier.php
-
+8 -1include/plugin.php
-
+65 -7include/poller.php
-
+132 -0include/quoteconvert.php
-
+5 -3include/template_processor.php
-
+5 -55library/spam/b8/storage/storage_frndc.php
-
+4 -2mod/admin.php
-
+2 -1mod/contacts.php
-
+34 -23mod/settings.php
-
+1 -0mod/tagger.php
-
+2 -1mod/viewcontacts.php
-
+25 -1update.php
-
+2 -0view/admin_plugins.tpl
-
+2 -2view/contact_template.tpl
-
+845 -624view/de/messages.po
-
+67 -21view/de/strings.php
-
+1 -1view/email_notify_html.tpl
-
+1 -1view/email_notify_text.tpl
-
+2 -2view/head.tpl
-
+1 -2view/jot-header.tpl
-
+2 -0view/settings_connectors.tpl
-
+0 -0view/theme/clean/unsupported
-
+0 -0view/theme/darkness/unsupported
-
+0 -0view/theme/darkzero-NS/unsupported
-
BINview/theme/dispy/premium.png
-
BINview/theme/dispy/star.png
-
+15 -0view/theme/dispy/style.css
-
BINview/theme/dispy/tag.png
-
+1 -0view/theme/dispy/wall_item.tpl
-
+1 -0view/theme/dispy/wallwall_item.tpl
-
+1 -0view/theme/duepuntozero/wallwall_item.tpl
-
+0 -0view/theme/easterbunny/unsupported
-
+0 -0view/theme/ghost/unsupported
-
+0 -0view/theme/goldenrod/unsupported
-
+0 -0view/theme/loozah/unsupported
-
+2 -0view/theme/loozah/wall_item.tpl
-
+1 -0view/theme/loozah/wallwall_item.tpl
-
+0 -0view/theme/shady/unsupported
-
+3 -1view/theme/vier/colors.less
-
+5 -0view/theme/vier/icons.less
-
+242 -8view/theme/vier/quattro.less
-
+3 -2view/theme/vier/search_item.tpl
-
+364 -334view/theme/vier/style.css
-
+4 -3view/theme/vier/wall_item.tpl
-
+4 -2view/theme/vier/wallwall_item.tpl
-
+2 -0view/wallwall_item.tpl
+ 2
- 2
boot.php
View File
+ 15
- 1
database.sql
View File
+ 24
- 8
include/Scrape.php
View File
+ 4
- 3
include/bbcode.php
View File
+ 12
- 2
include/conversation.php
View File
+ 26
- 12
include/delivery.php
View File
+ 136
- 64
include/email.php
View File
+ 97
- 50
include/enotify.php
View File
+ 2
- 2
include/html2bbcode.php
View File
+ 180
- 0
include/html2plain.php
View File
| @ -0,0 +1,180 @@ | |||
| <?php | |||
| require_once "html2bbcode.php"; | |||
| function breaklines($line, $level) | |||
| { | |||
| $wraplen = 75-$level; | |||
| $newlines = array(); | |||
| do { | |||
| $oldline = $line; | |||
| $subline = substr($line, 0, $wraplen); | |||
| $pos = strrpos($subline, ' '); | |||
| if ($pos == 0) | |||
| $pos = strpos($line, ' '); | |||
| if (($pos > 0) and strlen($line) > $wraplen) { | |||
| $newline = trim(substr($line, 0, $pos)); | |||
| if ($level > 0) | |||
| $newline = str_repeat(">", $level).' '.$newline; | |||
| $newlines[] = $newline." "; | |||
| $line = substr($line, $pos+1); | |||
| } | |||
| } while ((strlen($line) > $wraplen) and !($oldline == $line)); | |||
| if ($level > 0) | |||
| $line = str_repeat(">", $level).' '.$line; | |||
| $newlines[] = $line; | |||
| return(implode($newlines, "\n")); | |||
| } | |||
| function quotelevel($message) | |||
| { | |||
| $lines = explode("\n", $message); | |||
| $newlines = array(); | |||
| $level = 0; | |||
| foreach($lines as $line) {; | |||
| $line = trim($line); | |||
| $startquote = false; | |||
| while (strpos("*".$line, '[quote]') > 0) { | |||
| $level++; | |||
| $pos = strpos($line, '[quote]'); | |||
| $line = substr($line, 0, $pos).substr($line, $pos+7); | |||
| $startquote = true; | |||
| } | |||
| $currlevel = $level; | |||
| while (strpos("*".$line, '[/quote]') > 0) { | |||
| $level--; | |||
| if ($level < 0) | |||
| $level = 0; | |||
| $pos = strpos($line, '[/quote]'); | |||
| $line = substr($line, 0, $pos).substr($line, $pos+8); | |||
| } | |||
| if (!$startquote or ($line != '')) | |||
| $newlines[] = breaklines($line, $currlevel); | |||
| } | |||
| return(implode($newlines, "\n")); | |||
| } | |||
| function html2plain($html) | |||
| { | |||
| global $lang; | |||
| $message = str_replace("\r", "", $html); | |||
| $doc = new DOMDocument(); | |||
| $doc->preserveWhiteSpace = false; | |||
| $message = mb_convert_encoding($message, 'HTML-ENTITIES', "UTF-8"); | |||
| @$doc->loadHTML($message); | |||
| $xpath = new DomXPath($doc); | |||
| $list = $xpath->query("//pre"); | |||
| foreach ($list as $node) { | |||
| $node->nodeValue = str_replace("\n", "\r", $node->nodeValue); | |||
| } | |||
| $message = $doc->saveHTML(); | |||
| $message = str_replace(array("\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"), array("<", ">", "<br>", " ", ""), $message); | |||
| $message = preg_replace('= [\s]*=i', " ", $message); | |||
| // nach <a href="...">...</a> suchen, die ... miteinander vergleichen und bei Gleichheit durch ein einzelnes ... ersetzen. | |||
| $pattern = '/<a.*?href="(.*?)".*?>(.*?)<\/a>/is'; | |||
| preg_match_all($pattern, $message, $result, PREG_SET_ORDER); | |||
| foreach ($result as $treffer) { | |||
| if ($treffer[1] == $treffer[2]) { | |||
| $search = '<a href="'.$treffer[1].'" target="_blank">'.$treffer[1].'</a>'; | |||
| $message = str_replace($search, $treffer[1], $message); | |||
| } | |||
| } | |||
| @$doc->loadHTML($message); | |||
| node2bbcode($doc, 'html', array(), '', ''); | |||
| node2bbcode($doc, 'body', array(), '', ''); | |||
| // MyBB-Auszeichnungen | |||
| node2bbcode($doc, 'span', array('style'=>'text-decoration: underline;'), '_', '_'); | |||
| node2bbcode($doc, 'span', array('style'=>'font-style: italic;'), '/', '/'); | |||
| node2bbcode($doc, 'span', array('style'=>'font-weight: bold;'), '*', '*'); | |||
| node2bbcode($doc, 'strong', array(), '*', '*'); | |||
| node2bbcode($doc, 'b', array(), '*', '*'); | |||
| node2bbcode($doc, 'i', array(), '/', '/'); | |||
| node2bbcode($doc, 'u', array(), '_', '_'); | |||
| node2bbcode($doc, 'blockquote', array(), '[quote]', "[/quote]\n"); | |||
| node2bbcode($doc, 'br', array(), "\n", ''); | |||
| node2bbcode($doc, 'span', array(), "", ""); | |||
| node2bbcode($doc, 'pre', array(), "", ""); | |||
| node2bbcode($doc, 'div', array(), "\r", "\r"); | |||
| node2bbcode($doc, 'p', array(), "\n", "\n"); | |||
| //node2bbcode($doc, 'ul', array(), "\n[list]", "[/list]\n"); | |||
| //node2bbcode($doc, 'ol', array(), "\n[list=1]", "[/list]\n"); | |||
| node2bbcode($doc, 'li', array(), "\n* ", "\n"); | |||
| node2bbcode($doc, 'hr', array(), str_repeat("-", 70), ""); | |||
| node2bbcode($doc, 'tr', array(), "\n", ""); | |||
| node2bbcode($doc, 'td', array(), "\t", ""); | |||
| node2bbcode($doc, 'h1', array(), "\n\n*", "*\n"); | |||
| node2bbcode($doc, 'h2', array(), "\n\n*", "*\n"); | |||
| node2bbcode($doc, 'h3', array(), "\n\n*", "*\n"); | |||
| node2bbcode($doc, 'h4', array(), "\n\n*", "*\n"); | |||
| node2bbcode($doc, 'h5', array(), "\n\n*", "*\n"); | |||
| node2bbcode($doc, 'h6', array(), "\n\n*", "*\n"); | |||
| node2bbcode($doc, 'a', array('href'=>'/(.+)/'), ' $1', '', true); | |||
| node2bbcode($doc, 'img', array('alt'=>'/(.+)/'), '$1', ''); | |||
| node2bbcode($doc, 'img', array('title'=>'/(.+)/'), '$1', ''); | |||
| node2bbcode($doc, 'img', array(), '', ''); | |||
| node2bbcode($doc, 'img', array('src'=>'/(.+)/'), '[img]$1', '[/img]'); | |||
| $message = $doc->saveHTML(); | |||
| $message = str_replace("[img]", "", $message); | |||
| $message = str_replace("[/img]", "", $message); | |||
| // was ersetze ich da? | |||
| // Irgendein stoerrisches UTF-Zeug | |||
| $message = str_replace(chr(194).chr(160), ' ', $message); | |||
| $message = str_replace(" ", " ", $message); | |||
| // Aufeinanderfolgende DIVs | |||
| $message = preg_replace('=\r *\r=i', "\n", $message); | |||
| $message = str_replace("\r", "\n", $message); | |||
| $message = strip_tags($message); | |||
| $message = html_entity_decode($message, ENT_QUOTES, 'UTF-8'); | |||
| do { | |||
| $oldmessage = $message; | |||
| $message = str_replace("\n\n\n", "\n\n", $message); | |||
| } while ($oldmessage != $message); | |||
| $message = quotelevel(trim($message)); | |||
| return(trim($message)); | |||
| } | |||
| ?> | |||
+ 12
- 7
include/network.php
View File
+ 16
- 8
include/notifier.php
View File
+ 8
- 1
include/plugin.php
View File
+ 65
- 7
include/poller.php
View File
+ 132
- 0
include/quoteconvert.php
View File
| @ -0,0 +1,132 @@ | |||
| <?php | |||
| function convertquote($body, $reply) | |||
| { | |||
| // Convert Quotes | |||
| $arrbody = explode("\n", trim($body)); | |||
| $arrlevel = array(); | |||
| for ($i = 0; $i < count($arrbody); $i++) { | |||
| $quotelevel = 0; | |||
| $quoteline = $arrbody[$i]; | |||
| while ((strlen($quoteline)>0) and ((substr($quoteline, 0, 1) == '>') | |||
| or (substr($quoteline, 0, 1) == ' '))) { | |||
| if (substr($quoteline, 0, 1) == '>') | |||
| $quotelevel++; | |||
| $quoteline = ltrim(substr($quoteline, 1)); | |||
| } | |||
| //echo $quotelevel.'*'.$quoteline."\r\n"; | |||
| $arrlevel[$i] = $quotelevel; | |||
| $arrbody[$i] = $quoteline; | |||
| } | |||
| $quotelevel = 0; | |||
| $previousquote = 0; | |||
| $arrbodyquoted = array(); | |||
| for ($i = 0; $i < count($arrbody); $i++) { | |||
| $previousquote = $quotelevel; | |||
| $quotelevel = $arrlevel[$i]; | |||
| $currline = $arrbody[$i]; | |||
| while ($previousquote < $quotelevel) { | |||
| if ($sender != '') { | |||
| $quote = "[quote title=$sender]"; | |||
| $sender = ''; | |||
| } else | |||
| $quote = "[quote]"; | |||
| $arrbody[$i] = $quote.$arrbody[$i]; | |||
| $previousquote++; | |||
| } | |||
| while ($previousquote > $quotelevel) { | |||
| $arrbody[$i] = '[/quote]'.$arrbody[$i]; | |||
| $previousquote--; | |||
| } | |||
| $arrbodyquoted[] = $arrbody[$i]; | |||
| } | |||
| while ($quotelevel > 0) { | |||
| $arrbodyquoted[] = '[/quote]'; | |||
| $quotelevel--; | |||
| } | |||
| $body = implode("\n", $arrbodyquoted); | |||
| if (strlen($body) > 0) | |||
| $body = $body."\n\n"; | |||
| if ($reply) | |||
| $body = removetofu($body); | |||
| return($body); | |||
| } | |||
| function removetofu($message) | |||
| { | |||
| $message = trim($message); | |||
| do { | |||
| $oldmessage = $message; | |||
| $message = preg_replace('=\[/quote\][\s](.*?)\[quote\]=i', '$1', $message); | |||
| $message = str_replace("[/quote][quote]", "", $message); | |||
| } while ($message != $oldmessage); | |||
| $quotes = array(); | |||
| $startquotes = 0; | |||
| $start = 0; | |||
| while(($pos = strpos($message, '[quote', $start)) > 0) { | |||
| $quotes[$pos] = -1; | |||
| $start = $pos + 7; | |||
| $startquotes++; | |||
| } | |||
| $endquotes = 0; | |||
| $start = 0; | |||
| while(($pos = strpos($message, '[/quote]', $start)) > 0) { | |||
| $start = $pos + 7; | |||
| $endquotes++; | |||
| } | |||
| while ($endquotes < $startquotes) { | |||
| $message .= '[/quote]'; | |||
| ++$endquotes; | |||
| } | |||
| $start = 0; | |||
| while(($pos = strpos($message, '[/quote]', $start)) > 0) { | |||
| $quotes[$pos] = 1; | |||
| $start = $pos + 7; | |||
| } | |||
| if (strtolower(substr($message, -8)) != '[/quote]') | |||
| return($message); | |||
| krsort($quotes); | |||
| $quotelevel = 0; | |||
| $quotestart = 0; | |||
| foreach ($quotes as $index => $quote) { | |||
| $quotelevel += $quote; | |||
| if (($quotelevel == 0) and ($quotestart == 0)) | |||
| $quotestart = $index; | |||
| } | |||
| if ($quotestart != 0) { | |||
| $message = trim(substr($message, 0, $quotestart))."\n[collapsed]\n".substr($message, $quotestart+7, -8).'[/collapsed]'; | |||
| } | |||
| return($message); | |||
| } | |||
| ?> | |||