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

#6 - LAN clean-up (HTML removal, double quotes, generic) - done upto/i admin/lan_p

Browse Source
This commit is contained in:
Moc
2013-03-24 19:44:14 +01:00
parent afe4b27cf2
commit dc1d867aff
14 changed files with 391 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/mailout.php
View File

@@ -197,7 +197,7 @@ switch ($action)
require_once(e_HANDLER.'mail.php');
$add = ($pref['mailer']) ? " (".strtoupper($pref['mailer']).")" : ' (PHP)';
$sendto = trim($_POST['testaddress']);
if (!sendemail($sendto, LAN_MAILOUT_113." ".SITENAME.$add, LAN_MAILOUT_114,LAN_MAILOUT_189))
if (!sendemail($sendto, LAN_MAILOUT_113." ".SITENAME.$add, str_replace("[br]", "\n", LAN_MAILOUT_114),LAN_MAILOUT_189))
{
$mes->addError(($pref['mailer'] == 'smtp') ? LAN_MAILOUT_67 : LAN_MAILOUT_106);
}

5
e107_admin/meta.php
View File

@@ -2,14 +2,12 @@
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* Administration Area - Meta Tags
*
* $URL$
* $Id$
*
*/
require_once("../class2.php");
@@ -60,7 +58,6 @@ if (isset($_POST['metasubmit']))
$admin_log->log_event('META_01', 'meta_news_summary=>'.$pref['meta_news_summary'].'[!br!]'.e_LANGUAGE, E_LOG_INFORMATIVE, '');
save_prefs();
//$mes->add(METLAN_1." (".e_LANGUAGE.")", E_MESSAGE_SUCCESS);
}
$meta = vartrue($pref['meta_tag']);

12
e107_admin/modcomment.php
View File

@@ -2,18 +2,14 @@
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
*
*
* $Source: /cvs_backup/e107_0.8/e107_admin/modcomment.php,v $
* $Revision$
* $Date$
* $Author$
*/
// Moc: up for removal? Replaced by /e107_admin/comment.php
require_once("../class2.php");
if (!getperms("B")) {
header("location:".e_BASE."index.php");
@@ -25,7 +21,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
require_once("auth.php");
require_once(e_HANDLER."comment_class.php");
$cobj = new comment;
global $tp;
$tp = e107::getParser();
$tmp = explode(".", e_QUERY);
$table = $tmp[0];

14
e107_admin/newspost.php
View File

@@ -365,7 +365,7 @@ class news_admin_ui extends e_admin_ui
protected $fields = array(
'checkboxes' => array('title' => '', 'type' => null, 'width' => '3%', 'thclass' => 'center first', 'class' => 'center', 'nosort' => true, 'toggle' => 'news_selected', 'forced' => TRUE),
'news_id' => array('title' => LAN_NEWS_45, 'type' => 'text', 'width' => '5%', 'thclass' => 'center', 'class' => 'center', 'nosort' => false, 'readParms'=>'link=sef&target=blank'),
'news_id' => array('title' => LAN_ID, 'type' => 'text', 'width' => '5%', 'thclass' => 'center', 'class' => 'center', 'nosort' => false, 'readParms'=>'link=sef&target=blank'),
'news_thumbnail' => array('title' => NWSLAN_67, 'type' => 'method', 'width' => '110px', 'thclass' => 'center', 'class' => "center", 'nosort' => false, 'readParms'=>'thumb=60&thumb_urlraw=0&thumb_aw=60','readonly'=>false),
'news_title' => array('title' => LAN_TITLE, 'type' => 'text', 'inline'=>true, 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false),
'news_summary' => array('title' => LAN_NEWS_27, 'type' => 'text', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false),
@@ -855,7 +855,7 @@ class admin_newspost
$this->fields = array(
'checkboxes' => array('title' => '', 'type' => null, 'data'=> false, 'width' => '3%', 'thclass' => 'center first', 'class' => 'center', 'nosort' => true, 'toggle' => 'news_selected', 'forced' => TRUE),
'news_id' => array('title' => LAN_NEWS_45, 'type' => 'number', 'data'=> 'int', 'width' => '5%', 'thclass' => 'center', 'class' => 'center', 'nosort' => false),
'news_id' => array('title' => LAN_ID, 'type' => 'number', 'data'=> 'int', 'width' => '5%', 'thclass' => 'center', 'class' => 'center', 'nosort' => false),
'news_thumbnail' => array('title' => NWSLAN_67, 'type' => 'image', 'data'=> 'str', 'width' => '110px', 'thclass' => 'center', 'class' => "center", 'nosort' => false, 'readParms'=>'thumb=60&thumb_urlraw=0&thumb_aw=60','writeParams' => 'path={e_MEDIA}','readonly'=>false),
'news_title' => array('title' => LAN_TITLE, 'type' => 'text', 'data'=> 'str','width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false),
'news_summary' => array('title' => LAN_NEWS_27, 'type' => 'text', 'data'=> 'str','width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false),
@@ -2035,7 +2035,7 @@ class admin_newspost
</td>
</tr>
<tr>
<td>".NWSLAN_12.":</td>
<td>".LAN_TITLE.":</td>
<td>
<input type='text' name='news_title' value=\"". $tp->post_toForm(vartrue($_POST['news_title']))."\" class='tbox' style='width:90%' required='required' />
".
@@ -2354,7 +2354,7 @@ class admin_newspost
</tr>
";
if($pref['trackbackEnabled']){
if($pref['trackbackEnabled']){ // FIXME onclick expandit not working
$text .= "
<tr>
<td>".LAN_NEWS_34.":</td>
@@ -2362,7 +2362,7 @@ class admin_newspost
<a class='e-pointer' onclick='expandit(this);'>".LAN_NEWS_35."</a>
<div class='e-hideme'>
<div class='field-spacer'>
<span class='smalltext'>".LAN_NEWS_37."</span>
<span class='field-help>".LAN_NEWS_37."</span>
</div>
<div class='field-spacer'>
<textarea class='tbox textarea' name='trackback_urls' style='width:95%' cols='80' rows='5'>".$_POST['trackback_urls']."</textarea>
@@ -2712,7 +2712,7 @@ class admin_newspost
</colgroup>
<thead>
<tr>
<th class='center'>".LAN_NEWS_45."</th>
<th class='center'>".LAN_ID."</th>
<th class='center'>".LAN_ICON."</th>
<th>".NWSLAN_6."</th>
<th>Manage Permissions</th>
@@ -3027,7 +3027,7 @@ class admin_newspost
<div class='field-spacer center nowrap'>
".$frm->admin_button("category_view_{$row['submitnews_id']}", NWSLAN_27, 'action', '', array('id'=>false, 'other'=>"onclick=\"expandit('submitted_".$row['submitnews_id']."')\""))."
".$frm->admin_button("category_edit_{$row['submitnews_id']}", $buttext, 'action', '', array('id'=>false, 'other'=>"onclick=\"document.location='".e_SELF."?create.sn.{$row['submitnews_id']}'\""))."
".$frm->admin_button("delete[sn_{$row['submitnews_id']}]", LAN_DELETE, 'delete', '', array('id'=>false, 'title'=>$tp->toJS(NWSLAN_38." [".LAN_NEWS_45.": {$row['submitnews_id']} ]")))."
".$frm->admin_button("delete[sn_{$row['submitnews_id']}]", LAN_DELETE, 'delete', '', array('id'=>false, 'title'=>$tp->toJS(NWSLAN_38." [".LAN_ID.": {$row['submitnews_id']} ]")))."
</div>
</td>
</tr>

10
e107_admin/prefs.php
View File

@@ -2,16 +2,12 @@
/*
* e107 website system
*
* Copyright (C) 2008-2010 e107 Inc (e107.org)
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* Administration - Site Preferences
*
* $URL$
* $Revision$
* $Id$
* $Author$
*/
require_once ("../class2.php");
@@ -253,7 +249,7 @@ function sendTest()
require_once(e_HANDLER.'mail.php');
$add = ($pref['mailer']) ? " (".strtoupper($pref['mailer']).")" : ' (PHP)';
$sendto = trim($_POST['testaddress']);
if (!sendemail($sendto, LAN_MAILOUT_113." ".SITENAME.$add, LAN_MAILOUT_114,LAN_MAILOUT_189))
if (!sendemail($sendto, LAN_MAILOUT_113." ".SITENAME.$add, str_replace("[br]", "\n", LAN_MAILOUT_114),LAN_MAILOUT_189))
{
$mes->addError(($pref['mailer'] == 'smtp') ? LAN_MAILOUT_67 : LAN_MAILOUT_106);
}
@@ -1336,7 +1332,7 @@ if(file_exists(e_PLUGIN."geshi/geshi.php"))
<td>".PRFLAN_118."?:</div></td>
<td>
".$frm->radio_switch('useGeshi', $pref['useGeshi'])."
<div class='smalltext field-help'>".PRFLAN_119."</div>
<div class='smalltext field-help'>".str_replace("[link]", "http://qbnz.com/highlighter/", PRFLAN_119)."</div>
</td>
</tr>
<tr>