mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

plugin.xml can now set the site-link icon if needed.

Browse Source
This commit is contained in:
Cameron
2015-06-10 14:22:59 -07:00
parent ce6802f991
commit 5e2729645a
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_handlers/language_class.php
View File

@@ -404,10 +404,13 @@ class language{
* @param string $language eg. 'Spanish' * @param string $language eg. 'Spanish'
* @return URL * @return URL
*/ */
function subdomainUrl($language) function subdomainUrl($language, $url=e_REQUEST_URL)
{ {
global $pref; global $pref;
$codelnk = ($language == $pref['sitelanguage']) ? "www" : $this->convert($language);
$iso = (strlen($language) == 2) ? $language : $this->convert($language);
$codelnk = ($language == $pref['sitelanguage']) ? "www" : $iso;
if($codelnk == '') if($codelnk == '')
{ {
@@ -421,7 +424,10 @@ class language{
: str_replace($_SERVER['HTTP_HOST'], $codelnk.'.'.e_DOMAIN, e_SELF); : str_replace($_SERVER['HTTP_HOST'], $codelnk.'.'.e_DOMAIN, e_SELF);
*/ */
$urlval = str_replace($_SERVER['HTTP_HOST'], $codelnk.'.'.e_DOMAIN, e_REQUEST_URL) ;
$domain = deftrue('e_DOMAIN','example.com');
$urlval = str_replace($_SERVER['HTTP_HOST'], $codelnk.'.'.$domain, $url) ;
return (string) $urlval; return (string) $urlval;
} }

10
e107_handlers/plugin_class.php
View File

@@ -936,8 +936,8 @@ class e107plugin
$linkData = array( $linkData = array(
'link_name' => $link_name, 'link_name' => $link_name,
'link_url' => $path, 'link_url' => $path,
'link_description' => '', 'link_description' => vartrue($options['link_desription'],''),
'link_button' => '', 'link_button' => vartrue($options['link_icon'],''),
'link_category' => '1', 'link_category' => '1',
'link_order' => $link_t + 1, 'link_order' => $link_t + 1,
'link_parent' => '0', 'link_parent' => '0',
@@ -1981,7 +1981,7 @@ class e107plugin
foreach ($array['link'] as $link) foreach ($array['link'] as $link)
{ {
$attrib = $link['@attributes']; $attrib = $link['@attributes'];
$linkName = (defset($link['@value'])) ? constant($link['@value']) : $link['@value']; $linkName = (defset($link['@value'])) ? constant($link['@value']) : vartrue($link['@value'],'');
$remove = (varset($attrib['deprecate']) == 'true') ? TRUE : FALSE; $remove = (varset($attrib['deprecate']) == 'true') ? TRUE : FALSE;
$url = vartrue($attrib['url']); $url = vartrue($attrib['url']);
$perm = vartrue($attrib['perm'],'everyone'); $perm = vartrue($attrib['perm'],'everyone');
@@ -1990,7 +1990,9 @@ class e107plugin
$options = array( $options = array(
'link_function' => vartrue($attrib['function']), 'link_function' => vartrue($attrib['function']),
'link_owner' => vartrue($plug_vars['folder']), 'link_owner' => vartrue($plug_vars['folder']),
'link_sef' => $sef 'link_sef' => $sef,
'link_icon' => vartrue($attrib['icon']),
'link_description' => vartrue($attrib['description'])
); );
switch ($function) switch ($function)

2
e107_plugins/faqs/plugin.xml
View File

@@ -15,7 +15,7 @@
<link url="admin_config.php" description="Configure FAQs" icon="images/icon_32.png" iconSmall="images/icon_16.png" primary="true" >LAN_PLUGIN_FAQS_NAME</link> <link url="admin_config.php" description="Configure FAQs" icon="images/icon_32.png" iconSmall="images/icon_16.png" primary="true" >LAN_PLUGIN_FAQS_NAME</link>
</adminLinks> </adminLinks>
<siteLinks> <siteLinks>
<link url="{e_PLUGIN}faqs/faqs.php" sef='index' description="FAQs" icon="images/icon_32.png" iconSmall="images/icon_16.png" >LAN_PLUGIN_FAQS_NAME</link> <link url="{e_PLUGIN}faqs/faqs.php" sef='index' description="FAQs" perm='everyone' icon="" >LAN_PLUGIN_FAQS_NAME</link>
</siteLinks> </siteLinks>
<pluginPrefs> <pluginPrefs>
<pref name="add_faq">255</pref> <pref name="add_faq">255</pref>