diff --git a/core/bitrix/wizards/nsandrey/empty_install/.description.php b/core/bitrix/wizards/nsandrey/empty_install/.description.php deleted file mode 100644 index fde996222..000000000 --- a/core/bitrix/wizards/nsandrey/empty_install/.description.php +++ /dev/null @@ -1,21 +0,0 @@ - GetMessage('EMPTY_WIZARD_NAME'), - 'DESCRIPTION' => GetMessage('EMPTY_WIZARD_DESC'), - 'VERSION' => '1.0.3', - 'START_TYPE' => 'WINDOW', - 'WIZARD_TYPE' => 'INSTALL', - 'IMAGE' => 'images/'.LANGUAGE_ID.'/solution.png', - 'PARENT' => 'wizard_sol', - 'TEMPLATES' => Array( - Array('SCRIPT' => 'wizard_sol') - ), - 'STEPS' => Array('SelectTemplateStep', 'SiteSettingsStep', 'ModuleSettingsStep', 'InstallStep', 'SuccessStep') -); -?> \ No newline at end of file diff --git a/core/bitrix/wizards/nsandrey/empty_install/lang/ru/.description.php b/core/bitrix/wizards/nsandrey/empty_install/lang/ru/.description.php deleted file mode 100644 index 107021bba..000000000 --- a/core/bitrix/wizards/nsandrey/empty_install/lang/ru/.description.php +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/core/bitrix/wizards/nsandrey/empty_install/lang/ru/wizard.php b/core/bitrix/wizards/nsandrey/empty_install/lang/ru/wizard.php deleted file mode 100644 index bbaf4b71e..000000000 --- a/core/bitrix/wizards/nsandrey/empty_install/lang/ru/wizard.php +++ /dev/null @@ -1,78 +0,0 @@ - diff --git a/core/bitrix/wizards/nsandrey/empty_install/site/_index.php b/core/bitrix/wizards/nsandrey/empty_install/site/_index.php deleted file mode 100644 index c06de6c17..000000000 --- a/core/bitrix/wizards/nsandrey/empty_install/site/_index.php +++ /dev/null @@ -1,8 +0,0 @@ - \ No newline at end of file diff --git a/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/.section.php b/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/.section.php deleted file mode 100644 index 3eecc60f0..000000000 --- a/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/.section.php +++ /dev/null @@ -1,9 +0,0 @@ - '#SITE_TITLE#', - 'description' => '#SITE_DESCRIPTION#', - 'keywords' => '#SITE_KEYWORDS#', - 'robots' => 'index, follow' -); -?> \ No newline at end of file diff --git a/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/404.php b/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/404.php deleted file mode 100644 index 27de95160..000000000 --- a/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/404.php +++ /dev/null @@ -1,20 +0,0 @@ -SetTitle("404 Not Found"); - -$APPLICATION->IncludeComponent("bitrix:main.map", ".default", Array( - "LEVEL" => "3", - "COL_NUM" => "2", - "SHOW_DESCRIPTION" => "Y", - "SET_TITLE" => "Y", - "CACHE_TIME" => "36000000" - ) -); - -require($_SERVER["DOCUMENT_ROOT"]."/bitrix/footer.php");?> \ No newline at end of file diff --git a/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/_index.php b/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/_index.php deleted file mode 100644 index 8e4c5d3b5..000000000 --- a/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/_index.php +++ /dev/null @@ -1,8 +0,0 @@ -SetTitle('Главная'); -?> - - \ No newline at end of file diff --git a/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/auth/.section.php b/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/auth/.section.php deleted file mode 100644 index 7b2d18ed4..000000000 --- a/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/auth/.section.php +++ /dev/null @@ -1,6 +0,0 @@ - \ No newline at end of file diff --git a/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/auth/index.php b/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/auth/index.php deleted file mode 100644 index 39eaf1ee5..000000000 --- a/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/auth/index.php +++ /dev/null @@ -1,16 +0,0 @@ -0) - LocalRedirect($backurl); - -$APPLICATION->SetTitle("Авторизация"); -?> -

Вы зарегистрированы и успешно авторизовались.

- -

Используйте административную панель в верхней части экрана для быстрого доступа к функциям управления структурой и информационным наполнением сайта. Набор кнопок верхней панели отличается для различных разделов сайта. Так отдельные наборы действий предусмотрены для управления статическим содержимым страниц, динамическими публикациями (новостями, каталогом, фотогалереей) и т.п.

- -

Вернуться на главную страницу

- - \ No newline at end of file diff --git a/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/favicon.ico b/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/favicon.ico deleted file mode 100644 index 4f24c6bc1..000000000 Binary files a/core/bitrix/wizards/nsandrey/empty_install/site/public/ru/favicon.ico and /dev/null differ diff --git a/core/bitrix/wizards/nsandrey/empty_install/site/template/description.php b/core/bitrix/wizards/nsandrey/empty_install/site/template/description.php deleted file mode 100644 index 1eea8ef1d..000000000 --- a/core/bitrix/wizards/nsandrey/empty_install/site/template/description.php +++ /dev/null @@ -1,9 +0,0 @@ - '#TEMPLATE_NAME#', - 'DESCRIPTION' => '#TEMPLATE_DESCRIPTION#' -); -?> \ No newline at end of file diff --git a/core/bitrix/wizards/nsandrey/empty_install/site/template/footer.php b/core/bitrix/wizards/nsandrey/empty_install/site/template/footer.php deleted file mode 100644 index 55762d282..000000000 --- a/core/bitrix/wizards/nsandrey/empty_install/site/template/footer.php +++ /dev/null @@ -1,6 +0,0 @@ - - - \ No newline at end of file diff --git a/core/bitrix/wizards/nsandrey/empty_install/site/template/header.php b/core/bitrix/wizards/nsandrey/empty_install/site/template/header.php deleted file mode 100644 index 2904d215c..000000000 --- a/core/bitrix/wizards/nsandrey/empty_install/site/template/header.php +++ /dev/null @@ -1,17 +0,0 @@ - - - - - ShowHead();?> - <?$APPLICATION->ShowTitle();?> - - - -
- ShowPanel();?> -
- - \ No newline at end of file diff --git a/core/bitrix/wizards/nsandrey/empty_install/site/template/styles.css b/core/bitrix/wizards/nsandrey/empty_install/site/template/styles.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/core/bitrix/wizards/nsandrey/empty_install/site/template/template_styles.css b/core/bitrix/wizards/nsandrey/empty_install/site/template/template_styles.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/core/bitrix/wizards/nsandrey/empty_install/wizard.php b/core/bitrix/wizards/nsandrey/empty_install/wizard.php deleted file mode 100644 index 4c9a4231f..000000000 --- a/core/bitrix/wizards/nsandrey/empty_install/wizard.php +++ /dev/null @@ -1,465 +0,0 @@ - GetMessage("NAS_EMPTYINSTALL_REKLAMA_BANNERY"), - 'bitrixcloud' => GetMessage("NAS_OBLAKO_1C_BITRIX"), - 'bizproc' => GetMessage("NAS_EMPTYINSTALL_BIZNES_PROCESSY"), - 'bizprocdesigner' => GetMessage("NAS_EMPTYINSTALL_DIZAYNER_BIZNES_PROC"), - 'blog' => GetMessage("NAS_EMPTYINSTALL_BLOGI"), - 'calendar' => GetMessage("NAS_EMPTYINSTALL_CALENDAR"), - 'catalog' => GetMessage("NAS_EMPTYINSTALL_TORGOVYY_KATALOG"), - 'cluster' => GetMessage("NAS_EMPTYINSTALL_VEB_KLASTER"), - 'clouds' => GetMessage("NAS_EMPTYINSTALL_OBLACNYE_HRANILISA"), - 'compression' => GetMessage("NAS_EMPTYINSTALL_KOMPRESSIA"), - 'controller' => GetMessage("NAS_EMPTYINSTALL_KONTROLLER"), - 'crm' => 'CRM', - 'currency' => GetMessage("NAS_EMPTYINSTALL_VALUTY"), - 'DAV' => 'DAV', - 'extranet' => GetMessage("NAS_EMPTYINSTALL_EKSTRANET"), - 'form' => GetMessage("NAS_EMPTYINSTALL_VEB_FORMY"), - 'forum' => GetMessage("NAS_EMPTYINSTALL_FORUM"), - 'iblock' => GetMessage("NAS_EMPTYINSTALL_INFORMACIONNYE_BLOKI"), - 'idea' => GetMessage("NAS_EMPTYINSTALL_MENEDJER_IDEY"), - 'im' => GetMessage("NAS_EMPTYINSTALL_IM"), - 'intranet' => GetMessage("NAS_EMPTYINSTALL_INTRANET"), - 'ldap' => 'AD/LDAP', - 'learning' => GetMessage("NAS_EMPTYINSTALL_OBUCENIE"), - 'lists' => GetMessage("NAS_EMPTYINSTALL_UNIVERSALQNYE_SPISKI"), - 'mail' => GetMessage("NAS_EMPTYINSTALL_POCTA"), - 'meeting' => GetMessage("NAS_EMPTYINSTALL_PLANERKI_I_SOBRANIA"), - 'perfmon' => GetMessage("NAS_EMPTYINSTALL_MODULQ_PROIZVODITELQ"), - 'photogallery' => GetMessage("NAS_EMPTYINSTALL_FOTOGALEREA"), - 'report' => GetMessage("NAS_EMPTYINSTALL_KONSTRUKTOR_OTCETOV"), - 'sale' => GetMessage("NAS_EMPTYINSTALL_INTERNET_MAGAZIN"), - 'search' => GetMessage("NAS_EMPTYINSTALL_POISK"), - 'security' => GetMessage("NAS_EMPTYINSTALL_PROAKTIVNAA_ZASITA"), - 'seo' => GetMessage("NAS_EMPTYINSTALL_POISKOVAA_OPTIMIZACI"), - 'socialnetwork' => GetMessage("NAS_EMPTYINSTALL_SOCIALQNAA_SETQ"), - 'socialservices' => GetMessage("NAS_EMPTYINSTALL_SOCIALQNYE_SERVISY"), - 'statistic' => GetMessage("NAS_EMPTYINSTALL_VEB_ANALITIKA"), - 'subscribe' => GetMessage("NAS_EMPTYINSTALL_PODPISKA_RASSYLKI"), - 'support' => GetMessage("NAS_EMPTYINSTALL_TEHPODDERJKA"), - 'tasks' => GetMessage("NAS_EMPTYINSTALL_ZADACI"), - 'timeman' => GetMessage("NAS_EMPTYINSTALL_UCET_RABOCEGO_VREMEN"), - 'translate' => GetMessage("NAS_EMPTYINSTALL_PEREVOD"), - 'video' => GetMessage("NAS_EMPTYINSTALL_VIDEOKONFERENCII"), - 'videoport' => GetMessage("NAS_EMPTYINSTALL_VIDEOPORT"), - 'vote' => GetMessage("NAS_EMPTYINSTALL_OPROSY_GOLOSOVANIA"), - 'webdav' => GetMessage("NAS_EMPTYINSTALL_BIBLIOTEKA_DOKUMENTO"), - 'webservice' => GetMessage("NAS_EMPTYINSTALL_VEB_SERVISY"), - 'wiki' => 'Wiki', - 'workflow' => GetMessage("NAS_EMPTYINSTALL_DOKUMENTOOBOROT"), - 'xdimport' => GetMessage("NAS_EMPTYINSTALL_IMPORT_DANNYH_IZ_VNE"), - 'xmpp' => 'XMPP '.GetMessage("NAS_EMPTYINSTALL_SERVER") -); - -function on_shutdown(&$install_steps, &$currentStep) -{ - //ob_end_clean(); - - if(!isset($install_steps[$currentStep + 1])) - $response = "window.ajaxForm.StopAjax(); window.ajaxForm.SetStatus('100'); window.ajaxForm.Post('".($currentStep + 1)."', 'skip', '".($currentStep < 2 ? $install_steps[$currentStep] : $install_steps[$currentStep]['status'])."');"; - else - { - $progress = round($currentStep / sizeof($install_steps) * 100); - $response = "window.ajaxForm.SetStatus('".$progress."'); window.ajaxForm.Post('".($currentStep + 1)."', 'skip', '".($currentStep < 2 ? $install_steps[$currentStep] : $install_steps[$currentStep]['status'])."');"; - } - die("[response]".$response."[/response]"); -} - -class SelectTemplateStep extends CWizardStep -{ - private $s_count = 0; - - function InitStep() - { - $wizard =& $this->GetWizard(); - $wizard->solutionName = 'empty'; - - $this->SetStepID('set_template'); - $this->SetTitle(GetMessage('WIZ_TEMPLATE_SETTINGS')); - - $sites = CSite::GetList($by = "sort", $order = "desc"); - while($sites_f = $sites->Fetch()) - $this->s_count++; - - if($this->s_count < 2) - { - $this->SetNextStep('set_site'); - $this->SetNextCaption(GetMessage('WIZ_MAIN_SETTINGS')); - - $wizard->SetDefaultVars( - Array( - 'templateDescription' => GetMessage('WIZ_TEMPLATE_DESCRIPTION_DEFAULT'), - 'templateName' => GetMessage('WIZ_TEMPLATE_NAME_DEFAULT'), - 'templateDir' => GetMessage('WIZ_TEMPLATE_DIR_DEFAULT') - ) - ); - } - else - { - $site_wizard = file_get_contents($_SERVER['DOCUMENT_ROOT'].'/bitrix/wizards/nsandrey/empty_install/site/_index.php'); - $site_wizard = strtr($site_wizard, array('#SITE_ID#' => SITE_ID, '#SITE_ENCODING#' => SITE_CHARSET)); - file_put_contents($_SERVER['DOCUMENT_ROOT'].SITE_DIR.'index.php', $site_wizard); - - $this->SetNextStep('success'); - $this->SetNextCaption(GetMessage('WIZ_FINISH')); - } - } - - function OnPostForm() - { - if($this->s_count < 2) - { - $wizard =& $this->GetWizard(); - $templateDir = $wizard->GetVar('templateDir'); - - if(!preg_match('#^[A-Za-z0-9_]+$#is', $templateDir)) - $this->SetError(GetMessage('WIZ_TEMPLATE_DIR_ERROR')); - } - } - - function ShowStep() - { - $wizard =& $this->GetWizard(); - if($this->s_count < 2) - $this->content .= '
-
-

-
-
- '.$this->ShowInputField('text', 'templateName').' -
-
-
-
-

-
-
- '.$this->ShowInputField('text', 'templateDescription').' -
-
-
-
-

-
-
- '.$this->ShowInputField('text', 'templateDir').' -
-
-
-
'; - else - $this->content .= GetMessage('WIZ_NOT_FIRST'); - } -} - -class SiteSettingsStep extends CWizardStep -{ - function InitStep() - { - $wizard =& $this->GetWizard(); - $wizard->solutionName = 'empty'; - - $this->SetStepID('set_site'); - $this->SetTitle(GetMessage('WIZ_MAIN_SETTINGS')); - $this->SetNextStep('set_modules'); - $this->SetNextCaption(GetMessage('WIZ_MODULE_SETTINGS')); - - $wizard->SetDefaultVars( - Array( - 'siteName' => GetMessage('WIZ_SETTINGS_SITE_NAME_DEFAULT'), - 'siteMetaTitle' => GetMessage('WIZ_SETTINGS_TITLE_DEFAULT'), - 'siteMetaDescription' => GetMessage('WIZ_SETTINGS_DESCRIPTION_DEFAULT'), - 'siteMetaKeywords' => GetMessage('WIZ_SETTINGS_KEYWORDS_DEFAULT') - ) - ); - } - - function OnPostForm() - { - } - - function ShowStep() - { - $this->content .= '
-
-

-
-
- '.$this->ShowInputField('text', 'siteName').' -
-
-
-
-

-
-
- '.$this->ShowInputField('text', 'siteMetaTitle').' -
-
-
-
-

-
-
- '.$this->ShowInputField('text', 'siteMetaDescription').' -
-
-
-
-

-
-
- '.$this->ShowInputField('text', 'siteMetaKeywords').' -
-
-
-
'; - } -} - -class ModuleSettingsStep extends CWizardStep -{ - private $arModules = array(); - - function InitStep() - { - global $arModNames; - - $wizard =& $this->GetWizard(); - $wizard->solutionName = 'empty'; - - $this->SetStepID('set_modules'); - $this->SetTitle(GetMessage('WIZ_MODULE_SETTINGS')); - $this->SetNextStep('install_step'); - $this->SetNextCaption(GetMessage('WIZ_MAIN_SETTINGS')); - - - foreach($arModNames as $m_id => $m_name) - if(is_dir($_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/'.$m_id)) - $this->arModules[$m_id] = $m_name; - - asort($this->arModules); - - $wizard->SetVar('b_modules', $this->arModules); - - $wizard->SetDefaultVars(array('install' => array())); - } - - function OnPostForm() - { - } - - function ShowStep() - { - $wizard =& $this->GetWizard(); - - $this->content .= '
-
-

-
'; - - foreach($this->arModules as $m_id => $m_name) - $this->content .= $this->ShowCheckboxField('install[]', $m_id).' '.$m_name.'
'; - - $this->content .= '
'.GetMessage("NAS_EMPTYINSTALL_INSTALL_ALL").' | '.GetMessage("NAS_EMPTYINSTALL_INSTALL_NONE").' -
-
-
- '; - } -} - -class InstallStep extends CWizardStep -{ - function InitStep() - { - global $arModNames; - - $wizard =& $this->GetWizard(); - $wizard->solutionName = 'empty'; - - $this->SetStepID('install_step'); - $this->SetTitle(GetMessage('WIZ_INSTALL')); - } - - function OnPostForm() - { - $wizard =& $this->GetWizard(); - - $currentStep = $wizard->GetVar('nextStep'); - $install_mod = $wizard->GetVar('install'); - $all_mod = $wizard->GetVar('b_modules'); - - if($currentStep < 1) - $currentStep = 0; - - $install_steps = array( - GetMessage('WIZ_TEMPLATE_INSTALL'), - GetMessage('WIZ_SETTINGS_INSTALL') - ); - - foreach($all_mod as $m_id => $m_name) - $install_steps[] = in_array($m_id, $install_mod) ? array('module' => array('install', $m_id), 'status' => GetMessage('WIZ_MODULE_INSTALLING').$m_name) : array('module' => array('uninstall', $m_id), 'status' => GetMessage('WIZ_MODULE_UNINSTALLING').$m_name); - - if(!isset($install_steps[$currentStep])) - { - $wizard->SetCurrentStep('success'); - return; - } - - $arVars = $wizard->GetVars(); - - switch($currentStep) - { - case 0: - //�������� ������ - CopyDirFiles($_SERVER['DOCUMENT_ROOT'].'/bitrix/wizards/nsandrey/empty_install/site/template/', $_SERVER['DOCUMENT_ROOT'].'/bitrix/templates/'.$arVars['templateDir'].'/', true, true, false); - $templ_desc = file_get_contents($_SERVER['DOCUMENT_ROOT'].'/bitrix/templates/'.$arVars['templateDir'].'/description.php'); - $templ_desc = strtr($templ_desc, array('#TEMPLATE_NAME#' => $arVars['templateName'], '#TEMPLATE_DESCRIPTION#' => $arVars['templateDescription'])); - file_put_contents($_SERVER['DOCUMENT_ROOT'].'/bitrix/templates/'.$arVars['templateDir'].'/description.php', $templ_desc); - break; - case 1: - //�������� � ����������� ������ - CopyDirFiles($_SERVER['DOCUMENT_ROOT'].'/bitrix/wizards/nsandrey/empty_install/site/public/'.LANGUAGE_ID.'/', $_SERVER['DOCUMENT_ROOT'].'/', true, true, false); - $site_meta = file_get_contents($_SERVER['DOCUMENT_ROOT'].'/.section.php'); - $site_meta = strtr($site_meta, array('#SITE_TITLE#' => $arVars['siteMetaTitle'], '#SITE_DESCRIPTION#' => $arVars['siteMetaDescription'], '#SITE_KEYWORDS#' => $arVars['siteMetaKeywords'])); - file_put_contents($_SERVER['DOCUMENT_ROOT'].'/.section.php', $site_meta); - $obSite = new CSite; - $obSite->Update(SITE_ID, array('NAME' => $arVars['siteName'], 'TEMPLATE' => array(array('CONDITION' => '', 'SORT' => 1, 'TEMPLATE' => $arVars['templateDir'])))); - break; - default: - ob_start(); - if(@file_exists($_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/'.$install_steps[$currentStep]['module'][1].'/install/index.php')) - { - include_once($_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/'.$install_steps[$currentStep]['module'][1].'/install/index.php'); - - register_shutdown_function('on_shutdown', $install_steps, $currentStep); - - $module = new $install_steps[$currentStep]['module'][1]; - - global $step; - $_REQUEST['sessid'] = bitrix_sessid(); - if($install_steps[$currentStep]['module'][1] == 'wiki' || $install_steps[$currentStep]['module'][1] == 'photogallery') - $_REQUEST['step'] = $step = 3; - else - $_REQUEST['step'] = $step = 2; - - if($install_steps[$currentStep]['module'][0] == 'install' && !$module->IsInstalled()) - $module->DoInstall(); - elseif($install_steps[$currentStep]['module'][0] == 'uninstall' && $module->IsInstalled()) - $module->DoUninstall(); - } - ob_end_clean(); - break; - } - - if(!isset($install_steps[$currentStep + 1])) - $response = "window.ajaxForm.StopAjax(); window.ajaxForm.SetStatus('100'); window.ajaxForm.Post('".($currentStep + 1)."', 'skip', '".($currentStep < 2 ? $install_steps[$currentStep] : $install_steps[$currentStep]['status'])."');"; - else - { - $progress = round($currentStep / sizeof($install_steps) * 100); - $response = "window.ajaxForm.SetStatus('".$progress."'); window.ajaxForm.Post('".($currentStep + 1)."', 'skip', '".($currentStep < 2 ? $install_steps[$currentStep] : $install_steps[$currentStep]['status'])."');"; - } - die("[response]".$response."[/response]"); - } - - function ShowStep() - { - $wizard =& $this->GetWizard(); - - $this->content .= ' - - - - - - - - -
-
- 		 0%
-
-
- - - - - -
'.GetMessage("WIZARD_WAIT_WINDOW_TEXT").'
-


- - '.$this->ShowHiddenField("nextStep", $firstService).' - '.$this->ShowHiddenField("nextStepStage", $stage).' - '; - - $formName = $wizard->GetFormName(); - $NextStepVarName = $wizard->GetRealName("nextStep"); - - $this->content .= ' - '; - } -} - -class SuccessStep extends CWizardStep -{ - function InitStep() - { - $wizard =& $this->GetWizard(); - $wizard->solutionName = 'empty'; - - $this->SetStepID('success'); - $this->SetTitle(GetMessage('WIZ_FINISH')); - $this->SetNextStep('success'); - $this->SetNextCaption(GetMessage('WIZ_GO')); - } - - function ShowStep() - { - CopyDirFiles($_SERVER['DOCUMENT_ROOT'].'/_index.php', $_SERVER['DOCUMENT_ROOT'].'/index.php', true, true, true); - bx_accelerator_reset(); - } -} - -?>