mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-03-14 01:19:44 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/e107inc/e107

Browse Source
This commit is contained in:
SteveD 2012-12-09 12:47:50 +00:00
commit 80a3098406
94 changed files with 3421 additions and 2954 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contact.php
View File

@ -27,7 +27,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
require_once(HEADERF);
if (!$CONTACT_FORM) {
if (!vartrue($CONTACT_FORM)) {
if (file_exists(THEME."contact_template.php")) {
require_once(THEME."contact_template.php");
}
@ -158,7 +158,7 @@ if(isset($_POST['send-contactus']))
if(SITECONTACTINFO && $CONTACT_INFO)
{
$text = $tp->parseTemplate($CONTACT_INFO, TRUE, $contact_shortcodes);
$text = $tp->parseTemplate($CONTACT_INFO, TRUE, vartrue($contact_shortcodes));
$ns -> tablerender(LANCONTACT_01, $text,"contact");
}

6
e107_admin/ad_links.php
View File

@ -177,6 +177,9 @@ if (!defined('E_16_INSPECT')) {
if (!defined('E_16_LINKS')) {
define('E_16_LINKS', "<img class='icon S16' src='".e_IMAGE."admin_images/links_16.png' alt='' />");
}
if (!defined('E_16_LINKSPAGE')) {
define('E_16_LINKSPAGE', "<img class='icon S16' src='".e_IMAGE."admin_images/linkspage_16.png' alt='' />");
}
if (!defined('E_16_WELCOME')) {
define('E_16_WELCOME', "<img class='icon S16' src='".e_IMAGE."admin_images/welcome_16.png' alt='' />");
}
@ -344,6 +347,9 @@ if (!defined('E_32_INSPECT')) {
if (!defined('E_32_LINKS')) {
define('E_32_LINKS', "<img class='icon S32' src='".e_IMAGE."admin_images/links_32.png' alt='' />");
}
if (!defined('E_32_LINKSPAGE')) {
define('E_32_LINKSPAGE', "<img class='icon S32' src='".e_IMAGE."admin_images/linkspage_32.png' alt='' />");
}
if (!defined('E_32_WELCOME')) {
define('E_32_WELCOME', "<img class='icon S32' src='".e_IMAGE."admin_images/welcome_32.png' alt='' />");
}

2
e107_admin/auth.php
View File

@ -45,7 +45,7 @@ if (ADMIN)
if(e107::getUser()->getSessionDataAs())
{ // TODO - lan
$asuser = e107::getSystemUser(e107::getUser()->getSessionDataAs(), false);
e107::getMessage()->addInfo('Successfully logged in as '.($asuser && $asuser->getValue('name') ? $asuser->getValue('name') : 'unknown'). ' <a href="'.e_ADMIN_ABS.'users.php?logoutas">[logout]</a>');
e107::getMessage()->addInfo('Successfully logged in as '.($asuser->getId() ? $asuser->getName().' ('.$asuser->getValue('email').')' : 'unknown'). ' <a href="'.e_ADMIN_ABS.'users.php?mode=main&amp;action=logoutas">[logout]</a>');
}
// NEW, legacy 3rd party code fix, header called inside the footer o.O
if(deftrue('e_ADMIN_UI'))

2
e107_admin/comment.php
View File

@ -135,7 +135,7 @@ class comments_admin_form_ui extends e_admin_form_ui
$id = $row['comment_type'];
$list[$id] = e107::getComment()->getTable($id);
}
return $list;
return vartrue($list);
}
if($mode == 'batch')

2
e107_admin/credits.php
View File

@ -44,7 +44,7 @@ require_once(e_ADMIN."auth.php");
<p>
Cameron Hanly, Miroslav Yovchev, Steven Davies,<br />
Henk Jongedijk, James Currie, Martin Nicholls,<br />
Steven Davies, Thom Michelbrink
Steven Davies, Thom Michelbrink, Tijn Kuyper
</p>
<h1>3rd Parties</h1>
<p>

2
e107_admin/cron.php
View File

@ -157,7 +157,7 @@ class cron_admin_ui extends e_admin_ui
),
);
if(!$_GET['action'] || $_GET['action'] == 'refresh')
if(!vartrue($_GET['action']) || $_GET['action'] == 'refresh')
{
$this->cronImport($cronDefaults); // import Core Crons (if missing)

4
e107_admin/db.php
View File

@ -605,7 +605,7 @@ class system_tools
foreach($pref_types as $key=>$description)
{
$checked = ($_POST['xml_prefs'][$key] == $key) ? 1: 0;
$checked = (vartrue($_POST['xml_prefs'][$key]) == $key) ? 1: 0;
$text .= "<tr>
<td>
@ -636,7 +636,7 @@ class system_tools
foreach($tables as $name=>$count)
{
$checked = ($_POST['xml_tables'][$name] == $name) ? 1: 0;
$checked = (vartrue($_POST['xml_tables'][$name]) == $name) ? 1: 0;
$text .= "<tr>
<td>
".$frm->checkbox("xml_tables[".$name."]", $name, $checked)." Table Data: ".$name."

2
e107_admin/docs.php
View File

@ -74,7 +74,7 @@ $text_h = '';
foreach ($helplist as $key => $helpdata)
{
$filename = $doc_fpath.$helpdata['fname'];
$filename_alt = $doc_fpath_alt.$$helpdata['fname'];
$filename_alt = $doc_fpath_alt.vartrue($$helpdata['fname']);
if(is_readable($filename))
$tmp = file_get_contents($filename);

1372
e107_admin/emoticon.php
View File

File diff suppressed because it is too large Load Diff

10
e107_admin/fileinspector.php
View File

@ -82,7 +82,7 @@ if(isset($_GET['scan']))
$_POST = $_GET;
if($_GET['exploit'])
if(vartrue($_GET['exploit']))
{
$fi->exploit();
}
@ -141,7 +141,7 @@ class file_inspector {
if ($_POST['core'] == 'fail') {
$_POST['integrity'] = TRUE;
}
if (MAGIC_QUOTES_GPC && $_POST['regex']) {
if (MAGIC_QUOTES_GPC && vartrue($_POST['regex'])) {
$_POST['regex'] = stripslashes($_POST['regex']);
}
if ($_POST['regex']) {
@ -410,7 +410,7 @@ class file_inspector {
$this->sendProgress($this->count['core']['num'],$this->totalFiles,FR_LAN_1);
$this->sendProgress(vartrue($this->count['core']['num']),$this->totalFiles,FR_LAN_1);
foreach ($list as $key => $value)
{
@ -431,7 +431,7 @@ class file_inspector {
}
else
{
$this->sendProgress($this->count['core']['num'],$this->totalFiles,FR_LAN_1);
$this->sendProgress(vartrue($this->count['core']['num']),$this->totalFiles,FR_LAN_1);
$path = $dir.'/'.$key;
$fid = strtolower($key);
@ -1208,7 +1208,7 @@ function sh(showid) {
</script>
<style type='text/css'>
<!--\n";
if ($_POST['regex']) {
if (vartrue($_POST['regex'])) {
$text .= ".f { padding: 1px 0px 1px 8px; vertical-align: bottom; width: 90% }\n";
} else {
$text .= ".f { padding: 1px 0px 1px 8px; vertical-align: bottom; width: 90%; white-space: nowrap }\n";

6
e107_admin/image.php
View File

@ -40,7 +40,7 @@ if(isset($_POST['submit_cancel_show']))
include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
if($_GET['action'] == 'nav' && e_AJAX_REQUEST) //XXX Doesn't work correctly inside the class for some reason
if(vartrue($_GET['action']) == 'nav' && e_AJAX_REQUEST) //XXX Doesn't work correctly inside the class for some reason
{
define("e_IFRAME",true);
// require_once(e_ADMIN."auth.php");
@ -518,13 +518,13 @@ class media_form_ui extends e_admin_form_ui
return;
}
$tagid = $_GET['tagid'];
$tagid = vartrue($_GET['tagid']);
$path = $this->getController()->getListModel()->get('media_url');
$title = $this->getController()->getListModel()->get('media_name');
$id = $this->getController()->getListModel()->get('media_id');
$preview = basename($path);
$bbcode = ($_GET['bbcode']=='file') ? "file" : "";
$bbcode = (vartrue($_GET['bbcode']) == 'file') ? "file" : "";
// $save = ($_GET['bbcode']!='file') ? "e-dialog-save" : "";
// e-dialog-close
$text = $this->renderValue('options',$value,'',$id);

2
e107_admin/mailout.php
View File

@ -83,7 +83,7 @@ if (!getperms('W'))
$e_sub_cat = 'mail';
if($_GET['mode']=="progress")
if(vartrue($_GET['mode']) == "progress")
{
session_write_close();
sendProgress();

4
e107_admin/menus.php
View File

@ -116,7 +116,7 @@ if($_POST)
if ($message != "")
if (vartrue($message) != "")
{
echo $ns -> tablerender('Updated', "<div style='text-align:center'><b>".$message."</b></div><br /><br />");
}
@ -126,7 +126,7 @@ if($_POST)
if (!isset($_GET['configure']))
{
$men->menuScanMenus();
$text .= $men->menuRenderMessage();
$text = $men->menuRenderMessage();
$text .= $men->menuSelectLayout();
$text .= $men->menuVisibilityOptions();
$text .= $men->menuInstanceParameters();

38
e107_admin/newspost.php
View File

@ -24,7 +24,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
// ------------------------------
// done in class2: require_once(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_admin.php"); // maybe this should be put in class2.php when 'admin' is detected.
$newspost = new admin_newspost(e_QUERY, $pst);
$newspost = new admin_newspost(e_QUERY, vartrue($pst));
e107::setRegistry('_newspost_admin', $newspost);
$gen = new convert();
@ -1931,7 +1931,7 @@ class admin_newspost
<tr>
<td>".NWSLAN_12.":</td>
<td>
<input type='text' name='news_title' value=\"". $tp->post_toForm($_POST['news_title'])."\" class='tbox' style='width:90%' required='required' />
<input type='text' name='news_title' value=\"". $tp->post_toForm(vartrue($_POST['news_title']))."\" class='tbox' style='width:90%' required='required' />
".
// TOO short -> $frm->text('news_title', $tp->post_toForm($_POST['news_title']),200,array('size'=>300)).
"
@ -1941,7 +1941,7 @@ class admin_newspost
<tr>
<td>".LAN_NEWS_27.":</td>
<td>
<input type='text' name='news_summary' value=\"". $tp->post_toForm($_POST['news_summary'])."\" class='tbox' style='width:90%' />
<input type='text' name='news_summary' value=\"". $tp->post_toForm(vartrue($_POST['news_summary']))."\" class='tbox' style='width:90%' />
".
// $frm->text('news_summary', $tp->post_toForm($_POST['news_summary']), 250).
"
@ -1955,7 +1955,7 @@ class admin_newspost
";
//XXX multiple-selections at once. (comma separated) - working
$text .= $frm->selectbox('news_render_type', $this->news_renderTypes, $_POST['news_render_type'], "multiple=1",array(NWSLAN_74))."
$text .= $frm->selectbox('news_render_type', $this->news_renderTypes, vartrue($_POST['news_render_type']), "multiple=1",array(NWSLAN_74))."
<div class='field-help'>
".NWSLAN_74."
</div>
@ -2003,7 +2003,7 @@ class admin_newspost
$sql->db_Select_gen($qry);
while($row = $sql->db_Fetch())
{
if($_POST['news_author'])
if(vartrue($_POST['news_author']))
{
$sel = ($_POST['news_author'] == $row['user_id']);
}
@ -2033,13 +2033,13 @@ class admin_newspost
<li><a href='#news-extended-container'>".NWSLAN_14."</a></li>
</ul>";
$val = (strstr($tp->post_toForm($_POST['news_body']), "[img]http") ? $tp->post_toForm($_POST['news_body']) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_body'])));
$val = (strstr($tp->post_toForm(vartrue($_POST['news_body'])), "[img]http") ? $tp->post_toForm(vartrue($_POST['news_body'])) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_body'])));
$text .= "<div id='news-body-container' class='e-tab'>";
$text .= $frm->bbarea('news_body', $val, 'news', 'news');
$text .= "</div><div id='news-extended-container' class='t-container'>";
$val = (strstr($tp->post_toForm($_POST['news_extended']), "[img]http") ? $tp->post_toForm($_POST['news_extended']) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_extended'])));
$val = (strstr($tp->post_toForm(vartrue($_POST['news_extended'])), "[img]http") ? $tp->post_toForm($_POST['news_extended']) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_extended'])));
$text .= $frm->bbarea('news_extended', $val, 'extended', 'news','large');
$text .= "</div>
@ -2124,14 +2124,14 @@ class admin_newspost
<tr>
<td>Friendly URL string: </td>
<td>
".$frm->text('news_sef', $tp->post_toForm($_POST['news_sef']), 255)."
".$frm->text('news_sef', $tp->post_toForm(vartrue($_POST['news_sef'])), 255)."
<div class='field-help'>If left empty will be automatically created from current News Title based on your current <a href='".e_ADMIN_ABS."eurl.php?mode=main&amp;action=settings' title='To URL settings area' rel='external'>URL settings</a></div>
</td>
</tr>
<tr>
<td>".LAN_KEYWORDS.": </td>
<td>".$frm->tags('news_meta_keywords', $tp->post_toForm($_POST['news_meta_keywords']), 255)."
<td>".$frm->tags('news_meta_keywords', $tp->post_toForm(vartrue($_POST['news_meta_keywords'])), 255)."
<div class='field-help'>Keywords/tags associated to associate with this news item</div>
</td>
@ -2140,7 +2140,7 @@ class admin_newspost
<tr>
<td>Meta description: </td>
<td>".$frm->textarea('news_meta_description', $tp->post_toForm($_POST['news_meta_description']), 7)."</td>
<td>".$frm->textarea('news_meta_description', $tp->post_toForm(vartrue($_POST['news_meta_description'])), 7)."</td>
</tr>
</tbody>
</table>
@ -2160,8 +2160,8 @@ class admin_newspost
<tr>
<td>".NWSLAN_15.":</td>
<td>
".$frm->radio('news_allow_comments', 0, !$_POST['news_allow_comments'])."".$frm->label(LAN_ENABLED, 'news_allow_comments', 0)."&nbsp;&nbsp;
".$frm->radio('news_allow_comments', 1, $_POST['news_allow_comments'])."".$frm->label(LAN_DISABLED, 'news_allow_comments', 1)."
".$frm->radio('news_allow_comments', 0, !vartrue($_POST['news_allow_comments']))."".$frm->label(LAN_ENABLED, 'news_allow_comments', 0)."&nbsp;&nbsp;
".$frm->radio('news_allow_comments', 1, vartrue($_POST['news_allow_comments']))."".$frm->label(LAN_DISABLED, 'news_allow_comments', 1)."
<div class='field-help'>
".NWSLAN_18."
</div>
@ -2176,9 +2176,9 @@ class admin_newspost
";
$text .= $frm->datepicker("news_start",$_POST['news_start'],"type=datetime");
$text .= $frm->datepicker("news_start",vartrue($_POST['news_start']),"type=datetime");
$text .= " - ";
$text .= $frm->datepicker("news_end",$_POST['news_end'],"type=datetime");
$text .= $frm->datepicker("news_end",vartrue($_POST['news_end']),"type=datetime");
$text .= "</div>
<div class='field-help'>
@ -2192,7 +2192,7 @@ class admin_newspost
<div class='field-spacer'>
";
$text .= $frm->datepicker("news_datestamp",$_POST['news_datestamp'],"type=datetime");
$text .= $frm->datepicker("news_datestamp",vartrue($_POST['news_datestamp']),"type=datetime");
$text .= "</div>";
/*
@ -2228,7 +2228,7 @@ class admin_newspost
<tr>
<td>".LAN_NEWS_28.":</td>
<td>
".$frm->checkbox('news_sticky', '1', $_POST['news_sticky']).$frm->label(LAN_NEWS_29, 'news_sticky', '1')."
".$frm->checkbox('news_sticky', '1', vartrue($_POST['news_sticky'])).$frm->label(LAN_NEWS_29, 'news_sticky', '1')."
<div class='field-help'>
".LAN_NEWS_30."
</div>
@ -2750,7 +2750,7 @@ class admin_newspost
<tr>
<td>".LAN_NEWS_51."</td>
<td>
".$frm->uc_select('news_editauthor', $pref['news_editauthor'], 'nobody,main,admin,classes')."
".$frm->uc_select('news_editauthor', vartrue($pref['news_editauthor']), 'nobody,main,admin,classes')."
</td>
</tr>
<tr>
@ -2791,7 +2791,7 @@ class admin_newspost
<td>".NWSLAN_113."</td>
<td>
<div class='auto-toggle-area autocheck'>
".$frm->checkbox_switch('news_unstemplate', '1', $pref['news_unstemplate'])."
".$frm->checkbox_switch('news_unstemplate', '1', vartrue($pref['news_unstemplate']))."
<div class='field-help'>".NWSLAN_114."</div>
</div>
</td>
@ -2799,7 +2799,7 @@ class admin_newspost
<tr>
<td>".NWSLAN_120."</td>
<td>
".$frm->bbarea('news_subheader', stripcslashes($pref['news_subheader']), 2, 'helpb')."
".$frm->bbarea('news_subheader', stripcslashes(vartrue($pref['news_subheader'])), 2, 'helpb')."
</td>
</tr>
</tbody>

4
e107_admin/plugin.php
View File

@ -861,14 +861,14 @@ class pluginManager{
$text = "
<form action='".e_SELF."?".e_QUERY."' id='core-plugin-list-form' method='post'>
<fieldset id='core-plugin-list'>
<legend class='e-hideme'>".$caption."</legend>
<legend class='e-hideme'>".vartrue($caption)."</legend>
<table class='table adminlist'>
".$frm->colGroup($this->fields,$this->fieldpref).
$frm->thead($this->fields,$this->fieldpref)."
<tbody>
";
if($pluginRenderPlugin)
if(vartrue($pluginRenderPlugin))
{
$text .= $pluginRenderPlugin;
}

6
e107_admin/prefs.php
View File

@ -813,17 +813,17 @@ $text .= "
switch ($k) {
case 'enabled':
$eopt = array('class'=>'e-expandit');
$text .= $frm->radio_switch('social_login['.$prov.'][enabled]', $pref['social_login'][$prov]['enabled'],'','',$eopt);
$text .= $frm->radio_switch('social_login['.$prov.'][enabled]', vartrue($pref['social_login'][$prov]['enabled']),'','',$eopt);
break;
case 'keys':
// $cls = vartrue($pref['single_login'][$prov]['keys'][$tk]) ? "class='e-hideme'" : '';
$sty = vartrue($pref['social_login'][$prov]['keys'][$tk]) ? "" : "display:none";
$sty = vartrue($pref['social_login'][$prov]['keys'][vartrue($tk)]) ? "" : "display:none";
$text .= "<div id='option-{$prov}' style='padding:10px;{$sty}'>";
foreach($v as $tk=>$idk)
{
$opt['placeholder'] = $tk;
$text .= "<br />".$frm->text('social_login['.$prov.'][keys]['.$tk.']', $pref['social_login'][$prov]['keys'][$tk],100,$opt);
$text .= "<br />".$frm->text('social_login['.$prov.'][keys]['.$tk.']', vartrue($pref['social_login'][$prov]['keys'][$tk]),100,$opt);
}
$text .= "</div>";

4
e107_admin/search.php
View File

@ -67,7 +67,7 @@ if (!isset($search_prefs['boundary']))
$save_search = TRUE;
}
if ($save_search)
if (vartrue($save_search))
{
$serialpref = addslashes(serialize($search_prefs));
$sql -> db_Update("core", "e107_value='".$serialpref."' WHERE e107_name='search_prefs'");
@ -407,7 +407,7 @@ else
<select name='plug_handlers[".$plug_dir."][order]' class='tbox select order'>
";
for($a = 1; $a <= $handlers_total; $a++) {
$text .= ($search_prefs['plug_handlers'][$plug_dir]['order'] == $a) ? "<option value='".$a."' selected='selected'>".$a."</option>" : "<option value='".$a."'>".$a."</option>";
$text .= (vartrue($search_prefs['plug_handlers'][$plug_dir]['order']) == $a) ? "<option value='".$a."' selected='selected'>".$a."</option>" : "<option value='".$a."'>".$a."</option>";
}
$text .= "
</select>

6
e107_admin/theme.php
View File

@ -103,17 +103,17 @@ else {
$mode = (e_QUERY) ? e_QUERY :"main" ;
if($_POST['selectadmin'])
if(vartrue($_POST['selectadmin']))
{
$mode = "admin";
}
if($_POST['upload'])
if(vartrue($_POST['upload']))
{
$mode = "choose";
}
if($_POST['selectmain'] || varset($_POST['setUploadTheme']))
if(vartrue($_POST['selectmain']) || varset($_POST['setUploadTheme']))
{
$mode = "main";
}

2
e107_admin/ugflag.php
View File

@ -103,7 +103,7 @@ $text .= "
</td>
<td>
".$frm->bbarea('maintainance_text', $pref['maintainance_text'], 'maintenance', 'maintenance_bbhelp')."
".$frm->bbarea('maintainance_text', vartrue($pref['maintainance_text']), 'maintenance', 'maintenance_bbhelp')."
<div class='field-help'>".UGFLAN_6."</div>
</td>
</tr>

116
e107_admin/update_routines.php
View File

@ -20,7 +20,7 @@
/**
* @package e107
* @subpackage admin
* @version $Id$;
* @version $Id$;
*
* Update routines from older e107 versions to current.
*
@ -306,8 +306,8 @@ function update_706_to_800($type='')
// List of DB tables newly required (defined in core_sql.php) (The existing dblog table gets renamed)
// No Longer required. - automatically checked against core_sql.php.
// $new_tables = array('audit_log', 'dblog', 'news_rewrite', 'core_media', 'core_media_cat','cron', 'mail_recipients', 'mail_content');
// List of core prefs that need to be converted from serialized to e107ArrayStorage.
// List of core prefs that need to be converted from serialized to e107ArrayStorage.
$serialized_prefs = array("'emote'", "'menu_pref'", "'search_prefs'", "'emote_default'");
@ -324,7 +324,7 @@ function update_706_to_800($type='')
// List of changed DB tables (defined in core_sql.php)
// No Longer required. - automatically checked against core_sql.php.
// (primarily those which have changed significantly; for the odd field write some explicit code - it'll run faster)
// $changed_tables = array('user', 'dblog', 'admin_log', 'userclass_classes', 'banlist', 'menus',
// $changed_tables = array('user', 'dblog', 'admin_log', 'userclass_classes', 'banlist', 'menus',
// 'plugin', 'news', 'news_category', 'online', 'page', 'links', 'comments');
@ -332,7 +332,7 @@ function update_706_to_800($type='')
// key = plugin directory name. Data = comma-separated list of tables to check
// (primarily those which have changed significantly; for the odd field write some explicit code - it'll run faster)
// No Longer required. - automatically checked by db-verify
/* $pluginChangedTables = array('linkwords' => 'linkwords',
/* $pluginChangedTables = array('linkwords' => 'linkwords',
'featurebox' => 'featurebox',
'links_page' => 'links_page',
'poll' => 'polls',
@ -340,7 +340,7 @@ function update_706_to_800($type='')
);
*/
/*
/*
$setCorePrefs = array( //modified prefs during upgrade.
'adminstyle' => 'infopanel',
'admintheme' => 'bootstrap',
@ -357,16 +357,16 @@ function update_706_to_800($type='')
$do_save = TRUE;
// List of changed menu locations.
// List of changed menu locations.
$changeMenuPaths = array(
array('oldpath' => 'siteinfo_menu', 'newpath' => 'siteinfo', 'menu' => 'sitebutton_menu'),
array('oldpath' => 'siteinfo_menu', 'newpath' => 'siteinfo', 'menu' => 'compliance_menu'),
array('oldpath' => 'siteinfo_menu', 'newpath' => 'siteinfo', 'menu' => 'powered_by_menu'),
array('oldpath' => 'siteinfo_menu', 'newpath' => 'siteinfo', 'menu' => 'sitebutton_menu'),
array('oldpath' => 'siteinfo_menu', 'newpath' => 'siteinfo', 'menu' => 'counter_menu'),
array('oldpath' => 'siteinfo_menu', 'newpath' => 'siteinfo', 'menu' => 'latestnews_menu'),
array('oldpath' => 'siteinfo_menu', 'newpath' => 'siteinfo', 'menu' => 'latestnews_menu'),
array('oldpath' => 'compliance_menu', 'newpath' => 'siteinfo', 'menu' => 'compliance_menu'),
array('oldpath' => 'powered_by_menu', 'newpath' => 'siteinfo', 'menu' => 'powered_by_menu'),
array('oldpath' => 'sitebutton_menu', 'newpath' => 'siteinfo', 'menu' => 'sitebutton_menu'),
@ -377,7 +377,7 @@ function update_706_to_800($type='')
array('oldpath' => 'other_news_menu', 'newpath' => 'news', 'menu' => 'other_news_menu'),
array('oldpath' => 'other_news_menu', 'newpath' => 'news', 'menu' => 'other_news2_menu')
);
);
// List of DB tables (key) and field (value) which need changing to accommodate IPV6 addresses
@ -395,7 +395,7 @@ function update_706_to_800($type='')
if (!$just_check)
{
foreach($setCorePrefs as $k=>$v)
foreach(vartrue($setCorePrefs) as $k=>$v)
{
$pref[$k] = $v;
}
@ -615,32 +615,32 @@ function update_706_to_800($type='')
// Add index to download history
// Deprecated by db-verify-class
// if (FALSE !== ($temp = addIndexToTable('download_requests', 'download_request_datestamp', $just_check, $updateMessages)))
// {
// if ($just_check)
// {
// return update_needed($temp);
// }
// if (FALSE !== ($temp = addIndexToTable('download_requests', 'download_request_datestamp', $just_check, $updateMessages)))
// {
// if ($just_check)
// {
// return update_needed($temp);
// }
// }
// Extra index to tmp table
// Deprecated by db-verify-class
// if (FALSE !== ($temp = addIndexToTable('tmp', 'tmp_time', $just_check, $updateMessages)))
// {
// if ($just_check)
// {
// return update_needed($temp);
// }
// if (FALSE !== ($temp = addIndexToTable('tmp', 'tmp_time', $just_check, $updateMessages)))
// {
// if ($just_check)
// {
// return update_needed($temp);
// }
// }
// Extra index to rss table (if used)
// Deprecated by db-verify-class
// if (FALSE !== ($temp = addIndexToTable('rss', 'rss_name', $just_check, $updateMessages, TRUE)))
// {
// if ($just_check)
// {
// return update_needed($temp);
// }
// if (FALSE !== ($temp = addIndexToTable('rss', 'rss_name', $just_check, $updateMessages, TRUE)))
// {
// if ($just_check)
// {
// return update_needed($temp);
// }
// }
// Front page prefs (logic has changed)
@ -1070,8 +1070,8 @@ function update_706_to_800($type='')
// $_pdateMessages[] = LAN_UPDATE_XX24;
// catch_error($sql);
}
//-- Media-manger import --------------------------------------------------
@ -1196,11 +1196,11 @@ function update_706_to_800($type='')
}
$count = $sql->db_Select_gen("SELECT * FROM `#core_media_cat` WHERE `media_cat_owner` = '_common' LIMIT 1 ");
if($count != 1)
if($count != 1)
{
if ($just_check) return update_needed('Add Media-Manager Categories and Import existing images.');
@ -1220,9 +1220,9 @@ function update_706_to_800($type='')
mysql_query("INSERT INTO `".MPREFIX."core_media_cat` VALUES(0, 'news', 'news_thumb', 'News Thumbnails (Legacy)', 'Legacy news thumbnails. ', 253, '', 1);");
$med->import('news_thumb', e_IMAGE.'newspost_images',"^thumb_");
$med->import('news',e_IMAGE.'newspost_images');
$med->import('page',e_IMAGE.'custom');
$med->import('news',e_IMAGE.'newspost_images');
$med->import('page',e_IMAGE.'custom');
}
// Check for Legacy Download Images.
@ -1267,35 +1267,35 @@ function update_706_to_800($type='')
$count = $sql->db_Select_gen("SELECT * FROM `#core_media_cat` WHERE media_cat_owner='_icon' ");
$count = $sql->db_Select_gen("SELECT * FROM `#core_media_cat` WHERE media_cat_owner='_icon' ");
if(!$count)
{
if ($just_check) return update_needed('Add icons to media-manager');
if(!$count)
{
if ($just_check) return update_needed('Add icons to media-manager');
$query = "INSERT INTO `".MPREFIX."core_media_cat` (`media_cat_id`, `media_cat_owner`, `media_cat_category`, `media_cat_title`, `media_cat_diz`, `media_cat_class`, `media_cat_image`, `media_cat_order`) VALUES
(0, '_icon', '_icon_16', 'Icons 16px', 'Available where icons are used in admin. ', 253, '', 0),
(0, '_icon', '_icon_32', 'Icons 32px', 'Available where icons are used in admin. ', 253, '', 0),
(0, '_icon', '_icon_48', 'Icons 48px', 'Available where icons are used in admin. ', 253, '', 0),
(0, '_icon', '_icon_64', 'Icons 64px', 'Available where icons are used in admin. ', 253, '', 0);
";
";
if(!mysql_query($query))
{
// echo "mysyql error";
// error or already exists.
}
if(!mysql_query($query))
{
// echo "mysyql error";
// error or already exists.
}
$med->importIcons(e_PLUGIN);
$med->importIcons(e_PLUGIN);
$med->importIcons(e_IMAGE."icons/");
$med->importIcons(e_THEME.$pref['sitetheme']."/images/");
e107::getMessage()->addDebug("Icon category added");
}
// Any other images should be imported manually via Media Manager batch-import.
$med->importIcons(e_THEME.$pref['sitetheme']."/images/");
e107::getMessage()->addDebug("Icon category added");
}
// Any other images should be imported manually via Media Manager batch-import.
// ------------------------------------------------------------------
@ -1561,7 +1561,7 @@ function catch_error(&$target)
function get_default_prefs()
{
$xmlArray = e107::getSingleton('xmlClass')->loadXMLfile(e_CORE."xml/default_install.xml",'advanced');
$xmlArray = e107::getSingleton('xmlClass')->loadXMLfile(e_CORE."xml/default_install.xml",'advanced');
$pref = e107::getSingleton('xmlClass')->e107ImportPrefs($xmlArray,'core');
return $pref;
}

2
e107_admin/userclass2.php
View File

@ -936,7 +936,7 @@ class uclass_manager
}
else
{
$text .= "<form method='post' action='".e_SELF."?".e_QUERY."'>
$text = "<form method='post' action='".e_SELF."?".e_QUERY."'>
<fieldset id='core-userclass-list'>
<legend class='e-hideme'>".UCSLAN_5."</legend>
<table class='table adminlist'>".

2417
e107_admin/users.php
View File

File diff suppressed because it is too large Load Diff

8
e107_admin/wmessage.php
View File

@ -34,7 +34,7 @@ require_once(e_HANDLER."ren_help.php");
$rs = new form;
$frm = new e_form;
$action == '';
vartrue($action) == '';
if (e_QUERY)
{
$tmp = explode('.', e_QUERY);
@ -170,14 +170,14 @@ if ($action == "create" || $action == "edit")
<tr>
<td>".WMLAN_10."</td>
<td>
<input type='text' class='tbox' id='wm_caption' name='wm_caption' maxlength='80' style='width:95%' value=\"".$tp->toForm($row['gen_ip'])."\" />
<input type='text' class='tbox' id='wm_caption' name='wm_caption' maxlength='80' style='width:95%' value=\"".$tp->toForm(vartrue($row['gen_ip']))."\" />
</td>
</tr>";
$text .= "<tr>
<td>".WMLAN_04."</td>
<td>
<textarea class='e-wysiwyg tbox' id='data' name='data' cols='70' rows='15' style='width:95%' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this)'>".$tp->toForm($row['gen_chardata'])."</textarea>
<textarea class='e-wysiwyg tbox' id='data' name='data' cols='70' rows='15' style='width:95%' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this)'>".$tp->toForm(vartrue($row['gen_chardata']))."</textarea>
<br />";
$text .= display_help("helpb", "admin");
@ -187,7 +187,7 @@ if ($action == "create" || $action == "edit")
</td>
</tr>
<tr><td>".WMLAN_03."</td>
<td>".r_userclass("wm_active", $row['gen_intdata'], "off", "public,guest,nobody,member,admin,classes")."</td></tr>
<td>".r_userclass("wm_active", vartrue($row['gen_intdata']), "off", "public,guest,nobody,member,admin,classes")."</td></tr>
</table>";
$text .= "

4
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@ -321,9 +321,9 @@ class admin_shortcodes
$comments_pending = $sql -> db_Count("comments", "(*)", "WHERE comment_blocked = 2 ");
$text = "<div class='left'><div style='padding-bottom: 2px;'>".E_16_NEWS.($submitted_news ? " <a href='".e_ADMIN."newspost.php?mode=sub&amp;action=list'>".ADLAN_LAT_2.": $submitted_news</a>" : ' '.ADLAN_LAT_2.': 0').'</div>';
$text .= "<div style='padding-bottom: 2px;'>".E_16_COMMENT.($comments_pending ? " <a href='".e_ADMIN_ABS."comment.php?searchquery=&filter_options=comment_blocked__2'>".ADLAN_LAT_9.": $comments_pending</a>" : " ".ADLAN_LAT_9.": ".$comments_pending)."</div>";
$text .= "<div style='padding-bottom: 2px;'>".E_16_COMMENT. " <a href='".e_ADMIN_ABS."comment.php?searchquery=&filter_options=comment_blocked__2'>".ADLAN_LAT_9.": $comments_pending</a></div>";
$text .= "<div style='padding-bottom: 2px;'>".E_16_UPLOADS.($active_uploads ? " <a href='".e_ADMIN."upload.php'>".ADLAN_LAT_7.": $active_uploads</a>" : ' '.ADLAN_LAT_7.': '.$active_uploads).'</div>';
$text .= "<div style='padding-bottom: 2px;'>".E_16_UPLOADS." <a href='".e_ADMIN."upload.php'>".ADLAN_LAT_7.": $active_uploads</a></div>";
// for BC only.

4
e107_core/shortcodes/batch/bbcode_shortcodes.php
View File

@ -252,11 +252,11 @@ class bbcode_shortcodes extends e_shortcode
$emote = ",".$emote;
}
$text = "onclick=\"{$func}('".$func_var."'{$emote})\" ";
$bbcode_help = $this->var['hint_func'];
$bbcode_help = vartrue($this->var['hint_func']);
$bbcode_tag = $this->var['tagid'];
$_helptxt = $hint_diz;
// onclick="addtext('[justify][/justify]')" onmouseout="help('','admin')" onmouseover="help('Justify align: [justify]This text will be justified[/justify]','admin')">
$text .= ($this->var['hint_active'] ? "onmouseout=\"{$bbcode_help}('','{$bbcode_tag}')\" onmouseover=\"{$bbcode_help}('".$_helptxt."','{$bbcode_tag}')\"" : "" );
$text .= (vartrue($this->var['hint_active']) ? "onmouseout=\"{$bbcode_help}('','{$bbcode_tag}')\" onmouseover=\"{$bbcode_help}('".$_helptxt."','{$bbcode_tag}')\"" : "" );
return $text;
}

4
e107_core/shortcodes/single/imageselector.php
View File

@ -71,8 +71,8 @@ function imageselector_shortcode($parm = '', $mod = '')
}
$multi = ($multiple == "TRUE" || $multiple == "1") ? " multiple='multiple' style='height:{$height}'" : ""; //style='float:left'
$width = ($width) ? $width : "0";
$height = ($height) ? $height : "0";
$width = (vartrue($width)) ? $width : "0";
$height = (vartrue($height)) ? $height : "0";
$label = ($label) ? $label : " -- -- ";
$tabindex = varset($tabindex) ? " tabindex='{$tabindex}'" : '';
$class = varset($class) ? " class='{$class}'" : " class='tbox imgselector'";

2
e107_core/shortcodes/single/nextprev.php
View File

@ -172,7 +172,7 @@ function nextprev_shortcode($parm = '')
$e_vars->caption = sprintf(defset($e_vars->caption, $e_vars->caption), $current_page, $total_pages);
// urldecoded by parse_str()
$pagetitle = explode('|',$parm['pagetitle']);
$pagetitle = explode('|', vartrue($parm['pagetitle']));
// new - bullet support
$bullet = vartrue($parm['bullet'], '');

2
e107_core/url/user/url.php
View File

@ -52,7 +52,7 @@ class core_user_url extends eUrlConfig
if(isset($params['user_id']) && !empty($params['user_id'])) $params['id'] = $params['user_id'];
$url = 'user.php';
$page = $params['page'] ? intval($params['page']) : '0';
$page = vartrue($params['page']) ? intval($params['page']) : '0';
if($route[0] == 'profile')
{

88
e107_core/xml/default_install.xml
View File

@ -232,10 +232,90 @@ City, State, Country
<core name="upload_class">255</core>
<core name="upload_enabled">0</core>
<core name="upload_maxfilesize"></core>
<core name="url_aliases"><![CDATA[array()]]></core>
<core name="url_config"><![CDATA[array()]]></core>
<core name="url_locations"><![CDATA[array()]]></core>
<core name="url_modules"><![CDATA[array()]]></core>
<core name='url_aliases'><![CDATA[array (
)]]></core>
<core name='url_config'><![CDATA[array (
'index' => 'core',
'news' => 'core',
'page' => 'core',
'search' => 'core',
'system' => 'core',
'user' => 'core',
'forum' => 'plugin',
'gallery' => 'plugin/rewrite',
'tagwords' => 'plugin',
)]]></core>
<core name='url_disable_pathinfo'>1</core>
<core name='url_error_redirect'>0</core>
<core name='url_locations'><![CDATA[array (
'index' =>
array (
0 => 'core',
),
'news' =>
array (
0 => 'core',
1 => 'core/sef_full',
2 => 'core/sef_noid',
3 => 'core/sef',
),
'page' =>
array (
0 => 'core',
1 => 'core/sef_noid',
2 => 'core/sef',
),
'search' =>
array (
0 => 'core',
1 => 'core/rewrite',
),
'system' =>
array (
0 => 'core',
1 => 'core/rewrite',
),
'user' =>
array (
0 => 'core',
1 => 'core/rewrite',
),
'forum' =>
array (
0 => 'plugin',
1 => 'plugin/rewrite',
),
'gallery' =>
array (
0 => 'plugin',
1 => 'plugin/rewrite',
),
'tagwords' =>
array (
0 => 'plugin',
),
)]]></core>
<core name='url_main_module'></core>
<core name='url_modules'><![CDATA[array (
'core' =>
array (
0 => 'index',
1 => 'news',
2 => 'page',
3 => 'search',
4 => 'system',
5 => 'user',
),
'plugin' =>
array (
0 => 'forum',
1 => 'gallery',
2 => 'tagwords',
),
'override' =>
array (
),
)]]></core>
<core name="url_sef_translate">dashl</core>
<core name="useGeshi">0</core>
<core name="use_coppa">1</core>

22
e107_handlers/admin_ui.php
View File

@ -138,7 +138,7 @@ class e_admin_request
$this->_id = intval($this->_request_qry[$this->_id_key]);
}
$this->_posted_qry = $_POST; //raw?
$this->_posted_qry =& $_POST; //raw?
return $this;
}
@ -183,10 +183,12 @@ class e_admin_request
if(null === $value)
{
unset($this->_request_qry[$key]);
unset($_GET[$key]);
return $this;
}
$this->_request_qry[$key] = $value;
$_GET[$key] = $value;
return $this;
}
@ -410,9 +412,10 @@ class e_admin_request
* @param string|array $merge_with [optional] override request values
* @param boolean $encode if true &amp; separator will be used, all values will be http encoded, default true
* @param string|array $exclude_from_query numeric array/comma separated list of vars to be excluded from current query, true - don't use current query at all
* @param boolean $keepSpecial don't exclude special vars as 'mode' and 'action'
* @return string url encoded query string
*/
public function buildQueryString($merge_with = array(), $encode = true, $exclude_from_query = '')
public function buildQueryString($merge_with = array(), $encode = true, $exclude_from_query = '', $keepSpecial = true)
{
$ret = $this->getQuery();
@ -430,7 +433,7 @@ class e_admin_request
{
foreach ($exclude_from_query as $var)
{
unset($ret[$var]);
if($keepSpecial && $var != $this->_action_key && $var != $this->_mode_key) unset($ret[$var]);
}
}
@ -3302,13 +3305,13 @@ class e_admin_controller_ui extends e_admin_controller
{
// disabled or system
if((vartrue($var['nolist']) && !vartrue($var['filter'])) || null === $var['type'])
if((vartrue($var['nolist']) && !vartrue($var['filter'])) || null === vartrue($var['type']))
{
continue;
}
// select FROM... for main table
if($var['alias'] && vartrue($var['__tableField']))
if(vartrue($var['alias']) && vartrue($var['__tableField']))
{
$tableSFieldsArr[] = $var['__tableField'];
}
@ -3853,9 +3856,8 @@ class e_admin_ui extends e_admin_controller_ui
$this->setPosted(array());
return; // always break on cancel!
}
// TODO - investigate - strange post vale of delete triggers, switched to key
// for quick fix
$id = intval(key($posted));//intval(array_shift($posted));
$id = intval(key($posted));
if($this->deleteConfirmScreen && !$this->getPosted('etrigger_delete_confirm'))
{
// forward data to delete confirm screen
@ -4251,7 +4253,7 @@ class e_admin_ui extends e_admin_controller_ui
}
if(vartrue($att['validate']))
{
$this->validationRules[$key] = array((true === $att['validate'] ? 'required' : $att['validate']), varset($att['rule']), $att['title'], varset($att['error'], $att['help']));
$this->validationRules[$key] = array((true === $att['validate'] ? 'required' : $att['validate']), varset($att['rule']), $att['title'], varset($att['error'], vartrue($att['help'])));
}
/*elseif(vartrue($att['check'])) could go?
{
@ -4344,7 +4346,7 @@ class e_admin_form_ui extends e_form
foreach($fields as $field => $foptions)
{
// check form custom methods
if($foptions['type'] === 'method' && method_exists('e_form', $field)) // check even if type is not method. - just in case of an upgrade later by 3rd-party.
if(vartrue($foptions['type']) === 'method' && method_exists('e_form', $field)) // check even if type is not method. - just in case of an upgrade later by 3rd-party.
{
e107::getMessage()->addError(sprintf(LAN_UI_FORM_METHOD_ERROR, $field));
$err = true;

4
e107_handlers/bbcode_handler.php
View File

@ -527,10 +527,10 @@ class e_bbcode
$data = array(
'tagid' => $id,
'template' => $template,
'trigger' => $addtextfunc,
'trigger' => vartrue($addtextfunc),
// 'hint_func' => $helpfunc, // unused
// 'hint_active' => $bbcode_helpactive, // unused
'size' => $helpsize
'size' => vartrue($helpsize)
);
$bbcode_shortcodes->setVars($data);

2
e107_handlers/comment_class.php
View File

@ -68,7 +68,7 @@ class comment
{
require_once(e107::coreTemplatePath('comment'));
}
elseif(!$COMMENT_TEMPLATE) // BC template.
elseif(!vartrue($COMMENT_TEMPLATE)) // BC template.
{
global $sc_style;
/*

2
e107_handlers/db_verify_class.php
View File

@ -89,7 +89,7 @@ class db_verify
function verify()
{
if($_POST['verify_table'])
if(vartrue($_POST['verify_table']))
{
$this->runComparison($_POST['verify_table']);

2
e107_handlers/e107_class.php
View File

@ -1387,7 +1387,7 @@ class e107
/**
* Retrieve User Perms (admin perms) handler singleton object
* @return comment
* @return e_userperms
*/
public static function getUserPerms()
{

56
e107_handlers/form_handler.php
View File

@ -203,7 +203,7 @@ class e_form
$options['class'] = 'tbox input-text';
}
}
$options = $this->format_options('text', $name, $options);
//never allow id in format name-value for text fields
return "<input type='text' name='{$name}' value='{$value}' maxlength='{$maxlength}'".$this->get_attributes($options, $name)." />";
@ -217,7 +217,7 @@ class e_form
if(!vartrue($parms['size'])) $parms['size'] = 15;
if(!vartrue($parms['class'])) $parms['class'] = 'tbox number e-spinner input-small';
if(!$value) $value = '0';
return $this->text($key, $value, $maxlength, $parms);
return $this->text(vartrue($key), $value, $maxlength, $parms);
}
function email($name, $value, $maxlength = 200, $options = array())
@ -280,10 +280,10 @@ class e_form
parse_str($extras);
if($bbcode) $cat .= '&amp;bbcode=1';
if(vartrue($bbcode)) $cat .= '&amp;bbcode=1';
if(!$mode) $mode = 'main';
if(!$action) $action = 'dialog';
if(!vartrue($mode)) $mode = 'main';
if(!vartrue($action)) $action = 'dialog';
// $tabs // TODO - option to choose which tabs to display.
@ -465,12 +465,12 @@ class e_form
}
//$width = intval(vartrue($sc_parameters['width'], 150));
$cat = $tp->toDB($sc_parameters['media']);
$cat = $tp->toDB(vartrue($sc_parameters['media']));
if($cat == '_icon')
{
$ret = "<div class='imgselector-container' style='display:block;width:64px;min-height:64px'>";
$thpath = isset($sc_parameters['nothumb']) || $hide ? $default : $default_thumb;
$thpath = isset($sc_parameters['nothumb']) || vartrue($hide) ? $default : $default_thumb;
$style = ($blank) ? "border:1px dashed black;width:64px;height:64px" : "border:1px dashed black";
$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='image-selector' style='{$style}' />";
@ -479,7 +479,7 @@ class e_form
{
$ret = "<div class='imgselector-container' style='display:block;width:120px;min-height:100px'>";
$att = 'aw=120&ah=100';
$thpath = isset($sc_parameters['nothumb']) || $hide ? $default : $tp->thumbUrl($default_thumb, $att, true);
$thpath = isset($sc_parameters['nothumb']) || vartrue($hide) ? $default : $tp->thumbUrl($default_thumb, $att, true);
$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='image-selector' style='width:120px;height:100px;border:1px dashed black;' />";
}
@ -716,11 +716,23 @@ class e_form
function password($name, $value = '', $maxlength = 50, $options = array())
{
if($options['generate'])
{
$addon .= '&nbsp;<a href="#" class="smalltext" id="Spn_PasswordGenerator" >Generate</a> | <a class="smalltext" href="#" id="showPwd">Show</a><br />';
}
if($options['strength'])
{
$addon .= "<div><div id='pwdColor' class='progress' style='float:left;display:inline-block;width:215px'><div class='bar' id='pwdMeter' style='width:0%' ></div></div> <div id='pwdStatus' class='smalltext' style='float:left;display:inline-block;width:150px;margin-left:5px'></span></div>";
}
$options = $this->format_options('text', $name, $options);
$options['class'] = vartrue($options['class'],'e-password');
//never allow id in format name-value for text fields
return "<input type='password' name='{$name}' value='{$value}' maxlength='{$maxlength}'".$this->get_attributes($options, $name)." />";
$text = "<input type='password' name='{$name}' value='{$value}' maxlength='{$maxlength}'".$this->get_attributes($options, $name)." />";
return $text.$addon;
}
// autoexpand done
@ -888,7 +900,7 @@ class e_form
$options_on = varset($options['enabled'],array());
$options_off = varset($options['disabled'],array());
if($options['class'] == 'e-expandit') // See admin->prefs 'Single Login' for an example.
if(vartrue($options['class']) == 'e-expandit') // See admin->prefs 'Single Login' for an example.
{
$options_on = array('class' => 'e-expandit-on');
$options_off = array('class' => 'e-expandit-off');
@ -971,7 +983,7 @@ class e_form
$option_array = array(1 => LAN_YES, 0 => LAN_NO);
}
if($options['multiple'])
if(vartrue($options['multiple']))
{
$name = (strpos($name, '[') === false) ? $name.'[]' : $name;
$selected = explode(",",$selected);
@ -1641,7 +1653,7 @@ class e_form
foreach ($fieldarray as $field => $data)
{
// shouldn't happen...
if(!isset($fieldvalues[$field]) && $data['alias'])
if(!isset($fieldvalues[$field]) && vartrue($data['alias']))
{
$fieldvalues[$data['alias']] = $fieldvalues[$data['field']];
$field = $data['alias'];
@ -1652,7 +1664,7 @@ class e_form
{
continue;
}
elseif($data['type'] != 'method' && !$data['forced'] && !isset($fieldvalues[$field]) && $fieldvalues[$field] !== NULL)
elseif(vartrue($data['type']) != 'method' && !$data['forced'] && !isset($fieldvalues[$field]) && $fieldvalues[$field] !== NULL)
{
$ret .= "
<td>
@ -1666,7 +1678,7 @@ class e_form
$tdclass = vartrue($data['class']);
if($field == 'checkboxes') $tdclass = $tdclass ? $tdclass.' autocheck e-pointer' : 'autocheck e-pointer';
// there is no other way for now - prepare user data
if('user' == $data['type']/* && isset($data['readParms']['idField'])*/)
if('user' == vartrue($data['type']) /* && isset($data['readParms']['idField'])*/)
{
if(is_string($data['readParms'])) parse_str($data['readParms'], $data['readParms']);
if(isset($data['readParms']['idField']))
@ -1738,7 +1750,7 @@ class e_form
{
case 'options':
if($attributes['type']=='method') // Allow override with 'options' function.
if($attributes['type'] == "method") // Allow override with 'options' function.
{
$attributes['mode'] = "read";
if(isset($attributes['method']) && $attributes['method'] && method_exists($this, $attributes['method']))
@ -1865,7 +1877,7 @@ class e_form
$opts = $wparms['__options'];
unset($wparms['__options']);
if($opts['multiple'] || $attributes['data']=='comma')
if(vartrue($opts['multiple']) || vartrue($attributes['data']) == 'comma')
{
$ret = array();
$value = is_array($value) ? $value : explode(',', $value);
@ -2222,7 +2234,7 @@ class e_form
case 'textarea':
$text = "";
if($parms['append']) // similar to comments - TODO TBD. a 'comment' field type may be better.
if(vartrue($parms['append'])) // similar to comments - TODO TBD. a 'comment' field type may be better.
{
$attributes['readParms'] = 'bb=1';
$text = $this->renderValue($key, $value, $attributes).$this->hidden($key, $value).'<br />';
@ -2351,7 +2363,7 @@ class e_form
$uc_options = vartrue($parms['classlist'], 'public,guest,nobody,member,admin,main,classes'); // defaults to 'public,guest,nobody,member,classes' (userclass handler)
unset($parms['classlist']);
$method = ($attributes['type'] == 'userclass') ? 'uc_select' : 'uc_select';
if($atrributes['type'] == 'userclasses'){ $parms['multiple'] = true; }
if(vartrue($atrributes['type']) == 'userclasses'){ $parms['multiple'] = true; }
$ret = $this->$method($key, $value, $uc_options, vartrue($parms, array()));
break;
@ -2500,7 +2512,7 @@ class e_form
$asc = strtoupper(vartrue($options['asc'], 'asc'));
$elid = $fid;//$options['id'];
$query = isset($options['query']) ? $options['query'] : e_QUERY ;
if($_GET['action'] == 'list')
if(vartrue($_GET['action']) == 'list')
{
$query = e_QUERY; //XXX Quick fix for loss of pagination after 'delete'.
}
@ -2692,7 +2704,7 @@ class e_form
foreach($fdata['fields'] as $key => $att)
{
// convert aliases - not supported in edit mod
if($att['alias'] && !$model->hasData($key))
if(vartrue($att['alias']) && !$model->hasData($key))
{
$key = $att['field'];
}
@ -2715,7 +2727,7 @@ class e_form
}
// type null - system (special) fields
if($att['type'] !== null && !vartrue($att['noedit']) && $key != $model->getFieldIdName())
if(vartrue($att['type']) !== null && !vartrue($att['noedit']) && $key != $model->getFieldIdName())
{
$required = '';
$required_class = '';
@ -2749,7 +2761,7 @@ class e_form
$text .= "
<tr>
<td>
".$required."<span{$required_class}>".defset($att['title'], $att['title'])."</span>".$label."
".$required."<span{$required_class}>".defset(vartrue($att['title']), vartrue($att['title']))."</span>".$label."
</td>
<td>
".$this->renderElement($keyName, $model->getIfPosted($valPath), $att, varset($model_required[$key], array()))."

23
e107_handlers/menumanager_class.php
View File

@ -68,7 +68,7 @@ class e_menuManager {
$this->dbLayout = ($this->curLayout != $pref['sitetheme_deflayout']) ? $this->curLayout : ""; //menu_layout is left blank when it's default.
if(isset($_POST['menu_id']) || $_GET['id'])
if(isset($_POST['menu_id']) || vartrue($_GET['id']))
{
$this->menuId = (isset($_POST['menu_id'])) ? intval($_POST['menu_id']) : intval($_GET['id']);
}
@ -82,7 +82,7 @@ class e_menuManager {
$this->menuSaveParameters();
}
if ($_GET['mode'] == "deac")
if (vartrue($_GET['mode']) == "deac")
{
$this->menuDeactivate();
}
@ -112,7 +112,7 @@ class e_menuManager {
$this->menuModify();
if($_POST['menuActivate'])
if(vartrue($_POST['menuActivate']))
{
$this->menuActivateLoc = key($_POST['menuActivate']);
$this->menuActivateIds = $_POST['menuselect'];
@ -120,7 +120,7 @@ class e_menuManager {
}
if($_POST['menuSetCustomPages'])
if(vartrue($_POST['menuSetCustomPages']))
{
$this->menuSetCustomPages($_POST['custompages']);
}
@ -147,7 +147,7 @@ class e_menuManager {
$cnt = $sql->db_Select("menus", "*", "menu_location > 0 AND menu_layout = '$curLayout' ORDER BY menu_name "); // calculate height to remove vertical scroll-bar.
$text .= "<object type='text/html' id='menu_iframe' data='".$url."' width='100%' style='overflow:auto;width: 100%; height: ".(($cnt*90)+600)."px; border: 0px' ></object>";
$text = "<object type='text/html' id='menu_iframe' data='".$url."' width='100%' style='overflow:auto;width: 100%; height: ".(($cnt*90)+600)."px; border: 0px' ></object>";
return $text;
}
@ -427,7 +427,7 @@ class e_menuManager {
}
}
$this->menuAddMessage($message, E_MESSAGE_INFO);
$this->menuAddMessage(vartrue($message), E_MESSAGE_INFO);
}
@ -454,7 +454,7 @@ class e_menuManager {
*/
function menuInstanceParameters()
{
if(!$_GET['parmsId']) return;
if(!vartrue($_GET['parmsId'])) return;
$id = intval($_GET['parmsId']);
$frm = e107::getForm();
$sql = e107::getDb();
@ -494,7 +494,7 @@ class e_menuManager {
function menuVisibilityOptions()
{
if(!$_GET['vis']) return;
if(!vartrue($_GET['vis'])) return;
global $sql,$ns,$frm;
require_once(e_HANDLER."userclass_class.php");
@ -899,11 +899,12 @@ class e_menuManager {
//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------//
function menuSelectLayout()
{
global $rs, $pref;
global $rs;
$pref = e107::getPref();
// onchange=\"urljump(this.options[selectedIndex].value);\"
$text .= "<form method='post' action='".e_SELF."?configure=".$this->curLayout."'>";
$text = "<form method='post' action='".e_SELF."?configure=".$this->curLayout."'>";
$text .= "<div class='buttons-bar center'>".MENLAN_30." ";
$text .= "<select name='custom_select' id='menuManagerSelect' >\n"; // window.frames['menu_iframe'].location=this.options[selectedIndex].value ???
@ -1364,7 +1365,7 @@ class e_menuManager {
}
}
$pref['menuconfig_list'] = $tmp;
$pref['menuconfig_list'] = vartrue($tmp);
save_prefs();
}
} // end of Class.

70
e107_handlers/mysql_class.php
View File

@ -341,25 +341,37 @@ class e_db_mysql
* // Get single row set, $multi and indexField are ignored
* $array = e107::getDb()->retrieve('user', 'user_email, user_name', 'user_id=1');
*
* // Fetch all, don't append WHERE to the query, index by user_id
* $array = e107::getDb()->retrieve('user', 'user_id, user_email, user_name', 'ORDER BY user_email LIMIT 0,20', true, true, 'user_id');
* // Fetch all, don't append WHERE to the query, index by user_id, noWhere auto detected (string starts with upper case ORDER)
* $array = e107::getDb()->retrieve('user', 'user_id, user_email, user_name', 'ORDER BY user_email LIMIT 0,20', true, 'user_id');
*
* // Same as above but retrieve() is only used to fetch, not useable for single return value
* if(e107::getDb()->select('user', 'user_id, user_email, user_name', 'ORDER BY user_email LIMIT 0,20', true))
* {
* $array = e107::getDb()->retrieve(false, '', '', false, true, 'user_id');
* $array = e107::getDb()->retrieve(null, null, null, true, 'user_id');
* }
*
* // Using whole query example, in this case default mode is 'single'
* $array = e107::getDb()->retrieve('SELECT
* p.*, u.user_email, u.user_name FROM `#user` AS u
* LEFT JOIN `#myplug_table` AS p ON p.myplug_table=u.user_id
* ORDER BY u.user_email LIMIT 0,20'
* );
*
* // Using whole query example, multi mode - $fields argument mapped to $multi
* $array = e107::getDb()->retrieve('SELECT u.user_email, u.user_name FROM `#user` AS U ORDER BY user_email LIMIT 0,20', true);
*
* // Using whole query example, multi mode with index field
* $array = e107::getDb()->retrieve('SELECT u.user_email, u.user_name FROM `#user` AS U ORDER BY user_email LIMIT 0,20', null, null, true, 'user_id');
* </code>
*
* @param string $table if empty, enter fetch only mode
* @param string $fields comma separated list of fields or * or single field name (get one)
* @param string $fields comma separated list of fields or * or single field name (get one); if $fields is of type boolean and $where is not found, $fields overrides $multi
* @param string $where WHERE/ORDER/LIMIT etc clause, empty to disable
* @param boolean $noWhere if true $where doesn't contain any WHERE clause (e.g. ORDER/LIMIT only), don't prepare WHERE
* @param boolean $multi if true, fetch all (multi mode)
* @param string $indexField field name to be used for indexing when in multi mode
* @param boolean $debug
*/
public function retrieve($table, $fields = '*', $where=null, $noWhere = false, $multi = false, $indexField = null)
public function retrieve($table, $fields = null, $where=null, $multi = false, $indexField = null, $debug = false)
{
// fetch mode
if(empty($table))
@ -377,20 +389,47 @@ class e_db_mysql
// detect mode
$mode = 'one';
if('*' !== $fields && strpos($fields, ',') === false)
if($table && !$where && is_bool($fields))
{
// table is the query, fields used for multi
if($fields) $mode = 'multi';
else $mode = 'single';
$fields = null;
}
elseif($fields && '*' !== $fields && strpos($fields, ',') === false && $where)
{
$mode = 'single';
}
elseif($multi)
if($multi)
{
$mode = 'multi';
}
// detect query type
$select = true;
$noWhere = false;
if(!$fields && !$where)
{
// gen()
$select = false;
if($mode == 'one') $mode = 'single';
}
// auto detect noWhere - if where string starts with upper case LATIN word
elseif(!$where || preg_match('/^[A-Z]+\S.*$/', trim($where)))
{
// FIXME - move auto detect to select()?
$noWhere = true;
}
// execute & fetch
switch ($mode)
{
case 'single':
if(!$this->select($table, $fields, $where, $noWhere))
if($select && !$this->select($table, $fields, $where, $noWhere, $debug))
{
return null;
}
elseif(!$select && $this->gen($table, $debug))
{
return null;
}
@ -398,7 +437,11 @@ class e_db_mysql
break;
case 'one':
if(!$this->select($table, $fields, $where, $noWhere))
if($select && !$this->select($table, $fields, $where, $noWhere, $debug))
{
return array();
}
elseif(!$select && $this->gen($table, $debug))
{
return array();
}
@ -406,9 +449,12 @@ class e_db_mysql
break;
case 'multi':
if(!$this->select($table, $fields, $where, $noWhere))
if($select && !$this->select($table, $fields, $where, $noWhere, $debug))
{
return array();
}
elseif(!$select && $this->gen($table, $debug))
{
var_dump($this->getLastQuery());
return array();
}
$ret = array();

16
e107_handlers/plugin_class.php
View File

@ -1991,7 +1991,11 @@ class e107plugin
if (is_readable($setup_file))
{
$mes->add("Found setup file <b>".$path."_setup.php</b> ", E_MESSAGE_DEBUG);
if(e_PAGE == 'e107_update.php')
{
$mes->add("Found setup file <b>".$path."_setup.php</b> ", E_MESSAGE_DEBUG);
}
include_once($setup_file);
@ -2002,12 +2006,18 @@ class e107plugin
if (method_exists($obj, $method_name))
{
$mes->add("Executing setup function <b>".$class_name." :: ".$method_name."()</b>", E_MESSAGE_DEBUG);
if(e_PAGE == 'e107_update.php')
{
$mes->add("Executing setup function <b>".$class_name." :: ".$method_name."()</b>", E_MESSAGE_DEBUG);
}
return call_user_func(array($obj, $method_name), $this);
}
else
{
$mes->add("Setup function ".$class_name." :: ".$method_name."() NOT found.", E_MESSAGE_DEBUG);
if(e_PAGE == 'e107_update.php')
{
$mes->add("Setup function ".$class_name." :: ".$method_name."() NOT found.", E_MESSAGE_DEBUG);
}
return FALSE;
}
}

2
e107_handlers/theme_handler.php
View File

@ -650,7 +650,7 @@ class themeHandler
$var = call_user_func(array(&$this->themeConfigObj, 'config'));
foreach ($var as $val)
{
$text .= "<tr><td><b>".$val['caption']."</b>:</td><td colspan='2'>".$val['html']."</td></tr>";
$text = "<tr><td><b>".$val['caption']."</b>:</td><td colspan='2'>".$val['html']."</td></tr>";
}
return $text;
}

44
e107_handlers/user_handler.php
View File

@ -1410,20 +1410,13 @@ class e_userperms
$text .= "<div class='field-section'>
".$frm->admin_button('check_all', 'jstarget:perms', 'action', LAN_CHECKALL)."
".$frm->admin_button('uncheck_all', 'jstarget:perms', 'action', LAN_UNCHECKALL)."
</div>
$text .= $this->renderCheckAllButtons()."
</td>
</tr>
</tbody>
</table>
<div class='buttons-bar center'>
<input type='hidden' name='a_id' value='{$a_id}' />
".$frm->admin_button('update_admin', ADMSLAN_52, 'update')."
".$frm->admin_button('go_back', ADMSLAN_70)."
</div>
".$this->renderSubmitButtons()."
</fieldset>
</form>
";
@ -1431,6 +1424,28 @@ class e_userperms
$ns->tablerender(ADMSLAN_52, $text);
}
function renderCheckAllButtons()
{
$frm = e107::getForm();
return "
<div class='field-section'>
".$frm->admin_button('check_all', 'jstarget:perms', 'action', LAN_CHECKALL)."
".$frm->admin_button('uncheck_all', 'jstarget:perms', 'action', LAN_UNCHECKALL)."
</div>
";
}
function renderSubmitButtons()
{
$frm = e107::getForm();
return "
<div class='buttons-bar center'>
<input type='hidden' name='a_id' value='{$a_id}' />
".$frm->admin_button('update_admin', ADMSLAN_52, 'update')."
".$frm->admin_button('go_back', ADMSLAN_70)."
</div>
";
}
function renderPermTable($type,$a_perms='')
{
@ -1479,8 +1494,8 @@ class e_userperms
exit();
}
$sql->db_Select("user", "*", "user_id=".$modID);
$row = $sql->db_Fetch();
$sysuser = e107::getSystemUser($modID, false);
$row = $sysuser->getData();
$a_name = $row['user_name'];
$perm = "";
@ -1498,9 +1513,10 @@ class e_userperms
{
$perm .= $value.".";
}
}
e107::getMessage()->addAuto($sql->db_Update("user", "user_perms='{$perm}' WHERE user_id='{$modID}' "), 'update', sprintf(ADMSLAN_2, $tp->toDB($_POST['ad_name'])), false, false);
}
//$sql->db_Update("user", "user_perms='{$perm}' WHERE user_id='{$modID}' ")
e107::getMessage()->addAuto($sysuser->set('user_perms', $perm)->save(), 'update', sprintf(ADMSLAN_2, $tp->toDB($_POST['ad_name'])), false, false);
$logMsg = str_replace(array('--ID--', '--NAME--'),array($modID, $a_name),ADMSLAN_72).$perm;
$admin_log->log_event('ADMIN_01',$logMsg,E_LOG_INFORMATIVE,'');
}

23
e107_handlers/user_model.php
View File

@ -1006,10 +1006,14 @@ class e_system_user extends e_user_model
$userInfo = array_merge($options, $userInfo);
}
$eml = $this->renderEmail($userInfo, $type);
$eml = $this->renderEmail($type, $userInfo);
if(empty($eml)) return false;
$mailer = e107::getEmail();
$mailer->template = $eml['template'];
unset($eml['template']);
return $mailer->sendEmail($userInfo['user_email'], $userInfo['user_name'], $eml, false);
}
@ -1025,7 +1029,7 @@ class e_system_user extends e_user_model
* All standard user fields from the DB (user_name, user_loginname, etc.)
*
* @param array $userInfo
* @param string $type signup|notify|default
* @param string $type signup|notify|email
* @return array
*/
public function renderEmail($type, $userInfo)
@ -1057,14 +1061,17 @@ class e_system_user extends e_user_model
case 'signup':
if(vartrue($SIGNUPPROVIDEREMAIL_TEMPLATE)) $template = $SIGNUPPROVIDEREMAIL_TEMPLATE;
else $template = $SIGNUPEMAIL_TEMPLATE;
$ret['template'] = false; // Don't allow additional headers (mailer)
break;
case 'notify':
if(vartrue($userInfo['mail_body'])) $template = $NOTIFY_HEADER.$userInfo['mail_body'].$NOTIFY_FOOTER;
case 'notify': //emailer changes
if(vartrue($userInfo['mail_body'])) $template = $userInfo['mail_body'];//$NOTIFY_HEADER.$userInfo['mail_body'].$NOTIFY_FOOTER;
$ret['template'] = 'notify';
break;
case 'default':
if(vartrue($userInfo['mail_body'])) $template = $EMAIL_HEADER.$userInfo['mail_body'].$EMAIL_FOOTER;
case 'email'://emailer changes
if(vartrue($userInfo['mail_body'])) $template = $userInfo['mail_body']; //$EMAIL_HEADER.$userInfo['mail_body'].$EMAIL_FOOTER;
$ret['template'] = 'email';
break;
}
@ -1137,7 +1144,7 @@ class e_system_user extends e_user_model
}
$FOOT = "\n</body>\n</html>\n";
$ret['mail_body'] = str_replace($search,$replace,$HEAD.$template.$FOOT);
$ret['mail_body'] = e107::getParser()->parseTemplate(str_replace($search,$replace,$HEAD.$template.$FOOT), true);
$ret['preview'] = $ret['mail_body'];// Non-standard field
return $ret;
}
@ -1175,7 +1182,7 @@ class e_system_user extends e_user_model
$ret['mail_subject'] = str_replace($search, $replace, $subject);
$ret['send_html'] = TRUE;
$ret['mail_body'] = str_replace($search, $replace, $template);
$ret['mail_body'] = e107::getParser()->parseTemplate(str_replace($search, $replace, $template));
$ret['preview'] = $ret['mail_body']; // Non-standard field
return $ret;

4
e107_handlers/userclass_class.php
View File

@ -855,7 +855,7 @@ class user_class
public function isEditableClass($classID)
{
if (($classID >= e_UC_SPECIAL_BASE) && ($classID <= e_UC_SPECIAL_END)) return FALSE; // Don't allow deletion of fixed classes
if (isset($this->fixed_classes[$class_id])) return FALSE; // This picks up classes such as e_UC_PUBLIC outside the main range which can't be deleted
if (isset($this->fixed_classes[vartrue($class_id)])) return FALSE; // This picks up classes such as e_UC_PUBLIC outside the main range which can't be deleted
return TRUE;
}
@ -1187,7 +1187,7 @@ class user_class_admin extends user_class
*/
protected function show_graphical_subtree($listnum, $indent_images, $is_last = FALSE)
{
$num_children = count($this->class_tree[$listnum]['class_children']);
$num_children = count(vartrue($this->class_tree[$listnum]['class_children']));
$is_open = TRUE;
$tag_name = 'uclass_tree_'.$listnum;

BIN
e107_images/admin_images/linkspage_16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
e107_images/admin_images/linkspage_32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

2
e107_languages/English/admin/help/menus.php
View File

@ -44,7 +44,7 @@ else
$frm = e107::getForm();
$text .= "
$text = "
You can arrange where and in which order your menu items are from here.
Use the dropdown menu to move the menus up and down until you are satisfied with their positioning.
<br />

2
e107_languages/English/admin/help/userclass2.php
View File

@ -18,7 +18,7 @@ if (!defined('e107_INIT')) { exit; }
$caption = "User Class Help";
if (!($action = $_GET['action']))
if (!($action = vartrue($_GET['action'])))
{
if (e_QUERY)
{

752
e107_languages/English/admin/lan_log_messages.php
View File

@ -1,376 +1,376 @@
<?php
// e107 Language File.
// $Id$
/*
The definitions in this file are for standard 'explanatory' messages which might be entered
into any of the system logs. They are in three groups with different prefixes:
LAN_ADMIN_LOG_nnn - the admin log (records intentional actions by admins)
LAN_AUDIT_LOG_nnn - the audit log (records actions, generally intentional, by users)
LAN_ROLL_LOG_nnn - the rolling log (records extraneous events, debugging etc)
*/
// User audit trail events. For messages 11-30, the last 2 digits must match the define for the event type in the admin log class file
define('LAN_AUDIT_LOG_001', 'Access by banned user');
define('LAN_AUDIT_LOG_002', 'Flood protection activated');
define('LAN_AUDIT_LOG_003', 'Access from banned IP Address');
define('LAN_AUDIT_LOG_004', '');
define('LAN_AUDIT_LOG_005', '');
define('LAN_AUDIT_LOG_006', 'User changed password');
define('LAN_AUDIT_LOG_007', 'User changed email address');
define('LAN_AUDIT_LOG_008', '');
define('LAN_AUDIT_LOG_009', '');
define('LAN_AUDIT_LOG_010', 'User data changed by admin');
define('LAN_AUDIT_LOG_011', 'User signed up');
define('LAN_AUDIT_LOG_012', 'User confirmed registration');
define('LAN_AUDIT_LOG_013', 'User logged in');
define('LAN_AUDIT_LOG_014', 'User logged out');
define('LAN_AUDIT_LOG_015', 'User changed display name');
define('LAN_AUDIT_LOG_016', 'User changed password');
define('LAN_AUDIT_LOG_017', 'User changed email address');
define('LAN_AUDIT_LOG_018', 'User password reset');
define('LAN_AUDIT_LOG_019', 'User changed settings');
define('LAN_AUDIT_LOG_020', 'User added by admin');
define('LAN_AUDIT_LOG_021', 'User email bounce');
define('LAN_AUDIT_LOG_022', 'User banned');
define('LAN_AUDIT_LOG_023', 'User bounce reset');
define('LAN_AUDIT_LOG_024', 'User temporary status');
// Admin log events
//-----------------
define('LAN_AL_ADLOG_01', 'Admin log - prefs updated');
define('LAN_AL_ADLOG_02', 'Admin log - delete old data');
define('LAN_AL_ADLOG_03', 'User Audit log - delete old data');
define('LAN_AL_ADLOG_04', 'User audit options updated');
define('LAN_AL_ADLOG_05', '');
// User edits
//-----------
define('LAN_AL_USET_01', 'Admin edited user data');
define('LAN_AL_USET_02', 'User added by Admin');
define('LAN_AL_USET_03', 'User options updated');
define('LAN_AL_USET_04', 'Users pruned');
define('LAN_AL_USET_05', 'User banned');
define('LAN_AL_USET_06', 'User unbanned');
define('LAN_AL_USET_07', 'User deleted');
define('LAN_AL_USET_08', 'User made admin');
define('LAN_AL_USET_09', 'User admin status revoked');
define('LAN_AL_USET_10', 'User approved');
define('LAN_AL_USET_11', 'Resend validation email');
define('LAN_AL_USET_12', 'Resend all validation emails');
define('LAN_AL_USET_13', 'Bounced emails deleted');
define('LAN_AL_USET_14', 'Class membership updated');
define('LAN_AL_USET_15', 'Signup refused'); // Too many users at same IP address
// Userclass events
//------------------
define('LAN_AL_UCLASS_00',"Unknown userclass-related event");
define('LAN_AL_UCLASS_01',"Userclass created");
define('LAN_AL_UCLASS_02',"Userclass deleted");
define('LAN_AL_UCLASS_03',"Userclass edited");
define('LAN_AL_UCLASS_04',"Class membership updated");
define('LAN_AL_UCLASS_05',"Initial userclass settings edited");
define('LAN_AL_UCLASS_06',"Class membership emptied");
// Banlist events
//----------------
define('LAN_AL_BANLIST_00','Unknown ban-related event');
define('LAN_AL_BANLIST_01','Manual ban added');
define('LAN_AL_BANLIST_02','Ban deleted');
define('LAN_AL_BANLIST_03','Ban time changed');
define('LAN_AL_BANLIST_04','Whitelist entry added');
define('LAN_AL_BANLIST_05','Whitelist entry deleted');
define('LAN_AL_BANLIST_06','Banlist exported');
define('LAN_AL_BANLIST_07','Banlist imported');
define('LAN_AL_BANLIST_08','Banlist options updated');
define('LAN_AL_BANLIST_09','Banlist entry edited');
define('LAN_AL_BANLIST_10','Whitelist entry edited');
define('LAN_AL_BANLIST_11','Whitelist hit for ban entry');
define('LAN_AL_BANLIST_12','Expired bans cleared');
// Comment-related events
//-----------------------
define('LAN_AL_COMMENT_01', 'Comment(s) deleted');
// Rolling log events
//-------------------
define('LAN_ROLL_LOG_01','Empty username and/or password');
define('LAN_ROLL_LOG_02','Incorrect image code entered');
define('LAN_ROLL_LOG_03','Invalid username/password combination');
define('LAN_ROLL_LOG_04','Invalid username entered');
define('LAN_ROLL_LOG_05','Login attempt by user not fully signed up');
define('LAN_ROLL_LOG_06','Login blocked by event trigger handler');
define('LAN_ROLL_LOG_07','Multiple logins from same address');
define('LAN_ROLL_LOG_08','Excessive username length');
define('LAN_ROLL_LOG_09','Banned user attempted login');
define('LAN_ROLL_LOG_10','Login fail - reason unknown');
define('LAN_ROLL_LOG_11','Admin login fail');
// Prefs events
//-------------
define('LAN_AL_PREFS_01', 'Preferences changed');
define('LAN_AL_PREFS_02', 'New Preferences created');
define('LAN_AL_PREFS_03', 'Error saving prefs');
// Front Page events
//------------------
define('LAN_AL_FRONTPG_00', 'Unknown front page-related event');
define('LAN_AL_FRONTPG_01', 'Rules order changed');
define('LAN_AL_FRONTPG_02', 'Rule added');
define('LAN_AL_FRONTPG_03', 'Rule edited');
define('LAN_AL_FRONTPG_04', 'Rule deleted');
define('LAN_AL_FRONTPG_05', '');
define('LAN_AL_FRONTPG_06', '');
// User theme admin
//-----------------
define('LAN_AL_UTHEME_00', 'Unknown user theme related event');
define('LAN_AL_UTHEME_01', 'User theme settings changed');
define('LAN_AL_UTHEME_02', '');
// Update routines
//----------------
define('LAN_AL_UPDATE_00','Unknown software update related event');
define('LAN_AL_UPDATE_01','Update from 0.7 to 0.8 executed');
define('LAN_AL_UPDATE_02','Update from 0.7.x to 0.7.6 executed');
define('LAN_AL_UPDATE_03','Missing prefs added');
// Administrator routines
//-----------------------
define('LAN_AL_ADMIN_00','Unknown administrator event');
define('LAN_AL_ADMIN_01','Update admin permissions');
define('LAN_AL_ADMIN_02','Admin rights removed');
define('LAN_AL_ADMIN_03','');
// Maintenance mode
//-----------------
define('LAN_AL_MAINT_00','Unknown maintenance message');
define('LAN_AL_MAINT_01','Maintenance mode set');
define('LAN_AL_MAINT_02','Maintenance mode cleared');
// Sitelinks routines
//-------------------
define('LAN_AL_SLINKS_00','Unknown sitelinks message');
define('LAN_AL_SLINKS_01','Sublinks generated');
define('LAN_AL_SLINKS_02','Sitelink moved up');
define('LAN_AL_SLINKS_03','Sitelink moved down');
define('LAN_AL_SLINKS_04','Sitelink order updated');
define('LAN_AL_SLINKS_05','Sitelinks options updated');
define('LAN_AL_SLINKS_06','Sitelink deleted');
define('LAN_AL_SLINKS_07','Sitelink submitted');
define('LAN_AL_SLINKS_08','Sitelink updated');
// Theme manager routines
//-----------------------
define('LAN_AL_THEME_00','Unknown theme-related message');
define('LAN_AL_THEME_01','Site theme updated');
define('LAN_AL_THEME_02','Admin theme updated');
define('LAN_AL_THEME_03','Image preload/site CSS updated');
define('LAN_AL_THEME_04','Admin style/CSS updated');
define('LAN_AL_THEME_05','');
// Cache control routines
//-----------------------
define('LAN_AL_CACHE_00','Unknown cache-control message');
define('LAN_AL_CACHE_01','Cache settings updated');
define('LAN_AL_CACHE_02','System cache emptied');
define('LAN_AL_CACHE_03','Content cache emptied');
define('LAN_AL_CACHE_04','');
// Emote admin
//------------
define('LAN_AL_EMOTE_00','Unknown emote-related message');
define('LAN_AL_EMOTE_01','Active emote pack changed');
define('LAN_AL_EMOTE_02','Emotes activated');
define('LAN_AL_EMOTE_03','Emotes deactivated');
// Welcome message
//----------------
define('LAN_AL_WELCOME_00','Unknown welcome-related message');
define('LAN_AL_WELCOME_01','Welcome message created');
define('LAN_AL_WELCOME_02','Welcome message updated');
define('LAN_AL_WELCOME_03','Welcome message deleted');
define('LAN_AL_WELCOME_04','Welcome message options changed');
define('LAN_AL_WELCOME_05','');
// Admin Password
//---------------
define('LAN_AL_ADMINPW_01','Admin password changed');
// Banners Admin
//--------------
define('LAN_AL_BANNER_00','Unknown banner-related message');
define('LAN_AL_BANNER_01','Banner menu update');
define('LAN_AL_BANNER_02','Banner created');
define('LAN_AL_BANNER_03','Banner updated');
define('LAN_AL_BANNER_04','Banner deleted');
define('LAN_AL_BANNER_05','Banner configuration updated');
define('LAN_AL_BANNER_06','');
// Image management
//-----------------
define('LAN_AL_IMALAN_00','Unknown image-related message');
define('LAN_AL_IMALAN_01','Avatar deleted');
define('LAN_AL_IMALAN_02','All avatars and photos deleted');
define('LAN_AL_IMALAN_03','Avatar deleted');
define('LAN_AL_IMALAN_04','Settings updated');
define('LAN_AL_IMALAN_05','');
define('LAN_AL_IMALAN_06','');
// Language management
//--------------------
define('LAN_AL_LANG_00', 'Unknown language-related message');
define('LAN_AL_LANG_01', 'Language prefs changed');
define('LAN_AL_LANG_02', 'Language tables deleted');
define('LAN_AL_LANG_03', 'Language tables created');
define('LAN_AL_LANG_04', 'Language zip created');
define('LAN_AL_LANG_05', '');
// Meta Tags
//----------
define('LAN_AL_META_01', 'Meta tags updated');
// Downloads
//----------
define('LAN_AL_DOWNL_01', 'Download options changed');
define('LAN_AL_DOWNL_02', 'Download category created');
define('LAN_AL_DOWNL_03', 'Download category updated');
define('LAN_AL_DOWNL_04', 'Download category deleted');
define('LAN_AL_DOWNL_05', 'Download created');
define('LAN_AL_DOWNL_06', 'Download updated');
define('LAN_AL_DOWNL_07', 'Download deleted');
define('LAN_AL_DOWNL_08', 'Download category order updated');
define('LAN_AL_DOWNL_09', 'Download limit added');
define('LAN_AL_DOWNL_10', 'Download limit edited');
define('LAN_AL_DOWNL_11', 'Download limit deleted');
define('LAN_AL_DOWNL_12', 'Download mirror added');
define('LAN_AL_DOWNL_13', 'Download mirror updated');
define('LAN_AL_DOWNL_14', 'Download mirror deleted');
define('LAN_AL_DOWNL_15', '');
// Custom Pages/Menus
//-------------------
define('LAN_AL_CPAGE_01','Custom page/menu added');
define('LAN_AL_CPAGE_02','Custom page/menu updated');
define('LAN_AL_CPAGE_03','Custom page/menu deleted');
define('LAN_AL_CPAGE_04','Custom page/menu settings updated');
// Extended User Fields
//---------------------
define('LAN_AL_EUF_01', 'EUF moved up');
define('LAN_AL_EUF_02', 'EUF moved down');
define('LAN_AL_EUF_03', 'EUF category moved up');
define('LAN_AL_EUF_04', 'EUF category moved down');
define('LAN_AL_EUF_05', 'Extended User Field added');
define('LAN_AL_EUF_06', 'Extended User Field updated');
define('LAN_AL_EUF_07', 'Extended User Field deleted');
define('LAN_AL_EUF_08', 'EUF category added');
define('LAN_AL_EUF_09', 'EUF category updated');
define('LAN_AL_EUF_10', 'EUF category deleted');
define('LAN_AL_EUF_11', 'Extended user fields activated');
define('LAN_AL_EUF_12', 'Extended user fields deactivated');
// Menus
//------
define('LAN_AL_MENU_01', 'Menu activated');
define('LAN_AL_MENU_02', 'Menu - set visibility');
define('LAN_AL_MENU_03', 'Menu - change area');
define('LAN_AL_MENU_04', 'Menu deactivated');
define('LAN_AL_MENU_05', 'Menu - move to top');
define('LAN_AL_MENU_06', 'Menu - move to bottom');
define('LAN_AL_MENU_07', 'Menu - move up');
define('LAN_AL_MENU_08', 'Menu - move down');
define('LAN_AL_MENU_09', '');
// Public Uploads
//---------------
define('LAN_AL_UPLOAD_01','Uploaded file deleted');
define('LAN_AL_UPLOAD_02','Upload prefs changed');
// Search
//-------
define('LAN_AL_SEARCH_01', 'Search settings updated');
define('LAN_AL_SEARCH_02', 'Search prefs updated');
define('LAN_AL_SEARCH_03', 'Search params auto-update');
define('LAN_AL_SEARCH_04', 'Searchable areas updated');
define('LAN_AL_SEARCH_05', 'Search handler settings updated');
define('LAN_AL_SEARCH_06', '');
// Notify
//-------
define('LAN_AL_NOTIFY_01', 'Notify settings updated');
// News
//-----
define('LAN_AL_NEWS_01', 'News item deleted');
define('LAN_AL_NEWS_02', 'News category deleted');
define('LAN_AL_NEWS_03', 'Submitted news deleted');
define('LAN_AL_NEWS_04', 'News category created');
define('LAN_AL_NEWS_05', 'News category updated');
define('LAN_AL_NEWS_06', 'News preferences updated');
define('LAN_AL_NEWS_07', 'Submitted news authorised');
define('LAN_AL_NEWS_08', 'News item added');
define('LAN_AL_NEWS_09', 'News item updated');
define('LAN_AL_NEWS_10', 'News category rewrite changed');
define('LAN_AL_NEWS_11', 'News category rewrite deleted');
define('LAN_AL_NEWS_12', 'News rewrite changed');
define('LAN_AL_NEWS_13', 'News rewrite deleted');
// Comments
//---------
define('LAN_AL_COMMENT_01', 'Comment(s) deleted');
// File Manager
//-------------
define('LAN_AL_FILEMAN_01','File(s) deleted');
define('LAN_AL_FILEMAN_02','File(s) moved');
define('LAN_AL_FILEMAN_03','File(s) uploaded');
define('LAN_AL_FILEMAN_04','');
// Mail
//-----
define('LAN_AL_MAIL_01', 'Test email sent');
define('LAN_AL_MAIL_02', 'Mailshot created');
define('LAN_AL_MAIL_03', 'Mail settings updated');
define('LAN_AL_MAIL_04', 'Mailshot details deleted');
define('LAN_AL_MAIL_05', 'Mail Database tidy');
define('LAN_AL_MAIL_06', 'Mailout activated');
define('LAN_AL_MAIL_07', '');
// Plugin Manager
//---------------
define('LAN_AL_PLUGMAN_01', 'Plugin installed');
define('LAN_AL_PLUGMAN_02', 'Plugin updated');
define('LAN_AL_PLUGMAN_03', 'Plugin uninstalled');
define('LAN_AL_PLUGMAN_04', 'Plugin refreshed');
// URL Manager
//---------------
define('LAN_AL_EURL_01', 'Site URL configuration changed');
// Sundry Pseudo-plugins - technically they're plugins, but not worth the file overhead of treating them separately
//----------------------
define('LAN_AL_MISC_01','Tree menu settings updated');
define('LAN_AL_MISC_02','Online menu settings updated');
define('LAN_AL_MISC_03','Login menu settings updated');
define('LAN_AL_MISC_04','Comment menu settings updated');
define('LAN_AL_MISC_05','Clock menu settings updated');
define('LAN_AL_MISC_06','Blog calendar menu settings updated');
define('LAN_AL_MISC_07','');
?>
<?php
// e107 Language File.
// $Id$
/*
The definitions in this file are for standard 'explanatory' messages which might be entered
into any of the system logs. They are in three groups with different prefixes:
LAN_ADMIN_LOG_nnn - the admin log (records intentional actions by admins)
LAN_AUDIT_LOG_nnn - the audit log (records actions, generally intentional, by users)
LAN_ROLL_LOG_nnn - the rolling log (records extraneous events, debugging etc)
*/
// User audit trail events. For messages 11-30, the last 2 digits must match the define for the event type in the admin log class file
define('LAN_AUDIT_LOG_001', 'Access by banned user');
define('LAN_AUDIT_LOG_002', 'Flood protection activated');
define('LAN_AUDIT_LOG_003', 'Access from banned IP Address');
define('LAN_AUDIT_LOG_004', '');
define('LAN_AUDIT_LOG_005', '');
define('LAN_AUDIT_LOG_006', 'User changed password');
define('LAN_AUDIT_LOG_007', 'User changed email address');
define('LAN_AUDIT_LOG_008', '');
define('LAN_AUDIT_LOG_009', '');
define('LAN_AUDIT_LOG_010', 'User data changed by admin');
define('LAN_AUDIT_LOG_011', 'User signed up');
define('LAN_AUDIT_LOG_012', 'User confirmed registration');
define('LAN_AUDIT_LOG_013', 'User logged in');
define('LAN_AUDIT_LOG_014', 'User logged out');
define('LAN_AUDIT_LOG_015', 'User changed display name');
define('LAN_AUDIT_LOG_016', 'User changed password');
define('LAN_AUDIT_LOG_017', 'User changed email address');
define('LAN_AUDIT_LOG_018', 'User password reset');
define('LAN_AUDIT_LOG_019', 'User changed settings');
define('LAN_AUDIT_LOG_020', 'User added by admin');
define('LAN_AUDIT_LOG_021', 'User email bounce');
define('LAN_AUDIT_LOG_022', 'User banned');
define('LAN_AUDIT_LOG_023', 'User bounce reset');
define('LAN_AUDIT_LOG_024', 'User temporary status');
// Admin log events
//-----------------
define('LAN_AL_ADLOG_01', 'Admin log - prefs updated');
define('LAN_AL_ADLOG_02', 'Admin log - delete old data');
define('LAN_AL_ADLOG_03', 'User Audit log - delete old data');
define('LAN_AL_ADLOG_04', 'User audit options updated');
define('LAN_AL_ADLOG_05', '');
// User edits
//-----------
define('LAN_AL_USET_01', 'Admin edited user data');
define('LAN_AL_USET_02', 'User added by Admin');
define('LAN_AL_USET_03', 'User options updated');
define('LAN_AL_USET_04', 'Users pruned');
define('LAN_AL_USET_05', 'User banned');
define('LAN_AL_USET_06', 'User unbanned');
define('LAN_AL_USET_07', 'User deleted');
define('LAN_AL_USET_08', 'User made admin');
define('LAN_AL_USET_09', 'User admin status revoked');
define('LAN_AL_USET_10', 'User approved');
define('LAN_AL_USET_11', 'Resend validation email');
define('LAN_AL_USET_12', 'Resend all validation emails');
define('LAN_AL_USET_13', 'Bounced emails deleted');
define('LAN_AL_USET_14', 'Class membership updated');
define('LAN_AL_USET_15', 'Signup refused'); // Too many users at same IP address
// Userclass events
//------------------
define('LAN_AL_UCLASS_00',"Unknown userclass-related event");
define('LAN_AL_UCLASS_01',"Userclass created");
define('LAN_AL_UCLASS_02',"Userclass deleted");
define('LAN_AL_UCLASS_03',"Userclass edited");
define('LAN_AL_UCLASS_04',"Class membership updated");
define('LAN_AL_UCLASS_05',"Initial userclass settings edited");
define('LAN_AL_UCLASS_06',"Class membership emptied");
// Banlist events
//----------------
define('LAN_AL_BANLIST_00','Unknown ban-related event');
define('LAN_AL_BANLIST_01','Manual ban added');
define('LAN_AL_BANLIST_02','Ban deleted');
define('LAN_AL_BANLIST_03','Ban time changed');
define('LAN_AL_BANLIST_04','Whitelist entry added');
define('LAN_AL_BANLIST_05','Whitelist entry deleted');
define('LAN_AL_BANLIST_06','Banlist exported');
define('LAN_AL_BANLIST_07','Banlist imported');
define('LAN_AL_BANLIST_08','Banlist options updated');
define('LAN_AL_BANLIST_09','Banlist entry edited');
define('LAN_AL_BANLIST_10','Whitelist entry edited');
define('LAN_AL_BANLIST_11','Whitelist hit for ban entry');
define('LAN_AL_BANLIST_12','Expired bans cleared');
// Comment-related events
//-----------------------
define('LAN_AL_COMMENT_01', 'Comment(s) deleted');
// Rolling log events
//-------------------
define('LAN_ROLL_LOG_01','Empty username and/or password');
define('LAN_ROLL_LOG_02','Incorrect image code entered');
define('LAN_ROLL_LOG_03','Invalid username/password combination');
define('LAN_ROLL_LOG_04','Invalid username entered');
define('LAN_ROLL_LOG_05','Login attempt by user not fully signed up');
define('LAN_ROLL_LOG_06','Login blocked by event trigger handler');
define('LAN_ROLL_LOG_07','Multiple logins from same address');
define('LAN_ROLL_LOG_08','Excessive username length');
define('LAN_ROLL_LOG_09','Banned user attempted login');
define('LAN_ROLL_LOG_10','Login fail - reason unknown');
define('LAN_ROLL_LOG_11','Admin login fail');
// Prefs events
//-------------
define('LAN_AL_PREFS_01', 'Preferences changed');
define('LAN_AL_PREFS_02', 'New Preferences created');
define('LAN_AL_PREFS_03', 'Error saving prefs');
// Front Page events
//------------------
define('LAN_AL_FRONTPG_00', 'Unknown front page-related event');
define('LAN_AL_FRONTPG_01', 'Rules order changed');
define('LAN_AL_FRONTPG_02', 'Rule added');
define('LAN_AL_FRONTPG_03', 'Rule edited');
define('LAN_AL_FRONTPG_04', 'Rule deleted');
define('LAN_AL_FRONTPG_05', '');
define('LAN_AL_FRONTPG_06', '');
// User theme admin
//-----------------
define('LAN_AL_UTHEME_00', 'Unknown user theme related event');
define('LAN_AL_UTHEME_01', 'User theme settings changed');
define('LAN_AL_UTHEME_02', '');
// Update routines
//----------------
define('LAN_AL_UPDATE_00','Unknown software update related event');
define('LAN_AL_UPDATE_01','Update from 1.0 to 2.0 executed');
define('LAN_AL_UPDATE_02','Update from 0.7.x to 0.7.6 executed');
define('LAN_AL_UPDATE_03','Missing prefs added');
// Administrator routines
//-----------------------
define('LAN_AL_ADMIN_00','Unknown administrator event');
define('LAN_AL_ADMIN_01','Update admin permissions');
define('LAN_AL_ADMIN_02','Admin rights removed');
define('LAN_AL_ADMIN_03','');
// Maintenance mode
//-----------------
define('LAN_AL_MAINT_00','Unknown maintenance message');
define('LAN_AL_MAINT_01','Maintenance mode set');
define('LAN_AL_MAINT_02','Maintenance mode cleared');
// Sitelinks routines
//-------------------
define('LAN_AL_SLINKS_00','Unknown sitelinks message');
define('LAN_AL_SLINKS_01','Sublinks generated');
define('LAN_AL_SLINKS_02','Sitelink moved up');
define('LAN_AL_SLINKS_03','Sitelink moved down');
define('LAN_AL_SLINKS_04','Sitelink order updated');
define('LAN_AL_SLINKS_05','Sitelinks options updated');
define('LAN_AL_SLINKS_06','Sitelink deleted');
define('LAN_AL_SLINKS_07','Sitelink submitted');
define('LAN_AL_SLINKS_08','Sitelink updated');
// Theme manager routines
//-----------------------
define('LAN_AL_THEME_00','Unknown theme-related message');
define('LAN_AL_THEME_01','Site theme updated');
define('LAN_AL_THEME_02','Admin theme updated');
define('LAN_AL_THEME_03','Image preload/site CSS updated');
define('LAN_AL_THEME_04','Admin style/CSS updated');
define('LAN_AL_THEME_05','');
// Cache control routines
//-----------------------
define('LAN_AL_CACHE_00','Unknown cache-control message');
define('LAN_AL_CACHE_01','Cache settings updated');
define('LAN_AL_CACHE_02','System cache emptied');
define('LAN_AL_CACHE_03','Content cache emptied');
define('LAN_AL_CACHE_04','');
// Emote admin
//------------
define('LAN_AL_EMOTE_00','Unknown emote-related message');
define('LAN_AL_EMOTE_01','Active emote pack changed');
define('LAN_AL_EMOTE_02','Emotes activated');
define('LAN_AL_EMOTE_03','Emotes deactivated');
// Welcome message
//----------------
define('LAN_AL_WELCOME_00','Unknown welcome-related message');
define('LAN_AL_WELCOME_01','Welcome message created');
define('LAN_AL_WELCOME_02','Welcome message updated');
define('LAN_AL_WELCOME_03','Welcome message deleted');
define('LAN_AL_WELCOME_04','Welcome message options changed');
define('LAN_AL_WELCOME_05','');
// Admin Password
//---------------
define('LAN_AL_ADMINPW_01','Admin password changed');
// Banners Admin
//--------------
define('LAN_AL_BANNER_00','Unknown banner-related message');
define('LAN_AL_BANNER_01','Banner menu update');
define('LAN_AL_BANNER_02','Banner created');
define('LAN_AL_BANNER_03','Banner updated');
define('LAN_AL_BANNER_04','Banner deleted');
define('LAN_AL_BANNER_05','Banner configuration updated');
define('LAN_AL_BANNER_06','');
// Image management
//-----------------
define('LAN_AL_IMALAN_00','Unknown image-related message');
define('LAN_AL_IMALAN_01','Avatar deleted');
define('LAN_AL_IMALAN_02','All avatars and photos deleted');
define('LAN_AL_IMALAN_03','Avatar deleted');
define('LAN_AL_IMALAN_04','Settings updated');
define('LAN_AL_IMALAN_05','');
define('LAN_AL_IMALAN_06','');
// Language management
//--------------------
define('LAN_AL_LANG_00', 'Unknown language-related message');
define('LAN_AL_LANG_01', 'Language prefs changed');
define('LAN_AL_LANG_02', 'Language tables deleted');
define('LAN_AL_LANG_03', 'Language tables created');
define('LAN_AL_LANG_04', 'Language zip created');
define('LAN_AL_LANG_05', '');
// Meta Tags
//----------
define('LAN_AL_META_01', 'Meta tags updated');
// Downloads
//----------
define('LAN_AL_DOWNL_01', 'Download options changed');
define('LAN_AL_DOWNL_02', 'Download category created');
define('LAN_AL_DOWNL_03', 'Download category updated');
define('LAN_AL_DOWNL_04', 'Download category deleted');
define('LAN_AL_DOWNL_05', 'Download created');
define('LAN_AL_DOWNL_06', 'Download updated');
define('LAN_AL_DOWNL_07', 'Download deleted');
define('LAN_AL_DOWNL_08', 'Download category order updated');
define('LAN_AL_DOWNL_09', 'Download limit added');
define('LAN_AL_DOWNL_10', 'Download limit edited');
define('LAN_AL_DOWNL_11', 'Download limit deleted');
define('LAN_AL_DOWNL_12', 'Download mirror added');
define('LAN_AL_DOWNL_13', 'Download mirror updated');
define('LAN_AL_DOWNL_14', 'Download mirror deleted');
define('LAN_AL_DOWNL_15', '');
// Custom Pages/Menus
//-------------------
define('LAN_AL_CPAGE_01','Custom page/menu added');
define('LAN_AL_CPAGE_02','Custom page/menu updated');
define('LAN_AL_CPAGE_03','Custom page/menu deleted');
define('LAN_AL_CPAGE_04','Custom page/menu settings updated');
// Extended User Fields
//---------------------
define('LAN_AL_EUF_01', 'EUF moved up');
define('LAN_AL_EUF_02', 'EUF moved down');
define('LAN_AL_EUF_03', 'EUF category moved up');
define('LAN_AL_EUF_04', 'EUF category moved down');
define('LAN_AL_EUF_05', 'Extended User Field added');
define('LAN_AL_EUF_06', 'Extended User Field updated');
define('LAN_AL_EUF_07', 'Extended User Field deleted');
define('LAN_AL_EUF_08', 'EUF category added');
define('LAN_AL_EUF_09', 'EUF category updated');
define('LAN_AL_EUF_10', 'EUF category deleted');
define('LAN_AL_EUF_11', 'Extended user fields activated');
define('LAN_AL_EUF_12', 'Extended user fields deactivated');
// Menus
//------
define('LAN_AL_MENU_01', 'Menu activated');
define('LAN_AL_MENU_02', 'Menu - set visibility');
define('LAN_AL_MENU_03', 'Menu - change area');
define('LAN_AL_MENU_04', 'Menu deactivated');
define('LAN_AL_MENU_05', 'Menu - move to top');
define('LAN_AL_MENU_06', 'Menu - move to bottom');
define('LAN_AL_MENU_07', 'Menu - move up');
define('LAN_AL_MENU_08', 'Menu - move down');
define('LAN_AL_MENU_09', '');
// Public Uploads
//---------------
define('LAN_AL_UPLOAD_01','Uploaded file deleted');
define('LAN_AL_UPLOAD_02','Upload prefs changed');
// Search
//-------
define('LAN_AL_SEARCH_01', 'Search settings updated');
define('LAN_AL_SEARCH_02', 'Search prefs updated');
define('LAN_AL_SEARCH_03', 'Search params auto-update');
define('LAN_AL_SEARCH_04', 'Searchable areas updated');
define('LAN_AL_SEARCH_05', 'Search handler settings updated');
define('LAN_AL_SEARCH_06', '');
// Notify
//-------
define('LAN_AL_NOTIFY_01', 'Notify settings updated');
// News
//-----
define('LAN_AL_NEWS_01', 'News item deleted');
define('LAN_AL_NEWS_02', 'News category deleted');
define('LAN_AL_NEWS_03', 'Submitted news deleted');
define('LAN_AL_NEWS_04', 'News category created');
define('LAN_AL_NEWS_05', 'News category updated');
define('LAN_AL_NEWS_06', 'News preferences updated');
define('LAN_AL_NEWS_07', 'Submitted news authorised');
define('LAN_AL_NEWS_08', 'News item added');
define('LAN_AL_NEWS_09', 'News item updated');
define('LAN_AL_NEWS_10', 'News category rewrite changed');
define('LAN_AL_NEWS_11', 'News category rewrite deleted');
define('LAN_AL_NEWS_12', 'News rewrite changed');
define('LAN_AL_NEWS_13', 'News rewrite deleted');
// Comments
//---------
define('LAN_AL_COMMENT_01', 'Comment(s) deleted');
// File Manager
//-------------
define('LAN_AL_FILEMAN_01','File(s) deleted');
define('LAN_AL_FILEMAN_02','File(s) moved');
define('LAN_AL_FILEMAN_03','File(s) uploaded');
define('LAN_AL_FILEMAN_04','');
// Mail
//-----
define('LAN_AL_MAIL_01', 'Test email sent');
define('LAN_AL_MAIL_02', 'Mailshot created');
define('LAN_AL_MAIL_03', 'Mail settings updated');
define('LAN_AL_MAIL_04', 'Mailshot details deleted');
define('LAN_AL_MAIL_05', 'Mail Database tidy');
define('LAN_AL_MAIL_06', 'Mailout activated');
define('LAN_AL_MAIL_07', '');
// Plugin Manager
//---------------
define('LAN_AL_PLUGMAN_01', 'Plugin installed');
define('LAN_AL_PLUGMAN_02', 'Plugin updated');
define('LAN_AL_PLUGMAN_03', 'Plugin uninstalled');
define('LAN_AL_PLUGMAN_04', 'Plugin refreshed');
// URL Manager
//---------------
define('LAN_AL_EURL_01', 'Site URL configuration changed');
// Sundry Pseudo-plugins - technically they're plugins, but not worth the file overhead of treating them separately
//----------------------
define('LAN_AL_MISC_01','Tree menu settings updated');
define('LAN_AL_MISC_02','Online menu settings updated');
define('LAN_AL_MISC_03','Login menu settings updated');
define('LAN_AL_MISC_04','Comment menu settings updated');
define('LAN_AL_MISC_05','Clock menu settings updated');
define('LAN_AL_MISC_06','Blog calendar menu settings updated');
define('LAN_AL_MISC_07','');
?>

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

@ -166,7 +166,7 @@ define('USRLAN_160', 'Total --COUNT-- users of type --TYPE-- pruned');
define('USRLAN_161', 'User ID --UID-- name --NAME-- banned');
define('USRLAN_162', 'User ID --UID-- name --NAME-- unbanned');
define('USRLAN_163', 'User ID --UID-- deleted');
define('USRLAN_164', 'User ID --UID-- name --NAME-- made admin');
define('USRLAN_164', 'User ID --UID-- name --NAME-- (--EMAIL--) made admin');
define('USRLAN_165', 'User ID --UID-- name --NAME-- admin status revoked');
define('USRLAN_166', 'User ID --UID-- name --NAME-- approved');
//FIX ME USERLAN_160 - USERLAN_166 need to be reworked avoid duplication.

2
e107_plugins/alt_auth/alt_auth_adminmenu.php
View File

@ -31,7 +31,7 @@ TODO:
if (!defined('e107_INIT')) { exit; }
if (!is_object($euf))
if (!is_object(vartrue($euf)))
{
require_once(e_HANDLER.'user_extended_class.php');
$euf = new e107_user_extended;

4
e107_plugins/banner/admin_banner.php
View File

@ -98,7 +98,7 @@ if (isset($_POST['update_menu']))
if ($_POST['createbanner'] || $_POST['updatebanner'])
if (vartrue($_POST['createbanner']) || vartrue($_POST['updatebanner']))
{
$start_date = (!$_POST['startmonth'] || !$_POST['startday'] || !$_POST['startyear'] ? 0 : mktime (0, 0, 0, $_POST['startmonth'], $_POST['startday'], $_POST['startyear']));
$end_date = (!$_POST['endmonth'] || !$_POST['endday'] || !$_POST['endyear'] ? 0 : mktime (0, 0, 0, $_POST['endmonth'], $_POST['endday'], $_POST['endyear']));
@ -154,7 +154,7 @@ if (isset($_POST['delete_cancel']))
header('Location:'.e_SELF);
exit;
}
if ($action == "delete" && $sub_action && varsettrue($_POST['delete_confirm']))
if (vartrue($action) == "delete" && $sub_action && varsettrue($_POST['delete_confirm']))
{
if($sql->db_Delete("banner", "banner_id=".intval($sub_action)))
{

26
e107_plugins/download/admin_download.php
View File

@ -339,11 +339,11 @@ function showLimits()
}
$txt = "
<form method='post' action='".e_SELF."?".e_QUERY."'>
<table class='adminlist'>
<table class='table adminform'>
<tr>
<td colspan='4' style='text-align:left'>
";
if ($pref['download_limits'] == 1)
if(vartrue($pref['download_limits']) == 1)
{
$chk = "checked = 'checked'";
}
@ -364,7 +364,7 @@ function showLimits()
</tr>
";
if(is_array($limitList))
if(is_array(vartrue($limitList)))
{
foreach($limitList as $row)
{
@ -453,7 +453,7 @@ function showMaint() // Deprecated.
if (!$foundSome) {
// $text .= $rs->form_open("post", e_SELF."?".e_QUERY, "myform");
$text .= '<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform">
<table class="adminlist">';
<table class="table adminform">';
$text .= '<tr>';
$text .= '<th>'.DOWLAN_13.'</th>';
$text .= '<th>'.DOWLAN_67.'</th>';
@ -509,7 +509,7 @@ function showMaint() // Deprecated.
if (!$foundSome) {
// $text .= $rs->form_open("post", e_SELF."?".e_QUERY, "myform");
$text .= '<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform">
<table class="adminlist">';
<table class="table adminform">';
$text .= '<tr>';
$text .= '<th>'.DOWLAN_13.'</th>';
$text .= '<th>'.DOWLAN_182.'</th>';
@ -602,7 +602,7 @@ function showMaint() // Deprecated.
{
// $text .= $rs->form_open("post", e_SELF."?".e_QUERY, "myform");
$text .= '<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform">
<table class="adminlist">';
<table class="table adminform">';
$text .= '<tr>';
$text .= '<th>'.DOWLAN_67.'</th>';
$text .= '<th>'.DOWLAN_27.'</th>';
@ -657,7 +657,7 @@ function showMaint() // Deprecated.
// $text .= $rs->form_open("post", e_SELF."?".e_QUERY, "myform");
$text .= '
<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform">
<table class="adminlist">';
<table class="table adminlist">';
$text .= '<tr>';
$text .= '<th>'.DOWLAN_67.'</th>';
$text .= '<th>'.DOWLAN_27.'</th>';
@ -711,7 +711,7 @@ function showMaint() // Deprecated.
if (!$foundSome) {
// $text .= $rs->form_open("post", e_SELF."?".e_QUERY, "myform");
$text .= '<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform">
<table class="adminlist">';
<table class="table adminlist">';
$text .= '<tr>';
$text .= '<th>'.DOWLAN_67.'</th>';
$text .= '<th>'.DOWLAN_27.'</th>';
@ -766,7 +766,7 @@ function showMaint() // Deprecated.
<form method='post' action='".e_SELF."?".e_QUERY."' id='core-db-main-form'>
<fieldset id='core-db-plugin-scan'>
<legend class='e-hideme'>".DOWLAN_10."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'>
<table class='table adminform'>
<colgroup span='2'>
<col style='width: 40%'></col>
<col style='width: 60%'></col>
@ -927,7 +927,7 @@ function showMaint() // Deprecated.
<div id='download_search'>
<fieldset>
<legend class='e-hideme'>".DOWLAN_194."</legend>
<table class='adminlist'>
<table class='table adminform'>
<tr>
<td>".DOWLAN_198." ".$frm->text('download-search-text', $this->searchField, 50, array('size'=>50, 'class' => 'someclass'))."&nbsp;<a href='#download_search#download_advanced_search' class='e-swapit'>Switch to Advanced-Search</a></td>
</tr>
@ -955,7 +955,7 @@ function showMaint() // Deprecated.
<div id='download_advanced_search' class='e-hideme'>
<fieldset>
<legend class='e-hideme'>".DOWLAN_183."</legend>
<table class='adminform'>
<table class='table adminform'>
<colgroup>
<col style='width:15%;'/>
<col style='width:35%;'/>
@ -1143,7 +1143,7 @@ function showMaint() // Deprecated.
."</p><p>".
DOWLAN_72.$source_file."
</p></div>
<table style='".ADMIN_WIDTH."' class='adminlist'>"
<table class='table adminform'>"
.$frm->colGroup($columnInfo)
.$frm->thead($columnInfo,$filterColumns)."
<tbody>
@ -1197,7 +1197,7 @@ function showMaint() // Deprecated.
<form method='post' action='".e_SELF."?".e_QUERY."'>
<fieldset id='core-download-upload1'>
<div>
<table style='".ADMIN_WIDTH."' class='adminlist'>
<table class='table adminform'>
<colgroup>
<col style='width:30%'/>
<col style='width:70%'/>

3
e107_plugins/download/e_help.php
View File

@ -22,7 +22,7 @@ if (e_QUERY)
$action = $tmp[0];
}
switch($action) {
switch(vartrue($action)) {
case 'create' :{
$text = DOWLAN_HELP_2;
break;
@ -71,6 +71,7 @@ switch($action) {
$text .= "</div>";
*/
$text = "";
}
}
$ns -> tablerender(DOWLAN_HELP_1, $text);

10
e107_plugins/download/includes/admin.php
View File

@ -327,9 +327,9 @@ $columnInfo = array(
public function init()
{
$this->action = $_GET['mode'];
$this->subAction = $_GET['action'];
$this->id = $_GET['id'];
$this->action = vartrue($_GET['mode']);
$this->subAction = vartrue($_GET['action']);
$this->id = vartrue($_GET['id']);
$this->observe();
@ -353,7 +353,7 @@ $columnInfo = array(
$this->fields['download_category']['readParms'] = $categories;
// Custom filter queries
if($_GET['filter_options'])
if(vartrue($_GET['filter_options']))
{
list($filter,$mode) = explode("__",$_GET['filter_options']);
@ -1297,7 +1297,7 @@ $columnInfo = array(
$text = "<div>
<form method='post' action='".e_SELF."?".e_QUERY."' id='dataform'>\n
<table style='".ADMIN_WIDTH."' class='adminlist'>
<table class='table adminform'>
<tr>
<td style='width: 30%;'>".DOWLAN_12."</td>

8
e107_plugins/faqs/faqs.php
View File

@ -25,7 +25,7 @@ require_once (e_HANDLER."userclass_class.php");
require_once (e_HANDLER."ren_help.php");
require_once (e_HANDLER."comment_class.php");
if (!$FAQ_VIEW_TEMPLATE)
if (!vartrue($FAQ_VIEW_TEMPLATE))
{
if (file_exists(THEME."faqs_template.php"))
{
@ -44,14 +44,14 @@ if (!$FAQ_VIEW_TEMPLATE)
$rs = new form;
$cobj = new comment;
if (!$_GET['elan'])
if (!vartrue($_GET['elan']))
{
$qs = explode(".", e_QUERY);
$action = $qs[0];
$id = $qs[1];
$idx = $qs[2];
}
$from = ($from ? $from : 0);
$from = (vartrue($from) ? $from : 0);
$amount = 50;
if (isset($_POST['faq_submit']))
@ -215,7 +215,7 @@ class faq
$ret['title'] = FAQLAN_FAQ;
$ret['text'] = $text;
$ret['caption'] = $caption;
$ret['caption'] = vartrue($caption);
return $ret;
}

4
e107_plugins/forum/forum.php
View File

@ -191,7 +191,7 @@ else
}
}
if (USER && $allread != TRUE && $total_new_threads && $total_new_threads >= $total_read_threads)
if (USER && vartrue($allread) != TRUE && $total_new_threads && $total_new_threads >= $total_read_threads)
{
$fVars->INFO .= "<br /><a href='".e_SELF."?mark.all.as.read'>".LAN_199.'</a>'.(e_QUERY != 'new' ? ", <a href='".e_SELF."?new'>".LAN_421."</a>" : '');
}
@ -275,7 +275,7 @@ function parse_parent($parent)
{
$status = '( '.LAN_405.' )';
}
return $status;
return vartrue($status);
}
function parse_forum($f, $restricted_string = '')

6
e107_plugins/forum/forum_admin.php
View File

@ -307,13 +307,13 @@ if (isset($_POST['frsubmit']))
}
if ($delete == 'main') {
if (vartrue($delete) == 'main') {
if ($e107->sql->db_Delete('forum', "forum_id='$del_id' ")) {
$forum->show_message(FORLAN_96);
}
}
if ($action == 'create')
if (vartrue($action) == 'create')
{
if ($e107->sql->db_Select('forum', '*', "forum_parent='0' "))
{
@ -390,7 +390,7 @@ if ($delete == 'reported')
if (!e_QUERY || $action == 'main')
{
$forum->show_existing_forums($sub_action, $id);
$forum->show_existing_forums(vartrue($sub_action), vartrue($id));
}
//$forum->show_options($action);

20
e107_plugins/forum/forum_admin_class.php
View File

@ -517,7 +517,7 @@ class forumAdmin
$text .= "<select name='forum_parent' class='tbox'>\n";
while (list($fid, $fname) = $sql->db_Fetch(MYSQL_NUM))
{
$sel = ($fid == $fInfor['forum_parent'] ? "selected='selected'" : '');
$sel = ($fid == vartrue($fInfor['forum_parent']) ? "selected='selected'" : '');
$text .= "<option value='{$fid}' {$sel}>{$fname}</option>\n";
}
$text .= "</select>
@ -527,14 +527,14 @@ class forumAdmin
<tr>
<td>".FORLAN_31.":</td>
<td>
<input class='tbox' type='text' name='forum_name' size='60' value='".$tp->toForm($fInfo['forum_name'])."' maxlength='250' /><span class='field-help'>".FORLAN_179."</span>
<input class='tbox' type='text' name='forum_name' size='60' value='".$tp->toForm(vartrue($fInfo['forum_name']))."' maxlength='250' /><span class='field-help'>".FORLAN_179."</span>
</td>
</tr>
<tr>
<td>".FORLAN_32.":</td>
<td>
<textarea class='tbox' name='forum_description' cols='50' rows='5'>".$tp->toForm($fInfo['forum_description'])."</textarea>
<textarea class='tbox' name='forum_description' cols='50' rows='5'>".$tp->toForm(vartrue($fInfo['forum_description']))."</textarea>
</td>
</tr>
@ -883,7 +883,7 @@ class forumAdmin
}
else
{
$text .= "<div style='text-align:center'>".FORLAN_121."</div>";
$text = "<div style='text-align:center'>".FORLAN_121."</div>";
}
$ns->tablerender(FORLAN_116, $text);
}
@ -1031,9 +1031,9 @@ class forumAdmin
$admin_rules = $sql->db_Fetch();
}
$guesttext = $tp->toFORM($guest_rules['gen_chardata']);
$membertext = $tp->toFORM($member_rules['gen_chardata']);
$admintext = $tp->toFORM($admin_rules['gen_chardata']);
$guesttext = $tp->toFORM(vartrue($guest_rules['gen_chardata']));
$membertext = $tp->toFORM(vartrue($member_rules['gen_chardata']));
$admintext = $tp->toFORM(vartrue($admin_rules['gen_chardata']));
$text = "
<form method='post' action='".e_SELF."?rules' id='wmform'>
@ -1044,7 +1044,7 @@ class forumAdmin
<td style='width:20%'>".WMGLAN_1.": <br />
".WMGLAN_6.":";
if ($guest_rules['gen_intdata'])
if (vartrue($guest_rules['gen_intdata']))
{
$text .= "<input type='checkbox' name='guest_active' value='1' checked='checked' />";
}
@ -1065,7 +1065,7 @@ class forumAdmin
<tr>
<td style='width:20%'>".WMGLAN_2.": <br />
".WMGLAN_6.":";
if ($member_rules['gen_intdata'])
if (vartrue($member_rules['gen_intdata']))
{
$text .= "<input type='checkbox' name='member_active' value='1' checked='checked' />";
}
@ -1087,7 +1087,7 @@ class forumAdmin
<td style='width:20%'>".WMGLAN_3.": <br />
".WMGLAN_6.": ";
if ($admin_rules['gen_intdata'])
if (vartrue($admin_rules['gen_intdata']))
{
$text .= "<input type='checkbox' name='admin_active' value='1' checked='checked' />";
}

2
e107_plugins/forum/forum_class.php
View File

@ -1198,7 +1198,7 @@ class e107forum
$threadInfo['thread_id'] = intval($threadInfo['thread_id']);
$search = array('{THREAD_TITLE}', '{THREAD_HREF}');
$replace = array($threadInfo['thread_name'], $e107->url->create('forum/thread/view', $threadInfo)); // $thread->threadInfo - no reference found
$replace = array(vartrue($threadInfo['thread_name']), $e107->url->create('forum/thread/view', $threadInfo)); // $thread->threadInfo - no reference found
$FORUM_CRUMB['thread']['value'] = str_replace($search, $replace, $FORUM_CRUMB['thread']['value']);
$FORUM_CRUMB['fieldlist'] = 'sitename,forums,parent,subparent,forum,thread';

6
e107_plugins/forum/forum_post.php
View File

@ -83,7 +83,7 @@ define('MODERATOR', USER && $forum->isModerator(USERID));
require_once(e_HANDLER.'ren_help.php');
e107::getScBatch('view', 'forum');
e107::getScBatch('post', 'forum')->setScVar('forum', $forum)->setScVar('threadInfo', $threadInfo);
e107::getScBatch('post', 'forum')->setScVar('forum', $forum)->setScVar('threadInfo', vartrue($threadInfo));
$gen = new convert;
$fp = new floodprotect;
@ -437,7 +437,7 @@ if (isset($_POST['update_reply']))
require_once(HEADERF);
if ($error)
if (vartrue($error))
{
$ns->tablerender(LAN_20, $error);
}
@ -491,7 +491,7 @@ if ($action == 'edit' || $action == 'quote')
// -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
//Load forumpost template
if (!$FORUMPOST)
if (!vartrue($FORUMPOST))
{
if (is_readable(THEME.'forum_post_template.php'))
{

33
e107_plugins/forum/forum_update_check.php
View File

@ -1,33 +0,0 @@
<?php
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
*
*
* $URL$
* $Id$
*/
if (!defined('e107_INIT')) { exit; }
$dbupdatep['forum_08'] = LAN_UPDATE_8.' 0.7.x forums '.LAN_UPDATE_9.' 0.8 forums';
// print_a($pref);
function update_forum_08($type)
{
global $sql, $mySQLdefaultdb, $pref;
if($type == 'do')
{
if(!isset($_POST['updateall']))
{
include_once(e_PLUGIN.'forum/forum_update.php');
return;
}
}
$vc = !version_compare($pref['plug_installed']['forum'], '2.0', '<');
return $vc;
}
?>

4
e107_plugins/forum/forum_viewforum.php
View File

@ -64,7 +64,7 @@ if (!$forum->checkPerm($forumId, 'view'))
$forumInfo = $forum->forumGet($forumId);
$threadsViewed = $forum->threadGetUserViewed();
if (!$FORUM_VIEW_START)
if (!vartrue($FORUM_VIEW_START))
{
if (file_exists(THEME.'forum_viewforum_template.php'))
{
@ -233,7 +233,7 @@ $reg_threads = 0;
$unstuck = false;
$threadList = $forum->forumGetThreads($forumId, $threadFrom, $view);
$subList = $forum->forumGetSubs($forum_id);
$subList = $forum->forumGetSubs(vartrue($forum_id));
$gen = new convert;
$fVars->SUBFORUMS = '';

10
e107_plugins/forum/forum_viewtopic.php
View File

@ -138,7 +138,7 @@ if (file_exists(THEME . 'forum_design.php'))
{
include_once (THEME . 'forum_design.php');
}
if (!$FORUMSTART)
if (!vartrue($FORUMSTART))
{
if (file_exists(THEME . 'forum_viewtopic_template.php'))
{
@ -215,7 +215,7 @@ if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'thread'))
$tVars->BUTTONS .= "<a href='" . $e107->url->create('forum/thread/new', array('id' => $thread->threadInfo['thread_forum_id'])) . "'>" . IMAGE_newthread . "</a>";
}
$tVars->POLL = $pollstr;
$tVars->POLL = vartrue($pollstr);
$tVars->FORUMJUMP = forumjump();
@ -265,14 +265,14 @@ foreach ($postList as $postInfo)
{
$postInfo['thread_start'] = true;
e107::getScBatch('view', 'forum')->setScVar('postInfo', $postInfo);
$forthr = $e107->tp->parseTemplate($FORUMTHREADSTYLE, true, $forum_shortcodes) . "\n";
$forthr = $e107->tp->parseTemplate($FORUMTHREADSTYLE, true, vartrue($forum_shortcodes)) . "\n";
}
}
unset($loop_uid);
if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread->threadInfo['thread_active'])
{
if (!$forum_quickreply)
if (!vartrue($forum_quickreply))
{
$tVars->QUICKREPLY = "
<form action='" . $e107->url->create('forum/thread/reply', array('id' => $thread->threadId)) . "' method='post'>
@ -293,7 +293,7 @@ if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread
$forend = $tp->simpleParse($FORUMEND, $tVars);
$forumstring = $forstr . $forthr . $forrep . $forend;
$forumstring = $forstr . $forthr . vartrue($forrep) . $forend;
//If last post came after USERLV and not yet marked as read, mark the thread id as read
$threadsViewed = explode(',', $currentUser['user_plugin_forum_viewed']);

6
e107_plugins/forum/shortcodes/batch/post_shortcodes.php
View File

@ -130,7 +130,7 @@ class plugin_forum_post_shortcodes extends e_shortcode
global $action, $threadInfo;
if (MODERATOR && $action == "nt")
{
$thread_sticky = (isset($_POST['threadtype']) ? $_POST['threadtype'] : $threadInfo['thread_sticky']); // no reference of 'head' $threadInfo['head']['thread_sticky']
$thread_sticky = (isset($_POST['threadtype']) ? $_POST['threadtype'] : vartrue($threadInfo['thread_sticky'])); // no reference of 'head' $threadInfo['head']['thread_sticky']
return "<br /><span class='defaulttext'>".LAN_400."<input name='threadtype' type='radio' value='0' ".(!$thread_sticky ? "checked='checked' " : "")." />".LAN_1."&nbsp;<input name='threadtype' type='radio' value='1' ".($thread_sticky == 1 ? "checked='checked' " : "")." />".LAN_2."&nbsp;<input name='threadtype' type='radio' value='2' ".($thread_sticky == 2 ? "checked='checked' " : "")." />".LAN_3."</span>";
}
return '';
@ -147,7 +147,7 @@ class plugin_forum_post_shortcodes extends e_shortcode
function sc_noemotes()
{
if($eaction == true) { return ; }
if(vartrue($eaction) == true) { return ; }
return "<input type='checkbox' name='no_emote' value='1' />&nbsp;<span class='defaulttext'>".LAN_FORUMPOST_EMOTES.'</span>';
}
@ -158,7 +158,7 @@ class plugin_forum_post_shortcodes extends e_shortcode
$pref = e107::getPlugPref('forum');
if($eaction == true) { return ; }
if ($pref['notify'] && $action == 'nt' && USER)
if (vartrue($pref['notify']) && $action == 'nt' && USER)
{
if(isset($_POST['fpreview']))
{

26
e107_plugins/forum/templates/forum_post_template.php
View File

@ -16,28 +16,28 @@ if(!defined("USER_WIDTH")){ define("USER_WIDTH","width:95%"); }
// the user box and subject box are not always displayed, therefore we need to define them /in case/ they are, if not they'll be ignored.
if(!$userbox)
if(!vartrue($userbox))
{
$userbox = "<tr>
<td class='forumheader2' style='width:20%'>".LAN_61."</td>
<td class='forumheader2' style='width:80%'>
<input class='tbox' type='text' name='anonname' size='71' value='".$anonname."' maxlength='20' style='width:95%' />
<input class='tbox' type='text' name='anonname' size='71' value='".vartrue($anonname)."' maxlength='20' style='width:95%' />
</td>
</tr>";
}
if(!$subjectbox)
if(!vartrue($subjectbox))
{
$subjectbox = "<tr>
<td class='forumheader2' style='width:20%'>".LAN_62."</td>
<td class='forumheader2' style='width:80%'>
<input class='tbox' type='text' name='subject' size='71' value='".$subject."' maxlength='100' style='width:95%' />
<input class='tbox' type='text' name='subject' size='71' value='".vartrue($subject)."' maxlength='100' style='width:95%' />
</td>
</tr>";
}
// the poll is optional, be careful when changing the values here, only change if you know what you're doing ...
if(!$poll_form)
if(!vartrue($poll_form))
{
if(is_readable(e_PLUGIN.'poll/poll_class.php')) {
require_once(e_PLUGIN.'poll/poll_class.php');
@ -47,7 +47,7 @@ if(!$poll_form)
}
// finally, file attach is optional, again only change this if you know what you're doing ...
if(!$fileattach)
if(!vartrue($fileattach))
{
$fileattach = "
<tr>
@ -55,7 +55,7 @@ $fileattach = "
</tr>
<tr>
<td style='width:20%' class='forumheader3'>".LAN_392."</td>
<td style='width:80%' class='forumheader3'>".LAN_393." | ".$allowed_filetypes." |<br />".LAN_394."<br />".LAN_395.": ".($max_upload_size ? $max_upload_size.LAN_396 : ini_get('upload_max_filesize'))."
<td style='width:80%' class='forumheader3'>".LAN_393." | ".vartrue($allowed_filetypes)." |<br />".LAN_394."<br />".LAN_395.": ".(vartrue($max_upload_size) ? $max_upload_size.LAN_396 : ini_get('upload_max_filesize'))."
<br />
<div id='fiupsection'>
<span id='fiupopt'>
@ -70,7 +70,7 @@ $fileattach = "
//</tr>
}
// If the upload directory is not writable, we need to alert the user about this.
if(!$fileattach_alert)
if(!vartrue($fileattach_alert))
{
$fileattach_alert = "
<tr>
@ -126,7 +126,7 @@ $FORUMPOST = "
";
}
if(!$FORUMPOST_REPLY)
if(!vartrue($FORUMPOST_REPLY))
{
$FORUMPOST_REPLY = "
<div style='text-align:center'>
@ -176,7 +176,7 @@ $FORUMPOST_REPLY = "
";
}
if(!$LATESTPOSTS_START)
if(!vartrue($LATESTPOSTS_START))
{
$LATESTPOSTS_START = "
<table style='".USER_WIDTH."' class='fborder'>
@ -187,7 +187,7 @@ LAN_101."{LATESTPOSTSCOUNT}".LAN_102."
</tr>";
}
if(!$LATESTPOSTS_POST)
if(!vartrue($LATESTPOSTS_POST))
{
$LATESTPOSTS_POST = "
<tr>
@ -200,14 +200,14 @@ $LATESTPOSTS_POST = "
";
}
if(!$LATESTPOSTS_END)
if(!vartrue($LATESTPOSTS_END))
{
$LATESTPOSTS_END = "
</table>
";
}
if(!$THREADTOPIC_REPLY)
if(!vartrue($THREADTOPIC_REPLY))
{
$THREADTOPIC_REPLY = "
<table style='".USER_WIDTH."' class='fborder'>

2
e107_plugins/gallery/gallery.php
View File

@ -43,7 +43,7 @@ class gallery
{
$this->catList = e107::getMedia()->getCategories('gallery');
if(($_GET['cat']) && isset($this->catList[$_GET['cat']]))
if((vartrue($_GET['cat'])) && isset($this->catList[$_GET['cat']]))
{
$this->showImages($_GET['cat']);
}

10
e107_plugins/gsitemap/admin_config.php
View File

@ -87,7 +87,7 @@ class gsitemap
{
$this -> instructions();
}
else if(!$_POST['edit'])
else if(!vartrue($_POST['edit']))
{
$this -> showList();
}
@ -107,7 +107,7 @@ class gsitemap
if (!$count)
{
$text .= "
$text = "
<form action='".e_SELF."?import' id='import' method='post'>
".GSLAN_39."<br /><br />"
.$frm->admin_button('import',LAN_YES,'submit')."
@ -151,7 +151,7 @@ class gsitemap
foreach($glArray as $row2)
{
$datestamp = $gen->convert_date($row2['gsitemap_lastmod'], "short");
$rowStyle = ($rowStyle == "odd") ? "even" : "odd";
$rowStyle = (vartrue($rowStyle) == "odd") ? "even" : "odd";
$text .= "<tr class='{$rowStyle}'>
<td style='; text-align: center;'>".$row2['gsitemap_id'] ."</td>
@ -457,7 +457,7 @@ class gsitemap
for ($i=0.1; $i<1.0; $i=$i+0.1)
{
$sel = ($editArray['gsitemap_priority'] == number_format($i,1))? "selected='selected'" : "";
$sel = (vartrue($editArray['gsitemap_priority']) == number_format($i,1))? "selected='selected'" : "";
$text .= "<option value='".number_format($i,1)."' $sel>".number_format($i,1)."</option>\n";
};
@ -467,7 +467,7 @@ class gsitemap
<select class='tbox' name='import_freq' >\n";
foreach($this->freq_list as $k=>$fq)
{
$sel = ($editArray['gsitemap_freq'] == $k)? "selected='selected'" : "";
$sel = (vartrue($editArray['gsitemap_freq']) == $k)? "selected='selected'" : "";
$text .= "<option value='{$k}' {$sel}>{$fq}</option>\n";
}

2
e107_plugins/links_page/admin_linkspage_config.php
View File

@ -311,7 +311,7 @@ function admin_linkspage_config_adminmenu()
$var[$row['link_category_id']]['text'] = $row['link_category_name'];
$var[$row['link_category_id']]['link'] = e_SELF."?link.view.".$row['link_category_id'];
}
$active = ($qs[0] == 'link') ? $id : FALSE;
$active = ($qs[0] == 'link') ? vartrue($id) : FALSE;
show_admin_menu(LCLAN_ADMINMENU_8, $active, $var);
}
}

2
e107_plugins/links_page/e_help.php
View File

@ -1,7 +1,7 @@
<?php
if (!defined('e107_INIT')) { exit; }
include_lan($plugindir."languages/".e_LANGUAGE."_admin_links_page.php");
include_lan(e_PLUGIN."/links_page/languages/".e_LANGUAGE."_admin_links_page.php");
if(!e_QUERY)
{

20
e107_plugins/links_page/e_latest.php
View File

@ -1,6 +1,22 @@
<?php
if (!defined('e107_INIT')) { exit; }
$submitted_links = $sql->db_Select("tmp", "*", "tmp_ip='submitted_link' ");
$text .= "<div style='padding-bottom: 2px;'><img src='".e_PLUGIN_ABS."links_page/images/linkspage_16.png' style='width: 16px; height: 16px; vertical-align: bottom' alt='' />".($submitted_links ? " <a href='".e_PLUGIN_ABS."links_page/admin_linkspage_config.php?sn'>".ADLAN_LAT_5.": $submitted_links</a>" : " ".ADLAN_LAT_5.": ".$submitted_links)."</div>";
class links_page_latest
{
function config()
{
$sql = e107::getDb();
$submitted_links = $sql->db_Select("tmp", "*", "tmp_ip='submitted_link'");
$var[0]['icon'] = E_16_LINKSPAGE;
$var[0]['title'] = ADLAN_LAT_5;
$var[0]['url'] = e_PLUGIN."links_page/admin_linkspage_config.php?sn";
$var[0]['total'] = $submitted_links;
return $var;
}
}
?>

19
e107_plugins/links_page/e_status.php
View File

@ -1,7 +1,20 @@
<?php
if (!defined('e107_INIT')) { exit; }
include_lan(e_PLUGIN."links_page/languages/".e_LANGUAGE."_admin_links_page.php");
$count = $sql -> db_Count("links_page", "(*)");
$text .= "<div style='padding-bottom: 2px;'><img src='".e_PLUGIN_ABS."links_page/images/linkspage_16.png' style='width: 16px; height: 16px; vertical-align: bottom' alt='' /> ".LCLAN_ADMIN_14.": ".$count."</div>";
class links_page_status // include plugin-folder in the name.
{
function config()
{
$sql = e107::getDb();
$links_page_links = $sql->db_Count("links_page", "(*)");
$var[0]['icon'] = E_16_LINKSPAGE;
$var[0]['title'] = LCLAN_ADMIN_14;
$var[0]['url'] = e_PLUGIN."links_page/admin_linkspage_config.php";
$var[0]['total'] = $links_page_links;
return $var;
}
}
?>

4
e107_plugins/links_page/link_class.php
View File

@ -806,7 +806,7 @@ class linkclass
</tr>";
//triggerHook
$data = array('method'=>'form', 'table'=>'links_page', 'id'=>$row['link_id'], 'plugin'=>'links_page', 'function'=>'show_link_create');
$data = array('method'=>'form', 'table'=>'links_page', 'id'=>vartrue($row['link_id']), 'plugin'=>'links_page', 'function'=>'show_link_create');
$text .= $frm->renderHooks($data);
$text .= "
@ -1036,7 +1036,7 @@ class linkclass
<tr>
<td>".LCLAN_CAT_24."</td>
<td>
".r_userclass("link_category_class", $row['link_category_class'], "off", "public,guest,nobody,member,admin,classes")."
".r_userclass("link_category_class", vartrue($row['link_category_class']), "off", "public,guest,nobody,member,admin,classes")."
</td>
</tr>
<tr><td colspan='2' style='text-align:center'>";

2
e107_plugins/linkwords/e_tohtml.php
View File

@ -89,7 +89,7 @@ class e_tohtml_linkwords
$this->lw_enabled = TRUE;
}
}
if (!$temp)
if (!vartrue($temp))
{ // Either cache disabled, or no info in cache (or error reading/processing cache)
$link_sql = new db;
if($link_sql -> db_Select("linkwords", "*", "linkword_active!=1"))

23
e107_plugins/log/admin_config.php
View File

@ -286,7 +286,7 @@ function data_type_select($name,$value)
switch ($action)
{
case 'config' :
$text = "<div style='text-align:center'>
$text = "
<form method='post' action='".e_SELF."'>
<table class='table adminform'>
<colgroup>
@ -296,7 +296,7 @@ switch ($action)
<tr>
<td>".ADSTAT_L4."</td>
<td style='text-align: right;'>
<td>
<input type='radio' name='statActivate' value='1'".($pref['statActivate'] ? " checked='checked'" : "")." /> ".ADSTAT_ON."&nbsp;&nbsp;
<input type='radio' name='statActivate' value='0'".(!$pref['statActivate'] ? " checked='checked'" : "")." /> ".ADSTAT_OFF."
</td>
@ -304,12 +304,12 @@ switch ($action)
<tr>
<td>".ADSTAT_L18."</td>
<td style='text-align: right;'>".r_userclass("statUserclass", $pref['statUserclass'],'off','public, member, admin, classes')."</td>
<td>".r_userclass("statUserclass", $pref['statUserclass'],'off','public, member, admin, classes')."</td>
</tr>
<tr>
<td>".ADSTAT_L20."</td>
<td style='text-align: right;'>
<td>
<input type='radio' name='statCountAdmin' value='1'".($pref['statCountAdmin'] ? " checked='checked'" : "")." /> ".ADSTAT_ON."&nbsp;&nbsp;
<input type='radio' name='statCountAdmin' value='0'".(!$pref['statCountAdmin'] ? " checked='checked'" : "")." /> ".ADSTAT_OFF."
</td>
@ -317,14 +317,14 @@ switch ($action)
<tr>
<td>".ADSTAT_L21."</td>
<td style='text-align: right;'>
<td>
<input class='tbox' type='text' name='statDisplayNumber' size='8' value='".$pref['statDisplayNumber']."' maxlength='3' />
</td>
</tr>
<tr>
<td>".ADSTAT_L5."</td>
<td style='text-align: right'>
<td>
".gen_select(ADSTAT_L6, 'statBrowser',$pref['statBrowser'])
.gen_select(ADSTAT_L7, 'statOs',$pref['statOs'])
.gen_select(ADSTAT_L8, 'statScreen',$pref['statScreen'])
@ -340,13 +340,13 @@ switch ($action)
<tr>
<td>".ADSTAT_L78."<br /><span class='smalltext'>".ADSTAT_L79."</span></td>
<td style='text-align: right;'>
<td>
<input type='checkbox' name='statPrevMonth' value='1'".(varset($pref['statPrevMonth'],0) ? " checked='checked'" : "")." />
</td></tr>
<tr>
<td>".ADSTAT_L12."<br /><span class='smalltext'>".ADSTAT_L13."</span></td>
<td style='text-align: right;'>
<td>
".ADSTAT_L14."<input type='checkbox' name='wipe[statWipePage]' value='1' /><br />
".ADSTAT_L6."<input type='checkbox' name='wipe[statWipeBrowser]' value='1' /><br />
".ADSTAT_L7." <input type='checkbox' name='wipe[statWipeOs]' value='1' /><br />
@ -360,7 +360,7 @@ switch ($action)
<tr>
<td>".ADSTAT_L26."<br /><span class='smalltext'>".ADSTAT_L27."</span></td>
<td style='text-align: right;'><input class='button' type='submit' name='openRemPageD' value='".ADSTAT_L28."' />
<td><input class='button' type='submit' name='openRemPageD' value='".ADSTAT_L28."' />
</td>
</tr>
";
@ -369,10 +369,9 @@ switch ($action)
</tr>
</table>
<div class='buttons-bar center'>
".$frm->admin_button('updatesettings', LAN_UPDATE, 'update')."
".$frm->admin_button('updatesettings', LAN_UPDATE, 'update')."
</div>
</form>
</div>";
</form>";
$ns->tablerender(ADSTAT_L16, $text);
break; // case config

22
e107_plugins/log/stats.php
View File

@ -938,20 +938,20 @@ class siteStats
require($logfile);
}
$this -> filesiteTotal = $siteTotal;
$this -> filesiteUnique = $siteUnique;
$this -> filesiteTotal = vartrue($siteTotal);
$this -> filesiteUnique = vartrue($siteUnique);
/* set order var */
$this -> order = $order;
$this -> fileInfo = $pageInfo;
$this -> fileBrowserInfo = $browserInfo;
$this -> fileOsInfo = $osInfo;
$this -> fileScreenInfo = $screenInfo;
$this -> fileDomainInfo = $domainInfo;
$this -> fileReferInfo = $refInfo;
$this -> fileQueryInfo = $searchInfo;
$this -> fileRecent = $visitInfo;
$this -> fileInfo = vartrue($pageInfo);
$this -> fileBrowserInfo = vartrue($browserInfo);
$this -> fileOsInfo = vartrue($osInfo);
$this -> fileScreenInfo = vartrue($screenInfo);
$this -> fileDomainInfo = vartrue($domainInfo);
$this -> fileReferInfo = vartrue($refInfo);
$this -> fileQueryInfo = vartrue($searchInfo);
$this -> fileRecent = vartrue($visitInfo);
/* get main stat info from database */
if($sql -> db_Select('logstats', 'log_data', "log_id='pageTotal'"))
@ -1034,7 +1034,7 @@ class siteStats
if ($do_errors XOR !$found)
{
$totalArray[$k] = $v;
$total += $v['ttlv'];
$total += vartrue($v['ttlv']);
}
}
$totalArray = $this -> arraySort($totalArray, "ttl");

2
e107_plugins/metaweblog/admin_config.php
View File

@ -15,7 +15,7 @@ if(!getperms("P")){ header("location:".e_BASE."index.php"); exit; }
include_lan(e_PLUGIN."metaweblog/languages/".e_LANGUAGE.".php");
require_once(e_ADMIN."auth.php");
$text .= XMLRPC_HELP_011;
$text = XMLRPC_HELP_011;
$ns -> tablerender(XMLRPC_CONFIG_001, $text);
require_once(e_ADMIN."footer.php");
?>

44
e107_plugins/newforumposts_main/admin_config.php
View File

@ -26,67 +26,67 @@ require_once (e_HANDLER.'userclass_class.php');
include_lan(e_PLUGIN.'newforumposts_main/languages/'.e_LANGUAGE.'.php');
require_once (e_ADMIN.'auth.php');
$frm = e107::getForm();
if(isset($_POST['updatesettings']))
{
$pref['nfp_display'] = $_POST['nfp_display'];
$pref['nfp_caption'] = $_POST['nfp_caption'];
$pref['nfp_amount'] = $_POST['nfp_amount'];
$pref['nfp_layer'] = $_POST['nfp_layer'];
$pref['nfp_posts'] = $_POST['nfp_posts'];
$pref['nfp_layer'] = vartrue($_POST['nfp_layer']);
$pref['nfp_posts'] = vartrue($_POST['nfp_posts']);
$pref['nfp_layer_height'] = ($_POST['nfp_layer_height'] ? $_POST['nfp_layer_height'] : 200);
save_prefs();
$message = "".NFPM_L14."";
$message = "".NFPM_L13."";
}
if($message)
if(vartrue($message))
{
$ns->tablerender("", "<div style='text-align:center'><b>$message</b></div>");
}
$text = "<div style='text-align:center'>
$text = "
<form method='post' action='".e_SELF."?".e_QUERY."' id='menu_conf_form'>
<table style='width:85%' class='fborder'>
<table class='table adminform'>
<tr>
<td style='width:40%' class='forumheader3'>".NFPM_L4."</td>
<td style='width:60%' class='forumheader3'>
<td>".NFPM_L4."</td>
<td>
<select class='tbox' name='nfp_display'>".($pref['nfp_display'] == "0" ? "<option value='0' selected='selected'>".NFPM_L5."</option>" : "<option value='0'>".NFPM_L5."</option>").($pref['nfp_display'] == "1" ? "<option value='1' selected='selected'>".NFPM_L6."</option>" : "<option value='1'>".NFPM_L6."</option>").($pref['nfp_display'] == "2" ? "<option value='2' selected='selected'>".NFPM_L7."</option>" : "<option value='2'>".NFPM_L7."</option>")."</select>
</td>
</tr>
<tr>
<td style='width:40%' class='forumheader3'>".NFPM_L8.": </td>
<td style='width:60%' class='forumheader3'>
<td>".NFPM_L8.": </td>
<td>
<input class='tbox' type='text' name='nfp_caption' size='20' value='".$pref['nfp_caption']."' maxlength='100' />
</td>
</tr>
<tr>
<td style='width:40%' class='forumheader3'>".NFPM_L9.": </td>
<td style='width:60%' class='forumheader3'>
<td>".NFPM_L9.": </td>
<td>
<input class='tbox' type='text' name='nfp_amount' size='6' value='".$pref['nfp_amount']."' maxlength='3' />
</td>
</tr>
<tr>
<td class='forumheader3' style='width:40%'>".NFPM_L15." </td>
<td class='forumheader3' style='width:60%'>".($pref['nfp_posts'] ? "<input type='checkbox' name='nfp_posts' value='1' checked='checked' />" : "<input type='checkbox' name='nfp_posts' value='1' />")."
<td>".NFPM_L14."</td>
<td>".(vartrue($pref['nfp_posts']) ? "<input type='checkbox' name='nfp_posts' value='1' checked='checked' />" : "<input type='checkbox' name='nfp_posts' value='1' />")."<span class='field-help'>".NFPM_L15."</span>
</td>
</tr>
<tr>
<td class='forumheader3' style='width:40%'>".NFPM_L10.": </td>
<td class='forumheader3' style='width:60%'>".($pref['nfp_layer'] ? "<input type='checkbox' name='nfp_layer' value='1' checked='checked' />" : "<input type='checkbox' name='nfp_layer' value='1' />")."&nbsp;&nbsp;".NFPM_L11.": <input class='tbox' type='text' name='nfp_layer_height' size='8' value='".$pref['nfp_layer_height']."' maxlength='3' />
<td>".NFPM_L10.": </td>
<td>".(vartrue($pref['nfp_layer']) ? "<input type='checkbox' name='nfp_layer' value='1' checked='checked' />" : "<input type='checkbox' name='nfp_layer' value='1' />")."&nbsp;&nbsp;".NFPM_L11.": <input class='tbox' type='text' name='nfp_layer_height' size='8' value='".vartrue($pref['nfp_layer_height'])."' maxlength='3' />
</td>
</tr>
<tr>
<td colspan='2' class='forumheader' style='text-align:center'><input class='button' type='submit' name='updatesettings' value='".NFPM_L13."' /></td>
</tr>
</table>
</form>
</div>";
<div class='buttons-bar center'>
".$frm->admin_button('updatesettings', LAN_UPDATE, 'update')."
</div>
</form> ";
$ns->tablerender(NFPM_L12, $text);
require_once (e_ADMIN."footer.php");

6
e107_plugins/newforumposts_main/languages/English.php
View File

@ -20,9 +20,9 @@ define("NFPM_L9", "Number of new posts to display?");
define("NFPM_L10", "Display inside scrolling layer?");
define("NFPM_L11", "Layer height");
define("NFPM_L12", "New Forum Posts Configuration");
define("NFPM_L13", "Update New Forum Posts Settings");
define("NFPM_L14", "New Forum Posts settings updated.");
define("NFPM_L15", "Check to display latest forum posts.<br />Default is latest topics.");
define("NFPM_L13", "New Forum Posts settings updated.");
define("NFPM_L14", "Check to display latest forum posts.");
define("NFPM_L15", "Default is latest topics.");
define('NFPM_L16', '[user deleted]');
define('NFPM_L17', 'New Posts on Popular Thread');
define('NFPM_L18', 'New Posts');

4
e107_plugins/newsfeed/admin_config.php
View File

@ -102,7 +102,7 @@ if($headline_total = $sql->db_Select("newsfeed"))
{
$nfArray = $sql -> db_getList();
$text = "<div style='text-align:center'>
$text = "
<table class='table adminform'>
<colgroup>
<col style='width: 5%; text-align: center;' />
@ -134,7 +134,7 @@ if($headline_total = $sql->db_Select("newsfeed"))
</tr>\n";
}
$text .= "</table>\n</div>";
$text .= "</table>";
}
else
{

2
e107_plugins/newsfeed/e_frontpage.php
View File

@ -23,7 +23,7 @@ if (!plugInstalled('newsfeed'))
include_lan(e_PLUGIN.'newsfeed/languages/'.e_LANGUAGE.'_frontpage.php');
$front_page['newsfeed']['title'] = NWSF_FP_1.': '.$row['content_heading'];
$front_page['newsfeed']['title'] = NWSF_FP_1.': '.vartrue($row['content_heading']);
$front_page['newsfeed']['page'][] = array('page' => $PLUGINS_DIRECTORY.'newsfeed/newsfeed.php', 'title' => NWSF_FP_2);
if ($sql -> db_Select("newsfeed", "newsfeed_id, newsfeed_name")) {

2
e107_plugins/newsfeed/newsfeed.php
View File

@ -79,7 +79,7 @@ if (count($newsFeed->feedList))
}
}
$text = $NEWSFEED_LIST_START . $data . $NEWSFEED_LIST_END;
$text = $NEWSFEED_LIST_START . vartrue($data) . $NEWSFEED_LIST_END;
$ns->tablerender(NFLAN_29, $text);
require_once(FOOTERF);

74
e107_plugins/pdf/admin_pdf_config.php
View File

@ -80,7 +80,8 @@ function getDefaultPDFPrefs()
function getPDFPrefs()
{
global $sql, $eArrayStorage;
global $eArrayStorage;
$sql = e107::getDb();
if(!is_object($sql)){ $sql = new db; }
$num_rows = $sql -> db_Select("core", "*", "e107_name='pdf' ");
@ -184,27 +185,26 @@ foreach ($fontList as $font => $info)
$text = "
<div style='text-align:center'>
".$rs -> form_open("post", e_SELF, "pdfform", "", "enctype='multipart/form-data'")."
<table class='fborder' style='".ADMIN_WIDTH."'>
<table class='table adminform'>
<tr>
<td class='forumheader3' style='width:30%; white-space:nowrap;'>".PDF_LAN_5."</td>
<td class='forumheader3' style='width:70%;'>".$rs -> form_text("pdf_margin_left", 10, $pdfpref['pdf_margin_left'], 10)."</td>
<td>".PDF_LAN_5."</td>
<td>".$rs -> form_text("pdf_margin_left", 10, $pdfpref['pdf_margin_left'], 10)."</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%; white-space:nowrap;'>".PDF_LAN_6."</td>
<td class='forumheader3' style='width:70%;'>".$rs -> form_text("pdf_margin_right", 10, $pdfpref['pdf_margin_right'], 10)."</td>
<td>".PDF_LAN_6."</td>
<td>".$rs -> form_text("pdf_margin_right", 10, $pdfpref['pdf_margin_right'], 10)."</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%; white-space:nowrap;'>".PDF_LAN_7."</td>
<td class='forumheader3' style='width:70%;'>".$rs -> form_text("pdf_margin_top", 10, $pdfpref['pdf_margin_top'], 10)."</td>
<td>".PDF_LAN_7."</td>
<td>".$rs -> form_text("pdf_margin_top", 10, $pdfpref['pdf_margin_top'], 10)."</td>
</tr>";
$text .= "
<tr>
<td class='forumheader3' style='width:30%; white-space:nowrap;'>".PDF_LAN_8."</td>
<td class='forumheader3' style='width:70%;'>
<td>".PDF_LAN_8."</td>
<td>
".$rs -> form_select_open("pdf_font_family");
foreach($coreList as $font => $info)
{
@ -215,70 +215,68 @@ $text .= "
</tr>
<tr>
<td class='forumheader3' style='width:30%; white-space:nowrap;'>".PDF_LAN_9."</td>
<td class='forumheader3' style='width:70%;'>".$rs -> form_text("pdf_font_size", 10, $pdfpref['pdf_font_size'], 10)."</td>
<td>".PDF_LAN_9."</td>
<td>".$rs -> form_text("pdf_font_size", 10, $pdfpref['pdf_font_size'], 10)."</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%; white-space:nowrap;'>".PDF_LAN_10."</td>
<td class='forumheader3' style='width:70%;'>".$rs -> form_text("pdf_font_size_sitename", 10, $pdfpref['pdf_font_size_sitename'], 10)."</td>
<td>".PDF_LAN_10."</td>
<td>".$rs -> form_text("pdf_font_size_sitename", 10, $pdfpref['pdf_font_size_sitename'], 10)."</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%; white-space:nowrap;'>".PDF_LAN_11."</td>
<td class='forumheader3' style='width:70%;'>".$rs -> form_text("pdf_font_size_page_url", 10, $pdfpref['pdf_font_size_page_url'], 10)."</td>
<td>".PDF_LAN_11."</td>
<td>".$rs -> form_text("pdf_font_size_page_url", 10, $pdfpref['pdf_font_size_page_url'], 10)."</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%; white-space:nowrap;'>".PDF_LAN_12."</td>
<td class='forumheader3' style='width:70%;'>".$rs -> form_text("pdf_font_size_page_number", 10, $pdfpref['pdf_font_size_page_number'], 10)."</td>
<td>".PDF_LAN_12."</td>
<td>".$rs -> form_text("pdf_font_size_page_number", 10, $pdfpref['pdf_font_size_page_number'], 10)."</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%; white-space:nowrap;'>".PDF_LAN_13."</td>
<td class='forumheader3' style='width:70%;'>
<td>".PDF_LAN_13."</td>
<td>
".$rs -> form_radio("pdf_show_logo", "1", ($pdfpref['pdf_show_logo'] ? "1" : "0"), "", "").PDF_LAN_3."
".$rs -> form_radio("pdf_show_logo", "0", ($pdfpref['pdf_show_logo'] ? "0" : "1"), "", "").PDF_LAN_4."
</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%; white-space:nowrap;'>".PDF_LAN_14."</td>
<td class='forumheader3' style='width:70%;'>
<td>".PDF_LAN_14."</td>
<td>
".$rs -> form_radio("pdf_show_sitename", "1", ($pdfpref['pdf_show_sitename'] ? "1" : "0"), "", "").PDF_LAN_3."
".$rs -> form_radio("pdf_show_sitename", "0", ($pdfpref['pdf_show_sitename'] ? "0" : "1"), "", "").PDF_LAN_4."
</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%; white-space:nowrap;'>".PDF_LAN_15."</td>
<td class='forumheader3' style='width:70%;'>
<td>".PDF_LAN_15."</td>
<td>
".$rs -> form_radio("pdf_show_page_url", "1", ($pdfpref['pdf_show_page_url'] ? "1" : "0"), "", "").PDF_LAN_3."
".$rs -> form_radio("pdf_show_page_url", "0", ($pdfpref['pdf_show_page_url'] ? "0" : "1"), "", "").PDF_LAN_4."
</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%; white-space:nowrap;'>".PDF_LAN_16."</td>
<td class='forumheader3' style='width:70%;'>
<td>".PDF_LAN_16."</td>
<td>
".$rs -> form_radio("pdf_show_page_number", "1", ($pdfpref['pdf_show_page_number'] ? "1" : "0"), "", "").PDF_LAN_3."
".$rs -> form_radio("pdf_show_page_number", "0", ($pdfpref['pdf_show_page_number'] ? "0" : "1"), "", "").PDF_LAN_4."
</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%; white-space:nowrap;'>".PDF_LAN_20."</td>
<td class='forumheader3' style='width:70%;'>
<td>".PDF_LAN_20."</td>
<td>
".$rs -> form_radio("pdf_error_reporting", "1", ($pdfpref['pdf_error_reporting'] ? "1" : "0"), "", "").PDF_LAN_3."
".$rs -> form_radio("pdf_error_reporting", "0", ($pdfpref['pdf_error_reporting'] ? "0" : "1"), "", "").PDF_LAN_4."
</td>
</tr>
<tr>
<td style='text-align:center' class='forumheader' colspan='2'>".$rs -> form_button("submit", "update_pdf", PDF_LAN_17)."</td>
</tr>
</table>
<div class='buttons-bar center'>
".$rs -> form_button("submit", "update_pdf", PDF_LAN_17)."
</div>
".$rs -> form_close()."
</div>";
";
$ns -> tablerender(PDF_LAN_2, $text);
$text = "<div style='text-align:center;>\n
<table cellpadding='0' cellspacing='0' class='adminform'>
$text = "
<table class='table adminform'>
<tr><th>".PDF_LAN_21."</th><th>".PDF_LAN_22."</th><th>".PDF_LAN_23."</th>
<th>".PDF_LAN_24."</th><th title='".PDF_LAN_25."'>".PDF_LAN_26."</th></tr>\n";
@ -292,7 +290,7 @@ foreach ($fontList as $font => $info)
$text .= "<tr><td>{$font}</td><td>{$info['info']['type']}</td><td>{$variants}</td><td>{$info['info']['weight']}</td><td>{$info['info']['codes']}</td></tr>\n";
}
$text .= "</table></div>";
$text .= "</table>";
$ns->tablerender(PDF_LAN_31, $text);

276
e107_plugins/pm/private_msg_menu.php
View File

@ -1,139 +1,139 @@
<?php
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* PM plugin - menu display
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/pm/private_msg_menu.php,v $
* $Revision$
* $Date$
* $Author$
*/
/**
* e107 Private messenger plugin
*
* @package e107_plugins
* @subpackage pm
* @version $Id$;
*/
if (!defined('e107_INIT')) { exit; }
if (!e107::isInstalled('pm')) { return ''; }
global $sysprefs, $pm_prefs;
if(!isset($pm_prefs['perpage']))
{
$pm_prefs = $sysprefs->getArray('pm_prefs');
}
require_once(e_PLUGIN.'pm/pm_func.php');
e107::getScParser();
require_once(e_PLUGIN.'pm/pm_shortcodes.php');
setScVar('pm_handler_shortcodes','pmPrefs', $pm_prefs);
$pmManager = new pmbox_manager($pm_prefs);
setScVar('pm_handler_shortcodes','pmManager', &$pmManager);
define('PM_INBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_get.png' class='icon S16' alt='".LAN_PM_25."' title='".LAN_PM_25."' />");
define('PM_OUTBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_send.png' class='icon S16' alt='".LAN_PM_26."' title='".LAN_PM_26."' />");
define('PM_SEND_LINK', LAN_PM_35);
define('NEWPM_ANIMATION', "<img src='".e_PLUGIN_ABS."pm/images/newpm.gif' alt='' />");
$sc_style['PM_SEND_PM_LINK']['pre'] = "<br /><br />[ ";
$sc_style['PM_SEND_PM_LINK']['post'] = " ]";
$sc_style['PM_INBOX_FILLED']['pre'] = "[";
$sc_style['PM_INBOX_FILLED']['post'] = "%]";
$sc_style['PM_OUTBOX_FILLED']['pre'] = "[";
$sc_style['PM_OUTBOX_FILLED']['post'] = "%]";
$sc_style['PM_NEWPM_ANIMATE']['pre'] = "<a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>";
$sc_style['PM_NEWPM_ANIMATE']['post'] = "</a>";
$sc_style['PM_BLOCKED_SENDERS_MANAGE']['pre'] = "<br />[ <a href='".e_PLUGIN_ABS."pm/pm.php?blocked'>";
$sc_style['PM_BLOCKED_SENDERS_MANAGE']['post'] = '</a> ]';
if(!isset($pm_menu_template))
{
$pm_menu_template = "
<a href='{URL=pm|main|f=box&box=inbox}'>".PM_INBOX_ICON."</a>
<a href='{URL=pm|main|f=box&box=inbox}'>".LAN_PM_25."</a>
{PM_NEWPM_ANIMATE}
<br />
{PM_INBOX_TOTAL} ".LAN_PM_36.", {PM_INBOX_UNREAD} ".LAN_PM_37." {PM_INBOX_FILLED}
<br />
<a href='{URL=pm|main|f=box&box=outbox}'>".PM_OUTBOX_ICON."</a>
<a href='{URL=pm|main|f=box&box=outbox}'>".LAN_PM_26."</a><br />
{PM_OUTBOX_TOTAL} ".LAN_PM_36.", {PM_OUTBOX_UNREAD} ".LAN_PM_37." {PM_OUTBOX_FILLED}
{PM_SEND_PM_LINK}
{PM_BLOCKED_SENDERS_MANAGE}
";
}
if(check_class($pm_prefs['pm_class']))
{
$tp = e107::getParser();
$pm_inbox = $pmManager->pm_getInfo('inbox');
$txt = "\n".$tp->parseTemplate($pm_menu_template, TRUE);
if($pm_inbox['inbox']['new'] > 0 && $pm_prefs['popup'] && strpos(e_SELF, 'pm.php') === FALSE && $_COOKIE['pm-alert'] != 'ON')
{
$txt .= pm_show_popup($pm_inbox, $pm_prefs['popup_delay']);
}
$ns->tablerender(LAN_PM, $txt, 'pm');
}
/**
* Function to show a popup (if enabled) when new PMs arrive.
*
* @param array $pm_inbox - information about current state of inbox
* @param int $alertdelay - delay between popups, in seconds (defaults to 60 if pref not set)
*
* @return string - text for display
*
* @todo - check JS - may be some problems, especially if using debug in FF
*/
function pm_show_popup($pm_inbox, $alertdelay = 0)
{
if($alertdelay == 0) { $alertdelay = 60; }
setcookie('pm-alert', 'ON', time()+$alertdelay);
$popuptext = "
<html>
<head>
<title>".$pm_inbox['inbox']['new'].' '.LAN_PM_109."</title>
<link rel=\'stylesheet\' href=\'".THEME."style.css\'>
</head>
<body style=\'padding-left:2px;padding-right:2px; padding:2px; padding-bottom:2px; margin:0px; text-align:center\' marginheight=\'0\' marginleft=\'0\' topmargin=\'0\' leftmargin=\'0\'>
<table style=\'width:100%; text-align:center; height:99%; padding-bottom:2px\' class=\'bodytable\'>
<tr>
<td width=100% style='text-align:center'>
<b>--- ".LAN_PM." ---</b><br />".$pm_inbox['inbox']['new'].' '.LAN_PM_109."<br />".$pm_inbox['inbox']['unread'].' '.LAN_PM_37."<br /><br />
<form>
<input class=\'button\' type=\'submit\' onclick=\'self.close();\' value = \'".LAN_PM_110."\' />
</form>
</td>
</tr>
</table>
</body>
</html> ";
$popuptext = str_replace("\n", '', $popuptext);
$popuptext = str_replace("\t", '', $popuptext);
$text .= "
<script type='text/javascript'>
winl=(screen.width-200)/2;
wint = (screen.height-100)/2;
winProp = 'width=200,height=100,left='+winl+',top='+wint+',scrollbars=no';
window.open('javascript:document.write(\"".$popuptext."\");', 'pm_popup', winProp);
</script >";
return $text;
}
<?php
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* PM plugin - menu display
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/pm/private_msg_menu.php,v $
* $Revision$
* $Date$
* $Author$
*/
/**
* e107 Private messenger plugin
*
* @package e107_plugins
* @subpackage pm
* @version $Id$;
*/
if (!defined('e107_INIT')) { exit; }
if (!e107::isInstalled('pm')) { return ''; }
global $sysprefs, $pm_prefs;
if(!isset($pm_prefs['perpage']))
{
$pm_prefs = $sysprefs->getArray('pm_prefs');
}
require_once(e_PLUGIN.'pm/pm_func.php');
e107::getScParser();
require_once(e_PLUGIN.'pm/pm_shortcodes.php');
setScVar('pm_handler_shortcodes','pmPrefs', $pm_prefs);
$pmManager = new pmbox_manager($pm_prefs);
setScVar('pm_handler_shortcodes','pmManager', $pmManager);
define('PM_INBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_get.png' class='icon S16' alt='".LAN_PM_25."' title='".LAN_PM_25."' />");
define('PM_OUTBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_send.png' class='icon S16' alt='".LAN_PM_26."' title='".LAN_PM_26."' />");
define('PM_SEND_LINK', LAN_PM_35);
define('NEWPM_ANIMATION', "<img src='".e_PLUGIN_ABS."pm/images/newpm.gif' alt='' />");
$sc_style['PM_SEND_PM_LINK']['pre'] = "<br /><br />[ ";
$sc_style['PM_SEND_PM_LINK']['post'] = " ]";
$sc_style['PM_INBOX_FILLED']['pre'] = "[";
$sc_style['PM_INBOX_FILLED']['post'] = "%]";
$sc_style['PM_OUTBOX_FILLED']['pre'] = "[";
$sc_style['PM_OUTBOX_FILLED']['post'] = "%]";
$sc_style['PM_NEWPM_ANIMATE']['pre'] = "<a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>";
$sc_style['PM_NEWPM_ANIMATE']['post'] = "</a>";
$sc_style['PM_BLOCKED_SENDERS_MANAGE']['pre'] = "<br />[ <a href='".e_PLUGIN_ABS."pm/pm.php?blocked'>";
$sc_style['PM_BLOCKED_SENDERS_MANAGE']['post'] = '</a> ]';
if(!isset($pm_menu_template))
{
$pm_menu_template = "
<a href='{URL=pm|main|f=box&box=inbox}'>".PM_INBOX_ICON."</a>
<a href='{URL=pm|main|f=box&box=inbox}'>".LAN_PM_25."</a>
{PM_NEWPM_ANIMATE}
<br />
{PM_INBOX_TOTAL} ".LAN_PM_36.", {PM_INBOX_UNREAD} ".LAN_PM_37." {PM_INBOX_FILLED}
<br />
<a href='{URL=pm|main|f=box&box=outbox}'>".PM_OUTBOX_ICON."</a>
<a href='{URL=pm|main|f=box&box=outbox}'>".LAN_PM_26."</a><br />
{PM_OUTBOX_TOTAL} ".LAN_PM_36.", {PM_OUTBOX_UNREAD} ".LAN_PM_37." {PM_OUTBOX_FILLED}
{PM_SEND_PM_LINK}
{PM_BLOCKED_SENDERS_MANAGE}
";
}
if(check_class($pm_prefs['pm_class']))
{
$tp = e107::getParser();
$pm_inbox = $pmManager->pm_getInfo('inbox');
$txt = "\n".$tp->parseTemplate($pm_menu_template, TRUE);
if($pm_inbox['inbox']['new'] > 0 && $pm_prefs['popup'] && strpos(e_SELF, 'pm.php') === FALSE && $_COOKIE['pm-alert'] != 'ON')
{
$txt .= pm_show_popup($pm_inbox, $pm_prefs['popup_delay']);
}
$ns->tablerender(LAN_PM, $txt, 'pm');
}
/**
* Function to show a popup (if enabled) when new PMs arrive.
*
* @param array $pm_inbox - information about current state of inbox
* @param int $alertdelay - delay between popups, in seconds (defaults to 60 if pref not set)
*
* @return string - text for display
*
* @todo - check JS - may be some problems, especially if using debug in FF
*/
function pm_show_popup($pm_inbox, $alertdelay = 0)
{
if($alertdelay == 0) { $alertdelay = 60; }
setcookie('pm-alert', 'ON', time()+$alertdelay);
$popuptext = "
<html>
<head>
<title>".$pm_inbox['inbox']['new'].' '.LAN_PM_109."</title>
<link rel=\'stylesheet\' href=\'".THEME."style.css\'>
</head>
<body style=\'padding-left:2px;padding-right:2px; padding:2px; padding-bottom:2px; margin:0px; text-align:center\' marginheight=\'0\' marginleft=\'0\' topmargin=\'0\' leftmargin=\'0\'>
<table style=\'width:100%; text-align:center; height:99%; padding-bottom:2px\' class=\'bodytable\'>
<tr>
<td width=100% style='text-align:center'>
<b>--- ".LAN_PM." ---</b><br />".$pm_inbox['inbox']['new'].' '.LAN_PM_109."<br />".$pm_inbox['inbox']['unread'].' '.LAN_PM_37."<br /><br />
<form>
<input class=\'button\' type=\'submit\' onclick=\'self.close();\' value = \'".LAN_PM_110."\' />
</form>
</td>
</tr>
</table>
</body>
</html> ";
$popuptext = str_replace("\n", '', $popuptext);
$popuptext = str_replace("\t", '', $popuptext);
$text .= "
<script type='text/javascript'>
winl=(screen.width-200)/2;
wint = (screen.height-100)/2;
winProp = 'width=200,height=100,left='+winl+',top='+wint+',scrollbars=no';
window.open('javascript:document.write(\"".$popuptext."\");', 'pm_popup', winProp);
</script >";
return $text;
}
?>

10
e107_plugins/poll/poll_class.php
View File

@ -504,9 +504,9 @@ class poll
<span class='smalltext'>".LAN_386."</span>
</td>
</tr>
<tr><td style='width:20%'><div class='normaltext'>".LAN_5."</div></td><td style='width:80%'class='forumheader3'><input class='tbox' type='text' name='poll_title' size='70' value='".$tp->post_toForm($_POST['poll_title'])."' maxlength='200' /></td></tr>";
<tr><td style='width:20%'><div class='normaltext'>".LAN_5."</div></td><td style='width:80%'class='forumheader3'><input class='tbox' type='text' name='poll_title' size='70' value='".$tp->post_toForm(vartrue($_POST['poll_title']))."' maxlength='200' /></td></tr>";
$option_count = (count($_POST['poll_option']) ? count($_POST['poll_option']) : 1);
$option_count = (count(vartrue($_POST['poll_option'])) ? count($_POST['poll_option']) : 1);
$text .= "<tr>
<td style='width:20%'>".LAN_391."</td>
<td style='width:80%'>
@ -530,7 +530,7 @@ class poll
<tr>
<td style='width:20%'>".POLL_506."</td>
<td style='width:80%'>
<input type='radio' name='multipleChoice' value='1'".($_POST['multipleChoice'] ? " checked='checked'" : "")." /> ".POLL_507."&nbsp;&nbsp;
<input type='radio' name='multipleChoice' value='1'".(vartrue($_POST['multipleChoice']) ? " checked='checked'" : "")." /> ".POLL_507."&nbsp;&nbsp;
<input type='radio' name='multipleChoice' value='0'".(!$_POST['multipleChoice'] ? " checked='checked'" : "")." /> ".POLL_508."
</td>
</tr>
@ -538,7 +538,7 @@ class poll
<tr>
<td style='width:30%'>".POLLAN_16."</td>
<td>
<input type='radio' name='storageMethod' value='0'".(!$_POST['storageMethod'] ? " checked='checked'" : "")." /> ".POLLAN_17."<br />
<input type='radio' name='storageMethod' value='0'".(!vartrue($_POST['storageMethod']) ? " checked='checked'" : "")." /> ".POLLAN_17."<br />
<input type='radio' name='storageMethod' value='1'".($_POST['storageMethod'] == 1 ? " checked='checked'" : "")." /> ".POLLAN_18."<br />
<input type='radio' name='storageMethod' value='2'".($_POST['storageMethod'] ==2 ? " checked='checked'" : "")." /> ".POLLAN_19."
</td></tr>
@ -602,7 +602,7 @@ class poll
$text .= "
<td>".r_userclass("pollUserclass", $_POST['pollUserclass'], 'off', $uclass)."</td>
<td>".r_userclass("pollUserclass", vartrue($_POST['pollUserclass']), 'off', $uclass)."</td>
</tr>
<tr>

31
e107_plugins/rss_menu/admin_prefs.php
View File

@ -312,7 +312,6 @@ if(!isset($RSS_ADMIN_LIST_FOOTER))
if(!isset($RSS_ADMIN_CREATE_TABLE))
{
$RSS_ADMIN_CREATE_TABLE = "
<div style='text-align:center;'>
<form action='".e_SELF.(e_QUERY ? "?".e_QUERY : "")."' id='dataform' method='post' >
<table class='table adminform'>
<tr>
@ -345,7 +344,7 @@ if(!isset($RSS_ADMIN_CREATE_TABLE))
</tr>
<tr>
<td class='forumheader' colspan='2' style='text-align:center;'>{RSS_ADMIN_FORM_CREATEBUTTON}</td>
<td colspan='2' style='text-align:center;'>{RSS_ADMIN_FORM_CREATEBUTTON}</td>
</tr>
</table>
</form>
@ -356,49 +355,39 @@ if(!isset($RSS_ADMIN_CREATE_TABLE))
if(!isset($RSS_ADMIN_OPTIONS_TABLE))
{
$RSS_ADMIN_OPTIONS_TABLE = "
<div style='text-align:center;'>
<form action='".e_SELF.(e_QUERY ? "?".e_QUERY : "")."' id='dataform' method='post' >
<table class='table adminlist'>
<tr>
<td class='fcaption'>".LAN_OPTIONS."</td>
<td class='fcaption'>".RSS_LAN_ADMIN_14."</td>
</tr>
<table class='table adminform'>
<tr>
<td>".RSS_LAN_ADMIN_13."</td>
<td>
<input type='checkbox' name='rss_othernews' value='1' ".($pref['rss_othernews'] == 1 ? " checked='checked' " : "")." />
<input type='checkbox' name='rss_othernews' value='1' ".(vartrue($pref['rss_othernews']) == 1 ? " checked='checked' " : "")." />
</td>
</tr>
<tr>
<td>".RSS_LAN_ADMIN_19."</td>
<td>
<input type='checkbox' name='rss_summarydiz' value='1' ".($pref['rss_summarydiz'] == 1 ? " checked='checked' " : "")." />
<input type='checkbox' name='rss_summarydiz' value='1' ".(vartrue($pref['rss_summarydiz']) == 1 ? " checked='checked' " : "")." />
</td>
</tr>
<tr>
<td>".RSS_LAN_ADMIN_33."</td>
<td>
<input type='checkbox' name='rss_shownewsimage' value='1' ".($pref['rss_shownewsimage'] == 1 ? " checked='checked' " : "")." />
<input type='checkbox' name='rss_shownewsimage' value='1' ".(vartrue($pref['rss_shownewsimage']) == 1 ? " checked='checked' " : "")." />
</td>
</tr>
<tr style='vertical-align:top'>
</tr>
</table>
<div class='buttons-bar center'>
".$frm->admin_button('updatesettings',LAN_SAVE,'update')."
".$frm->admin_button('updatesettings', LAN_UPDATE, 'update')."
</div>
</form>
</div>";
</form>";
}
// Admin : rss import
if(!isset($RSS_ADMIN_IMPORT_HEADER))
{
$RSS_ADMIN_IMPORT_HEADER = "
<div style='text-align:center;'>
<form action='".e_SELF."' id='imlistform' method='post' >
<table class='table adminlist'>
<table class='table adminform'>
<tr>
<th>".RSS_LAN_ADMIN_16."</td>
<th>".RSS_LAN_ADMIN_3."</td>
@ -424,10 +413,10 @@ if(!isset($RSS_ADMIN_IMPORT_FOOTER))
$RSS_ADMIN_IMPORT_FOOTER = "
</table>
<div class='buttons-bar center'>
".$frm->admin_button('import_rss',RSS_LAN_ADMIN_17,'submit')."
".$frm->admin_button('import_rss',RSS_LAN_ADMIN_17,'submit')."
</div>
</form>
</div>";
";
}
// Listing

194
e107_plugins/siteinfo/e_shortcode.php
View File

@ -1,98 +1,98 @@
<?php
/*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id$
*
* Siteinfo shortcode batch
*/
if (!defined('e107_INIT')) { exit; }
class siteinfo_shortcodes // must match the folder name of the plugin.
{
function sc_sitebutton()
{
$e107 = e107::getInstance();
$path = ($_POST['sitebutton'] && $_POST['ajax_used']) ? $e107->tp->replaceConstants($_POST['sitebutton']) : (strstr(SITEBUTTON, 'http:') ? SITEBUTTON : e_IMAGE.SITEBUTTON);
//TODO use CSS class?
return '<a href="'.SITEURL.'"><img src="'.$path.'" alt="'.SITENAME.'" /></a>';
}
function sc_sitedisclaimer()
{
$e107 = e107::getInstance();
return $e107->tp->toHtml(SITEDISCLAIMER, true, 'constants defs');
}
function sc_sitename($parm)
{
return ($parm == 'link') ? "<a href='".SITEURL."' title=\"".SITENAME."\">".SITENAME."</a>" : SITENAME;
}
function sc_sitedescription()
{
global $pref;
return SITEDESCRIPTION.(defined('THEME_DESCRIPTION') && $pref['displaythemeinfo'] ? THEME_DESCRIPTION : '');
}
function sc_sitetag()
{
return SITETAG;
}
function sc_logo($parm)
{
parse_str($parm); // Optional {LOGO=file=file_name} or {LOGO=link=url} or {LOGO=file=file_name&link=url}
// Paths to image file, link are relative to site base
$tp = e107::getParser();
$logopref = e107::getConfig('core')->get('sitelogo');
$logo = $tp->replaceConstants($logopref);
if(vartrue($logopref) && is_readable($logo))
{
$logo = $tp->replaceConstants($logopref,'abs');
$path = $tp->replaceConstants($logopref);
}
elseif (isset($file) && $file && is_readable($file))
{
$logo = e_HTTP.$file; // HTML path
$path = e_BASE.$file; // PHP path
}
else if (is_readable(THEME.'images/e_logo.png'))
{
$logo = THEME_ABS.'images/e_logo.png'; // HTML path
$path = THEME.'images/e_logo.png'; // PHP path
}
else
{
$logo = e_IMAGE_ABS.'logo.png'; // HTML path
$path = e_IMAGE.'logo.png'; // PHP path
}
$dimensions = getimagesize($path);
$image = "<img class='logo' src='".$logo."' style='width: ".$dimensions[0]."px; height: ".$dimensions[1]."px' alt='".SITENAME."' />\n";
if (isset($link) && $link)
{
if ($link == 'index')
{
$image = "<a href='".e_HTTP."index.php'>".$image."</a>";
}
else
{
$image = "<a href='".e_HTTP.$link."'>".$image."</a>";
}
}
return $image;
}
function sc_theme_disclaimer($parm)
{
$pref = e107::getPref();
return (defined('THEME_DISCLAIMER') && $pref['displaythemeinfo'] ? THEME_DISCLAIMER : '');
}
}
<?php
/*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id$
*
* Siteinfo shortcode batch
*/
if (!defined('e107_INIT')) { exit; }
class siteinfo_shortcodes // must match the folder name of the plugin.
{
function sc_sitebutton()
{
$e107 = e107::getInstance();
$path = ($_POST['sitebutton'] && $_POST['ajax_used']) ? $e107->tp->replaceConstants($_POST['sitebutton']) : (strstr(SITEBUTTON, 'http:') ? SITEBUTTON : e_IMAGE.SITEBUTTON);
//TODO use CSS class?
return '<a href="'.SITEURL.'"><img src="'.$path.'" alt="'.SITENAME.'" /></a>';
}
function sc_sitedisclaimer()
{
$e107 = e107::getInstance();
return $e107->tp->toHtml(SITEDISCLAIMER, true, 'constants defs');
}
function sc_sitename($parm)
{
return ($parm == 'link') ? "<a href='".SITEURL."' title=\"".SITENAME."\">".SITENAME."</a>" : SITENAME;
}
function sc_sitedescription()
{
global $pref;
return SITEDESCRIPTION.(defined('THEME_DESCRIPTION') && $pref['displaythemeinfo'] ? THEME_DESCRIPTION : '');
}
function sc_sitetag()
{
return SITETAG;
}
function sc_logo($parm = '')
{
parse_str(vartrue($parm)); // Optional {LOGO=file=file_name} or {LOGO=link=url} or {LOGO=file=file_name&link=url}
// Paths to image file, link are relative to site base
$tp = e107::getParser();
$logopref = e107::getConfig('core')->get('sitelogo');
$logo = $tp->replaceConstants($logopref);
if(vartrue($logopref) && is_readable($logo))
{
$logo = $tp->replaceConstants($logopref,'abs');
$path = $tp->replaceConstants($logopref);
}
elseif (isset($file) && $file && is_readable($file))
{
$logo = e_HTTP.$file; // HTML path
$path = e_BASE.$file; // PHP path
}
else if (is_readable(THEME.'images/e_logo.png'))
{
$logo = THEME_ABS.'images/e_logo.png'; // HTML path
$path = THEME.'images/e_logo.png'; // PHP path
}
else
{
$logo = e_IMAGE_ABS.'logo.png'; // HTML path
$path = e_IMAGE.'logo.png'; // PHP path
}
$dimensions = getimagesize($path);
$image = "<img class='logo' src='".$logo."' style='width: ".$dimensions[0]."px; height: ".$dimensions[1]."px' alt='".SITENAME."' />\n";
if (isset($link) && $link)
{
if ($link == 'index')
{
$image = "<a href='".e_HTTP."index.php'>".$image."</a>";
}
else
{
$image = "<a href='".e_HTTP.$link."'>".$image."</a>";
}
}
return $image;
}
function sc_theme_disclaimer($parm)
{
$pref = e107::getPref();
return (defined('THEME_DISCLAIMER') && $pref['displaythemeinfo'] ? THEME_DISCLAIMER : '');
}
}
?>

15
e107_plugins/tagwords/tagwords_template.php
View File

@ -120,13 +120,14 @@ $TEMPLATE_TAGWORDS['menu_cloud'] = "
$TEMPLATE_TAGWORDS['admin_options'] = "
<form method='post' action='".e_SELF.(e_QUERY ? "?".e_QUERY : "")."'>
<table cellpadding='0' cellspacing='0' class='adminform'>
<table class='table adminform'>
<colgroup span='2'>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tr>
<td class='fcaption' colspan='2'>".LAN_TAG_OPT_25."</td>
<td colspan='2'>".LAN_TAG_OPT_25."</td>
</tr>
<tr>
<td>".LAN_TAG_OPT_2."</td>
@ -137,7 +138,7 @@ $TEMPLATE_TAGWORDS['admin_options'] = "
<td>{TAG_OPT_CLASS}</td>
</tr>
<tr>
<td class='fcaption' colspan='2'>".LAN_TAG_OPT_16."</td>
<td colspan='2'>".LAN_TAG_OPT_16."</td>
</tr>
<tr>
<td>".LAN_TAG_OPT_4."</td>
@ -158,7 +159,7 @@ $TEMPLATE_TAGWORDS['admin_options'] = "
</td>
</tr>
<tr>
<td class='fcaption' colspan='2'>".LAN_TAG_OPT_17."</td>
<td colspan='2'>".LAN_TAG_OPT_17."</td>
</tr>
<tr>
<td>".LAN_TAG_OPT_18."</td>
@ -180,21 +181,21 @@ $TEMPLATE_TAGWORDS['admin_options'] = "
</td>
</tr>
<tr>
<td class='fcaption' colspan='2'>".LAN_TAG_OPT_21."</td>
<td colspan='2'>".LAN_TAG_OPT_21."</td>
</tr>
<tr>
<td>".LAN_TAG_OPT_22."</td>
<td>{TAG_OPT_SEPERATOR}</td>
</tr>
<tr>
<td class='fcaption' colspan='2'>".LAN_TAG_OPT_23."</td>
<td colspan='2'>".LAN_TAG_OPT_23."</td>
</tr>
<tr>
<td>".LAN_TAG_OPT_24."</td>
<td>{TAG_OPT_ACTIVEAREAS}</td>
</tr>
<tr>
<td class='forumheader' colspan='2' style='text-align:center'>{TAG_OPT_BUTTON}</td>
<td colspan='2' style='text-align:center'>{TAG_OPT_BUTTON}</td>
</tr>
</table>
</form>";

31
e107_plugins/trackback/admin_config.php
View File

@ -24,6 +24,8 @@ if (!getperms("P") || !plugInstalled('trackback'))
include_lan(e_PLUGIN."trackback/languages/".e_LANGUAGE."_admin_trackback.php");
require_once(e_ADMIN."auth.php");
$frm = e107::getForm();
if (isset($_POST['updatesettings']))
{
@ -53,30 +55,23 @@ if (isset($message))
$text = "
<div style='text-align:center'>
<form method='post' action='".e_SELF."'>
<table style='".ADMIN_WIDTH."' class='fborder'>
<table class='table adminform'>
<tr>
<td style='width:50%' class='forumheader3'>".TRACKBACK_L7."</td>
<td style='width:50%; text-align:right' class='forumheader3'>
<input type='radio' name='trackbackEnabled' value='1'".($pref['trackbackEnabled'] ? " checked='checked'" : "")." /> ".TRACKBACK_L5."&nbsp;&nbsp;
<input type='radio' name='trackbackEnabled' value='0'".(!$pref['trackbackEnabled'] ? " checked='checked'" : "")." /> ".TRACKBACK_L6."
</td>
<td>".TRACKBACK_L7."</td>
<td>
<input type='radio' name='trackbackEnabled' value='1'".($pref['trackbackEnabled'] ? " checked='checked'" : "")." /> ".TRACKBACK_L5."&nbsp;&nbsp;
<input type='radio' name='trackbackEnabled' value='0'".(!$pref['trackbackEnabled'] ? " checked='checked'" : "")." /> ".TRACKBACK_L6."
</td>
</tr>
<tr>
<td style='width:50%' class='forumheader3'>".TRACKBACK_L8."</td>
<td style='width:50%; text-align:right' class='forumheader3'>
<input size='50' class='tbox' type='text' name='trackbackString' value='".$pref['trackbackString']."' />
</td>
</tr>
<td colspan='2' style='text-align:center' class='forumheader'>
<input class='button' type='submit' name='updatesettings' value='".TRACKBACK_L9."' />
</td>
</tr>
<td>".TRACKBACK_L8."</td>
<td><input size='50' class='tbox' type='text' name='trackbackString' value='".$pref['trackbackString']."' /> </td>
</table>
<div class='buttons-bar center'>
".$frm->admin_button('updatesettings', LAN_UPDATE, 'update')."
</div>
</form>
</div>
";

2
e107_plugins/trackback/languages/English_admin_trackback.php
View File

@ -23,7 +23,7 @@ define("TRACKBACK_L5", "On");
define("TRACKBACK_L6", "Off");
define("TRACKBACK_L7", "Activate trackback");
define("TRACKBACK_L8", "Trackback URL text");
define("TRACKBACK_L9", "Save Settings");
//define("TRACKBACK_L9", "Save Settings");
define("TRACKBACK_L10", "Trackback Settings");
define("TRACKBACK_L11", "Trackback address for this post:");

86
e107_themes/bootstrap/admin_theme.php
View File

@ -454,61 +454,41 @@ if (!defined('E_16_FAILEDLOGIN')) {
define('E_16_FAILEDLOGIN', "<i class='S16 e-failedlogin-16'></i>");
}
// define("ADMIN_TRUE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/true_32.png' alt='' />");
// define("ADMIN_TRUE_ICON_PATH", e_IMAGE."admin_images/true_32.png");
// define("ADMIN_FALSE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/false_32.png' alt='' />");
// define("ADMIN_FALSE_ICON_PATH", e_IMAGE."admin_images/false_32.png");
define("ADMIN_EDIT_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/edit_32.png' alt='' title='".LAN_EDIT."' />");
define("ADMIN_EDIT_ICON_PATH", e_IMAGE."admin_images/edit_32.png");
define("ADMIN_DELETE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/delete_32.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_DELETE_ICON_PATH", e_IMAGE."admin_images/delete_32.png");
define("ADMIN_WARNING_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/warning_32.png' alt='' />");
define("ADMIN_WARNING_ICON_PATH", e_IMAGE."admin_images/warning_32.png");
define("ADMIN_ADD_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/add_32.png' alt='' />");
define("ADMIN_ADD_ICON_PATH", e_IMAGE."admin_images/add_32.png");
define("ADMIN_INFO_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/info_32.png' alt='' />");
define("ADMIN_INFO_ICON_PATH", e_IMAGE."admin_images/info_32.png");
define("ADMIN_CONFIGURE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/configure_32.png' alt='' />");
define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE."admin_images/configure_32.png");
define("ADMIN_VIEW_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/search_32.png' alt='' />");
define("ADMIN_VIEW_ICON_PATH", e_IMAGE."admin_images/admin_images/search_32.png");
define("ADMIN_URL_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/forums_32.png' alt='' />");
define("ADMIN_URL_ICON_PATH", e_IMAGE."admin_images/forums_32.png");
define("ADMIN_INSTALLPLUGIN_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/plugin_install_32.png' alt='' />");
define("ADMIN_INSTALLPLUGIN_ICON_PATH", e_IMAGE."admin_images/plugin_install_32.png");
define("ADMIN_UNINSTALLPLUGIN_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/plugin_uninstall_32.png' alt='' />");
define("ADMIN_UNINSTALLPLUGIN_ICON_PATH", e_IMAGE."admin_images/plugin_unstall_32.png");
define("ADMIN_UPGRADEPLUGIN_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/up_32.png' alt='' />");
define("ADMIN_UPGRADEPLUGIN_ICON_PATH", e_IMAGE."admin_images/up_32.png");
define("ADMIN_UP_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/up_32.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_UP_ICON_PATH", e_IMAGE."admin_images/up_32.png");
define("ADMIN_DOWN_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/down_32.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_DOWN_ICON_PATH", e_IMAGE."admin_images/down_32.png");
define("ADMIN_TRUE_ICON", "<i class='S16 e-true-16'></i>");
define("ADMIN_FALSE_ICON", "<i class='S16 e-false-16'></i>");
define("ADMIN_EXECUTE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/execute_32.png' alt='' title='".LAN_EXECUTE."' />");
define("ADMIN_EXECUTE_ICON_PATH", e_IMAGE."admin_images/execute_32.png");
define("ADMIN_EDIT_ICON", "<i class='S32 e-edit-32'></i>");
define("ADMIN_DELETE_ICON", "<i class='S32 e-delete-32'></i>");
define("ADMIN_WARNING_ICON", "<i class='S32 e-warning-32'></i>");
define("ADMIN_ADD_ICON", "<i class='S32 e-add-32'></i>");
define("ADMIN_INFO_ICON", "<i class='S16 e-info-16'></i>");
define("ADMIN_CONFIGURE_ICON", "<i class='S32 e-configure-32'></i>");
define("ADMIN_VIEW_ICON", "<i class='S32 e-search-32'></i>");
define("ADMIN_URL_ICON", "<i class='S16 e-forums-16'></i>");
define("ADMIN_INSTALLPLUGIN_ICON", "<i class='S32 e-plugin_install-32'></i>");
define("ADMIN_UNINSTALLPLUGIN_ICON", "<i class='S32 e-plugin_uninstall-32'></i>");
define("ADMIN_UPGRADEPLUGIN_ICON", "<i class='S32 e-up-32'></i>");
define("ADMIN_UP_ICON", "<i class='S32 e-up-32'></i>");
define("ADMIN_DOWN_ICON", "<i class='S32 e-down-32'></i>");
define("ADMIN_SORT_ICON", "<i class='S32 e-sort-32'></i>");
define("ADMIN_EXECUTE_ICON", "<i class='S32 e-execute-32'></i>");
define("ADMIN_SORT_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/sort_32.png' alt='' title='Re-Sort' />");
// FOR BC
define("ADMIN_EDIT_ICON_PATH", e_IMAGE."admin_images/edit_32.png");
define("ADMIN_DELETE_ICON_PATH", e_IMAGE."admin_images/delete_32.png");
define("ADMIN_WARNING_ICON_PATH", e_IMAGE."admin_images/warning_32.png");
define("ADMIN_ADD_ICON_PATH", e_IMAGE."admin_images/add_32.png");
define("ADMIN_INFO_ICON_PATH", e_IMAGE."admin_images/info_32.png");
define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE."admin_images/configure_32.png");
define("ADMIN_VIEW_ICON_PATH", e_IMAGE."admin_images/admin_images/search_32.png");
define("ADMIN_URL_ICON_PATH", e_IMAGE."admin_images/forums_32.png");
define("ADMIN_INSTALLPLUGIN_ICON_PATH", e_IMAGE."admin_images/plugin_install_32.png");
define("ADMIN_UNINSTALLPLUGIN_ICON_PATH", e_IMAGE."admin_images/plugin_unstall_32.png");
define("ADMIN_UPGRADEPLUGIN_ICON_PATH", e_IMAGE."admin_images/up_32.png");
define("ADMIN_UP_ICON_PATH", e_IMAGE."admin_images/up_32.png");
define("ADMIN_DOWN_ICON_PATH", e_IMAGE."admin_images/down_32.png");
define("ADMIN_EXECUTE_ICON_PATH", e_IMAGE."admin_images/execute_32.png");
define("ADMIN_SORT_ICON_PATH", e_IMAGE."admin_images/sort_32.png");

2
e107_web/js/core/admin.jquery.js
View File

@ -118,7 +118,7 @@ $(document).ready(function()
// backend
$(".e-password-admin").pwdMeter({
$(".e-password").pwdMeter({
minLength: 6,
displayGeneratePassword: true,
generatePassText: "Generate",

46
e107_web/js/core/all.jquery.js
View File

@ -14,16 +14,46 @@ $(document).ready(function()
//check all
$("#check-all").click(function(){
$(".field-spacer").each( function() {
$(this).children(":checkbox").attr("checked",true);
})
$("#check-all").click(function(event){
var val = $(this).val(), selector = '.field-spacer';
event.preventDefault();
// e.g. <button id="check-all" value="jstarget:perms"><span>Check All</span></button> - match all checkboxes with attribute 'name="perms[]"
if(val && val.match(/^jstarget\:/))
{
selector = 'input:checkbox[name^=' + val.split(':')[1] + ']';
$(selector).each( function() {
$(this).attr("checked",true);
});
return;
}
// checkboxes children of .field-spacer
else
{
$(selector).each( function() {
$(this).children(":checkbox").attr("checked",true);
})
}
})
$("#uncheck-all").click(function(){
$(".field-spacer").each( function() {
$(this).children(":checkbox").attr("checked",false);
})
$("#uncheck-all").click(function(event) {
var val = $(this).val(), selector = '.field-spacer';
event.preventDefault();
// e.g. <button id="uncheck-all" value="jstarget:perms"><span>Uncheck All</span></button> - match all checkboxes with attribute 'name="perms[]"
if(val && val.match(/^jstarget\:/))
{
selector = 'input:checkbox[name^=' + val.split(':')[1] + ']';
$(selector).each( function() {
$(this).attr("checked",false);
})
}
// checkboxes children of .field-spacer
else
{
$(".field-spacer").each( function() {
$(this).children(":checkbox").attr("checked",false);
});
}
})

113
e107_web/js/password/jquery.pwdMeter.js
View File

@ -16,14 +16,14 @@ jQuery.fn.pwdMeter = function(options){
displayGeneratePassword: false,
generatePassText: 'Generate',
generatePassClass: 'GeneratePasswordLink',
randomPassLength: 13,
randomPassLength: 12,
passwordBox: this
}, options);
var pwdObj = this;
$(pwdObj).after("<span id=\"pwdMeter\" class=\"neutral\">Very Weak</span>");
// $(pwdObj).after("<span class='progress progress-info span2' ><span class='bar' id=\"pwdMeter\" style='width:20%'></span></span>");
return this.each(function(index){
@ -39,53 +39,69 @@ jQuery.fn.pwdMeter = function(options){
$("#showPwdBox").val(password);
if ((password.length >0) && (password.length <=5)) passwordStrength=1;
if ((password.length >3) && (password.length <=5)) passwordStrength=1;
if (password.length >= options.minLength) passwordStrength++;
if ((password.match(/[a-z]/)) && (password.match(/[A-Z]/)) ) passwordStrength++;
if ((password.match(/[A-Z]/)) ) passwordStrength++;
if ((password.match(/[a-z]/)) ) passwordStrength++;
if (password.match(/\d+/)) passwordStrength++;
if (password.match(/\d+/) && password.length > 5) passwordStrength++;
if (password.match(/.[!,@,#,$,%,^,&,*,?,_,~,-,(,)]/)) passwordStrength++;
if (password.length > 12) passwordStrength++;
if (password.length > 11) passwordStrength++;
$('#pwdMeter').removeClass();
$('#pwdMeter').addClass('neutral');
$('#pwdColor').removeClass();
$('#pwdColor').addClass('progress');
$('#pwdMeter').css("width",'1%');
// $('#pwdMeter').removeStyle();
switch(passwordStrength){
case 1:
$('#pwdMeter').addClass('veryweak');
$('#pwdMeter').text('Very Weak');
$('#pwdColor').addClass('progress-danger');
$('#pwdMeter').css("width",'10%');
$('#pwdStatus').text('Very Weak');
break;
case 2:
$('#pwdMeter').addClass('weak');
$('#pwdMeter').text('Weak');
$('#pwdColor').addClass('progress-danger');
$('#pwdMeter').css("width",'25%');
$('#pwdStatus').text('Weak');
break;
case 3:
$('#pwdMeter').addClass('medium');
$('#pwdMeter').text('Medium');
$('#pwdColor').addClass('progress-warning');
$('#pwdMeter').css("width",'30%');
$('#pwdStatus').text('Medium');
break;
case 4:
$('#pwdMeter').addClass('strong');
$('#pwdMeter').text('Strong');
$('#pwdColor').addClass('progress-warning');
$('#pwdMeter').css("width",'50%');
$('#pwdStatus').text('Medium');
break;
case 5:
$('#pwdMeter').addClass('verystrong');
$('#pwdMeter').text('Very Strong');
case 5:
$('#pwdColor').addClass('progress-success');
$('#pwdMeter').css("width",'75%');
$('#pwdStatus').text('Strong');
break;
case 6:
$('#pwdColor').addClass('progress-success');
$('#pwdMeter').css("width",'100%');
$('#pwdStatus').text('Very Strong');
break;
default:
$('#pwdMeter').addClass('neutral');
$('#pwdMeter').text('Very Weak');
$('#pwdMeter').css("width",'0px');
// $('#pwdStatus').text('Strong');
}
}
if(options.displayGeneratePassword){
$('#pwdMeter').before('&nbsp;<a href="#" id="Spn_PasswordGenerator" class="'+options.generatePassClass+'">'+ options.generatePassText +'</a><br />');
$('#pwdMeter').after('&nbsp;<a href="#" id="showPwd">Show</a>');
if(options.displayGeneratePassword)
{
// $('#pwdMeter').before('&nbsp;<a href="#" id="Spn_PasswordGenerator" class="'+options.generatePassClass+'">'+ options.generatePassText +'</a><br />');
$(pwdObj).after('<input id="showPwdBox" type="text" class="'+ $(pwdObj).attr('class') +'" style="display:none" size="'+ $(pwdObj).attr('size') +'" value="" />');
}
@ -107,9 +123,51 @@ jQuery.fn.pwdMeter = function(options){
});
function random_password() {
function random_password()
{
var length = options.randomPassLength;
var pchars = "abcdefghijklmnopqrstuvwxyz";
var pchars1 = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
var pchars2 = "1234567890";
var pchars3 = "~!@#$%^&*-<>=_+,./?;':";
ret_pass = "";
for(x=0;x<Math.abs(length/4);x++) {
i = Math.floor(Math.random() * pchars.length);
ret_pass += pchars.charAt(i);
}
for(x=0;x<Math.abs(length/4);x++) {
i = Math.floor(Math.random() * pchars1.length);
ret_pass += pchars1.charAt(i);
}
for(x=0;x<Math.abs(length/4);x++) {
i = Math.floor(Math.random() * pchars2.length);
ret_pass += pchars2.charAt(i);
}
for(x=0;x<Math.abs(length/4);x++) {
i = Math.floor(Math.random() * pchars3.length);
ret_pass += pchars3.charAt(i);
}
// shuffle the string a bit
var a = ret_pass.split(""),
n = a.length;
for(var i = n - 1; i > 0; i--) {
var j = Math.floor(Math.random() * (i + 1));
var tmp = a[i];
a[i] = a[j];
a[j] = tmp;
}
return a.join("");
}
/*
function random_password_old() {
var allowed_chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz!?$?%^&*()_-+={[}]:;@~#|\<,>.?/";
var allowed_upper = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ";
var allowed_lower = "abcdefghiklmnopqrstuvwxyz";
var allower_symb = "!?$?%^&*()_-+={[}]:;@~#|\<,>.?";
var pwd_length = options.randomPassLength;
var rnd_pwd = '';
for (var i=0; i<pwd_length; i++) {
@ -117,7 +175,8 @@ jQuery.fn.pwdMeter = function(options){
rnd_pwd += allowed_chars.substring(rnd_num,rnd_num+1);
}
return rnd_pwd;
}
}
*/
});

4
submitnews.php
View File

@ -191,7 +191,7 @@ $text .= "
<tr>
<td style='width:20%' class='forumheader3'>".LAN_62."</td>
<td style='width:80%' class='forumheader3'>
<input class='tbox' type='text' id='submitnews_title' name='submitnews_title' size='60' value='".$tp->toHTML($_POST['submitnews_title'],TRUE,'USER_TITLE')."' maxlength='200' style='width:90%' />
<input class='tbox' type='text' id='submitnews_title' name='submitnews_title' size='60' value='".$tp->toHTML(vartrue($_POST['submitnews_title']),TRUE,'USER_TITLE')."' maxlength='200' style='width:90%' />
</td>
</tr>";
@ -209,7 +209,7 @@ $text .= "
<tr>
<td style='width:20%' class='forumheader3'>".LAN_135."</td>
<td style='width:80%' class='forumheader3'>
<textarea class='e-wysiwyg tbox' id='submitnews_item' name='submitnews_item' cols='80' style='max-width:95%' {$insertjs}>".$tp->toForm($_POST['submitnews_item'],TRUE,'USER_BODY')."</textarea><br />";
<textarea class='e-wysiwyg tbox' id='submitnews_item' name='submitnews_item' cols='80' style='max-width:95%' {$insertjs}>".$tp->toForm(vartrue($_POST['submitnews_item']),TRUE,'USER_BODY')."</textarea><br />";
// toHTML is dangerous.
if (!e_WYSIWYG)

2
user.php
View File

@ -110,7 +110,7 @@ else
}
}
}
if ($records > 30)
if (vartrue($records) > 30)
{
$records = 30;
}