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

Notice removals

Browse Source
This commit is contained in:
Tijn Kuyper
2012-12-16 12:28:28 +01:00
parent 9217a078fd
commit 57dbc89d18
14 changed files with 102 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/language.php
View File

@@ -263,7 +263,7 @@ if(varset($_POST['searchDeprecated']) && varset($_POST['deprecatedLans']))
else else
{ {
$mes->addDebug("Couldn't Read LanFile... "); $mes->addDebug("Couldn't Read LanFile... ");
$ns -> tablerender($res['caption'],$mes->render(). $res['text']); $ns -> tablerender(vartrue($res['caption']), $mes->render(). vartrue($res['text']));
} }

20
e107_admin/users.php
View File

@@ -282,7 +282,8 @@ class users_admin_ui extends e_admin_ui
// if(isset ($_POST['adduser'])) // if(isset ($_POST['adduser']))
// { // {
// addUser(); // addUser();
// } // }
} }
/** /**
@@ -421,8 +422,8 @@ class users_admin_ui extends e_admin_ui
$emessage->addSuccess("Email sent to: ".$sysuser->getName().' ('.$sysuser->getValue('email').')'); $emessage->addSuccess("Email sent to: ".$sysuser->getName().' ('.$sysuser->getValue('email').')');
} }
else else
else {
{ $emessage->addError("Failed to send email to: ".$sysuser->getName().' ('.$sysuser->getValue('email').')');
} }
} }
} }
@@ -1134,15 +1135,15 @@ class users_admin_ui extends e_admin_ui
// activate, don't notify // activate, don't notify
$check = -1; $check = -1;
break; break;
break;
case 1: case 1:
case 1: // activate and send password
$check = $sysuser->email('quickadd', array( $check = $sysuser->email('quickadd', array(
'user_password' => $savePassword, 'user_password' => $savePassword,
'mail_subject' => USRLAN_187.SITENAME, 'mail_subject' => USRLAN_187.SITENAME,
// TODO lan // TODO lan
'activation_url' => 'Your current status is <strong>Active</strong>', 'activation_url' => 'Your current status is <strong>Active</strong>',
'activation_url' => 'Your current status is <strong>Active</strong>', ));
break; break;
case 2: case 2:
@@ -1156,7 +1157,7 @@ class users_admin_ui extends e_admin_ui
'mail_subject' => USRLAN_187.SITENAME, 'mail_subject' => USRLAN_187.SITENAME,
'activation_url' => SITEURL."signup.php?activate.".$sysuser->getId().".".$sysuser->getValue('sess'), 'activation_url' => SITEURL."signup.php?activate.".$sysuser->getId().".".$sysuser->getValue('sess'),
)); ));
)); break;
} }
@@ -1887,7 +1888,7 @@ class users_admin_form_ui extends e_admin_form_ui
} }
/*
function user_class($curval,$mode) function user_class($curval,$mode)
{ {
@@ -1920,7 +1921,7 @@ class users_admin_form_ui extends e_admin_form_ui
} }
return implode("<br />",$text); // $list[$curval]; return implode("<br />",$text); // $list[$curval];
}*/
@@ -1978,6 +1979,7 @@ class users_admin_form_ui extends e_admin_form_ui
extract($row); extract($row);
$text = "";
$text .= "<div> $text .= "<div>
<input type='hidden' name='userid[{$user_id}]' value='{$user_id}' /> <input type='hidden' name='userid[{$user_id}]' value='{$user_id}' />

4
e107_core/controllers/system/error.php
View File

@@ -23,11 +23,11 @@ class core_system_error_controller extends eController
$this->addTitle(LAN_ERROR_7); $this->addTitle(LAN_ERROR_7);
//var_dump($this->getRequest()->getRouteHistory()); //var_dump($this->getRequest()->getRouteHistory());
$errorText = "<img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_21.'<br />'.LAN_ERROR_9."<br /><br />"; $errorText = "<img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_21.'<br />'.LAN_ERROR_9."<br /><br />";
if (strlen($errFrom)) $errorText .= LAN_ERROR_23." <a href='{$errFrom}' rel='external'>{$errFrom}</a> ".LAN_ERROR_24." -- ".LAN_ERROR_19."<br /><br />"; if (strlen(vartrue($errFrom))) $errorText .= LAN_ERROR_23." <a href='{$errFrom}' rel='external'>{$errFrom}</a> ".LAN_ERROR_24." -- ".LAN_ERROR_19."<br /><br />";
$errorText .= "<h3>".LAN_ERROR_45."</h3>"; $errorText .= "<h3>".LAN_ERROR_45."</h3>";
if($errReturnTo) if(vartrue($errReturnTo))
{ {
foreach ($errReturnTo as $url => $label) foreach ($errReturnTo as $url => $label)
{ {

2
e107_handlers/admin_ui.php
View File

@@ -1759,7 +1759,7 @@ class e_admin_controller
*/ */
public function addHeader($content) public function addHeader($content)
{ {
$this->getResponse()->addHeaderContent($content); $this->getResponse()->addHeaderContent(vartrue($content));
return $this; return $this;
} }

130
e107_handlers/application.php
View File

@@ -138,13 +138,13 @@ class eFront
$c++; $c++;
if($c > 100) if($c > 100)
{ {
throw new eException("Too much dispatch loops", 1); throw new eException("Too much dispatch loops", 1);
} }
// dispatched status true on first loop // dispatched status true on first loop
$router->checkLegacy($request); $router->checkLegacy($request);
// dispatched by default - don't allow legacy to alter dispatch status // dispatched by default - don't allow legacy to alter dispatch status
$request->setDispatched(true); $request->setDispatched(true);
// legacy mod - return control to the bootstrap // legacy mod - return control to the bootstrap
@@ -164,7 +164,7 @@ class eFront
exit; exit;
} }
} while (!$request->isDispatched()); } while (!$request->isDispatched());
} }
@@ -715,9 +715,9 @@ class eDispatcher
$search = array('core', 'plugin', 'override'); $search = array('core', 'plugin', 'override');
foreach ($search as $location) foreach ($search as $location)
{ {
$_searchArray = vartrue($searchArray[$location], array()); $_searchArray = vartrue($searchArray[$location], array());
if(in_array($module, $_searchArray)) return $location; if(in_array($module, $_searchArray)) return $location;
} }
return null; return null;
} }
@@ -878,10 +878,10 @@ class eRouter
$rules = array(); $rules = array();
foreach ($config as $module => $c) foreach ($config as $module => $c)
{ {
$rules[$module] = $c['rules']; $rules[$module] = $c['rules'];
unset($config[$module]['rules']); unset($config[$module]['rules']);
$config[$module] = $config[$module]['config']; $config[$module] = $config[$module]['config'];
} }
$this->_globalConfig = $config; $this->_globalConfig = $config;
$this->setRuleSets($rules); $this->setRuleSets($rules);
@@ -906,7 +906,7 @@ class eRouter
$config = array(); $config = array();
foreach ($active as $module => $location) foreach ($active as $module => $location)
{ {
$_config = array(); $_config = array();
$obj = eDispatcher::getConfigObject($module, $location); $obj = eDispatcher::getConfigObject($module, $location);
$path = eDispatcher::getConfigPath($module, $location, true); $path = eDispatcher::getConfigPath($module, $location, true);
@@ -932,10 +932,10 @@ class eRouter
if(!is_array($rule)) if(!is_array($rule))
{ {
$_config['rules'][$pattern] = array($rule); $_config['rules'][$pattern] = array($rule);
} }
} }
$config[$module] = $_config; $config[$module] = $_config;
} }
if($save) if($save)
@@ -970,8 +970,8 @@ class eRouter
$c = eRouter::file2config($file, $location); $c = eRouter::file2config($file, $location);
if($c) $ret[] = $c; if($c) $ret[] = $c;
continue; continue;
} }
$ret[] = eRouter::file2config($file, $location); $ret[] = eRouter::file2config($file, $location);
} }
return $ret; return $ret;
} }
@@ -1285,7 +1285,7 @@ class eRouter
* @param array $currentConfig url_config core preference * @param array $currentConfig url_config core preference
* @return array cleaned aliases * @return array cleaned aliases
*/ */
public static function adminSyncAliases($currentAliases, $currentConfig) public static function adminSyncAliases($currentAliases, $currentConfig)
{ {
if(empty($currentAliases)) return array(); if(empty($currentAliases)) return array();
@@ -1298,7 +1298,7 @@ class eRouter
if(is_array($currentAliases)) if(is_array($currentAliases))
{ {
foreach ($currentAliases as $lanCode => $aliases) foreach ($currentAliases as $lanCode => $aliases)
{ {
$lanName = $lng->convert($lanCode); $lanName = $lng->convert($lanCode);
if(!$lanName || !in_array($lanName, $lanList)) if(!$lanName || !in_array($lanName, $lanList))
{ {
@@ -1308,9 +1308,9 @@ class eRouter
// remove non-existing modules // remove non-existing modules
foreach ($aliases as $alias => $module) foreach ($aliases as $alias => $module)
{ {
if(!isset($currentConfig[$module])) unset($currentAliases[$lanCode][$alias]); if(!isset($currentConfig[$module])) unset($currentAliases[$lanCode][$alias]);
} }
} }
} }
return $currentAliases; return $currentAliases;
@@ -1514,11 +1514,11 @@ class eRouter
foreach ($rules as $pattern => $set) foreach ($rules as $pattern => $set)
{ {
foreach ($map as $key => $value) foreach ($map as $key => $value)
{ {
if(!isset($set[$value]) && isset($config[$key])) if(!isset($set[$value]) && isset($config[$key]))
{ {
$set[$value] = $config[$key]; $set[$value] = $config[$key];
} }
} }
$this->_parsedRules[$module][$pattern] = $this->createRule($set, $pattern); $this->_parsedRules[$module][$pattern] = $this->createRule($set, $pattern);
} }
@@ -1555,9 +1555,9 @@ class eRouter
$this->_urlFormat = self::FORMAT_GET; $this->_urlFormat = self::FORMAT_GET;
} }
else else
{ {
$rawPathInfo = rawurldecode($request->getPathInfo()); $rawPathInfo = rawurldecode($request->getPathInfo());
//$this->_urlFormat = self::FORMAT_PATH; //$this->_urlFormat = self::FORMAT_PATH;
} }
// Route to front page - index/index/index route // Route to front page - index/index/index route
@@ -1666,12 +1666,12 @@ class eRouter
if($rule->allowVars) if($rule->allowVars)
{ {
foreach ($rule->allowVars as $key) foreach ($rule->allowVars as $key)
{ {
if(isset($_GET[$key]) && !$request->isRequestParam($key)) if(isset($_GET[$key]) && !$request->isRequestParam($key))
{ {
// sanitize // sanitize
$vars->$key = preg_replace('/[^\d\w\-]/', '', $_GET[$key]); $vars->$key = preg_replace('/[^\d\w\-]/', '', $_GET[$key]);
} }
} }
} }
$obj->legacyQueryString = e107::getParser()->simpleParse($rule->legacyQuery, $vars, '0'); $obj->legacyQueryString = e107::getParser()->simpleParse($rule->legacyQuery, $vars, '0');
@@ -1701,7 +1701,7 @@ class eRouter
} }
// final fallback // final fallback
if(!$route) if(!vartrue($route))
{ {
if($request->routed) if($request->routed)
{ {
@@ -1866,8 +1866,8 @@ class eRouter
if(isset($route[1]) && $route[1] === '*') $route[1] = $request->getController(); if(isset($route[1]) && $route[1] === '*') $route[1] = $request->getController();
} }
else else
{ {
$route = explode('/', $route, 3); $route = explode('/', $route, 3);
} }
// we don't know anything about this route, just build it blind // we don't know anything about this route, just build it blind
@@ -1883,16 +1883,16 @@ class eRouter
# fill in index when needed - XXX not needed, may be removed soon # fill in index when needed - XXX not needed, may be removed soon
switch (count($route)) switch (count($route))
{ {
case 1: case 1:
$route[1] = 'index'; $route[1] = 'index';
$route[2] = 'index'; $route[2] = 'index';
break; break;
case 2: case 2:
$route[2] = 'index'; $route[2] = 'index';
break; break;
} }
# aliases # aliases
@@ -1936,8 +1936,8 @@ class eRouter
if(!$this->isMainModule($module)) $route = $alias; if(!$this->isMainModule($module)) $route = $alias;
} }
elseif (!$this->isMainModule($module)) elseif (!$this->isMainModule($module))
{ {
$route = $alias.'/'.$route; $route = $alias.'/'.$route;
} }
} }
@@ -1973,7 +1973,7 @@ class eRouter
if (($url = $rule->createUrl($this, array($route[1], $route[2]), $params, $options)) !== false) return $base.rtrim(($this->isMainModule($module) ? '' : $alias.'/').$url, '/').$anc; if (($url = $rule->createUrl($this, array($route[1], $route[2]), $params, $options)) !== false) return $base.rtrim(($this->isMainModule($module) ? '' : $alias.'/').$url, '/').$anc;
} }
} }
// default - module/controller/action // default - module/controller/action
if($this->isMainModule($module)) unset($route[0]); if($this->isMainModule($module)) unset($route[0]);
if($route[2] == 'index') if($route[2] == 'index')
@@ -2020,8 +2020,8 @@ class eRouter
$params = array(); $params = array();
$params[$this->routeVar] = implode('/', $route); $params[$this->routeVar] = implode('/', $route);
foreach ($copy as $key => $value) foreach ($copy as $key => $value)
{ {
$params[$key] = $value; $params[$key] = $value;
} }
unset($copy); unset($copy);
$route = array(); $route = array();
@@ -2648,8 +2648,8 @@ class eController
->init(); ->init();
} }
/** /**
* Custom init, always called in the constructor, no matter what is the request dispatch status * Custom init, always called in the constructor, no matter what is the request dispatch status
*/ */
public function init() {} public function init() {}
@@ -2759,7 +2759,7 @@ class eController
} }
} }
else else
{ {
//TODO not found method by controller or default one //TODO not found method by controller or default one
$action = substr($actionMethodName, 6); $action = substr($actionMethodName, 6);
throw new eException('Action "'.$action.'" does not exist'); throw new eException('Action "'.$action.'" does not exist');
@@ -2815,11 +2815,11 @@ class eController
$oldRoute = $request->getRoute(); $oldRoute = $request->getRoute();
$route = explode('/', trim($route, '/')); $route = explode('/', trim($route, '/'));
switch (count($route)) { switch (count($route)) {
case 3: case 3:
if($route[0] !== '*') $request->setModule($route[0]); if($route[0] !== '*') $request->setModule($route[0]);
if($route[1] !== '*') $request->setController($route[1]); if($route[1] !== '*') $request->setController($route[1]);
$request->setAction($route[2]); $request->setAction($route[2]);
break; break;
case 2: case 2:
@@ -2829,11 +2829,11 @@ class eController
case 1: case 1:
$request->setAction($route[0]); $request->setAction($route[0]);
break; break;
default: default:
return; return;
break; break;
} }
$request->addRouteHistory($oldRoute); $request->addRouteHistory($oldRoute);
@@ -2942,14 +2942,14 @@ class eControllerFront extends eController
*/ */
final protected function _init() final protected function _init()
{ {
// plugin check // plugin check
if(null !== $this->plugin) if(null !== $this->plugin)
{ {
if(!e107::isInstalled($this->plugin)) if(!e107::isInstalled($this->plugin))
{ {
$this->forward403(); $this->forward403();
return; return;
} }
} }
// global controller restriction // global controller restriction
@@ -3936,7 +3936,7 @@ class eResponse
{ {
$attrData .= '<meta'; $attrData .= '<meta';
foreach ($attr as $p => $v) foreach ($attr as $p => $v)
{ {
$attrData .= ' '.preg_replace('/[^\w\-]/', '', $p).'="'.str_replace(array('"', '<'), '', $v).'"'; $attrData .= ' '.preg_replace('/[^\w\-]/', '', $p).'="'.str_replace(array('"', '<'), '', $v).'"';
} }
$attrData .= ' />'."\n"; $attrData .= ' />'."\n";
@@ -4229,15 +4229,15 @@ class eHelper
} }
$tp = e107::getParser(); $tp = e107::getParser();
switch ($type) switch ($type)
{ {
case 'dashl': //dasherize, to lower case case 'dashl': //dasherize, to lower case
return self::dasherize($tp->ustrtolower($title)); return self::dasherize($tp->ustrtolower($title));
break; break;
case 'dashc': //dasherize, camel case case 'dashc': //dasherize, camel case
return self::dasherize(self::camelize($title, true, ' ')); return self::dasherize(self::camelize($title, true, ' '));
break; break;
case 'dash': //dasherize case 'dash': //dasherize
return self::dasherize($title); return self::dasherize($title);
break; break;
@@ -4266,10 +4266,10 @@ class eHelper
return str_replace(' ', '+', $title); return str_replace(' ', '+', $title);
break; break;
case 'none': case 'none':
default: default:
return $title; return $title;
break; break;
} }
} }

2
e107_handlers/menumanager_class.php
View File

@@ -1354,7 +1354,7 @@ class e_menuManager {
if($link) if($link)
{ {
$tmp[$id]['name'] = ucwords(str_replace("_menu","",$menu_name)); $tmp[$id]['name'] = ucwords(str_replace("_menu","",$menu_name));
if($prev == $id && ($tmp[$id]['name']!=$prev_name)) if(vartrue($prev) == $id && ($tmp[$id]['name']!=$prev_name))
{ {
$tmp[$id]['name'] .= ":".$prev_name; $tmp[$id]['name'] .= ":".$prev_name;
} }

1
e107_plugins/alt_auth/alt_auth_adminmenu.php
View File

@@ -333,6 +333,7 @@ function alt_auth_post_options($prefix)
function altAuthGetPasswordSelector($name, $frm, $currentSelection = '', $getExtended = FALSE) function altAuthGetPasswordSelector($name, $frm, $currentSelection = '', $getExtended = FALSE)
{ {
$password_methods = ExtendedPasswordHandler::GetPasswordTypes($getExtended); $password_methods = ExtendedPasswordHandler::GetPasswordTypes($getExtended);
$text = "";
$text .= $frm->form_select_open($name); $text .= $frm->form_select_open($name);
foreach($password_methods as $k => $v) foreach($password_methods as $k => $v)
{ {

4
e107_plugins/alt_auth/e107db_conf.php
View File

@@ -30,13 +30,13 @@ require_once(e_PLUGIN.'alt_auth/alt_auth_adminmenu.php');
require_once(e_PLUGIN.'alt_auth/extended_password_handler.php'); require_once(e_PLUGIN.'alt_auth/extended_password_handler.php');
if($_POST['update']) if(vartrue($_POST['update']))
{ {
$message = alt_auth_post_options('e107db'); $message = alt_auth_post_options('e107db');
} }
if($message) if(vartrue($message))
{ {
e107::getRender()->tablerender('',"<div style='text-align:center;'>".$message.'</div>'); e107::getRender()->tablerender('',"<div style='text-align:center;'>".$message.'</div>');
} }

4
e107_plugins/alt_auth/importdb_conf.php
View File

@@ -32,13 +32,13 @@ require_once(e_PLUGIN.'alt_auth/alt_auth_adminmenu.php');
require_once(e_PLUGIN.'alt_auth/extended_password_handler.php'); require_once(e_PLUGIN.'alt_auth/extended_password_handler.php');
if($_POST['update']) if(vartrue($_POST['update']))
{ {
// $message = update_importdb_prefs(); // $message = update_importdb_prefs();
$message = alt_auth_post_options('importdb'); $message = alt_auth_post_options('importdb');
} }
if($message) if(vartrue($message))
{ {
e107::getRender()->tablerender("","<div style='text-align:center;'>".$message."</div>"); e107::getRender()->tablerender("","<div style='text-align:center;'>".$message."</div>");
} }

14
e107_plugins/alt_auth/ldap_conf.php
View File

@@ -39,7 +39,7 @@ $ldap_ver[1]='2';
$ldap_ver[2]='3'; $ldap_ver[2]='3';
$message = ''; $message = '';
if($_POST['update']) if(vartrue($_POST['update']))
{ {
$message .= alt_auth_post_options('ldap'); $message .= alt_auth_post_options('ldap');
} }
@@ -71,28 +71,28 @@ $text .= "<tr><td>".LDAPLAN_12."</td><td>";
$text .= $frm -> form_select_open("ldap_servertype"); $text .= $frm -> form_select_open("ldap_servertype");
foreach($server_types as $v) foreach($server_types as $v)
{ {
$sel = ($ldap['ldap_servertype'] == $v) ? " Selected='selected'" : ''; $sel = (vartrue($ldap['ldap_servertype']) == $v) ? " Selected='selected'" : '';
$text .= $frm -> form_option($v, $sel, $v); $text .= $frm -> form_option($v, $sel, $v);
} }
$text .= $frm -> form_select_close(); $text .= $frm -> form_select_close();
$text .= "</td></tr>"; $text .= "</td></tr>";
$text .= "<tr><td>".LDAPLAN_1."</td><td>"; $text .= "<tr><td>".LDAPLAN_1."</td><td>";
$text .= $frm -> form_text("ldap_server", 35, $ldap['ldap_server'], 120); $text .= $frm -> form_text("ldap_server", 35, vartrue($ldap['ldap_server']), 120);
$text .= "</td></tr>"; $text .= "</td></tr>";
$text .= "<tr><td>".LDAPLAN_2."</td><td>"; $text .= "<tr><td>".LDAPLAN_2."</td><td>";
$text .= $frm -> form_text("ldap_basedn", 35, $ldap['ldap_basedn'], 120); $text .= $frm -> form_text("ldap_basedn", 35, vartrue($ldap['ldap_basedn']), 120);
$text .= "</td></tr>"; $text .= "</td></tr>";
$text .= "<tr><td>".LDAPLAN_14."</td><td>"; $text .= "<tr><td>".LDAPLAN_14."</td><td>";
$text .= $frm -> form_text("ldap_ou", 35, $ldap['ldap_ou'], 60); $text .= $frm -> form_text("ldap_ou", 35, vartrue($ldap['ldap_ou']), 60);
$text .= "</td></tr>"; $text .= "</td></tr>";
$text .= "<tr><td>".LDAPLAN_3."</td><td>"; $text .= "<tr><td>".LDAPLAN_3."</td><td>";
$text .= $frm -> form_text("ldap_user", 35, $ldap['ldap_user'], 120); $text .= $frm -> form_text("ldap_user", 35, vartrue($ldap['ldap_user']), 120);
$text .= "</td></tr>"; $text .= "</td></tr>";
$text .= "<tr><td>".LDAPLAN_4."</td><td>"; $text .= "<tr><td>".LDAPLAN_4."</td><td>";
$text .= $frm -> form_text("ldap_passwd", 35, $ldap['ldap_passwd'], 120); $text .= $frm -> form_text("ldap_passwd", 35, vartrue($ldap['ldap_passwd']), 120);
$text .= "</td></tr>"; $text .= "</td></tr>";
$text .= "<tr><td>".LDAPLAN_5."</td><td>"; $text .= "<tr><td>".LDAPLAN_5."</td><td>";

4
e107_plugins/alt_auth/otherdb_conf.php
View File

@@ -31,13 +31,13 @@ require_once(e_PLUGIN.'alt_auth/alt_auth_adminmenu.php');
require_once(e_PLUGIN.'alt_auth/extended_password_handler.php'); require_once(e_PLUGIN.'alt_auth/extended_password_handler.php');
if($_POST['update']) if(vartrue($_POST['update']))
{ {
$message = alt_auth_post_options('otherdb'); $message = alt_auth_post_options('otherdb');
} }
if($message) if(vartrue($message))
{ {
e107::getRender()->tablerender('',"<div style='text-align:center;'>".$message.'</div>'); e107::getRender()->tablerender('',"<div style='text-align:center;'>".$message.'</div>');
} }

8
e107_plugins/alt_auth/radius_conf.php
View File

@@ -27,7 +27,7 @@ require_once(e_PLUGIN."alt_auth/alt_auth_adminmenu.php");
$mes = e107::getMessage(); $mes = e107::getMessage();
$message = ''; $message = '';
if($_POST['update']) if(vartrue($_POST['update']))
{ {
// $message .= alt_auth_post_options('radius'); // $message .= alt_auth_post_options('radius');
$mes->addSuccess(alt_auth_post_options('radius')); $mes->addSuccess(alt_auth_post_options('radius'));
@@ -58,14 +58,14 @@ $frm = new form;
$text = $frm -> form_open("post",e_SELF); $text = $frm -> form_open("post",e_SELF);
$text .= "<table class='table adminform'>"; $text .= "<table class='table adminform'>";
$text .= "<tr><td>".LAN_RADIUS_01."</td><td>"; $text .= "<tr><td>".LAN_RADIUS_01."</td><td>";
$text .= $frm -> form_text("radius_server", 35, $radius['radius_server'], 120); $text .= $frm -> form_text("radius_server", 35, vartrue($radius['radius_server']), 120);
$text .= "</td></tr>"; $text .= "</td></tr>";
$text .= "<tr><td>".LAN_RADIUS_02."</td><td>"; $text .= "<tr><td>".LAN_RADIUS_02."</td><td>";
$text .= $frm -> form_text('radius_secret', 35, $radius['radius_secret'], 200); $text .= $frm -> form_text('radius_secret', 35, vartrue($radius['radius_secret']), 200);
$text .= "</td></tr>"; $text .= "</td></tr>";
$tmp = alt_auth_get_field_list('radius',$frm, $ldap, FALSE); $tmp = alt_auth_get_field_list('radius',$frm, vartrue($ldap), FALSE);
if ($tmp) if ($tmp)
{ {
$text .= "<tr><td class='forumheader2' colspan='2'>".LAN_ALT_27."</td></tr>".$tmp; $text .= "<tr><td class='forumheader2' colspan='2'>".LAN_ALT_27."</td></tr>".$tmp;

4
e107_plugins/login_menu/login_menu_class.php
View File

@@ -213,7 +213,7 @@ class login_menu_class
$lbox_stats[0]['stat_items'] = LOGIN_MENU_L17; $lbox_stats[0]['stat_items'] = LOGIN_MENU_L17;
$lbox_stats[0]['stat_new'] = 0; $lbox_stats[0]['stat_new'] = 0;
$lbox_stats[0]['stat_nonew'] = LOGIN_MENU_L26.' '.LOGIN_MENU_L17; $lbox_stats[0]['stat_nonew'] = LOGIN_MENU_L26.' '.LOGIN_MENU_L17;
if($get_stats) { if(vartrue($get_stats)) {
$lbox_stats['chatbox_menu'][0]['stat_new'] = $sql->db_Count('chatbox', '(*)', 'WHERE `cb_datestamp` > '.USERLV); $lbox_stats['chatbox_menu'][0]['stat_new'] = $sql->db_Count('chatbox', '(*)', 'WHERE `cb_datestamp` > '.USERLV);
} }
@@ -346,7 +346,7 @@ class login_menu_class
if(($tmp = getcachedvars('loginbox_eplug_data_'.$plugid)) !== FALSE) return $tmp; if(($tmp = getcachedvars('loginbox_eplug_data_'.$plugid)) !== FALSE) return $tmp;
$ret = array(); $ret = array();
if (is_readable(e_PLUGIN.$plugin_path.'/plugin.xml')) if (is_readable(e_PLUGIN.vartrue($plugin_path).'/plugin.xml'))
{ {
require_once(e_HANDLER.'xml_class.php'); require_once(e_HANDLER.'xml_class.php');
$xml = new xmlClass; $xml = new xmlClass;

2
user.php
View File

@@ -136,7 +136,7 @@ if (isset($id))
exit; exit;
} }
if($pref['profile_comments']) if(vartrue($pref['profile_comments']))
{ {
require_once(e_HANDLER."comment_class.php"); require_once(e_HANDLER."comment_class.php");
$comment_edit_query = 'comment.user.'.$id; $comment_edit_query = 'comment.user.'.$id;