Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 2031) +++ branches/2.8.x/CHANGELOG (revision 2032) @@ -11,6 +11,8 @@ ! = Update/Change =============================================================================== +16 Dec-2013 Build 2032 Dietmar Woellbrink (Luisehahne) +! /modules/droplets/example/ update some droplets and remove the old ones 15 Dec-2013 Build 2031 Dietmar Woellbrink (Luisehahne) # /search/search.php:: trim() parameter (Tks to evaki) # /search/search_mod.php:: check for undefined users index Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 2031) +++ branches/2.8.x/wb/admin/interface/version.php (revision 2032) @@ -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.3'); -if(!defined('REVISION')) define('REVISION', '2031'); +if(!defined('REVISION')) define('REVISION', '2032'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/modules/droplets/example/LoginBox.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/LoginBox.php (revision 2031) +++ branches/2.8.x/wb/modules/droplets/example/LoginBox.php (nonexistent) @@ -1,72 +0,0 @@ -//:Puts a Login / Logout box on your page. -//:Use: [[LoginBox?redirect=url]] -//:Absolute or relative url possible -//:Remember to enable frontend login in your website settings. - - global $page_id,$TEXT, $MENU, $HEADING; - - $return_value = '
'."\n"; - $return_admin = ' '; - $wb = new admin ('Start', 'start', false, false); -// Get redirect - $redirect_url = ((isset($_SESSION['HTTP_REFERER']) && $_SESSION['HTTP_REFERER'] != '') ? $_SESSION['HTTP_REFERER'] : WB_URL ); - $redirect_url = (isset($redirect) && ($redirect!='') ? $redirect : $redirect_url); - - if ( ( FRONTEND_LOGIN == 'enabled') && - ( VISIBILITY != 'private') && - ( $wb->get_session('USER_ID') == '') ) - { - $return_value .= '
'."\n"; - $return_value .= ''."\n"; - - $return_value .= '
'."\n"; - $return_value .= '

'.$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"; - - } elseif( (FRONTEND_LOGIN == true) && - (is_numeric($wb->get_session('USER_ID'))) ) - { - $return_value .= '
'."\n"; - $return_value .= '
'."\n"; - $return_value .= '

'.$TEXT["LOGGED_IN"].'

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

'."\n"; - $return_value .= '
    '."\n"; - if ($wb->ami_group_member('1')||$wb->get_permission('preferences')) - { - $return_value .= '
  • '.$MENU['PREFERENCES'].'
    • '."\n"; - } - - //change ot the group that should get special links - if ($wb->ami_group_member('1')||$wb->get_permission('admintools')) - { - $return_admin .= '
  • '.$TEXT["ADMINISTRATION"].'
    • '."\n"; - //you can add more links for your users like userpage, lastchangedpages or something - $return_value .= $return_admin; - } - //change ot the group that should get special links - if( $wb->get_permission('pages_modify') && $wb->get_page_permission( PAGE_ID ) ) - { - $return_value .= '
  • '.$HEADING['MODIFY_PAGE'].'
    • '."\n"; - } - $return_value .= '
  •  '.'
    • '."\n"; - $return_value .= '
'."\n"; - $return_value .= '
'."\n"; - $return_value .= '
'."\n"; - } - $return_value .= '
'."\n"; - return $return_value; Property changes on: branches/2.8.x/wb/modules/droplets/example/LoginBox.php ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: branches/2.8.x/wb/modules/droplets/example/ShowRandomWysiwyg.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/ShowRandomWysiwyg.php (revision 2031) +++ branches/2.8.x/wb/modules/droplets/example/ShowRandomWysiwyg.php (nonexistent) @@ -1,23 +0,0 @@ -//:Randomly display one WYSIWYG section from a given list -//:Use [[ShowRandomWysiwyg?section=10,12,15,20]] possible Delimiters: [ ,;:|-+#/ ] -global $database, $section_id; -$content = ''; -if (isset($section)) { - if( preg_match('/^[0-9]+(?:\s*[\,\|\-\;\:\+\#\/]\s*[0-9]+\s*)*$/', $section)) { - if (is_readable(WB_PATH.'/modules/wysiwyg/view.php')) { - // if valid arguments given and module wysiwyg is installed - // split and sanitize arguments - $aSections = preg_split('/[\s\,\|\-\;\:\+\#\/]+/', $section); - $iOldSectionId = intval($section_id); // save old SectionID - $section_id = $aSections[array_rand($aSections)]; // get random element - ob_start(); // generate output by wysiwyg module - $sectionAnchor = (defined('SEC_ANCHOR') && SEC_ANCHOR!='') ? SEC_ANCHOR.$section_id : 'section_'.$section_id; - echo PHP_EOL.'
'.PHP_EOL; - require(WB_PATH.'/modules/wysiwyg/view.php'); - echo PHP_EOL.'
'.PHP_EOL; - $content = ob_get_clean(); - $section_id = $iOldSectionId; // restore old SectionId - } - } -} -return $content; \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/droplets/example/ShowRandomWysiwyg.php ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/modules/droplets/example/ShowWysiwyg.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/ShowWysiwyg.php (revision 2031) +++ branches/2.8.x/wb/modules/droplets/example/ShowWysiwyg.php (nonexistent) @@ -1,20 +0,0 @@ -//:Display one defined WYSIWYG section -//:Use [[ShowWysiwyg?section=10]] -global $database, $section_id, $module; -$content = ''; -$section = isset($section) ? intval($section) : 0; -if ($section) { - if (is_readable(WB_PATH.'/modules/wysiwyg/view.php')) { - // if valid section is given and module wysiwyg is installed - $iOldSectionId = intval($section_id); // save old SectionID - $section_id = $section; - ob_start(); // generate output by regulary wysiwyg module - $sectionAnchor = (defined('SEC_ANCHOR') && SEC_ANCHOR!='') ? SEC_ANCHOR.$section_id : 'section_'.$section_id; - echo PHP_EOL.'
'.PHP_EOL; - require(WB_PATH.'/modules/wysiwyg/view.php'); - echo PHP_EOL.'
'.PHP_EOL; - $content = ob_get_clean(); - $section_id = $iOldSectionId; // restore old SectionId - } -} -return $content; \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/droplets/example/ShowWysiwyg.php ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/modules/droplets/example/SectionPicker.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/SectionPicker.php (revision 2031) +++ branches/2.8.x/wb/modules/droplets/example/SectionPicker.php (nonexistent) @@ -1,32 +0,0 @@ -//: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 Property changes on: branches/2.8.x/wb/modules/droplets/example/SectionPicker.php ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Date Author Id Revision HeadURL \ 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 (nonexistent) +++ branches/2.8.x/wb/modules/droplets/example/iLoginBox.php (revision 2032) @@ -0,0 +1,73 @@ +//:Puts a Login / Logout box on your page. +//:Use: [[iLoginBox?redirect=url]] +//:Absolute or relative url possible +//:Remember to enable frontend login in your website settings. + + $mLang = Translate::getinstance(); + if( !(isset($wb) && is_object($wb)) ) { $wb = new frontend(); } + if( !(isset($admin) && is_object($admin)) ) { $admin= new admin('##skip##'); } + + $return_value = '
'."\n"; + $return_admin = ' '; +// Get redirect + $redirect_url = ((isset($_SESSION['HTTP_REFERER']) && $_SESSION['HTTP_REFERER'] != '') ? $_SESSION['HTTP_REFERER'] : WB_URL ); + $redirect_url = (isset($redirect) && ($redirect!='') ? $redirect : $redirect_url); + + if ( ( FRONTEND_LOGIN == 'enabled') && + ( VISIBILITY != 'private') && + ( $wb->get_session('USER_ID') == '') ) + { + $return_value .= '
'."\n"; + $return_value .= ''."\n"; + + $return_value .= '
'."\n"; + $return_value .= '

'.$mLang->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"; + + } elseif( (FRONTEND_LOGIN == true) && + (is_numeric($wb->get_session('USER_ID'))) ) + { + $return_value .= ''."\n"; + } + $return_value .= '
'."\n"; + return $return_value; Index: branches/2.8.x/wb/modules/droplets/example/iShowWysiwyg.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/iShowWysiwyg.php (nonexistent) +++ branches/2.8.x/wb/modules/droplets/example/iShowWysiwyg.php (revision 2032) @@ -0,0 +1,20 @@ +//:Display one defined WYSIWYG section +//:Use [[iShowWysiwyg?section=10]] +global $database, $section_id, $module; +$content = ''; +$section = isset($section) ? intval($section) : 0; +if ($section) { + if (is_readable(WB_PATH.'/modules/wysiwyg/view.php')) { + // if valid section is given and module wysiwyg is installed + $iOldSectionId = intval($section_id); // save old SectionID + $section_id = $section; + ob_start(); // generate output by regulary wysiwyg module + $sectionAnchor = (defined('SEC_ANCHOR') && SEC_ANCHOR!='') ? SEC_ANCHOR : 'Sec'; + echo PHP_EOL.'
'.PHP_EOL; + require(WB_PATH.'/modules/wysiwyg/view.php'); + echo PHP_EOL.'
'.PHP_EOL; + $content = ob_get_clean(); + $section_id = $iOldSectionId; // restore old SectionId + } +} +return $content; Index: branches/2.8.x/wb/modules/droplets/example/iShowRandomWysiwyg.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/iShowRandomWysiwyg.php (nonexistent) +++ branches/2.8.x/wb/modules/droplets/example/iShowRandomWysiwyg.php (revision 2032) @@ -0,0 +1,23 @@ +//:Randomly display one WYSIWYG section from a given list +//:Use [[iShowRandomWysiwyg?section=10,12,15,20]] possible Delimiters: [ ,;:|-+#/ ] +global $database, $section_id,$module; +$content = ''; +if (isset($section)) { + if( preg_match('/^[0-9]+(?:\s*[\,\|\-\;\:\+\#\/]\s*[0-9]+\s*)*$/', $section)) { + if (is_readable(WB_PATH.'/modules/wysiwyg/view.php')) { + // if valid arguments given and module wysiwyg is installed + // split and sanitize arguments + $aSections = preg_split('/[\s\,\|\-\;\:\+\#\/]+/', $section); + $iOldSectionId = intval($section_id); // save old SectionID + $section_id = $aSections[array_rand($aSections)]; // get random element + ob_start(); // generate output by wysiwyg module + $sectionAnchor = (defined('SEC_ANCHOR') && SEC_ANCHOR!='') ? SEC_ANCHOR : 'Sec'; + echo PHP_EOL.'
'.PHP_EOL; + require(WB_PATH.'/modules/wysiwyg/view.php'); + echo PHP_EOL.'
'.PHP_EOL; + $content = ob_get_clean(); + $section_id = $iOldSectionId; // restore old SectionId + } + } +} +return $content; Index: branches/2.8.x/wb/modules/droplets/example/iSectionPicker.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/iSectionPicker.php (nonexistent) +++ branches/2.8.x/wb/modules/droplets/example/iSectionPicker.php (revision 2032) @@ -0,0 +1,32 @@ +//: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;