diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index d13898d95..f0110aa06 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -259,12 +259,14 @@ define("LAN_NOTWRITABLE"," is not writable, you need to CHMOD 777 the file or fo define("LAN_NOTREADABLE", "Not Readable"); define("LAN_MISSING", "Missing"); define("LAN_UNUSED", "Unused"); +define("LAN_TOOLTIP", "Tooltip"); define("LAN_TIME","Time"); // define("LAN_YES","Yes"); // define("LAN_NO","No"); // defined in e107_languages/English/English.php define("LAN_EMPTY","There are no entries in the database yet"); define("LAN_EXISTING","Existing Entries"); +define("LAN_DEFAULT_TABLE_DATA","Adding default table data to table:"); define("LAN_CONFDELETE","Confirm Delete"); define("LAN_PLUGIN","Plugin"); @@ -286,6 +288,7 @@ define("LAN_DISPLAYOPT", "Edit Display Options"); define("LAN_DATESTAMP","Date stamp"); define("LAN_TIMESTAMP","Timestamp"); define("LAN_IP","IP"); +define("LAN_IP_ADDRESS","IP Address"); define("LAN_PAGE","PAGE"); define("LAN_AGENT","AGENT"); define("LAN_LANG","Lang."); @@ -310,6 +313,7 @@ define("LAN_UPLOAD_ADDFILE","Add Another File"); define("LAN_UPLOAD_CONFIRM","Any unsaved changes to this page will be lost. Continue?"); define("LAN_UPLOAD_777","Folder is missing or not writable, you need to CHMOD 777 the following folder before uploading:"); define("LAN_UPLOAD_SERVEROFF", "This option is disabled as file uploading is not enabled on your server"); +define("LAN_WIDTH","Width"); define("LAN_DISABLED","Disabled"); define("LAN_ENABLED", "Enabled"); @@ -376,8 +380,8 @@ define("LAN_DEMO_FORBIDDEN", "Changes on this page are not possible in demo mode define("LAN_COPYRIGHT", "Copyright"); define("LAN_MANAGER", "Manage Permissions"); define("LAN_PING", "Ping"); -define("LAN_START", "Starting"); -define("LAN_END", "Ending"); +define("LAN_START", "Start"); +define("LAN_END", "End"); define("LAN_PREVIEW", "Preview"); diff --git a/e107_plugins/banner/admin_banner.php b/e107_plugins/banner/admin_banner.php index 73a1509d4..69012a4d9 100644 --- a/e107_plugins/banner/admin_banner.php +++ b/e107_plugins/banner/admin_banner.php @@ -2,7 +2,7 @@ /* * e107 website system * - * Copyright (C) 2008-2013 e107 Inc (e107.org) + * Copyright (C) 2008-2016 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * @@ -76,7 +76,7 @@ class banner_admin extends e_admin_dispatcher 'main/list' => array('caption'=> LAN_MANAGE, 'perm' => 'P'), 'main/create' => array('caption'=> LAN_CREATE, 'perm' => 'P'), - 'main/menu' => array('caption'=> BNRLAN_36, 'perm' => 'P'), + // 'main/menu' => array('caption'=> BNRLAN_36, 'perm' => 'P'), //NOW CONFIGURED IN MENU MGR // 'main/prefs' => array('caption'=> LAN_PREFS, 'perm' => 'P'), // 'main/custom' => array('caption'=> 'Custom Page', 'perm' => 'P') @@ -96,7 +96,7 @@ class banner_admin extends e_admin_dispatcher class banner_ui extends e_admin_ui { - protected $pluginTitle = 'Banners'; + protected $pluginTitle = LAN_PLUGIN_BANNER_NAME; protected $pluginName = 'banner'; protected $table = 'banner'; protected $pid = 'banner_id'; @@ -114,27 +114,27 @@ class banner_ui extends e_admin_ui protected $fields = array ( 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), 'banner_id' => array ( 'title' => LAN_ID, 'type' => null, 'data' => 'int', 'width' => '2%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'banner_campaign' => array ( 'title' => 'Campaign', 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => array( 'tdClassRight'=>'form-inline'), 'class' => 'left', 'thclass' => 'left', ), + 'banner_campaign' => array ( 'title' => BNRLAN_11, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => array( 'tdClassRight'=>'form-inline'), 'class' => 'left', 'thclass' => 'left', ), - 'banner_clientname' => array ( 'title' => 'Clientname', 'type' => 'method', 'tab'=>1, 'data' => 'str', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'banner_clientname' => array ( 'title' => BANNERLAN_22, 'type' => 'method', 'tab'=>1, 'data' => 'str', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'banner_clientlogin' => array ( 'title' => BNRLAN_12, 'type' => 'method', 'tab'=>1, 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), - 'banner_clientpassword' => array ( 'title' => BNRLAN_13, 'type' => 'text', 'tab'=>1,'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => 'strength=1&password=1&required=0&generate=1&nomask=1', 'class' => 'center', 'thclass' => 'center', ), - 'banner_image' => array ( 'title' => BNRLAN_14, 'type' => 'image', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => 'thumb=0x50', 'writeParms' => 'media=banner&w=600', 'class' => 'left', 'thclass' => 'left', ), + 'banner_clientpassword' => array ( 'title' => LAN_PASSWORD, 'type' => 'text', 'tab'=>1,'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => 'strength=1&password=1&required=0&generate=1&nomask=1', 'class' => 'center', 'thclass' => 'center', ), + 'banner_image' => array ( 'title' => LAN_IMAGE, 'type' => 'image', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => 'thumb=0x50', 'writeParms' => 'media=banner&w=600', 'class' => 'left', 'thclass' => 'left', ), 'banner_clickurl' => array ( 'title' => BNRLAN_15, 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => 'size=xxlarge&required=1', 'class' => 'left', 'thclass' => 'left', ), 'banner_impurchased' => array ( 'title' => BNRLAN_16, 'type' => 'number', 'data' => 'int', 'width' => 'auto', 'inline' => true, 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', 'help'=>'0 = unlimited' ), - 'banner_tooltip' => array ( 'title' => BNRLAN_49, 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => array('size'=>'xxlarge'), 'class' => 'center', 'thclass' => 'center', ), + 'banner_tooltip' => array ( 'title' => LAN_TOOLTIP, 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => array('size'=>'xxlarge'), 'class' => 'center', 'thclass' => 'center', ), 'banner_description' => array ( 'title' => LAN_DESCRIPTION, 'type' => 'textarea', 'data' => 'str', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), 'banner_keywords' => array ( 'title' => LAN_KEYWORDS, 'type' => 'tags', 'data' => 'str', 'width' => 'auto', 'inline' => true, 'help' => 'When news or pages are loaded, this will limit banner result to matching keywords. Use with caution.', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), - 'banner_startdate' => array ( 'title' => BNRLAN_17, 'type' => 'datestamp', 'tab'=>1,'data' => 'int', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), - 'banner_enddate' => array ( 'title' => BNRLAN_18, 'type' => 'datestamp', 'tab'=>1, 'data' => 'int', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), + 'banner_startdate' => array ( 'title' => LAN_START, 'type' => 'datestamp', 'tab'=>1,'data' => 'int', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), + 'banner_enddate' => array ( 'title' => LAN_END, 'type' => 'datestamp', 'tab'=>1, 'data' => 'int', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), 'banner_active' => array ( 'title' => LAN_VISIBILITY, 'type' => 'userclass', 'data' => 'int', 'width' => 'auto', 'filter' => true, 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'banner_clicks' => array ( 'title' => BANNERLAN_24, 'type' => 'number', 'noedit'=>true, 'readonly'=>2, 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), 'click_percentage' => array ( 'title' => BANNERLAN_25, 'type' => 'method', 'noedit'=>true, 'data' => false, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), - 'banner_impressions' => array ( 'title' => 'Impressions', 'type' => 'method', 'noedit'=>true, 'data' => 'int', 'width' => '12%', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'banner_impressions' => array ( 'title' => BANNERLAN_26, 'type' => 'method', 'noedit'=>true, 'data' => 'int', 'width' => '12%', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'banner_ip' => array ( 'title' => LAN_IP, 'type' => 'hidden', 'noedit'=>true, 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'options' => array ( 'title' => LAN_OPTIONS, 'type' => null, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ), ); @@ -388,7 +388,7 @@ class banner_form_ui extends e_admin_form_ui if ($sql->select("banner")) { - $this->campaigns['_new_'] = "(New Campaign)"; + $this->campaigns['_new_'] = "(".LAN_ADD.")"; while ($banner_row = $sql->fetch()) @@ -840,14 +840,14 @@ if (!$action) ".$banner_row['banner_id']." - - ".($banner_row['banner_clientname'] ? $banner_row['banner_clientname'] : BNRLAN_8)." + + ".($banner_row['banner_clientname'] ? $banner_row['banner_clientname'] : BANNERLAN_31)." @@ -1043,11 +1043,11 @@ if ($action == "create") ".$frm->text('client_login', $_POST['client_login'], '20')." - ".BNRLAN_13." + ".LAN_PASSWORD." ".$frm->password('client_password', $_POST['client_password'], '50','strength=1&generate=1&required=0')." - ".BNRLAN_14." + ".LAN_IMAGE." ".$frm->imagepicker('banner_image', $_POST['banner_image'], '', 'media=banner&w=600'); @@ -1113,12 +1113,12 @@ if ($action == "create") ".$frm->number('impressions_purchased', $_POST['impressions_purchased'], 10)."".BNRLAN_31." - ".BNRLAN_17." + ".LAN_START." ".$frm->datepicker('banner_startdate', $_POST['banner_startdate'],'type=date')." - ".BNRLAN_18." - ".$frm->datepicker('banner_enddate', $_POST['banner_enddate'],'type=date')." + ".LAN_END." + ".$frm->datepicker('banner_enddate', $_POST['banner_enddate'],'type=date')." ".LAN_VISIBILITY." diff --git a/e107_plugins/banner/banner.php b/e107_plugins/banner/banner.php index a339534fe..974ac3a82 100644 --- a/e107_plugins/banner/banner.php +++ b/e107_plugins/banner/banner.php @@ -2,7 +2,7 @@ /* * e107 website system * - * Copyright (C) 2009-2014 e107 Inc (e107.org) + * Copyright (C) 2009-2016 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * @@ -82,7 +82,7 @@ if (isset($_POST['clientsubmit'])) // check if(!$banner_total) { - $mes->addInfo(BANNERLAN_29); + $mes->addInfo(LAN_NO_RECORDS_FOUND.": ".LAN_PLUGIN_BANNER_NAME); $ns->tablerender(PAGE_NAME, $mes->render()); require_once(FOOTERF); exit; @@ -101,9 +101,9 @@ if (isset($_POST['clientsubmit'])) $BANNER_TABLE_BANNER_ID = $row['banner_id']; $BANNER_TABLE_BANNER_CLICKS = $row['banner_clicks']; $BANNER_TABLE_BANNER_IMPRESSIONS = $row['banner_impressions']; - $BANNER_TABLE_ACTIVE = BANNERLAN_36.($row['banner_active'] != "255" ? LAN_YES : "".LAN_NO.""); - $BANNER_TABLE_STARTDATE = BANNERLAN_37." ".$start_date; - $BANNER_TABLE_ENDDATE = BANNERLAN_34." ".$end_date; + $BANNER_TABLE_ACTIVE = LAN_VISIBILITY." ".($row['banner_active'] != "255" ? LAN_YES : "".LAN_NO.""); + $BANNER_TABLE_STARTDATE = LAN_START." ".$start_date; + $BANNER_TABLE_ENDDATE = LAN_END." ".$end_date; if ($row['banner_ip']) { diff --git a/e107_plugins/banner/banner_menu.php b/e107_plugins/banner/banner_menu.php index 2a8852ca0..a4afa31dc 100644 --- a/e107_plugins/banner/banner_menu.php +++ b/e107_plugins/banner/banner_menu.php @@ -2,7 +2,7 @@ /* * e107 website system * - * Copyright (C) 2008-2013 e107 Inc (e107.org) + * Copyright (C) 2008-2016 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * diff --git a/e107_plugins/banner/banner_setup.php b/e107_plugins/banner/banner_setup.php index 4a80f90d8..57dc83d5a 100644 --- a/e107_plugins/banner/banner_setup.php +++ b/e107_plugins/banner/banner_setup.php @@ -43,7 +43,7 @@ class banner_setup ); $status = ($sql->insert('banner', $insert)) ? E_MESSAGE_SUCCESS : E_MESSAGE_ERROR; - $mes->add("Adding Default table data to table: banner", $status); //TODO Generic LAN "LAN_DEFAULT_TABLE_DATA" + $mes->add(LAN_DEFAULT_TABLE_DATA." banner", $status); } diff --git a/e107_plugins/banner/banner_template.php b/e107_plugins/banner/banner_template.php index a99eec0f0..4546ac1a2 100644 --- a/e107_plugins/banner/banner_template.php +++ b/e107_plugins/banner/banner_template.php @@ -1,5 +1,14 @@ \n - + - + diff --git a/e107_plugins/banner/e_menu.php b/e107_plugins/banner/e_menu.php index 645d658f9..2a91edd19 100644 --- a/e107_plugins/banner/e_menu.php +++ b/e107_plugins/banner/e_menu.php @@ -2,7 +2,7 @@ /* * e107 website system * - * Copyright (C) 2008-2015 e107 Inc (e107.org) + * Copyright (C) 2008-2016 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * @@ -31,10 +31,10 @@ class banner_menu $renderTypes = array(BNRLAN_48,'1 - '.BNRLAN_45,'2 - '.BNRLAN_46, "3 - ".BNRLAN_47); $fields = array(); - $fields['banner_caption'] = array('title'=> BNRLAN_37, 'type'=>'text', 'multilan'=>true, 'writeParms'=>array('size'=>'xxlarge')); + $fields['banner_caption'] = array('title'=> LAN_CAPTION, 'type'=>'text', 'multilan'=>true, 'writeParms'=>array('size'=>'xxlarge')); $fields['banner_campaign'] = array('title'=> BNRLAN_39, 'type'=>'method'); $fields['banner_amount'] = array('title'=> BNRLAN_41, 'type'=>'text', 'writeParms'=>array('pattern'=>'[0-9]*')); - $fields['banner_width'] = array('title'=> "Width", 'type'=>'text', 'help'=>"In pixels", 'writeParms'=>array('pattern'=>'[0-9]*')); + $fields['banner_width'] = array('title'=> LAN_WIDTH, 'type'=>'text', 'help'=>"In pixels", 'writeParms'=>array('pattern'=>'[0-9]*')); $fields['banner_rendertype'] = array('title'=> BNRLAN_43, 'type'=>'dropdown', 'writeParms'=>array('optArray'=>$renderTypes)); return $fields; diff --git a/e107_plugins/banner/e_shortcode.php b/e107_plugins/banner/e_shortcode.php index 425f0bdb4..9200adf5b 100644 --- a/e107_plugins/banner/e_shortcode.php +++ b/e107_plugins/banner/e_shortcode.php @@ -2,7 +2,7 @@ /* * e107 website system * - * Copyright (C) 2008-2013 e107 Inc (e107.org) + * Copyright (C) 2008-2016 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * diff --git a/e107_plugins/banner/languages/English_admin.php b/e107_plugins/banner/languages/English_admin.php index 3a3980a7b..58cd3dc3a 100644 --- a/e107_plugins/banner/languages/English_admin.php +++ b/e107_plugins/banner/languages/English_admin.php @@ -1,10 +1,13 @@ \ No newline at end of file +//define("BNRLAN_49", "Tooltip");//LAN_TOOLTIP Linkwords also +?> diff --git a/e107_plugins/banner/languages/English_front.php b/e107_plugins/banner/languages/English_front.php index 22da1a760..43178a10c 100644 --- a/e107_plugins/banner/languages/English_front.php +++ b/e107_plugins/banner/languages/English_front.php @@ -2,15 +2,15 @@ /* * e107 website system * - * Copyright (C) 2008-2014 e107 Inc (e107.org) + * Copyright (C) 2008-2016 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * */ -define("BANNERLAN_16", "Username: "); -define("BANNERLAN_17", "Password: "); +//define("BANNERLAN_16", "Username: ");//LAN_USER +//define("BANNERLAN_17", "Password: ");//LAN_PASSWORD //define("BANNERLAN_18", "Continue"); // English LAN_CONTINUE define("BANNERLAN_19", "Please enter your client login and password to continue"); define("BANNERLAN_20", "Sorry, unable to find those details in the database. Please contact the site administrator for details."); @@ -22,14 +22,17 @@ define("BANNERLAN_25", "Click %"); define("BANNERLAN_26", "Impressions"); define("BANNERLAN_27", "Impressions Purchased"); define("BANNERLAN_28", "Impressions Left"); -define("BANNERLAN_29", "No banners"); +//define("BANNERLAN_29", "No banners"); define("BANNERLAN_30", "Unlimited"); define("BANNERLAN_31", "Not applicable"); //define("BANNERLAN_32", "Yes"); // English LAN_YES //define("BANNERLAN_33", "No"); // English LAN_NO -define("BANNERLAN_34", "Ends:"); +//define("BANNERLAN_34", "Ends:");//LAN_END define("BANNERLAN_35", "Clickthrough IP addresses"); -define("BANNERLAN_36", "Active:"); -define("BANNERLAN_37", "Starts:"); +//define("BANNERLAN_36", "Active:");//LAN_VISIBILITY +//define("BANNERLAN_37", "Starts:");//LAN_START //define("BANNERLAN_38", "Error"); // English LAN_ERROR define("BANNERLAN_39", "No image assigned to this banner."); + +?> + diff --git a/e107_plugins/banner/languages/English_global.php b/e107_plugins/banner/languages/English_global.php index 97b75efbc..7403a5cfd 100644 --- a/e107_plugins/banner/languages/English_global.php +++ b/e107_plugins/banner/languages/English_global.php @@ -1,5 +1,13 @@
".BANNERLAN_16."".BANNERLAN_16." {BANNER_LOGIN_TABLE_LOGIN}\n
".BANNERLAN_17."".LAN_PASSWORD." {BANNER_LOGIN_TABLE_PASSW}\n