mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-19 20:21:51 +02:00
Code Issues Releases Wiki Activity

Notice removal and default styling fixes.

Browse Source
This commit is contained in:
Cameron 2012-12-16 14:28:30 -08:00
parent 4bd6cd3dee
commit f63fcb61a8
11 changed files with 114 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/links.php
View File

@ -93,7 +93,7 @@ class links_admin_ui extends e_admin_ui
'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'forced'=>TRUE, 'width' => '10%', 'thclass' => 'center last', 'class'=>'center','readParms'=>'sort=1') // quick workaround
);
protected $fieldpref = array('checkboxes','link_id','link_name','link_sefurl','link_class','options');
protected $fieldpref = array('checkboxes','link_id','link_name','link_sefurl','link_class','link_category','options');
protected $prefs = array(
'linkpage_screentip' => array('title'=>LCLAN_78, 'type'=>'boolean', 'help'=>LCLAN_79),

37
e107_admin/update_routines.php
View File

@ -100,26 +100,26 @@ if (!$dont_check_update)
}
*/
$dbupdateplugs = e107::getConfig('core')->get('plug_installed');
// Read in each update file - this will add an entry to the $dbupdatep array if a potential update exists
foreach ($dbupdateplugs as $path => $ver)
if($dbupdateplugs = e107::getConfig('core')->get('plug_installed'))
{
if(!is_file(e_PLUGIN.$path."/plugin.xml"))
{
$fname = e_PLUGIN.$path.'/'.$path.'_update_check.php'; // DEPRECATED - left for BC only.
if (is_readable($fname)) include_once($fname);
}
$fname = e_PLUGIN.$path.'/'.$path.'_setup.php';
if (is_readable($fname))
// Read in each update file - this will add an entry to the $dbupdatep array if a potential update exists
foreach ($dbupdateplugs as $path => $ver)
{
$dbupdatep[$path] = $path ; // ' 0.7.x forums '.LAN_UPDATE_9.' 0.8 forums';
include_once($fname);
}
if(!is_file(e_PLUGIN.$path."/plugin.xml"))
{
$fname = e_PLUGIN.$path.'/'.$path.'_update_check.php'; // DEPRECATED - left for BC only.
if (is_readable($fname)) include_once($fname);
}
$fname = e_PLUGIN.$path.'/'.$path.'_setup.php';
if (is_readable($fname))
{
$dbupdatep[$path] = $path ; // ' 0.7.x forums '.LAN_UPDATE_9.' 0.8 forums';
include_once($fname);
}
}
}
// List of potential updates
if (defined('TEST_UPDATE'))
{
@ -1106,7 +1106,10 @@ function update_706_to_800($type='')
{
foreach($user_media_dirs as $md)
{
mkdir(e_MEDIA.$md);
if(!is_dir(e_MEDIA.$md))
{
mkdir(e_MEDIA.$md);
}
}
}

8
e107_handlers/admin_handler.php
View File

@ -50,11 +50,17 @@ if (!function_exists('multiarray_sort')) {
{
($order=='asc')? asort($sort_values) : arsort($sort_values);
}
else
elseif(isset($sort_values))
{
$case ? natsort($sort_values) : natcasesort($sort_values);
if($order != 'asc') $sort_values = array_reverse($sort_values, true);
}
if(!isset($sort_values))
{
return;
}
reset ($sort_values);
while (list ($arr_key, $arr_val) = each ($sort_values))

28
e107_handlers/db_verify_class.php
View File

@ -61,21 +61,23 @@ class db_verify
$this->tables['core'] = $this->getTables($core_data);
$this->sqlLanguageTables = $this->getSqlLanguages();
foreach($pref['e_sql_list'] as $path => $file)
if(varset($pref['e_sql_list']))
{
$filename = e_PLUGIN.$path.'/'.$file.'.php';
if(is_readable($filename))
foreach($pref['e_sql_list'] as $path => $file)
{
$id = str_replace('_sql','',$file);
$data = file_get_contents($filename);
$this->tables[$id] = $this->getTables($data);
unset($data);
}
else
{
$message = str_replace("[x]",$filename,DBVLAN_22);
$mes->add($message, E_MESSAGE_WARNING);
$filename = e_PLUGIN.$path.'/'.$file.'.php';
if(is_readable($filename))
{
$id = str_replace('_sql','',$file);
$data = file_get_contents($filename);
$this->tables[$id] = $this->getTables($data);
unset($data);
}
else
{
$message = str_replace("[x]",$filename,DBVLAN_22);
$mes->add($message, E_MESSAGE_WARNING);
}
}
}

2
e107_handlers/e107_class.php
View File

@ -149,7 +149,7 @@ class e107
'e_admin_controller_ui' => '{e_HANDLER}admin_ui.php',
'e_admin_dispatcher' => '{e_HANDLER}admin_ui.php',
'e_admin_form_ui' => '{e_HANDLER}admin_ui.php',
'e_admin_icons' => '{e_HANDLER}admin_handler.php',
// 'e_admin_icons' => '{e_HANDLER}admin_handler.php', // DEPRECATED
'e_admin_log' => '{e_HANDLER}admin_log_class.php',
'e_admin_model' => '{e_HANDLER}model_class.php',
'e_admin_request' => '{e_HANDLER}admin_ui.php',

6
e107_handlers/plugin_class.php
View File

@ -167,7 +167,11 @@ class e107plugin
$xml = e107::getXml();
$mes = e107::getMessage();
$needed = array();
$plugVersions = e107::getConfig('core')->get('plug_installed');
if(!$plugVersions = e107::getConfig('core')->get('plug_installed'))
{
return FALSE;
}
foreach($plugVersions as $path=>$version)
{

76
e107_handlers/sitelinks_class.php
View File

@ -774,49 +774,51 @@ class e_navigation
$plugs = e107::getObject('e107plugin');
foreach($pref['plug_installed'] as $plug=>$vers)
if(vartrue($pref['plug_installed']))
{
$plugs->parse_plugin($plug);
$plugin_path = $plug;
$name = $plugs->plug_vars['@attributes']['name'];
/* echo "<h1>".$name." ($plug)</h1>";
print_a($plugs->plug_vars);*/
if(!varset($plugs->plug_vars['adminLinks']['link']))
foreach($pref['plug_installed'] as $plug=>$vers)
{
continue;
}
foreach($plugs->plug_vars['adminLinks']['link'] as $tag)
{
if(varset($tag['@attributes']['primary']) !='true')
{
continue;
}
loadLanFiles($plugin_path, 'admin');
$att = $tag['@attributes'];
$eplug_name = $tp->toHTML($name,FALSE,"defs, emotes_off");
$eplug_conffile = $att['url'];
$eplug_icon_small = $plugin_path.'/'.$att['iconSmall'];
$eplug_icon = $plugin_path.'/'.$att['icon'];
$eplug_caption = str_replace("'", '', $tp->toHTML($att['description'], FALSE, 'defs, emotes_off'));
$plugs->parse_plugin($plug);
if (varset($eplug_conffile))
$plugin_path = $plug;
$name = $plugs->plug_vars['@attributes']['name'];
/* echo "<h1>".$name." ($plug)</h1>";
print_a($plugs->plug_vars);*/
if(!varset($plugs->plug_vars['adminLinks']['link']))
{
$eplug_name = $tp->toHTML($eplug_name,FALSE,"defs, emotes_off");
$plugin_icon = $eplug_icon_small ? "<img class='icon S16' src='".e_PLUGIN.$eplug_icon_small."' alt='' />" : E_16_PLUGIN;
$plugin_icon_32 = $eplug_icon ? "<img class='icon S32' src='".e_PLUGIN.$eplug_icon."' alt='' />" : E_32_PLUGIN;
$plugin_array['p-'.$plugin_path] = array('link' => e_PLUGIN.$plugin_path."/".$eplug_conffile, 'title' => $eplug_name, 'caption' => $eplug_caption, 'perms' => "P".varset($plug_id[$plugin_path]), 'icon' => $plugin_icon, 'icon_32' => $plugin_icon_32);
continue;
}
}
}
foreach($plugs->plug_vars['adminLinks']['link'] as $tag)
{
if(varset($tag['@attributes']['primary']) !='true')
{
continue;
}
loadLanFiles($plugin_path, 'admin');
$att = $tag['@attributes'];
$eplug_name = $tp->toHTML($name,FALSE,"defs, emotes_off");
$eplug_conffile = $att['url'];
$eplug_icon_small = $plugin_path.'/'.$att['iconSmall'];
$eplug_icon = $plugin_path.'/'.$att['icon'];
$eplug_caption = str_replace("'", '', $tp->toHTML($att['description'], FALSE, 'defs, emotes_off'));
if (varset($eplug_conffile))
{
$eplug_name = $tp->toHTML($eplug_name,FALSE,"defs, emotes_off");
$plugin_icon = $eplug_icon_small ? "<img class='icon S16' src='".e_PLUGIN.$eplug_icon_small."' alt='' />" : E_16_PLUGIN;
$plugin_icon_32 = $eplug_icon ? "<img class='icon S32' src='".e_PLUGIN.$eplug_icon."' alt='' />" : E_32_PLUGIN;
$plugin_array['p-'.$plugin_path] = array('link' => e_PLUGIN.$plugin_path."/".$eplug_conffile, 'title' => $eplug_name, 'caption' => $eplug_caption, 'perms' => "P".varset($plug_id[$plugin_path]), 'icon' => $plugin_icon, 'icon_32' => $plugin_icon_32);
}
}
}
}
// print_a($plugs->plug_vars['adminLinks']['link']);

6
e107_plugins/login_menu/login_menu_shortcodes.php
View File

@ -35,7 +35,7 @@ $login_menu_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__);
/*
SC_BEGIN LM_USERNAME_INPUT
global $pref;
return "<input class='tbox login user' type='text' name='username' id='username' size='15' value='' maxlength='".varset($pref['loginname_maxlength'],30)."' />\n";
return "<input class='tbox login user' type='text' name='username' required='required' id='username' size='15' value='' maxlength='".varset($pref['loginname_maxlength'],30)."' />\n";
SC_END
SC_BEGIN LM_USERNAME_LABEL
@ -54,7 +54,7 @@ SC_END
SC_BEGIN LM_PASSWORD_INPUT
global $pref;
$t_password = "<input class='tbox login pass' type='password' name='userpass' id='userpass' size='15' value='' maxlength='30' />\n";
$t_password = "<input class='tbox login pass' type='password' required='required' name='userpass' id='userpass' size='15' value='' maxlength='30' />\n";
if (!USER && e107::getSession()->is('challenge') && varset($pref['password_CHAP'],0)) $t_password .= "<input type='hidden' name='hashchallenge' id='hashchallenge' value='".e107::getSession()->get('challenge')."' />\n\n";
return $t_password;
SC_END
@ -93,7 +93,7 @@ return '';
SC_END
SC_BEGIN LM_LOGINBUTTON
return "<input class='button login' type='submit' name='userlogin' id='userlogin' value='".LOGIN_MENU_L28."' />";
return "<input class='button btn login' type='submit' name='userlogin' id='userlogin' value='".LOGIN_MENU_L28."' />";
SC_END
SC_BEGIN LM_REMEMBERME

2
e107_plugins/news/news_months_menu.php
View File

@ -106,7 +106,7 @@ if(false === $cached)
$cached = $template['start'].implode($template['separator'], $menu_text).$template['end'];
if($cached)
{
if(!$parms['showarchive']) $cached .= '<div class="e-menu-link archive"><a href="'.e_PLUGIN_ABS.'blogcalendar_menu/archive.php">'.BLOGCAL_L2.'</a></div>';
if(!$parms['showarchive']) $cached .= '<ul class="nav nav-list e-menu-link news-menu-archive"><li><a href="'.e_PLUGIN_ABS.'blogcalendar_menu/archive.php">'.BLOGCAL_L2.'</a></li></ul>';
$cached = $ns->tablerender(BLOGCAL_L1.$req_year, $cached, 'news_months_menu', true);
}
e107::getCache()->set($cString, $cached);

20
e107_plugins/news/templates/news_menu_template.php
View File

@ -14,27 +14,27 @@ $sc_style['NEWS_CATEGORY_NEWS_COUNT']['pre'] = '(';
$sc_style['NEWS_CATEGORY_NEWS_COUNT']['post'] = ')';
// category menu
$NEWS_MENU_TEMPLATE['category']['start'] = '';
$NEWS_MENU_TEMPLATE['category']['end'] = '';
$NEWS_MENU_TEMPLATE['category']['start'] = '<ul class="nav nav-list news-menu-category">';
$NEWS_MENU_TEMPLATE['category']['end'] = '</ul>';
$NEWS_MENU_TEMPLATE['category']['item'] = '
<img src="{bullet}" alt="bullet" class="icon" /> <a class="e-menu-link newscats{active}" href="{NEWS_CATEGORY_URL}">{NEWS_CATEGORY_TITLE} {NEWS_CATEGORY_NEWS_COUNT}</a>
<li><a class="e-menu-link newscats{active}" href="{NEWS_CATEGORY_URL}">{NEWS_CATEGORY_TITLE} {NEWS_CATEGORY_NEWS_COUNT}</a></li>
';
$NEWS_MENU_TEMPLATE['category']['separator'] = '<br />';
// months menu
$NEWS_MENU_TEMPLATE['months']['start'] = '';
$NEWS_MENU_TEMPLATE['months']['end'] = '';
$NEWS_MENU_TEMPLATE['months']['start'] = '<ul class="nav nav-list news-menu-months">';
$NEWS_MENU_TEMPLATE['months']['end'] = '</ul>';
$NEWS_MENU_TEMPLATE['months']['item'] = '
<img src="{bullet}" alt="bullet" class="icon" /> <a class="e-menu-link newsmonths{active}" href="{url}">{month} ({count})</a>
<li><a class="e-menu-link newsmonths{active}" href="{url}">{month} ({count})</a></li>
';
$NEWS_MENU_TEMPLATE['months']['separator'] = '<br />';
// latest menu
$NEWS_MENU_TEMPLATE['latest']['start'] = '';
$NEWS_MENU_TEMPLATE['latest']['start'] = '<ul class="nav nav-list news-menu-latest">';
// Example
//$NEWS_MENU_TEMPLATE['latest']['end'] = '<br />{currentTotal} from {total}';
$NEWS_MENU_TEMPLATE['latest']['end'] = '';
$NEWS_MENU_TEMPLATE['latest']['end'] = '</ul>';
$NEWS_MENU_TEMPLATE['latest']['item'] = '
<img src="{bullet}" alt="bullet" class="icon" /> <a class="e-menu-link newsmonths" href="{NEWSURL}">{NEWSTITLE} ({NEWSCOMMENTCOUNT})</a>
<li><a class="e-menu-link newsmonths" href="{NEWSURL}">{NEWSTITLE} ({NEWSCOMMENTCOUNT})</a></li>
';
$NEWS_MENU_TEMPLATE['latest']['separator'] = '<br />';
$NEWS_MENU_TEMPLATE['latest']['separator'] = '<br />'; // Shouldn't be needed.

12
e107_themes/bootstrap/theme.php
View File

@ -70,6 +70,18 @@ function tablestyle($caption, $text, $mode)
return;
}
if($mode == 'loginbox')
{
echo '<div class="well sidebar-nav">
<ul class="nav nav-list"><li class="nav-header">'.$caption.'</li></ul>
'.$text.'
</div><!--/.well -->';
return;
}
switch($type)
{