*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
*
* @return $cryptoInstance An instance of this crypto helper class
*/
- public final static function createCryptoHelper () {
+ public static final function createCryptoHelper () {
// Get a new instance
$cryptoInstance = new CryptoHelper();
*
* @return $selfInstance An instance of this crypto helper class
*/
- public final static function getInstance () {
+ public static final function getInstance () {
// Is no instance there?
if (is_null(self::$selfInstance)) {
// Then get a new one
* Encrypt the string with fixed salt
*
* @param $str The unencrypted string
+ * @param $key Optional key, if none provided, a random key will be generated
* @return $encrypted Encrypted string
*/
- public function encryptString ($str) {
+ public function encryptString ($str, $key = null) {
// Encrypt the string through the stream
- $encrypted = $this->cryptoStreamInstance->encryptStream($str);
+ $encrypted = $this->cryptoStreamInstance->encryptStream($str, $key);
// Return the string
return $encrypted;