Changeset 3103107

Timestamp:

06/15/2024 01:34:20 PM (19 months ago)

Author:

d3395

Message:

The encryptx template function has been revised so that it accepts arguments again, as in previous versions.

Location:

cryptx

Files:

• tags/3.4.5 (copied) (copied from cryptx/trunk)
• tags/3.4.5/classes/CryptX.php (copied) (copied from cryptx/trunk/classes/CryptX.php) (39 diffs)
• tags/3.4.5/cryptx.php (copied) (copied from cryptx/trunk/cryptx.php) (2 diffs)
• tags/3.4.5/include/admin_presentation.php (copied) (copied from cryptx/trunk/include/admin_presentation.php)
• tags/3.4.5/readme.txt (copied) (copied from cryptx/trunk/readme.txt) (2 diffs)
• trunk/classes/CryptX.php (modified) (39 diffs)
• trunk/cryptx.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)

cryptx/tags/3.4.5/classes/CryptX.php

@@ -5 +5 @@
 class CryptX {
 
-    const NOT_FOUND = false;
-    const MAIL_IDENTIFIER = 'mailto:';
-    const SUBJECT_IDENTIFIER = "?subject=";
-    const INDEX_TO_CHECK = 4;
-    const PATTERN = '/(.*)(">)/i';
-    const ASCII_VALUES_BLACKLIST = ['32', '34', '39', '60', '62', '63', '92', '94', '96', '127'];
+    const NOT_FOUND = false;
+    const MAIL_IDENTIFIER = 'mailto:';
+    const SUBJECT_IDENTIFIER = "?subject=";
+    const INDEX_TO_CHECK = 4;
+    const PATTERN = '/(.*)(">)/i';
+    const ASCII_VALUES_BLACKLIST = [ '32', '34', '39', '60', '62', '63', '92', '94', '96', '127' ];
 
     private static ?CryptX $_instance = null;
     private static array $cryptXOptions = [];
     private static array $defaults = array(
-        'version' => null,
-        'at' => ' [at] ',
-        'dot' => ' [dot] ',
-        'css_id' => '',
-        'css_class' => '',
-        'the_content' => 1,
-        'the_meta_key' => 1,
-        'the_excerpt' => 1,
-        'comment_text' => 1,
-        'widget_text' => 1,
-        'java' => 1,
-        'load_java' => 1,
-        'opt_linktext' => 0,
-        'autolink' => 1,
-        'alt_linktext' => '',
-        'alt_linkimage' => '',
+        'version'              => null,
+        'at'                   => ' [at] ',
+        'dot'                  => ' [dot] ',
+        'css_id'               => '',
+        'css_class'            => '',
+        'the_content'          => 1,
+        'the_meta_key'         => 1,
+        'the_excerpt'          => 1,
+        'comment_text'         => 1,
+        'widget_text'          => 1,
+        'java'                 => 1,
+        'load_java'            => 1,
+        'opt_linktext'         => 0,
+        'autolink'             => 1,
+        'alt_linktext'         => '',
+        'alt_linkimage'        => '',
         'http_linkimage_title' => '',
-        'alt_linkimage_title' => '',
-        'excludedIDs' => '',
-        'metaBox' => 1,
-        'alt_uploadedimage' => '0',
-        'c2i_font' => null,
-        'c2i_fontSize' => 10,
-        'c2i_fontRGB' => '#000000',
-        'echo' => 1,
-        'filter' => array('the_content','the_meta_key','the_excerpt','comment_text','widget_text'),
-        'whiteList' => 'jpeg,jpg,png,gif',
+        'alt_linkimage_title'  => '',
+        'excludedIDs'          => '',
+        'metaBox'              => 1,
+        'alt_uploadedimage'    => '0',
+        'c2i_font'             => null,
+        'c2i_fontSize'         => 10,
+        'c2i_fontRGB'          => '#000000',
+        'echo'                 => 1,
+        'filter'               => array( 'the_content', 'the_meta_key', 'the_excerpt', 'comment_text', 'widget_text' ),
+        'whiteList'            => 'jpeg,jpg,png,gif',
     );
     private static int $imageCounter = 0;
-    private function __construct()
-    {
+
+    private function __construct() {
         self::$cryptXOptions = $this->loadCryptXOptionsWithDefaults();
     }
@@ -58 +58 @@
      * @return CryptX The instance of the CryptX class.
      */
-    public static function getInstance(): CryptX
-    {
-        if ( ! ( self::$_instance instanceof self) ) {
+    public static function getInstance(): CryptX {
+        if ( ! ( self::$_instance instanceof self ) ) {
             self::$_instance = new self();
         }
+
         return self::$_instance;
     }
 
-    function startCryptX(): void {
-        if( isset( self::$cryptXOptions['version'] ) && version_compare(CRYPTX_VERSION, self::$cryptXOptions['version']) > 0 ) {
-            $this->updateCryptXSettings();
-        }
-        foreach(self::$cryptXOptions['filter'] as $filter) {
-            if (@self::$cryptXOptions[$filter]) {
-                $this->addPluginFilters($filter);
-            }
-        }
-        add_action( 'activate_' . CRYPTX_BASENAME, [$this, 'installCryptX' ] );
-        add_action( 'wp_enqueue_scripts', [$this, 'loadJavascriptFiles' ] );
-        if (@self::$cryptXOptions['metaBox']) {
-            add_action('admin_menu', [$this, 'metaBox' ]);
-            add_action('wp_insert_post', [$this, 'addPostIdToExcludedList' ] );
-            add_action('wp_update_post', [$this, 'addPostIdToExcludedList' ] );
-        }
-        add_filter( 'plugin_row_meta', 'rw_cryptx_init_row_meta', 10, 2 );
-        add_filter( 'init', [$this, 'cryptXtinyUrl' ]);
-        add_shortcode( 'cryptx', [$this, 'cryptXShortcode']);
-    }
+    function startCryptX(): void {
+        if ( isset( self::$cryptXOptions['version'] ) && version_compare( CRYPTX_VERSION, self::$cryptXOptions['version'] ) > 0 ) {
+            $this->updateCryptXSettings();
+        }
+        foreach ( self::$cryptXOptions['filter'] as $filter ) {
+            if ( @self::$cryptXOptions[ $filter ] ) {
+                $this->addPluginFilters( $filter );
+            }
+        }
+        add_action( 'activate_' . CRYPTX_BASENAME, [ $this, 'installCryptX' ] );
+        add_action( 'wp_enqueue_scripts', [ $this, 'loadJavascriptFiles' ] );
+        if ( @self::$cryptXOptions['metaBox'] ) {
+            add_action( 'admin_menu', [ $this, 'metaBox' ] );
+            add_action( 'wp_insert_post', [ $this, 'addPostIdToExcludedList' ] );
+            add_action( 'wp_update_post', [ $this, 'addPostIdToExcludedList' ] );
+        }
+        add_filter( 'plugin_row_meta', 'rw_cryptx_init_row_meta', 10, 2 );
+        add_filter( 'init', [ $this, 'cryptXtinyUrl' ] );
+        add_shortcode( 'cryptx', [ $this, 'cryptXShortcode' ] );
+    }
 
     /**
@@ -95 +95 @@
      * @return array The array of default options.
      */
-    function getCryptXOptionsDefaults(): array
-    {
-        $firstFont = $this->getFilesInDirectory( CRYPTX_DIR_PATH . 'fonts', ["ttf"]);
-        return array_merge(self::$defaults, [ 'version' => CRYPTX_VERSION, 'c2i_font' => $firstFont[0] ]);
+    function getCryptXOptionsDefaults(): array {
+        $firstFont = $this->getFilesInDirectory( CRYPTX_DIR_PATH . 'fonts', [ "ttf" ] );
+
+        return array_merge( self::$defaults, [ 'version' => CRYPTX_VERSION, 'c2i_font' => $firstFont[0] ] );
     }
 
@@ -106 +106 @@
      * @return array The cryptX options array with default values.
      */
-    function loadCryptXOptionsWithDefaults(): array
-    {
-        $defaultValues = $this->getCryptXOptionsDefaults();
-        $currentOptions = get_option('cryptX');
-        return wp_parse_args($currentOptions, $defaultValues);
+    function loadCryptXOptionsWithDefaults(): array {
+        $defaultValues  = $this->getCryptXOptionsDefaults();
+        $currentOptions = get_option( 'cryptX' );
+
+        return wp_parse_args( $currentOptions, $defaultValues );
     }
 
@@ -120 +120 @@
      * @return void
      */
-    function saveCryptXOptions( array $saveOptions): void {
-        update_option( 'cryptX', wp_parse_args( $saveOptions, $this->loadCryptXOptionsWithDefaults() ) );
-    }
-
-    /**
-     * Processes the [cryptx] shortcode.
-     *
-     * @param array $atts The shortcode attributes.
-     * @param string $content The content wrapped in the shortcode.
-     *
-     * @return string The processed content.
-     */
-    function cryptXShortcode( array $atts, string $content): string
-    {
-        if (@self::$cryptXOptions['autolink']) {
-            $content = $this->addLinkToEmailAddresses($content, true);
-        }
-
-        return $this->encryptAndLinkContent($content);
+    function saveCryptXOptions( array $saveOptions ): void {
+        update_option( 'cryptX', wp_parse_args( $saveOptions, $this->loadCryptXOptionsWithDefaults() ) );
+    }
+
+    /**
+     * Generates a shortcode for encrypting email addresses in search results.
+     *
+     * @param array $atts An associative array of attributes for the shortcode.
+     * @param string $content The content inside the shortcode.
+     * @param string $tag The shortcode tag.
+     *
+     * @return string The encrypted search results content.
+     */
+    function cryptXShortcode( array $atts = [], string $content = '', string $tag = '' ): string {
+        if ( isset( $atts['encoded'] ) && $atts['encoded'] == "true" ) {
+            foreach ( $atts as $key => $value ) {
+                $atts[ $key ] = $this->decodeString( $value );
+            }
+            unset( $atts['encoded'] );
+        }
+
+        self::$cryptXOptions = shortcode_atts( $this->getCryptXOptionsDefaults(), array_change_key_case( $atts, CASE_LOWER ), $tag );
+        if ( @self::$cryptXOptions['autolink'] ) {
+            $content = $this->addLinkToEmailAddresses( $content, true );
+        }
+        $content             = $this->encryptAndLinkContent( $content, true );
+        self::$cryptXOptions = $this->getCryptXOptionsDefaults();
+
+        return $content;
     }
 
@@ -148 +158 @@
      * @return string The encrypted and linked content.
      */
-    function encryptAndLinkContent( string $content): string {
-        $content = $this->findEmailAddressesInContent($content, true);
-        $content = $this->replaceEmailInContent($content, true);
-        return $content;
-    }
-    /**
-     *  create image from tinyurl
-     *
-     *  @return image
-     */
-    function cryptXtinyUrl() : void
-    {
-        $url                 = $_SERVER['REQUEST_URI'];
+    function encryptAndLinkContent( string $content, bool $shortcode = false ): string {
+        $content = $this->findEmailAddressesInContent( $content, $shortcode );
+
+        return $this->replaceEmailInContent( $content, $shortcode );
+    }
+
+    /**
+     * Generates and returns a tiny URL image.
+     *
+     * @return void
+     */
+    function cryptXtinyUrl(): void {
+        $url    = $_SERVER['REQUEST_URI'];
         $params = explode( '/', $url );
         if ( count( $params ) > 1 ) {
-            $tiny_url = $params[count( $params ) -2];
-            if ( $tiny_url == md5( get_bloginfo('url') ) ) {
-                $font = CRYPTX_DIR_PATH . 'fonts/' . self::$cryptXOptions['c2i_font'];
-                $msg = $params[count( $params ) -1];
-                $size = self::$cryptXOptions['c2i_fontSize'];
-                $pad = 1;
+            $tiny_url = $params[ count( $params ) - 2 ];
+            if ( $tiny_url == md5( get_bloginfo( 'url' ) ) ) {
+                $font        = CRYPTX_DIR_PATH . 'fonts/' . self::$cryptXOptions['c2i_font'];
+                $msg         = $params[ count( $params ) - 1 ];
+                $size        = self::$cryptXOptions['c2i_fontSize'];
+                $pad         = 1;
                 $transparent = 1;
-                $rgb = str_replace("#", "", self::$cryptXOptions['c2i_fontRGB']);
-                $red = hexdec(substr($rgb,0,2));
-                $grn = hexdec(substr($rgb,2,2));
-                $blu = hexdec(substr($rgb,4,2));
-                $bg_red = 255 - $red;
-                $bg_grn = 255 - $grn;
-                $bg_blu = 255 - $blu;
-                $width = 0;
-                $height = 0;
-                $offset_x = 0;
-                $offset_y = 0;
-                $bounds = array();
-                $image = "";
-                $bounds = ImageTTFBBox($size, 0, $font, "W");
-                $font_height = abs($bounds[7]-$bounds[1]);
-                $bounds = ImageTTFBBox($size, 0, $font, $msg);
-                $width = abs($bounds[4]-$bounds[6]);
-                $height = abs($bounds[7]-$bounds[1]);
-                $offset_y = $font_height+abs(($height - $font_height)/2)-1;
-                $offset_x = 0;
-                $image = imagecreatetruecolor($width+($pad*2),$height+($pad*2));
-                imagesavealpha($image, true);
-                $foreground = ImageColorAllocate($image, $red, $grn, $blu);
-                $background = imagecolorallocatealpha($image, 0, 0, 0, 127);
-                imagefill($image, 0, 0, $background);
-                ImageTTFText($image, $size, 0, $offset_x+$pad, $offset_y+$pad, $foreground, $font, $msg);
-                Header("Content-type: image/png");
-                imagePNG($image);
+                $rgb         = str_replace( "#", "", self::$cryptXOptions['c2i_fontRGB'] );
+                $red         = hexdec( substr( $rgb, 0, 2 ) );
+                $grn         = hexdec( substr( $rgb, 2, 2 ) );
+                $blu         = hexdec( substr( $rgb, 4, 2 ) );
+                $bg_red      = 255 - $red;
+                $bg_grn      = 255 - $grn;
+                $bg_blu      = 255 - $blu;
+                $width       = 0;
+                $height      = 0;
+                $offset_x    = 0;
+                $offset_y    = 0;
+                $bounds      = array();
+                $image       = "";
+                $bounds      = ImageTTFBBox( $size, 0, $font, "W" );
+                $font_height = abs( $bounds[7] - $bounds[1] );
+                $bounds      = ImageTTFBBox( $size, 0, $font, $msg );
+                $width       = abs( $bounds[4] - $bounds[6] );
+                $height      = abs( $bounds[7] - $bounds[1] );
+                $offset_y    = $font_height + abs( ( $height - $font_height ) / 2 ) - 1;
+                $offset_x    = 0;
+                $image       = imagecreatetruecolor( $width + ( $pad * 2 ), $height + ( $pad * 2 ) );
+                imagesavealpha( $image, true );
+                $foreground = ImageColorAllocate( $image, $red, $grn, $blu );
+                $background = imagecolorallocatealpha( $image, 0, 0, 0, 127 );
+                imagefill( $image, 0, 0, $background );
+                ImageTTFText( $image, $size, 0, round( $offset_x + $pad, 0 ), round( $offset_y + $pad, 0 ), $foreground, $font, $msg );
+                Header( "Content-type: image/png" );
+                imagePNG( $image );
                 die;
             }
@@ -214 +224 @@
      * @return void
      */
-    function addPluginFilters( string $filterName): void
-    {
+    function addPluginFilters( string $filterName ): void {
         global $shortcode_tags;
-        if ( array_key_exists('autolink', self::$cryptXOptions) && self::$cryptXOptions['autolink']) {
-            $this->addAutoLinkFilters($filterName);
-            if (!empty($shortcode_tags)) {
-                $this->addAutoLinkFilters($filterName, 11);
+        if ( array_key_exists( 'autolink', self::$cryptXOptions ) && self::$cryptXOptions['autolink'] ) {
+            $this->addAutoLinkFilters( $filterName );
+            if ( ! empty( $shortcode_tags ) ) {
+                $this->addAutoLinkFilters( $filterName, 11 );
                 //add_filter($filterName, [$this,'autolink'], 11);
             }
         }
-        $this->addOtherFilters($filterName);
+        $this->addOtherFilters( $filterName );
     }
 
@@ -236 +245 @@
      * @return void
      */
-    function addAutoLinkFilters( string $filterName, $prio = 5): void
-    {
-        add_filter($filterName, [$this, 'addLinkToEmailAddresses' ], $prio);
+    function addAutoLinkFilters( string $filterName, $prio = 5 ): void {
+        add_filter( $filterName, [ $this, 'addLinkToEmailAddresses' ], $prio );
     }
 
@@ -252 +260 @@
      * @return void
      */
-    function addOtherFilters( string $filterName): void
-    {
-        add_filter($filterName, [$this, 'findEmailAddressesInContent' ], 12);
-        add_filter($filterName, [$this,'replaceEmailInContent'], 13);
+    function addOtherFilters( string $filterName ): void {
+        add_filter( $filterName, [ $this, 'findEmailAddressesInContent' ], 12 );
+        add_filter( $filterName, [ $this, 'replaceEmailInContent' ], 13 );
     }
 
@@ -265 +272 @@
      * @return bool Returns true if the ID is excluded, false otherwise.
      */
-    function isIdExcluded( int $ID): bool
-    {
-        $excludedIds = explode(",", self::$cryptXOptions['excludedIDs']);
-        return in_array($ID, $excludedIds);
+    function isIdExcluded( int $ID ): bool {
+        $excludedIds = explode( ",", self::$cryptXOptions['excludedIDs'] );
+
+        return in_array( $ID, $excludedIds );
     }
 
@@ -279 +286 @@
      * @param string $content The
      */
-    function replaceEmailInContent( string $content, bool $isShortcode=false): string {
+    function replaceEmailInContent( string $content, bool $isShortcode = false ): string {
         global $post;
-        $postId = (is_object($post))? $post->ID : -1;
-        if ( !$this->isIdExcluded($postId) || $isShortcode ) {
-            $content = $this->replaceEmailWithLinkText($content);
-        }
+        $postId = ( is_object( $post ) ) ? $post->ID : - 1;
+        if ( ! $this->isIdExcluded( $postId ) || $isShortcode ) {
+            $content = $this->replaceEmailWithLinkText( $content );
+        }
+
         return $content;
     }
@@ -295 +303 @@
      * @return string The content with email addresses replaced with link text.
      */
-    function replaceEmailWithLinkText( string $content): string
-    {
+    function replaceEmailWithLinkText( string $content ): string {
         $emailPattern = "/([_a-zA-Z0-9-+]+(\.[_a-zA-Z0-9-+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*(\.[a-zA-Z]{2,}))/i";
-        return preg_replace_callback($emailPattern, [$this,'encodeEmailToLinkText'], $content );
+
+        return preg_replace_callback( $emailPattern, [ $this, 'encodeEmailToLinkText' ], $content );
     }
 
@@ -308 +316 @@
      * @return string The encoded link text.
      */
-    function encodeEmailToLinkText( array $Match): string {
-        if($this->in_white_list($Match)) return $Match[1];
-        switch (self::$cryptXOptions['opt_linktext']) {
+    function encodeEmailToLinkText( array $Match ): string {
+        if ( $this->inWhiteList( $Match ) ) {
+            return $Match[1];
+        }
+        switch ( self::$cryptXOptions['opt_linktext'] ) {
             case 1:
                 $text = $this->getLinkText();
@@ -319 +329 @@
             case 3:
                 $img_url = wp_get_attachment_url( self::$cryptXOptions['alt_uploadedimage'] );
-                $text = $this->getUploadedImage($img_url);
-                self::$imageCounter++;
+                $text    = $this->getUploadedImage( $img_url );
+                self::$imageCounter ++;
                 break;
             case 4:
-                $text = antispambot($Match[1]);
+                $text = antispambot( $Match[1] );
                 break;
             case 5:
-                $text = $this->getImageFromText($Match);
-                self::$imageCounter++;
+                $text = $this->getImageFromText( $Match );
+                self::$imageCounter ++;
                 break;
             default:
-                $text = $this->getDefaultLinkText($Match);
+                $text = $this->getDefaultLinkText( $Match );
         }
 
@@ -343 +353 @@
      * @return bool True if the match is in the whitelist, false otherwise.
      */
-    function in_white_list( array $Match): bool
-    {
-        $whiteList = array_filter(array_map('trim', explode(",", self::$cryptXOptions['whiteList'])));
-        $tmp = explode(".", $Match[0]);
-        return in_array(end($tmp), $whiteList);
+    function inWhiteList( array $Match ): bool {
+        $whiteList = array_filter( array_map( 'trim', explode( ",", self::$cryptXOptions['whiteList'] ) ) );
+        $tmp       = explode( ".", $Match[0] );
+
+        return in_array( end( $tmp ), $whiteList );
     }
 
@@ -364 +374 @@
      * @return string The HTML image tag
      */
-    function getLinkImage(): string
-    {
-        return "<img src=\"" . self::$cryptXOptions['alt_linkimage'] . "\" class=\"cryptxImage\" alt=\"" . self::$cryptXOptions['alt_linkimage_title'] . "\" title=\"" . antispambot(self::$cryptXOptions['alt_linkimage_title']) . "\" />";
+    function getLinkImage(): string {
+        return "<img src=\"" . self::$cryptXOptions['alt_linkimage'] . "\" class=\"cryptxImage\" alt=\"" . self::$cryptXOptions['alt_linkimage_title'] . "\" title=\"" . antispambot( self::$cryptXOptions['alt_linkimage_title'] ) . "\" />";
     }
 
@@ -376 +385 @@
      * @return string The HTML tag for the image.
      */
-    function getUploadedImage( string $img_url): string
-    {
-        return "<img src=\"" . $img_url . "\" class=\"cryptxImage cryptxImage_" . self::$imageCounter . "\" alt=\"" . self::$cryptXOptions['http_linkimage_title'] . " title=\"" . antispambot( self::$cryptXOptions['http_linkimage_title']) . "\" />";
+    function getUploadedImage( string $img_url ): string {
+        return "<img src=\"" . $img_url . "\" class=\"cryptxImage cryptxImage_" . self::$imageCounter . "\" alt=\"" . self::$cryptXOptions['http_linkimage_title'] . " title=\"" . antispambot( self::$cryptXOptions['http_linkimage_title'] ) . "\" />";
     }
 
@@ -388 +396 @@
      * @return string Returns the HTML image element.
      */
-    function getImageFromText( array $Match): string
-    {
-        return "<img src=\"" . get_bloginfo('url') . "/" . md5( get_bloginfo('url') ) . "/" . antispambot($Match[1]) . "\" class=\"cryptxImage cryptxImage_" . self::$imageCounter . "\" alt=\"" . antispambot($Match[1]) . "\" title=\"" . antispambot($Match[1]) . "\" />";
+    function getImageFromText( array $Match ): string {
+        return "<img src=\"" . get_bloginfo( 'url' ) . "/" . md5( get_bloginfo( 'url' ) ) . "/" . antispambot( $Match[1] ) . "\" class=\"cryptxImage cryptxImage_" . self::$imageCounter . "\" alt=\"" . antispambot( $Match[1] ) . "\" title=\"" . antispambot( $Match[1] ) . "\" />";
     }
 
@@ -404 +411 @@
      *                     for each element.
      */
-    function getDefaultLinkText( array $Match): string
-    {
-        $text = str_replace("@", self::$cryptXOptions['at'], $Match[1]);
-        return str_replace(".", self::$cryptXOptions['dot'], $text);
+    function getDefaultLinkText( array $Match ): string {
+        $text = str_replace( "@", self::$cryptXOptions['at'], $Match[1] );
+
+        return str_replace( ".", self::$cryptXOptions['dot'], $text );
     }
 
@@ -419 +426 @@
      * @return array An array of file names that match the filter.
      */
-    function getFilesInDirectory( string $path, array $filter): array
-    {
-        $directoryHandle = opendir($path);
+    function getFilesInDirectory( string $path, array $filter ): array {
+        $directoryHandle  = opendir( $path );
         $directoryContent = array();
-        while ($file = readdir($directoryHandle)) {
-            $fileExtension = substr(strtolower($file), -3);
-            if (in_array($fileExtension, $filter)) {
+        while ( $file = readdir( $directoryHandle ) ) {
+            $fileExtension = substr( strtolower( $file ), - 3 );
+            if ( in_array( $fileExtension, $filter ) ) {
                 $directoryContent[] = $file;
             }
         }
+
         return $directoryContent;
     }
@@ -440 +447 @@
      * @return string|null The content with encrypted email addresses, or null if $content is null.
      */
-    function findEmailAddressesInContent( ?string $content, bool $shortcode = false): ?string
-    {
-        global $post;
-
-        if ($content === null) return null;
-
-        $postId = (is_object($post))? $post->ID : -1;
-
-        $isIdExcluded = $this->isIdExcluded($postId);
-        $mailtoRegex = '/<a (.*?)(href=("|\')mailto:(.*?)("|\')(.*?)|)>\s*(.*?)\s*<\/a>/i';
-
-        if ((!$isIdExcluded || $shortcode !== null)) {
-            $content = preg_replace_callback($mailtoRegex, [$this, 'encryptEmailAddress' ], $content);
+    function findEmailAddressesInContent( ?string $content, bool $shortcode = false ): ?string {
+        global $post;
+
+        if ( $content === null ) {
+            return null;
+        }
+
+        $postId = ( is_object( $post ) ) ? $post->ID : - 1;
+
+        $isIdExcluded = $this->isIdExcluded( $postId );
+        $mailtoRegex  = '/<a (.*?)(href=("|\')mailto:(.*?)("|\')(.*?)|)>\s*(.*?)\s*<\/a>/i';
+
+        if ( ( ! $isIdExcluded || $shortcode !== null ) ) {
+            $content = preg_replace_callback( $mailtoRegex, [ $this, 'encryptEmailAddress' ], $content );
         }
 
@@ -465 +473 @@
      * @return string The search results with encrypted email addresses.
      */
-    function encryptEmailAddress( array $searchResults): string
-    {
+    function encryptEmailAddress( array $searchResults ): string {
         $originalValue = $searchResults[0];
 
-        if(strpos($searchResults[self::INDEX_TO_CHECK], '@') === self::NOT_FOUND) {
+        if ( strpos( $searchResults[ self::INDEX_TO_CHECK ], '@' ) === self::NOT_FOUND ) {
             return $originalValue;
         }
 
-        $mailReference = self::MAIL_IDENTIFIER . $searchResults[self::INDEX_TO_CHECK];
+        $mailReference = self::MAIL_IDENTIFIER . $searchResults[ self::INDEX_TO_CHECK ];
 
         if ( str_starts_with( $searchResults[ self::INDEX_TO_CHECK ], self::SUBJECT_IDENTIFIER ) ) {
@@ -480 +487 @@
 
         $return = $originalValue;
-        if (!empty(self::$cryptXOptions['java'])) {
-            $javaHandler="javascript:DeCryptX('" . $this->generateHashFromString($searchResults[self::INDEX_TO_CHECK]) . "')";
-            $return = str_replace(self::MAIL_IDENTIFIER.$searchResults[self::INDEX_TO_CHECK], $javaHandler, $originalValue);
-        }
-
-        $return = str_replace($mailReference, antispambot($mailReference), $return);
-
-        if(!empty(self::$cryptXOptions['css_id'])) {
-            $return = preg_replace(self::PATTERN, '$1" id="'.self::$cryptXOptions['css_id'] . '">', $return );
-        }
-
-        if(!empty(self::$cryptXOptions['css_class'])) {
-            $return = preg_replace(self::PATTERN, '$1" class="'.self::$cryptXOptions['css_class'] . '">', $return );
+        if ( ! empty( self::$cryptXOptions['java'] ) ) {
+            $javaHandler = "javascript:DeCryptX('" . $this->generateHashFromString( $searchResults[ self::INDEX_TO_CHECK ] ) . "')";
+            $return      = str_replace( self::MAIL_IDENTIFIER . $searchResults[ self::INDEX_TO_CHECK ], $javaHandler, $originalValue );
+        }
+
+        $return = str_replace( $mailReference, antispambot( $mailReference ), $return );
+
+        if ( ! empty( self::$cryptXOptions['css_id'] ) ) {
+            $return = preg_replace( self::PATTERN, '$1" id="' . self::$cryptXOptions['css_id'] . '">', $return );
+        }
+
+        if ( ! empty( self::$cryptXOptions['css_class'] ) ) {
+            $return = preg_replace( self::PATTERN, '$1" class="' . self::$cryptXOptions['css_class'] . '">', $return );
         }
 
@@ -506 +513 @@
      * @return string The generated hash string.
      */
-    function generateHashFromString( string $inputString): string
-    {
-        $inputString = str_replace("&", "&", $inputString);
-        $crypt = '';
-
-        for ($i = 0; $i < strlen($inputString); $i++) {
+    function generateHashFromString( string $inputString ): string {
+        $inputString = str_replace( "&", "&", $inputString );
+        $crypt       = '';
+
+        for ( $i = 0; $i < strlen( $inputString ); $i ++ ) {
             do {
-                $salt = mt_rand(0, 3);
-                $asciiValue = ord(substr($inputString, $i)) + $salt;
-                if (8364 <= $asciiValue) {
+                $salt       = mt_rand( 0, 3 );
+                $asciiValue = ord( substr( $inputString, $i ) ) + $salt;
+                if ( 8364 <= $asciiValue ) {
                     $asciiValue = 128;
                 }
-            } while (in_array($asciiValue, self::ASCII_VALUES_BLACKLIST));
-
-            $crypt .= $salt . chr($asciiValue);
-        }
+            } while ( in_array( $asciiValue, self::ASCII_VALUES_BLACKLIST ) );
+
+            $crypt .= $salt . chr( $asciiValue );
+        }
+
         return $crypt;
     }
@@ -535 +542 @@
      * @return string The content with emails auto-linked.
      */
-    function addLinkToEmailAddresses( string $content, bool $shortcode = false ): string
-    {
+    function addLinkToEmailAddresses( string $content, bool $shortcode = false ): string {
         global $post;
         $postID = is_object( $post ) ? $post->ID : - 1;
@@ -575 +581 @@
     function installCryptX(): void {
         global $wpdb;
-        self::$cryptXOptions['admin_notices_deprecated'] =true;
-        if ( self::$cryptXOptions['excludedIDs'] == "") {
-            $tmp = array();
-            $excludes = $wpdb->get_results("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = 'cryptxoff' AND meta_value = 'true'");
-            if(count($excludes) > 0) {
-                foreach ($excludes as $exclude) {
+        self::$cryptXOptions['admin_notices_deprecated'] = true;
+        if ( self::$cryptXOptions['excludedIDs'] == "" ) {
+            $tmp      = array();
+            $excludes = $wpdb->get_results( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = 'cryptxoff' AND meta_value = 'true'" );
+            if ( count( $excludes ) > 0 ) {
+                foreach ( $excludes as $exclude ) {
                     $tmp[] = $exclude->post_id;
                 }
-                sort($tmp);
-                self::$cryptXOptions['excludedIDs'] = implode(",", $tmp);
-                update_option( 'cryptX', self::$cryptXOptions);
+                sort( $tmp );
+                self::$cryptXOptions['excludedIDs'] = implode( ",", $tmp );
+                update_option( 'cryptX', self::$cryptXOptions );
                 self::$cryptXOptions = $this->loadCryptXOptionsWithDefaults(); // reread Options
-                $wpdb->query("DELETE FROM $wpdb->postmeta WHERE meta_key = 'cryptxoff'");
-            }
-        }
-        if (empty(self::$cryptXOptions['c2i_font'])) {
+                $wpdb->query( "DELETE FROM $wpdb->postmeta WHERE meta_key = 'cryptxoff'" );
+            }
+        }
+        if ( empty( self::$cryptXOptions['c2i_font'] ) ) {
             self::$cryptXOptions['c2i_font'] = CRYPTX_DIR_PATH . 'fonts/' . $firstFont[0];
         }
-        if (empty(self::$cryptXOptions['c2i_fontSize'])) {
+        if ( empty( self::$cryptXOptions['c2i_fontSize'] ) ) {
             self::$cryptXOptions['c2i_fontSize'] = 10;
         }
-        if (empty(self::$cryptXOptions['c2i_fontRGB'])) {
+        if ( empty( self::$cryptXOptions['c2i_fontRGB'] ) ) {
             self::$cryptXOptions['c2i_fontRGB'] = '000000';
         }
-        update_option( 'cryptX', self::$cryptXOptions);
+        update_option( 'cryptX', self::$cryptXOptions );
         self::$cryptXOptions = $this->loadCryptXOptionsWithDefaults(); // reread Options
     }
 
-    function addHooksHelper($function_name, $hook_name): void {
-        if ( function_exists($function_name) ) {
-            call_user_func($function_name, 'cryptx', 'CryptX', [$this, 'metaCheckbox' ], $hook_name);
+    function addHooksHelper( $function_name, $hook_name ): void {
+        if ( function_exists( $function_name ) ) {
+            call_user_func( $function_name, 'cryptx', 'CryptX', [ $this, 'metaCheckbox' ], $hook_name );
         } else {
-            add_action("dbx_{$hook_name}_sidebar", [$this, 'metaOptionFieldset' ]);
+            add_action( "dbx_{$hook_name}_sidebar", [ $this, 'metaOptionFieldset' ] );
         }
     }
 
     function metaBox(): void {
-        $this->addHooksHelper('add_meta_box', 'post');
-        $this->addHooksHelper('add_meta_box', 'page');
+        $this->addHooksHelper( 'add_meta_box', 'post' );
+        $this->addHooksHelper( 'add_meta_box', 'page' );
     }
 
@@ -622 +628 @@
      * functionality for the current post or page. If the current post or page ID is excluded
      **/
-    function metaCheckbox(): void
-    {
+    function metaCheckbox(): void {
         global $post;
         ?>
-        <label><input type="checkbox" name="disable_cryptx_pageid" <?php if ($this->isIdExcluded($post->ID)) { echo 'checked="checked"'; } ?>/>
-        Disable CryptX for this post/page</label>
+        <label><input type="checkbox" name="disable_cryptx_pageid" <?php if ( $this->isIdExcluded( $post->ID ) ) {
+                echo 'checked="checked"';
+            } ?>/>
+            Disable CryptX for this post/page</label>
         <?php
     }
@@ -637 +644 @@
      * @return void
      */
-    function metaOptionFieldset(): void
-    {
+    function metaOptionFieldset(): void {
         global $post;
-        if ( current_user_can('edit_posts') ) { ?>
-            <fieldset id="cryptxoption" class="dbx-box">
-                <h3 class="dbx-handle">CryptX</h3>
-                <div class="dbx-content">
-                    <label><input type="checkbox" name="disable_cryptx_pageid" <?php if ($this->isIdExcluded($post->ID)) { echo 'checked="checked"'; } ?>/> Disable CryptX for this post/page</label>
-                </div>
-            </fieldset>
+        if ( current_user_can( 'edit_posts' ) ) { ?>
+            <fieldset id="cryptxoption" class="dbx-box">
+                <h3 class="dbx-handle">CryptX</h3>
+                <div class="dbx-content">
+                    <label><input type="checkbox"
+                                  name="disable_cryptx_pageid" <?php if ( $this->isIdExcluded( $post->ID ) ) {
+                            echo 'checked="checked"';
+                        } ?>/> Disable CryptX for this post/page</label>
+                </div>
+            </fieldset>
             <?php
         }
@@ -658 +667 @@
      * @return void
      */
-    function addPostIdToExcludedList( int $postId): void {
-        $postId                             = wp_is_post_revision($postId) ?: $postId;
-        $excludedIds                        = $this->updateExcludedIdsList(self::$cryptXOptions['excludedIDs'], $postId);
-        self::$cryptXOptions['excludedIDs'] = implode(",", array_filter($excludedIds));
-        update_option('cryptX', self::$cryptXOptions);
+    function addPostIdToExcludedList( int $postId ): void {
+        $postId                             = wp_is_post_revision( $postId ) ?: $postId;
+        $excludedIds                        = $this->updateExcludedIdsList( self::$cryptXOptions['excludedIDs'], $postId );
+        self::$cryptXOptions['excludedIDs'] = implode( ",", array_filter( $excludedIds ) );
+        update_option( 'cryptX', self::$cryptXOptions );
     }
 
@@ -673 +682 @@
      * @return array The updated excluded IDs list as an array, with the ID removed if it existed and added if necessary.
      */
-    function updateExcludedIdsList(string $excludedIds, int $postId): array {
-        $excludedIdsArray = explode(",", $excludedIds);
-        $excludedIdsArray = $this->removePostIdFromExcludedIds($excludedIdsArray, $postId);
-        $excludedIdsArray = $this->addPostIdToExcludedIdsIfNecessary($excludedIdsArray, $postId);
-        return $this->makeExcludedIdsUniqueAndSorted($excludedIdsArray);
+    function updateExcludedIdsList( string $excludedIds, int $postId ): array {
+        $excludedIdsArray = explode( ",", $excludedIds );
+        $excludedIdsArray = $this->removePostIdFromExcludedIds( $excludedIdsArray, $postId );
+        $excludedIdsArray = $this->addPostIdToExcludedIdsIfNecessary( $excludedIdsArray, $postId );
+
+        return $this->makeExcludedIdsUniqueAndSorted( $excludedIdsArray );
     }
 
@@ -688 +698 @@
      * @return array The updated array of excluded IDs without the specified post ID.
      */
-    function removePostIdFromExcludedIds(array $excludedIds, int $postId): array {
-        foreach($excludedIds as $key => $id) {
-            if($id == $postId) {
-                unset($excludedIds[$key]);
+    function removePostIdFromExcludedIds( array $excludedIds, int $postId ): array {
+        foreach ( $excludedIds as $key => $id ) {
+            if ( $id == $postId ) {
+                unset( $excludedIds[ $key ] );
                 break;
             }
         }
+
         return $excludedIds;
     }
@@ -706 +717 @@
      * @return array The updated array of excluded IDs.
      */
-    function addPostIdToExcludedIdsIfNecessary(array $excludedIds, int $postId): array {
-        if (isset($_POST['disable_cryptx_pageid'])) {
+    function addPostIdToExcludedIdsIfNecessary( array $excludedIds, int $postId ): array {
+        if ( isset( $_POST['disable_cryptx_pageid'] ) ) {
             $excludedIds[] = $postId;
         }
+
         return $excludedIds;
     }
@@ -720 +732 @@
      * @return array The array of excluded IDs with duplicate values removed and sorted in ascending order.
      */
-    function makeExcludedIdsUniqueAndSorted(array $excludedIds): array {
-        $excludedIds = array_unique($excludedIds);
-        sort($excludedIds);
+    function makeExcludedIdsUniqueAndSorted( array $excludedIds ): array {
+        $excludedIds = array_unique( $excludedIds );
+        sort( $excludedIds );
+
         return $excludedIds;
     }
@@ -734 +747 @@
      * @return void
      */
-    function showMessage($message, $errormsg = false): void {
-        if ($errormsg) {
+    function showMessage( $message, $errormsg = false ): void {
+        if ( $errormsg ) {
             echo '<div id="message" class="error">';
-        }
-        else {
+        } else {
             echo '<div id="message" class="updated fade">';
         }
@@ -751 +763 @@
      */
     function getDomain(): string {
-        return $this->trimSlashFromDomain($this->removeProtocolFromUrl($this->getSiteUrl()));
+        return $this->trimSlashFromDomain( $this->removeProtocolFromUrl( $this->getSiteUrl() ) );
     }
 
@@ -770 +782 @@
      * @return string The URL string without the protocol.
      */
-    function removeProtocolFromUrl(string $url): string
-    {
+    function removeProtocolFromUrl( string $url ): string {
         return preg_replace( '|https?://|', '', $url );
     }
@@ -782 +793 @@
      * @return string The domain with the trailing slash removed.
      */
-    function trimSlashFromDomain(string $domain): string
-    {
+    function trimSlashFromDomain( string $domain ): string {
         if ( $slashPosition = strpos( $domain, '/' ) ) {
             $domain = substr( $domain, 0, $slashPosition );
         }
+
         return $domain;
     }
@@ -797 +808 @@
     function loadJavascriptFiles(): void {
         wp_enqueue_script( 'cryptx-js', CRYPTX_DIR_URL . 'js/cryptx.min.js', false, false, self::$cryptXOptions['load_java'] );
-        wp_enqueue_style( 'cryptx-styles', CRYPTX_DIR_URL . 'css/cryptx.css');
+        wp_enqueue_style( 'cryptx-styles', CRYPTX_DIR_URL . 'css/cryptx.css' );
     }
 
@@ -810 +821 @@
      */
     function updateCryptXSettings(): void {
-        self::$cryptXOptions = get_option('cryptX');
-        if( isset( self::$cryptXOptions['version'] ) && version_compare(CRYPTX_VERSION, self::$cryptXOptions['version']) > 0 ) {
-            if( isset(self::$cryptXOptions['version']) ) unset(self::$cryptXOptions['version']);
-            if( isset(self::$cryptXOptions['c2i_font']) ) unset(self::$cryptXOptions['c2i_font']);
-            if( isset(self::$cryptXOptions['c2i_fontRGB']) ) self::$cryptXOptions['c2i_fontRGB'] = "#" . self::$cryptXOptions['c2i_fontRGB'];
-            if( isset(self::$cryptXOptions['alt_uploadedimage']) && !is_int(self::$cryptXOptions['alt_uploadedimage'])) {
-                unset(self::$cryptXOptions['alt_uploadedimage']);
-                if( self::$cryptXOptions['opt_linktext'] == 3 ) unset(self::$cryptXOptions['opt_linktext']);
+        self::$cryptXOptions = get_option( 'cryptX' );
+        if ( isset( self::$cryptXOptions['version'] ) && version_compare( CRYPTX_VERSION, self::$cryptXOptions['version'] ) > 0 ) {
+            if ( isset( self::$cryptXOptions['version'] ) ) {
+                unset( self::$cryptXOptions['version'] );
+            }
+            if ( isset( self::$cryptXOptions['c2i_font'] ) ) {
+                unset( self::$cryptXOptions['c2i_font'] );
+            }
+            if ( isset( self::$cryptXOptions['c2i_fontRGB'] ) ) {
+                self::$cryptXOptions['c2i_fontRGB'] = "#" . self::$cryptXOptions['c2i_fontRGB'];
+            }
+            if ( isset( self::$cryptXOptions['alt_uploadedimage'] ) && ! is_int( self::$cryptXOptions['alt_uploadedimage'] ) ) {
+                unset( self::$cryptXOptions['alt_uploadedimage'] );
+                if ( self::$cryptXOptions['opt_linktext'] == 3 ) {
+                    unset( self::$cryptXOptions['opt_linktext'] );
+                }
             }
             self::$cryptXOptions = wp_parse_args( self::$cryptXOptions, $this->getCryptXOptionsDefaults() );
-            update_option( 'cryptX', self::$cryptXOptions);
-        }
+            update_option( 'cryptX', self::$cryptXOptions );
+        }
+    }
+
+    /**
+     * Encodes a string by replacing special characters with their corresponding HTML entities.
+     *
+     * @param string|null $str The string to be encoded.
+     *
+     * @return string The encoded string, or an array of encoded strings if an array was passed.
+     */
+    function encodeString( ?string $str ): string {
+        $str     = htmlentities( $str, ENT_QUOTES, 'UTF-8' );
+        $special = array(
+            '[' => '&#91;',
+            ']' => '&#93;',
+        );
+
+        return str_replace( array_keys( $special ), array_values( $special ), $str );
+    }
+
+    /**
+     * Decodes a string that has been HTML entity encoded.
+     *
+     * @param string|null $str The string to decode. If null, an empty string is returned.
+     *
+     * @return string The decoded string.
+     */
+    function decodeString( ?string $str ): string {
+        return html_entity_decode( $str, ENT_QUOTES, 'UTF-8' );
+    }
+
+    function convertArrayToArgumentString( array $args = [] ): string {
+        $string = "";
+        if ( ! empty( $args ) ) {
+            foreach ( $args as $key => $value ) {
+                $string .= sprintf( " %s=\"%s\"", $key, $this->encodeString( $value ) );
+            }
+            $string .= " encoded=\"true\"";
+        }
+
+        return $string;
     }
 }

cryptx/tags/3.4.5/cryptx.php

@@ -4 +4 @@
  * Plugin URI: http://weber-nrw.de/wordpress/cryptx/
  * Description: No more SPAM by spiders scanning you site for email addresses. With CryptX you can hide all your email addresses, with and without a mailto-link, by converting them using javascript or UNICODE.
- * Version: 3.4.4
+ * Version: 3.4.5
  * Requires at least: 6.0
  * Author: Ralf Weber
@@ -42 +42 @@
  * @return string The encrypted content wrapped in the Cryptx shortcode.
  */
-function encryptx( ?string $content, string $args = "" ): string {
-    return do_shortcode( '[cryptx]' . $content . '[/cryptx]' );
+function encryptx( ?string $content, ?array $args ): string {
+    $CryptX_instance = Cryptx\CryptX::getInstance();
+    return do_shortcode( '[cryptx'. $CryptX_instance->convertArrayToArgumentString( $args ).']' . $content . '[/cryptx]' );
 }

cryptx/tags/3.4.5/readme.txt

@@ -5 +5 @@
 Requires at least: 6.0
 Tested up to: 6.5
-Stable tag: 3.4.4
+Stable tag: 3.4.5
 Requires PHP: 7.4
 License: GPLv2 or later
@@ -22 +22 @@
 
 == Changelog ==
+= 3.4.5 =
+* The "encryptx" template function has been revised so that it accepts arguments again, as in previous versions.
 = 3.4.4 =
 * changed type hinting of an argument to be string or null on some methods

cryptx/trunk/classes/CryptX.php

@@ -5 +5 @@
 class CryptX {
 
-    const NOT_FOUND = false;
-    const MAIL_IDENTIFIER = 'mailto:';
-    const SUBJECT_IDENTIFIER = "?subject=";
-    const INDEX_TO_CHECK = 4;
-    const PATTERN = '/(.*)(">)/i';
-    const ASCII_VALUES_BLACKLIST = ['32', '34', '39', '60', '62', '63', '92', '94', '96', '127'];
+    const NOT_FOUND = false;
+    const MAIL_IDENTIFIER = 'mailto:';
+    const SUBJECT_IDENTIFIER = "?subject=";
+    const INDEX_TO_CHECK = 4;
+    const PATTERN = '/(.*)(">)/i';
+    const ASCII_VALUES_BLACKLIST = [ '32', '34', '39', '60', '62', '63', '92', '94', '96', '127' ];
 
     private static ?CryptX $_instance = null;
     private static array $cryptXOptions = [];
     private static array $defaults = array(
-        'version' => null,
-        'at' => ' [at] ',
-        'dot' => ' [dot] ',
-        'css_id' => '',
-        'css_class' => '',
-        'the_content' => 1,
-        'the_meta_key' => 1,
-        'the_excerpt' => 1,
-        'comment_text' => 1,
-        'widget_text' => 1,
-        'java' => 1,
-        'load_java' => 1,
-        'opt_linktext' => 0,
-        'autolink' => 1,
-        'alt_linktext' => '',
-        'alt_linkimage' => '',
+        'version'              => null,
+        'at'                   => ' [at] ',
+        'dot'                  => ' [dot] ',
+        'css_id'               => '',
+        'css_class'            => '',
+        'the_content'          => 1,
+        'the_meta_key'         => 1,
+        'the_excerpt'          => 1,
+        'comment_text'         => 1,
+        'widget_text'          => 1,
+        'java'                 => 1,
+        'load_java'            => 1,
+        'opt_linktext'         => 0,
+        'autolink'             => 1,
+        'alt_linktext'         => '',
+        'alt_linkimage'        => '',
         'http_linkimage_title' => '',
-        'alt_linkimage_title' => '',
-        'excludedIDs' => '',
-        'metaBox' => 1,
-        'alt_uploadedimage' => '0',
-        'c2i_font' => null,
-        'c2i_fontSize' => 10,
-        'c2i_fontRGB' => '#000000',
-        'echo' => 1,
-        'filter' => array('the_content','the_meta_key','the_excerpt','comment_text','widget_text'),
-        'whiteList' => 'jpeg,jpg,png,gif',
+        'alt_linkimage_title'  => '',
+        'excludedIDs'          => '',
+        'metaBox'              => 1,
+        'alt_uploadedimage'    => '0',
+        'c2i_font'             => null,
+        'c2i_fontSize'         => 10,
+        'c2i_fontRGB'          => '#000000',
+        'echo'                 => 1,
+        'filter'               => array( 'the_content', 'the_meta_key', 'the_excerpt', 'comment_text', 'widget_text' ),
+        'whiteList'            => 'jpeg,jpg,png,gif',
     );
     private static int $imageCounter = 0;
-    private function __construct()
-    {
+
+    private function __construct() {
         self::$cryptXOptions = $this->loadCryptXOptionsWithDefaults();
     }
@@ -58 +58 @@
      * @return CryptX The instance of the CryptX class.
      */
-    public static function getInstance(): CryptX
-    {
-        if ( ! ( self::$_instance instanceof self) ) {
+    public static function getInstance(): CryptX {
+        if ( ! ( self::$_instance instanceof self ) ) {
             self::$_instance = new self();
         }
+
         return self::$_instance;
     }
 
-    function startCryptX(): void {
-        if( isset( self::$cryptXOptions['version'] ) && version_compare(CRYPTX_VERSION, self::$cryptXOptions['version']) > 0 ) {
-            $this->updateCryptXSettings();
-        }
-        foreach(self::$cryptXOptions['filter'] as $filter) {
-            if (@self::$cryptXOptions[$filter]) {
-                $this->addPluginFilters($filter);
-            }
-        }
-        add_action( 'activate_' . CRYPTX_BASENAME, [$this, 'installCryptX' ] );
-        add_action( 'wp_enqueue_scripts', [$this, 'loadJavascriptFiles' ] );
-        if (@self::$cryptXOptions['metaBox']) {
-            add_action('admin_menu', [$this, 'metaBox' ]);
-            add_action('wp_insert_post', [$this, 'addPostIdToExcludedList' ] );
-            add_action('wp_update_post', [$this, 'addPostIdToExcludedList' ] );
-        }
-        add_filter( 'plugin_row_meta', 'rw_cryptx_init_row_meta', 10, 2 );
-        add_filter( 'init', [$this, 'cryptXtinyUrl' ]);
-        add_shortcode( 'cryptx', [$this, 'cryptXShortcode']);
-    }
+    function startCryptX(): void {
+        if ( isset( self::$cryptXOptions['version'] ) && version_compare( CRYPTX_VERSION, self::$cryptXOptions['version'] ) > 0 ) {
+            $this->updateCryptXSettings();
+        }
+        foreach ( self::$cryptXOptions['filter'] as $filter ) {
+            if ( @self::$cryptXOptions[ $filter ] ) {
+                $this->addPluginFilters( $filter );
+            }
+        }
+        add_action( 'activate_' . CRYPTX_BASENAME, [ $this, 'installCryptX' ] );
+        add_action( 'wp_enqueue_scripts', [ $this, 'loadJavascriptFiles' ] );
+        if ( @self::$cryptXOptions['metaBox'] ) {
+            add_action( 'admin_menu', [ $this, 'metaBox' ] );
+            add_action( 'wp_insert_post', [ $this, 'addPostIdToExcludedList' ] );
+            add_action( 'wp_update_post', [ $this, 'addPostIdToExcludedList' ] );
+        }
+        add_filter( 'plugin_row_meta', 'rw_cryptx_init_row_meta', 10, 2 );
+        add_filter( 'init', [ $this, 'cryptXtinyUrl' ] );
+        add_shortcode( 'cryptx', [ $this, 'cryptXShortcode' ] );
+    }
 
     /**
@@ -95 +95 @@
      * @return array The array of default options.
      */
-    function getCryptXOptionsDefaults(): array
-    {
-        $firstFont = $this->getFilesInDirectory( CRYPTX_DIR_PATH . 'fonts', ["ttf"]);
-        return array_merge(self::$defaults, [ 'version' => CRYPTX_VERSION, 'c2i_font' => $firstFont[0] ]);
+    function getCryptXOptionsDefaults(): array {
+        $firstFont = $this->getFilesInDirectory( CRYPTX_DIR_PATH . 'fonts', [ "ttf" ] );
+
+        return array_merge( self::$defaults, [ 'version' => CRYPTX_VERSION, 'c2i_font' => $firstFont[0] ] );
     }
 
@@ -106 +106 @@
      * @return array The cryptX options array with default values.
      */
-    function loadCryptXOptionsWithDefaults(): array
-    {
-        $defaultValues = $this->getCryptXOptionsDefaults();
-        $currentOptions = get_option('cryptX');
-        return wp_parse_args($currentOptions, $defaultValues);
+    function loadCryptXOptionsWithDefaults(): array {
+        $defaultValues  = $this->getCryptXOptionsDefaults();
+        $currentOptions = get_option( 'cryptX' );
+
+        return wp_parse_args( $currentOptions, $defaultValues );
     }
 
@@ -120 +120 @@
      * @return void
      */
-    function saveCryptXOptions( array $saveOptions): void {
-        update_option( 'cryptX', wp_parse_args( $saveOptions, $this->loadCryptXOptionsWithDefaults() ) );
-    }
-
-    /**
-     * Processes the [cryptx] shortcode.
-     *
-     * @param array $atts The shortcode attributes.
-     * @param string $content The content wrapped in the shortcode.
-     *
-     * @return string The processed content.
-     */
-    function cryptXShortcode( array $atts, string $content): string
-    {
-        if (@self::$cryptXOptions['autolink']) {
-            $content = $this->addLinkToEmailAddresses($content, true);
-        }
-
-        return $this->encryptAndLinkContent($content);
+    function saveCryptXOptions( array $saveOptions ): void {
+        update_option( 'cryptX', wp_parse_args( $saveOptions, $this->loadCryptXOptionsWithDefaults() ) );
+    }
+
+    /**
+     * Generates a shortcode for encrypting email addresses in search results.
+     *
+     * @param array $atts An associative array of attributes for the shortcode.
+     * @param string $content The content inside the shortcode.
+     * @param string $tag The shortcode tag.
+     *
+     * @return string The encrypted search results content.
+     */
+    function cryptXShortcode( array $atts = [], string $content = '', string $tag = '' ): string {
+        if ( isset( $atts['encoded'] ) && $atts['encoded'] == "true" ) {
+            foreach ( $atts as $key => $value ) {
+                $atts[ $key ] = $this->decodeString( $value );
+            }
+            unset( $atts['encoded'] );
+        }
+
+        self::$cryptXOptions = shortcode_atts( $this->getCryptXOptionsDefaults(), array_change_key_case( $atts, CASE_LOWER ), $tag );
+        if ( @self::$cryptXOptions['autolink'] ) {
+            $content = $this->addLinkToEmailAddresses( $content, true );
+        }
+        $content             = $this->encryptAndLinkContent( $content, true );
+        self::$cryptXOptions = $this->getCryptXOptionsDefaults();
+
+        return $content;
     }
 
@@ -148 +158 @@
      * @return string The encrypted and linked content.
      */
-    function encryptAndLinkContent( string $content): string {
-        $content = $this->findEmailAddressesInContent($content, true);
-        $content = $this->replaceEmailInContent($content, true);
-        return $content;
-    }
-    /**
-     *  create image from tinyurl
-     *
-     *  @return image
-     */
-    function cryptXtinyUrl() : void
-    {
-        $url                 = $_SERVER['REQUEST_URI'];
+    function encryptAndLinkContent( string $content, bool $shortcode = false ): string {
+        $content = $this->findEmailAddressesInContent( $content, $shortcode );
+
+        return $this->replaceEmailInContent( $content, $shortcode );
+    }
+
+    /**
+     * Generates and returns a tiny URL image.
+     *
+     * @return void
+     */
+    function cryptXtinyUrl(): void {
+        $url    = $_SERVER['REQUEST_URI'];
         $params = explode( '/', $url );
         if ( count( $params ) > 1 ) {
-            $tiny_url = $params[count( $params ) -2];
-            if ( $tiny_url == md5( get_bloginfo('url') ) ) {
-                $font = CRYPTX_DIR_PATH . 'fonts/' . self::$cryptXOptions['c2i_font'];
-                $msg = $params[count( $params ) -1];
-                $size = self::$cryptXOptions['c2i_fontSize'];
-                $pad = 1;
+            $tiny_url = $params[ count( $params ) - 2 ];
+            if ( $tiny_url == md5( get_bloginfo( 'url' ) ) ) {
+                $font        = CRYPTX_DIR_PATH . 'fonts/' . self::$cryptXOptions['c2i_font'];
+                $msg         = $params[ count( $params ) - 1 ];
+                $size        = self::$cryptXOptions['c2i_fontSize'];
+                $pad         = 1;
                 $transparent = 1;
-                $rgb = str_replace("#", "", self::$cryptXOptions['c2i_fontRGB']);
-                $red = hexdec(substr($rgb,0,2));
-                $grn = hexdec(substr($rgb,2,2));
-                $blu = hexdec(substr($rgb,4,2));
-                $bg_red = 255 - $red;
-                $bg_grn = 255 - $grn;
-                $bg_blu = 255 - $blu;
-                $width = 0;
-                $height = 0;
-                $offset_x = 0;
-                $offset_y = 0;
-                $bounds = array();
-                $image = "";
-                $bounds = ImageTTFBBox($size, 0, $font, "W");
-                $font_height = abs($bounds[7]-$bounds[1]);
-                $bounds = ImageTTFBBox($size, 0, $font, $msg);
-                $width = abs($bounds[4]-$bounds[6]);
-                $height = abs($bounds[7]-$bounds[1]);
-                $offset_y = $font_height+abs(($height - $font_height)/2)-1;
-                $offset_x = 0;
-                $image = imagecreatetruecolor($width+($pad*2),$height+($pad*2));
-                imagesavealpha($image, true);
-                $foreground = ImageColorAllocate($image, $red, $grn, $blu);
-                $background = imagecolorallocatealpha($image, 0, 0, 0, 127);
-                imagefill($image, 0, 0, $background);
-                ImageTTFText($image, $size, 0, $offset_x+$pad, $offset_y+$pad, $foreground, $font, $msg);
-                Header("Content-type: image/png");
-                imagePNG($image);
+                $rgb         = str_replace( "#", "", self::$cryptXOptions['c2i_fontRGB'] );
+                $red         = hexdec( substr( $rgb, 0, 2 ) );
+                $grn         = hexdec( substr( $rgb, 2, 2 ) );
+                $blu         = hexdec( substr( $rgb, 4, 2 ) );
+                $bg_red      = 255 - $red;
+                $bg_grn      = 255 - $grn;
+                $bg_blu      = 255 - $blu;
+                $width       = 0;
+                $height      = 0;
+                $offset_x    = 0;
+                $offset_y    = 0;
+                $bounds      = array();
+                $image       = "";
+                $bounds      = ImageTTFBBox( $size, 0, $font, "W" );
+                $font_height = abs( $bounds[7] - $bounds[1] );
+                $bounds      = ImageTTFBBox( $size, 0, $font, $msg );
+                $width       = abs( $bounds[4] - $bounds[6] );
+                $height      = abs( $bounds[7] - $bounds[1] );
+                $offset_y    = $font_height + abs( ( $height - $font_height ) / 2 ) - 1;
+                $offset_x    = 0;
+                $image       = imagecreatetruecolor( $width + ( $pad * 2 ), $height + ( $pad * 2 ) );
+                imagesavealpha( $image, true );
+                $foreground = ImageColorAllocate( $image, $red, $grn, $blu );
+                $background = imagecolorallocatealpha( $image, 0, 0, 0, 127 );
+                imagefill( $image, 0, 0, $background );
+                ImageTTFText( $image, $size, 0, round( $offset_x + $pad, 0 ), round( $offset_y + $pad, 0 ), $foreground, $font, $msg );
+                Header( "Content-type: image/png" );
+                imagePNG( $image );
                 die;
             }
@@ -214 +224 @@
      * @return void
      */
-    function addPluginFilters( string $filterName): void
-    {
+    function addPluginFilters( string $filterName ): void {
         global $shortcode_tags;
-        if ( array_key_exists('autolink', self::$cryptXOptions) && self::$cryptXOptions['autolink']) {
-            $this->addAutoLinkFilters($filterName);
-            if (!empty($shortcode_tags)) {
-                $this->addAutoLinkFilters($filterName, 11);
+        if ( array_key_exists( 'autolink', self::$cryptXOptions ) && self::$cryptXOptions['autolink'] ) {
+            $this->addAutoLinkFilters( $filterName );
+            if ( ! empty( $shortcode_tags ) ) {
+                $this->addAutoLinkFilters( $filterName, 11 );
                 //add_filter($filterName, [$this,'autolink'], 11);
             }
         }
-        $this->addOtherFilters($filterName);
+        $this->addOtherFilters( $filterName );
     }
 
@@ -236 +245 @@
      * @return void
      */
-    function addAutoLinkFilters( string $filterName, $prio = 5): void
-    {
-        add_filter($filterName, [$this, 'addLinkToEmailAddresses' ], $prio);
+    function addAutoLinkFilters( string $filterName, $prio = 5 ): void {
+        add_filter( $filterName, [ $this, 'addLinkToEmailAddresses' ], $prio );
     }
 
@@ -252 +260 @@
      * @return void
      */
-    function addOtherFilters( string $filterName): void
-    {
-        add_filter($filterName, [$this, 'findEmailAddressesInContent' ], 12);
-        add_filter($filterName, [$this,'replaceEmailInContent'], 13);
+    function addOtherFilters( string $filterName ): void {
+        add_filter( $filterName, [ $this, 'findEmailAddressesInContent' ], 12 );
+        add_filter( $filterName, [ $this, 'replaceEmailInContent' ], 13 );
     }
 
@@ -265 +272 @@
      * @return bool Returns true if the ID is excluded, false otherwise.
      */
-    function isIdExcluded( int $ID): bool
-    {
-        $excludedIds = explode(",", self::$cryptXOptions['excludedIDs']);
-        return in_array($ID, $excludedIds);
+    function isIdExcluded( int $ID ): bool {
+        $excludedIds = explode( ",", self::$cryptXOptions['excludedIDs'] );
+
+        return in_array( $ID, $excludedIds );
     }
 
@@ -279 +286 @@
      * @param string $content The
      */
-    function replaceEmailInContent( string $content, bool $isShortcode=false): string {
+    function replaceEmailInContent( string $content, bool $isShortcode = false ): string {
         global $post;
-        $postId = (is_object($post))? $post->ID : -1;
-        if ( !$this->isIdExcluded($postId) || $isShortcode ) {
-            $content = $this->replaceEmailWithLinkText($content);
-        }
+        $postId = ( is_object( $post ) ) ? $post->ID : - 1;
+        if ( ! $this->isIdExcluded( $postId ) || $isShortcode ) {
+            $content = $this->replaceEmailWithLinkText( $content );
+        }
+
         return $content;
     }
@@ -295 +303 @@
      * @return string The content with email addresses replaced with link text.
      */
-    function replaceEmailWithLinkText( string $content): string
-    {
+    function replaceEmailWithLinkText( string $content ): string {
         $emailPattern = "/([_a-zA-Z0-9-+]+(\.[_a-zA-Z0-9-+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*(\.[a-zA-Z]{2,}))/i";
-        return preg_replace_callback($emailPattern, [$this,'encodeEmailToLinkText'], $content );
+
+        return preg_replace_callback( $emailPattern, [ $this, 'encodeEmailToLinkText' ], $content );
     }
 
@@ -308 +316 @@
      * @return string The encoded link text.
      */
-    function encodeEmailToLinkText( array $Match): string {
-        if($this->in_white_list($Match)) return $Match[1];
-        switch (self::$cryptXOptions['opt_linktext']) {
+    function encodeEmailToLinkText( array $Match ): string {
+        if ( $this->inWhiteList( $Match ) ) {
+            return $Match[1];
+        }
+        switch ( self::$cryptXOptions['opt_linktext'] ) {
             case 1:
                 $text = $this->getLinkText();
@@ -319 +329 @@
             case 3:
                 $img_url = wp_get_attachment_url( self::$cryptXOptions['alt_uploadedimage'] );
-                $text = $this->getUploadedImage($img_url);
-                self::$imageCounter++;
+                $text    = $this->getUploadedImage( $img_url );
+                self::$imageCounter ++;
                 break;
             case 4:
-                $text = antispambot($Match[1]);
+                $text = antispambot( $Match[1] );
                 break;
             case 5:
-                $text = $this->getImageFromText($Match);
-                self::$imageCounter++;
+                $text = $this->getImageFromText( $Match );
+                self::$imageCounter ++;
                 break;
             default:
-                $text = $this->getDefaultLinkText($Match);
+                $text = $this->getDefaultLinkText( $Match );
         }
 
@@ -343 +353 @@
      * @return bool True if the match is in the whitelist, false otherwise.
      */
-    function in_white_list( array $Match): bool
-    {
-        $whiteList = array_filter(array_map('trim', explode(",", self::$cryptXOptions['whiteList'])));
-        $tmp = explode(".", $Match[0]);
-        return in_array(end($tmp), $whiteList);
+    function inWhiteList( array $Match ): bool {
+        $whiteList = array_filter( array_map( 'trim', explode( ",", self::$cryptXOptions['whiteList'] ) ) );
+        $tmp       = explode( ".", $Match[0] );
+
+        return in_array( end( $tmp ), $whiteList );
     }
 
@@ -364 +374 @@
      * @return string The HTML image tag
      */
-    function getLinkImage(): string
-    {
-        return "<img src=\"" . self::$cryptXOptions['alt_linkimage'] . "\" class=\"cryptxImage\" alt=\"" . self::$cryptXOptions['alt_linkimage_title'] . "\" title=\"" . antispambot(self::$cryptXOptions['alt_linkimage_title']) . "\" />";
+    function getLinkImage(): string {
+        return "<img src=\"" . self::$cryptXOptions['alt_linkimage'] . "\" class=\"cryptxImage\" alt=\"" . self::$cryptXOptions['alt_linkimage_title'] . "\" title=\"" . antispambot( self::$cryptXOptions['alt_linkimage_title'] ) . "\" />";
     }
 
@@ -376 +385 @@
      * @return string The HTML tag for the image.
      */
-    function getUploadedImage( string $img_url): string
-    {
-        return "<img src=\"" . $img_url . "\" class=\"cryptxImage cryptxImage_" . self::$imageCounter . "\" alt=\"" . self::$cryptXOptions['http_linkimage_title'] . " title=\"" . antispambot( self::$cryptXOptions['http_linkimage_title']) . "\" />";
+    function getUploadedImage( string $img_url ): string {
+        return "<img src=\"" . $img_url . "\" class=\"cryptxImage cryptxImage_" . self::$imageCounter . "\" alt=\"" . self::$cryptXOptions['http_linkimage_title'] . " title=\"" . antispambot( self::$cryptXOptions['http_linkimage_title'] ) . "\" />";
     }
 
@@ -388 +396 @@
      * @return string Returns the HTML image element.
      */
-    function getImageFromText( array $Match): string
-    {
-        return "<img src=\"" . get_bloginfo('url') . "/" . md5( get_bloginfo('url') ) . "/" . antispambot($Match[1]) . "\" class=\"cryptxImage cryptxImage_" . self::$imageCounter . "\" alt=\"" . antispambot($Match[1]) . "\" title=\"" . antispambot($Match[1]) . "\" />";
+    function getImageFromText( array $Match ): string {
+        return "<img src=\"" . get_bloginfo( 'url' ) . "/" . md5( get_bloginfo( 'url' ) ) . "/" . antispambot( $Match[1] ) . "\" class=\"cryptxImage cryptxImage_" . self::$imageCounter . "\" alt=\"" . antispambot( $Match[1] ) . "\" title=\"" . antispambot( $Match[1] ) . "\" />";
     }
 
@@ -404 +411 @@
      *                     for each element.
      */
-    function getDefaultLinkText( array $Match): string
-    {
-        $text = str_replace("@", self::$cryptXOptions['at'], $Match[1]);
-        return str_replace(".", self::$cryptXOptions['dot'], $text);
+    function getDefaultLinkText( array $Match ): string {
+        $text = str_replace( "@", self::$cryptXOptions['at'], $Match[1] );
+
+        return str_replace( ".", self::$cryptXOptions['dot'], $text );
     }
 
@@ -419 +426 @@
      * @return array An array of file names that match the filter.
      */
-    function getFilesInDirectory( string $path, array $filter): array
-    {
-        $directoryHandle = opendir($path);
+    function getFilesInDirectory( string $path, array $filter ): array {
+        $directoryHandle  = opendir( $path );
         $directoryContent = array();
-        while ($file = readdir($directoryHandle)) {
-            $fileExtension = substr(strtolower($file), -3);
-            if (in_array($fileExtension, $filter)) {
+        while ( $file = readdir( $directoryHandle ) ) {
+            $fileExtension = substr( strtolower( $file ), - 3 );
+            if ( in_array( $fileExtension, $filter ) ) {
                 $directoryContent[] = $file;
             }
         }
+
         return $directoryContent;
     }
@@ -440 +447 @@
      * @return string|null The content with encrypted email addresses, or null if $content is null.
      */
-    function findEmailAddressesInContent( ?string $content, bool $shortcode = false): ?string
-    {
-        global $post;
-
-        if ($content === null) return null;
-
-        $postId = (is_object($post))? $post->ID : -1;
-
-        $isIdExcluded = $this->isIdExcluded($postId);
-        $mailtoRegex = '/<a (.*?)(href=("|\')mailto:(.*?)("|\')(.*?)|)>\s*(.*?)\s*<\/a>/i';
-
-        if ((!$isIdExcluded || $shortcode !== null)) {
-            $content = preg_replace_callback($mailtoRegex, [$this, 'encryptEmailAddress' ], $content);
+    function findEmailAddressesInContent( ?string $content, bool $shortcode = false ): ?string {
+        global $post;
+
+        if ( $content === null ) {
+            return null;
+        }
+
+        $postId = ( is_object( $post ) ) ? $post->ID : - 1;
+
+        $isIdExcluded = $this->isIdExcluded( $postId );
+        $mailtoRegex  = '/<a (.*?)(href=("|\')mailto:(.*?)("|\')(.*?)|)>\s*(.*?)\s*<\/a>/i';
+
+        if ( ( ! $isIdExcluded || $shortcode !== null ) ) {
+            $content = preg_replace_callback( $mailtoRegex, [ $this, 'encryptEmailAddress' ], $content );
         }
 
@@ -465 +473 @@
      * @return string The search results with encrypted email addresses.
      */
-    function encryptEmailAddress( array $searchResults): string
-    {
+    function encryptEmailAddress( array $searchResults ): string {
         $originalValue = $searchResults[0];
 
-        if(strpos($searchResults[self::INDEX_TO_CHECK], '@') === self::NOT_FOUND) {
+        if ( strpos( $searchResults[ self::INDEX_TO_CHECK ], '@' ) === self::NOT_FOUND ) {
             return $originalValue;
         }
 
-        $mailReference = self::MAIL_IDENTIFIER . $searchResults[self::INDEX_TO_CHECK];
+        $mailReference = self::MAIL_IDENTIFIER . $searchResults[ self::INDEX_TO_CHECK ];
 
         if ( str_starts_with( $searchResults[ self::INDEX_TO_CHECK ], self::SUBJECT_IDENTIFIER ) ) {
@@ -480 +487 @@
 
         $return = $originalValue;
-        if (!empty(self::$cryptXOptions['java'])) {
-            $javaHandler="javascript:DeCryptX('" . $this->generateHashFromString($searchResults[self::INDEX_TO_CHECK]) . "')";
-            $return = str_replace(self::MAIL_IDENTIFIER.$searchResults[self::INDEX_TO_CHECK], $javaHandler, $originalValue);
-        }
-
-        $return = str_replace($mailReference, antispambot($mailReference), $return);
-
-        if(!empty(self::$cryptXOptions['css_id'])) {
-            $return = preg_replace(self::PATTERN, '$1" id="'.self::$cryptXOptions['css_id'] . '">', $return );
-        }
-
-        if(!empty(self::$cryptXOptions['css_class'])) {
-            $return = preg_replace(self::PATTERN, '$1" class="'.self::$cryptXOptions['css_class'] . '">', $return );
+        if ( ! empty( self::$cryptXOptions['java'] ) ) {
+            $javaHandler = "javascript:DeCryptX('" . $this->generateHashFromString( $searchResults[ self::INDEX_TO_CHECK ] ) . "')";
+            $return      = str_replace( self::MAIL_IDENTIFIER . $searchResults[ self::INDEX_TO_CHECK ], $javaHandler, $originalValue );
+        }
+
+        $return = str_replace( $mailReference, antispambot( $mailReference ), $return );
+
+        if ( ! empty( self::$cryptXOptions['css_id'] ) ) {
+            $return = preg_replace( self::PATTERN, '$1" id="' . self::$cryptXOptions['css_id'] . '">', $return );
+        }
+
+        if ( ! empty( self::$cryptXOptions['css_class'] ) ) {
+            $return = preg_replace( self::PATTERN, '$1" class="' . self::$cryptXOptions['css_class'] . '">', $return );
         }
 
@@ -506 +513 @@
      * @return string The generated hash string.
      */
-    function generateHashFromString( string $inputString): string
-    {
-        $inputString = str_replace("&", "&", $inputString);
-        $crypt = '';
-
-        for ($i = 0; $i < strlen($inputString); $i++) {
+    function generateHashFromString( string $inputString ): string {
+        $inputString = str_replace( "&", "&", $inputString );
+        $crypt       = '';
+
+        for ( $i = 0; $i < strlen( $inputString ); $i ++ ) {
             do {
-                $salt = mt_rand(0, 3);
-                $asciiValue = ord(substr($inputString, $i)) + $salt;
-                if (8364 <= $asciiValue) {
+                $salt       = mt_rand( 0, 3 );
+                $asciiValue = ord( substr( $inputString, $i ) ) + $salt;
+                if ( 8364 <= $asciiValue ) {
                     $asciiValue = 128;
                 }
-            } while (in_array($asciiValue, self::ASCII_VALUES_BLACKLIST));
-
-            $crypt .= $salt . chr($asciiValue);
-        }
+            } while ( in_array( $asciiValue, self::ASCII_VALUES_BLACKLIST ) );
+
+            $crypt .= $salt . chr( $asciiValue );
+        }
+
         return $crypt;
     }
@@ -535 +542 @@
      * @return string The content with emails auto-linked.
      */
-    function addLinkToEmailAddresses( string $content, bool $shortcode = false ): string
-    {
+    function addLinkToEmailAddresses( string $content, bool $shortcode = false ): string {
         global $post;
         $postID = is_object( $post ) ? $post->ID : - 1;
@@ -575 +581 @@
     function installCryptX(): void {
         global $wpdb;
-        self::$cryptXOptions['admin_notices_deprecated'] =true;
-        if ( self::$cryptXOptions['excludedIDs'] == "") {
-            $tmp = array();
-            $excludes = $wpdb->get_results("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = 'cryptxoff' AND meta_value = 'true'");
-            if(count($excludes) > 0) {
-                foreach ($excludes as $exclude) {
+        self::$cryptXOptions['admin_notices_deprecated'] = true;
+        if ( self::$cryptXOptions['excludedIDs'] == "" ) {
+            $tmp      = array();
+            $excludes = $wpdb->get_results( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = 'cryptxoff' AND meta_value = 'true'" );
+            if ( count( $excludes ) > 0 ) {
+                foreach ( $excludes as $exclude ) {
                     $tmp[] = $exclude->post_id;
                 }
-                sort($tmp);
-                self::$cryptXOptions['excludedIDs'] = implode(",", $tmp);
-                update_option( 'cryptX', self::$cryptXOptions);
+                sort( $tmp );
+                self::$cryptXOptions['excludedIDs'] = implode( ",", $tmp );
+                update_option( 'cryptX', self::$cryptXOptions );
                 self::$cryptXOptions = $this->loadCryptXOptionsWithDefaults(); // reread Options
-                $wpdb->query("DELETE FROM $wpdb->postmeta WHERE meta_key = 'cryptxoff'");
-            }
-        }
-        if (empty(self::$cryptXOptions['c2i_font'])) {
+                $wpdb->query( "DELETE FROM $wpdb->postmeta WHERE meta_key = 'cryptxoff'" );
+            }
+        }
+        if ( empty( self::$cryptXOptions['c2i_font'] ) ) {
             self::$cryptXOptions['c2i_font'] = CRYPTX_DIR_PATH . 'fonts/' . $firstFont[0];
         }
-        if (empty(self::$cryptXOptions['c2i_fontSize'])) {
+        if ( empty( self::$cryptXOptions['c2i_fontSize'] ) ) {
             self::$cryptXOptions['c2i_fontSize'] = 10;
         }
-        if (empty(self::$cryptXOptions['c2i_fontRGB'])) {
+        if ( empty( self::$cryptXOptions['c2i_fontRGB'] ) ) {
             self::$cryptXOptions['c2i_fontRGB'] = '000000';
         }
-        update_option( 'cryptX', self::$cryptXOptions);
+        update_option( 'cryptX', self::$cryptXOptions );
         self::$cryptXOptions = $this->loadCryptXOptionsWithDefaults(); // reread Options
     }
 
-    function addHooksHelper($function_name, $hook_name): void {
-        if ( function_exists($function_name) ) {
-            call_user_func($function_name, 'cryptx', 'CryptX', [$this, 'metaCheckbox' ], $hook_name);
+    function addHooksHelper( $function_name, $hook_name ): void {
+        if ( function_exists( $function_name ) ) {
+            call_user_func( $function_name, 'cryptx', 'CryptX', [ $this, 'metaCheckbox' ], $hook_name );
         } else {
-            add_action("dbx_{$hook_name}_sidebar", [$this, 'metaOptionFieldset' ]);
+            add_action( "dbx_{$hook_name}_sidebar", [ $this, 'metaOptionFieldset' ] );
         }
     }
 
     function metaBox(): void {
-        $this->addHooksHelper('add_meta_box', 'post');
-        $this->addHooksHelper('add_meta_box', 'page');
+        $this->addHooksHelper( 'add_meta_box', 'post' );
+        $this->addHooksHelper( 'add_meta_box', 'page' );
     }
 
@@ -622 +628 @@
      * functionality for the current post or page. If the current post or page ID is excluded
      **/
-    function metaCheckbox(): void
-    {
+    function metaCheckbox(): void {
         global $post;
         ?>
-        <label><input type="checkbox" name="disable_cryptx_pageid" <?php if ($this->isIdExcluded($post->ID)) { echo 'checked="checked"'; } ?>/>
-        Disable CryptX for this post/page</label>
+        <label><input type="checkbox" name="disable_cryptx_pageid" <?php if ( $this->isIdExcluded( $post->ID ) ) {
+                echo 'checked="checked"';
+            } ?>/>
+            Disable CryptX for this post/page</label>
         <?php
     }
@@ -637 +644 @@
      * @return void
      */
-    function metaOptionFieldset(): void
-    {
+    function metaOptionFieldset(): void {
         global $post;
-        if ( current_user_can('edit_posts') ) { ?>
-            <fieldset id="cryptxoption" class="dbx-box">
-                <h3 class="dbx-handle">CryptX</h3>
-                <div class="dbx-content">
-                    <label><input type="checkbox" name="disable_cryptx_pageid" <?php if ($this->isIdExcluded($post->ID)) { echo 'checked="checked"'; } ?>/> Disable CryptX for this post/page</label>
-                </div>
-            </fieldset>
+        if ( current_user_can( 'edit_posts' ) ) { ?>
+            <fieldset id="cryptxoption" class="dbx-box">
+                <h3 class="dbx-handle">CryptX</h3>
+                <div class="dbx-content">
+                    <label><input type="checkbox"
+                                  name="disable_cryptx_pageid" <?php if ( $this->isIdExcluded( $post->ID ) ) {
+                            echo 'checked="checked"';
+                        } ?>/> Disable CryptX for this post/page</label>
+                </div>
+            </fieldset>
             <?php
         }
@@ -658 +667 @@
      * @return void
      */
-    function addPostIdToExcludedList( int $postId): void {
-        $postId                             = wp_is_post_revision($postId) ?: $postId;
-        $excludedIds                        = $this->updateExcludedIdsList(self::$cryptXOptions['excludedIDs'], $postId);
-        self::$cryptXOptions['excludedIDs'] = implode(",", array_filter($excludedIds));
-        update_option('cryptX', self::$cryptXOptions);
+    function addPostIdToExcludedList( int $postId ): void {
+        $postId                             = wp_is_post_revision( $postId ) ?: $postId;
+        $excludedIds                        = $this->updateExcludedIdsList( self::$cryptXOptions['excludedIDs'], $postId );
+        self::$cryptXOptions['excludedIDs'] = implode( ",", array_filter( $excludedIds ) );
+        update_option( 'cryptX', self::$cryptXOptions );
     }
 
@@ -673 +682 @@
      * @return array The updated excluded IDs list as an array, with the ID removed if it existed and added if necessary.
      */
-    function updateExcludedIdsList(string $excludedIds, int $postId): array {
-        $excludedIdsArray = explode(",", $excludedIds);
-        $excludedIdsArray = $this->removePostIdFromExcludedIds($excludedIdsArray, $postId);
-        $excludedIdsArray = $this->addPostIdToExcludedIdsIfNecessary($excludedIdsArray, $postId);
-        return $this->makeExcludedIdsUniqueAndSorted($excludedIdsArray);
+    function updateExcludedIdsList( string $excludedIds, int $postId ): array {
+        $excludedIdsArray = explode( ",", $excludedIds );
+        $excludedIdsArray = $this->removePostIdFromExcludedIds( $excludedIdsArray, $postId );
+        $excludedIdsArray = $this->addPostIdToExcludedIdsIfNecessary( $excludedIdsArray, $postId );
+
+        return $this->makeExcludedIdsUniqueAndSorted( $excludedIdsArray );
     }
 
@@ -688 +698 @@
      * @return array The updated array of excluded IDs without the specified post ID.
      */
-    function removePostIdFromExcludedIds(array $excludedIds, int $postId): array {
-        foreach($excludedIds as $key => $id) {
-            if($id == $postId) {
-                unset($excludedIds[$key]);
+    function removePostIdFromExcludedIds( array $excludedIds, int $postId ): array {
+        foreach ( $excludedIds as $key => $id ) {
+            if ( $id == $postId ) {
+                unset( $excludedIds[ $key ] );
                 break;
             }
         }
+
         return $excludedIds;
     }
@@ -706 +717 @@
      * @return array The updated array of excluded IDs.
      */
-    function addPostIdToExcludedIdsIfNecessary(array $excludedIds, int $postId): array {
-        if (isset($_POST['disable_cryptx_pageid'])) {
+    function addPostIdToExcludedIdsIfNecessary( array $excludedIds, int $postId ): array {
+        if ( isset( $_POST['disable_cryptx_pageid'] ) ) {
             $excludedIds[] = $postId;
         }
+
         return $excludedIds;
     }
@@ -720 +732 @@
      * @return array The array of excluded IDs with duplicate values removed and sorted in ascending order.
      */
-    function makeExcludedIdsUniqueAndSorted(array $excludedIds): array {
-        $excludedIds = array_unique($excludedIds);
-        sort($excludedIds);
+    function makeExcludedIdsUniqueAndSorted( array $excludedIds ): array {
+        $excludedIds = array_unique( $excludedIds );
+        sort( $excludedIds );
+
         return $excludedIds;
     }
@@ -734 +747 @@
      * @return void
      */
-    function showMessage($message, $errormsg = false): void {
-        if ($errormsg) {
+    function showMessage( $message, $errormsg = false ): void {
+        if ( $errormsg ) {
             echo '<div id="message" class="error">';
-        }
-        else {
+        } else {
             echo '<div id="message" class="updated fade">';
         }
@@ -751 +763 @@
      */
     function getDomain(): string {
-        return $this->trimSlashFromDomain($this->removeProtocolFromUrl($this->getSiteUrl()));
+        return $this->trimSlashFromDomain( $this->removeProtocolFromUrl( $this->getSiteUrl() ) );
     }
 
@@ -770 +782 @@
      * @return string The URL string without the protocol.
      */
-    function removeProtocolFromUrl(string $url): string
-    {
+    function removeProtocolFromUrl( string $url ): string {
         return preg_replace( '|https?://|', '', $url );
     }
@@ -782 +793 @@
      * @return string The domain with the trailing slash removed.
      */
-    function trimSlashFromDomain(string $domain): string
-    {
+    function trimSlashFromDomain( string $domain ): string {
         if ( $slashPosition = strpos( $domain, '/' ) ) {
             $domain = substr( $domain, 0, $slashPosition );
         }
+
         return $domain;
     }
@@ -797 +808 @@
     function loadJavascriptFiles(): void {
         wp_enqueue_script( 'cryptx-js', CRYPTX_DIR_URL . 'js/cryptx.min.js', false, false, self::$cryptXOptions['load_java'] );
-        wp_enqueue_style( 'cryptx-styles', CRYPTX_DIR_URL . 'css/cryptx.css');
+        wp_enqueue_style( 'cryptx-styles', CRYPTX_DIR_URL . 'css/cryptx.css' );
     }
 
@@ -810 +821 @@
      */
     function updateCryptXSettings(): void {
-        self::$cryptXOptions = get_option('cryptX');
-        if( isset( self::$cryptXOptions['version'] ) && version_compare(CRYPTX_VERSION, self::$cryptXOptions['version']) > 0 ) {
-            if( isset(self::$cryptXOptions['version']) ) unset(self::$cryptXOptions['version']);
-            if( isset(self::$cryptXOptions['c2i_font']) ) unset(self::$cryptXOptions['c2i_font']);
-            if( isset(self::$cryptXOptions['c2i_fontRGB']) ) self::$cryptXOptions['c2i_fontRGB'] = "#" . self::$cryptXOptions['c2i_fontRGB'];
-            if( isset(self::$cryptXOptions['alt_uploadedimage']) && !is_int(self::$cryptXOptions['alt_uploadedimage'])) {
-                unset(self::$cryptXOptions['alt_uploadedimage']);
-                if( self::$cryptXOptions['opt_linktext'] == 3 ) unset(self::$cryptXOptions['opt_linktext']);
+        self::$cryptXOptions = get_option( 'cryptX' );
+        if ( isset( self::$cryptXOptions['version'] ) && version_compare( CRYPTX_VERSION, self::$cryptXOptions['version'] ) > 0 ) {
+            if ( isset( self::$cryptXOptions['version'] ) ) {
+                unset( self::$cryptXOptions['version'] );
+            }
+            if ( isset( self::$cryptXOptions['c2i_font'] ) ) {
+                unset( self::$cryptXOptions['c2i_font'] );
+            }
+            if ( isset( self::$cryptXOptions['c2i_fontRGB'] ) ) {
+                self::$cryptXOptions['c2i_fontRGB'] = "#" . self::$cryptXOptions['c2i_fontRGB'];
+            }
+            if ( isset( self::$cryptXOptions['alt_uploadedimage'] ) && ! is_int( self::$cryptXOptions['alt_uploadedimage'] ) ) {
+                unset( self::$cryptXOptions['alt_uploadedimage'] );
+                if ( self::$cryptXOptions['opt_linktext'] == 3 ) {
+                    unset( self::$cryptXOptions['opt_linktext'] );
+                }
             }
             self::$cryptXOptions = wp_parse_args( self::$cryptXOptions, $this->getCryptXOptionsDefaults() );
-            update_option( 'cryptX', self::$cryptXOptions);
-        }
+            update_option( 'cryptX', self::$cryptXOptions );
+        }
+    }
+
+    /**
+     * Encodes a string by replacing special characters with their corresponding HTML entities.
+     *
+     * @param string|null $str The string to be encoded.
+     *
+     * @return string The encoded string, or an array of encoded strings if an array was passed.
+     */
+    function encodeString( ?string $str ): string {
+        $str     = htmlentities( $str, ENT_QUOTES, 'UTF-8' );
+        $special = array(
+            '[' => '&#91;',
+            ']' => '&#93;',
+        );
+
+        return str_replace( array_keys( $special ), array_values( $special ), $str );
+    }
+
+    /**
+     * Decodes a string that has been HTML entity encoded.
+     *
+     * @param string|null $str The string to decode. If null, an empty string is returned.
+     *
+     * @return string The decoded string.
+     */
+    function decodeString( ?string $str ): string {
+        return html_entity_decode( $str, ENT_QUOTES, 'UTF-8' );
+    }
+
+    function convertArrayToArgumentString( array $args = [] ): string {
+        $string = "";
+        if ( ! empty( $args ) ) {
+            foreach ( $args as $key => $value ) {
+                $string .= sprintf( " %s=\"%s\"", $key, $this->encodeString( $value ) );
+            }
+            $string .= " encoded=\"true\"";
+        }
+
+        return $string;
     }
 }

cryptx/trunk/cryptx.php

@@ -4 +4 @@
  * Plugin URI: http://weber-nrw.de/wordpress/cryptx/
  * Description: No more SPAM by spiders scanning you site for email addresses. With CryptX you can hide all your email addresses, with and without a mailto-link, by converting them using javascript or UNICODE.
- * Version: 3.4.4
+ * Version: 3.4.5
  * Requires at least: 6.0
  * Author: Ralf Weber
@@ -42 +42 @@
  * @return string The encrypted content wrapped in the Cryptx shortcode.
  */
-function encryptx( ?string $content, string $args = "" ): string {
-    return do_shortcode( '[cryptx]' . $content . '[/cryptx]' );
+function encryptx( ?string $content, ?array $args ): string {
+    $CryptX_instance = Cryptx\CryptX::getInstance();
+    return do_shortcode( '[cryptx'. $CryptX_instance->convertArrayToArgumentString( $args ).']' . $content . '[/cryptx]' );
 }

cryptx/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 6.0
 Tested up to: 6.5
-Stable tag: 3.4.4
+Stable tag: 3.4.5
 Requires PHP: 7.4
 License: GPLv2 or later
@@ -22 +22 @@
 
 == Changelog ==
+= 3.4.5 =
+* The "encryptx" template function has been revised so that it accepts arguments again, as in previous versions.
 = 3.4.4 =
 * changed type hinting of an argument to be string or null on some methods