Version 2.2.2

upload/upgrade/custom/app.php

@@ -28,19 +28,19 @@ class application_installer extends class_installer
 			if ( ! $this->ipsclass->member['id'] )
 			{
 				$this->template->page_current = 'login';
-				$this->template->message = "You do not have access to this tool.";
+				$this->template->message = "Âû íå èìååòå ïðàâ äîñòóïà ê ìàñòåðó îáíîâëåíèÿ.";
 			}
 			
 			if ( $this->ipsclass->return_md5_check() != $this->saved_data['securekey'] )
 			{
 				$this->template->page_current = 'login';
-				$this->template->message = "You do not have access to this tool.";
+				$this->template->message = "Âû íå èìååòå ïðàâ äîñòóïà ê ìàñòåðó îáíîâëåíèÿ.";
 			}
 			
 			if ( ! $this->ipsclass->member['g_access_cp'] )
 			{
 				$this->template->page_current = 'login';
-				$this->template->message = "You must be an admin to access this upgrade script.";
+				$this->template->message = "Äëÿ èñïîëüçîâàíèÿ ìàñòåðà îáíîâëåíèÿ âû äîëæíû îáëàäàòü ïðàâàìè àäìèíèñòðàòîðà ôîðóìà.";
 			}
 			
 			if( $this->ipsclass->DB->field_exists( 'converge_id', 'members_converge' ) )
@@ -161,6 +161,35 @@ class application_installer extends class_installer
 		return $vers;
 	}
 
+	function get_db_codepage()
+	{
+		if ( $this->ipsclass->vars['sql_driver'] == 'mysql' ) 
+		{
+            $this->ipsclass->DB->sql_get_version();
+            
+			if ( $this->ipsclass->DB->mysql_version >= 40101 ) 
+			{
+				$table_scheme = $this->ipsclass->DB->sql_get_table_schematic ( "topics" );
+				
+				$q = $table_scheme['Create Table'];
+				
+				$match = array();				
+                
+				if ( preg_match("/CHARSET=([a-zA-Z0-9]+)/", $q, $match) ) 
+				{
+					return $match[1];
+				}
+				
+				if ( preg_match("/CHARACTER SET ([a-zA-Z0-9]+)/", $q, $match) )
+				{
+					return $match[1];
+				}
+			} 
+		}
+		
+		return false;
+	}
+		
 	/*-------------------------------------------------------------------------*/
 	// Get dir structure..
 	/*-------------------------------------------------------------------------*/
@@ -175,7 +204,7 @@ class application_installer extends class_installer
 
  		$dh = opendir( INS_ROOT_PATH.'installfiles' );
 
- 		while ( $file = readdir( $dh ) )
+ 		while ( false !== ( $file = readdir( $dh ) ) )
  		{
 			if ( is_dir( INS_ROOT_PATH.'installfiles/'.$file ) )
 			{
@@ -210,7 +239,7 @@ class application_installer extends class_installer
 		// BBCODE
 		//-------------------------------------------------------------
 		
-		$output[] = "Rebuilding bbcode cache...";
+		$output[] = "Ñîçäàíèå êåøà BB-êîäîâ...";
 		
 		$this->ipsclass->cache['bbcode'] = array();
 		
@@ -228,7 +257,7 @@ class application_installer extends class_installer
 		// Forum cache
 		//-------------------------------------------------------------
 		
-		$output[] = "Rebuilding forum cache...";
+		$output[] = "Ñîçäàíèå êåøà ôîðóìîâ...";
 		
 		$this->ipsclass->update_forum_cache();
 			
@@ -236,7 +265,7 @@ class application_installer extends class_installer
 		// Group Cache
 		//-------------------------------------------------------------
 		
-		$output[] = "Rebuilding group cache...";
+		$output[] = "Ñîçäàíèå êåøà ãðóïï...";
 		
 		$this->ipsclass->cache['group_cache'] = array();
 	
@@ -257,7 +286,7 @@ class application_installer extends class_installer
 		// Systemvars
 		//-------------------------------------------------------------
 		
-		$output[] = "Rebuilding system cache...";
+		$output[] = "Ñîçäàíèå êåøà ñèñòåìíûõ ïåðåìåííûõ";
 		
 		$this->ipsclass->cache['systemvars'] = array();
 		
@@ -272,7 +301,7 @@ class application_installer extends class_installer
 		// Moderators
 		//-----------------------------------------
 		
-		$output[] = "Rebuilding moderator cache...";
+		$output[] = "Ñîçäàíèå êåøà ìîäåðàòîðîâ ôîðóìîâ";
 		
 		$this->ipsclass->cache['moderators'] = array();
 		
@@ -286,7 +315,7 @@ class application_installer extends class_installer
 		// Cal events / Birthdays
 		//-----------------------------------------
 		
-		$output[] = "Rebuilding calendar events/birthdays cache...";
+		$output[] = "Ñîçäàíèå êåøà äíåé ðîæäåíèé/ñîáûòèé...";
 		
 		require_once( ROOT_PATH . 'sources/action_admin/calendars.php' );
 		$calendars           =  new ad_calendars();
@@ -299,7 +328,7 @@ class application_installer extends class_installer
 		// Ranks
 		//-------------------------------------------------------------
 		
-		$output[] = "Rebuilding ranks cache...";
+		$output[] = "Ñîçäàíèå êåøà çâàíèé ïîëüçîâàòåëåé...";
 		
 		$this->ipsclass->cache['ranks'] = array();
 	
@@ -326,7 +355,7 @@ class application_installer extends class_installer
 		// SETTINGS
 		//-------------------------------------------------------------
 		
-		$output[] = "Rebuilding settings cache...";
+		$output[] = "Ñîçäàíèå êåøà íàñòðîåê ôîðóìà...";
 		
 		require_once( ROOT_PATH . 'sources/action_admin/settings.php' );
 		$settings           =  new ad_settings();
@@ -338,7 +367,7 @@ class application_installer extends class_installer
 		// EMOTICONS
 		//-------------------------------------------------------------
 		
-		$output[] = "Rebuilding emoticons cache...";
+		$output[] = "Ñîçäàíèå êåøà ñìàéëèêîâ...";
 		
 		require_once( ROOT_PATH . 'sources/action_admin/emoticons.php' );
 		$emoticons           =  new ad_emoticons();
@@ -350,7 +379,7 @@ class application_installer extends class_installer
 		// LANGUAGES
 		//-------------------------------------------------------------
 		
-		$output[] = "Rebuilding languages cache...";
+		$output[] = "Ñîçäàíèå ÿçûêîâîãî êåøà...";
 		
 		$this->ipsclass->cache['languages'] = array();
 	
@@ -368,7 +397,7 @@ class application_installer extends class_installer
 		// ATTACHMENT TYPES
 		//-------------------------------------------------------------
 		
-		$output[] = "Rebuilding attachment types cache...";
+		$output[] = "Ñîçäàíèå êåøà òèïîâ ôàéëîâ...";
 			
 		$this->ipsclass->cache['attachtypes'] = array();
 	
@@ -384,6 +413,29 @@ class application_installer extends class_installer
 
 		return $output;
 	}
+	
+	/**
+	 * application_installer::write_codepage_configuration
+	 * 
+	 * Writes the configuration codepage for this app
+	 *
+	 */		
+	function write_codepage_configuration()
+	{
+        $this->ipsclass->vars['mysql_codepage'] = $this->saved_data['mysql_codepage'];
+        
+		$core_conf = $this->read_file( ROOT_PATH. "conf_global.php" );
+		$cp = '$INFO['."'mysql_codepage'".']'."\t\t\t=\t'".$this->saved_data['mysql_codepage']."';\n";		
+		$core_conf = str_replace("\n".'?'.'>', $cp, $core_conf);
+		$core_conf .= "\n".'?'.'>';
+
+		/* Write Configuration Files */
+		$output = 'Îáíîâëåíèå êîíôèãóðàöèîííûõ ôàéëîâ...<br />';
+		
+		$this->write_file( ROOT_PATH. "conf_global.php"  , $core_conf );
+        
+		return $output;
+	}
 }
 
 ?>