From 028ab0ddc86a26dd610d7f33e00bdb0d02f24d4c Mon Sep 17 00:00:00 2001 From: Moc Date: Thu, 21 Mar 2013 13:39:11 +0100 Subject: [PATCH] #6 - LAN clean-up (HTML removal, double quotes, generic) - done upto lan_lx --- e107_admin/db.php | 2 +- e107_admin/emoticon.php | 18 +- e107_admin/eurl.php | 8 +- e107_admin/filemanager.php | 2 +- e107_admin/frontpage.php | 4 +- e107_admin/lancheck.php | 8 +- e107_admin/links.php | 2 +- .../shortcodes/batch/admin_shortcodes.php | 4 +- e107_languages/English/admin/lan_admin.php | 3 +- .../English/admin/lan_admin_log.php | 7 +- .../English/admin/lan_administrator.php | 7 +- e107_languages/English/admin/lan_banlist.php | 7 +- e107_languages/English/admin/lan_cache.php | 3 +- e107_languages/English/admin/lan_cpage.php | 30 +- e107_languages/English/admin/lan_credits.php | 72 ++- e107_languages/English/admin/lan_cron.php | 15 +- e107_languages/English/admin/lan_db.php | 7 +- .../English/admin/lan_db_verify.php | 13 +- e107_languages/English/admin/lan_docs.php | 7 + e107_languages/English/admin/lan_download.php | 16 +- .../English/admin/lan_e107_update.php | 5 +- e107_languages/English/admin/lan_emoticon.php | 25 +- e107_languages/English/admin/lan_eurl.php | 16 +- .../English/admin/lan_fileinspector.php | 14 +- .../English/admin/lan_filemanager.php | 15 +- e107_languages/English/admin/lan_fla.php | 13 +- e107_languages/English/admin/lan_footer.php | 13 +- .../English/admin/lan_frontpage.php | 47 +- e107_languages/English/admin/lan_header.php | 17 +- e107_languages/English/admin/lan_image.php | 5 +- e107_languages/English/admin/lan_lancheck.php | 28 +- e107_languages/English/admin/lan_language.php | 42 +- e107_languages/English/admin/lan_links.php | 7 +- .../English/admin/lan_log_messages.php | 488 +++++++++--------- 34 files changed, 466 insertions(+), 504 deletions(-) diff --git a/e107_admin/db.php b/e107_admin/db.php index b67d38df8..7f5288dd8 100644 --- a/e107_admin/db.php +++ b/e107_admin/db.php @@ -914,7 +914,7 @@ class system_tools - ".DBLAN_24." + ".LAN_NAME." ".DBLAN_25." ".DBLAN_26." ".DBLAN_27." diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php index c1c36ba29..f7c4ac04a 100644 --- a/e107_admin/emoticon.php +++ b/e107_admin/emoticon.php @@ -293,7 +293,7 @@ class emotec
".LAN_EDIT." -
".sprintf(EMOLAN_31, count($eArray))."
+
".sprintf(str_replace("[x]", "%u", EMOLAN_31), count($eArray))."
@@ -401,11 +401,11 @@ class emotec if (file_put_contents($fname,$f_string) === FALSE) { - $mes->addWarning(''.EMOLAN_30.''.str_replace(e_IMAGE, e_IMAGE_ABS, $fname)); + $mes->addWarning(''.EMOLAN_30.':'.str_replace(e_IMAGE, e_IMAGE_ABS, $fname)); } else { - $mes->addSuccess(''.EMOLAN_29.''.str_replace(e_IMAGE, e_IMAGE_ABS, $fname)); + $mes->addSuccess(''.EMOLAN_29.':'.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}'"); } } diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php index 24f145be6..6f1e70410 100644 --- a/e107_admin/eurl.php +++ b/e107_admin/eurl.php @@ -510,7 +510,7 @@ class eurl_admin_form_ui extends e_admin_form_ui $info .= " - "; @@ -628,7 +628,7 @@ class eurl_admin_form_ui extends e_admin_form_ui ".LAN_EURL_CORE_INDEX_INFO." "; @@ -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.'
'.$url.''; + $help[] = '['.$lanDef[1].'] '.LAN_EURL_FORM_HELP_EXAMPLE.':
'.$url.''; 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 .= "
"; $text .= $this->text('eurl_aliases['.$code.']['.$module.']', $defVal).' ['.$lan.']'.$this->help(LAN_EURL_FORM_HELP_ALIAS_1.' '.$lan.''); - $help[] = '['.$lan.'] '.LAN_EURL_FORM_HELP_EXAMPLE.'
'.$url.''; + $help[] = '['.$lan.'] '.LAN_EURL_FORM_HELP_EXAMPLE.':
'.$url.''; } } diff --git a/e107_admin/filemanager.php b/e107_admin/filemanager.php index c11c3e87d..07900c9dc 100644 --- a/e107_admin/filemanager.php +++ b/e107_admin/filemanager.php @@ -309,7 +309,7 @@ $text .= " - + diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php index 6768a780a..2294355a0 100644 --- a/e107_admin/frontpage.php +++ b/e107_admin/frontpage.php @@ -500,7 +500,7 @@ class frontpage
".$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')."
@@ -633,7 +633,7 @@ class frontpage function add_other($ob_name, $cur_val, $cur_page) { return " - + "; } diff --git a/e107_admin/lancheck.php b/e107_admin/lancheck.php index 27c98dcbf..91f4c67cf 100644 --- a/e107_admin/lancheck.php +++ b/e107_admin/lancheck.php @@ -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.''.$lck->error_count.''); + $mes->addSuccess(LAN_CHECK_27.': '.$lck->error_count.''); } else { - $mes->addWarning(LAN_CHECK_27.''.$lck->error_count.''); + $mes->addWarning(LAN_CHECK_27.': '.$lck->error_count.''); } @@ -342,7 +342,7 @@ class lancheck $utf_error = ""; $bomkey = str_replace(".php","",$k_check); - $bom_error = ($check['bom'][$bomkey]) ? "".LAN_CHECK_15."
" : ""; // illegal chars + $bom_error = ($check['bom'][$bomkey]) ? "".str_replace("[php]", "
" : ""; // illegal chars foreach($subkeys as $sk) { diff --git a/e107_admin/links.php b/e107_admin/links.php index 8f97ef792..09e8deee6 100644 --- a/e107_admin/links.php +++ b/e107_admin/links.php @@ -216,7 +216,7 @@ class links_admin_ui extends e_admin_ui - +
".$label." ".LAN_EURL_LOCATION." ".$path." + ".LAN_EURL_LOCATION.": ".$path."

".vartrue($section['description'], LAN_EURL_PROFILE_INFO)."

".implode("
", $exampleUrl)."
- ".LAN_EURL_FORM_HELP_EXAMPLE."
".e107::getUrl()->create('/', '', array('full' => 1))." + ".LAN_EURL_FORM_HELP_EXAMPLE.":
".e107::getUrl()->create('/', '', array('full' => 1))."
".FMLAN_17."".LAN_SIZE." ".FMLAN_18." ".FMLAN_19."
".$this->frm->radio($ob_name, 'other', $cur_val)." ".$this->frm->label(FRTLAN_15, $ob_name, 'other')."".$this->frm->radio($ob_name, 'other', $cur_val)." ".$this->frm->label(FRTLAN_15.":", $ob_name, 'other')." ".$this->frm->text($ob_name.'_other', ($cur_val ? $cur_page : ''), 150, "size=50&id={$ob_name}-other-txt")."
".LINKLAN_6."".LINKLAN_6.": "; diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 3bc03ab7a..43e6ba2ef 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -476,11 +476,11 @@ class admin_shortcodes $str = str_replace('.', '', ADMINPERMS); if (ADMINPERMS == '0') { - return ''.ADLAN_48.': '.ADMINNAME.' ('.ADLAN_49.') '.( defined('e_DBLANGUAGE') ? ''.LAN_head_5.' '.e_DBLANGUAGE : '' ); + return ''.ADLAN_48.': '.ADMINNAME.' ('.ADLAN_49.') '.( defined('e_DBLANGUAGE') ? ''.LAN_head_5.': '.e_DBLANGUAGE : '' ); } else { - return ''.ADLAN_48.': '.ADMINNAME.' '.( defined('e_DBLANGUAGE') ? ''.LAN_head_5.' '.e_DBLANGUAGE : '' ); + return ''.ADLAN_48.': '.ADMINNAME.' '.( defined('e_DBLANGUAGE') ? ''.LAN_head_5.': '.e_DBLANGUAGE : '' ); } } else diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index e37ac4e01..9ff4e38df 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -1,8 +1,9 @@ 5ODM2NDU3YWI0ZjM1NGILJT
yarrrrrr! wtf matey!\""); // jalist -define("CRELAN_23", ""); // lisa -define("CRELAN_24", ""); // McFly -define("CRELAN_25", ""); // que -define("CRELAN_26", ""); // streaky -define("CRELAN_27", "\"Wot? No tea?? 0_0\""); // SweetAs -define("CRELAN_28", ""); // MrPete -define("CRELAN_29", "Up and forward!"); // SecretR -define("CRELAN_30", ""); // steved +// define("CRELAN_20", ""); // asperon +// define("CRELAN_21", "Always a pressure..err..pleasure!"); // CaMer0n +// define("CRELAN_22", "\"MTVhNjMyZDgxN2QwM2Q3ZTI
5ODM2NDU3YWI0ZjM1NGILJT
yarrrrrr! wtf matey!\""); // jalist +// define("CRELAN_23", ""); // lisa +// define("CRELAN_24", ""); // McFly +// define("CRELAN_25", ""); // que +// define("CRELAN_26", ""); // streaky +// define("CRELAN_27", "\"Wot? No tea?? 0_0\""); // SweetAs +// define("CRELAN_28", ""); // MrPete +// define("CRELAN_29", "Up and forward!"); // SecretR +// define("CRELAN_30", ""); // steved //define("CRELAN_31", ""); //define("CRELAN_32", ""); diff --git a/e107_languages/English/admin/lan_cron.php b/e107_languages/English/admin/lan_cron.php index 29248f7bb..65938ef36 100644 --- a/e107_languages/English/admin/lan_cron.php +++ b/e107_languages/English/admin/lan_cron.php @@ -1,14 +1,11 @@
Please ensure the file core_sql.php exists in the /e107_core/sql directory."); // define("DBLAN_2", "Verifying all"); diff --git a/e107_languages/English/admin/lan_docs.php b/e107_languages/English/admin/lan_docs.php index 904c42aa8..91185093d 100644 --- a/e107_languages/English/admin/lan_docs.php +++ b/e107_languages/English/admin/lan_docs.php @@ -1,4 +1,11 @@ \ No newline at end of file diff --git a/e107_languages/English/admin/lan_filemanager.php b/e107_languages/English/admin/lan_filemanager.php index 194ca8a4a..2778cacc2 100644 --- a/e107_languages/English/admin/lan_filemanager.php +++ b/e107_languages/English/admin/lan_filemanager.php @@ -1,14 +1,11 @@ \ No newline at end of file diff --git a/e107_languages/English/admin/lan_header.php b/e107_languages/English/admin/lan_header.php index 2d629e37b..58dfff8a8 100644 --- a/e107_languages/English/admin/lan_header.php +++ b/e107_languages/English/admin/lan_header.php @@ -1,21 +1,16 @@ diff --git a/e107_languages/English/admin/lan_image.php b/e107_languages/English/admin/lan_image.php index 6575ee54b..ba599fab5 100644 --- a/e107_languages/English/admin/lan_image.php +++ b/e107_languages/English/admin/lan_image.php @@ -1,10 +1,9 @@ \ No newline at end of file diff --git a/e107_languages/English/admin/lan_language.php b/e107_languages/English/admin/lan_language.php index bbc9a7c4a..abe73d016 100644 --- a/e107_languages/English/admin/lan_language.php +++ b/e107_languages/English/admin/lan_language.php @@ -1,18 +1,17 @@ \ No newline at end of file diff --git a/e107_languages/English/admin/lan_links.php b/e107_languages/English/admin/lan_links.php index 871a577fa..672f39772 100644 --- a/e107_languages/English/admin/lan_links.php +++ b/e107_languages/English/admin/lan_links.php @@ -1,10 +1,9 @@