Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 2091) +++ branches/2.8.x/CHANGELOG (revision 2092) @@ -11,16 +11,22 @@ ! = Update/Change =============================================================================== -20 Jan-2014 Build 2090 Manuela v.d.Decken(DarkViper) +20 Jan-2014 Build 2092 Manuela v.d.Decken(DarkViper) +! several files: remove multiple ;; +! uninstall language deactivated +- droplet: iSectionPicker ++ droplet: SectionPicker +20 Jan-2014 Build 2091 Manuela v.d.Decken(DarkViper) ! several Files: corrected case sensitivity of ::getInstance() +19 Jan-2014 Build 2090 Manuela v.d.Decken(DarkViper) +! UpgradeHelper: added method delTree() ++ templates/WbTheme +! all upgrade/install and all other files needed to change defaults +# modules/MultiLingual/update_keys.php inactive lines of code removed 19 Jan-2014 Build 2089 Manuela v.d.Decken(DarkViper) -! UpgradeHelper: added method delTree() - templates/argos_theme - templates/allcss - templates/wb_theme -+ templates/WbTheme -! all upgrade/install and all other files needed to change defaults -# modules/MultiLingual/update_keys.php inactive lines of code removed 19 Jan-2014 Build 2088 Manuela v.d.Decken(DarkViper) # news/delete_post invalid arguments for AccessFile corrected ! search/search.php read settings optimized Index: branches/2.8.x/wb/admin/skel/themes/htt/__languages.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/__languages.htt (nonexistent) +++ branches/2.8.x/wb/admin/skel/themes/htt/__languages.htt (revision 2092) @@ -0,0 +1,79 @@ + + + + + + + +
{HEADING_CHANGE_TEMPLATE_NOTICE} + {URL_TEMPLATES} + - + {URL_MODULES} + - + {URL_ADVANCED} +
+ +
+{FTAN} +

{HEADING_INSTALL_LANGUAGE}

+ + + + + +
+ +

+ + + {MESSAGE_ADDON_OVERWRITE_NEWER_FILES} + + + 		+

+
+
+
+
+{FTAN} +

{HEADING_UNINSTALL_LANGUAGE}

+ + + + + +
+ + + +
+
+
+
+{FTAN} +

{HEADING_LANGUAGE_DETAILS}

+ + + + + +
+ + + +
+
+
+ Index: branches/2.8.x/wb/admin/skel/themes/htt/languages.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/languages.htt (revision 2091) +++ branches/2.8.x/wb/admin/skel/themes/htt/languages.htt (revision 2092) @@ -36,26 +36,8 @@
-
-{FTAN} -

{HEADING_UNINSTALL_LANGUAGE}

- - - - - -
- - - -
-
-
+ +
{FTAN}

{HEADING_LANGUAGE_DETAILS}

Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 2091) +++ branches/2.8.x/wb/admin/interface/version.php (revision 2092) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.4'); -if(!defined('REVISION')) define('REVISION', '2090'); +if(!defined('REVISION')) define('REVISION', '2092'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/admin/addons/languages/NL.php =================================================================== --- branches/2.8.x/wb/admin/addons/languages/NL.php (revision 2091) +++ branches/2.8.x/wb/admin/addons/languages/NL.php (revision 2092) @@ -64,7 +64,7 @@ $MESSAGE['GENERIC_SECURITY_ACCESS'] = 'Veiligheidsrisico! Toegang geweigerd!'; $MESSAGE['GENERIC_SECURITY_OFFENSE'] = 'Veiligheidsrisico! Data-opslag geweigerd!'; $MESSAGE['GENERIC_UNINSTALLED'] = 'Deïnstallatie voltooid'; -$MESSAGE['GENERIC_UPGRADED'] = 'Upgrade voltooid';; +$MESSAGE['GENERIC_UPGRADED'] = 'Upgrade voltooid'; $MESSAGE['MEDIA_BLANK_NAME'] = 'U heeft geen nieuwe naam opgegeven'; $MESSAGE['MEDIA_CANNOT_DELETE_DIR'] = 'Kan geselecteerde map niet verwijderen'; Index: branches/2.8.x/wb/languages/HU.php =================================================================== --- branches/2.8.x/wb/languages/HU.php (revision 2091) +++ branches/2.8.x/wb/languages/HU.php (revision 2092) @@ -377,7 +377,7 @@ $TEXT['VISIBILITY'] = 'Megjelenés'; $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'Küldàemail'; $TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'Küldàszemély'; -$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Kérlek add meg az alapértelmezett "Küldàemail" címet és a "Küldàszemély" mez-?-?. Ajánlott az alábbi fosználata: <strong>admin@tedomained.hu</strong>. Némely szolgáltató (e.g. <em>mail.com</em>) Visszautasíthatja a leveleket az olyan küldàcímt-?-? mint <@mail.com</em> ez azért van hogy megakadályozzák a SPAM küldést.<br /><br />Az alapértelmezett értékek csak akkor érvényesek,ha nincs más megadva aker-ben. Ha a szervered támogatja <acronym title="Simple mail transfer protocol">SMTP</acronym>protokolt, akkor használhatod ezt az opciót levél küldé;hez.'; +$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Kérlek add meg az alapértelmezett "Küldàemail" címet és a "Küldàszemély" mez-?-?. Ajánlott az alábbi fosználata: <strong>admin@tedomained.hu</strong>. Némely szolgáltató (e.g. <em>mail.com</em>) Visszautasíthatja a leveleket az olyan küldàcímt-?-? mint <@mail.com</em> ez azért van hogy megakadályozzák a SPAM küldést.<br /><br />Az alapértelmezett értékek csak akkor érvényesek,ha nincs más megadva aker-ben. Ha a szervered támogatja <acronym title="Simple mail transfer protocol">SMTP</acronym>protokolt, akkor használhatod ezt az opciót levél küldéhez.'; $TEXT['WBMAILER_FUNCTION'] = 'Mail Rutin'; $TEXT['WBMAILER_NOTICE'] = '<strong>SMTP Mailer Beállítások:</strong><br />Ezek a beállítások csak akkor szükségesek, ha emailt akarsz küldeni <acro="Simple mail transfer protocol">SMTP</acronym> protokollon keresztül. Ha nem tudod az SMTP kiszolgálódat, vagy nem vagy biztos a követleményekben, akkoszer-?-¦en maradj az alap beállításnál: PHP MAIL.'; $TEXT['WBMAILER_PHP'] = 'PHP MAIL'; Index: branches/2.8.x/wb/modules/droplets/example/iSectionPicker.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/iSectionPicker.php (revision 2091) +++ branches/2.8.x/wb/modules/droplets/example/iSectionPicker.php (nonexistent) @@ -1,32 +0,0 @@ -//:Load the view.php from any other section-module, including the frontend.css -//:Use [[iSectionPicker?sid=123]] -global $database, $wb, $section_id,$page_id,$module; -$content = ''; -$sid = isset($sid) ? intval($sid) : 0; -if( $sid ) { - $oldSid = $section_id; // save old sectionID - $sql = 'SELECT `module` FROM `'.TABLE_PREFIX.'sections` '; - $sql .= 'WHERE `section_id`='.$sid; - if (($module = $database->get_one($sql))) { - if (is_readable(WB_PATH.'/modules/'.$module.'/view.php')) { - $_sFrontendCss = '/modules/'.$module.'/frontend.css'; - if(is_readable(WB_PATH.$_sFrontendCss)) { - $_sSearch = preg_quote(WB_URL.'/modules/'.$module.'/frontend.css', '/'); - if(preg_match('/]*?href\s*=\s*\"'.$_sSearch.'\".*?\/>/si', $wb_page_data)) { - $_sFrontendCss = ''; - }else { - $_sFrontendCss = ''; - } - } else { $_sFrontendCss = ''; } - $section_id = $sid; - ob_start(); - $sectionAnchor = (defined('SEC_ANCHOR') && SEC_ANCHOR!='') ? SEC_ANCHOR : 'Sec'; - echo PHP_EOL.'
'.PHP_EOL; - require(WB_PATH.'/modules/'.$module.'/view.php'); - echo PHP_EOL.'
'.PHP_EOL; - $content = $_sFrontendCss.ob_get_clean(); - $section_id = $oldSid; // restore old sectionID - } - } -} -return $content; Property changes on: branches/2.8.x/wb/modules/droplets/example/iSectionPicker.php ___________________________________________________________________ Deleted: svn:keywords ## -1,4 +0,0 ## -Id -Revision -HeadURL -Date \ No newline at end of property Index: branches/2.8.x/wb/modules/droplets/example/iLoginBox.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/iLoginBox.php (revision 2091) +++ branches/2.8.x/wb/modules/droplets/example/iLoginBox.php (revision 2092) @@ -3,7 +3,7 @@ //:Absolute or relative url possible //:Remember to enable frontend login in your website settings. - $mLang = Translate::getinstance(); + $oLang = Translate::getInstance(); if( !(isset($wb) && is_object($wb)) ) { $wb = new frontend(); } if( !(isset($admin) && is_object($admin)) ) { $admin= new admin('##skip##'); } $page_id = PAGE_ID == 0 ? $wb->default_page_id : PAGE_ID; @@ -22,18 +22,18 @@ $return_value .= ''."\n"; $return_value .= '
'."\n"; - $return_value .= '

'.$mLang->TEXT_LOGIN.'

'."\n"; - $return_value .= ''."\n"; + $return_value .= '

'.$oLang->TEXT_LOGIN.'

'."\n"; + $return_value .= ''."\n"; $return_value .= '

'."\n"; - $return_value .= ''."\n"; + $return_value .= ''."\n"; $return_value .= '

'."\n"; - $return_value .= '

'."\n"; + $return_value .= '

'."\n"; $return_value .= ''."\n"; $return_value .= '
'."\n"; @@ -44,19 +44,19 @@ { $return_value .= ''."\n"; $return_value .= '
'."\n"; - $return_value .= '

'.$mLang->TEXT_LOGGED_IN.'

'."\n"; - $return_value .= ''."\n"; - $return_value .= '

'."\n"; + $return_value .= '

'.$oLang->TEXT_LOGGED_IN.'

'."\n"; + $return_value .= ''."\n"; + $return_value .= '

'."\n"; $return_value .= ''."\n"; Index: branches/2.8.x/wb/modules/droplets/example/SectionPicker.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/SectionPicker.php (nonexistent) +++ branches/2.8.x/wb/modules/droplets/example/SectionPicker.php (revision 2092) @@ -0,0 +1,32 @@ +//:Load the view.php from any other section-module, including the frontend.css +//:Use [[SectionPicker?sid=123]] +global $database, $wb, $TEXT, $DGTEXT,$section_id,$page_id; +$content = ''; +$sid = isset($sid) ? intval($sid) : 0; +if( $sid ) { + $oldSid = $section_id; // save old sectionID + $sql = 'SELECT `module` FROM `'.TABLE_PREFIX.'sections` '; + $sql .= 'WHERE `section_id`='.$sid; + if (($module = $database->get_one($sql))) { + if (is_readable(WB_PATH.'/modules/'.$module.'/view.php')) { + $_sFrontendCss = '/modules/'.$module.'/frontend.css'; + if(is_readable(WB_PATH.$_sFrontendCss)) { + $_sSearch = preg_quote(WB_URL.'/modules/'.$module.'/frontend.css', '/'); + if(preg_match('/]*?href\s*=\s*\"'.$_sSearch.'\".*?\/>/si', $wb_page_data)) { + $_sFrontendCss = ''; + }else { + $_sFrontendCss = ''; + } + } else { $_sFrontendCss = ''; } + $section_id = $sid; + ob_start(); + $sectionAnchor = (defined('SEC_ANCHOR') && SEC_ANCHOR!='') ? SEC_ANCHOR.$section_id : 'section_'.$section_id; + echo PHP_EOL.'
'.PHP_EOL; + require(WB_PATH.'/modules/'.$module.'/view.php'); + echo PHP_EOL.'
'.PHP_EOL; + $content = $_sFrontendCss.ob_get_clean(); + $section_id = $oldSid; // restore old sectionID + } + } +} +return $content; \ No newline at end of file