diff --git a/e107_admin/sql/core_sql.php b/e107_admin/sql/core_sql.php index 4a5a8e834..82855d916 100644 --- a/e107_admin/sql/core_sql.php +++ b/e107_admin/sql/core_sql.php @@ -403,21 +403,6 @@ CREATE TABLE plugin ( ) ENGINE=MyISAM; # -------------------------------------------------------- - -# -# Table structure for table `preset` -# - -CREATE TABLE preset ( - preset_id int(10) unsigned NOT NULL auto_increment, - preset_name varchar(80) NOT NULL default '', - preset_field varchar(80) NOT NULL default '', - preset_value varchar(255) NOT NULL default '', - PRIMARY KEY (preset_id) -) ENGINE=MyISAM; - -# -------------------------------------------------------- - # # Table structure for table `rate` # diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php index 8516d2704..8e5033fbb 100644 --- a/e107_admin/update_routines.php +++ b/e107_admin/update_routines.php @@ -132,6 +132,9 @@ if (!$dont_check_update) */ function update_check() { + + + global $ns, $dont_check_update, $e107info; @@ -193,7 +196,7 @@ function update_check() } } - + require_once(e_HANDLER.'e_upgrade_class.php'); // $upg = new e_upgrade; @@ -273,7 +276,7 @@ function update_706_to_800($type='') $sql = e107::getDb(); $sql2 = e107::getDb('sql2'); $tp = e107::getParser(); - + e107::getCache()->clearAll('db'); // List of unwanted $pref values which can go @@ -283,7 +286,7 @@ function update_706_to_800($type='') ); // List of DB tables not required (includes a few from 0.6xx) - $obs_tables = array('flood', 'headlines', 'stat_info', 'stat_counter', 'stat_last', 'session'); + $obs_tables = array('flood', 'headlines', 'stat_info', 'stat_counter', 'stat_last', 'session', 'preset'); // List of DB tables newly required (defined in core_sql.php) (The existing dblog table gets renamed) @@ -575,7 +578,7 @@ function update_706_to_800($type='') } - + //--------------------------------------------------------- // Comments - split user field @@ -656,6 +659,7 @@ function update_706_to_800($type='') $do_save = TRUE; } + /* * Deprecated by db-verify-class * @@ -896,7 +900,6 @@ function update_706_to_800($type='') */ - // Obsolete tables (list at top) foreach ($obs_tables as $ot) { @@ -1088,7 +1091,7 @@ function update_706_to_800($type='') } // ------------------------------- - + $med = e107::getMedia(); diff --git a/e107_files/jslib/core/all.jquery.js b/e107_files/jslib/core/all.jquery.js index 1daff9933..11bd35105 100644 --- a/e107_files/jslib/core/all.jquery.js +++ b/e107_files/jslib/core/all.jquery.js @@ -397,7 +397,7 @@ $(document).ready(function() }); // Text-area AutoGrow - $("textarea.e-autoheight").elastic(); + // $("textarea.e-autoheight").elastic(); diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php index 4e7c8cfd0..92bb7137c 100644 --- a/e107_handlers/user_handler.php +++ b/e107_handlers/user_handler.php @@ -865,13 +865,14 @@ class e_userperms "C" => array(ADMSLAN_64,E_16_CACHE, E_32_CACHE), // Clear the system cache "F" => array(ADMSLAN_31,E_16_EMOTE, E_32_EMOTE), // Emoticons "G" => array(ADMSLAN_32,E_16_FRONT, E_32_FRONT), // Front-Page Configuration + "L" => array(ADMSLAN_76,E_16_LANGUAGE, E_32_LANGUAGE), // Meta tags "T" => array(ADMSLAN_34,E_16_META, E_32_META), // Meta tags "1" => array(ADMSLAN_19,E_16_PREFS, E_32_PREFS), // Alter Site Preferences "X" => array(ADMSLAN_66,E_16_SEARCH, E_32_SEARCH), // Search "I" => array(ADMSLAN_40,E_16_LINKS, E_32_LINKS), // Post SiteLinks "8" => array(ADMSLAN_27,E_16_LINKS, E_32_LINKS), // Oversee SiteLink Categories - "L" => array(ADMSLAN_43,E_16_EURL, E_32_EURL), // Configure URLs + "K" => array(ADMSLAN_43,E_16_EURL, E_32_EURL), // Configure URLs // Users "3" => array(ADMSLAN_21,E_16_ADMIN, E_32_ADMIN), // Modify Admin perms @@ -901,9 +902,9 @@ class e_userperms // Manage "B" => array(ADMSLAN_37,E_16_COMMENT, E_32_COMMENT), // Moderate Comments "6" => array(ADMSLAN_25,E_16_FILE, E_32_FILE), // File-Manager - Upload /manage files - - "A" => array(ADMSLAN_36,E_16_IMAGES, E_32_IMAGES), // Media-Manager and Image Settings - "A1"=> array(ADMSLAN_36,E_16_IMAGES, E_32_IMAGES), // Media-Manager (Media Add) - "A2"=> array(ADMSLAN_36,E_16_IMAGES, E_32_IMAGES), // Media-Manager (Media-Import) + "A" => array(ADMSLAN_36,E_16_IMAGES, E_32_IMAGES), // Media-Manager All Areas. + "A1"=> array(ADMSLAN_36,E_16_IMAGES, E_32_IMAGES), // Media-Manager (Media Add/Import) + "A2"=> array(ADMSLAN_36,E_16_IMAGES, E_32_IMAGES), // Media-Manager (Media-Categories) "2" => array(ADMSLAN_20,E_16_MENUS, E_32_MENUS), // Alter Menus diff --git a/e107_languages/English/admin/lan_administrator.php b/e107_languages/English/admin/lan_administrator.php index ea0323cf0..cd435ddf0 100644 --- a/e107_languages/English/admin/lan_administrator.php +++ b/e107_languages/English/admin/lan_administrator.php @@ -89,7 +89,7 @@ define('ADMSLAN_73', 'Admin ID: --ID-- name: --NAME--'); define('ADMSLAN_74', 'General'); // define('ADMSLAN_75', ''); -// define("ADMSLAN_76", "Language Configuration"); +define("ADMSLAN_76", "Manage language-packs"); define("ADMSLAN_2", "Site Administrator %s updated in database."); ?> \ No newline at end of file diff --git a/e107_plugins/import/providers/rss_import_class.php b/e107_plugins/import/providers/rss_import_class.php index 77fbdb85d..9365f8dd7 100644 --- a/e107_plugins/import/providers/rss_import_class.php +++ b/e107_plugins/import/providers/rss_import_class.php @@ -22,7 +22,7 @@ // Array element key defines the function prefix and the class name; value is displayed in drop-down selection box $import_class_names['rss_import'] = 'RSS'; -$import_class_comment['rss_import'] = 'Import RSS v2.0 feeds'; +$import_class_comment['rss_import'] = 'Import content via RSS v2.0 feeds from virtually any website.'; $import_class_support['rss_import'] = array('news','page','links'); $import_default_prefix['rss_import'] = ''; diff --git a/e107_plugins/import/providers/wordpress_import_class.php b/e107_plugins/import/providers/wordpress_import_class.php index cd1e3f91e..5681f76ce 100644 --- a/e107_plugins/import/providers/wordpress_import_class.php +++ b/e107_plugins/import/providers/wordpress_import_class.php @@ -22,7 +22,7 @@ // Array element key defines the function prefix and the class name; value is displayed in drop-down selection box $import_class_names['wordpress_import'] = 'Wordpress'; -$import_class_comment['wordpress_import'] = 'Tested with version 2.8.x (salted passwords)'; +$import_class_comment['wordpress_import'] = 'Tested with version 3.4.x (salted passwords)'; $import_class_support['wordpress_import'] = array('users','news','page','links'); $import_default_prefix['wordpress_import'] = 'wp_'; @@ -305,6 +305,13 @@ class wordpress_import extends base_import_class link_function link_sefurl */ + /* e107. + 0 => LCLAN_20, // 0 = same window + 1 => LCLAN_23, // new window + 4 => LCLAN_24, // 4 = miniwindow 600x400 + 5 => LINKLAN_1 // 5 = miniwindow 800x600 + */ + $target['link_name'] = $source['link_name']; $target['link_url'] = $source['link_url'];