Merge branch 'pull'
This commit is contained in:
commit
41d595d5bc
28 changed files with 449 additions and 158 deletions
|
@ -638,6 +638,7 @@ CREATE TABLE IF NOT EXISTS `mailacct` (
|
||||||
`mailbox` CHAR( 255 ) NOT NULL,
|
`mailbox` CHAR( 255 ) NOT NULL,
|
||||||
`user` CHAR( 255 ) NOT NULL ,
|
`user` CHAR( 255 ) NOT NULL ,
|
||||||
`pass` TEXT NOT NULL ,
|
`pass` TEXT NOT NULL ,
|
||||||
|
`reply_to` CHAR( 255 ) NOT NULL ,
|
||||||
`action` INT NOT NULL ,
|
`action` INT NOT NULL ,
|
||||||
`movetofolder` CHAR(255) NOT NULL ,
|
`movetofolder` CHAR(255) NOT NULL ,
|
||||||
`pubmail` TINYINT(1) NOT NULL DEFAULT '0',
|
`pubmail` TINYINT(1) NOT NULL DEFAULT '0',
|
||||||
|
|
|
@ -79,3 +79,9 @@ $a->config['system']['theme'] = 'duepuntozero';
|
||||||
// By default allow pseudonyms
|
// By default allow pseudonyms
|
||||||
|
|
||||||
$a->config['system']['no_regfullname'] = true;
|
$a->config['system']['no_regfullname'] = true;
|
||||||
|
|
||||||
|
// If set to true the priority settings of ostatus contacts are used
|
||||||
|
$a->config['system']['ostatus_use_priority'] = false;
|
||||||
|
|
||||||
|
// If enabled all items are cached in the given directory
|
||||||
|
$a->config['system']['itemcache'] = "";
|
||||||
|
|
|
@ -435,8 +435,8 @@ function delivery_run($argv, $argc){
|
||||||
$headers .= 'Reply-to: ' . $reply_to . "\n";
|
$headers .= 'Reply-to: ' . $reply_to . "\n";
|
||||||
|
|
||||||
// for testing purposes: Collect exported mails
|
// for testing purposes: Collect exported mails
|
||||||
$file = tempnam("/tmp/friendica/", "mail-out-");
|
// $file = tempnam("/tmp/friendica/", "mail-out-");
|
||||||
file_put_contents($file, json_encode($it));
|
// file_put_contents($file, json_encode($it));
|
||||||
|
|
||||||
$headers .= 'Message-Id: <' . iri2msgid($it['uri']). '>' . "\n";
|
$headers .= 'Message-Id: <' . iri2msgid($it['uri']). '>' . "\n";
|
||||||
|
|
||||||
|
@ -448,28 +448,14 @@ function delivery_run($argv, $argc){
|
||||||
$headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
|
$headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
|
||||||
if(!strlen($it['title'])) {
|
if(!strlen($it['title'])) {
|
||||||
$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
|
$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
|
||||||
dbesc($it['parent-uri'])
|
dbesc($it['parent-uri']));
|
||||||
);
|
|
||||||
if(count($r)) {
|
if(count($r) AND ($r[0]['title'] != ''))
|
||||||
$subtitle = $r[0]['title'];
|
$subject = $r[0]['title'];
|
||||||
if($subtitle) {
|
|
||||||
if(strncasecmp($subtitle,'RE:',3))
|
|
||||||
$subject = $subtitle;
|
|
||||||
else
|
|
||||||
$subject = 'Re: ' . $subtitle;
|
|
||||||
}
|
}
|
||||||
|
if(strncasecmp($subject,'RE:',3))
|
||||||
|
$subject = 'Re: '.$subject;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
/*$headers .= 'MIME-Version: 1.0' . "\n";
|
|
||||||
//$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
|
|
||||||
$headers .= 'Content-Type: text/plain; charset=UTF-8' . "\n";
|
|
||||||
$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
|
|
||||||
$html = prepare_body($it);
|
|
||||||
//$message = '<html><body>' . $html . '</body></html>';
|
|
||||||
$message = html2plain($html);
|
|
||||||
logger('notifier: email delivery to ' . $addr);
|
|
||||||
mail($addr, $subject, $message, $headers);*/
|
|
||||||
email_send($addr, $subject, $headers, $it);
|
email_send($addr, $subject, $headers, $it);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
require_once('include/html2plain.php');
|
require_once('include/html2plain.php');
|
||||||
|
require_once('include/msgclean.php');
|
||||||
|
require_once('include/quoteconvert.php');
|
||||||
|
|
||||||
function email_connect($mailbox,$username,$password) {
|
function email_connect($mailbox,$username,$password) {
|
||||||
if(! function_exists('imap_open'))
|
if(! function_exists('imap_open'))
|
||||||
|
@ -86,6 +88,7 @@ function email_get_msg($mbox,$uid) {
|
||||||
|
|
||||||
if(! $struc->parts) {
|
if(! $struc->parts) {
|
||||||
$ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html');
|
$ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html');
|
||||||
|
$html = $ret['body'];
|
||||||
|
|
||||||
if (trim($ret['body']) == '')
|
if (trim($ret['body']) == '')
|
||||||
$ret['body'] = email_get_part($mbox,$uid,$struc,0, 'plain');
|
$ret['body'] = email_get_part($mbox,$uid,$struc,0, 'plain');
|
||||||
|
@ -107,6 +110,17 @@ function email_get_msg($mbox,$uid) {
|
||||||
else
|
else
|
||||||
$ret['body'] = $text;
|
$ret['body'] = $text;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$ret['body'] = removegpg($ret['body']);
|
||||||
|
$msg = removesig($ret['body']);
|
||||||
|
$ret['body'] = $msg['body'];
|
||||||
|
$ret['body'] = convertquote($ret['body'], false);
|
||||||
|
|
||||||
|
if (trim($html) != '')
|
||||||
|
$ret['body'] = removelinebreak($ret['body']);
|
||||||
|
|
||||||
|
$ret['body'] = unifyattributionline($ret['body']);
|
||||||
|
|
||||||
return $ret;
|
return $ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -142,18 +142,22 @@ function html2bbcode($message)
|
||||||
node2bbcode($doc, 'span', array('style'=>'font-style: italic;'), '[i]', '[/i]');
|
node2bbcode($doc, 'span', array('style'=>'font-style: italic;'), '[i]', '[/i]');
|
||||||
node2bbcode($doc, 'span', array('style'=>'font-weight: bold;'), '[b]', '[/b]');
|
node2bbcode($doc, 'span', array('style'=>'font-weight: bold;'), '[b]', '[/b]');
|
||||||
|
|
||||||
node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'size'=>'/(\d+)/', 'color'=>'/(.+)/'), '[font=$1][size=$2][color=$3]', '[/color][/size][/font]');
|
/*node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'size'=>'/(\d+)/', 'color'=>'/(.+)/'), '[font=$1][size=$2][color=$3]', '[/color][/size][/font]');
|
||||||
node2bbcode($doc, 'font', array('size'=>'/(\d+)/', 'color'=>'/(.+)/'), '[size=$1][color=$2]', '[/color][/size]');
|
node2bbcode($doc, 'font', array('size'=>'/(\d+)/', 'color'=>'/(.+)/'), '[size=$1][color=$2]', '[/color][/size]');
|
||||||
node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'size'=>'/(.+)/'), '[font=$1][size=$2]', '[/size][/font]');
|
node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'size'=>'/(.+)/'), '[font=$1][size=$2]', '[/size][/font]');
|
||||||
node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'color'=>'/(.+)/'), '[font=$1][color=$3]', '[/color][/font]');
|
node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'color'=>'/(.+)/'), '[font=$1][color=$3]', '[/color][/font]');
|
||||||
node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/'), '[font=$1]', '[/font]');
|
node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/'), '[font=$1]', '[/font]');
|
||||||
node2bbcode($doc, 'font', array('size'=>'/(\d+)/'), '[size=$1]', '[/size]');
|
node2bbcode($doc, 'font', array('size'=>'/(\d+)/'), '[size=$1]', '[/size]');
|
||||||
node2bbcode($doc, 'font', array('color'=>'/(.+)/'), '[color=$1]', '[/color]');
|
node2bbcode($doc, 'font', array('color'=>'/(.+)/'), '[color=$1]', '[/color]');
|
||||||
|
*/
|
||||||
|
// Untested
|
||||||
|
//node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(.+?)[,;].*font-family:\s*(.+?)[,;].*color:\s*(.+?)[,;].*/'), '[size=$1][font=$2][color=$3]', '[/color][/font][/size]');
|
||||||
|
//node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(\d+)[,;].*/'), '[size=$1]', '[/size]');
|
||||||
|
//node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(.+?)[,;].*/'), '[size=$1]', '[/size]');
|
||||||
|
|
||||||
node2bbcode($doc, 'span', array('style'=>'/.*color:\s*(.+?)[,;].*/'), '[color="$1"]', '[/color]');
|
node2bbcode($doc, 'span', array('style'=>'/.*color:\s*(.+?)[,;].*/'), '[color="$1"]', '[/color]');
|
||||||
node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(\d+)/'), '[size=$1]', '[/size]');
|
|
||||||
|
|
||||||
//node2bbcode($doc, 'span', array('style'=>'/.*font-family:\s*(.+?)[,;].*/'), '[font=$1]', '[/font]');
|
//node2bbcode($doc, 'span', array('style'=>'/.*font-family:\s*(.+?)[,;].*/'), '[font=$1]', '[/font]');
|
||||||
|
|
||||||
//node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*font-size:\s*(\d+?)pt.*/'), '[font=$1][size=$2]', '[/size][/font]');
|
//node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*font-size:\s*(\d+?)pt.*/'), '[font=$1][size=$2]', '[/size][/font]');
|
||||||
//node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*font-size:\s*(\d+?)px.*/'), '[font=$1][size=$2]', '[/size][/font]');
|
//node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*font-size:\s*(\d+?)px.*/'), '[font=$1][size=$2]', '[/size][/font]');
|
||||||
//node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*/'), '[font=$1]', '[/font]');
|
//node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*/'), '[font=$1]', '[/font]');
|
||||||
|
@ -187,13 +191,13 @@ function html2bbcode($message)
|
||||||
|
|
||||||
node2bbcode($doc, 'hr', array(), "[hr]", "");
|
node2bbcode($doc, 'hr', array(), "[hr]", "");
|
||||||
|
|
||||||
//node2bbcode($doc, 'table', array(), "", "");
|
node2bbcode($doc, 'table', array(), "", "");
|
||||||
//node2bbcode($doc, 'tr', array(), "\n", "");
|
node2bbcode($doc, 'tr', array(), "\n", "");
|
||||||
//node2bbcode($doc, 'td', array(), "\t", "");
|
node2bbcode($doc, 'td', array(), "\t", "");
|
||||||
node2bbcode($doc, 'table', array(), "[table]", "[/table]");
|
//node2bbcode($doc, 'table', array(), "[table]", "[/table]");
|
||||||
node2bbcode($doc, 'th', array(), "[th]", "[/th]");
|
//node2bbcode($doc, 'th', array(), "[th]", "[/th]");
|
||||||
node2bbcode($doc, 'tr', array(), "[tr]", "[/tr]");
|
//node2bbcode($doc, 'tr', array(), "[tr]", "[/tr]");
|
||||||
node2bbcode($doc, 'td', array(), "[td]", "[/td]");
|
//node2bbcode($doc, 'td', array(), "[td]", "[/td]");
|
||||||
|
|
||||||
node2bbcode($doc, 'h1', array(), "\n\n[size=xx-large][b]", "[/b][/size]\n");
|
node2bbcode($doc, 'h1', array(), "\n\n[size=xx-large][b]", "[/b][/size]\n");
|
||||||
node2bbcode($doc, 'h2', array(), "\n\n[size=x-large][b]", "[/b][/size]\n");
|
node2bbcode($doc, 'h2', array(), "\n\n[size=x-large][b]", "[/b][/size]\n");
|
||||||
|
|
225
include/msgclean.php
Normal file
225
include/msgclean.php
Normal file
|
@ -0,0 +1,225 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
function savereplace($pattern, $replace, $text)
|
||||||
|
{
|
||||||
|
$save = $text;
|
||||||
|
|
||||||
|
$text = preg_replace($pattern, $replace, $text);
|
||||||
|
|
||||||
|
if ($text == '')
|
||||||
|
$text = $save;
|
||||||
|
return($text);
|
||||||
|
}
|
||||||
|
|
||||||
|
function unifyattributionline($message)
|
||||||
|
{
|
||||||
|
$quotestr = array('quote', 'collapsed');
|
||||||
|
foreach ($quotestr as $quote) {
|
||||||
|
|
||||||
|
$message = savereplace('/----- Original Message -----\s.*?From: "([^<"].*?)" <(.*?)>\s.*?To: (.*?)\s*?Cc: (.*?)\s*?Sent: (.*?)\s.*?Subject: ([^\n].*)\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
$message = savereplace('/----- Original Message -----\s.*?From: "([^<"].*?)" <(.*?)>\s.*?To: (.*?)\s*?Sent: (.*?)\s.*?Subject: ([^\n].*)\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/-------- Original-Nachricht --------\s*\['.$quote.'\]\nDatum: (.*?)\nVon: (.*?) <(.*?)>\nAn: (.*?)\nBetreff: (.*?)\n/i', "[".$quote."='$2']\n", $message);
|
||||||
|
$message = savereplace('/-------- Original-Nachricht --------\s*\['.$quote.'\]\sDatum: (.*?)\s.*Von: "([^<"].*?)" <(.*?)>\s.*An: (.*?)\n.*/i', "[".$quote."='$2']\n", $message);
|
||||||
|
$message = savereplace('/-------- Original-Nachricht --------\s*\['.$quote.'\]\nDatum: (.*?)\nVon: (.*?)\nAn: (.*?)\nBetreff: (.*?)\n/i', "[".$quote."='$2']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/-----Urspr.*?ngliche Nachricht-----\sVon: "([^<"].*?)" <(.*?)>\s.*Gesendet: (.*?)\s.*An: (.*?)\s.*Betreff: ([^\n].*?).*:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
$message = savereplace('/-----Urspr.*?ngliche Nachricht-----\sVon: "([^<"].*?)" <(.*?)>\s.*Gesendet: (.*?)\s.*An: (.*?)\s.*Betreff: ([^\n].*?)\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/Am (.*?), schrieb (.*?):\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/Am .*?, \d+ .*? \d+ \d+:\d+:\d+ \+\d+\sschrieb\s(.*?)\s<(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/Am (.*?) schrieb (.*?) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
|
||||||
|
$message = savereplace('/Am (.*?) schrieb <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
|
||||||
|
$message = savereplace('/Am (.*?) schrieb (.*?):\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
|
||||||
|
$message = savereplace('/Am (.*?) schrieb (.*?)\n(.*?):\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/(\d+)\/(\d+)\/(\d+) ([^<"].*?) <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/On .*?, \d+ .*? \d+ \d+:\d+:\d+ \+\d+\s(.*?)\s<(.*?)>\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/On (.*?) at (.*?), (.*?)\s<(.*?)>\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$3']\n", $message);
|
||||||
|
$message = savereplace('/On (.*?)\n([^<].*?)\s<(.*?)>\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
|
||||||
|
$message = savereplace('/On (.*?), (.*?), (.*?)\s<(.*?)>\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$3']\n", $message);
|
||||||
|
$message = savereplace('/On ([^,].*?), (.*?)\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
|
||||||
|
$message = savereplace('/On (.*?), (.*?)\swrote\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
|
||||||
|
|
||||||
|
// Der loescht manchmal den Body - was eigentlich unmoeglich ist
|
||||||
|
$message = savereplace('/On (.*?),(.*?),(.*?),(.*?), (.*?) wrote:\s*\['.$quote.'\]/i', "[".$quote."='$5']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/Zitat von ([^<].*?) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/Quoting ([^<].*?) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/From: "([^<"].*?)" <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
$message = savereplace('/From: <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/Du \(([^)].*?)\) schreibst:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/--- (.*?) <.*?> schrieb am (.*?):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
$message = savereplace('/--- (.*?) schrieb am (.*?):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/\* (.*?) <(.*?)> hat geschrieben:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/(.*?) <(.*?)> schrieb (.*?)\):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
$message = savereplace('/(.*?) <(.*?)> schrieb am (.*?) um (.*):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
$message = savereplace('/(.*?) schrieb am (.*?) um (.*):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
$message = savereplace('/(.*?) \((.*?)\) schrieb:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
|
||||||
|
$message = savereplace('/(.*?) schrieb:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/(.*?) <(.*?)> writes:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
$message = savereplace('/(.*?) \((.*?)\) writes:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
|
||||||
|
$message = savereplace('/(.*?) writes:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/\* (.*?) wrote:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
$message = savereplace('/(.*?) wrote \(.*?\):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
$message = savereplace('/(.*?) wrote:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/([^<].*?) <.*?> hat am (.*?)\sum\s(.*)\sgeschrieben:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/(\d+)\/(\d+)\/(\d+) ([^<"].*?) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
|
||||||
|
$message = savereplace('/(\d+)\/(\d+)\/(\d+) (.*?) <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
|
||||||
|
$message = savereplace('/(\d+)\/(\d+)\/(\d+) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
|
||||||
|
$message = savereplace('/(\d+)\/(\d+)\/(\d+) <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
|
||||||
|
|
||||||
|
$message = savereplace('/(.*?) <(.*?)> schrubselte:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
|
||||||
|
$message = savereplace('/(.*?) \((.*?)\) schrubselte:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
|
||||||
|
|
||||||
|
}
|
||||||
|
return($message);
|
||||||
|
}
|
||||||
|
|
||||||
|
function removegpg($message)
|
||||||
|
{
|
||||||
|
|
||||||
|
$pattern = '/(.*)\s*-----BEGIN PGP SIGNED MESSAGE-----\s*[\r\n].*Hash:.*?[\r\n](.*)'.
|
||||||
|
'[\r\n]\s*-----BEGIN PGP SIGNATURE-----\s*[\r\n].*'.
|
||||||
|
'[\r\n]\s*-----END PGP SIGNATURE-----(.*)/is';
|
||||||
|
|
||||||
|
preg_match($pattern, $message, $result);
|
||||||
|
|
||||||
|
$cleaned = trim($result[1].$result[2].$result[3]);
|
||||||
|
|
||||||
|
$cleaned = str_replace(array("\n- --\n", "\n- -"), array("\n-- \n", "\n-"), $cleaned);
|
||||||
|
|
||||||
|
|
||||||
|
if ($cleaned == '')
|
||||||
|
$cleaned = $message;
|
||||||
|
|
||||||
|
return($cleaned);
|
||||||
|
}
|
||||||
|
|
||||||
|
function removesig($message)
|
||||||
|
{
|
||||||
|
$sigpos = strrpos($message, "\n-- \n");
|
||||||
|
$quotepos = strrpos($message, "[/quote]");
|
||||||
|
|
||||||
|
if ($sigpos == 0) {
|
||||||
|
// Speziell fuer web.de, die das als Trenner verwenden
|
||||||
|
$message = str_replace("\n___________________________________________________________\n", "\n-- \n", $message);
|
||||||
|
$sigpos = strrpos($message, "\n-- \n");
|
||||||
|
$quotepos = strrpos($message, "[/quote]");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sollte sich der Signaturtrenner innerhalb eines Quotes befinden
|
||||||
|
// wird keine Signaturtrennung ausgefuehrt
|
||||||
|
if (($sigpos < $quotepos) and ($sigpos != 0))
|
||||||
|
return(array('body' => $message, 'sig' => ''));
|
||||||
|
|
||||||
|
// To-Do: Regexp umstellen, so dass auf 1 oder kein Leerzeichen
|
||||||
|
// geprueft wird
|
||||||
|
//$message = str_replace("\n--\n", "\n-- \n", $message);
|
||||||
|
|
||||||
|
$pattern = '/(.*)[\r\n]-- [\r\n](.*)/is';
|
||||||
|
|
||||||
|
preg_match($pattern, $message, $result);
|
||||||
|
|
||||||
|
if (($result[1] != '') and ($result[2] != '')) {
|
||||||
|
$cleaned = trim($result[1])."\n";
|
||||||
|
$sig = trim($result[2]);
|
||||||
|
// '[hr][size=x-small][color=darkblue]'.trim($result[2]).'[/color][/size]';
|
||||||
|
} else {
|
||||||
|
$cleaned = $message;
|
||||||
|
$sig = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
return(array('body' => $cleaned, 'sig' => $sig));
|
||||||
|
}
|
||||||
|
|
||||||
|
function removelinebreak($message)
|
||||||
|
{
|
||||||
|
$arrbody = explode("\n", trim($message));
|
||||||
|
|
||||||
|
$lines = array();
|
||||||
|
$lineno = 0;
|
||||||
|
|
||||||
|
foreach($arrbody as $i => $line) {
|
||||||
|
$currquotelevel = 0;
|
||||||
|
$currline = $line;
|
||||||
|
while ((strlen($currline)>0) and ((substr($currline, 0, 1) == '>')
|
||||||
|
or (substr($currline, 0, 1) == ' '))) {
|
||||||
|
if (substr($currline, 0, 1) == '>')
|
||||||
|
$currquotelevel++;
|
||||||
|
|
||||||
|
$currline = ltrim(substr($currline, 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
$quotelevel = 0;
|
||||||
|
$nextline = trim($arrbody[$i+1]);
|
||||||
|
while ((strlen($nextline)>0) and ((substr($nextline, 0, 1) == '>')
|
||||||
|
or (substr($nextline, 0, 1) == ' '))) {
|
||||||
|
if (substr($nextline, 0, 1) == '>')
|
||||||
|
$quotelevel++;
|
||||||
|
|
||||||
|
$nextline = ltrim(substr($nextline, 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
$len = strlen($line);
|
||||||
|
$firstword = strpos($nextline.' ', ' ');
|
||||||
|
|
||||||
|
$specialchars = ((substr(trim($nextline), 0, 1) == '-') or
|
||||||
|
(substr(trim($nextline), 0, 1) == '=') or
|
||||||
|
(substr(trim($nextline), 0, 1) == '*') or
|
||||||
|
(substr(trim($nextline), 0, 1) == '·') or
|
||||||
|
(substr(trim($nextline), 0, 4) == '[url') or
|
||||||
|
(substr(trim($nextline), 0, 5) == '[size') or
|
||||||
|
(substr(trim($nextline), 0, 7) == 'http://') or
|
||||||
|
(substr(trim($nextline), 0, 8) == 'https://'));
|
||||||
|
|
||||||
|
if (!$specialchars)
|
||||||
|
$specialchars = ((substr(rtrim($line), -1) == '-') or
|
||||||
|
(substr(rtrim($line), -1) == '=') or
|
||||||
|
(substr(rtrim($line), -1) == '*') or
|
||||||
|
(substr(rtrim($line), -1) == '·') or
|
||||||
|
(substr(rtrim($line), -6) == '[/url]') or
|
||||||
|
(substr(rtrim($line), -7) == '[/size]'));
|
||||||
|
|
||||||
|
//if ($specialchars)
|
||||||
|
// echo ("Special\n");
|
||||||
|
|
||||||
|
if ($lines[$lineno] != '') {
|
||||||
|
if (substr($lines[$lineno], -1) != ' ')
|
||||||
|
$lines[$lineno] .= ' ';
|
||||||
|
|
||||||
|
while ((strlen($line)>0) and ((substr($line, 0, 1) == '>')
|
||||||
|
or (substr($line, 0, 1) == ' '))) {
|
||||||
|
|
||||||
|
$line = ltrim(substr($line, 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
//else
|
||||||
|
// $lines[$lineno] = $quotelevel.'-'.$len.'-'.$firstword.'-';
|
||||||
|
|
||||||
|
$lines[$lineno] .= $line;
|
||||||
|
//if ((($len + $firstword < 68) and (substr($line, -1, 1) != ' '))
|
||||||
|
// or ($quotelevel != $currquotelevel) or $specialchars)
|
||||||
|
if (((substr($line, -1, 1) != ' '))
|
||||||
|
or ($quotelevel != $currquotelevel))
|
||||||
|
$lineno++;
|
||||||
|
}
|
||||||
|
return(implode("\n", $lines));
|
||||||
|
|
||||||
|
}
|
||||||
|
?>
|
|
@ -648,8 +648,8 @@ function notifier_run($argv, $argc){
|
||||||
$headers .= 'Reply-to: ' . $reply_to . "\n";
|
$headers .= 'Reply-to: ' . $reply_to . "\n";
|
||||||
|
|
||||||
// for testing purposes: Collect exported mails
|
// for testing purposes: Collect exported mails
|
||||||
$file = tempnam("/tmp/friendica/", "mail-out2-");
|
//$file = tempnam("/tmp/friendica/", "mail-out2-");
|
||||||
file_put_contents($file, json_encode($it));
|
//file_put_contents($file, json_encode($it));
|
||||||
|
|
||||||
$headers .= 'Message-Id: <' . iri2msgid($it['uri']) . '>' . "\n";
|
$headers .= 'Message-Id: <' . iri2msgid($it['uri']) . '>' . "\n";
|
||||||
|
|
||||||
|
@ -657,29 +657,14 @@ function notifier_run($argv, $argc){
|
||||||
$headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
|
$headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
|
||||||
if(!strlen($it['title'])) {
|
if(!strlen($it['title'])) {
|
||||||
$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
|
$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
|
||||||
dbesc($it['parent-uri'])
|
dbesc($it['parent-uri']));
|
||||||
);
|
|
||||||
if(count($r)) {
|
|
||||||
$subtitle = $r[0]['title'];
|
|
||||||
if($subtitle) {
|
|
||||||
if(strncasecmp($subtitle,'RE:',3))
|
|
||||||
$subject = $subtitle;
|
|
||||||
else
|
|
||||||
$subject = 'Re: ' . $subtitle;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*$headers .= 'MIME-Version: 1.0' . "\n";
|
if(count($r) AND ($r[0]['title'] != ''))
|
||||||
//$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
|
$subject = $r[0]['title'];
|
||||||
$headers .= 'Content-Type: text/plain; charset=UTF-8' . "\n";
|
}
|
||||||
$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
|
if(strncasecmp($subject,'RE:',3))
|
||||||
$html = prepare_body($it);
|
$subject = 'Re: '.$subject;
|
||||||
//$message = '<html><body>' . $html . '</body></html>';
|
}
|
||||||
$message = html2plain($html);
|
|
||||||
logger('notifier: email delivery to ' . $addr);
|
|
||||||
mail($addr, $subject, $message, $headers);*/
|
|
||||||
email_send($addr, $subject, $headers, $it);
|
email_send($addr, $subject, $headers, $it);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once("boot.php");
|
require_once("boot.php");
|
||||||
require_once("include/quoteconvert.php");
|
|
||||||
|
|
||||||
|
|
||||||
function poller_run($argv, $argc){
|
function poller_run($argv, $argc){
|
||||||
|
@ -70,6 +69,19 @@ function poller_run($argv, $argc){
|
||||||
// clear old cache
|
// clear old cache
|
||||||
Cache::clear();
|
Cache::clear();
|
||||||
|
|
||||||
|
// clear item cache files if they are older than one day
|
||||||
|
$cache = get_config('system','itemcache');
|
||||||
|
if (($cache != '') and is_dir($cache)) {
|
||||||
|
if ($dh = opendir($cache)) {
|
||||||
|
while (($file = readdir($dh)) !== false) {
|
||||||
|
$fullpath = $cache."/".$file;
|
||||||
|
if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - 86400))
|
||||||
|
unlink($fullpath);
|
||||||
|
}
|
||||||
|
closedir($dh);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$manual_id = 0;
|
$manual_id = 0;
|
||||||
$generation = 0;
|
$generation = 0;
|
||||||
$hub_update = false;
|
$hub_update = false;
|
||||||
|
@ -141,7 +153,10 @@ function poller_run($argv, $argc){
|
||||||
if($manual_id)
|
if($manual_id)
|
||||||
$contact['last-update'] = '0000-00-00 00:00:00';
|
$contact['last-update'] = '0000-00-00 00:00:00';
|
||||||
|
|
||||||
if($contact['network'] === NETWORK_DFRN || $contact['network'] === NETWORK_OSTATUS)
|
if($contact['network'] === NETWORK_DFRN)
|
||||||
|
$contact['priority'] = 2;
|
||||||
|
|
||||||
|
if(!get_config('system','ostatus_use_priority') and ($contact['network'] === NETWORK_OSTATUS))
|
||||||
$contact['priority'] = 2;
|
$contact['priority'] = 2;
|
||||||
|
|
||||||
if($contact['priority'] || $contact['subhub']) {
|
if($contact['priority'] || $contact['subhub']) {
|
||||||
|
@ -494,7 +509,7 @@ function poller_run($argv, $argc){
|
||||||
logger("Mail: can't fetch msg ".$msg_uid);
|
logger("Mail: can't fetch msg ".$msg_uid);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$datarray['body'] = escape_tags(convertquote($r['body'], false));
|
$datarray['body'] = escape_tags($r['body']);
|
||||||
|
|
||||||
logger("Mail: Importing ".$msg_uid);
|
logger("Mail: Importing ".$msg_uid);
|
||||||
|
|
||||||
|
|
|
@ -877,14 +877,27 @@ function prepare_body($item,$attach = false) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
call_hooks('prepare_body_init', $item);
|
call_hooks('prepare_body_init', $item);
|
||||||
|
|
||||||
|
$cache = get_config('system','itemcache');
|
||||||
|
|
||||||
|
if (($cache != '')) {
|
||||||
|
$cachefile = $cache."/".$item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']);
|
||||||
|
|
||||||
|
if (file_exists($cachefile))
|
||||||
|
$s = file_get_contents($cachefile);
|
||||||
|
else {
|
||||||
|
$s = prepare_text($item['body']);
|
||||||
|
file_put_contents($cachefile, $s);
|
||||||
|
}
|
||||||
|
} else
|
||||||
$s = prepare_text($item['body']);
|
$s = prepare_text($item['body']);
|
||||||
|
|
||||||
$prep_arr = array('item' => $item, 'html' => $s);
|
$prep_arr = array('item' => $item, 'html' => $s);
|
||||||
call_hooks('prepare_body', $prep_arr);
|
call_hooks('prepare_body', $prep_arr);
|
||||||
$s = $prep_arr['html'];
|
$s = $prep_arr['html'];
|
||||||
|
|
||||||
if(! $attach)
|
if(! $attach) {
|
||||||
return $s;
|
return $s;
|
||||||
|
}
|
||||||
|
|
||||||
$arr = explode(',',$item['attach']);
|
$arr = explode(',',$item['attach']);
|
||||||
if(count($arr)) {
|
if(count($arr)) {
|
||||||
|
@ -942,9 +955,9 @@ function prepare_body($item,$attach = false) {
|
||||||
$s .= '<div class="filesavetags"><span>' . t('Filed under:') . ' </span>' . $x . '</div>';
|
$s .= '<div class="filesavetags"><span>' . t('Filed under:') . ' </span>' . $x . '</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$prep_arr = array('item' => $item, 'html' => $s);
|
$prep_arr = array('item' => $item, 'html' => $s);
|
||||||
call_hooks('prepare_body_final', $prep_arr);
|
call_hooks('prepare_body_final', $prep_arr);
|
||||||
|
|
||||||
return $prep_arr['html'];
|
return $prep_arr['html'];
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
|
@ -485,6 +485,9 @@ code {
|
||||||
#sidebar-group-list .tool:hover {
|
#sidebar-group-list .tool:hover {
|
||||||
background: #EEE;
|
background: #EEE;
|
||||||
}
|
}
|
||||||
|
#sidebar-pages-list .tool:hover {
|
||||||
|
background: #EEE;
|
||||||
|
}
|
||||||
.tool .label {
|
.tool .label {
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
|
@ -1334,14 +1337,14 @@ body .pageheader{
|
||||||
}
|
}
|
||||||
.tag {
|
.tag {
|
||||||
/*background: url("../../../images/tag_b.png") repeat-x center left;*/
|
/*background: url("../../../images/tag_b.png") repeat-x center left;*/
|
||||||
color: #3465A4;
|
color: #999;
|
||||||
padding-left: 3px;
|
padding-left: 3px;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
.tag a {
|
.tag a {
|
||||||
padding-right: 5px;
|
padding-right: 5px;
|
||||||
/*background: url("../../../images/tag.png") no-repeat center right;*/
|
/*background: url("../../../images/tag.png") no-repeat center right;*/
|
||||||
color: #3465A4;
|
color: #999;
|
||||||
}
|
}
|
||||||
.wwto {
|
.wwto {
|
||||||
position: absolute !important;
|
position: absolute !important;
|
||||||
|
|
|
@ -13,7 +13,8 @@
|
||||||
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
|
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
|
||||||
<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
|
<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
|
||||||
</a>
|
</a>
|
||||||
<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
|
<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu"
|
||||||
|
id="wall-item-photo-menu-button-$item.id">menu</a>
|
||||||
<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
|
<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
|
||||||
$item.item_photo_menu
|
$item.item_photo_menu
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -21,7 +22,8 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="wall-item-actions-author">
|
<div class="wall-item-actions-author">
|
||||||
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
|
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span
|
||||||
|
class="wall-item-name$item.sparkle">$item.name</span></a>
|
||||||
<span class="wall-item-ago">-
|
<span class="wall-item-ago">-
|
||||||
{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
|
{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
|
||||||
{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
|
{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
|
||||||
|
@ -95,3 +97,4 @@
|
||||||
<div class="wall-item-comment-wrapper" >
|
<div class="wall-item-comment-wrapper" >
|
||||||
$item.comment
|
$item.comment
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,8 @@
|
||||||
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
|
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
|
||||||
<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
|
<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
|
||||||
</a>
|
</a>
|
||||||
<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
|
<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu"
|
||||||
|
id="wall-item-photo-menu-button-$item.id">menu</a>
|
||||||
<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
|
<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
|
||||||
$item.item_photo_menu
|
$item.item_photo_menu
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -26,8 +27,10 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="wall-item-actions-author">
|
<div class="wall-item-actions-author">
|
||||||
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
|
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span
|
||||||
$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
|
class="wall-item-name$item.sparkle">$item.name</span></a>
|
||||||
|
$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle"
|
||||||
|
id="wall-item-ownername-$item.id">$item.owner_name</span></a>
|
||||||
$item.vwall <span class="wall-item-ago">-
|
$item.vwall <span class="wall-item-ago">-
|
||||||
{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
|
{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
|
||||||
{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
|
{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
|
||||||
|
|
|
@ -20,9 +20,11 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="contact-entry-photo-end" ></div>
|
<div class="contact-entry-photo-end" ></div>
|
||||||
<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
|
<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
|
||||||
|
{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
|
||||||
<div class="contact-entry-details" id="contact-entry-url-$contact.id" >
|
<div class="contact-entry-details" id="contact-entry-url-$contact.id" >
|
||||||
<a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
|
<a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
|
||||||
<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
|
<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
|
||||||
|
|
||||||
<div class="contact-entry-end" ></div>
|
<div class="contact-entry-end" ></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<div class="widget" id="group-sidebar">
|
<div id="group-sidebar" class="widget">
|
||||||
<h3>$title</h3>
|
<h3 class="label">$title</h3>
|
||||||
|
|
||||||
<div id="sidebar-group-list">
|
<div id="sidebar-group-list">
|
||||||
<ul id="sidebar-group-ul">
|
<ul id="sidebar-group-ul">
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
{{ if $group.edit }}
|
{{ if $group.edit }}
|
||||||
<a
|
<a
|
||||||
class="groupsideedit"
|
class="groupsideedit"
|
||||||
href="$group.edit.href" title="$edittext"><span class="icon small-pencil"></span></a>
|
href="$group.edit.href" title="$group.edit.title"><span class="icon small-pencil"></span></a>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
{{ if $group.cid }}
|
{{ if $group.cid }}
|
||||||
<input type="checkbox"
|
<input type="checkbox"
|
||||||
|
|
|
@ -74,25 +74,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$(document).ready(function() {
|
|
||||||
function toggleToolbar() {
|
|
||||||
if ( $('#nav-floater').is(':visible') ) {
|
|
||||||
$('#nav-floater').slideUp('fast');
|
|
||||||
$('.floaterflip').css({
|
|
||||||
backgroundPosition: '-210px -60px'
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
$('#nav-floater').slideDown('fast');
|
|
||||||
$('.floaterflip').css({
|
|
||||||
backgroundPosition: '-190px -60px'
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
$('.floaterflip').click(function() {
|
|
||||||
toggleToolbar();
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
@ -114,6 +114,7 @@ function enableOnUser(){
|
||||||
$(this).val("");
|
$(this).val("");
|
||||||
initEditor();
|
initEditor();
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
|
<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
@ -121,6 +122,7 @@ function enableOnUser(){
|
||||||
var addtitle = '$addtitle';
|
var addtitle = '$addtitle';
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|
||||||
/* enable tinymce on focus and click */
|
/* enable tinymce on focus and click */
|
||||||
$("#profile-jot-text").focus(enableOnUser);
|
$("#profile-jot-text").focus(enableOnUser);
|
||||||
$("#profile-jot-text").click(enableOnUser);
|
$("#profile-jot-text").click(enableOnUser);
|
||||||
|
@ -261,6 +263,18 @@ function enableOnUser(){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function itemFiler(id) {
|
||||||
|
reply = prompt("$fileas");
|
||||||
|
if(reply && reply.length) {
|
||||||
|
commentBusy = true;
|
||||||
|
$('body').css('cursor', 'wait');
|
||||||
|
$.get('filer/' + id + '?term=' + reply);
|
||||||
|
if(timer) clearTimeout(timer);
|
||||||
|
timer = setTimeout(NavUpdate,3000);
|
||||||
|
liking = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function jotClearLocation() {
|
function jotClearLocation() {
|
||||||
$('#jot-coord').val('');
|
$('#jot-coord').val('');
|
||||||
$('#profile-nolocation-wrapper').hide();
|
$('#profile-nolocation-wrapper').hide();
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
|
<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
|
||||||
<ul class="nets-ul">
|
<ul class="nets-ul">
|
||||||
{{ for $nets as $net }}
|
{{ for $nets as $net }}
|
||||||
<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
|
<li><a href="$base?f=&nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
|
||||||
{{ endfor }}
|
{{ endfor }}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,30 +1,44 @@
|
||||||
<div class="vcard">
|
<div class="vcard">
|
||||||
|
|
||||||
|
{{ if $profile.edit }}
|
||||||
|
<div class="action">
|
||||||
|
<span class="icon-profile-edit"></span>
|
||||||
|
<a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
|
||||||
|
<ul id="profiles-menu" class="menu-popup">
|
||||||
|
{{ for $profile.menu.entries as $e }}
|
||||||
|
<li>
|
||||||
|
<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
|
||||||
|
</li>
|
||||||
|
{{ endfor }}
|
||||||
|
<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
|
||||||
|
<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
|
||||||
|
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
{{ endif }}
|
||||||
|
|
||||||
<div class="fn label">$profile.name</div>
|
<div class="fn label">$profile.name</div>
|
||||||
|
|
||||||
{{ if $pdesc }}
|
{{ if $pdesc }}
|
||||||
<div class="title">$profile.pdesc</div>
|
<div class="title">$profile.pdesc</div>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
<div id="profile-photo-wrapper">
|
<div id="profile-photo-wrapper">
|
||||||
<img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name" />
|
<img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" />
|
||||||
<div class="profile-edit-side-div">
|
|
||||||
<a class="profile-edit-side-link icon edit" title="$profile.$editprofile" href="profiles/$profile.id" ></a>
|
|
||||||
</div>
|
|
||||||
<div class="clear"></div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{ if $location }}
|
{{ if $location }}
|
||||||
<div class="location">
|
<div class="location">
|
||||||
<span class="location-label">$location</span>
|
<span class="location-label">$location</span>
|
||||||
<address class="adr">
|
<div class="adr">
|
||||||
{{ if $profile.address }}
|
{{ if $profile.address }}
|
||||||
<div class="street-address">$profile.address</div>{{ endif }}
|
<div class="street-address">$profile.address</div>{{ endif }}
|
||||||
<span class="city-state-zip">$profile.zip</span>
|
<span class="city-state-zip">
|
||||||
<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
|
<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
|
||||||
<span class="region">$profile.region</span>
|
<span class="region">$profile.region</span>
|
||||||
<span class="postal-code">$profile.postal-code</span>
|
<span class="postal-code">$profile.postal-code</span>
|
||||||
|
</span>
|
||||||
{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
|
{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
|
||||||
</address>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="widget" id="saved-search-list">
|
<div id="saved-search-list" class="widget">
|
||||||
<h3 id="search">$title</h3>
|
<h3 id="search">$title</h3>
|
||||||
$searchbox
|
$searchbox
|
||||||
|
|
||||||
|
|
|
@ -195,14 +195,16 @@ input[type=submit] {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* global
|
* global
|
||||||
*/
|
*/
|
||||||
/* .tool .action */
|
/* .tool .action */
|
||||||
.action {
|
.action {
|
||||||
float: right;
|
margin: 5px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* login
|
* login
|
||||||
*/
|
*/
|
||||||
|
@ -210,9 +212,10 @@ input[type=submit] {
|
||||||
margin-right: 20px;
|
margin-right: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*********
|
|
||||||
|
/**
|
||||||
* nav
|
* nav
|
||||||
*********/
|
*/
|
||||||
nav {
|
nav {
|
||||||
height: 60px;
|
height: 60px;
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -690,7 +693,9 @@ aside #viewcontacts {
|
||||||
#netsearch-box {
|
#netsearch-box {
|
||||||
margin: 30px 0px;
|
margin: 30px 0px;
|
||||||
}
|
}
|
||||||
|
.ttright {
|
||||||
|
margin: 0px 0px 0px 0px;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* contacts block
|
* contacts block
|
||||||
|
@ -830,6 +835,7 @@ aside #viewcontacts {
|
||||||
border: 0;
|
border: 0;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
float: right;
|
float: right;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
#profile-jot-perms {
|
#profile-jot-perms {
|
||||||
float: right;
|
float: right;
|
||||||
|
@ -916,7 +922,7 @@ aside #viewcontacts {
|
||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
#jot-title-desc {
|
#jot-title-desc {
|
||||||
color: #cccccc;
|
color: #ccc;
|
||||||
}
|
}
|
||||||
#profile-jot-desc {
|
#profile-jot-desc {
|
||||||
color: #ff2000;
|
color: #ff2000;
|
||||||
|
@ -1097,7 +1103,7 @@ section {
|
||||||
clear: left;
|
clear: left;
|
||||||
font-size: 0.8em;
|
font-size: 0.8em;
|
||||||
color: #878883;
|
color: #878883;
|
||||||
margin: 20px 0 0 110px;
|
margin: 20px 20px 0 110px;
|
||||||
}
|
}
|
||||||
.wall-item-ago {
|
.wall-item-ago {
|
||||||
display: inline;
|
display: inline;
|
||||||
|
@ -1697,7 +1703,6 @@ div[id$="wrapper"] br {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* register, settings & profile forms
|
* register, settings & profile forms
|
||||||
*/
|
*/
|
||||||
|
@ -1744,26 +1749,44 @@ div[id$="wrapper"] br {
|
||||||
margin: 30px 0px;
|
margin: 30px 0px;
|
||||||
}
|
}
|
||||||
.profile-edit-side-div {
|
.profile-edit-side-div {
|
||||||
background: #2e2f2e;
|
/*background: #111;*/
|
||||||
border-radius: 5px 5px 0 0;
|
/*border-radius: 5px 5px 0px 0px;*/
|
||||||
width: 175px;
|
|
||||||
height: 20px;
|
|
||||||
position: relative;
|
|
||||||
margin: -25px -30px 0px 0px;
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.profile-edit-side-div:hover {
|
|
||||||
/*margin: 0px 0px 0px 0px;*/
|
/*margin: 0px 0px 0px 0px;*/
|
||||||
display: inline;
|
/*width: 100px;*/
|
||||||
|
/*height: 25px;*/
|
||||||
|
/*position: absolute;*/
|
||||||
|
display: none;
|
||||||
|
/*left: 35%;*/
|
||||||
|
/*top: 41%;*/
|
||||||
|
/*cursor: pointer;*/
|
||||||
}
|
}
|
||||||
.profile-edit-side-link {
|
/*.profile-edit-side-div:hover {*/
|
||||||
margin: 0 0px 0px 155px;
|
/*display: block;*/
|
||||||
/*float: right;*/
|
/*}*/
|
||||||
|
/*.profile-edit-side-link {*/
|
||||||
|
/*margin: 3px 0px 0px 70px;*/
|
||||||
|
/*}*/
|
||||||
|
#profiles-menu-trigger {
|
||||||
|
margin: 0px 0px 0px 25px;
|
||||||
}
|
}
|
||||||
.profile-listing {
|
.profile-listing {
|
||||||
float: left;
|
float: left;
|
||||||
margin: 20px 20px 0px 0px;
|
margin: 20px 20px 0px 0px;
|
||||||
}
|
}
|
||||||
|
.icon-profile-edit {
|
||||||
|
background: url("icons.png") -150px 0px no-repeat;
|
||||||
|
border: 0;
|
||||||
|
cursor: pointer;
|
||||||
|
display: block;
|
||||||
|
float: right;
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
margin: 0 0 -18px;
|
||||||
|
position: absolute;
|
||||||
|
text-decoration: none;
|
||||||
|
top: 18px;
|
||||||
|
right: 226px;
|
||||||
|
}
|
||||||
#profile-edit-links ul {
|
#profile-edit-links ul {
|
||||||
margin: 20px 0;
|
margin: 20px 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
|
|
@ -74,16 +74,6 @@ $(document).ready(function() {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
});
|
});
|
||||||
|
|
||||||
// usermenu
|
|
||||||
//$('html').click(function() {
|
|
||||||
// $('#user-menu-popup').css('display: none');
|
|
||||||
//document.getElementById("usermenu-popup").style.display = "none";
|
|
||||||
//});
|
|
||||||
|
|
||||||
//$('#user-menu').click(function(event) {
|
|
||||||
// event.stopPropagation();
|
|
||||||
//});
|
|
||||||
|
|
||||||
function toggleToolbar() {
|
function toggleToolbar() {
|
||||||
if ( $('#nav-floater').is(':visible') ) {
|
if ( $('#nav-floater').is(':visible') ) {
|
||||||
$('#nav-floater').slideUp('fast');
|
$('#nav-floater').slideUp('fast');
|
||||||
|
@ -106,11 +96,20 @@ $(document).ready(function() {
|
||||||
$(this).css({color: '#eec'});
|
$(this).css({color: '#eec'});
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#profile-photo-wrapper').mouseover(function() {
|
/* $('#profile-photo-wrapper').mouseover(function() {
|
||||||
$('#profile-edit-side-div').css({display: 'block'});
|
$('.profile-edit-side-div').css({display: 'block'});
|
||||||
}).mouseout(function() {
|
}).mouseout(function() {
|
||||||
$('#profile-edit-side-div').css({display: 'none'});
|
$('.profile-edit-side-div').css({display: 'none'});
|
||||||
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('img.photo').mouseover(function() {
|
||||||
|
$('.profile-edit-side-div').css({display: 'block'});
|
||||||
|
}).mouseout(function() {
|
||||||
|
$('.profile-edit-side-div').css({display: 'none'});
|
||||||
|
return false;
|
||||||
|
});*/
|
||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
EOT;
|
EOT;
|
||||||
|
|
|
@ -26,11 +26,14 @@
|
||||||
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
|
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
|
||||||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
|
|
||||||
{{ if $item.vote }}
|
{{ if $item.vote }}
|
||||||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
|
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
|
||||||
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
|
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
|
||||||
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
|
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
|
||||||
{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
|
{{ if $item.vote.share }}
|
||||||
|
<a href="#" id="share-$item.id"
|
||||||
|
class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
|
||||||
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
|
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
|
||||||
</div>
|
</div>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
|
|
|
@ -31,11 +31,15 @@
|
||||||
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
|
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
|
||||||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
|
|
||||||
{{ if $item.vote }}
|
{{ if $item.vote }}
|
||||||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
|
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
|
||||||
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
|
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
|
||||||
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
|
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
|
||||||
{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
|
|
||||||
|
{{ if $item.vote.share }}
|
||||||
|
<a href="#" id="share-$item.id"
|
||||||
|
class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
|
||||||
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
|
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
|
||||||
</div>
|
</div>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
|
@ -63,6 +67,7 @@
|
||||||
{{ endfor }}
|
{{ endfor }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="wall-item-author">
|
<div class="wall-item-author">
|
||||||
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
|
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
|
||||||
|
|
|
@ -111,6 +111,3 @@ $(document).ready(function() {
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
EOT;
|
EOT;
|
||||||
|
|
||||||
$a->page['footer'] .= <<<EOFooter
|
|
||||||
EOFooter;
|
|
||||||
|
|
|
@ -2615,12 +2615,12 @@ aside input[type='text'] {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.body-tag, .filesavetags {
|
.body-tag {
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
filter:alpha(opacity=50);
|
filter:alpha(opacity=50);
|
||||||
}
|
}
|
||||||
|
|
||||||
.body-tag:hover, .filesavetags:hover {
|
.body-tag:hover {
|
||||||
opacity: 1.0 !important;
|
opacity: 1.0 !important;
|
||||||
filter:alpha(opacity=100) !important;
|
filter:alpha(opacity=100) !important;
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,9 +56,7 @@
|
||||||
{{ if $item.star }}
|
{{ if $item.star }}
|
||||||
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
|
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
|
||||||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||||
{{ endif }}
|
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.star.filer"></a>
|
||||||
{{ if $item.filer }}
|
|
||||||
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
|
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
|
|
||||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
|
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
|
||||||
|
|
|
@ -61,9 +61,6 @@
|
||||||
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
|
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
|
||||||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
{{ if $item.filer }}
|
|
||||||
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
|
|
||||||
{{ endif }}
|
|
||||||
|
|
||||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
|
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
|
||||||
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
|
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
|
||||||
|
|
Loading…
Reference in a new issue