Changeset 2820
- Timestamp:
- Nov 3, 2008, 8:55:35 PM (15 years ago)
- Location:
- branches/2.0
- Files:
-
- 5 edited
- 6 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/2.0/admin/include/functions_upgrade.php
r2816 r2820 133 133 mysql_query($query); 134 134 135 array_push( 136 $page['infos'], 137 'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them: 138 <pre>' . implode(', ', $plugins) . '</pre>' 139 ); 135 array_push($page['infos'], 136 l10n('deactivated plugins') . '<pre>' . implode(', ', $plugins) . '</pre>'); 140 137 } 141 138 } -
branches/2.0/admin/template/goto/install.tpl
r2753 r2820 2 2 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 3 3 "http://www.w3.org/TR/html4/strict.dtd"> 4 <html lang=" fr">4 <html lang="{$lang_info.code}" dir="{$lang_info.direction}"> 5 5 <head> 6 6 <meta http-equiv="Content-Type" content="text/html; charset={$T_CONTENT_ENCODING}"> -
branches/2.0/admin/template/goto/upgrade.tpl
r2788 r2820 1 1 {* $Id$ *} 2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 2 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 3 "http://www.w3.org/TR/html4/strict.dtd"> 4 <html lang="{$lang_info.code}" dir="{$lang_info.direction}"> 5 <head> 6 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 7 <meta http-equiv="Content-script-type" content="text/javascript"> 8 <meta http-equiv="Content-Style-Type" content="text/css"> 9 <link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico"> 10 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/layout.css"> 11 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/default-colors.css"> 12 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css"> 13 {literal} 14 <style type="text/css"> 15 #theHeader { height: 105px; } 4 16 5 <head> 6 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> 7 <title>Piwigo : Upgrade to {$RELEASE}</title> 8 </head> 17 .content { 18 width: 800px; 19 min-height: 0px !important; 20 margin: auto; 21 padding: 25px; 22 text-align: left; 23 } 9 24 10 <body> 11 {if isset($introduction)} 12 <h1>Welcome to Piwigo upgrade page.</h1> 25 h2 { width: 770px !important; } 26 </style> 27 {/literal} 28 <title>Piwigo {$RELEASE} - {'Upgrade'|@translate}</title> 29 </head> 13 30 14 <p>This page proposes to upgrade your database corresponding to your old 15 version of Piwigo to the current version. The upgrade assistant 16 thinks you are currently running a 17 < strong>release {$introduction.CURRENT_RELEASE}</strong> (or equivalent).</p>31 <body> 32 <div id="headbranch"></div> {* Dummy block for double background management *} 33 <div id="theHeader"></div> 34 <div id="content" class="content"> 18 35 19 <p><a href="{$introduction.RUN_UPGRADE_URL}">Upgrade from release 20 {$introduction.CURRENT_RELEASE} to {$RELEASE}</a></p> 21 {/if} 36 {if isset($introduction)} 37 <h2>Piwigo {$RELEASE} - {'Upgrade'|@translate}</h2> 22 38 23 {if isset($upgrade)} 24 <h1>Upgrade from version {$upgrade.VERSION} to {$RELEASE}</h1> 39 <p>{'language'|@translate} 40 <select name="language" onchange="document.location = 'upgrade.php?language='+this.options[this.selectedIndex].value;"> 41 {html_options options=$language_options selected=$language_selection} 42 </select> 43 </p> 25 44 26 <p>Statistics</p> 27 <ul> 28 <li>total upgrade time : {$upgrade.TOTAL_TIME}</li> 29 <li>total SQL time : {$upgrade.SQL_TIME}</li> 30 <li>SQL queries : {$upgrade.NB_QUERIES}</li> 31 </ul> 45 <p>{'introduction message'|@translate|@sprintf:$introduction.CURRENT_RELEASE}</p> 32 46 33 <p>Upgrade informations</p> 47 <p style="text-align: center;"> 48 <a href="{$introduction.RUN_UPGRADE_URL}">{'Upgrade from %s to %s'|@translate|@sprintf:$introduction.CURRENT_RELEASE:$RELEASE}</b> 49 </p> 50 {/if} 34 51 35 <ul> 36 {foreach from=$infos item=info} 37 <li>{$info}</li> 38 {/foreach} 39 </ul> 52 {if isset($upgrade)} 53 <h2>{'Upgrade from %s to %s'|@translate|@sprintf:$upgrade.VERSION:$RELEASE}</h2> 40 54 41 {/if} 42 </body> 55 <p><b>{'Statistics'|@translate}</b></p> 56 <ul> 57 <li>{'total upgrade time'|@translate} : {$upgrade.TOTAL_TIME}</li> 58 <li>{'total SQL time'|@translate} : {$upgrade.SQL_TIME}</li> 59 <li>{'SQL queries'|@translate} : {$upgrade.NB_QUERIES}</li> 60 </ul> 43 61 62 <p><b>{'Upgrade informations'|@translate}</b></p> 63 <ul> 64 {foreach from=$infos item=info} 65 <li>{$info}</li> 66 {/foreach} 67 </ul> 68 {/if} 69 70 </div> {* content *} 71 </body> 44 72 </html> -
branches/2.0/install/upgrade_1.7.0.php
r2816 r2820 86 86 // +-----------------------------------------------------------------------+ 87 87 88 ob_start(); 88 89 echo '<pre>'; 89 90 … … 116 117 117 118 echo '</pre>'; 119 ob_clean(); 118 120 119 121 // now we upgrade from 2.0.0 -
branches/2.0/upgrade.php
r2816 r2820 149 149 150 150 // +-----------------------------------------------------------------------+ 151 // | language | 152 // +-----------------------------------------------------------------------+ 153 if (isset($_GET['language'])) 154 { 155 $language = strip_tags($_GET['language']); 156 } 157 else 158 { 159 $language = 'en_UK'; 160 // Try to get browser language 161 foreach (get_languages('utf-8') as $language_code => $language_name) 162 { 163 if (substr($language_code,0,2) == @substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2)) 164 { 165 $language = $language_code; 166 break; 167 } 168 } 169 } 170 171 load_language( 'common.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') ); 172 load_language( 'admin.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') ); 173 load_language( 'upgrade.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') ); 174 175 // +-----------------------------------------------------------------------+ 151 176 // | template initialization | 152 177 // +-----------------------------------------------------------------------+ 153 178 154 $template = new Template(PHPWG_ROOT_PATH.'admin/template/goto' );179 $template = new Template(PHPWG_ROOT_PATH.'admin/template/goto', 'roma'); 155 180 $template->set_filenames(array('upgrade'=>'upgrade.tpl')); 156 181 $template->assign('RELEASE', PHPWG_VERSION); 182 183 foreach (get_languages('utf-8') as $language_code => $language_name) 184 { 185 if ($language == $language_code) 186 { 187 $template->assign('language_selection', $language_code); 188 } 189 $languages_options[$language_code] = $language_name; 190 } 191 $template->assign('language_options', $languages_options); 157 192 158 193 // +-----------------------------------------------------------------------+ … … 211 246 'CURRENT_RELEASE' => $current_release, 212 247 'RUN_UPGRADE_URL' => 213 PHPWG_ROOT_PATH.'upgrade.php?version='.$current_release ,248 PHPWG_ROOT_PATH.'upgrade.php?version='.$current_release.'&language='.$language, 214 249 ) 215 250 ); … … 264 299 ); 265 300 266 array_push( 267 $page['infos'], 268 '[security] delete files "upgrade.php", "upgrade_feed.php", "install.php" and "install" 269 directory' 270 ); 271 272 array_push( 273 $page['infos'], 274 'in include/mysql.inc.php, remove 275 <pre style="background-color:lightgray"> 276 define(\'PHPWG_IN_UPGRADE\', true); 277 </pre>' 278 ); 279 280 array_push( 281 $page['infos'], 282 'Perform a maintenance check in [Administration>General>Maintenance] 283 if you encounter any problem.' 301 array_push($page['infos'], 302 l10n('delete upgrade files'), 303 l10n('remove line from mysql.inc.php') . '<pre>define(\'PHPWG_IN_UPGRADE\', true);</pre>', 304 l10n('perform a maintenance check') 284 305 ); 285 306
Note: See TracChangeset
for help on using the changeset viewer.