Index: branches/5.2.x/core/admin_templates/groups/groups_edit.tpl =================================================================== diff -u -N -r14630 -r14924 --- branches/5.2.x/core/admin_templates/groups/groups_edit.tpl (.../groups_edit.tpl) (revision 14630) +++ branches/5.2.x/core/admin_templates/groups/groups_edit.tpl (.../groups_edit.tpl) (revision 14924) @@ -80,7 +80,7 @@ - + Index: branches/5.2.x/core/admin_templates/categories/categories_edit.tpl =================================================================== diff -u -N -r14474 -r14924 --- branches/5.2.x/core/admin_templates/categories/categories_edit.tpl (.../categories_edit.tpl) (revision 14474) +++ branches/5.2.x/core/admin_templates/categories/categories_edit.tpl (.../categories_edit.tpl) (revision 14924) @@ -189,7 +189,7 @@ - + Index: branches/5.2.x/core/install/install_data.sql =================================================================== diff -u -N -r14879 -r14924 --- branches/5.2.x/core/install/install_data.sql (.../install_data.sql) (revision 14879) +++ branches/5.2.x/core/install/install_data.sql (.../install_data.sql) (revision 14924) @@ -31,7 +31,7 @@ INSERT INTO ConfigurationValues VALUES(DEFAULT, 'PageHitCounter', '0', 'In-Portal', 'in-portal:configure_advanced', '', '', '', NULL, NULL, 0, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseModRewrite', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_use_modrewrite', 'checkbox', '', '', 10.01, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ModRewriteUrlEnding', '.html', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ModRewriteUrlEnding', 'select', '', '=+||/=+/||.html=+.html', 10.011, 0, 0, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ForceModRewriteUrlEnding', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceModRewriteUrlEnding', 'checkbox', '', NULL, 10.012, 0, 0, 'la_hint_ForceModRewriteUrlEnding'); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ForceModRewriteUrlEnding', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceModRewriteUrlEnding', 'checkbox', '', NULL, 10.012, 0, 0, 'hint:la_config_ForceModRewriteUrlEnding'); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseContentLanguageNegotiation', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseContentLanguageNegotiation', 'checkbox', '', '', 10.013, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'cms_DefaultDesign', '#default_design#', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultDesignTemplate', 'text', NULL, NULL, 10.02, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_error_template', 'text', '', '', 10.03, 0, 0, NULL); @@ -41,7 +41,7 @@ INSERT INTO ConfigurationValues VALUES(DEFAULT, 'CheckStopWords', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_CheckStopWords', 'checkbox', '', '', 10.07, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UseVisitorTracking', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseVisitorTracking', 'checkbox', '', '', 10.08, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'cms_DefaultTrackingCode', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultTrackingCode', 'textarea', NULL, 'COLS=40 ROWS=5', 10.09, 0, 0, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'PerformExactSearch', '1', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_PerformExactSearch', 'checkbox', '', '', '10.10', 0, 0, 'la_hint_PerformExactSearch'); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'PerformExactSearch', '1', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_PerformExactSearch', 'checkbox', '', '', '10.10', 0, 0, 'hint:la_config_PerformExactSearch'); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'CookieSessions', '2', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSession', 'la_prompt_session_management', 'select', NULL, '0=lu_opt_QueryString||1=lu_opt_Cookies||2=lu_opt_AutoDetect', 20.01, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SessionCookieName', 'sid', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSession', 'la_prompt_session_cookie_name', 'text', '', '', 20.02, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SessionCookieDomains', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSession', 'la_config_SessionCookieDomains', 'textarea', '', 'rows="5" cols="40"', 20.021, 0, 0, NULL); Index: branches/5.2.x/core/admin_templates/site_domains/site_domain_edit.tpl =================================================================== diff -u -N -r14244 -r14924 --- branches/5.2.x/core/admin_templates/site_domains/site_domain_edit.tpl (.../site_domain_edit.tpl) (revision 14244) +++ branches/5.2.x/core/admin_templates/site_domains/site_domain_edit.tpl (.../site_domain_edit.tpl) (revision 14924) @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + Index: branches/5.2.x/core/admin_templates/spam_reports/spam_report_edit.tpl =================================================================== diff -u -N -r14789 -r14924 --- branches/5.2.x/core/admin_templates/spam_reports/spam_report_edit.tpl (.../spam_report_edit.tpl) (revision 14789) +++ branches/5.2.x/core/admin_templates/spam_reports/spam_report_edit.tpl (.../spam_report_edit.tpl) (revision 14924) @@ -119,7 +119,7 @@ - + Index: branches/5.2.x/core/install/upgrades.php =================================================================== diff -u -N -r14888 -r14924 --- branches/5.2.x/core/install/upgrades.php (.../upgrades.php) (revision 14888) +++ branches/5.2.x/core/install/upgrades.php (.../upgrades.php) (revision 14924) @@ -1,6 +1,6 @@ transformFieldPhrases(); + $this->moveTranslation('LA_COL_', 'LA_FLD_', 'ColumnTranslation'); } /** - * Merges column and field phrases - * - * @return void - */ - protected function transformFieldPhrases() - { - $sql = 'SELECT * - FROM ' . TABLE_PREFIX . 'Phrase - WHERE PhraseKey LIKE "LA_COL_%"'; - $column_phrases = $this->Conn->Query($sql, 'PhraseKey'); - - $sql = 'SELECT * - FROM ' . TABLE_PREFIX . 'Phrase - WHERE PhraseKey LIKE "LA_FLD_%"'; - $field_phrases = $this->Conn->Query($sql, 'PhraseKey'); - - $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper'); - /* @var $ml_helper kMultiLanguageHelper */ - - $delete_ids = Array (); - $ml_helper->createFields('phrases'); - $languages = $ml_helper->getLanguages(); - - foreach ($column_phrases as $phrase_key => $phrase_info) { - $field_phrase_key = 'LA_FLD_' . substr($phrase_key, 7); - - if ( !isset($field_phrases[$field_phrase_key]) ) { - continue; - } - - $fields_hash = Array (); - - // copy column phrase main translation into field phrase column translation - foreach ($languages as $language_id) { - $fields_hash['l' . $language_id . '_ColumnTranslation'] = $phrase_info['l' . $language_id . '_Translation']; - } - - $delete_ids[] = $phrase_info['PhraseId']; - $this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Phrase', 'PhraseId = ' . $field_phrases[$field_phrase_key]['PhraseId']); - } - - // delete all column phrases, that were absorbed by field phrases - if ( $delete_ids ) { - $sql = 'DELETE FROM ' . TABLE_PREFIX . 'Phrase - WHERE PhraseId IN (' . implode(',', $delete_ids) . ')'; - $this->Conn->Query($sql); - - - $sql = 'DELETE FROM ' . TABLE_PREFIX . 'PhraseCache'; - $this->Conn->Query($sql); - } - } - - /** * Update to 5.2.0-B1; Transform list sortings storage * * @param string $mode when called mode {before, after) @@ -1835,7 +1781,9 @@ { if ($mode == 'after') { $this->transformSortings(); - $this->transformFieldPhrases(); // because of "la_col_ItemPrefix" phrase + $this->moveTranslation('LA_COL_', 'LA_FLD_', 'ColumnTranslation'); // because of "la_col_ItemPrefix" phrase + $this->moveTranslation('LA_HINT_', 'LA_FLD_', 'HintTranslation'); + $this->moveTranslation('LA_HINT_', 'LA_CONFIG_', 'HintTranslation'); $this->createPageRevisions(); } } @@ -1898,6 +1846,72 @@ } } + /** + * Merges several phrases into one (e.g. la_col_ + la_hint_ into designated columns of la_fld_ phrases) + * + * @param string $source_prefix + * @param string $target_prefix + * @param string $db_column + * @return void + * @access protected + */ + public function moveTranslation($source_prefix, $target_prefix, $db_column) + { + $source_phrases = $this->getPhrasesByMask($source_prefix . '%'); + $target_phrases = $this->getPhrasesByMask($target_prefix . '%'); + + $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper'); + /* @var $ml_helper kMultiLanguageHelper */ + + $delete_ids = Array (); + $ml_helper->createFields('phrases'); + $languages = $ml_helper->getLanguages(); + + foreach ($source_phrases as $phrase_key => $phrase_info) { + $target_phrase_key = $target_prefix . substr($phrase_key, strlen($source_prefix)); + + if ( !isset($target_phrases[$target_phrase_key]) ) { + continue; + } + + $fields_hash = Array (); + + // copy column phrase main translation into field phrase column translation + foreach ($languages as $language_id) { + $fields_hash['l' . $language_id . '_' . $db_column] = $phrase_info['l' . $language_id . '_Translation']; + } + + $delete_ids[] = $phrase_info['PhraseId']; + $this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Phrase', 'PhraseId = ' . $target_phrases[$target_phrase_key]['PhraseId']); + } + + // delete all column phrases, that were absorbed by field phrases + if ( $delete_ids ) { + $sql = 'DELETE FROM ' . TABLE_PREFIX . 'Phrase + WHERE PhraseId IN (' . implode(',', $delete_ids) . ')'; + $this->Conn->Query($sql); + + $sql = 'DELETE FROM ' . TABLE_PREFIX . 'PhraseCache'; + $this->Conn->Query($sql); + } + } + + /** + * Returns phrases by mask + * + * @param string $mask + * @return Array + * @access protected + */ + protected function getPhrasesByMask($mask) + { + $sql = 'SELECT * + FROM ' . TABLE_PREFIX . 'Phrase + WHERE PhraseKey LIKE ' . $this->Conn->qstr($mask); + + return $this->Conn->Query($sql, 'PhraseKey'); + } + protected function createPageRevisions() { $sql = 'SELECT DISTINCT PageId Index: branches/5.2.x/core/admin_templates/regional/languages_export.tpl =================================================================== diff -u -N -r14585 -r14924 --- branches/5.2.x/core/admin_templates/regional/languages_export.tpl (.../languages_export.tpl) (revision 14585) +++ branches/5.2.x/core/admin_templates/regional/languages_export.tpl (.../languages_export.tpl) (revision 14924) @@ -106,8 +106,8 @@ - - + + Index: branches/5.2.x/core/install/upgrades.sql =================================================================== diff -u -N -r14892 -r14924 --- branches/5.2.x/core/install/upgrades.sql (.../upgrades.sql) (revision 14892) +++ branches/5.2.x/core/install/upgrades.sql (.../upgrades.sql) (revision 14924) @@ -2425,3 +2425,7 @@ KEY ItemPrefix (ItemPrefix), KEY Enabled (Enabled) ); + +UPDATE ConfigurationValues +SET HintLabel = CONCAT('hint:', Prompt) +WHERE VariableName IN ('ForceModRewriteUrlEnding', 'PerformExactSearch'); \ No newline at end of file Index: branches/5.2.x/core/admin_templates/users/admins_edit.tpl =================================================================== diff -u -N -r14726 -r14924 --- branches/5.2.x/core/admin_templates/users/admins_edit.tpl (.../admins_edit.tpl) (revision 14726) +++ branches/5.2.x/core/admin_templates/users/admins_edit.tpl (.../admins_edit.tpl) (revision 14924) @@ -80,7 +80,7 @@ - +
', this.href);">
Index: branches/5.2.x/core/admin_templates/users/users_edit.tpl =================================================================== diff -u -N -r14726 -r14924 --- branches/5.2.x/core/admin_templates/users/users_edit.tpl (.../users_edit.tpl) (revision 14726) +++ branches/5.2.x/core/admin_templates/users/users_edit.tpl (.../users_edit.tpl) (revision 14924) @@ -92,7 +92,7 @@ - + Index: branches/5.2.x/core/install/english.lang =================================================================== diff -u -N -r14879 -r14924 --- branches/5.2.x/core/install/english.lang (.../english.lang) (revision 14879) +++ branches/5.2.x/core/install/english.lang (.../english.lang) (revision 14924) @@ -157,7 +157,7 @@ RmlsZW5hbWUgU3BlY2lhbCBDaGFyIFJlcGxhY2VtZW50 Rmlyc3QgRGF5IE9mIFdlZWs= QWx3YXlzIHVzZSBJbWFnZU1hZ2ljayB0byByZXNpemUgaW1hZ2Vz - Rm9yY2UgUmVkaXJlY3QgdG8gU2VsZWN0ZWQgVVJMIEVuZGluZw== + Rm9yY2UgUmVkaXJlY3QgdG8gU2VsZWN0ZWQgVVJMIEVuZGluZw== UmVkaXJlY3QgdG8gSFRUUCB3aGVuIFNTTCBpcyBub3QgcmVxdWlyZWQ= RnVsbCBpbWFnZSBIZWlnaHQ= RnVsbCBpbWFnZSBXaWR0aA== @@ -173,7 +173,7 @@ VGVtcGxhdGUgZm9yICJJbnN1ZmZpY2llbnQgUGVybWlzc2lvbnMiIEVycm9y R1pJUCBjb21wcmVzc2lvbiBsZXZlbCAwLTk= UGF0aCB0byBXZWJzaXRl - UGVyZm9ybSBFeGFjdCBTZWFyY2g= + UGVyZm9ybSBFeGFjdCBTZWFyY2g= Q29tbWVudHMgcGVyIHBhZ2U= UHJvbW8gUm90YXRpb24gRGVsYXkgKHNlY29uZHMp UHJvbW8gVHJhbnNpdGlvbiBDb250cm9scw== @@ -362,7 +362,7 @@ RmllbGQgTGFiZWw= RGlzcGxheSBzaXRlIG5hbWUgaW4gSGVhZGVy RGlzcGxheSBUbyBQdWJsaWM= - UmFuZ2Ugb2YgSVBz + UmFuZ2Ugb2YgSVBz RG9tYWluIE5hbWU= QXMgUGxhaW4gVGV4dA== RHVyYXRpb24= @@ -383,11 +383,11 @@ RXZlbnQ= RXhwaXJl RXhwb3J0IGNvbHVtbnM= - RXhwb3J0IFNwZWNpZmllZCBFbWFpbCBFdmVudHM= + RXhwb3J0IFNwZWNpZmllZCBFbWFpbCBFdmVudHM= RXhwb3J0IEZpbGVuYW1l RXhwb3J0IGZvcm1hdA== RXhwb3J0IE1vZHVsZXM= - RXhwb3J0IFNwZWNpZmllZCBQaHJhc2Vz + RXhwb3J0IFNwZWNpZmllZCBQaHJhc2Vz RXhwb3J0IFBocmFzZSBUeXBlcw== RXhwb3J0IFByZXNldCBUaXRsZQ== RXhwb3J0IFByZXNldA== @@ -520,7 +520,7 @@ UGFkZGluZyBUb3A= Q3VzdG9tIENhY2hpbmcgS2V5 VGl0bGUgKE9uIFBhZ2Up - Q2FjaGUgRXhwaXJhdGlvbiBpbiBzZWNvbmRz + Q2FjaGUgRXhwaXJhdGlvbiBpbiBzZWNvbmRz VGl0bGUgKE1lbnUgSXRlbSk= U2VjdGlvbiBUaXRsZQ== UGFyZW50IFNlY3Rpb24= @@ -587,7 +587,7 @@ TmFtZQ== U2tpcCBGaXJzdCBSb3c= U29ydCBWYWx1ZXM= - U1NMIEZ1bGwgVVJM + U1NMIEZ1bGwgVVJM U3RhcnQgRGF0ZQ== U3RhdGU= U3RhdGUgQ291bnRyeQ== @@ -651,16 +651,9 @@ SGlkZQ== QWxsIEZpbGVz Q1NWIEZpbGVz - U2luZ2xlIElQLCBJUCByYW5nZSwgU3VibmV0IG9yIGhvc3RuYW1lIHJlY29yZCBwZXIgbGluZSAoZm9ybWF0czogMS4yLjMuNCBvciAxLjIuMy4zMi0xLjIuMy41NCBvciAxLjIuMy4zMi8yNyBvciAxLjIuMy4zMi8yNTUuMjU1LjI1NS4yMjQgb3Igd3d3LmluLXBvcnRhbC5jb20p - U2luZ2xlIEVtYWlsIEV2ZW50IHBlciBsaW5lIChmb3JtYXRzOiBVU0VSLkFERCwgT1JERVIuU1VCTUlUKQ== - U2luZ2xlIFBocmFzZSBMYWJlbCBwZXIgbGluZSAoZm9ybWF0czogbGFfU2FtcGxlTGFiZWwsIGx1X0Zyb250RW5kTGFiZWwp - VXNlciB3aWxsIGJlIGF1dG9tYXRpY2FsbHkgcmVkaXJlY3RlZCB0byB0aGUgc2VsZWN0ZWQgVXJsIEVuZGluZyBpbiBjYXNlIHdoZW4gY3VycmVudCBwYWdlIHVybCBoYXMgYSBkaWZmZXJlbnQgZW5kaW5n SW1hZ2UgRmlsZXM= - SG93IHNvb24gKGluIHNlY29uZHMpIHRoZSBzZWN0aW9uIGNhY2hlIHNob3VsZCBhdXRvLWV4cGlyZSBhZnRlciBpdCdzIGNyZWF0aW9uLiBCeSBkZWZhdWx0IHN5c3RlbSB0ZW5kcyB0byByZWJ1aWxkIHRoZSBjYWNoZSBvbmx5IHdoZW4gaXQncyBwcm9wZXJ0aWVzIG9yIGVsZW1lbnRzIGhhdmUgY2hhbmdlZC4= - U2VhcmNoIGZvciBhbGwgZW50ZXJlZCBrZXl3b3JkcywgaW5zdGVhZCBvZiBhbnkgb25lIG9mIHRoZW0= UE9QMyBTZXJ2ZXIgUG9ydC4gRm9yIGV4LiAiMTEwIiBmb3IgcmVndWxhciBjb25uZWN0aW9uLCAiOTk1IiBmb3Igc2VjdXJlIGNvbm5lY3Rpb24u UE9QMyBTZXJ2ZXIgQWRkcmVzcy4gRm9yIGV4LiB1c2UgInNzbDovL3BvcC5nbWFpbC5jb20iIGZvciBHbWFpbCwgInBvcC5tYWlsLnlhaG9vLmNvbSIgZm9yIFlhaG9vLg== - aHR0cHM6Ly93d3cuZG9tYWluLmNvbS9wYXRo Q2FjaGUgS2V5KHMp PHVsPg0KICA8bGk+RGVsZXRlcyBhbGwgY29tcGlsZWQgdGVtcGxhdGVzIGZyb20gQWRtaW4gQ29uc29sZSBhbmQgRnJvbnQtZW5kIHRoZW1lcy48L2xpPg0KICA8bGk+UmVjb21tZW5kZWQgZm9yIHRoZSBtYWludGVuYW5jZSBwdXJwb3Nlcywgc2luY2UgZG9lcyBub3QgcHJvdmlkZSBhbnkgYWR2YW50YWdlcyBleGNlcHQgZm9yIHRlbXBvcmFyeSBsb3dlcmluZyB1c2FnZSBvZiB0aGUgZGlzayBzcGFjZS4gQWxsIHRlbXBsYXRlcyB3aWxsIGJlIGF1dG9tYXRpY2FsbHkgcmVjb21waWxlZCBhdCB0aGUgdGltZSBvZiB2aXNpdC48L2xpPg0KPC91bD4= ZGF0YWJhc2UgY2FjaGU=