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

Merge pull request #35 from e107inc/master

Browse Source 
.
This commit is contained in:
rica-carv
2016-12-12 17:25:00 +00:00
committed by GitHub
parent be531a5fd8 8e917817d6
commit 85574060b8
19 changed files with 142 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/plugin.php
View File

@@ -3678,7 +3678,7 @@ $text .= "
'main/edit' => 'main/list' 'main/edit' => 'main/list'
); );
protected \$menuTitle = '".vartrue($tp->filter($vars['pluginName']), $pluginTitle)."'; protected \$menuTitle = '".vartrue($pluginTitle, $tp->filter($vars['pluginName']))."';
} }

5
e107_core/templates/login_template.php
View File

@@ -89,7 +89,7 @@ $LOGIN_TEMPLATE['page']['header'] = "
</div>"; </div>";
$LOGIN_TEMPLATE['page']['body'] = ' $LOGIN_TEMPLATE['page']['body'] = '
{LOGIN_TABLE_LOGINMESSAGE}
<h2 class="form-signin-heading">'.LAN_LOGIN_4.'</h2>'; <h2 class="form-signin-heading">'.LAN_LOGIN_4.'</h2>';
if (e107::pref('core', 'password_CHAP') == 2) if (e107::pref('core', 'password_CHAP') == 2)
{ {
@@ -110,6 +110,9 @@ $LOGIN_WRAPPER['page']['LOGIN_TABLE_SECIMG_TEXTBOC'] = "<div class='form-group'>
$LOGIN_WRAPPER['page']['LOGIN_TABLE_REMEMBERME'] = "<div class='form-group checkbox'>{---}</div>"; $LOGIN_WRAPPER['page']['LOGIN_TABLE_REMEMBERME'] = "<div class='form-group checkbox'>{---}</div>";
$LOGIN_WRAPPER['page']['LOGIN_TABLE_SUBMIT'] = "<div class='form-group'>{---}</div>"; $LOGIN_WRAPPER['page']['LOGIN_TABLE_SUBMIT'] = "<div class='form-group'>{---}</div>";
$LOGIN_WRAPPER['page']['LOGIN_TABLE_FOOTER_USERREG'] = "<div class='form-group'>{---}</div>"; $LOGIN_WRAPPER['page']['LOGIN_TABLE_FOOTER_USERREG'] = "<div class='form-group'>{---}</div>";
$LOGIN_WRAPPER['page']['LOGIN_TABLE_LOGINMESSAGE'] = "<div class='alert alert-danger'>{---}</div>";
// $LOGIN_WRAPPER['page']['LOGIN_TABLE_FPW_LINK'] = "<div class='form-group'>{---}</div>"; // $LOGIN_WRAPPER['page']['LOGIN_TABLE_FPW_LINK'] = "<div class='form-group'>{---}</div>";
$LOGIN_TEMPLATE['page']['body'] .= ' $LOGIN_TEMPLATE['page']['body'] .= '

27
e107_handlers/db_debug_class.php
View File

@@ -412,11 +412,30 @@ class e107_db_debug {
$aSum['%Time']=$totTime ? number_format(100.0 * ($aSum['Time'] / $totTime), 0) : 0; $aSum['%Time']=$totTime ? number_format(100.0 * ($aSum['Time'] / $totTime), 0) : 0;
$aSum['%DB Time']=$db_time ? number_format(100.0 * ($aSum['DB Time'] / $db_time), 0) : 0; $aSum['%DB Time']=$db_time ? number_format(100.0 * ($aSum['DB Time'] / $db_time), 0) : 0;
$aSum['%DB Count']=($sql->db_QueryCount()) ? number_format(100.0 * ($aSum['DB Count'] / ($sql->db_QueryCount())), 0) : 0; $aSum['%DB Count']=($sql->db_QueryCount()) ? number_format(100.0 * ($aSum['DB Count'] / ($sql->db_QueryCount())), 0) : 0;
$aSum['Time']=number_format($aSum['Time']*1000.0, 1); $aSum['Time']=number_format($aSum['Time'] * 1000.0, 1);
$aSum['DB Time']=number_format($aSum['DB Time']*1000.0, 1); $aSum['DB Time']=number_format($aSum['DB Time']*1000.0, 1);
$text .= "<tr><td class='fcaption'><b>".implode("</b>&nbsp;</td><td class='fcaption' style='text-align:right'><b>", $aSum)."</b>&nbsp;</td><td class='fcaption'>&nbsp;</td></tr>\n";
$text .= "\n</table><br />\n"; $text .= "<tr>
<td class='fcaption'>&nbsp;</td>
<td class='fcaption' style='text-align:right'><b>Total</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['%Time']."</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['%DB Time']."</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['%DB Count']."</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['Time']."</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['DB Time']."</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['DB Count']."</b></td>
<td class='fcaption' style='text-align:right'><b>".$tMarker['Memory']."</b></td>
<td class='fcaption' style='text-align:right'><b>".$tMarker['OB Lev']."</b></td>
</tr>
";
// $text .= "<tr><td class='fcaption'><b>".implode("</b>&nbsp;</td><td class='fcaption' style='text-align:right'><b>", $aSum)."</b>&nbsp;</td><td class='fcaption'>&nbsp;</td></tr>\n";
$text .= "\n</table><br />\n";
// //
// Stats by Table // Stats by Table
@@ -461,7 +480,7 @@ class e107_db_debug {
$aSum['%DB Time']=$db_time ? number_format(100.0 * ($aSum['DB Time'] / $db_time), 0) : 0; $aSum['%DB Time']=$db_time ? number_format(100.0 * ($aSum['DB Time'] / $db_time), 0) : 0;
$aSum['%DB Count']=($sql->db_QueryCount()) ? number_format(100.0 * ($aSum['DB Count'] / ($sql->db_QueryCount())), 0) : 0; $aSum['%DB Count']=($sql->db_QueryCount()) ? number_format(100.0 * ($aSum['DB Count'] / ($sql->db_QueryCount())), 0) : 0;
$aSum['DB Time']=number_format($aSum['DB Time']*1000.0, 1); $aSum['DB Time']=number_format($aSum['DB Time']*1000.0, 1);
$text .= "<tr><td class='fcaption'>".implode("&nbsp;</td><td class='fcaption' style='text-align:right'>", array_values($aSum))."&nbsp;</td></tr>\n"; $text .= "<tr><td class='fcaption'><b>".implode("&nbsp;</td><td class='fcaption' style='text-align:right'><b>", array_values($aSum))."&nbsp;</b></td></tr>\n";
$text .= "\n</table><br />\n"; $text .= "\n</table><br />\n";
return $text; return $text;

2
e107_handlers/file_class.php
View File

@@ -413,7 +413,7 @@ class e_file
/** /**
* Grab a remote file and save it in the /temp directory. requires CURL * Grab a remote file and save it in the /temp directory. requires CURL
* @param $remote_url * @param $remote_url
* @param $local_file * @param $local_file string filename to save as
* @param $type media, temp, or import * @param $type media, temp, or import
* @return boolean TRUE on success, FALSE on failure (which includes absence of CURL functions) * @return boolean TRUE on success, FALSE on failure (which includes absence of CURL functions)
*/ */

2
e107_handlers/form_handler.php
View File

@@ -1730,7 +1730,7 @@ e107::getDebug()->log($sc_parameters);
$options['pattern'] = vartrue($options['pattern'],'[\S]{4,}'); $options['pattern'] = vartrue($options['pattern'],'[\S]{4,}');
$options['required'] = varset($options['required'], 1); $options['required'] = varset($options['required'], 1);
$options['class'] = vartrue($options['class'],'e-password'); $options['class'] = vartrue($options['class'],'e-password tbox');
e107::js('core', 'password/jquery.pwdMeter.js', 'jquery', 2); e107::js('core', 'password/jquery.pwdMeter.js', 'jquery', 2);

11
e107_handlers/login.php
View File

@@ -165,12 +165,11 @@ class userlogin
// Check secure image // Check secure image
if (!$forceLogin && $pref['logcode'] && extension_loaded('gd')) if (!$forceLogin && $pref['logcode'] && extension_loaded('gd'))
{ {
require_once(e_HANDLER."secure_img_handler.php"); if ($secImgResult = e107::getSecureImg()->invalidCode($_POST['rand_num'], $_POST['code_verify'])) // Invalid code
$sec_img = new secure_image; {
if (!$sec_img->verify_code($_POST['rand_num'], $_POST['code_verify'])) return $this->invalidLogin($username, LOGIN_BAD_CODE, $secImgResult);
{ // Invalid code
return $this->invalidLogin($username,LOGIN_BAD_CODE);
} }
} }
if (empty($this->userData)) // May have retrieved user data earlier if (empty($this->userData)) // May have retrieved user data earlier
@@ -578,7 +577,7 @@ class userlogin
$doCheck = true; $doCheck = true;
break; break;
case LOGIN_BAD_CODE : case LOGIN_BAD_CODE :
$message = LAN_LOGIN_23; $message = $extra_text; // LAN_LOGIN_23;
$this->logNote('LAN_ROLL_LOG_02', $username); $this->logNote('LAN_ROLL_LOG_02', $username);
break; break;
case LOGIN_NOT_ACTIVATED : case LOGIN_NOT_ACTIVATED :

12
e107_handlers/session_handler.php
View File

@@ -333,8 +333,13 @@ class e_session
* @param string $key * @param string $key
* @return e_session * @return e_session
*/ */
public function clear($key) public function clear($key=null)
{ {
if($key == null) // clear all under this namespace.
{
$this->_data = array(); // must be set to array() not unset.
}
unset($this->_data[$key]); unset($this->_data[$key]);
return $this; return $this;
} }
@@ -451,7 +456,10 @@ class e_session
break; break;
default: default:
session_module_name('files'); if(!isset($_SESSION))
{
session_module_name('files');
}
break; break;
} }

3
e107_handlers/shortcode_handler.php
View File

@@ -100,6 +100,7 @@ class e_parse_shortcode
protected $sc_style = array(); // Former $sc_style global variable. Internally used - performance reasons protected $sc_style = array(); // Former $sc_style global variable. Internally used - performance reasons
protected $editableCodes = array(); // Array of editable shortcode data. protected $editableCodes = array(); // Array of editable shortcode data.
protected $editableActive = false; protected $editableActive = false;
protected $nowrap = false;
function __construct() function __construct()
{ {
@@ -460,7 +461,7 @@ class e_parse_shortcode
// echo "<h3>Couldn't Find Class '".$className."' in <b>".$path."</b></h3>"; // echo "<h3>Couldn't Find Class '".$className."' in <b>".$path."</b></h3>";
} }
e107::getDebug()->log( "<div class='alert alert-danger'>Couldn't Load: <b>".$path."</b> with class-name:<b> {$className}</b> and pluginName <b>{$pluginName}</b></div>"); // e107::getDebug()->log( "<div class='alert alert-danger'>Couldn't Load: <b>".$path."</b> with class-name:<b> {$className}</b> and pluginName <b>{$pluginName}</b></div>");
// TODO - throw exception? // TODO - throw exception?

14
e107_handlers/sitelinks_class.php
View File

@@ -260,6 +260,8 @@ class sitelinks
} }
// If submenu: Fix Name, Add Indentation. // If submenu: Fix Name, Add Indentation.
if ($submenu == TRUE) if ($submenu == TRUE)
{ {
@@ -274,10 +276,14 @@ class sitelinks
// Convert any {e_XXX} to absolute URLs (relative ones sometimes get broken by adding e_HTTP at the front) // Convert any {e_XXX} to absolute URLs (relative ones sometimes get broken by adding e_HTTP at the front)
$linkInfo['link_url'] = $tp -> replaceConstants($linkInfo['link_url'], TRUE, TRUE); // replace {e_xxxx} $linkInfo['link_url'] = $tp -> replaceConstants($linkInfo['link_url'], TRUE, TRUE); // replace {e_xxxx}
if(strpos($linkInfo['link_url'],"{") !== FALSE) if(strpos($linkInfo['link_url'],"{") !== false)
{ {
$linkInfo['link_url'] = $tp->parseTemplate($linkInfo['link_url'], TRUE); // shortcode in URL support - dynamic urls for multilanguage. $linkInfo['link_url'] = $tp->parseTemplate($linkInfo['link_url'], TRUE); // shortcode in URL support - dynamic urls for multilanguage.
} }
elseif($linkInfo['link_url'][0] != '/')
{
$linkInfo['link_url'] = e_HTTP.ltrim($linkInfo['link_url'],'/');
}
// By default links are not highlighted. // By default links are not highlighted.
if (isset($linkInfo['link_expand']) && $linkInfo['link_expand']) if (isset($linkInfo['link_expand']) && $linkInfo['link_expand'])
@@ -306,7 +312,7 @@ class sitelinks
elseif ($linkInfo['link_url']) elseif ($linkInfo['link_url'])
{ {
// Only add the e_BASE if it actually has an URL. // Only add the e_BASE if it actually has an URL.
$linkInfo['link_url'] = (strpos($linkInfo['link_url'], '://') === FALSE && strpos($linkInfo['link_url'], 'mailto:') !== 0 ? e_HTTP.$linkInfo['link_url'] : $linkInfo['link_url']); $linkInfo['link_url'] = (strpos($linkInfo['link_url'], '://') === FALSE && strpos($linkInfo['link_url'], 'mailto:') !== 0 ? $linkInfo['link_url'] : $linkInfo['link_url']);
// Only check if its highlighted if it has an URL // Only check if its highlighted if it has an URL
if ($this->hilite($linkInfo['link_url'], $style['linkstart_hilite'])== TRUE) if ($this->hilite($linkInfo['link_url'], $style['linkstart_hilite'])== TRUE)
@@ -333,7 +339,7 @@ class sitelinks
// Open link in a new window. (equivalent of target='_blank' ) // Open link in a new window. (equivalent of target='_blank' )
$link_append = ($linkInfo['link_open'] == 1) ? " rel='external'" : ""; $link_append = ($linkInfo['link_open'] == 1) ? " rel='external'" : "";
} }
e107::getDebug()->log($linkInfo['link_url']);
// Remove default images if its a button and add new image at the start. // Remove default images if its a button and add new image at the start.
if ($linkInfo['link_button']) if ($linkInfo['link_button'])
{ {
@@ -371,6 +377,8 @@ class sitelinks
$_link = $linkstart.$indent.$_link; $_link = $linkstart.$indent.$_link;
e107::getDebug()->log($linkInfo['link_url']);
global $SITELINKSTYLE; global $SITELINKSTYLE;
if(!$SITELINKSTYLE) if(!$SITELINKSTYLE)
{ {

30
e107_handlers/user_handler.php
View File

@@ -1123,7 +1123,35 @@ class e_user_provider
public function setProvider($provider) public function setProvider($provider)
{ {
$provider = ucfirst(strtolower($provider)); $provider = strtolower($provider);
switch($provider)
{
case 'aol':
$provider = 'AOL';
break;
case 'googleopenid':
$provider = 'GoogleOpenID';
break;
case 'linkedin':
$provider = 'LinkedIn';
break;
case 'myspace':
$provider = 'MySpace';
break;
case 'openid':
$provider = 'OpenID';
break;
default:
$provider = ucfirst($provider);
break;
}
if(isset($this->_config['providers'][$provider]) && $this->_config['providers'][$provider]['enabled']) if(isset($this->_config['providers'][$provider]) && $this->_config['providers'][$provider]['enabled'])
{ {
if($this->_config['providers'][$provider]['enabled'] && vartrue($this->_config['providers'][$provider]['keys'])) if($this->_config['providers'][$provider]['enabled'] && vartrue($this->_config['providers'][$provider]['keys']))

26
e107_languages/English/lan_error.php
View File

@@ -50,17 +50,17 @@ define("LAN_ERROR_32", "To complete the upgrade, copy the following text into yo
define("LAN_ERROR_33", "Processing error! Normally, I would redirect to the home page."); define("LAN_ERROR_33", "Processing error! Normally, I would redirect to the home page.");
define("LAN_ERROR_34", "Unknown error! Please inform the site administrator you saw this:"); define("LAN_ERROR_34", "Unknown error! Please inform the site administrator you saw this:");
define('LAN_ERROR_35', "Error 400 - Bad Request"); define("LAN_ERROR_35", "Error 400 - Bad Request");
define('LAN_ERROR_36', "There is a formatting error in the web page you are trying to access."); define("LAN_ERROR_36", "There is a formatting error in the web page you are trying to access.");
define('LAN_ERROR_37', "Error Icon"); define("LAN_ERROR_37", "Error Icon");
define('LAN_ERROR_38', "Sorry, but the site is unavailable due to a temporary fault"); define("LAN_ERROR_38", "Sorry, but the site is unavailable due to a temporary fault");
define('LAN_ERROR_39', "Please try again in a few minutes"); define("LAN_ERROR_39", "Please try again in a few minutes");
define('LAN_ERROR_40', "If the problem persists, please contact the site administrator"); define("LAN_ERROR_40", "If the problem persists, please contact the site administrator");
define('LAN_ERROR_41', "The reported error is:"); define("LAN_ERROR_41", "The reported error is:");
define('LAN_ERROR_42', "Additional error information: "); define("LAN_ERROR_42", "Additional error information: ");
define('LAN_ERROR_43', "Site unavailable temporarily"); define("LAN_ERROR_43", "Site unavailable temporarily");
define('LAN_ERROR_44', "Site logo"); define("LAN_ERROR_44", "Site logo");
define('LAN_ERROR_45', "What can you do now?"); define("LAN_ERROR_45", "What can you do now?");
define('LAN_ERROR_46', "Check log for details."); define("LAN_ERROR_46", "Check log for details.");
?> ?>

10
e107_languages/English/lan_fpw.php
View File

@@ -41,14 +41,14 @@ define("LAN_FPW14", "has been submitted by someone with the IP of");
define("LAN_FPW15", "This does not mean your password has yet been reset. You must navigate to the link shown below to complete the reset process."); define("LAN_FPW15", "This does not mean your password has yet been reset. You must navigate to the link shown below to complete the reset process.");
define("LAN_FPW16", "If you did not request to have your password reset and you do NOT want it reset, you may simply ignore this email"); define("LAN_FPW16", "If you did not request to have your password reset and you do NOT want it reset, you may simply ignore this email");
define("LAN_FPW17", "The link below will be valid for 48 hours."); define("LAN_FPW17", "The link below will be valid for 48 hours.");
define('LAN_FPW18', "Password reset requested"); define("LAN_FPW18", "Password reset requested");
define('LAN_FPW19', "Email send failed"); define("LAN_FPW19", "Email send failed");
define('LAN_FPW20', "Email send succeeded"); define("LAN_FPW20", "Email send succeeded");
define('LAN_FPW21', "User clicked on password reset link"); define("LAN_FPW21", "User clicked on password reset link");
define("LAN_FPW_100", "Forgot your password?"); define("LAN_FPW_100", "Forgot your password?");
define("LAN_FPW_101", "Not to worry. Just enter your email address below and we'll send you an instruction email for recovery."); define("LAN_FPW_101", "Not to worry. Just enter your email address below and we'll send you an instruction email for recovery.");
define("LAN_FPW_102", "Reset Password"); define("LAN_FPW_102", "Reset Password");
?> ?>

2
e107_plugins/forum/forum.css
View File

@@ -13,9 +13,11 @@
.forum-attachment-file { margin-top:15px; } .forum-attachment-file { margin-top:15px; }
.forum-user-combo { padding-bottom:5px } .forum-user-combo { padding-bottom:5px }
/*
ul.newforumposts-menu { padding-left: 10px; } ul.newforumposts-menu { padding-left: 10px; }
ul.newforumposts-menu li { margin-bottom: 15px; } ul.newforumposts-menu li { margin-bottom: 15px; }
*/
div.forum-poll-results { padding-left:0 } div.forum-poll-results { padding-left:0 }
.forum-viewtopic-customtitle { .forum-viewtopic-customtitle {

15
e107_plugins/forum/forum.php
View File

@@ -306,21 +306,28 @@ str_replace("[x]", ($total_topics+$total_replies), LAN_FORUM_0031)." ($total_top
$FORUM_TEMPLATE = e107::getTemplate('forum','forum'); // required to use v2.x wrapper shortcode wrappers.
if(empty($FORUM_TEMPLATE)) //v1.x fallback.
if(empty($FORUM_TEMPLATE))
{ {
include(e_PLUGIN.'forum/templates/forum_template.php'); // include(e_PLUGIN.'forum/templates/forum_template.php');
// Override with theme template // Override with theme template
if (file_exists(THEME.'forum_template.php')) if (file_exists(THEME.'forum_template.php')) //v1.x fallback.
{ {
include(e_PLUGIN.'forum/templates/forum_template.php');
include_once(THEME.'forum_template.php'); include_once(THEME.'forum_template.php');
} }
elseif(file_exists(THEME.'templates/forum/forum_template.php')) elseif(file_exists(THEME.'templates/forum/forum_template.php'))
{ {
$FORUM_TEMPLATE = e107::getTemplate('forum','forum');
require_once(THEME.'templates/forum/forum_template.php'); require_once(THEME.'templates/forum/forum_template.php');
} }
else //v2.x
{
$FORUM_TEMPLATE = e107::getTemplate('forum','forum'); // required to use v2.x wrapper shortcode wrappers.
}
} }
if(is_array($FORUM_TEMPLATE) && deftrue('BOOTSTRAP',false)) // new v2.x format. if(is_array($FORUM_TEMPLATE) && deftrue('BOOTSTRAP',false)) // new v2.x format.

11
e107_plugins/log/stats.php
View File

@@ -816,12 +816,16 @@ class siteStats
$url = str_replace($this->plugFolder,'',$url); $url = str_replace($this->plugFolder,'',$url);
if($truncate) if($truncate)
{ {
return e107::getParser()->text_truncate($url,50); $result = e107::getParser()->text_truncate($url,50);
return $result;
} }
return $url; return trim($url);
} }
@@ -842,6 +846,7 @@ class siteStats
$totalArray = array(); $totalArray = array();
$totalv = 0; $totalv = 0;
$totalu = 0; $totalu = 0;
$total = 0;
foreach ($this -> fileInfo as $k => $v) foreach ($this -> fileInfo as $k => $v)
{ {
$found = (strpos($k,'error/') === 0); $found = (strpos($k,'error/') === 0);
@@ -871,7 +876,7 @@ class siteStats
if($info['ttl']) if($info['ttl'])
{ {
$percentage = round(($info['ttl']/$totalv) * 100, 2); $percentage = round(($info['ttl']/$totalv) * 100, 2);
$text .= "<tr>\n<td class='forumheader3' style='width: 20%;'><img src='".e_PLUGIN."log/images/html.png' alt='' style='vertical-align: middle;' /> <a href='".$info['url']."'>".$this->getLabel($key)."</a> $text .= "<tr>\n<td class='forumheader3' style='width: 20%;text-align:left'><img src='".e_PLUGIN."log/images/html.png' alt='' style='vertical-align: middle;' /> <a href='".$info['url']."'>".$this->getLabel($key)."</a>
</td>\n<td class='forumheader3' style='width: 70%;'>".$this -> bar($percentage, $info['ttl']." [".$info['unq']."]")."</td>\n<td class='forumheader3' style='width: 10%; text-align: center;'>".$percentage."%</td>\n</tr>\n"; </td>\n<td class='forumheader3' style='width: 70%;'>".$this -> bar($percentage, $info['ttl']." [".$info['unq']."]")."</td>\n<td class='forumheader3' style='width: 10%; text-align: center;'>".$percentage."%</td>\n</tr>\n";
} }
} }

2
e107_themes/bootstrap3/style.css
View File

@@ -143,7 +143,7 @@ table label.checkbox {
#sidebar .panel-body ul.list-unstyled { padding-left:0} #sidebar .panel-body ul.list-unstyled { padding-left:0}
li.dropdown-avatar > a.dropdown-toggle { padding:9px 15px 10px 0; }

5
e107_web/css/backcompat.css
View File

@@ -27,4 +27,7 @@ div.news-empty { text-align:center; font-weight: bold }
div.checkboxes label.checkbox { display: block } div.checkboxes label.checkbox { display: block }
textarea.bbarea { margin:0; } textarea.bbarea { margin:0; }
#chatbox-input-block { text-align:center }
ul.breadcrumb li { display:inline-block; padding-right:5px;}
ul.breadcrumb li span.divider { padding-left:5px; }

6
login.php
View File

@@ -101,7 +101,11 @@ if (!USER || getperms('0'))
$login_message = SITENAME; // $login_message = LAN_LOGIN_3." | ".SITENAME; $login_message = SITENAME; // $login_message = LAN_LOGIN_3." | ".SITENAME;
echo LOGINMESSAGE; if(strpos($LOGIN_TABLE_HEADER,'LOGIN_TABLE_LOGINMESSAGE') === false && strpos($LOGIN_TABLE,'LOGIN_TABLE_LOGINMESSAGE') === false)
{
echo LOGINMESSAGE;
}
echo $tp->parseTemplate($LOGIN_TABLE_HEADER,true, $sc); echo $tp->parseTemplate($LOGIN_TABLE_HEADER,true, $sc);
$ns->tablerender($login_message, $text, 'login_page'); $ns->tablerender($login_message, $text, 'login_page');
echo $tp->parseTemplate($LOGIN_TABLE_FOOTER, true, $sc); echo $tp->parseTemplate($LOGIN_TABLE_FOOTER, true, $sc);

9
news.php
View File

@@ -510,6 +510,8 @@ if ($action == 'extend')
$news = $sql->fetch(); $news = $sql->fetch();
$id = $news['news_category']; // Use category of this news item to generate next/prev links $id = $news['news_category']; // Use category of this news item to generate next/prev links
e107::getEvent()->trigger('user_news_item_viewed', $news);
//***NEW [SecretR] - comments handled inside now //***NEW [SecretR] - comments handled inside now
e107::setRegistry('news/page_allow_comments', !$news['news_allow_comments']); e107::setRegistry('news/page_allow_comments', !$news['news_allow_comments']);
if(!$news['news_allow_comments'] && isset($_POST['commentsubmit'])) if(!$news['news_allow_comments'] && isset($_POST['commentsubmit']))
@@ -1006,12 +1008,13 @@ else
if ($action == "item") if ($action == "item")
{ {
unset($news['news_render_type']); unset($news['news_render_type']);
e107::getEvent()->trigger('user_news_item_viewed', $news);
//e107::getDebug()->log($news);
} }
// $template = false; // $template = false;
$ix->render_newsitem($news, 'default', '', $template, $param); $ix->render_newsitem($news, 'default', '', $template, $param);
$i++; $i++;
} }