Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Upgrade and Install changes for enableThemes setting

Signed-off-by: Suki <[email protected]>
Suki 10 years ago
parent
5b504dca35
commit
7d349f04b5
13 changed files with 50 additions and 0 deletions
Split View Show Diff Stats
  1. 2 0
      Sources/Themes.php
  2. 1 0
      other/install_2-1_mysql.sql
  3. 1 0
      other/install_2-1_postgresql.sql
  4. 1 0
      other/install_2-1_sqlite.sql
  5. 1 0
      other/install_2-1_sqlite3.sql
  6. 1 0
      other/upgrade_1-0.sql
  7. 1 0
      other/upgrade_1-1.sql
  8. 1 0
      other/upgrade_2-0_mysql.sql
  9. 11 0
      other/upgrade_2-0_postgresql.sql
  10. 9 0
      other/upgrade_2-0_sqlite.sql
  11. 7 0
      other/upgrade_2-1_mysql.sql
  12. 7 0
      other/upgrade_2-1_postgresql.sql
  13. 7 0
      other/upgrade_2-1_sqlite.sql

+ 2 - 0
Sources/Themes.php
View File 

@@ -133,6 +133,7 @@ function ThemeAdmin()
 
 	$i = 1;
 
 	while (file_exists($theme_dir . $i))
 
 		$i++;
 
+
 
 	$context['new_theme_name'] = 'theme' . $i;
 
 
 	// A bunch of tokens for a bunch of forms.
 
@@ -150,6 +151,7 @@ function ThemeAdmin()
 
 		if (isset($_POST['options']['known_themes']))
 
 			foreach ($_POST['options']['known_themes'] as $key => $id)
 
 				$_POST['options']['known_themes'][$key] = (int) $id;
 
+
 
 		else
 
 			fatal_lang_error('themes_none_selectable', false);

+ 1 - 0
other/install_2-1_mysql.sql
View File 

@@ -1844,6 +1844,7 @@ VALUES ('smfVersion', '{$smf_version}'),
 
 	('enableAllMessages', '0'),
 
 	('fixLongWords', '0'),
 
 	('knownThemes', '1,2,3'),
 
+	('enableThemes', '1'),
 
 	('who_enabled', '1'),
 
 	('time_offset', '0'),
 
 	('cookieTime', '60'),

+ 1 - 0
other/install_2-1_postgresql.sql
View File 

@@ -2353,6 +2353,7 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('maxMsgID', '1');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('enableAllMessages', '0');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('fixLongWords', '0');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('knownThemes', '1,2,3');
 
+INSERT INTO {$db_prefix}settings (variable, value) VALUES ('enableThemes', '1');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('who_enabled', '1');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('time_offset', '0');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('cookieTime', '60');

+ 1 - 0
other/install_2-1_sqlite.sql
View File 

@@ -1991,6 +1991,7 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('maxMsgID', '1');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('enableAllMessages', '0');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('fixLongWords', '0');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('knownThemes', '1,2,3');
 
+INSERT INTO {$db_prefix}settings (variable, value) VALUES ('enableThemes', '1');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('who_enabled', '1');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('time_offset', '0');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('cookieTime', '60');

+ 1 - 0
other/install_2-1_sqlite3.sql
View File 

@@ -1991,6 +1991,7 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('maxMsgID', '1');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('enableAllMessages', '0');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('fixLongWords', '0');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('knownThemes', '1,2,3');
 
+INSERT INTO {$db_prefix}settings (variable, value) VALUES ('enableThemes', '1');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('who_enabled', '1');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('time_offset', '0');
 
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('cookieTime', '60');

+ 1 - 0
other/upgrade_1-0.sql
View File 

@@ -1825,6 +1825,7 @@ VALUES
 
 	('attachmentEncryptFilenames', '1'),
 
 	('censorIgnoreCase', '1'),
 
 	('mostOnline', '1');
 
+	('enableThemes', '1');
 
 INSERT IGNORE INTO {$db_prefix}settings
 
 	(variable, value)
 
 VALUES

+ 1 - 0
other/upgrade_1-1.sql
View File 

@@ -255,6 +255,7 @@ VALUES ('edit_disable_time', '0'),
 
 	('attachmentThumbWidth', '150'),
 
 	('attachmentThumbHeight', '150'),
 
 	('max_pm_recipients', '10');
 
+	('enableThemes', '1');
 
 
 ---{
 
 if (@$modSettings['smfVersion'] < '1.1')

+ 1 - 0
other/upgrade_2-0_mysql.sql
View File 

@@ -532,6 +532,7 @@ VALUES
 
 	('last_mod_report_action', '0'),
 
 	('search_floodcontrol_time', '5'),
 
 	('next_task_time', UNIX_TIMESTAMP());
 
+	('enableThemes', '1'),
 
 ---#
 
 
 ---# Changing stats settings.

+ 11 - 0
other/upgrade_2-0_postgresql.sql
View File 

@@ -1038,6 +1038,17 @@ if ((!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] <= '2.0 RC
 
 				VALUES " . implode(', ', $a_new_setting));
 
 		}
 
 
+		$enableThemes = array();
 
+		$enableThemes = "('enableThemes', '" . implode(',', $allThemes) . "')";
 
+
 
+		foreach ($enableThemes AS $an_enable_theme)
 
+		{
 
+			upgrade_query("
 
+				INSERT INTO {$db_prefix}settings
 
+				(variable, value)
 
+				VALUES " . implode(', ', $an_enable_theme));
 
+		}
 
+
 
 		// What about members?
 
 		upgrade_query("
 
 			UPDATE {$db_prefix}members

+ 9 - 0
other/upgrade_2-0_sqlite.sql
View File 

@@ -819,6 +819,15 @@ if ((!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] <= '2.0 RC
 
 			VALUES
 
 				" . implode(', ', $newSettings));
 
 
+		$enableThemes = array();
 
+		$enableThemes[] = "('enableThemes', '" . implode(',', $allThemes) . "')";
 
+
 
+		upgrade_query("
 
+			REPLACE INTO {$db_prefix}settings
 
+				(variable, value)
 
+			VALUES
 
+				" . implode(', ', $enableThemes));
 
+
 
 		// What about members?
 
 		upgrade_query("
 
 			UPDATE {$db_prefix}members

+ 7 - 0
other/upgrade_2-1_mysql.sql
View File 

@@ -259,6 +259,13 @@ SET value = 'SMF Default Theme - Curve2'
 
 WHERE value LIKE 'SMF Default Theme%';
 
 ---#
 
 
+---# Adding the enableThemes setting.
 
+INSERT INTO {$db_prefix}settings
 
+	(variable, value)
 
+VALUES
 
+	('enableThemes', '1');
 
+---#
 
+
 
 /******************************************************************************/
 
 --- Cleaning up after old themes...
 
 /******************************************************************************/

+ 7 - 0
other/upgrade_2-1_postgresql.sql
View File 

@@ -317,6 +317,13 @@ SET value = 'SMF Default Theme - Curve2'
 
 WHERE value LIKE 'SMF Default Theme%';
 
 ---#
 
 
+---# Adding the enableThemes setting.
 
+INSERT INTO {$db_prefix}settings
 
+	(variable, value)
 
+VALUES
 
+	('enableThemes', '1');
 
+---#
 
+
 
 /******************************************************************************/
 
 --- Cleaning up after old themes...
 
 /******************************************************************************/

+ 7 - 0
other/upgrade_2-1_sqlite.sql
View File 

@@ -309,6 +309,13 @@ SET value = 'SMF Default Theme - Curve2'
 
 WHERE value LIKE 'SMF Default Theme%';
 
 ---#
 
 
+---# Adding the enableThemes setting.
 
+INSERT INTO {$db_prefix}settings
 
+	(variable, value)
 
+VALUES
 
+	('enableThemes', '1');
 
+---#
 
+
 
 /******************************************************************************/
 
 --- Cleaning up after old themes...
 
 /******************************************************************************/