jon48 / webtrees-lib

src/Webtrees/Functions/Functions.php

Indentation +24 added lines, -24 removed lines

@@ -129,11 +129,11 @@ 
 	 * @return string Encryption key
 	 */
 	protected static function getBase64EncryptionKey() {	    
-	    $key = 'STANDARDKEYIFNOSERVER';
-	    if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
-	        $key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+		$key = 'STANDARDKEYIFNOSERVER';
+		if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
+			$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
 	    
-	    return $key;
+		return $key;
 	}
 	
 	/**	  
@@ -172,20 +172,20 @@ 
 			throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
 		
 		if (mb_strlen($encrypted, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES))
-		    throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
+			throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
 
-	    $nonce = mb_substr($encrypted, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
-	    $ciphertext = mb_substr($encrypted, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
+		$nonce = mb_substr($encrypted, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
+		$ciphertext = mb_substr($encrypted, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
         
-        $decrypted = sodium_crypto_secretbox_open($ciphertext, $nonce, self::getBase64EncryptionKey());
+		$decrypted = sodium_crypto_secretbox_open($ciphertext, $nonce, self::getBase64EncryptionKey());
 		
-        if($decrypted === false) {
-            throw new \InvalidArgumentException('The message has been tampered with in transit.');
-        }
+		if($decrypted === false) {
+			throw new \InvalidArgumentException('The message has been tampered with in transit.');
+		}
         
-        //sodium_memzero($encrypted);   // Requires PHP 7.2
+		//sodium_memzero($encrypted);   // Requires PHP 7.2
         
-        return $decrypted;
+		return $decrypted;
 	}
 	
 	/**
@@ -196,7 +196,7 @@ 
 	 */
 	public static function encodeFileSystemToUtf8($string){
 		if (strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') {
-		    return iconv('cp1252', 'utf-8//IGNORE',$string);
+			return iconv('cp1252', 'utf-8//IGNORE',$string);
 		}
 		return $string;
 	}
@@ -261,20 +261,20 @@ 
 	 * @return boolean|string Is supported?
 	 */
 	public static function isImageTypeSupported($reqtype) {
-	    $supportByGD = array('jpg'=>'jpeg', 'jpeg'=>'jpeg', 'gif'=>'gif', 'png'=>'png');
-	    $reqtype = strtolower($reqtype);
+		$supportByGD = array('jpg'=>'jpeg', 'jpeg'=>'jpeg', 'gif'=>'gif', 'png'=>'png');
+		$reqtype = strtolower($reqtype);
 	
-	    if (empty($supportByGD[$reqtype])) {
-	        return false;
-	    }
+		if (empty($supportByGD[$reqtype])) {
+			return false;
+		}
 	
-	    $type = $supportByGD[$reqtype];
+		$type = $supportByGD[$reqtype];
 	
-	    if (function_exists('imagecreatefrom'.$type) && function_exists('image'.$type)) {
-	        return $type;
-	    }
+		if (function_exists('imagecreatefrom'.$type) && function_exists('image'.$type)) {
+			return $type;
+		}
 	
-	    return false;
+		return false;
 	}
 		
 }

src/Webtrees/Module/CertificatesModule.php

Indentation +182 added lines, -182 removed lines

@@ -31,147 +31,147 @@ 
  * Certificates Module.
  */
 class CertificatesModule 
-    extends AbstractModule 
-    implements HookSubscriberInterface, ModuleConfigInterface, ModuleMenuItemInterface, FactSourceTextExtenderInterface, CustomSimpleTagManagerInterface, DependentInterface
+	extends AbstractModule 
+	implements HookSubscriberInterface, ModuleConfigInterface, ModuleMenuItemInterface, FactSourceTextExtenderInterface, CustomSimpleTagManagerInterface, DependentInterface
 {
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
         
-    /**
-     * Provider for Certificates
-     * @var CertificateProviderInterface $provider
-     */
-    protected $provider;
+	/**
+	 * Provider for Certificates
+	 * @var CertificateProviderInterface $provider
+	 */
+	protected $provider;
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “Certificates” module */ I18N::translate('Certificates');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “Certificates” module */ I18N::translate('Certificates');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “Certificates” module */ I18N::translate('Display and edition of certificates linked to sources.');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “Certificates” module */ I18N::translate('Display and edition of certificates linked to sources.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
-     */
-    public function validatePrerequisites() {
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
+	 */
+	public function validatePrerequisites() {
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
-     */
-    public function getSubscribedHooks() {
-        return array(
-            'hFactSourcePrepend' => 50,
-            'hGetExpectedTags' => 50,
-            'hHtmlSimpleTagDisplay#_ACT' => 50,
-            'hHtmlSimpleTagEditor#_ACT'	=> 50,
-            'hAddSimpleTag#SOUR'	=> 50,
-            'hHasHelpTextTag#_ACT'	=> 50,
-            'hGetHelpTextTag#_ACT'	=> 50
-        );
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
+	 */
+	public function getSubscribedHooks() {
+		return array(
+			'hFactSourcePrepend' => 50,
+			'hGetExpectedTags' => 50,
+			'hHtmlSimpleTagDisplay#_ACT' => 50,
+			'hHtmlSimpleTagEditor#_ACT'	=> 50,
+			'hAddSimpleTag#SOUR'	=> 50,
+			'hHasHelpTextTag#_ACT'	=> 50,
+			'hGetHelpTextTag#_ACT'	=> 50
+		);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()
-     */
-    public function getMenu(Tree $tree, $reference = null) {
-        $tree_url = $tree ? $tree->getNameUrl() : '';
-        return new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Certificate@listAll&ged=' . $tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()
+	 */
+	public function getMenu(Tree $tree, $reference = null) {
+		$tree_url = $tree ? $tree->getNameUrl() : '';
+		return new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Certificate@listAll&ged=' . $tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourcePrepend()
-     */
-    public function hFactSourcePrepend($srec) {
-        $wt_tree = Globals::getTree();
-        $html='';
-        $sid=null;
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourcePrepend()
+	 */
+	public function hFactSourcePrepend($srec) {
+		$wt_tree = Globals::getTree();
+		$html='';
+		$sid=null;
         
-        if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($wt_tree)){
-            if (!$srec || strlen($srec) == 0) return $html;
+		if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($wt_tree)){
+			if (!$srec || strlen($srec) == 0) return $html;
             	
-            $certificate = null;
-            $subrecords = explode("\n", $srec);
-            $levelSOUR = substr($subrecords[0], 0, 1);
-            $match = null;
-            if (preg_match('~^'.$levelSOUR.' SOUR @('.WT_REGEX_XREF.')@$~', $subrecords[0], $match)) {
-                $sid=$match[1];
-            };
-            $nb_subrecords = count($subrecords);
-            for ($i=0; $i < $nb_subrecords; $i++) {
-                $subrecords[$i] = trim($subrecords[$i]);
-                $tag = substr($subrecords[$i], 2, 4);
-                $text = substr($subrecords[$i], 7);
-                if($tag == '_ACT') $certificate= new Certificate($text, $wt_tree, $this->getProvider());
-            }
+			$certificate = null;
+			$subrecords = explode("\n", $srec);
+			$levelSOUR = substr($subrecords[0], 0, 1);
+			$match = null;
+			if (preg_match('~^'.$levelSOUR.' SOUR @('.WT_REGEX_XREF.')@$~', $subrecords[0], $match)) {
+				$sid=$match[1];
+			};
+			$nb_subrecords = count($subrecords);
+			for ($i=0; $i < $nb_subrecords; $i++) {
+				$subrecords[$i] = trim($subrecords[$i]);
+				$tag = substr($subrecords[$i], 2, 4);
+				$text = substr($subrecords[$i], 7);
+				if($tag == '_ACT') $certificate= new Certificate($text, $wt_tree, $this->getProvider());
+			}
             	
-            if($certificate && $certificate->canShow())
-                $html = $this->getDisplay_ACT($certificate, $sid);
+			if($certificate && $certificate->canShow())
+				$html = $this->getDisplay_ACT($certificate, $sid);
                 	
-        }
-        return $html;
-    }
+		}
+		return $html;
+	}
    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourceAppend()
-     */
-    public function hFactSourceAppend($srec) { }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourceAppend()
+	 */
+	public function hFactSourceAppend($srec) { }
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetExpectedTags()
-     */
-    public function hGetExpectedTags() {
-        return array('SOUR' => '_ACT');
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetExpectedTags()
+	 */
+	public function hGetExpectedTags() {
+		return array('SOUR' => '_ACT');
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagDisplay()
-     */
-    public function hHtmlSimpleTagDisplay($tag, $value, $context = null, $contextid = null) {
-        $html = '';
-        switch($tag){
-            case '_ACT':
-                if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
-                break;
-        }
-        return $html;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagDisplay()
+	 */
+	public function hHtmlSimpleTagDisplay($tag, $value, $context = null, $contextid = null) {
+		$html = '';
+		switch($tag){
+			case '_ACT':
+				if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
+				break;
+		}
+		return $html;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagEditor()
-     */
-    public function hHtmlSimpleTagEditor($tag, $value = null, $element_id = '', $element_name = '', $context = null, $contextid = null) {        
-        $html = '';
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagEditor()
+	 */
+	public function hHtmlSimpleTagEditor($tag, $value = null, $element_id = '', $element_name = '', $context = null, $contextid = null) {        
+		$html = '';
 		
 		switch($tag){
 			case '_ACT':
@@ -199,75 +199,75 @@ 
 		}
 		
 		return $html;
-    }
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hAddSimpleTag()
-     */
-    public function hAddSimpleTag($context, $level) {
-        switch($context){
-            case 'SOUR':
-                FunctionsEdit::addSimpleTag($level.' _ACT');
-                break;
-        }
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hAddSimpleTag()
+	 */
+	public function hAddSimpleTag($context, $level) {
+		switch($context){
+			case 'SOUR':
+				FunctionsEdit::addSimpleTag($level.' _ACT');
+				break;
+		}
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHasHelpTextTag()
-     */
-    public function hHasHelpTextTag($tag) {
-        switch($tag){
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHasHelpTextTag()
+	 */
+	public function hHasHelpTextTag($tag) {
+		switch($tag){
 			case '_ACT':
 				return true;
 		}
 		return false;
-    }
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetHelpTextTag()
-     */
-    public function hGetHelpTextTag($tag) {
-        switch($tag){
-            case '_ACT':
-                return array(
-                I18N::translate('Certificate'),
-                '<p>'.I18N::translate('Path to a certificate linked to a source reference.').'</p>');
-            default:
-                return null;
-        }
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetHelpTextTag()
+	 */
+	public function hGetHelpTextTag($tag) {
+		switch($tag){
+			case '_ACT':
+				return array(
+				I18N::translate('Certificate'),
+				'<p>'.I18N::translate('Path to a certificate linked to a source reference.').'</p>');
+			default:
+				return null;
+		}
+	}
 
-    /**
-     * Returns the default Certificate File Provider, as configured in the module
-     *
-     * @return \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface
-     */
-    public function getProvider() {
-        if(!$this->provider) {
-            $root_path = $this->getSetting('MAJ_CERT_ROOTDIR', 'certificates/');
-            $this->provider = new CertificateFileProvider($root_path, Globals::getTree());
-        }
-        return $this->provider;
-    }
+	/**
+	 * Returns the default Certificate File Provider, as configured in the module
+	 *
+	 * @return \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface
+	 */
+	public function getProvider() {
+		if(!$this->provider) {
+			$root_path = $this->getSetting('MAJ_CERT_ROOTDIR', 'certificates/');
+			$this->provider = new CertificateFileProvider($root_path, Globals::getTree());
+		}
+		return $this->provider;
+	}
     
     
-    /**
-     * Return the HTML code for custom simple tag _ACT
-     *
-     * @param Certificate $certificatePath Certificate (as per the GEDCOM)
-     * @param string|null $sid Linked Source ID, if it exists
-     */
-    protected function getDisplay_ACT(Certificate $certificate, $sid = null){    
-        $html = '';
-        if($certificate){
-            $certificate->setSource($sid);
-            $html = $certificate->displayImage('icon');
-        }
-        return $html;
-    }
+	/**
+	 * Return the HTML code for custom simple tag _ACT
+	 *
+	 * @param Certificate $certificatePath Certificate (as per the GEDCOM)
+	 * @param string|null $sid Linked Source ID, if it exists
+	 */
+	protected function getDisplay_ACT(Certificate $certificate, $sid = null){    
+		$html = '';
+		if($certificate){
+			$certificate->setSource($sid);
+			$html = $certificate->displayImage('icon');
+		}
+		return $html;
+	}
 
 
 }