Merge https://github.com/friendica/friendica-addons into apull
This commit is contained in:
friendica
commit
d6283663ca
90
dav/main.php
90
dav/main.php
|
|
@ -22,6 +22,50 @@ function dav_module()
|
|||
{
|
||||
}
|
||||
|
||||
function dav_include_files() {
|
||||
require_once (__DIR__ . "/common/dbclasses/dbclass_animexx.class.php");
|
||||
require_once (__DIR__ . "/common/dbclasses/dbclass.friendica.calendars.class.php");
|
||||
require_once (__DIR__ . "/common/dbclasses/dbclass.friendica.jqcalendar.class.php");
|
||||
require_once (__DIR__ . "/common/dbclasses/dbclass.friendica.notifications.class.php");
|
||||
require_once (__DIR__ . "/common/dbclasses/dbclass.friendica.calendarobjects.class.php");
|
||||
|
||||
/*
|
||||
require_once (__DIR__ . "/SabreDAV/lib/Sabre.includes.php");
|
||||
require_once (__DIR__ . "/SabreDAV/lib/Sabre/VObject/includes.php");
|
||||
require_once (__DIR__ . "/SabreDAV/lib/Sabre/DAVACL/includes.php");
|
||||
require_once (__DIR__ . "/SabreDAV/lib/Sabre/CalDAV/includes.php");
|
||||
*/
|
||||
require_once (__DIR__ . "/SabreDAV/lib/Sabre/autoload.php");
|
||||
|
||||
$tz_before = date_default_timezone_get();
|
||||
require_once (__DIR__ . "/iCalcreator/iCalcreator.class.php");
|
||||
date_default_timezone_set($tz_before);
|
||||
|
||||
require_once (__DIR__ . "/common/calendar.fnk.php");
|
||||
require_once (__DIR__ . "/common/dav_caldav_backend_common.inc.php");
|
||||
require_once (__DIR__ . "/common/dav_caldav_backend.inc.php");
|
||||
require_once (__DIR__ . "/common/dav_caldav_root.inc.php");
|
||||
require_once (__DIR__ . "/common/dav_user_calendars.inc.php");
|
||||
require_once (__DIR__ . "/common/dav_carddav_root.inc.php");
|
||||
require_once (__DIR__ . "/common/dav_carddav_backend_std.inc.php");
|
||||
require_once (__DIR__ . "/common/dav_user_addressbooks.inc.php");
|
||||
require_once (__DIR__ . "/common/virtual_cal_source_backend.inc.php");
|
||||
require_once (__DIR__ . "/common/wdcal_configuration.php");
|
||||
require_once (__DIR__ . "/common/wdcal_cal_source.inc.php");
|
||||
require_once (__DIR__ . "/common/wdcal_cal_source_private.inc.php");
|
||||
|
||||
require_once (__DIR__ . "/dav_friendica_principal.inc.php");
|
||||
require_once (__DIR__ . "/dav_friendica_auth.inc.php");
|
||||
require_once (__DIR__ . "/dav_carddav_backend_friendica_community.inc.php");
|
||||
require_once (__DIR__ . "/dav_caldav_backend_friendica.inc.php");
|
||||
require_once (__DIR__ . "/virtual_cal_source_friendica.inc.php");
|
||||
require_once (__DIR__ . "/wdcal_cal_source_friendicaevents.inc.php");
|
||||
require_once (__DIR__ . "/FriendicaACLPlugin.inc.php");
|
||||
|
||||
require_once (__DIR__ . "/calendar.friendica.fnk.php");
|
||||
require_once (__DIR__ . "/layout.fnk.php");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param App $a
|
||||
|
|
@ -34,48 +78,8 @@ function dav_init(&$a)
|
|||
* ALTER TABLE `photo` ADD INDEX ( `contact-id` )
|
||||
*/
|
||||
|
||||
require_once (__DIR__ . "/common/dbclasses/dbclass_animexx.class.php");
|
||||
require_once (__DIR__ . "/common/dbclasses/dbclass.friendica.calendars.class.php");
|
||||
require_once (__DIR__ . "/common/dbclasses/dbclass.friendica.jqcalendar.class.php");
|
||||
require_once (__DIR__ . "/common/dbclasses/dbclass.friendica.notifications.class.php");
|
||||
require_once (__DIR__ . "/common/dbclasses/dbclass.friendica.calendarobjects.class.php");
|
||||
|
||||
/*
|
||||
require_once (__DIR__ . "/SabreDAV/lib/Sabre.includes.php");
|
||||
require_once (__DIR__ . "/SabreDAV/lib/Sabre/VObject/includes.php");
|
||||
require_once (__DIR__ . "/SabreDAV/lib/Sabre/DAVACL/includes.php");
|
||||
require_once (__DIR__ . "/SabreDAV/lib/Sabre/CalDAV/includes.php");
|
||||
*/
|
||||
require_once (__DIR__ . "/SabreDAV/lib/Sabre/autoload.php");
|
||||
|
||||
$tz_before = date_default_timezone_get();
|
||||
require_once (__DIR__ . "/iCalcreator/iCalcreator.class.php");
|
||||
date_default_timezone_set($tz_before);
|
||||
|
||||
require_once (__DIR__ . "/common/calendar.fnk.php");
|
||||
require_once (__DIR__ . "/common/dav_caldav_backend_common.inc.php");
|
||||
require_once (__DIR__ . "/common/dav_caldav_backend.inc.php");
|
||||
require_once (__DIR__ . "/common/dav_caldav_root.inc.php");
|
||||
require_once (__DIR__ . "/common/dav_user_calendars.inc.php");
|
||||
require_once (__DIR__ . "/common/dav_carddav_root.inc.php");
|
||||
require_once (__DIR__ . "/common/dav_carddav_backend_std.inc.php");
|
||||
require_once (__DIR__ . "/common/dav_user_addressbooks.inc.php");
|
||||
require_once (__DIR__ . "/common/virtual_cal_source_backend.inc.php");
|
||||
require_once (__DIR__ . "/common/wdcal_configuration.php");
|
||||
require_once (__DIR__ . "/common/wdcal_cal_source.inc.php");
|
||||
require_once (__DIR__ . "/common/wdcal_cal_source_private.inc.php");
|
||||
|
||||
require_once (__DIR__ . "/dav_friendica_principal.inc.php");
|
||||
require_once (__DIR__ . "/dav_friendica_auth.inc.php");
|
||||
require_once (__DIR__ . "/dav_carddav_backend_friendica_community.inc.php");
|
||||
require_once (__DIR__ . "/dav_caldav_backend_friendica.inc.php");
|
||||
require_once (__DIR__ . "/virtual_cal_source_friendica.inc.php");
|
||||
require_once (__DIR__ . "/wdcal_cal_source_friendicaevents.inc.php");
|
||||
require_once (__DIR__ . "/FriendicaACLPlugin.inc.php");
|
||||
|
||||
require_once (__DIR__ . "/calendar.friendica.fnk.php");
|
||||
require_once (__DIR__ . "/layout.fnk.php");
|
||||
|
||||
dav_include_files();
|
||||
|
||||
if (false) {
|
||||
dbg(true);
|
||||
error_reporting(E_ALL);
|
||||
|
|
@ -197,6 +201,7 @@ function dav_content()
|
|||
*/
|
||||
function dav_event_created_hook(&$a, &$b)
|
||||
{
|
||||
dav_include_files();
|
||||
// @TODO Updating the cache instead of completely invalidating and rebuilding it
|
||||
FriendicaVirtualCalSourceBackend::invalidateCache($a->user["uid"], CALDAV_FRIENDICA_CONTACTS);
|
||||
FriendicaVirtualCalSourceBackend::invalidateCache($a->user["uid"], CALDAV_FRIENDICA_MINE);
|
||||
|
|
@ -208,6 +213,7 @@ function dav_event_created_hook(&$a, &$b)
|
|||
*/
|
||||
function dav_event_updated_hook(&$a, &$b)
|
||||
{
|
||||
dav_include_files();
|
||||
// @TODO Updating the cache instead of completely invalidating and rebuilding it
|
||||
FriendicaVirtualCalSourceBackend::invalidateCache($a->user["uid"], CALDAV_FRIENDICA_CONTACTS);
|
||||
FriendicaVirtualCalSourceBackend::invalidateCache($a->user["uid"], CALDAV_FRIENDICA_MINE);
|
||||
|
|
|
|||
|
|
@ -34,20 +34,48 @@ function privacy_image_cache_init() {
|
|||
$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash );
|
||||
if (count($r)) {
|
||||
$img_str = $r[0]['data'];
|
||||
$mime = $r[0]["desc"];
|
||||
if ($mime == "") $mime = "image/jpeg";
|
||||
}
|
||||
else {
|
||||
require_once("Photo.php");
|
||||
|
||||
$img_str = fetch_url($_REQUEST['url'],true);
|
||||
$img = new Photo($img_str);
|
||||
if($img->is_valid()) {
|
||||
$img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100);
|
||||
$img_str = $img->imageString();
|
||||
}
|
||||
if (substr($img_str, 0, 6) == "GIF89a") {
|
||||
$mime = "image/gif";
|
||||
$image = @imagecreatefromstring($img_str);
|
||||
|
||||
if($image === FALSE) die();
|
||||
|
||||
q("INSERT INTO `photo`
|
||||
( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, `album`, `height`, `width`, `desc`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
|
||||
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' )",
|
||||
0, 0, get_guid(), dbesc($urlhash),
|
||||
dbesc(datetime_convert()),
|
||||
dbesc(datetime_convert()),
|
||||
dbesc(basename(dbesc($_REQUEST["url"]))),
|
||||
dbesc(''),
|
||||
intval(imagesy($image)),
|
||||
intval(imagesx($image)),
|
||||
'image/gif',
|
||||
dbesc($img_str),
|
||||
100,
|
||||
intval(0),
|
||||
dbesc(''), dbesc(''), dbesc(''), dbesc('')
|
||||
);
|
||||
|
||||
} else {
|
||||
$img = new Photo($img_str);
|
||||
if($img->is_valid()) {
|
||||
$img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100);
|
||||
$img_str = $img->imageString();
|
||||
}
|
||||
$mime = "image/jpeg";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
header("Content-type: image/jpeg");
|
||||
header("Content-type: $mime");
|
||||
header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
|
||||
header("Cache-Control: max-age=" . (3600*24));
|
||||
|
||||
|
|
@ -75,7 +103,7 @@ function privacy_image_cache_is_local_image($url) {
|
|||
function privacy_image_cache_img_cb($matches) {
|
||||
// following line changed per bug #431
|
||||
if (privacy_image_cache_is_local_image($matches[2])) return $matches[1] . $matches[2] . $matches[3];
|
||||
return $matches[1] . "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($matches[2]))) . $matches[3];
|
||||
return $matches[1] . get_app()->get_baseurl() . "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($matches[2]))) . $matches[3];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -94,9 +122,9 @@ function privacy_image_cache_bbcode_hook(&$a, &$o) {
|
|||
function privacy_image_cache_display_item_hook(&$a, &$o) {
|
||||
if (isset($o["output"])) {
|
||||
if (isset($o["output"]["thumb"]) && !privacy_image_cache_is_local_image($o["output"]["thumb"]))
|
||||
$o["output"]["thumb"] = "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["output"]["thumb"])));
|
||||
$o["output"]["thumb"] = $a->get_baseurl() . "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["output"]["thumb"])));
|
||||
if (isset($o["output"]["author-avatar"]) && !privacy_image_cache_is_local_image($o["output"]["author-avatar"]))
|
||||
$o["output"]["author-avatar"] = "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["output"]["author-avatar"])));
|
||||
$o["output"]["author-avatar"] = $a->get_baseurl() . "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["output"]["author-avatar"])));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -107,7 +135,7 @@ function privacy_image_cache_display_item_hook(&$a, &$o) {
|
|||
*/
|
||||
function privacy_image_cache_ping_xmlize_hook(&$a, &$o) {
|
||||
if ($o["photo"] != "" && !privacy_image_cache_is_local_image($o["photo"]))
|
||||
$o["photo"] = "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["photo"])));
|
||||
$o["photo"] = $a->get_baseurl() . "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["photo"])));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
BIN
smiley_pack.tgz
BIN
smiley_pack.tgz
Binary file not shown.
|
|
@ -69,9 +69,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':grenouille';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':grenouille' . '" />';
|
||||
|
||||
$b['texts'][] = ':hamster';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';
|
||||
|
||||
$b['texts'][] = ':singe';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':singe' . '" />';
|
||||
|
||||
|
|
@ -81,9 +78,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':perroquet';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':perroquet' . '" />';
|
||||
|
||||
$b['texts'][] = ':tux';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';
|
||||
|
||||
$b['texts'][] = ':escargot';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':escargot' . '" />';
|
||||
|
||||
|
|
@ -142,9 +136,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':afro';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';
|
||||
|
||||
$b['texts'][] = ':cool';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool' . '" />';
|
||||
|
||||
#Devil/Angel Smileys
|
||||
|
||||
$b['texts'][] = ':ange';
|
||||
|
|
@ -168,9 +159,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':possédé';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':possédé' . '" />';
|
||||
|
||||
$b['texts'][] = ':saint';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint' . '" />';
|
||||
|
||||
$b['texts'][] = ':tombe';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tombe' . '" />';
|
||||
|
||||
|
|
@ -182,9 +170,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':pèteaulit';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pèteaulit' . '" />';
|
||||
|
||||
$b['texts'][] = ':vomit';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit' . '" />';
|
||||
|
||||
$b['texts'][] = ':pet';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pet' . '" />';
|
||||
|
||||
|
|
@ -217,9 +202,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':basket';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basket' . '" />';
|
||||
|
||||
$b['texts'][] = ':bowling';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . ':bowling' . '" />';
|
||||
|
||||
$b['texts'][] = ':vélo';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':vélo' . '" />';
|
||||
|
||||
|
|
@ -229,9 +211,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':escrime';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':escrime' . '" />';
|
||||
|
||||
$b['texts'][] = ':golf';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
|
||||
|
||||
$b['texts'][] = ':jonglage';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':jonglage' . '" />';
|
||||
|
||||
|
|
@ -241,18 +220,12 @@ function smiley_pack_fr_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':arc';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':arc' . '" />';
|
||||
|
||||
$b['texts'][] = ':football';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football' . '" />';
|
||||
|
||||
$b['texts'][] = ':surf';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
|
||||
|
||||
$b['texts'][] = ':billard';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billard' . '" />';
|
||||
|
||||
$b['texts'][] = ':tennis';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tennis' . '" />';
|
||||
|
||||
$b['texts'][] = ':équitation';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':équitation' . '" />';
|
||||
|
||||
|
|
@ -264,9 +237,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':amoureux';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':amoureux' . '" />';
|
||||
|
||||
$b['texts'][] = ':love';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':love' . '" />';
|
||||
|
||||
$b['texts'][] = ':oursamour';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':oursamour' . '" />';
|
||||
|
||||
|
|
@ -298,9 +268,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':combatalien';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':combatalien' . '" />';
|
||||
|
||||
$b['texts'][] = ':alpha';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alpha' . '" />';
|
||||
|
||||
$b['texts'][] = ':armée';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':armée' . '" />';
|
||||
|
||||
|
|
@ -334,21 +301,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':mitrailleuse';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':mitrailleuse' . '" />';
|
||||
|
||||
$b['texts'][] = ':marine';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
|
||||
|
||||
$b['texts'][] = ':sabre';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sabre' . '" />';
|
||||
|
||||
$b['texts'][] = ':tank';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tank' . '" />';
|
||||
|
||||
$b['texts'][] = ':viking';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
|
||||
|
||||
$b['texts'][] = ':gangs';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs' . '" />';
|
||||
|
||||
$b['texts'][] = ':acide';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acide' . '" />';
|
||||
|
||||
|
|
@ -363,9 +315,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':dinosaure';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaure' . '" />';
|
||||
|
||||
$b['texts'][] = ':dragon';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragon' . '" />';
|
||||
|
||||
$b['texts'][] = ':petitdragon';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':petitdragon' . '" />';
|
||||
|
||||
|
|
@ -428,26 +377,11 @@ function smiley_pack_fr_smilies(&$a,&$b) {
|
|||
|
||||
#Laugh smileys
|
||||
|
||||
$b['texts'][] = ':hahaha';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha' . '" />';
|
||||
|
||||
$b['texts'][] = ':loltv';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':loltv' . '" />';
|
||||
|
||||
$b['texts'][] = ':rofl';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl' . '" />';
|
||||
|
||||
#Music smileys
|
||||
|
||||
$b['texts'][] = ':dj';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
|
||||
|
||||
$b['texts'][] = ':batterie';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':batterie' . '" />';
|
||||
|
||||
$b['texts'][] = ':elvis';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
|
||||
|
||||
$b['texts'][] = ':guitare';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitare' . '" />';
|
||||
|
||||
|
|
@ -468,24 +402,7 @@ function smiley_pack_fr_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':barbeblanche';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':barbeblanche' . '" />';
|
||||
|
||||
$b['texts'][] = ':shaka';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':shaka' . '" />';
|
||||
|
||||
$b['texts'][] = ':\\.../';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
|
||||
|
||||
$b['texts'][] = ':\\ooo/';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
|
||||
|
||||
$b['texts'][] = ':tête';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':tête' . '" />';
|
||||
|
||||
#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
|
||||
|
||||
$b['texts'][] = ':-d';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
|
||||
|
||||
$b['texts'][] = ':-o';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
/*
|
||||
* Name: Smiley Pack
|
||||
* Description: Pack of smileys that make master too AOLish.
|
||||
* Version: 1.02
|
||||
* Version: 1.04
|
||||
* Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template)
|
||||
* All smileys from sites offering them as Public Domain
|
||||
*/
|
||||
|
|
@ -141,9 +141,6 @@ function smiley_pack_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':affro';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':affro' . '" />';
|
||||
|
||||
$b['texts'][] = ':cool';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool' . '" />';
|
||||
|
||||
#Devil/Angel Smileys
|
||||
|
||||
$b['texts'][] = ':angel';
|
||||
|
|
@ -181,9 +178,6 @@ function smiley_pack_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':fartinbed';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':fartinbed' . '" />';
|
||||
|
||||
$b['texts'][] = ':vomit';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit' . '" />';
|
||||
|
||||
$b['texts'][] = ':fartblush';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush' . '" />';
|
||||
|
||||
|
|
@ -228,9 +222,6 @@ function smiley_pack_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':fencing';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':fencing' . '" />';
|
||||
|
||||
$b['texts'][] = ':golf';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
|
||||
|
||||
$b['texts'][] = ':juggling';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':juggling' . '" />';
|
||||
|
||||
|
|
@ -240,18 +231,12 @@ function smiley_pack_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':archery';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':archery' . '" />';
|
||||
|
||||
$b['texts'][] = ':football';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football' . '" />';
|
||||
|
||||
$b['texts'][] = ':surfing';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surfing' . '" />';
|
||||
|
||||
$b['texts'][] = ':snooker';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':snooker' . '" />';
|
||||
|
||||
$b['texts'][] = ':tennis';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tennis' . '" />';
|
||||
|
||||
$b['texts'][] = ':horseriding';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding' . '" />';
|
||||
|
||||
|
|
@ -297,9 +282,6 @@ function smiley_pack_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':alienfight';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':alienfight' . '" />';
|
||||
|
||||
$b['texts'][] = ':alpha';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alpha' . '" />';
|
||||
|
||||
$b['texts'][] = ':army';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':army' . '" />';
|
||||
|
||||
|
|
@ -333,21 +315,6 @@ function smiley_pack_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':machinegun';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':machinegun' . '" />';
|
||||
|
||||
$b['texts'][] = ':marine';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
|
||||
|
||||
$b['texts'][] = ':sabre';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sabre' . '" />';
|
||||
|
||||
$b['texts'][] = ':tank';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tank' . '" />';
|
||||
|
||||
$b['texts'][] = ':viking';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
|
||||
|
||||
$b['texts'][] = ':gangs';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs' . '" />';
|
||||
|
||||
$b['texts'][] = ':acid';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acid' . '" />';
|
||||
|
||||
|
|
@ -438,14 +405,9 @@ function smiley_pack_smilies(&$a,&$b) {
|
|||
|
||||
#Music smileys
|
||||
|
||||
$b['texts'][] = ':dj';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
|
||||
|
||||
$b['texts'][] = ':drums';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':drums' . '" />';
|
||||
|
||||
$b['texts'][] = ':elvis';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
|
||||
|
||||
$b['texts'][] = ':guitar';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitar' . '" />';
|
||||
|
|
@ -453,9 +415,6 @@ function smiley_pack_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':trumpet';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trumpet' . '" />';
|
||||
|
||||
$b['texts'][] = ':violin';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin' . '" />';
|
||||
|
||||
#Smileys that used to be in core
|
||||
|
||||
$b['texts'][] = ':headbang';
|
||||
|
|
@ -487,7 +446,50 @@ function smiley_pack_smilies(&$a,&$b) {
|
|||
$b['texts'][] = ':-o';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
|
||||
|
||||
# Regex killers - stick these at the bottom so they appear at the end of the English and
|
||||
# at the start of $OtherLanguage.
|
||||
|
||||
$b['texts'][] = ':cool';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool' . '" />';
|
||||
|
||||
$b['texts'][] = ':vomit';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit' . '" />';
|
||||
|
||||
$b['texts'][] = ':golf';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
|
||||
|
||||
$b['texts'][] = ':football';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football' . '" />';
|
||||
|
||||
$b['texts'][] = ':tennis';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tennis' . '" />';
|
||||
|
||||
$b['texts'][] = ':alpha';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alpha' . '" />';
|
||||
|
||||
$b['texts'][] = ':marine';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
|
||||
|
||||
$b['texts'][] = ':sabre';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sabre' . '" />';
|
||||
|
||||
$b['texts'][] = ':tank';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tank' . '" />';
|
||||
|
||||
$b['texts'][] = ':viking';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
|
||||
|
||||
$b['texts'][] = ':gangs';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs' . '" />';
|
||||
|
||||
|
||||
$b['texts'][] = ':dj';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
|
||||
|
||||
|
||||
$b['texts'][] = ':elvis';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
|
||||
|
||||
$b['texts'][] = ':violin';
|
||||
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin' . '" />';
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue