diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index f94609d0b..fc0c97031 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -110,6 +110,10 @@ if(isset($_POST['updateprefs'])) $pref['post_html'] = intval($_POST['post_html']); // This ensures the setting is reflected in set text + if(isset($_POST['contact_info']) && is_array($_POST['contact_info'])) + { + $core_pref->set('contact_info', []); // reset to type array if string had been used in the past. + } $smtp_opts = array(); diff --git a/e107_plugins/social/fonts/social.eot b/e107_plugins/social/fonts/social.eot index 2a0485606..ce5440fe9 100644 Binary files a/e107_plugins/social/fonts/social.eot 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 index 9165b8776..96fdb6e5b 100644 --- a/e107_plugins/social/fonts/social.svg +++ b/e107_plugins/social/fonts/social.svg @@ -8,8 +8,10 @@ + + @@ -22,7 +24,7 @@ - + @@ -37,9 +39,13 @@ + + + + @@ -58,7 +64,6 @@ - diff --git a/e107_plugins/social/fonts/social.ttf b/e107_plugins/social/fonts/social.ttf index b4bf5ac24..97ef95977 100644 Binary files a/e107_plugins/social/fonts/social.ttf 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 index fd785ec89..8b6b948cc 100644 Binary files a/e107_plugins/social/fonts/social.woff 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 index 65068b5a8..cdfd59a90 100644 --- a/e107_plugins/social/ie7/ie7.css +++ b/e107_plugins/social/ie7/ie7.css @@ -1,3 +1,12 @@ +.e-social-behance { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-telegram { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.e-social-snapchat { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} .e-social-map { *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } @@ -28,9 +37,6 @@ .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 = ''); } @@ -82,9 +88,6 @@ .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 = ''); } @@ -127,20 +130,17 @@ .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-reddit { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } -.e-social-instapaper { - *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +.e-social-spotify { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } -.e-social-twitter { - *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +.e-social-soundcloud-alt { + *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-soundcloud { + *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } .e-social-pushpin { *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); @@ -166,4 +166,19 @@ .e-social-flattr { *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 = ''); +} diff --git a/e107_plugins/social/ie7/ie7.js b/e107_plugins/social/ie7/ie7.js index 5729ba729..88e0b7912 100644 --- a/e107_plugins/social/ie7/ie7.js +++ b/e107_plugins/social/ie7/ie7.js @@ -13,6 +13,9 @@ el.innerHTML = '' + entity + '' + html; } var icons = { + 'e-social-behance': '', + 'e-social-telegram': '', + 'e-social-snapchat': '', 'e-social-map': '', 'e-social-sms': '', 'e-social-facebook-square': '', @@ -23,7 +26,6 @@ 'e-social-github': '', 'e-social-mobile': '', 'e-social-tumblr': '', - 'e-social-reddit': '', 'e-social-twitch': '', 'e-social-whatsapp': '', 'e-social-map-o': '', @@ -41,7 +43,6 @@ 'e-social-digg': '', 'e-social-stumbleupon': '', 'e-social-flickr': '', - 'e-social-reddit-alien': '', 'e-social-youtube-play': '', 'e-social-youtube': '', 'e-social-pocketpocket': '', @@ -56,11 +57,10 @@ '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-reddit': '', + 'e-social-spotify': '', + 'e-social-soundcloud-alt': '', + 'e-social-soundcloud': '', 'e-social-pushpin': '', 'e-social-vine': '', 'e-social-dribbble': '', @@ -69,6 +69,11 @@ 'e-social-linkedin-rect': '', 'e-social-delicious': '', 'e-social-flattr': '', + 'e-social-discord': '', + 'e-social-instapaper': '', + 'e-social-twitter': '', + 'e-social-squarespace': '', + 'e-social-tiktok': '', '0': 0 }, els = document.getElementsByTagName('*'), diff --git a/e107_plugins/social/style.css b/e107_plugins/social/style.css index a935b7a66..e1bb44aec 100644 --- a/e107_plugins/social/style.css +++ b/e107_plugins/social/style.css @@ -1,10 +1,10 @@ @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'); + src: url('fonts/social.eot?dje1ws'); + src: url('fonts/social.eot?dje1ws#iefix') format('embedded-opentype'), + url('fonts/social.ttf?dje1ws') format('truetype'), + url('fonts/social.woff?dje1ws') format('woff'), + url('fonts/social.svg?dje1ws#social') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -25,6 +25,15 @@ -moz-osx-font-smoothing: grayscale; } +.e-social-behance:before { + content: "\e926"; +} +.e-social-telegram:before { + content: "\e923"; +} +.e-social-snapchat:before { + content: "\e911"; +} .e-social-map:before { content: "\f041"; } @@ -55,9 +64,6 @@ .e-social-tumblr:before { content: "\f173"; } -.e-social-reddit:before { - content: "\f1a1"; -} .e-social-twitch:before { content: "\f1e8"; } @@ -109,9 +115,6 @@ .e-social-flickr:before { content: "\e910"; } -.e-social-reddit-alien:before { - content: "\e911"; -} .e-social-youtube-play:before { content: "\e912"; } @@ -154,20 +157,17 @@ .e-social-mail-alt:before { content: "\e91f"; } -.e-social-discord:before { - content: "\e900"; +.e-social-reddit:before { + content: "\e925"; } -.e-social-instapaper:before { - content: "\e903"; +.e-social-spotify:before { + content: "\e920"; } -.e-social-twitter:before { - content: "\e924"; +.e-social-soundcloud-alt:before { + content: "\e901"; } -.e-social-squarespace:before { - content: "\e921"; -} -.e-social-tiktok:before { - content: "\e922"; +.e-social-soundcloud:before { + content: "\e904"; } .e-social-pushpin:before { content: "\e946"; @@ -193,3 +193,18 @@ .e-social-flattr:before { content: "\ead5"; } +.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"; +} diff --git a/e107_plugins/social/svg/behance.svg b/e107_plugins/social/svg/behance.svg new file mode 100644 index 000000000..a47d39af8 --- /dev/null +++ b/e107_plugins/social/svg/behance.svg @@ -0,0 +1,4 @@ + + + + diff --git a/e107_plugins/social/svg/snapchat.svg b/e107_plugins/social/svg/snapchat.svg new file mode 100644 index 000000000..8a97ce595 --- /dev/null +++ b/e107_plugins/social/svg/snapchat.svg @@ -0,0 +1,4 @@ + + + + diff --git a/e107_plugins/social/svg/soundcloud-alt.svg b/e107_plugins/social/svg/soundcloud-alt.svg new file mode 100644 index 000000000..a3969b831 --- /dev/null +++ b/e107_plugins/social/svg/soundcloud-alt.svg @@ -0,0 +1,4 @@ + + + + diff --git a/e107_plugins/social/svg/soundcloud.svg b/e107_plugins/social/svg/soundcloud.svg new file mode 100644 index 000000000..e0762c709 --- /dev/null +++ b/e107_plugins/social/svg/soundcloud.svg @@ -0,0 +1,4 @@ + + + + diff --git a/e107_plugins/social/svg/spotify.svg b/e107_plugins/social/svg/spotify.svg new file mode 100644 index 000000000..c3c0fe46e --- /dev/null +++ b/e107_plugins/social/svg/spotify.svg @@ -0,0 +1,4 @@ + + + + diff --git a/e107_plugins/social/svg/telegram.svg b/e107_plugins/social/svg/telegram.svg new file mode 100644 index 000000000..02a7ade7d --- /dev/null +++ b/e107_plugins/social/svg/telegram.svg @@ -0,0 +1,4 @@ + + + + diff --git a/e107_plugins/social/xurls.json b/e107_plugins/social/xurls.json index a2fcfe0d0..2882ec1a3 100644 --- a/e107_plugins/social/xurls.json +++ b/e107_plugins/social/xurls.json @@ -27,6 +27,10 @@ "label": "Google", "placeholder": "" }, + "behance": { + "label": "Behance", + "placeholder": "" + }, "discord": { "label": "Discord", "placeholder": "" @@ -39,12 +43,24 @@ "label": "Pinterest", "placeholder": "" }, + "snapchat": { + "label": "Snapchat", + "placeholder": "" + }, + "soundcloud": { + "label": "Soundcloud", + "placeholder": "" + }, + "spotify": { + "label": "Spotify", + "placeholder": "" + }, "steam": { "label": "Steam", "placeholder": "eg. https:\/\/steamcommunity.com" }, - "vimeo": { - "label": "Vimeo", + "telegram": { + "label": "Telegram", "placeholder": "" }, "tiktok": { @@ -54,6 +70,10 @@ "twitch": { "label": "Twitch", "placeholder": "" + }, + "vimeo": { + "label": "Vimeo", + "placeholder": "" }, "vk": { "label": "VK (Vkontakte)",