mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Issue #2669 Incorrect FB og:image used. Issue #6 LAN modified.

Browse Source
This commit is contained in:
Cameron
2018-08-26 13:54:25 -07:00
parent d4834c43e9
commit f958f66dcb
5 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/admin.php
View File

@@ -455,13 +455,13 @@ TMPO;
if($numDays < 3) // installed in the past 3 days. if($numDays < 3) // installed in the past 3 days.
{ {
$srch = array('[',']'); $srch = array('[',']');
$repl = array("<a href='http://e107help.org' rel='external'>","</a>"); $repl = array("<a href='http://e107help.org' target='_blank' rel='external'>","</a>");
echo e107::getMessage()->setTitle(ADLAN_190,E_MESSAGE_INFO)->addInfo("<p>".e107::getParser()->lanVars(e107::getParser()->toHTML(ADLAN_192, true), (str_replace($srch,$repl)))."</p>")->render(); echo e107::getMessage()->setTitle(ADLAN_190,E_MESSAGE_INFO)->addInfo("<p>".str_replace($srch,$repl,ADLAN_192)."</p>")->render();
} }
elseif($pref < $v2ReleaseDate && !file_exists($upgradeAlertFlag)) // installed prior to v2 release. elseif($pref < $v2ReleaseDate && !file_exists($upgradeAlertFlag)) // installed prior to v2 release.
{ {
$srch = array('[',']'); $srch = array('[',']');
$repl = array("<a href='http://e107help.org' rel='external'>","</a>"); $repl = array("<a href='http://e107help.org' target='_blank' rel='external'>","</a>");
$message = str_replace($srch,$repl,ADLAN_191); $message = str_replace($srch,$repl,ADLAN_191);
$message .= "<div class='text-right'><a class='btn btn-xs btn-primary ' href='admin.php?dismiss=upgrade'>".LAN_DONT_SHOW_AGAIN."</a></div>"; //todo do it with class=e-ajax and data-dismiss='alert' $message .= "<div class='text-right'><a class='btn btn-xs btn-primary ' href='admin.php?dismiss=upgrade'>".LAN_DONT_SHOW_AGAIN."</a></div>"; //todo do it with class=e-ajax and data-dismiss='alert'
echo e107::getMessage()->setTitle(LAN_UPGRADING,E_MESSAGE_INFO)->addInfo($message)->render(); echo e107::getMessage()->setTitle(LAN_UPGRADING,E_MESSAGE_INFO)->addInfo($message)->render();

2
e107_admin/prefs.php
View File

@@ -385,7 +385,7 @@ if(!empty($pref['sitebutton']) && strpos($pref['sitebutton'],'{')===false && fil
$text .= $frm->imagepicker('sitebutton',$pref['sitebutton'],'','help='.PRFLAN_225); //todo use 'LegacyPath' option instead of code above. $text .= $frm->imagepicker('sitebutton',$pref['sitebutton'],'','w=200&help='.PRFLAN_225); //todo use 'LegacyPath' option instead of code above.
$text .= " $text .= "
</td> </td>

20
e107_core/templates/header_default.php
View File

@@ -140,12 +140,22 @@ else
// C: Send start of HTML // C: Send start of HTML
// //
if(vartrue($pref['meta_copyright'][e_LANGUAGE])) e107::meta('dcterms.rights',$pref['meta_copyright'][e_LANGUAGE]); if(!empty($pref['meta_copyright'][e_LANGUAGE])) e107::meta('dcterms.rights',$pref['meta_copyright'][e_LANGUAGE]);
if(vartrue($pref['meta_author'][e_LANGUAGE])) e107::meta('author',$pref['meta_author'][e_LANGUAGE]); if(!empty($pref['meta_author'][e_LANGUAGE])) e107::meta('author',$pref['meta_author'][e_LANGUAGE]);
$siteButton = (strpos($pref['sitelogo'],'{e_MEDIA') !== false) ? $tp->thumbUrl($pref['sitelogo'],'w=800',false, true) : $tp->replaceConstants($pref['sitelogo'],'full'); if(!empty($pref['sitebutton']))
if($pref['sitebutton']) e107::meta('og:image',$siteButton); {
$siteButton = (strpos($pref['sitebutton'],'{e_MEDIA') !== false) ? $tp->thumbUrl($pref['sitebutton'],'w=800',false, true) : $tp->replaceConstants($pref['sitebutton'],'full');
e107::meta('og:image',$siteButton);
unset($siteButton);
}
elseif(!empty($pref['sitelogo'])) // fallback to sitelogo
{
$siteLogo = (strpos($pref['sitelogo'],'{e_MEDIA') !== false) ? $tp->thumbUrl($pref['sitelogo'],'w=800',false, true) : $tp->replaceConstants($pref['sitelogo'],'full');
e107::meta('og:image',$siteLogo);
unset($siteLogo);
}
if(defined("VIEWPORT")) e107::meta('viewport',VIEWPORT); //BC ONLY if(defined("VIEWPORT")) e107::meta('viewport',VIEWPORT); //BC ONLY
unset($siteButton);
// Load Plugin Header Files, allow them to load CSS/JSS/Meta via JS Manager early enouhg // Load Plugin Header Files, allow them to load CSS/JSS/Meta via JS Manager early enouhg

2
e107_languages/English/admin/lan_prefs.php
View File

@@ -234,7 +234,7 @@ define("PRFLAN_223", "Completely Automated Public Turing test to tell Computers
define("PRFLAN_224", "User registration system"); define("PRFLAN_224", "User registration system");
define("PRFLAN_225", "Used by Facebook and others. Should be a square image of at least 144px in width and height."); define("PRFLAN_225", "Used by Facebook and others. Should be a square image of at least 800px in width and height.");
define("PRFLAN_226", "Used by some themes as the header image on some pages."); define("PRFLAN_226", "Used by some themes as the header image on some pages.");
define("PRFLAN_227", "Used by some themes. Place 'SITETAG' in your theme to use this value."); define("PRFLAN_227", "Used by some themes. Place 'SITETAG' in your theme to use this value.");
define("PRFLAN_228", "Used by some themes. Place 'SITEDESCRIPTION' in your theme to use this value."); define("PRFLAN_228", "Used by some themes. Place 'SITEDESCRIPTION' in your theme to use this value.");

3
e107_themes/bootstrap3/admin_style.css
View File

@@ -302,6 +302,9 @@ td.right, th.right { text-align:right }
.mediaselector-container-icon .overlay span { width:64px; height:64px; display:block; } .mediaselector-container-icon .overlay span { width:64px; height:64px; display:block; }
.mediaselector-container-icon .mediaselector-preview { height: auto; padding: 0; text-align: center; } .mediaselector-container-icon .mediaselector-preview { height: auto; padding: 0; text-align: center; }
td .mediaselector-container { margin-bottom:0 }
/* dropzone new in v2.1.9 */ /* dropzone new in v2.1.9 */
.dropzone { min-height: 100px; padding: 0 } .dropzone { min-height: 100px; padding: 0 }