Icy Phoenix 2.2.0.105

adm/admin_db_maintenance.php

@@ -76,7 +76,10 @@
 
 if (($mode_id == 'perform') && !isset($_POST['confirm']))
 {
-	$mode_id = '';
+	if ($function != 'perform_rebuild')
+	{
+		$mode_id = '';
+	}
 }
 
 // Check for parameters
@@ -3154,7 +3157,7 @@
 				set_config('dbmtnc_rebuild_pos', $last_post, false);
 				// OK, all actions are done - send headers
 
-				$redirect_url = append_sid(ADM . '/admin_db_maintenance.' . PHP_EXT . '?mode=perform&function=perform_rebuild&db_state=' . $db_state);
+				$redirect_url = append_sid('admin_db_maintenance.' . PHP_EXT . '?mode=perform&function=perform_rebuild&db_state=' . $db_state);
 				meta_refresh(3, $redirect_url);
 
 				include(IP_ROOT_PATH . ADM . '/page_header_admin.' . PHP_EXT);

adm/admin_forums_extend.php

@@ -895,7 +895,7 @@
 				$sql = "SELECT * FROM " . PRUNE_TABLE . " WHERE forum_id = " . intval($item['id']);
 				$result = $db->sql_query($sql);
 
-			if($db->sql_numrows($result) > 0)
+				if($db->sql_numrows($result) > 0)
 				{
 					$sql = "UPDATE " . PRUNE_TABLE . "
 								SET prune_days = " . intval($item['prune_days']) . ",
@@ -916,7 +916,7 @@
 									" . intval($item['prune_freq']) . "
 								)";
 				}
-				$db->sql_query($sql);
+			$db->sql_query($sql);
 			}
 		}
 

docs/readme_english.html

@@ -49,7 +49,8 @@
 					<li><a href="#license">License</a></li>
 					<li><a href="#requirements">Requirements</a></li>
 					<li><a href="#fresh_installation">Fresh Installation</a></li>
-					<li><a href="#upgrade_ip">Upgrade from IP 1.3.0.53 or above</a></li>
+					<li><a href="#upgrade_ip">Upgrade from IP 2.0.0.86 or above</a></li>
+					<li><a href="#upgrade_ip_053">Upgrade from IP 1.3.0.53</a></li>
 					<li><a href="#upgrade_ip_027">Upgrade from IP 1.2.0.27</a></li>
 					<li><a href="#upgrade_ip_015">Upgrade from IP 1.1.0.15</a></li>
 					<li><a href="#upgrade_xs">Upgrade from phpBB XS</a></li>
@@ -217,13 +218,64 @@
 		</table>
 
 		<table class="forumline">
-		<tr><td class="row-header" colspan="3"><span><a name="upgrade_ip">Upgrade from Icy Phoenix 1.3.0.53 or above</a></span></td>
+		<tr><td class="row-header" colspan="3"><span><a name="upgrade_ip">Upgrade from Icy Phoenix 2.0.0.86 or above</a></span></td>
 		</tr>
 		<tr>
 			<td class="row-post" colspan="3">
 				<div class="post-text">
 					<br />
-					If you're using Icy Phoenix 1.3.0.53 or above, you can upgrade your board by following these instructions:<br />
+					If you're using Icy Phoenix 2.0.0.86 or above, you can upgrade your board by following these instructions:<br />
+					<ol type="1">
+						<li>Login as administrator.</li>
+						<li>Lock your site.</li>
+						<li><span class="text_red">Make a full backup of all files and database</span> (if you don't do a backup, don't dare to ask for support! <img src="../images/smiles/icon_mrgreen.gif" alt="Backup Rules!" title="Backup Rules!" />)</li>
+						<li>Did you backup everything? If you didn't make the backup, please, step back to the previous point.</li>
+						<li>Copy your current <b>.htaccess</b> (if you edited it) and <b>config.php</b> and keep them in a safe place.</li>
+						<li>You may also want to backup the customized pages you have created using the CMS (if you have created some).</li>
+						<li>Check again that your backup is ok and keep it in a safe place. <img src="../images/smiles/icon_mrgreen.gif" alt="Backup Rules!" title="Backup Rules!" /></li>
+						<li>Remove the following folders (make sure you don't have in those folders some files you may need for some mods you have installed, but in any case you should have a backup <img src="../images/smiles/icon_mrgreen.gif" alt="Backup Rules!" title="Backup Rules!" />):
+							<ul>
+								<li><b>adm</b></li>
+								<li><b>includes</b></li>
+								<li><b>language</b></li>
+								<li><b>templates</b></li>
+							</ul>
+						</li>
+						<li>Remove <b>all old Icy Phoenix files</b> making sure you are not deleting other stuff you may need! (In any case you should have a backup, right? <img src="../images/smiles/icon_mrgreen.gif" alt="Backup Rules!" title="Backup Rules!" />).</li>
+						<li>When deleting files, please pay particular attention to custom files and folders like these:<br />
+							<ul>
+								<li><b>config.php</b></li>
+								<li><b>backup/</b></li>
+								<li><b>downloads/</b></li>
+								<li><b>images/</b></li>
+								<li><b>files/</b></li>
+								<li><b>logs/</b></li>
+							</ul>
+						</li>
+						<li>Unpack Icy Phoenix package to one folder on your HD.</li>
+						<li>Upload all Icy Phoenix files (all but <b>config.php</b>) in the same folder where Icy Phoenix was installed and running. Pay attention that all older files still there (if any) must be replaced by the new ones.</li>
+						<li>Apply all permissions listed in <a class="post-url" href="#fresh_installation">Fresh Installation</a>.</li>
+						<li>Run <b>install/database_update.php</b> to update your DB (i.e. <i><u>http://www.mysite.com/ip/install/database_update.php</u></i>).</li>
+						<li>Delete or rename <b>install</b> folder.</li>
+						<li>Customize your Icy Phoenix setup as listed here ==&gt; <a class="post-url" href="#ip_customize">Customizations</a>.</li>
+						<li>Unlock your site.</li>
+						<li>Enjoy your New <b>Icy Phoenix</b> Site <img src="../images/smiles/icon_mrgreen.gif" alt="Enjoy!" title="Enjoy!" />.</li>
+					</ol>
+					<br />
+				</div>
+			</td>
+		</tr>
+		<tr><td class="cat" colspan="3"><span style="float: right;">&nbsp;&nbsp;<a href="#top" class="gensmall">Top</a>&nbsp;&nbsp;</span></td></tr>
+		</table>
+
+		<table class="forumline">
+		<tr><td class="row-header" colspan="3"><span><a name="upgrade_ip_053">Upgrade from Icy Phoenix 1.3.0.53</a></span></td>
+		</tr>
+		<tr>
+			<td class="row-post" colspan="3">
+				<div class="post-text">
+					<br />
+					If you're using Icy Phoenix 1.3.0.53, you can upgrade your board by following these instructions:<br />
 					<ol type="1">
 						<li>Login as administrator.</li>
 						<li>Lock your site.</li>
@@ -399,20 +451,24 @@
 			<td class="row-post" colspan="3">
 				<br />
 				<div class="post-text">
-					<i>Version 1.1.0.15 (2007/05/20)</i>
-					<ul><li>First stable release.</li></ul>
+					<i>Version 2.2.0.105 (2016/06/04)</i>
+					<ul><li>Fifth stable release.</li></ul>
 					<br />
 					<br />
-					<i>Version 1.2.0.27 (2008/03/03)</i>
-					<ul><li>Second stable release.</li></ul>
+					<i>Version 2.0.0.86 (2012/07/28)</i>
+					<ul><li>Fourth stable release.</li></ul>
 					<br />
 					<br />
 					<i>Version 1.3.0.53 (2009/07/17)</i>
 					<ul><li>Third stable release.</li></ul>
 					<br />
 					<br />
-					<i>Version 2.0.0.86 (2012/07/28)</i>
-					<ul><li>Icy Phoenix 2.0 First stable release.</li></ul>
+					<i>Version 1.2.0.27 (2008/03/03)</i>
+					<ul><li>Second stable release.</li></ul>
+					<br />
+					<br />
+					<i>Version 1.1.0.15 (2007/05/20)</i>
+					<ul><li>First stable release.</li></ul>
 				</div>
 				<br clear="all" /><br />
 			</td>

includes/constants.php

@@ -20,7 +20,7 @@
 	die('Hacking attempt');
 }
 
-define('ICYPHOENIX_VERSION', '2.0.18.104');
+define('ICYPHOENIX_VERSION', '2.2.0.105');
 
 // FOUNDER ID, this is the ID of the main admin of the site, only this user can access special features of the site and this ID is also used to send Welcome and Birthday PM
 define('FOUNDER_ID', '2');

includes/functions_mg_http.php

@@ -144,7 +144,6 @@ function get_user_browser($http_user_agent_str)
 
 	// Order is important... do not move browsers unless you know what you are doing!!!
 	$browsers = array(
-		'vivaldi' => array('regex' => array('/Vivaldi\/([0-9]{1,2}.[0-9]{1,4})/'), 'check_version' => false, 'name' => 'Vivaldi', 'icon' => 'vivaldi.png'),
 		'edge' => array('regex' => array('/Edge\/([0-9]{1,2}.[0-9]{1,4})/'), 'check_version' => false, 'name' => 'MS Edge', 'icon' => 'edge.png'),
 		'msie' => array('regex' => array('/MSIE ([0-9]{1,2}.[0-9]{1,4})/'), 'check_version' => false, 'name' => 'MS Internet Explorer', 'icon' => 'msie.png'),
 		'opera' => array('regex' => array('/Opera\/([0-9]{1,2}.[0-9]{1,4})/', '/Opera ([0-9]{1,2}.[0-9]{1,4})/'), 'check_version' => true, 'name' => 'Opera', 'icon' => 'opera.png'),
@@ -164,6 +163,7 @@ function get_user_browser($http_user_agent_str)
 		'safari' => array('regex' => array('/Safari\/([0-9]{1,5}.[0-9]{1,5})/'), 'check_version' => true, 'name' => 'Safari', 'icon' => 'safari.png'),
 		'konqueror' => array('regex' => array('/Konqueror\/([0-9]{1,2}.[0-9]{1,4})/'), 'check_version' => false, 'name' => 'Konqueror', 'icon' => 'konqueror.png'),
 		'facebook' => array('regex' => array('/facebookexternalhit\/([0-9]{1,2}.[0-9]{1,4})/'), 'check_version' => true, 'name' => 'Facebook', 'icon' => 'facebook.png'),
+		'vivaldi' => array('regex' => array('/Vivaldi\/([0-9]{1,2}.[0-9]{1,4})/'), 'check_version' => false, 'name' => 'Vivaldi', 'icon' => 'vivaldi.png'),
 		// Mozilla must be the last one!!!
 		'mozilla' => array('regex' => array('/Mozilla\/([0-9]{1,2}.[0-9]{1,4})/'), 'check_version' => false, 'name' => 'Mozilla', 'icon' => 'mozilla.png'),
 	);
@@ -216,4 +216,4 @@ function get_user_browser_version($http_user_agent_str)
 	return $version;
 }
 
-?>
+?>

install/schemas/db_update_086.sql

@@ -234,13 +234,25 @@ INSERT INTO `phpbb_cms_layout_special` (`page_id`, `name`, `filename`, `global_b
 
 
 
+########################################
+##              BUILD 104             ##
+########################################
+
+
+
+########################################
+##              BUILD 105             ##
+########################################
+
+
+
 
 #####################
 
 ##UPDATE phpbb_config SET config_value = '2' WHERE config_name = 'main_admin_id';
 
 #-- DB CHANGES FOR VERSIONING
-UPDATE phpbb_config SET config_value = '2.0.17.103' WHERE config_name = 'ip_version';
+UPDATE phpbb_config SET config_value = '2.2.0.105' WHERE config_name = 'ip_version';
 UPDATE phpbb_config SET config_value = '.0.23' WHERE config_name = 'version';
 UPDATE phpbb_config SET config_value = '2.0.0' WHERE config_name = 'cms_version';
 UPDATE phpbb_album_config SET config_value = '1.5.0' WHERE config_name = 'fap_version';

install/schemas/mysql_basic.sql

@@ -1,7 +1,7 @@
 ## Better leaving these input at the beginning... so they will be inserted as first values into tables
 ## Roll on version
 INSERT INTO `phpbb_config` (`config_name`, `config_value`) VALUES ('version', '.0.23');
-INSERT INTO `phpbb_config` (`config_name`, `config_value`) VALUES ('ip_version', '2.0.18.104');
+INSERT INTO `phpbb_config` (`config_name`, `config_value`) VALUES ('ip_version', '2.2.0.105');
 INSERT INTO `phpbb_config` (`config_name`, `config_value`) VALUES ('cms_version', '2.0.0');
 ## INSERT INTO phpbb_link_config (config_name, config_value) VALUES ('site_logo', 'http://www.mightygorgon.com/images/banners/banner_mightygorgon.gif');
 ## INSERT INTO phpbb_link_config (config_name, config_value) VALUES ('site_url', 'http://www.mightygorgon.com/');
@@ -1459,6 +1459,12 @@ INSERT INTO `phpbb_smilies` (`smilies_id`, `code`, `smile_url`, `emoticon`, `smi
 INSERT INTO `phpbb_smilies` (`smilies_id`, `code`, `smile_url`, `emoticon`, `smilies_order`) VALUES (45, ':mrorange:', 'icon_mrorange.gif', 'Mr. Orange', 45);
 INSERT INTO `phpbb_smilies` (`smilies_id`, `code`, `smile_url`, `emoticon`, `smilies_order`) VALUES (46, ':mrviolet:', 'icon_mrviolet.gif', 'Mr. Violet', 46);
 INSERT INTO `phpbb_smilies` (`smilies_id`, `code`, `smile_url`, `emoticon`, `smilies_order`) VALUES (47, ':mryellow:', 'icon_mryellow.gif', 'Mr. Yellow', 47);
+INSERT INTO `phpbb_smilies` (`smilies_id`, `code`, `smile_url`, `emoticon`, `smilies_order`) VALUES (48, ':mri:', 'icon_mricy.gif', 'Mr. Icy', 48);
+INSERT INTO `phpbb_smilies` (`smilies_id`, `code`, `smile_url`, `emoticon`, `smilies_order`) VALUES (49, ':mrb:', 'icon_mrblue.gif', 'Mr. Blue', 49);
+INSERT INTO `phpbb_smilies` (`smilies_id`, `code`, `smile_url`, `emoticon`, `smilies_order`) VALUES (50, ':mrg:', 'icon_mrgreen.gif', 'Mr. Green', 50);
+INSERT INTO `phpbb_smilies` (`smilies_id`, `code`, `smile_url`, `emoticon`, `smilies_order`) VALUES (51, ':mro:', 'icon_mrorange.gif', 'Mr. Orange', 51);
+INSERT INTO `phpbb_smilies` (`smilies_id`, `code`, `smile_url`, `emoticon`, `smilies_order`) VALUES (52, ':mrv:', 'icon_mrviolet.gif', 'Mr. Violet', 52);
+INSERT INTO `phpbb_smilies` (`smilies_id`, `code`, `smile_url`, `emoticon`, `smilies_order`) VALUES (53, ':mry:', 'icon_mryellow.gif', 'Mr. Yellow', 53);
 
 ## `phpbb_stats_config`
 ##

install/schemas/sql_update_ip.php

@@ -108,8 +108,8 @@
 	case '2016102': $current_ip_version = '2.0.16.102'; break;
 	case '2017103': $current_ip_version = '2.0.17.103'; break;
 	case '2018104': $current_ip_version = '2.0.18.104'; break;
-	case '2019105': $current_ip_version = '2.0.19.105'; break;
-
+	case '220105': $current_ip_version = '2.2.0.105'; break;
+	case '221106': $current_ip_version = '2.2.1.106'; break;
 }
 
 // We need to force this because in MySQL 5.5.5 the new default DB Engine is InnoDB, not MyISAM any more
@@ -4643,8 +4643,11 @@
 		/* Updating from IP 2.0.18.104 */
 		case '2.0.18.104':
 
-		/* Updating from IP 2.0.19.105 */
-		case '2.0.19.105':
+		/* Updating from IP 2.2.0.105 */
+		case '2.2.0.105':
+
+		/* Updating from IP 2.2.1.106 */
+		case '2.2.1.106':
 
 	}
 

install/schemas/versions.php

@@ -23,7 +23,7 @@
 // Versioning
 $fap_version = '1.5.0';
 $phpbb_version = '.0.23';
-$ip_version = '2.0.18.104';
+$ip_version = '2.2.0.105';
 
 // CHMOD
 $chmod_777 = array();

tags.php

@@ -118,7 +118,7 @@
 	}
 
 	$breadcrumbs['bottom_right_links'] .= (($breadcrumbs['bottom_right_links'] != '') ? ('&nbsp;' . MENU_SEP_CHAR . '&nbsp;') : '') . '<a href="' . append_sid(CMS_PAGE_TAGS) . '">' . $lang['TOPIC_TAGS'] . '</a>';
-	$breadcrumbs['bottom_right_links'] .= (($user->data['user_level'] != ADMIN) ? ('&nbsp;' . MENU_SEP_CHAR . '&nbsp;') : '') . '<a href="' . append_sid(CMS_PAGE_TAGS . '?mode=replace') . '">' . $lang['TOPIC_TAGS_REPLACE'] . '</a>';
+	$breadcrumbs['bottom_right_links'] .= (($user->data['user_level'] == ADMIN) ? ('&nbsp;' . MENU_SEP_CHAR . '&nbsp;') . '<a href="' . append_sid(CMS_PAGE_TAGS . '?mode=replace') . '">' . $lang['TOPIC_TAGS_REPLACE'] . '</a>' : '');
 
 	$template_to_parse = 'tags_view_body.tpl';