mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 04:10:38 +02:00
Code Issues Releases Wiki Activity

#6 - LAN clean-up (HTML removal, double quotes, generic) - done upto lan_lx

Browse Source
This commit is contained in:
Moc
2013-03-21 13:39:11 +01:00
parent a60bfbad10
commit 028ab0ddc8
34 changed files with 466 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/db.php
View File

@@ -914,7 +914,7 @@ class system_tools
</colgroup>
<thead>
<tr>
<th>".DBLAN_24."</th>
<th>".LAN_NAME."</th>
<th>".DBLAN_25."</th>
<th>".DBLAN_26."</th>
<th class='center last'>".DBLAN_27."</th>

18
e107_admin/emoticon.php
View File

@@ -293,7 +293,7 @@ class emotec
<form method='post' action='".e_SELF."#etabTabContainer=emoticon-packages'>
<fieldset id='core-emoticon-configure'>
<legend class='e-hideme'>".LAN_EDIT."</legend>
<div class='info-bar'><strong>".sprintf(EMOLAN_31, count($eArray))."</strong></div>
<div class='info-bar'><strong>".sprintf(str_replace("[x]", "%u", EMOLAN_31), count($eArray))."</strong></div>
<table class='table adminlist'>
<colgroup>
<col style='width:20px' />
@@ -401,11 +401,11 @@ class emotec
if (file_put_contents($fname,$f_string) === FALSE)
{
$mes->addWarning('<strong>'.EMOLAN_30.'</strong>'.str_replace(e_IMAGE, e_IMAGE_ABS, $fname));
$mes->addWarning('<strong>'.EMOLAN_30.'</strong>:'.str_replace(e_IMAGE, e_IMAGE_ABS, $fname));
}
else
{
$mes->addSuccess('<strong>'.EMOLAN_29.'</strong>'.str_replace(e_IMAGE, e_IMAGE_ABS, $fname));
$mes->addSuccess('<strong>'.EMOLAN_29.'</strong>:'.str_replace(e_IMAGE, e_IMAGE_ABS, $fname));
}
}
@@ -475,7 +475,7 @@ class emotec
if (($do_one == $value) || !$do_one && (!$sql -> db_Select("core", "*", "e107_name='emote_".$value."' ")))
{ // Pack info not in DB, or to be re-scanned
$no_error = TRUE;
$File_type = EMOLAN_32;
$File_type = EMOLAN_32.":";
// Array of all files in the directory of the selected emote pack
$fileArray = $fl -> get_files(e_IMAGE."emotes/".$value); // We actually want all the files in the directory
$confFile = '';
@@ -519,7 +519,7 @@ class emotec
}
// $tmp = addslashes(serialize($confArray));
$tmp = e107::getArrayStorage()->WriteArray($confArray);
$File_type = EMOLAN_22;
$File_type = EMOLAN_22.":";
}
/* end */
@@ -629,13 +629,13 @@ class emotec
// Save pack info in the database
// $tmp = addslashes(serialize($confArray));
$tmp = e107::getArrayStorage()->WriteArray($confArray);
$File_type = EMOLAN_23;
$File_type = EMOLAN_23.":";
}
if($confFile['type'] == "php")
{
include_once(e_IMAGE."emotes/".$value."/".$confFile['file']);
$File_type = EMOLAN_24;
$File_type = EMOLAN_24.":";
$tmp = $_emoteconf; // Use consistent name
}
@@ -653,7 +653,7 @@ class emotec
}
else
{ // Error occurred
$mes->addError(EMOLAN_27." '{$value}'");
$mes->addError(EMOLAN_27.": '{$value}'");
}
}
}
@@ -664,7 +664,7 @@ class emotec
{
foreach ($pack_local as $p => $d)
{
$mes->addInfo(EMOLAN_34.$p.EMOLAN_35);
$mes->addInfo(EMOLAN_34.":".$p.EMOLAN_35);
$sql->db_Delete("core","`e107_name` = 'emote_{$p}'");
}
}

8
e107_admin/eurl.php
View File

@@ -510,7 +510,7 @@ class eurl_admin_form_ui extends e_admin_form_ui
$info .= "<tr><td>".$label."
</td>
<td><strong>".LAN_EURL_LOCATION."</strong> ".$path."
<td><strong>".LAN_EURL_LOCATION."</strong>: ".$path."
<p>".vartrue($section['description'], LAN_EURL_PROFILE_INFO)."</p><small>".implode("<br />", $exampleUrl)."</small></td></tr>
";
@@ -628,7 +628,7 @@ class eurl_admin_form_ui extends e_admin_form_ui
".LAN_EURL_CORE_INDEX_INFO."
</td>
<td>
".LAN_EURL_FORM_HELP_EXAMPLE." <br /><strong>".e107::getUrl()->create('/', '', array('full' => 1))."</strong>
".LAN_EURL_FORM_HELP_EXAMPLE.":<br /><strong>".e107::getUrl()->create('/', '', array('full' => 1))."</strong>
</td>
</tr>
";
@@ -656,7 +656,7 @@ class eurl_admin_form_ui extends e_admin_form_ui
// default language
$text .= $this->text('eurl_aliases['.$lanDef[0].']['.$module.']', $defVal).' ['.$lanDef[1].']'.$this->help(LAN_EURL_FORM_HELP_DEFAULT);
$help[] = '['.$lanDef[1].'] '.LAN_EURL_FORM_HELP_EXAMPLE.'<br /><strong>'.$url.'</strong>';
$help[] = '['.$lanDef[1].'] '.LAN_EURL_FORM_HELP_EXAMPLE.':<br /><strong>'.$url.'</strong>';
if($lans)
{
@@ -667,7 +667,7 @@ class eurl_admin_form_ui extends e_admin_form_ui
$defVal = isset($currentAliases[$code]) && in_array($module, $currentAliases[$code]) ? array_search($module, $currentAliases[$code]) : $module;
$text .= "<div class='spacer'><!-- --></div>";
$text .= $this->text('eurl_aliases['.$code.']['.$module.']', $defVal).' ['.$lan.']'.$this->help(LAN_EURL_FORM_HELP_ALIAS_1.' <strong>'.$lan.'</strong>');
$help[] = '['.$lan.'] '.LAN_EURL_FORM_HELP_EXAMPLE.'<br /><strong>'.$url.'</strong>';
$help[] = '['.$lan.'] '.LAN_EURL_FORM_HELP_EXAMPLE.':<br /><strong>'.$url.'</strong>';
}
}

2
e107_admin/filemanager.php
View File

@@ -309,7 +309,7 @@ $text .= "
<!-- <a href='filemanager.php'><img src='".$imagedir."home.png' alt='".FMLAN_16."' /></a> -->
<input type='hidden' name='MAX_FILE_SIZE' value='{$max_file_size}' />
</th>
<th class='center'>".FMLAN_17."</th>
<th class='center'>".LAN_SIZE."</th>
<th class='center'>".FMLAN_18."</th>
<th class='center'>".FMLAN_19."</th>
</tr>

4
e107_admin/frontpage.php
View File

@@ -500,7 +500,7 @@ class frontpage
</div>
<div class='buttons-bar center'>
".$this->frm->hidden('fp_order', $rule_info['order'])."
".FRTLAN_43.e107::getUserClass()->uc_dropdown('class', $rule_info['class'], 'public,guest,member,admin,main,classes')."
".FRTLAN_43.": ".e107::getUserClass()->uc_dropdown('class', $rule_info['class'], 'public,guest,member,admin,main,classes')."
".$this->frm->admin_button('fp_save_new', LAN_UPDATE, 'update')."
".$this->frm->admin_button('fp_cancel', LAN_CANCEL, 'cancel')."
</div>
@@ -633,7 +633,7 @@ class frontpage
function add_other($ob_name, $cur_val, $cur_page)
{
return "
<td>".$this->frm->radio($ob_name, 'other', $cur_val)."&nbsp;".$this->frm->label(FRTLAN_15, $ob_name, 'other')."</td>
<td>".$this->frm->radio($ob_name, 'other', $cur_val)."&nbsp;".$this->frm->label(FRTLAN_15.":", $ob_name, 'other')."</td>
<td>".$this->frm->text($ob_name.'_other', ($cur_val ? $cur_page : ''), 150, "size=50&id={$ob_name}-other-txt")."</td>
";
}

8
e107_admin/lancheck.php
View File

@@ -132,7 +132,7 @@ if(isset($_POST['submit']))
else
{
$caption = LAN_CHECK_PAGE_TITLE.' - '.LAN_CHECK_24;
$mes->addSuccess(sprintf(LAN_CHECK_23, basename($writeit)));
$mes->addSuccess(sprintf(str_replace("[x]", "%s", LAN_CHECK_23), basename($writeit)));
}
fclose($writeit);
@@ -270,11 +270,11 @@ if(isset($_POST['language_sel']) && isset($_POST['language']))
{
e107::getConfig()->setPref('lancheck/'.$_POST['language'],1);
e107::getConfig()->save(FALSE);
$mes->addSuccess(LAN_CHECK_27.'<b>'.$lck->error_count.'</b>');
$mes->addSuccess(LAN_CHECK_27.'<b>: '.$lck->error_count.'</b>');
}
else
{
$mes->addWarning(LAN_CHECK_27.'<b>'.$lck->error_count.'</b>');
$mes->addWarning(LAN_CHECK_27.'<b>: '.$lck->error_count.'</b>');
}
@@ -342,7 +342,7 @@ class lancheck
$utf_error = "";
$bomkey = str_replace(".php","",$k_check);
$bom_error = ($check['bom'][$bomkey]) ? "<span class='error'><em>".LAN_CHECK_15."</em></span><br />" : ""; // illegal chars
$bom_error = ($check['bom'][$bomkey]) ? "<span class='error'><em>".str_replace("[php]", "<?php", LAN_CHECK_15)."</em></span><br />" : ""; // illegal chars
foreach($subkeys as $sk)
{

2
e107_admin/links.php
View File

@@ -216,7 +216,7 @@ class links_admin_ui extends e_admin_ui
</colgroup>
<tbody>
<tr>
<td>".LINKLAN_6."</td>
<td>".LINKLAN_6.":</td>
<td>
";