WB 2.08.x

09 Jul-2013 Build 1930 Werner v.d.Decken(DarkViper)

! implement class Password and activate it

	/**********************************************************

	 *  - Adding password settings to settings table

	 */

	$aDebugMessage[] = "<span>Adding/updating password settings to settings table</span>";

	$cfg = array();

	$cfg['password_crypt_loops'] = (defined('PASSWORD_CRYPT_LOOPS') ? PASSWORD_CRYPT_LOOPS : '12');

	$cfg['password_hash_type'] = (defined('PASSWORD_HASH_TYPES') ? PASSWORD_HASH_TYPES : 'false');

	$cfg['password_length'] = (defined('PASSWORD_LENGTH') ? PASSWORD_LENGTH : '10');

	$cfg['password_use_types'] = (defined('PASSWORD_USE_TYPES') ? PASSWORD_USE_TYPES : (int)0xFFFF);

    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");

	protected $itoa64;

	protected $itoa64BlowFish;

	protected $random_state;

	protected $iteration_count_log2;

	protected $portable_hashes;

		$iType = ($sType === 'SHA256' ? 5 : 6);

		$iIterations = min(max(pow(2, $this->iteration_count_log2), 10000), 999999999);

if(!defined('REVISION')) define('REVISION', '1930');

	$oPass = Password::getInstance();

	if(defined('PASSWORD_CRYPT_LOOPS')) { $oPass->setIteration(PASSWORD_CRYPT_LOOPS); }

	if(defined('PASSWORD_HASH_TYPES'))  { $oPass->setIteration(PASSWORD_HASH_TYPES); }

	include(dirname(dirname(__FILE__)).'/include/phpass/PasswordHash.php');

	const CRYPT_LOOPS_MIN     =  6;  // minimum numbers of loops is 2^6 (64) very quick but unsecure

	const HASH_TYPE_AUTO      = false; // select highest available crypting methode (default)

	/** holds the active singleton instance */

	private static $_oInstance     = null;

	protected $oHashMethods        = null;

	protected $iIterationCountLog2 = self::CRYPT_LOOPS_DEFAULT;

	protected $bPortableHashes     = self::HASH_TYPE_AUTO;

 * constructor

	protected function __construct()

		parent::__construct(self::CRYPT_LOOPS_DEFAULT, self::HASH_TYPE_AUTO);

 * dissable cloning

 */

	private function __clone() {

		;

	}

/**

 * get current instance or create new one

 * @return Password

 */

	public static function getInstance()

	{

		if( is_null(self::$_oInstance) ) {

            $c = __CLASS__;

            self::$_oInstance = new $c;

			self::$_oInstance->setIteration(self::CRYPT_LOOPS_DEFAULT);

			self::$_oInstance->setHashType(self::HASH_TYPE_AUTO);

		}

		return self::$oInstance;

	}

/**

 * set the number of iterations

 * @param int $iIterationCountLog2 number of iterations defined as the exponent to basic 2

 */

	public function setIteration($iIterationCountLog2 = self::CRYPT_LOOPS_DEFAULT)

	{

		$this->iteration_count_log2 = min(max($iIterationCountLog2, self::CRYPT_LOOPS_MIN), self::CRYPT_LOOPS_MAX);

	}

/**

 * set type of hash generation

 * @param bool $bPortableHashes

 * @description HASH_TYPE_AUTO will choose the higest available algorithm to create a hash (default)<br />

 *              Attention: it's possible that high level generated hashes from PHP>=5.3 are not validable under PHP<5.3!!<br />

 *              HASH_TYPE_PORTABLE choose MD5 hashing with salt and n iterations

 */

	public function setHashType($bPortableHashes = self::HASH_TYPE_AUTO)

	{

		if(version_compare('5.3', PHP_VERSION, '<')) {

			$this->portable_hashes = self::HASH_TYPE_PORTABLE;

		}else {

			$this->portable_hashes = (boolean)$bPortableHashes;

		}

	}

/**

/** @todo extend blacklist with additional utf8 codes */

	$sql = 'INSERT INTO `'.TABLE_PREFIX.'settings` (`name`, `value`) VALUES '

	     . '(\'wb_version\', \''.VERSION.'\'), '

	     . '(\'website_title\', \''.$website_title.'\'), '

	     . '(\'website_description\', \'\'), '

	     . '(\'website_keywords\', \'\'), '

	     . '(\'website_header\', \'\'), '

	     . '(\'website_footer\', \'\'), '

	     . '(\'wysiwyg_style\', \'font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px;\'), '

	     . '(\'rename_files_on_upload\', \'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx,js,txt\'), '

	     . '(\'er_level\', \'0\'), '

	     . '(\'default_language\', \''.$default_language.'\'), '

	     . '(\'app_name\', \'wb_'.$session_rand.'\'), '

	     . '(\'sec_anchor\', \'Sec\'), '

	     . '(\'default_timezone\', \''.$default_timezone.'\'), '

	     . '(\'default_date_format\', \'Y-m-d\'), '

	     . '(\'default_time_format\', \'h:i A\'), '

	     . '(\'redirect_timer\', \'1500\'), '

	     . '(\'home_folders\', \'true\'), '

	     . '(\'warn_page_leave\', \'1\'), '

	     . '(\'default_template\', \'round\'), '

	     . '(\'default_theme\', \'wb_theme\'), '

	     . '(\'default_charset\', \'utf-8\'), '

	     . '(\'multiple_menus\', \'true\'), '

	     . '(\'page_level_limit\', \'6\'), '

	     . '(\'intro_page\', \'false\'), '

	     . '(\'page_trash\', \'inline\'), '

	     . '(\'homepage_redirection\', \'false\'), '

	     . '(\'page_languages\', \'true\'), '

	     . '(\'wysiwyg_editor\', \'fckeditor\'), '

	     . '(\'manage_sections\', \'true\'), '

	     . '(\'section_blocks\', \'false\'), '

	     . '(\'smart_login\', \'false\'), '

	     . '(\'frontend_login\', \'false\'), '

	     . '(\'frontend_signup\', \'false\'), '

	     . '(\'search\', \'public\'), '

	     . '(\'page_extension\', \'.php\'), '

	     . '(\'page_spacer\', \'-\'), '

	     . '(\'pages_directory\', \'/pages\'), '

	     . '(\'rename_files_on_upload\', \'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx,js,txt\'), '

	     . '(\'media_directory\', \'/media\'), '

	     . '(\'operating_system\', \''.$operating_system.'\'), '

	     . '(\'string_file_mode\', \''.$file_mode.'\'), '

	     . '(\'string_dir_mode\', \''.$dir_mode.'\'), '

	     . '(\'wbmailer_routine\', \'phpmail\'), '

	     . '(\'server_email\', \''.$admin_email.'\'), '

	     . '(\'wbmailer_default_sendername\', \'WebsiteBaker Mailer\'), '

	     . '(\'wbmailer_smtp_host\', \'\'), '

	     . '(\'wbmailer_smtp_auth\', \'\'), '

	     . '(\'wbmailer_smtp_username\', \'\'), '

	     . '(\'wbmailer_smtp_password\', \'\'), '

	     . '(\'fingerprint_with_ip_octets\', \'2\'), '

	     . '(\'secure_form_module\', \'\'), '

	     . '(\'mediasettings\', \'\'), '

	     . '(\'wb_revision\', \''.REVISION.'\'), '

 	     . '(\'wb_sp\', \''.SP.'\'), '

	     . '(\'page_icon_dir\', \'/templates/*/title_images\'), '

	     . '(\'dev_infos\', \'false\'), '

	     . '(\'groups_updated\', \''.time().'\'), '

	     . '(\'wbmail_signature\', \'\'), '

	     . '(\'confirmed_registration\', \'1\'), '

	     . '(\'page_extendet\', \'true\'), '

	     . '(\'system_locked\', \'0\'), '

	     . '(\'password_crypt_loops\', \'12\'), '

	     . '(\'password_hash_type\', \'false\'), '

	     . '(\'password_length\', \'10\'), '

		 . '(\'password_use_types\', \''.(int)0xFFFF.'\') '

	     . '';

	$full_system_permissions  = 'access,addons,admintools,admintools_view,groups,groups_add,groups_delete,'

	                          . 'groups_modify,groups_view,languages,languages_install,languages_uninstall,'

	                          . 'languages_view,media,media_create,media_delete,media_rename,media_upload,'

	                          . 'media_view,modules,modules_advanced,modules_install,modules_uninstall,'

	                          . 'modules_view,pages,pages_add,pages_add_l0,pages_delete,pages_intro,'

	                          . 'pages_modify,pages_settings,pages_view,preferences,preferences_view,'

	                          . 'settings,settings_advanced,settings_basic,settings_view,templates,'

	                          . 'templates_install,templates_uninstall,templates_view,users,users_add,'

	                          . 'users_delete,users_modify,users_view';

	$sql = 'INSERT INTO `'.TABLE_PREFIX.'groups` '

	     . 'SET `group_id` =1,'

	     .     '`name`=\'Administrators\','

		 .     '`system_permissions`=\''.$full_system_permissions.'\','

		 .     '`module_permissions`=\'\','

		 .     '`template_permissions`=\'\'';

	if(!$database->query($sql)) { set_error($database->get_error()); }