diff --git a/e107_plugins/social/admin_config.php b/e107_plugins/social/admin_config.php index bb0233282..ddb1a355e 100644 --- a/e107_plugins/social/admin_config.php +++ b/e107_plugins/social/admin_config.php @@ -394,21 +394,10 @@ class social_ui extends e_admin_ui "; - //XXX XURL Definitions. - $xurls = array( - 'facebook' => array('label'=>"Facebook", "placeholder"=>"eg. https://www.facebook.com/e107CMS"), - 'twitter' => array('label'=>"Twitter", "placeholder"=>"eg. https://twitter.com/e107"), - 'youtube' => array('label'=>"Youtube", "placeholder"=>"eg.https://youtube.com/e107Inc"), - 'linkedin' => array('label'=>"LinkedIn", "placeholder"=>"eg. https://www.linkedin.com/groups?home=&gid=1782682"), - 'github' => array('label'=>"GitHub", "placeholder"=>"eg. https://github.com/e107inc"), - 'flickr' => array('label'=>"Flickr", "placeholder"=>""), - 'instagram' => array('label'=>"Instagram", "placeholder"=>""), - 'pinterest' => array('label'=>"Pinterest", "placeholder"=>""), - 'steam' => array('label'=>"Steam", "placeholder"=>"eg. https://steamcommunity.com"), - 'vimeo' => array('label'=>"Vimeo", "placeholder"=>""), - 'twitch' => array('label'=>"Twitch", "placeholder"=>""), - 'vk' => array('label'=>"VK (Vkontakte)", "placeholder"=>""), - ); + + + $json = file_get_contents(__DIR__."/xurls.json"); + $xurls = e107::unserialize($json); foreach($xurls as $k=>$var) { diff --git a/e107_plugins/social/css/fontello.css b/e107_plugins/social/css/fontello.css deleted file mode 100644 index a114768c7..000000000 --- a/e107_plugins/social/css/fontello.css +++ /dev/null @@ -1,104 +0,0 @@ -@font-face { - font-family: 'fontello'; - src: url('../font/fontello.eot?21917124'); - src: url('../font/fontello.eot?21917124#iefix') format('embedded-opentype'), - url('../font/fontello.woff2?21917124') format('woff2'), - url('../font/fontello.woff?21917124') format('woff'), - url('../font/fontello.ttf?21917124') format('truetype'), - url('../font/fontello.svg?21917124#fontello') format('svg'); - font-weight: normal; - font-style: normal; -} -/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ -/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ -/* -@media screen and (-webkit-min-device-pixel-ratio:0) { - @font-face { - font-family: 'fontello'; - src: url('../font/fontello.svg?21917124#fontello') format('svg'); - } -} -*/ - - [class^="e-social-"]:before, [class*=" e-social-"]:before { - font-family: "fontello"; - font-style: normal; - font-weight: normal; - speak: none; - - display: inline-block; - text-decoration: inherit; - width: 1em; - margin-right: .2em; - text-align: center; - /* opacity: .8; */ - - /* For safety - reset parent styles, that can break glyph codes*/ - font-variant: normal; - text-transform: none; - - /* fix buttons height, for twitter bootstrap */ - line-height: 1em; - - /* Animation center compensation - margins should be symmetric */ - /* remove if not needed */ - margin-left: .2em; - - /* you can be more comfortable with increased icons size */ - /* font-size: 120%; */ - - /* Font smoothing. That was taken from TWBS */ - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - - /* Uncomment for 3D effect */ - /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ -} - -.e-social-gplus:before { content: '\e800'; } /* '' */ -.e-social-stumbleupon:before { content: '\e801'; } /* '' */ -.e-social-pinterest:before { content: '\e802'; } /* '' */ -.e-social-digg:before { content: '\e803'; } /* '' */ -.e-social-reddit:before { content: '\e804'; } /* '' */ -.e-social-blogger:before { content: '\e805'; } /* '' */ -.e-social-dribbble:before { content: '\e806'; } /* '' */ -.e-social-linkedin:before { content: '\e807'; } /* '' */ -.e-social-skype:before { content: '\e808'; } /* '' */ -.e-social-twitter:before { content: '\e809'; } /* '' */ -.e-social-youtube:before { content: '\e80a'; } /* '' */ -.e-social-vimeo:before { content: '\e80b'; } /* '' */ -.e-social-yahoo:before { content: '\e80c'; } /* '' */ -.e-social-email:before { content: '\e80d'; } /* '' */ -.e-social-dropbox:before { content: '\e80e'; } /* '' */ -.e-social-facebook:before { content: '\e80f'; } /* '' */ -.e-social-tumblr:before { content: '\e811'; } /* '' */ -.e-social-yelp:before { content: '\e812'; } /* '' */ -.e-social-delicious:before { content: '\e813'; } /* '' */ -.e-social-acrobat:before { content: '\e814'; } /* '' */ -.e-social-linkedin-rect:before { content: '\e815'; } /* '' */ -.e-social-blogger-rect:before { content: '\e816'; } /* '' */ -.e-social-instagram-1:before { content: '\e817'; } /* '' */ -.e-social-instagram-filled:before { content: '\e818'; } /* '' */ -.e-social-google:before { content: '\e819'; } /* '' */ -.e-social-rss:before { content: '\e81a'; } /* '' */ -.e-social-spread:before { content: '\e81b'; } /* '' */ -.e-social-flattr:before { content: '\e81c'; } /* '' */ -.e-social-flickr:before { content: '\e81d'; } /* '' */ -.e-social-instapaper:before { content: '\e81e'; } /* '' */ -.e-social-thumbs-up:before { content: '\e81f'; } /* '' */ -.e-social-mail:before { content: '\e820'; } /* '' */ -.e-social-mail-alt:before { content: '\e821'; } /* '' */ -.e-social-foursquare:before { content: '\e822'; } /* '' */ -.e-social-share:before { content: '\e823'; } /* '' */ -.e-social-export:before { content: '\e824'; } /* '' */ -.e-social-pocket:before { content: '\e825'; } /* '' */ -.e-social-wordpress:before { content: '\e826'; } /* '' */ -.e-social-pinboard:before { content: '\e827'; } /* '' */ -.e-social-instagram:before { content: '\e828'; } /* '' */ -.e-social-vk:before { content: '\e829'; } /* '' */ -.e-social-vine:before { content: '\e82a'; } /* '' */ -.e-social-meetup:before { content: '\e82b'; } /* '' */ -.e-social-youtube-play:before { content: '\e82c'; } /* '' */ -.e-social-github:before { content: '\f09b'; } /* '' */ -.e-social-steam:before { content: '\f1b6'; } /* '' */ -.e-social-twitch:before { content: '\f1e8'; } /* '' */ \ No newline at end of file diff --git a/e107_plugins/social/e_module.php b/e107_plugins/social/e_module.php index 93944de2c..bc2ec29e9 100644 --- a/e107_plugins/social/e_module.php +++ b/e107_plugins/social/e_module.php @@ -3,7 +3,7 @@ if(e_ADMIN_AREA !==true) { - e107::css('social', 'css/fontello.css'); + e107::css('social', 'style.css'); // e107::link(array('rel'=>'preload', 'href'=> "{e_PLUGIN}social/font/fontello.woff2?21917124", 'as' => "font", 'type'=>"font/woff2", 'crossorigin' => 'anonymous')); e107::css('social' ,'css/social.css'); diff --git a/e107_plugins/social/e_shortcode.php b/e107_plugins/social/e_shortcode.php index 27adfec86..ae525e0a2 100644 --- a/e107_plugins/social/e_shortcode.php +++ b/e107_plugins/social/e_shortcode.php @@ -18,6 +18,11 @@ class social_shortcodes extends e_shortcode + private $xurl; + + + + public function getProviders() { @@ -61,6 +66,11 @@ class social_shortcodes extends e_shortcode */ function sc_xurl_icons($parm=null) { + if(empty($this->xurl)) + { + $this->xurl = e107::pref('core','xurl'); + } + $tp = e107::getParser(); $tmpl = !empty($parm['template']) ? $parm['template'] : 'default'; @@ -74,20 +84,19 @@ class social_shortcodes extends e_shortcode $social = array( 'rss' => array('href'=> (e107::isInstalled('rss_menu') ? e107::url('rss_menu', 'index', array('rss_url'=>'news')) : ''), 'title'=>'RSS/Atom Feed'), - 'facebook' => array('href'=> deftrue('XURL_FACEBOOK'), 'title'=>'Facebook'), - 'twitter' => array('href'=> deftrue('XURL_TWITTER'), 'title'=>'Twitter'), - // 'google-plus' => array('href'=> deftrue('XURL_GOOGLE'), 'title'=>'Google Plus'), - 'linkedin' => array('href'=> deftrue('XURL_LINKEDIN'), 'title'=>'LinkedIn'), - 'github' => array('href'=> deftrue('XURL_GITHUB'), 'title'=>'Github'), - 'pinterest' => array('href'=> deftrue('XURL_PINTEREST'), 'title'=>'Pinterest'), - 'flickr' => array('href'=> deftrue('XURL_FLICKR'), 'title'=>'Flickr'), - 'instagram' => array('href'=> deftrue('XURL_INSTAGRAM'), 'title'=>'Instagram'), - 'youtube' => array('href'=> deftrue('XURL_YOUTUBE'), 'title'=>'YouTube'), - 'steam' => array('href'=> deftrue('XURL_STEAM'), 'title'=>'Steam'), - 'vimeo' => array('href'=> deftrue('XURL_VIMEO'), 'title'=>'Vimeo'), - 'twitch' => array('href'=> deftrue('XURL_TWITCH'), 'title'=>'Twitch'), - 'vk' => array('href'=> deftrue('XURL_VK'), 'title'=>'VK (Vkontakte)') ); + + $json = file_get_contents(__DIR__."/xurls.json"); + $xurls = e107::unserialize($json); + foreach($xurls as $k=>$val) + { + if(!empty($this->xurl[$k])) + { + $social[$k] = ['href'=> $this->xurl[$k], 'title'=>$val['label'] ]; + } + } + + // print_a($social); @@ -163,8 +172,9 @@ class social_shortcodes extends e_shortcode /** @experimental inline svg - subject to removal at any time */ public function sc_xurl_icons_svg($parm=null) { - $path = e_WEB.'lib/font-awesome/5/svgs/brands/'; - $path .= $this->var['id'].".svg"; + // $path = e_WEB.'lib/font-awesome/'.$this->fontawesome.'/svgs/brands/'; + + $path = e_PLUGIN."social/svg/".$this->var['id'].".svg"; if(!file_exists($path)) { diff --git a/e107_plugins/social/font/fontello.eot b/e107_plugins/social/font/fontello.eot deleted file mode 100644 index 1687d9b65..000000000 Binary files a/e107_plugins/social/font/fontello.eot and /dev/null differ diff --git a/e107_plugins/social/font/fontello.svg b/e107_plugins/social/font/fontello.svg deleted file mode 100644 index 22c8f739d..000000000 --- a/e107_plugins/social/font/fontello.svg +++ /dev/null @@ -1,104 +0,0 @@ - - - -Copyright (C) 2020 by original authors @ fontello.com - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/e107_plugins/social/font/fontello.ttf b/e107_plugins/social/font/fontello.ttf deleted file mode 100644 index 4095f53ab..000000000 Binary files a/e107_plugins/social/font/fontello.ttf and /dev/null differ diff --git a/e107_plugins/social/font/fontello.woff b/e107_plugins/social/font/fontello.woff deleted file mode 100644 index fe0741ecb..000000000 Binary files a/e107_plugins/social/font/fontello.woff and /dev/null differ diff --git a/e107_plugins/social/font/fontello.woff2 b/e107_plugins/social/font/fontello.woff2 deleted file mode 100644 index 4c20f9dfb..000000000 Binary files a/e107_plugins/social/font/fontello.woff2 and /dev/null differ diff --git a/e107_plugins/social/fonts/social.eot b/e107_plugins/social/fonts/social.eot new file mode 100644 index 000000000..2a0485606 Binary files /dev/null and b/e107_plugins/social/fonts/social.eot differ diff --git a/e107_plugins/social/fonts/social.svg b/e107_plugins/social/fonts/social.svg new file mode 100644 index 000000000..9165b8776 --- /dev/null +++ b/e107_plugins/social/fonts/social.svg @@ -0,0 +1,66 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e107_plugins/social/fonts/social.ttf b/e107_plugins/social/fonts/social.ttf new file mode 100644 index 000000000..b4bf5ac24 Binary files /dev/null and b/e107_plugins/social/fonts/social.ttf differ diff --git a/e107_plugins/social/fonts/social.woff b/e107_plugins/social/fonts/social.woff new file mode 100644 index 000000000..fd785ec89 Binary files /dev/null and b/e107_plugins/social/fonts/social.woff differ diff --git a/e107_plugins/social/ie7/ie7.css b/e107_plugins/social/ie7/ie7.css new file mode 100644 index 000000000..65068b5a8 --- /dev/null +++ b/e107_plugins/social/ie7/ie7.css @@ -0,0 +1,169 @@ +.e-social-map { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-sms { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-facebook-square { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-github-square { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-phone { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-phone-square { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-facebook { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-github { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-mobile { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-tumblr { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-reddit { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-twitch { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-whatsapp { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-map-o { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-meetup { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-steam { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-vimeo { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-skype { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-wordpress { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-yelp { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-dropbox { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-vk { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-gplus { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-google { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-apple { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-digg { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-stumbleupon { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-flickr { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-reddit-alien { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-youtube-play { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-youtube { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-pocketpocket { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-rss { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-pinterest { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-instagram { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-linkedin { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-export { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-share { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-foursquare { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-thumbs-up { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-thumbs-up-solid { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-mail { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-mail-alt { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-discord { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-instapaper { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-twitter { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-squarespace { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-tiktok { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-pushpin { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-vine { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-dribbble { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-blogger { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-android { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-linkedin-rect { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-delicious { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-flattr { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} + diff --git a/e107_plugins/social/ie7/ie7.js b/e107_plugins/social/ie7/ie7.js new file mode 100644 index 000000000..5729ba729 --- /dev/null +++ b/e107_plugins/social/ie7/ie7.js @@ -0,0 +1,87 @@ +/* To avoid CSS expressions while still supporting IE 7 and IE 6, use this script */ +/* The script tag referencing this file must be placed before the ending body tag. */ + +/* Use conditional comments in order to target IE 7 and older: + + + +*/ + +(function() { + function addIcon(el, entity) { + var html = el.innerHTML; + el.innerHTML = '' + entity + '' + html; + } + var icons = { + 'e-social-map': '', + 'e-social-sms': '', + 'e-social-facebook-square': '', + 'e-social-github-square': '', + 'e-social-phone': '', + 'e-social-phone-square': '', + 'e-social-facebook': '', + 'e-social-github': '', + 'e-social-mobile': '', + 'e-social-tumblr': '', + 'e-social-reddit': '', + 'e-social-twitch': '', + 'e-social-whatsapp': '', + 'e-social-map-o': '', + 'e-social-meetup': '', + 'e-social-steam': '', + 'e-social-vimeo': '', + 'e-social-skype': '', + 'e-social-wordpress': '', + 'e-social-yelp': '', + 'e-social-dropbox': '', + 'e-social-vk': '', + 'e-social-gplus': '', + 'e-social-google': '', + 'e-social-apple': '', + 'e-social-digg': '', + 'e-social-stumbleupon': '', + 'e-social-flickr': '', + 'e-social-reddit-alien': '', + 'e-social-youtube-play': '', + 'e-social-youtube': '', + 'e-social-pocketpocket': '', + 'e-social-rss': '', + 'e-social-pinterest': '', + 'e-social-instagram': '', + 'e-social-linkedin': '', + 'e-social-export': '', + 'e-social-share': '', + 'e-social-foursquare': '', + 'e-social-thumbs-up': '', + 'e-social-thumbs-up-solid': '', + 'e-social-mail': '', + 'e-social-mail-alt': '', + 'e-social-discord': '', + 'e-social-instapaper': '', + 'e-social-twitter': '', + 'e-social-squarespace': '', + 'e-social-tiktok': '', + 'e-social-pushpin': '', + 'e-social-vine': '', + 'e-social-dribbble': '', + 'e-social-blogger': '', + 'e-social-android': '', + 'e-social-linkedin-rect': '', + 'e-social-delicious': '', + 'e-social-flattr': '', + '0': 0 + }, + els = document.getElementsByTagName('*'), + i, c, el; + for (i = 0; ; i += 1) { + el = els[i]; + if(!el) { + break; + } + c = el.className; + c = c.match(/e-social-[^\s'"]+/); + if (c && icons[c[0]]) { + addIcon(el, icons[c[0]]); + } + } +}()); diff --git a/e107_plugins/social/style.css b/e107_plugins/social/style.css new file mode 100644 index 000000000..a935b7a66 --- /dev/null +++ b/e107_plugins/social/style.css @@ -0,0 +1,195 @@ +@font-face { + font-family: 'social'; + src: url('fonts/social.eot?jatzak'); + src: url('fonts/social.eot?jatzak#iefix') format('embedded-opentype'), + url('fonts/social.ttf?jatzak') format('truetype'), + url('fonts/social.woff?jatzak') format('woff'), + url('fonts/social.svg?jatzak#social') format('svg'); + font-weight: normal; + font-style: normal; + font-display: block; +} + +[class^="e-social-"], [class*=" e-social-"] { + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: 'social' !important; + speak: never; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.e-social-map:before { + content: "\f041"; +} +.e-social-sms:before { + content: "\f075"; +} +.e-social-facebook-square:before { + content: "\f082"; +} +.e-social-github-square:before { + content: "\f092"; +} +.e-social-phone:before { + content: "\f095"; +} +.e-social-phone-square:before { + content: "\f098"; +} +.e-social-facebook:before { + content: "\f09a"; +} +.e-social-github:before { + content: "\f09b"; +} +.e-social-mobile:before { + content: "\f10b"; +} +.e-social-tumblr:before { + content: "\f173"; +} +.e-social-reddit:before { + content: "\f1a1"; +} +.e-social-twitch:before { + content: "\f1e8"; +} +.e-social-whatsapp:before { + content: "\f232"; +} +.e-social-map-o:before { + content: "\f278"; +} +.e-social-meetup:before { + content: "\f2e0"; +} +.e-social-steam:before { + content: "\e902"; +} +.e-social-vimeo:before { + content: "\e905"; +} +.e-social-skype:before { + content: "\e906"; +} +.e-social-wordpress:before { + content: "\e907"; +} +.e-social-yelp:before { + content: "\e908"; +} +.e-social-dropbox:before { + content: "\e909"; +} +.e-social-vk:before { + content: "\e90a"; +} +.e-social-gplus:before { + content: "\e90b"; +} +.e-social-google:before { + content: "\e90c"; +} +.e-social-apple:before { + content: "\e90d"; +} +.e-social-digg:before { + content: "\e90e"; +} +.e-social-stumbleupon:before { + content: "\e90f"; +} +.e-social-flickr:before { + content: "\e910"; +} +.e-social-reddit-alien:before { + content: "\e911"; +} +.e-social-youtube-play:before { + content: "\e912"; +} +.e-social-youtube:before { + content: "\e913"; +} +.e-social-pocketpocket:before { + content: "\e914"; +} +.e-social-rss:before { + content: "\e915"; +} +.e-social-pinterest:before { + content: "\e916"; +} +.e-social-instagram:before { + content: "\e917"; +} +.e-social-linkedin:before { + content: "\e918"; +} +.e-social-export:before { + content: "\e919"; +} +.e-social-share:before { + content: "\e91a"; +} +.e-social-foursquare:before { + content: "\e91b"; +} +.e-social-thumbs-up:before { + content: "\e91c"; +} +.e-social-thumbs-up-solid:before { + content: "\e91d"; +} +.e-social-mail:before { + content: "\e91e"; +} +.e-social-mail-alt:before { + content: "\e91f"; +} +.e-social-discord:before { + content: "\e900"; +} +.e-social-instapaper:before { + content: "\e903"; +} +.e-social-twitter:before { + content: "\e924"; +} +.e-social-squarespace:before { + content: "\e921"; +} +.e-social-tiktok:before { + content: "\e922"; +} +.e-social-pushpin:before { + content: "\e946"; +} +.e-social-vine:before { + content: "\ea97"; +} +.e-social-dribbble:before { + content: "\eaa7"; +} +.e-social-blogger:before { + content: "\eab7"; +} +.e-social-android:before { + content: "\eac0"; +} +.e-social-linkedin-rect:before { + content: "\eac9"; +} +.e-social-delicious:before { + content: "\eacd"; +} +.e-social-flattr:before { + content: "\ead5"; +} diff --git a/e107_plugins/social/svg/android.svg b/e107_plugins/social/svg/android.svg new file mode 100644 index 000000000..cf40a3ff1 --- /dev/null +++ b/e107_plugins/social/svg/android.svg @@ -0,0 +1,6 @@ + + +android + + + diff --git a/e107_plugins/social/svg/apple.svg b/e107_plugins/social/svg/apple.svg new file mode 100644 index 000000000..90fe6314c --- /dev/null +++ b/e107_plugins/social/svg/apple.svg @@ -0,0 +1,5 @@ + + +apple + + diff --git a/e107_plugins/social/svg/blogger.svg b/e107_plugins/social/svg/blogger.svg new file mode 100644 index 000000000..23f7d44bc --- /dev/null +++ b/e107_plugins/social/svg/blogger.svg @@ -0,0 +1,5 @@ + + +blogger + + diff --git a/e107_plugins/social/svg/delicious.svg b/e107_plugins/social/svg/delicious.svg new file mode 100644 index 000000000..b64f7024a --- /dev/null +++ b/e107_plugins/social/svg/delicious.svg @@ -0,0 +1,5 @@ + + +delicious + + diff --git a/e107_plugins/social/svg/digg.svg b/e107_plugins/social/svg/digg.svg new file mode 100644 index 000000000..dd5f337e5 --- /dev/null +++ b/e107_plugins/social/svg/digg.svg @@ -0,0 +1,5 @@ + + +digg + + diff --git a/e107_plugins/social/svg/discord.svg b/e107_plugins/social/svg/discord.svg new file mode 100644 index 000000000..076e0b172 --- /dev/null +++ b/e107_plugins/social/svg/discord.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/e107_plugins/social/svg/dribbble.svg b/e107_plugins/social/svg/dribbble.svg new file mode 100644 index 000000000..e69ef917b --- /dev/null +++ b/e107_plugins/social/svg/dribbble.svg @@ -0,0 +1,5 @@ + + +dribbble + + diff --git a/e107_plugins/social/svg/dropbox.svg b/e107_plugins/social/svg/dropbox.svg new file mode 100644 index 000000000..940faa13c --- /dev/null +++ b/e107_plugins/social/svg/dropbox.svg @@ -0,0 +1,5 @@ + + +dropbox + + diff --git a/e107_plugins/social/svg/export.svg b/e107_plugins/social/svg/export.svg new file mode 100644 index 000000000..531a6c177 --- /dev/null +++ b/e107_plugins/social/svg/export.svg @@ -0,0 +1,5 @@ + + +export + + diff --git a/e107_plugins/social/svg/facebook-square.svg b/e107_plugins/social/svg/facebook-square.svg new file mode 100644 index 000000000..d84b2251b --- /dev/null +++ b/e107_plugins/social/svg/facebook-square.svg @@ -0,0 +1,5 @@ + + +facebook-square + + diff --git a/e107_plugins/social/svg/facebook.svg b/e107_plugins/social/svg/facebook.svg new file mode 100644 index 000000000..37f3e2d03 --- /dev/null +++ b/e107_plugins/social/svg/facebook.svg @@ -0,0 +1,5 @@ + + +facebook + + diff --git a/e107_plugins/social/svg/flattr.svg b/e107_plugins/social/svg/flattr.svg new file mode 100644 index 000000000..041cacd3b --- /dev/null +++ b/e107_plugins/social/svg/flattr.svg @@ -0,0 +1,5 @@ + + +flattr + + diff --git a/e107_plugins/social/svg/flickr.svg b/e107_plugins/social/svg/flickr.svg new file mode 100644 index 000000000..12c05a5ce --- /dev/null +++ b/e107_plugins/social/svg/flickr.svg @@ -0,0 +1,5 @@ + + +flickr + + diff --git a/e107_plugins/social/svg/foursquare.svg b/e107_plugins/social/svg/foursquare.svg new file mode 100644 index 000000000..70d0e1850 --- /dev/null +++ b/e107_plugins/social/svg/foursquare.svg @@ -0,0 +1,5 @@ + + +foursquare + + diff --git a/e107_plugins/social/svg/github-square.svg b/e107_plugins/social/svg/github-square.svg new file mode 100644 index 000000000..495b96d13 --- /dev/null +++ b/e107_plugins/social/svg/github-square.svg @@ -0,0 +1,5 @@ + + +github-square + + diff --git a/e107_plugins/social/svg/github.svg b/e107_plugins/social/svg/github.svg new file mode 100644 index 000000000..0bf3a0de0 --- /dev/null +++ b/e107_plugins/social/svg/github.svg @@ -0,0 +1,5 @@ + + +github + + diff --git a/e107_plugins/social/svg/google.svg b/e107_plugins/social/svg/google.svg new file mode 100644 index 000000000..20ea96bf7 --- /dev/null +++ b/e107_plugins/social/svg/google.svg @@ -0,0 +1,5 @@ + + +google + + diff --git a/e107_plugins/social/svg/gplus.svg b/e107_plugins/social/svg/gplus.svg new file mode 100644 index 000000000..78c33c8b8 --- /dev/null +++ b/e107_plugins/social/svg/gplus.svg @@ -0,0 +1,5 @@ + + +gplus + + diff --git a/e107_plugins/social/svg/instagram.svg b/e107_plugins/social/svg/instagram.svg new file mode 100644 index 000000000..c0124e896 --- /dev/null +++ b/e107_plugins/social/svg/instagram.svg @@ -0,0 +1,5 @@ + + +instagram + + diff --git a/e107_plugins/social/svg/instapaper.svg b/e107_plugins/social/svg/instapaper.svg new file mode 100644 index 000000000..b164ec854 --- /dev/null +++ b/e107_plugins/social/svg/instapaper.svg @@ -0,0 +1,5 @@ + + +instapaper + + diff --git a/e107_plugins/social/svg/linkedin-rect.svg b/e107_plugins/social/svg/linkedin-rect.svg new file mode 100644 index 000000000..87aea49b7 --- /dev/null +++ b/e107_plugins/social/svg/linkedin-rect.svg @@ -0,0 +1,5 @@ + + +linkedin-rect + + diff --git a/e107_plugins/social/svg/linkedin.svg b/e107_plugins/social/svg/linkedin.svg new file mode 100644 index 000000000..b5252eaf1 --- /dev/null +++ b/e107_plugins/social/svg/linkedin.svg @@ -0,0 +1,5 @@ + + +linkedin + + diff --git a/e107_plugins/social/svg/mail-alt.svg b/e107_plugins/social/svg/mail-alt.svg new file mode 100644 index 000000000..466d7035b --- /dev/null +++ b/e107_plugins/social/svg/mail-alt.svg @@ -0,0 +1,5 @@ + + +mail-alt + + diff --git a/e107_plugins/social/svg/mail.svg b/e107_plugins/social/svg/mail.svg new file mode 100644 index 000000000..b66a6d0d8 --- /dev/null +++ b/e107_plugins/social/svg/mail.svg @@ -0,0 +1,5 @@ + + +mail + + diff --git a/e107_plugins/social/svg/map-o.svg b/e107_plugins/social/svg/map-o.svg new file mode 100644 index 000000000..ff5b69746 --- /dev/null +++ b/e107_plugins/social/svg/map-o.svg @@ -0,0 +1,5 @@ + + +map-o + + diff --git a/e107_plugins/social/svg/map.svg b/e107_plugins/social/svg/map.svg new file mode 100644 index 000000000..cae59dc50 --- /dev/null +++ b/e107_plugins/social/svg/map.svg @@ -0,0 +1,5 @@ + + +map + + diff --git a/e107_plugins/social/svg/meetup.svg b/e107_plugins/social/svg/meetup.svg new file mode 100644 index 000000000..5c1ccd4a1 --- /dev/null +++ b/e107_plugins/social/svg/meetup.svg @@ -0,0 +1,5 @@ + + +meetup + + diff --git a/e107_plugins/social/svg/mobile.svg b/e107_plugins/social/svg/mobile.svg new file mode 100644 index 000000000..498bc990f --- /dev/null +++ b/e107_plugins/social/svg/mobile.svg @@ -0,0 +1,5 @@ + + +mobile + + diff --git a/e107_plugins/social/svg/phone-square.svg b/e107_plugins/social/svg/phone-square.svg new file mode 100644 index 000000000..ec48cf9ca --- /dev/null +++ b/e107_plugins/social/svg/phone-square.svg @@ -0,0 +1,5 @@ + + +phone-square + + diff --git a/e107_plugins/social/svg/phone.svg b/e107_plugins/social/svg/phone.svg new file mode 100644 index 000000000..4fc559507 --- /dev/null +++ b/e107_plugins/social/svg/phone.svg @@ -0,0 +1,5 @@ + + +phone + + diff --git a/e107_plugins/social/svg/pinterest.svg b/e107_plugins/social/svg/pinterest.svg new file mode 100644 index 000000000..564dee1b5 --- /dev/null +++ b/e107_plugins/social/svg/pinterest.svg @@ -0,0 +1,5 @@ + + +pinterest + + diff --git a/e107_plugins/social/svg/pocketpocket.svg b/e107_plugins/social/svg/pocketpocket.svg new file mode 100644 index 000000000..2ae58e9ce --- /dev/null +++ b/e107_plugins/social/svg/pocketpocket.svg @@ -0,0 +1,5 @@ + + +pocketpocket + + diff --git a/e107_plugins/social/svg/pushpin.svg b/e107_plugins/social/svg/pushpin.svg new file mode 100644 index 000000000..b18d50bd7 --- /dev/null +++ b/e107_plugins/social/svg/pushpin.svg @@ -0,0 +1,5 @@ + + +pushpin + + diff --git a/e107_plugins/social/svg/reddit-alien.svg b/e107_plugins/social/svg/reddit-alien.svg new file mode 100644 index 000000000..f7fcaece9 --- /dev/null +++ b/e107_plugins/social/svg/reddit-alien.svg @@ -0,0 +1,5 @@ + + +reddit-alien + + diff --git a/e107_plugins/social/svg/reddit.svg b/e107_plugins/social/svg/reddit.svg new file mode 100644 index 000000000..55954e4c8 --- /dev/null +++ b/e107_plugins/social/svg/reddit.svg @@ -0,0 +1,5 @@ + + +reddit + + diff --git a/e107_plugins/social/svg/rss.svg b/e107_plugins/social/svg/rss.svg new file mode 100644 index 000000000..57698c610 --- /dev/null +++ b/e107_plugins/social/svg/rss.svg @@ -0,0 +1,5 @@ + + +rss + + diff --git a/e107_plugins/social/svg/share.svg b/e107_plugins/social/svg/share.svg new file mode 100644 index 000000000..695829514 --- /dev/null +++ b/e107_plugins/social/svg/share.svg @@ -0,0 +1,5 @@ + + +share + + diff --git a/e107_plugins/social/svg/skype.svg b/e107_plugins/social/svg/skype.svg new file mode 100644 index 000000000..16326b13d --- /dev/null +++ b/e107_plugins/social/svg/skype.svg @@ -0,0 +1,5 @@ + + +skype + + diff --git a/e107_plugins/social/svg/sms.svg b/e107_plugins/social/svg/sms.svg new file mode 100644 index 000000000..76f99268c --- /dev/null +++ b/e107_plugins/social/svg/sms.svg @@ -0,0 +1,5 @@ + + +sms + + diff --git a/e107_plugins/social/svg/squarespace.svg b/e107_plugins/social/svg/squarespace.svg new file mode 100644 index 000000000..6c53e4b2d --- /dev/null +++ b/e107_plugins/social/svg/squarespace.svg @@ -0,0 +1,5 @@ + + +squarespace + + diff --git a/e107_plugins/social/svg/steam.svg b/e107_plugins/social/svg/steam.svg new file mode 100644 index 000000000..b939b09f4 --- /dev/null +++ b/e107_plugins/social/svg/steam.svg @@ -0,0 +1,5 @@ + + +steam + + diff --git a/e107_plugins/social/svg/stumbleupon.svg b/e107_plugins/social/svg/stumbleupon.svg new file mode 100644 index 000000000..f61b0b46c --- /dev/null +++ b/e107_plugins/social/svg/stumbleupon.svg @@ -0,0 +1,5 @@ + + +stumbleupon + + diff --git a/e107_plugins/social/svg/thumbs-up-solid.svg b/e107_plugins/social/svg/thumbs-up-solid.svg new file mode 100644 index 000000000..619ac464b --- /dev/null +++ b/e107_plugins/social/svg/thumbs-up-solid.svg @@ -0,0 +1,5 @@ + + +thumbs-up-solid + + diff --git a/e107_plugins/social/svg/thumbs-up.svg b/e107_plugins/social/svg/thumbs-up.svg new file mode 100644 index 000000000..b164781d5 --- /dev/null +++ b/e107_plugins/social/svg/thumbs-up.svg @@ -0,0 +1,5 @@ + + +thumbs-up + + diff --git a/e107_plugins/social/svg/tiktok.svg b/e107_plugins/social/svg/tiktok.svg new file mode 100644 index 000000000..1bb33378f --- /dev/null +++ b/e107_plugins/social/svg/tiktok.svg @@ -0,0 +1,5 @@ + + +tiktok + + diff --git a/e107_plugins/social/svg/tumblr.svg b/e107_plugins/social/svg/tumblr.svg new file mode 100644 index 000000000..26eb3f4a1 --- /dev/null +++ b/e107_plugins/social/svg/tumblr.svg @@ -0,0 +1,5 @@ + + +tumblr + + diff --git a/e107_plugins/social/svg/twitch.svg b/e107_plugins/social/svg/twitch.svg new file mode 100644 index 000000000..4e72e7e02 --- /dev/null +++ b/e107_plugins/social/svg/twitch.svg @@ -0,0 +1,5 @@ + + +twitch + + diff --git a/e107_plugins/social/svg/twitter-old.svg b/e107_plugins/social/svg/twitter-old.svg new file mode 100644 index 000000000..83824646c --- /dev/null +++ b/e107_plugins/social/svg/twitter-old.svg @@ -0,0 +1,5 @@ + + +twitter + + diff --git a/e107_plugins/social/svg/twitter.svg b/e107_plugins/social/svg/twitter.svg new file mode 100644 index 000000000..8bdc81619 --- /dev/null +++ b/e107_plugins/social/svg/twitter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/e107_plugins/social/svg/vimeo.svg b/e107_plugins/social/svg/vimeo.svg new file mode 100644 index 000000000..47383f9e3 --- /dev/null +++ b/e107_plugins/social/svg/vimeo.svg @@ -0,0 +1,5 @@ + + +vimeo + + diff --git a/e107_plugins/social/svg/vine.svg b/e107_plugins/social/svg/vine.svg new file mode 100644 index 000000000..6a929d451 --- /dev/null +++ b/e107_plugins/social/svg/vine.svg @@ -0,0 +1,5 @@ + + +vine + + diff --git a/e107_plugins/social/svg/vk.svg b/e107_plugins/social/svg/vk.svg new file mode 100644 index 000000000..f65d3fbe0 --- /dev/null +++ b/e107_plugins/social/svg/vk.svg @@ -0,0 +1,5 @@ + + +vk + + diff --git a/e107_plugins/social/svg/whatsapp.svg b/e107_plugins/social/svg/whatsapp.svg new file mode 100644 index 000000000..90cee8f11 --- /dev/null +++ b/e107_plugins/social/svg/whatsapp.svg @@ -0,0 +1,5 @@ + + +whatsapp + + diff --git a/e107_plugins/social/svg/wordpress.svg b/e107_plugins/social/svg/wordpress.svg new file mode 100644 index 000000000..ae2d4c826 --- /dev/null +++ b/e107_plugins/social/svg/wordpress.svg @@ -0,0 +1,5 @@ + + +wordpress + + diff --git a/e107_plugins/social/svg/yelp.svg b/e107_plugins/social/svg/yelp.svg new file mode 100644 index 000000000..e892f6600 --- /dev/null +++ b/e107_plugins/social/svg/yelp.svg @@ -0,0 +1,5 @@ + + +yelp + + diff --git a/e107_plugins/social/svg/youtube-play.svg b/e107_plugins/social/svg/youtube-play.svg new file mode 100644 index 000000000..300ddbf2b --- /dev/null +++ b/e107_plugins/social/svg/youtube-play.svg @@ -0,0 +1,5 @@ + + +youtube-play + + diff --git a/e107_plugins/social/svg/youtube.svg b/e107_plugins/social/svg/youtube.svg new file mode 100644 index 000000000..af1608654 --- /dev/null +++ b/e107_plugins/social/svg/youtube.svg @@ -0,0 +1,5 @@ + + +youtube + + diff --git a/e107_plugins/social/xurls.json b/e107_plugins/social/xurls.json new file mode 100644 index 000000000..a2fcfe0d0 --- /dev/null +++ b/e107_plugins/social/xurls.json @@ -0,0 +1,70 @@ +{ + "facebook": { + "label": "Facebook", + "placeholder": "eg. https:\/\/www.facebook.com\/e107CMS" + }, + "instagram": { + "label": "Instagram", + "placeholder": "" + }, + "twitter": { + "label": "X", + "placeholder": "eg. https:\/\/x.com\/e107" + }, + "youtube": { + "label": "Youtube", + "placeholder": "eg.https:\/\/youtube.com\/e107Inc" + }, + "linkedin": { + "label": "LinkedIn", + "placeholder": "eg. https:\/\/www.linkedin.com\/groups?home=&gid=1782682" + }, + "github": { + "label": "GitHub", + "placeholder": "eg. https:\/\/github.com\/e107inc" + }, + "google": { + "label": "Google", + "placeholder": "" + }, + "discord": { + "label": "Discord", + "placeholder": "" + }, + "flickr": { + "label": "Flickr", + "placeholder": "" + }, + "pinterest": { + "label": "Pinterest", + "placeholder": "" + }, + "steam": { + "label": "Steam", + "placeholder": "eg. https:\/\/steamcommunity.com" + }, + "vimeo": { + "label": "Vimeo", + "placeholder": "" + }, + "tiktok": { + "label": "TikTok", + "placeholder": "eg. https:\/\/tiktok.com\/@you" + }, + "twitch": { + "label": "Twitch", + "placeholder": "" + }, + "vk": { + "label": "VK (Vkontakte)", + "placeholder": "" + }, + "whatsapp": { + "label": "Whatsapp", + "placeholder": "" + }, + "yelp": { + "label": "Yelp", + "placeholder": "" + } +} \ No newline at end of file diff --git a/e107_tests/tests/unit/e_parse_shortcodeTest.php b/e107_tests/tests/unit/e_parse_shortcodeTest.php index c2431808d..8d649b993 100644 --- a/e107_tests/tests/unit/e_parse_shortcodeTest.php +++ b/e107_tests/tests/unit/e_parse_shortcodeTest.php @@ -773,7 +773,7 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit } catch (Exception $e) { - $this->fail($e->getMessage()); + self::fail($e->getMessage()); } $sc->__construct(); @@ -782,8 +782,8 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit $result = $sc->sc_xurl_icons($parm); - $this->assertStringContainsString('', $result); - $this->assertStringContainsString('', $result); + self::assertStringContainsString('', $result); + self::assertStringContainsString('', $result); } @@ -960,7 +960,7 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit 'comment_comment' => 'Nested Comment here', 'comment_blocked' => '0', 'comment_ip' => '0000:0000:0000:0000:0000:ffff:7f00:0001', - 'comment_type' => '0', + // 'comment_type' => '0', 'comment_lock' => '0', 'comment_share' => '0', 'table' => 'news', @@ -1349,7 +1349,7 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit 'post_user_anon' => NULL, 'post_attachments' => NULL, 'post_options' => NULL, - 'user_join' => time(), + // 'user_join' => time(), 'user_id' => 1, 'user_name' => USERNAME, 'user_hideemail' => 1,