mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-24 16:31:48 +02:00
Code Issues Releases Wiki Activity

More Duplicate LANS #6 LAN_NONE LAN_SUBMIT

Browse Source 
More Duplicate LANS #6 LAN_NONE LAN_SUBMIT
This commit is contained in:
MikeyGMT
2017-02-10 22:34:17 +00:00
parent 28e8937845
commit af17dffcaa
10 changed files with 54 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
e107_admin/users_extended.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Copyright (C) 2008-2017 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
@@ -63,7 +63,7 @@ if(varset($_GET['mode']) == "ajax")
$text = "<table class='table table-striped table-bordered' style='width:70%;margin-left:0;'><tr><td>";
$text .= EXTLAN_62 . "</td><td style='70%'>\n";
$text .= "<select name='table_db' style='width:99%' class='tbox e-ajax' data-src='{$ajaxGetTableSrc}'>";
$text .= "<option value='' class='caption'>" . EXTLAN_61 . "</option>";
$text .= "<option value='' class='caption'>" . LAN_NONE . "</option>";
$result = e107::getDb()->tables();
foreach($result as $row2)
{
@@ -78,7 +78,7 @@ if(varset($_GET['mode']) == "ajax")
// Field ID.
$text .= "<tr><td>" . EXTLAN_63 . "</td><td>";
$text .= "<select style='width:99%' class='tbox e-select' name='field_id'>";
$text .= "<option value='' class='caption'>" . EXTLAN_61 . "</option>";
$text .= "<option value='' class='caption'>" . LAN_NONE . "</option>";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0];
if($sql->gen("DESCRIBE " . MPREFIX . "{$table_list}"))
{
@@ -94,7 +94,7 @@ if(varset($_GET['mode']) == "ajax")
// Display Value.
$text .= EXTLAN_64 . "</td><td>";
$text .= "<select style='width:99%' class='tbox e-select' name='field_value'>";
$text .= "<option value='' class='caption'>" . EXTLAN_61 . "</option>";
$text .= "<option value='' class='caption'>" . LAN_NONE . "</option>";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0];
if($sql->gen("DESCRIBE " . MPREFIX . "{$table_list}"))
{
@@ -110,7 +110,7 @@ if(varset($_GET['mode']) == "ajax")
// Order.
$text .= LAN_ORDER . "</td><td>";
$text .= "<select style='width:99%' class='tbox e-select' name='field_order'>";
$text .= "<option value='' class='caption'>" . EXTLAN_61 . "</option>";
$text .= "<option value='' class='caption'>" . LAN_NONE . "</option>";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0];
if($sql->gen("DESCRIBE " . MPREFIX . "{$table_list}"))
{
@@ -964,7 +964,7 @@ e107::js('footer-inline', js());
$text .= "<table class='table table-striped table-bordered' style='width:70%;margin-left:0;'><tr><td>";
$text .= EXTLAN_62 . "</td><td style='70%'>";
$text .= "<select name='table_db' style='width:99%' class='tbox e-ajax' data-src='{$ajaxGetTableSrc}'>";
$text .= "<option value='' class='caption'>" . EXTLAN_61 . "</option>";
$text .= "<option value='' class='caption'>" . LAN_NONE . "</option>";
$result = e107::getDb()->tables();
@@ -983,7 +983,7 @@ e107::js('footer-inline', js());
{
// Field ID
$text .= "<tr><td>".EXTLAN_63."</td><td><select style='width:99%' class='tbox e-select' name='field_id' >\n
<option value='' class='caption'>".EXTLAN_61."</option>\n";
<option value='' class='caption'>".LAN_NONE."</option>\n";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0] ;
if($sql->gen("DESCRIBE ".MPREFIX."{$table_list}"))
@@ -998,7 +998,7 @@ e107::js('footer-inline', js());
$text .= " </select></td></tr><tr><td>";
// Field Value
$text .= EXTLAN_64."</td><td><select style='width:99%' class='tbox e-select' name='field_value' >
<option value='' class='caption'>".EXTLAN_61."</option>\n";
<option value='' class='caption'>".LAN_NONE."</option>\n";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0] ;
if($sql->gen("DESCRIBE ".MPREFIX."{$table_list}"))
@@ -1013,7 +1013,7 @@ e107::js('footer-inline', js());
$text .= " </select></td></tr><tr><td>";
$text .= LAN_ORDER."</td><td><select style='width:99%' class='tbox e-select' name='field_order' >
<option value='' class='caption'>".EXTLAN_61."</option>\n";
<option value='' class='caption'>".LAN_NONE."</option>\n";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0] ;
if($sql ->gen("DESCRIBE ".MPREFIX."{$table_list}"))
@@ -1821,7 +1821,7 @@ class users_ext
$text .= "<table style='width:70%;margin-left:0;'><tr><td>";
$text .= EXTLAN_62 . "</td><td style='70%'>";
$text .= "<select name='table_db' style='width:99%' class='tbox e-ajax' data-src='{$ajaxGetTableSrc}'>";
$text .= "<option value='' class='caption'>" . EXTLAN_61 . "</option>";
$text .= "<option value='' class='caption'>" . LAN_NONE . "</option>";
$result = e107::getDb()->tables();
@@ -1840,7 +1840,7 @@ class users_ext
{
// Field ID
$text .= "<tr><td>".EXTLAN_63."</td><td><select style='width:99%' class='tbox e-select' name='field_id' >\n
<option value='' class='caption'>".EXTLAN_61."</option>\n";
<option value='' class='caption'>".LAN_NONE."</option>\n";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0] ;
if($sql->gen("DESCRIBE ".MPREFIX."{$table_list}"))
@@ -1855,7 +1855,7 @@ class users_ext
$text .= " </select></td></tr><tr><td>";
// Field Value
$text .= EXTLAN_64."</td><td><select style='width:99%' class='tbox e-select' name='field_value' >
<option value='' class='caption'>".EXTLAN_61."</option>\n";
<option value='' class='caption'>".LAN_NONE."</option>\n";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0] ;
if($sql->gen("DESCRIBE ".MPREFIX."{$table_list}"))
@@ -1870,7 +1870,7 @@ class users_ext
$text .= " </select></td></tr><tr><td>";
$text .= LAN_ORDER."</td><td><select style='width:99%' class='tbox e-select' name='field_order' >
<option value='' class='caption'>".EXTLAN_61."</option>\n";
<option value='' class='caption'>".LAN_NONE."</option>\n";
$table_list = ($_POST['table_db']) ? $_POST['table_db'] : $curVals[0] ;
if($sql ->gen("DESCRIBE ".MPREFIX."{$table_list}"))

4
e107_handlers/mailout_admin_class.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Copyright (C) 2008-2017 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
@@ -2165,7 +2165,7 @@ class mailoutAdminClass extends e107MailManager
<td>".LAN_MAILOUT_90."</td><td>
<select class='tbox' name='smtp_options'>\n
<option value=''>".LAN_MAILOUT_96."</option>\n";
<option value=''>".LAN_NONE."</option>\n";
$selected = (in_array('secure=SSL',$smtp_opts) ? " selected='selected'" : '');
$text .= "<option value='smtp_ssl'{$selected}>".LAN_MAILOUT_92."</option>\n";
$selected = (in_array('secure=TLS',$smtp_opts) ? " selected='selected'" : '');

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

@@ -72,7 +72,7 @@ releases, then you will discover files have failed integrity check because they
after the latest core image snapshot was created.");
define("FR_LAN_19", "files failed");
define("FR_LAN_20", "All files passed");
define("FR_LAN_21", "none");
//define("FR_LAN_21", "none");//NOT USED
define("FR_LAN_22", "Missing core files");
define("FR_LAN_23", "No matches found.");
define("FR_LAN_24", "Old core files");

12
e107_languages/English/admin/lan_mailout.php
View File

@@ -1,12 +1,14 @@
<?php
/*
* Copyright (C) 2008-2013 e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* e107 website system
*
* Admin Language File
* Copyright (C) 2008-2017 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
*/
*/
// TODO - MAJOR LAN REWRITE NEEDED
// TODO - LANS - MAJOR LAN REWRITE NEEDED
define("CORE_DATE_ORDER", "dmy"); // Temporary until we find somewhere better to put it.
// Defines order of field entry/display in date boxes
@@ -106,7 +108,7 @@ define("LAN_MAILOUT_92", "SSL");
define("LAN_MAILOUT_93", "TLS");
define("LAN_MAILOUT_94", "(Use SSL for gmail/googlemail)");
define("LAN_MAILOUT_95", "Use VERP for bulk mailing");
define("LAN_MAILOUT_96", "none");
//define("LAN_MAILOUT_96", "none");//LAN_NONE
define("LAN_MAILOUT_97", "Mailer Results");
define("LAN_MAILOUT_98", "Orphaned entries");
define("LAN_MAILOUT_99", "Confirm retry mailshot");

18
e107_languages/English/admin/lan_users_extended.php
View File

@@ -1,14 +1,12 @@
<?php
/*
+ ----------------------------------------------------------------------------+
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_users_extended.php,v $
| $Revision$
| $Date$
| $Author$
+----------------------------------------------------------------------------+
*/
* e107 website system
*
* Copyright (C) 2008-2017 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
*/
define("EXTLAN_1", "Name");
define("EXTLAN_2", "Preview");
define("EXTLAN_3", "Values");
@@ -70,7 +68,7 @@ define("EXTLAN_57", "Activated");
define("EXTLAN_58", "Not Activated");
define("EXTLAN_59", "Activate");
define("EXTLAN_60", "Deactivate");
define("EXTLAN_61", "None");
//define("EXTLAN_61", "None");//LAN_NONE
define("EXTLAN_62", "Table");
define("EXTLAN_63", "Field Id");

18
e107_languages/English/lan_page.php
View File

@@ -1,14 +1,12 @@
<?php
/*
+ ----------------------------------------------------------------------------+
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_page.php,v $
| $Revision$
| $Date$
| $Author$
+----------------------------------------------------------------------------+
*/
* e107 website system
*
* Copyright (C) 2008-2017 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
*/
define("LAN_PAGE_1", "Page listing is turned off");
define("LAN_PAGE_2", "There are no pages");
@@ -19,7 +17,7 @@ define("LAN_PAGE_6", "You do not have permission to view this page");
//define("LAN_PAGE_7", "Incorrect password");//LAN_INCORRECT_PASSWORD
define("LAN_PAGE_8", "Password Protected Page");
//define("LAN_PAGE_9", "Password");//LAN_PASSWORD
define("LAN_PAGE_10", "Submit");
//define("LAN_PAGE_10", "Submit");//LAN_SUBMIT
define("LAN_PAGE_11", "Page List");
define("LAN_PAGE_12", "Invalid page");
define("LAN_PAGE_13", "Page");

4
e107_plugins/download/handlers/adminDownload_class.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Copyright (C) 2008-2017 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
@@ -1946,7 +1946,7 @@ class adminDownload extends download
<tr>
<td style='width: 10%; text-align: center;'>$mirror_id</td>
<td style='width: 30%;'>".$tp -> toHTML($mirror_name)."</td>
<td style='width: 30%;'>".($mirror_image ? "<img src='".e_FILE."downloadimages/".$mirror_image."' alt=''/>" : DOWLAN_28)."</td>
<td style='width: 30%;'>".($mirror_image ? "<img src='".e_FILE."downloadimages/".$mirror_image."' alt=''/>" : LAN_NONE)."</td>
<td style='width: 30%; text-align: center;'>
<a href='".e_SELF."?mirror.edit.{$mirror_id}'>".ADMIN_EDIT_ICON."</a>
<input type='image' title='".LAN_DELETE."' name='delete[mirror_{$mirror_id}]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".DOWLAN_137." [ID: $mirror_id ]')\"/>

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

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Copyright (C) 2008-2017 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
@@ -1917,7 +1917,7 @@ $columnInfo = array(
<tr>
<td style='width: 10%; text-align: center;'>$mirror_id</td>
<td style='width: 30%;'>".$tp -> toHTML($mirror_name)."</td>
<td style='width: 30%;'>".($mirror_image ? "<img src='".e_FILE."downloadimages/".$mirror_image."' alt=''/>" : DOWLAN_28)."</td>
<td style='width: 30%;'>".($mirror_image ? "<img src='".e_FILE."downloadimages/".$mirror_image."' alt=''/>" : LAN_NONE)."</td>
<td style='width: 30%; text-align: center;'>
<a href='".e_SELF."?mirror.edit.{$mirror_id}'>".ADMIN_EDIT_ICON."</a>
<input type='image' title='".LAN_DELETE."' name='delete[mirror_{$mirror_id}]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".DOWLAN_137." [ID: $mirror_id ]')\"/>

18
e107_plugins/download/languages/English/English_admin.php
View File

@@ -1,14 +1,12 @@
<?php
/*
+ ----------------------------------------------------------------------------+
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/download/languages/English/admin_download.php,v $
| $Revision$
| $Date$
| $Author$
+----------------------------------------------------------------------------+
*/
* e107 website system
*
* Copyright (C) 2008-2017 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
*/
// define("LAN_PLUGIN_DOWNLOAD_NAME", "Downloads");
define("LAN_DL_OPTIONS", "Options"); //FIXME Use Generic
define("LAN_DL_DOWNLOAD_OPT_GENERAL", "General");
@@ -49,7 +47,7 @@ define("DOWLAN_24", "Update Download");
define("DOWLAN_25", "Submit Download");
// define("DOWLAN_26", "Uploads enabled?");
define("DOWLAN_27", "Download");
define("DOWLAN_28", "None");
//define("DOWLAN_28", "None");//LAN_NONE
define("DOWLAN_29", "Requested");
define("DOWLAN_31", "Categories");
define("DOWLAN_32", "Downloads");

10
page.php
View File

@@ -2,15 +2,11 @@
/*
* e107 website system
*
* Copyright (C) e107 Inc (e107.org)
* Copyright (C) 2008-2017 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* URL and front controller Management
*
* $URL$
* $Id$
*/
*/
require_once("class2.php");
e107::coreLan('page');
@@ -808,7 +804,7 @@ class pageClass
$extend->label = LAN_PASSWORD;
$extend->password = $frm->password('page_pw','',50,'size=xlarge&required=1');
$extend->icon = e_IMAGE_ABS.'generic/password.png';
$extend->submit = $frm->submit('submit_page_pw', LAN_PAGE_10);
$extend->submit = $frm->submit('submit_page_pw', LAN_SUBMIT);
// FIXME - add form open/close e_form methods
$extend->form_open = '<form method="post" class="form-inline" action="'.e_REQUEST_URI.'" id="pwform">';
$extend->form_close = '</form>';