mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 14:46:56 +02:00
Code Issues Releases Wiki Activity

Removal of e107_preset table (deprecated by batch 'copy' function) and other small fixes.

Browse Source
This commit is contained in:
CaMer0n
2012-07-23 09:35:32 +00:00
parent b85f748c98
commit 93a6aa1325
7 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
e107_admin/sql/core_sql.php
View File

@@ -403,21 +403,6 @@ CREATE TABLE plugin (
) ENGINE=MyISAM; ) 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` # Table structure for table `rate`
# #

7
e107_admin/update_routines.php
View File

@@ -132,6 +132,9 @@ if (!$dont_check_update)
*/ */
function update_check() function update_check()
{ {
global $ns, $dont_check_update, $e107info; global $ns, $dont_check_update, $e107info;
@@ -283,7 +286,7 @@ function update_706_to_800($type='')
); );
// List of DB tables not required (includes a few from 0.6xx) // 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) // List of DB tables newly required (defined in core_sql.php) (The existing dblog table gets renamed)
@@ -656,6 +659,7 @@ function update_706_to_800($type='')
$do_save = TRUE; $do_save = TRUE;
} }
/* /*
* Deprecated by db-verify-class * Deprecated by db-verify-class
* *
@@ -896,7 +900,6 @@ function update_706_to_800($type='')
*/ */
// Obsolete tables (list at top) // Obsolete tables (list at top)
foreach ($obs_tables as $ot) foreach ($obs_tables as $ot)
{ {

2
e107_files/jslib/core/all.jquery.js
View File

@@ -397,7 +397,7 @@ $(document).ready(function()
}); });
// Text-area AutoGrow // Text-area AutoGrow
$("textarea.e-autoheight").elastic(); // $("textarea.e-autoheight").elastic();

9
e107_handlers/user_handler.php
View File

@@ -865,13 +865,14 @@ class e_userperms
"C" => array(ADMSLAN_64,E_16_CACHE, E_32_CACHE), // Clear the system cache "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 "F" => array(ADMSLAN_31,E_16_EMOTE, E_32_EMOTE), // Emoticons
"G" => array(ADMSLAN_32,E_16_FRONT, E_32_FRONT), // Front-Page Configuration "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 "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 "1" => array(ADMSLAN_19,E_16_PREFS, E_32_PREFS), // Alter Site Preferences
"X" => array(ADMSLAN_66,E_16_SEARCH, E_32_SEARCH), // Search "X" => array(ADMSLAN_66,E_16_SEARCH, E_32_SEARCH), // Search
"I" => array(ADMSLAN_40,E_16_LINKS, E_32_LINKS), // Post SiteLinks "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 "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 // Users
"3" => array(ADMSLAN_21,E_16_ADMIN, E_32_ADMIN), // Modify Admin perms "3" => array(ADMSLAN_21,E_16_ADMIN, E_32_ADMIN), // Modify Admin perms
@@ -901,9 +902,9 @@ class e_userperms
// Manage // Manage
"B" => array(ADMSLAN_37,E_16_COMMENT, E_32_COMMENT), // Moderate Comments "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 - "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 "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) "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-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 "2" => array(ADMSLAN_20,E_16_MENUS, E_32_MENUS), // Alter Menus

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

@@ -89,7 +89,7 @@ define('ADMSLAN_73', 'Admin ID: --ID-- name: --NAME--');
define('ADMSLAN_74', 'General'); define('ADMSLAN_74', 'General');
// define('ADMSLAN_75', ''); // define('ADMSLAN_75', '');
// define("ADMSLAN_76", "Language Configuration"); define("ADMSLAN_76", "Manage language-packs");
define("ADMSLAN_2", "Site Administrator <strong>%s</strong> updated in database."); define("ADMSLAN_2", "Site Administrator <strong>%s</strong> updated in database.");
?> ?>

2
e107_plugins/import/providers/rss_import_class.php
View File

@@ -22,7 +22,7 @@
// Array element key defines the function prefix and the class name; value is displayed in drop-down selection box // 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_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_class_support['rss_import'] = array('news','page','links');
$import_default_prefix['rss_import'] = ''; $import_default_prefix['rss_import'] = '';

9
e107_plugins/import/providers/wordpress_import_class.php
View File

@@ -22,7 +22,7 @@
// Array element key defines the function prefix and the class name; value is displayed in drop-down selection box // 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_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_class_support['wordpress_import'] = array('users','news','page','links');
$import_default_prefix['wordpress_import'] = 'wp_'; $import_default_prefix['wordpress_import'] = 'wp_';
@@ -305,6 +305,13 @@ class wordpress_import extends base_import_class
link_function link_function
link_sefurl 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_name'] = $source['link_name'];
$target['link_url'] = $source['link_url']; $target['link_url'] = $source['link_url'];