Version 2.3.6
This commit is contained in:
1 parent
a3bb603c96
commit
19b38c7c74
764 files changed
+143731
-118164
No files matched your search
@@ -40,7 +40,7 @@ class action_overview
|
||||
|
||||
if ( empty($this->install->ipsclass->input['username']) )
|
||||
{
|
||||
$this->install->template->append( $this->install->template->login_page( "Íåîáõîäèìî óêàçàòü èìÿ ïîëüçîâàòåëÿ" ) );
|
||||
$this->install->template->append( $this->install->template->login_page( "You must enter a username before proceeding" ) );
|
||||
$this->install->template->next_action = '?p=overview';
|
||||
return;
|
||||
}
|
||||
@@ -49,7 +49,7 @@ class action_overview
|
||||
|
||||
if ( empty($this->install->ipsclass->input['password']) )
|
||||
{
|
||||
$this->install->template->append( $this->install->template->login_page( "Íåîáõîäèìî óêàçàòü ïàðîëü" ) );
|
||||
$this->install->template->append( $this->install->template->login_page( "You must enter a password before proceeding" ) );
|
||||
$this->install->template->next_action = '?p=overview';
|
||||
return;
|
||||
}
|
||||
@@ -75,7 +75,7 @@ class action_overview
|
||||
//----------------------------------
|
||||
if ( empty($mem['id']) )
|
||||
{
|
||||
$this->install->template->append( $this->install->template->login_page( "Ïîëüçîâàòåëü ñ óêàçàííûìè èìåíåì íå ñóùåñòâóåò â ñèñòåìå" ) );
|
||||
$this->install->template->append( $this->install->template->login_page( "Could not find a record matching that username, please check the spelling" ) );
|
||||
$this->install->template->next_action = '?p=overview';
|
||||
return;
|
||||
}
|
||||
@@ -91,7 +91,7 @@ class action_overview
|
||||
|
||||
if ( $pass != $mem['password'] AND $pass != $mem['legacy_password'] )
|
||||
{
|
||||
$this->install->template->append( $this->install->template->login_page( "Ââåäåííûé ïàðîëü íåâåðåí" ) );
|
||||
$this->install->template->append( $this->install->template->login_page( "The password you entered is not correct" ) );
|
||||
$this->install->template->next_action = '?p=overview';
|
||||
return;
|
||||
}
|
||||
@@ -99,7 +99,7 @@ class action_overview
|
||||
{
|
||||
if ($mem['g_access_cp'] != 1)
|
||||
{
|
||||
$this->install->template->append( $this->install->template->login_page( "Âû íå îáëàäàåòå ïðàâàìè àäìèíèñòðàòîðà" ) );
|
||||
$this->install->template->append( $this->install->template->login_page( "You do not have access to the administrative CP" ) );
|
||||
$this->install->template->next_action = '?p=overview';
|
||||
return;
|
||||
}
|
||||
@@ -118,7 +118,7 @@ class action_overview
|
||||
|
||||
if ( ! $this->install->ipsclass->converge->member['converge_id'] )
|
||||
{
|
||||
$this->install->template->append( $this->install->template->login_page( "Ïîëüçîâàòåëü ñ óêàçàííûìè email íå ñóùåñòâóåò â ñèñòåìå" ) );
|
||||
$this->install->template->append( $this->install->template->login_page( "Could not find a record matching that username, please check the spelling" ) );
|
||||
$this->install->template->next_action = '?p=overview';
|
||||
return;
|
||||
}
|
||||
@@ -131,7 +131,7 @@ class action_overview
|
||||
|
||||
if ( $this->install->ipsclass->converge->converge_authenticate_member( $pass ) != TRUE )
|
||||
{
|
||||
$this->install->template->append( $this->install->template->login_page( "Ââåäåííûé ïàðîëü íåâåðåí" ) );
|
||||
$this->install->template->append( $this->install->template->login_page( "The password you entered is not correct" ) );
|
||||
$this->install->template->next_action = '?p=overview';
|
||||
return;
|
||||
}
|
||||
@@ -139,7 +139,7 @@ class action_overview
|
||||
{
|
||||
if ($mem['g_access_cp'] != 1)
|
||||
{
|
||||
$this->install->template->append( $this->install->template->login_page( "Âû íå îáëàäàåòå ïðàâàìè àäìèíèñòðàòîðà" ) );
|
||||
$this->install->template->append( $this->install->template->login_page( "You do not have access to the administrative CP" ) );
|
||||
$this->install->template->next_action = '?p=overview';
|
||||
return;
|
||||
}
|
||||
@@ -159,19 +159,19 @@ class action_overview
|
||||
$error = array();
|
||||
if ( ! $this->install->last_poss_id )
|
||||
{
|
||||
$error[] = "Íå óäàëîñü îïðåäåëèòü ïîñëåäíþþ äîñòóïíóþ âåðñèþ ïðîäóêòà.";
|
||||
$error[] = "An error has occured, we are unable to determine the current version or if there are any required upgrade files left to run";
|
||||
}
|
||||
if ( count($this->install->versions) == 0 )
|
||||
{
|
||||
$error[] = "Íå óäàëîñü íàéòè ñêðèïò äëÿ îáíîâëåíèÿ: 'upg_{$this->install->last_poss_id}/version_history.php'";
|
||||
$error[] = "Could not locate the required upgrade script: 'upg_{$this->install->last_poss_id}/version_history.php'";
|
||||
}
|
||||
if ( ! $this->install->current_version )
|
||||
{
|
||||
$error[] = "Íå óäàëîñü îïðåäåëèòü âåðñèþ óñòàíîâëåííîãî ïðîäóêòà";
|
||||
$error[] = "An error has occured, we are unable to determine the current version or if there are any required upgrade files left to run";
|
||||
}
|
||||
if ( $this->install->last_poss_id AND $this->install->last_poss_id <= $this->install->current_version )
|
||||
if ( $this->install->last_poss_id <= $this->install->current_version )
|
||||
{
|
||||
$error[] = "Ó âàñ óñòàíîâëåíà ïîñëåäíÿÿ äîñòóïíàÿ âåðñèÿ ïðîäóêòà. Îáíîâëåíèå íå òðåáóåòñÿ.";
|
||||
$error[] = "Your installation is up to date; no upgrade required";
|
||||
}
|
||||
|
||||
$checkfiles = array( ROOT_PATH ."resources/ipb_templates.xml",
|
||||
@@ -208,7 +208,7 @@ class action_overview
|
||||
{
|
||||
if ( ! file_exists($cf) )
|
||||
{
|
||||
$error[] = "Ìàñòåð íå ñìîã íàéòè íåîáõîäèìûé äëÿ ðàáîòû ôàéë '$cf'.";
|
||||
$error[] = "Cannot locate the file '$cf'.";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -216,7 +216,7 @@ class action_overview
|
||||
{
|
||||
if ( ! is_writeable($cf) )
|
||||
{
|
||||
$error[] = "Ðåñóðñ (ôàéë èëè äèðåêòîðèÿ) '$cf' íå äîñòóïåí äëÿ çàïèñè. Ïîæàëóéñòà èçìåíèòå CHMOD íà 0777.";
|
||||
$error[] = "Cannot write to the file or folder '$cf'. Please CHMOD to 0777.";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -228,7 +228,7 @@ class action_overview
|
||||
return;
|
||||
}
|
||||
|
||||
$current_version = $this->install->current_version == '00000' ? 'íå óñòàíîâëåí' : $this->install->versions[ $this->install->current_version ];
|
||||
$current_version = $this->install->current_version == '00000' ? 'not installed' : $this->install->versions[ $this->install->current_version ];
|
||||
|
||||
if ( $this->install->current_version == '00000' )
|
||||
{
|
||||
@@ -236,14 +236,14 @@ class action_overview
|
||||
}
|
||||
else
|
||||
{
|
||||
$summary .= "îáíîâëåíèå ".$this->install->versions[ $this->install->current_version ]." äî âåðñèè ".$this->install->versions[ $this->install->last_poss_id ];
|
||||
$summary .= "Upgrade from ".$this->install->versions[ $this->install->current_version ]." to ".$this->install->versions[ $this->install->last_poss_id ];
|
||||
}
|
||||
|
||||
//-----------------------------------------
|
||||
// Time check...
|
||||
//-----------------------------------------
|
||||
|
||||
$summary .= "<br /><br /><strong>Ïðîâåðêà âàëèäíîñòè ðåñóðñ-ôàéëîâ</strong>";
|
||||
$summary .= "<br /><br /><strong>Checking 'resources' directory files</strong>";
|
||||
$_flag = 0;
|
||||
|
||||
foreach ( $timecheck as $cf )
|
||||
@@ -253,35 +253,19 @@ class action_overview
|
||||
if ( $time_to_check AND $_time AND ( ( $time_to_check - (86400 * 7) ) > $_time ) )
|
||||
{
|
||||
$_flag = 1;
|
||||
$summary .= "<div style='color:red'>·" . str_replace( ROOT_PATH, '', $cf ) . ' ìîæåò áûòü óñòàðåâøèì</div>';
|
||||
$summary .= "<div style='color:red'>·" . str_replace( ROOT_PATH, '', $cf ) . ' may be out of date</div>';
|
||||
}
|
||||
}
|
||||
|
||||
if ( $_flag )
|
||||
{
|
||||
$summary .= "<br /><div>Ïîæàëóéñòà óáåäèòåñü, ÷òî ôàéëû èç ñïèñêà çàêà÷àíû èç äèñòðèáóòèâà ".$this->install->versions[ $this->install->last_poss_id ]." âåðñèè";
|
||||
$summary .= "<br /><div>Please check the above files to make sure they have been uploaded from the ".$this->install->versions[ $this->install->last_poss_id ]." download";
|
||||
}
|
||||
else
|
||||
{
|
||||
$summary .= "<div style='color:green'>Âñå ðåñóðñ-ôàéëû âàëèäíû</div>";
|
||||
$summary .= "<div style='color:green'>All files checked OK</div>";
|
||||
}
|
||||
|
||||
if ( $cp = $this->install->get_db_codepage() )
|
||||
{
|
||||
$summary .= "
|
||||
<br />
|
||||
<strong>Êîäèðîâêà òàáëèö â MySQL</strong>
|
||||
<table width='100%' cellspacing='0' cellpadding='0' align='left' border='0'>
|
||||
<tr>
|
||||
<td class='title'><div style='color:gray; font-weight:normal;'>Íå èçìåíÿéòå, åñëè íå óâåðåíû.</div></td>
|
||||
<td class='content'><input type='text' name='mysql_codepage' class='sql_form' value='" . $cp . "'></td>
|
||||
</tr>
|
||||
</table>";
|
||||
|
||||
} else {
|
||||
$summary .= "<input type='hidden' name='mysql_codepage' value='none'>";
|
||||
}
|
||||
|
||||
/* Page Output */
|
||||
$this->install->template->append( $this->install->template->overview_page( $current_version, $summary ) );
|
||||
$this->install->template->next_action = '?p=eula';
|
||||
|
||||
Reference in new issue
Block a user