Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 2028) +++ branches/2.8.x/CHANGELOG (revision 2029) @@ -11,6 +11,9 @@ ! = Update/Change =============================================================================== +14 Dec-2013 Build 2029 Manuela v.d.Decken(DarkViper) +! initialize.php now blocking PHP-versions <5.3.2 and PHP with magic_quotes enabled +! droplets some new/recoded droplets added, some old ones removed 14 Dec-2013 Build 2028 Dietmar Woellbrink (Luisehahne) # /modules/news/save_posts.php::title rename fix 08 Dec-2013 Build 2027 Manuela v.d.Decken(DarkViper) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 2028) +++ branches/2.8.x/wb/admin/interface/version.php (revision 2029) @@ -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', '2028'); +if(!defined('REVISION')) define('REVISION', '2029'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/initialize.php =================================================================== --- branches/2.8.x/wb/framework/initialize.php (revision 2028) +++ branches/2.8.x/wb/framework/initialize.php (revision 2029) @@ -205,8 +205,16 @@ $starttime = array_sum(explode(" ",microtime())); $iPhpDeclaredClasses = sizeof(get_declared_classes()); $sDbConnectType = 'url'; // depending from class WbDatabase it can be 'url' or 'dsn' +// PHP less then 5.3.2 is prohibited --- + if (version_compare(PHP_VERSION, '5.3.2', '<')) { + $sMsg = '

WebsiteBaker is not able to run with PHP-Version less then 5.3.2!!
' + . 'Please change your PHP-Version to any kind from 5.3.2 and up!
' + . 'If you have problems to solve that, ask your hosting provider for it.
' + . 'The very best solution is the use of PHP-5.4 and up

'; + die($sMsg); + } // disable all kind of magic_quotes in PHP versions before 5.4 --- - if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { + if (function_exists('get_magic_quotes_gpc') && filter_var(get_magic_quotes_gpc(), FILTER_VALIDATE_BOOLEAN)) { $sMsg = '

WebsiteBaker is not able to run with magic_quotes=on!!
' . 'Please change your PHP-ini or add a _htaccess file to switch this setting to off!
' . 'If you have problems to solve that, ask your hosting provider for it.
' @@ -223,7 +231,7 @@ if(!class_exists('WbAutoloader')){ include($sTmp); } - WbAutoloader::doRegister(array(ADMIN_DIRECTORY=>'a', 'modules'=>'m')); + WbAutoloader::doRegister(array(ADMIN_DIRECTORY=>'a', 'modules'=>'m', 'templates'=>'t', 'include'=>'i')); // instantiate and initialize adaptor for temporary registry replacement --- WbAdaptor::getInstance()->getWbConstants(); // register TWIG autoloader --- Index: branches/2.8.x/wb/modules/droplets/example/EditThisPage.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/EditThisPage.php (revision 2028) +++ branches/2.8.x/wb/modules/droplets/example/EditThisPage.php (nonexistent) @@ -1,20 +0,0 @@ -//:Puts a EditThisPage link on your page, if you have the rights -//:Use [[EditThisPage]] - -global $page_id, $HEADING; -$retVal = ''; -$wb = new admin ('Start', 'start', false, false); -if (FRONTEND_LOGIN == true && is_numeric($wb->get_session('USER_ID'))) -{ - - if( $wb->get_permission('pages_modify') && $wb->get_page_permission( PAGE_ID ) ) - { - $retVal .= '

'."\n"; - $retVal .= ''; - $retVal .= ''.$HEADING['MODIFY_PAGE'].''; - $retVal .= ''.$HEADING['MODIFY_PAGE'].''; - $retVal .= ''; - $retVal .= '
'."\n"; - } -} -return $retVal; \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/droplets/example/EditThisPage.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/iEditThisPage.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/iEditThisPage.php (nonexistent) +++ branches/2.8.x/wb/modules/droplets/example/iEditThisPage.php (revision 2029) @@ -0,0 +1,50 @@ +//:Puts Edit-Buttons on every page you have rights for. 1=modify page, 2=modify pagesettings, 4=modify sections, or add values to combine buttons. +//:Use: [[iEditThisPage?show=7]]. You can format the appearance using CSS-class 'div.iEditThisPage' in your basic-css file +// @author: Werner von der Decken + + global $wb, $database, $HEADING; + $returnvalue = ''; + if($wb->is_authenticated() ) + { + $is_admin = false; + $page_id = PAGE_ID == 0 ? $wb->default_page_id : PAGE_ID; + $user_id = $wb->get_user_id(); + $sql = 'SELECT `admin_users`, `admin_groups` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$page_id; + if(($rset = $database->query($sql)) != null) + { + if(($rec = $rset->fetchRow()) != null) + { + $is_admin = ($wb->ami_group_member($rec['admin_groups']) || + ($this->is_group_match($user_id, $rec['admin_users'])) ); + } + } + if($is_admin) + { + $tpl = ''; + $tpl .= '%2$s'; + $show = ((!isset($show) || $show == '') ? 1 : (int)$show); + $show = ($show > 7 ? 7 : (int)$show); + $show = ($show < 2 ? 1 : (int)$show ); + if($show & 1) + { + $returnvalue .= sprintf($tpl, 'modify', $HEADING['MODIFY_PAGE'], 'edit'); + } + $sys_perm = $wb->get_session('SYSTEM_PERMISSIONS'); + if(@is_array($sys_perm)) + { + if(($show & 2) && (array_search('pages_settings', $sys_perm)!==false)) + { + $returnvalue .= sprintf($tpl, 'settings', $HEADING['MODIFY_PAGE_SETTINGS'], 'modify'); + } + if(($show & 4) && (array_search('pages_modify', $sys_perm)!==false)) + { + $returnvalue .= sprintf($tpl, 'sections', $HEADING['MANAGE_SECTIONS'], 'sections'); + } + } + if($returnvalue != '') + { + $returnvalue = '
'.$returnvalue.'
'; + } + } + } + return($returnvalue == '' ? true : $returnvalue); Index: branches/2.8.x/wb/modules/droplets/example =================================================================== --- branches/2.8.x/wb/modules/droplets/example (revision 2028) +++ branches/2.8.x/wb/modules/droplets/example (revision 2029) Property changes on: branches/2.8.x/wb/modules/droplets/example ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +newExamples