close
WordPress.org
Get WordPress

Plugin Directory

Changeset 3206855


Ignore:
Timestamp:
12/12/2024 10:06:11 AM (15 months ago)
Author:
podpirate
Message:

Release 1.2.1

Location:
multisite-blog-alias
Files:
18 edited
1 copied

Legend:

Unmodified
Added
Removed

  • multisite-blog-alias/tags/1.2.1/.wp-release-info.json

    r3046426 r3206855  
    22  "id": "https://github.com/mcguffin/multisite-blog-alias/raw/master/.wp-release-info.json",
    33  "slug": "multisite-blog-alias",
    4   "version": "1.2.0",
     4  "version": "1.2.1",
    55  "url": "https://github.com/mcguffin/multisite-blog-alias",
    6   "package": "https://github.com/mcguffin/multisite-blog-alias/releases/download/1.2.0/multisite-blog-alias.zip",
    7   "tested": "6.5",
     6  "package": "https://github.com/mcguffin/multisite-blog-alias/releases/download/1.2.1/multisite-blog-alias.zip",
     7  "tested": "6.7",
    88  "requires_php": "5.6"
    99}

  • multisite-blog-alias/tags/1.2.1/include/BlogAlias/Admin/Ajax.php

    r3046426 r3206855  
    118118
    119119
    120                 if ( $item->redirect ) {
    121 
    122                 } else {
     120                if ( ! $item->redirect ) {
    123121                    printf(
    124122                        '<span class="dashicons dashicons-%1$s"></span>',
    … …  
    140138
    141139            if ( $result->success ) {
    142                 $message_class = 'success';
     140                $message_class = 'notice-success';
    143141                $messages = [
    144142                    esc_html__( 'Redirects are working.', 'multisite-blog-alias' )

  • multisite-blog-alias/tags/1.2.1/include/BlogAlias/Admin/NetworkAdmin.php

    r3046426 r3206855  
    126126                </td>
    127127            </tr>
     128            <tr valign="top">
     129                <th scope="row">
     130                    <label for="blog_alias_redirect_wp_admin_opt">
     131                        <?php esc_html_e( 'Redirect wp-admin', 'multisite-blog-alias' ); ?>
     132                    </label>
     133                </th>
     134                <td>
     135                    <input type="checkbox" name="blog_alias_redirect_wp_admin" id="blog_alias_redirect_wp_admin_opt" value="1" <?php checked( get_site_option( 'blog_alias_redirect_wp_admin' ), 1, true ); ?> />
     136                    <label for="blog_alias_redirect_wp_admin_opt">
     137                        <?php esc_html_e( 'Redirect Admin Path', 'multisite-blog-alias' ); ?>
     138                    </label>
     139                    <p class="description">
     140                        <?php esc_html_e( 'If checked wp-login.php and wp-admin/ paths request path will be appended to the redirect URL.', 'multisite-blog-alias' ); ?>
     141                    </p>
     142                </td>
     143            </tr>
    128144        </table>
    129145        <?php
    … …  
    137153        check_admin_referer( 'siteoptions' );
    138154
    139         $with_path = 0;
     155        $with_path       = 0;
     156        $with_admin_path = 0;
    140157
    141158        if ( isset( $_POST['blog_alias_redirect_with_path'] ) ) {
    142159            $with_path = intval( $_POST['blog_alias_redirect_with_path'] );
    143160        }
     161        if ( isset( $_POST['blog_alias_redirect_wp_admin'] ) ) {
     162            $with_admin_path = intval( $_POST['blog_alias_redirect_wp_admin'] );
     163        }
    144164
    145165        update_site_option( 'blog_alias_redirect_with_path', $with_path );
     166        update_site_option( 'blog_alias_redirect_wp_admin', $with_admin_path );
    146167
    147168    }

  • multisite-blog-alias/tags/1.2.1/include/version.php

    r3046426 r3206855  
    1 <?php return "1.2.0";
     1<?php return "1.2.1";

  • multisite-blog-alias/tags/1.2.1/index.php

    r3046426 r3206855  
    66Description: Alias Domains for Blogs
    77Author: Jörn Lund
    8 Version: 1.2.0
     8Version: 1.2.1
    99Author URI: https://github.com/mcguffin
    1010License: GPL3

  • multisite-blog-alias/tags/1.2.1/languages/multisite-blog-alias-cli.pot

    r3046426 r3206855  
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: Multisite Blog Alias 1.2.0\n"
     5"Project-Id-Version: Multisite Blog Alias 1.2.1\n"
    66"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/multisite-blog-alias\n"
    77"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    1010"Content-Type: text/plain; charset=UTF-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "POT-Creation-Date: 2024-03-06T15:20:57+00:00\n"
     12"POT-Creation-Date: 2024-12-12T10:05:48+00:00\n"
    1313"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    14 "X-Generator: WP-CLI 2.10.0\n"
     14"X-Generator: WP-CLI 2.11.0\n"
    1515"X-Domain: multisite-blog-alias-cli\n"
    1616

  • multisite-blog-alias/tags/1.2.1/languages/multisite-blog-alias.pot

    r3046426 r3206855  
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: Multisite Blog Alias 1.2.0\n"
     5"Project-Id-Version: Multisite Blog Alias 1.2.1\n"
    66"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/multisite-blog-alias\n"
    77"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    1010"Content-Type: text/plain; charset=UTF-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "POT-Creation-Date: 2024-03-06T15:20:57+00:00\n"
     12"POT-Creation-Date: 2024-12-12T10:05:48+00:00\n"
    1313"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    14 "X-Generator: WP-CLI 2.10.0\n"
     14"X-Generator: WP-CLI 2.11.0\n"
    1515"X-Domain: multisite-blog-alias\n"
    1616
    … …  
    5050msgstr ""
    5151
    52 #: include/BlogAlias/Admin/Ajax.php:144
     52#: include/BlogAlias/Admin/Ajax.php:142
    5353msgid "Redirects are working."
    5454msgstr ""
    5555
    5656#. translators: lock symbol
    57 #: include/BlogAlias/Admin/Ajax.php:151
     57#: include/BlogAlias/Admin/Ajax.php:149
    5858msgid "However there are problems with your SSL-Certificates indicated by a red %s in the report above."
    5959msgstr ""
    6060
    61 #: include/BlogAlias/Admin/Ajax.php:156
     61#: include/BlogAlias/Admin/Ajax.php:154
    6262msgid "Some of the redirects (the gray ones) are not triggered by this system."
    6363msgstr ""
    … …  
    7777msgstr ""
    7878
    79 #: include/BlogAlias/Admin/NetworkAdmin.php:164
     79#: include/BlogAlias/Admin/NetworkAdmin.php:131
     80msgid "Redirect wp-admin"
     81msgstr ""
     82
     83#: include/BlogAlias/Admin/NetworkAdmin.php:137
     84msgid "Redirect Admin Path"
     85msgstr ""
     86
     87#: include/BlogAlias/Admin/NetworkAdmin.php:140
     88msgid "If checked wp-login.php and wp-admin/ paths request path will be appended to the redirect URL."
     89msgstr ""
     90
     91#: include/BlogAlias/Admin/NetworkAdmin.php:185
    8092msgid "Uninstall"
    8193msgstr ""
    8294
    83 #: include/BlogAlias/Admin/NetworkAdmin.php:177
     95#: include/BlogAlias/Admin/NetworkAdmin.php:198
    8496msgid "Sorry, you are not allowed to install plugins."
    8597msgstr ""
    8698
    87 #: include/BlogAlias/Admin/NetworkAdmin.php:194
     99#: include/BlogAlias/Admin/NetworkAdmin.php:215
    88100msgid "Multisite Blog Alias Setup"
    89101msgstr ""
    90102
    91 #: include/BlogAlias/Admin/NetworkAdmin.php:201
     103#: include/BlogAlias/Admin/NetworkAdmin.php:222
    92104msgid "The plugin is well configured. The instructions are kept for documentation purposes."
    93105msgstr ""
    94106
    95 #: include/BlogAlias/Admin/NetworkAdmin.php:209
     107#: include/BlogAlias/Admin/NetworkAdmin.php:230
    96108msgid "The plugin could not write to the filesystem."
    97109msgstr ""
    98110
    99 #: include/BlogAlias/Admin/NetworkAdmin.php:210
     111#: include/BlogAlias/Admin/NetworkAdmin.php:231
    100112msgid "Please change the following."
    101113msgstr ""
    102114
    103115#. translators: sunrise.php file location
    104 #: include/BlogAlias/Admin/NetworkAdmin.php:247
     116#: include/BlogAlias/Admin/NetworkAdmin.php:268
    105117msgid "Insert the following code into %s:"
    106118msgstr ""
    107119
    108120#. translators: sunrise.php file location
    109 #: include/BlogAlias/Admin/NetworkAdmin.php:253
     121#: include/BlogAlias/Admin/NetworkAdmin.php:274
    110122msgid "Create a file %s with the following code:"
    111123msgstr ""
    112124
    113 #: include/BlogAlias/Admin/NetworkAdmin.php:288
     125#: include/BlogAlias/Admin/NetworkAdmin.php:309
    114126msgid "Sorry, you are not allowed to run the uninstall procedere."
    115127msgstr ""
    116128
    117 #: include/BlogAlias/Admin/NetworkAdmin.php:309
     129#: include/BlogAlias/Admin/NetworkAdmin.php:330
    118130msgid "Uninstall Plugin?"
    119131msgstr ""
    120132
    121 #: include/BlogAlias/Admin/NetworkAdmin.php:312
     133#: include/BlogAlias/Admin/NetworkAdmin.php:333
    122134msgid "Uninstalling the plugin will remove the Blog Alias table from the database and deactivate the plugin."
    123135msgstr ""
    124136
    125137#. translators: number of domains being deleted on plugin uninstall
    126 #: include/BlogAlias/Admin/NetworkAdmin.php:321
     138#: include/BlogAlias/Admin/NetworkAdmin.php:342
    127139msgid "%d Alias Domain will be deleted."
    128140msgid_plural "%d Alias Domains will be deleted."
    … …  
    130142msgstr[1] ""
    131143
    132 #: include/BlogAlias/Admin/NetworkAdmin.php:329
     144#: include/BlogAlias/Admin/NetworkAdmin.php:350
    133145msgid "No, back to plugins"
    134146msgstr ""
    135147
    136 #: include/BlogAlias/Admin/NetworkAdmin.php:332
     148#: include/BlogAlias/Admin/NetworkAdmin.php:353
    137149msgid "Yes, Uninstall now!"
    138150msgstr ""
    139151
    140 #: include/BlogAlias/Admin/NetworkAdmin.php:491
     152#: include/BlogAlias/Admin/NetworkAdmin.php:512
    141153msgid "Alias Domains"
    142154msgstr ""
    143155
    144 #: include/BlogAlias/Admin/NetworkAdmin.php:588
     156#: include/BlogAlias/Admin/NetworkAdmin.php:609
    145157msgid "Not Configured:"
    146158msgstr ""
    147159
    148160#. Translators: link to setup page
    149 #: include/BlogAlias/Admin/NetworkAdmin.php:591
     161#: include/BlogAlias/Admin/NetworkAdmin.php:612
    150162msgid "Multisite Blog Alias is not configured. Please visit %s for instructions."
    151163msgstr ""
    152164
    153 #: include/BlogAlias/Admin/NetworkAdmin.php:595
     165#: include/BlogAlias/Admin/NetworkAdmin.php:616
    154166msgid "the setup page"
    155167msgstr ""
    156168
    157 #: include/BlogAlias/Admin/NetworkAdmin.php:604
     169#: include/BlogAlias/Admin/NetworkAdmin.php:625
    158170msgid "Alias created"
    159171msgstr ""
    160172
    161173#. translators: number of deleted entries
    162 #: include/BlogAlias/Admin/NetworkAdmin.php:609
     174#: include/BlogAlias/Admin/NetworkAdmin.php:630
    163175msgid "%d entry deleted"
    164176msgid_plural "%d entries deleted"
    … …  
    166178msgstr[1] ""
    167179
    168 #: include/BlogAlias/Admin/NetworkAdmin.php:624
     180#: include/BlogAlias/Admin/NetworkAdmin.php:645
    169181msgid "Notice:"
    170182msgstr ""
    171183
    172 #: include/BlogAlias/Admin/NetworkAdmin.php:625
     184#: include/BlogAlias/Admin/NetworkAdmin.php:646
    173185#: include/BlogAlias/Model/AliasDomains.php:333
    174186msgid "The domain matches the site URL of this blog."
    175187msgstr ""
    176188
    177 #: include/BlogAlias/Admin/NetworkAdmin.php:629
     189#: include/BlogAlias/Admin/NetworkAdmin.php:650
    178190msgid "Error:"
    179191msgstr ""
    180192
    181 #: include/BlogAlias/Admin/NetworkAdmin.php:684
     193#: include/BlogAlias/Admin/NetworkAdmin.php:705
    182194msgid "Add Domain Alias"
    183195msgstr ""
    184196
    185 #: include/BlogAlias/Admin/NetworkAdmin.php:697
     197#: include/BlogAlias/Admin/NetworkAdmin.php:718
    186198msgid "Add"
    187199msgstr ""
    188200
    189 #: include/BlogAlias/Admin/NetworkAdmin.php:705
     201#: include/BlogAlias/Admin/NetworkAdmin.php:726
    190202msgid "Domain Aliases"
    191203msgstr ""
    192204
    193 #: include/BlogAlias/Admin/NetworkAdmin.php:710
     205#: include/BlogAlias/Admin/NetworkAdmin.php:731
    194206msgid "– No Domain Aliases –"
    195207msgstr ""
    196208
    197 #: include/BlogAlias/Admin/NetworkAdmin.php:717
     209#: include/BlogAlias/Admin/NetworkAdmin.php:738
    198210msgid "Alias Domain"
    199211msgstr ""
    200212
    201 #: include/BlogAlias/Admin/NetworkAdmin.php:718
     213#: include/BlogAlias/Admin/NetworkAdmin.php:739
    202214msgid "Status"
    203215msgstr ""
    204216
    205 #: include/BlogAlias/Admin/NetworkAdmin.php:752
     217#: include/BlogAlias/Admin/NetworkAdmin.php:773
    206218msgid "Remove"
    207219msgstr ""
    208220
    209 #: include/BlogAlias/Admin/NetworkAdmin.php:767
     221#: include/BlogAlias/Admin/NetworkAdmin.php:788
    210222msgid "Check Status"
    211223msgstr ""
    212224
    213 #: include/BlogAlias/Admin/NetworkAdmin.php:770
     225#: include/BlogAlias/Admin/NetworkAdmin.php:791
    214226msgid "Remove All"
    215227msgstr ""

  • multisite-blog-alias/tags/1.2.1/readme.txt

    r3046426 r3206855  
    55Requires at least: 4.8
    66Requires PHP: 5.6
    7 Tested up to: 6.5
    8 Stable tag: 1.2.0
     7Tested up to: 6.7
     8Stable tag: 1.2.1
    99License: GPLv3 or later
    1010License URI: http://www.gnu.org/licenses/gpl-3.0.html
    … …  
    147147== Changelog ==
    148148
     149= 1.2.1 =
     150 - New Option: Redirect /wp-admin/ and /wp-login.php
     151
    149152= 1.2.0 =
    150153 - Status Check: Test SSL status and show redirects

  • multisite-blog-alias/tags/1.2.1/sunrise.php

    r3046426 r3206855  
    5454            : get_site_option( 'blog_alias_redirect_with_path' );
    5555
    56         if ( $add_path ) {
    57             $redirect = untrailingslashit( $site_url ) . $path;
    58         } else {
    59             $redirect = trailingslashit( $site_url );
     56        $add_admin_path = get_site_option( 'blog_alias_redirect_wp_admin' );
     57
     58        if ( $add_admin_path && preg_match( '/^\/wp-(admin\/|login\.php$)/', $_SERVER['REQUEST_URI'] ) ) {
     59            // REQUEST_URI, SCRIPT_NAME, SCRIPT_URI, PHP_SELF
     60            $path = $_SERVER['REQUEST_URI'];
     61        } else if ( ! $add_path ) {
     62            $path = '/';
    6063        }
     64
     65        $redirect = untrailingslashit( $site_url ) . $path;
    6166
    6267        http_response_code( 301 );

  • multisite-blog-alias/trunk/.wp-release-info.json

    r3046426 r3206855  
    22  "id": "https://github.com/mcguffin/multisite-blog-alias/raw/master/.wp-release-info.json",
    33  "slug": "multisite-blog-alias",
    4   "version": "1.2.0",
     4  "version": "1.2.1",
    55  "url": "https://github.com/mcguffin/multisite-blog-alias",
    6   "package": "https://github.com/mcguffin/multisite-blog-alias/releases/download/1.2.0/multisite-blog-alias.zip",
    7   "tested": "6.5",
     6  "package": "https://github.com/mcguffin/multisite-blog-alias/releases/download/1.2.1/multisite-blog-alias.zip",
     7  "tested": "6.7",
    88  "requires_php": "5.6"
    99}

  • multisite-blog-alias/trunk/include/BlogAlias/Admin/Ajax.php

    r3046426 r3206855  
    118118
    119119
    120                 if ( $item->redirect ) {
    121 
    122                 } else {
     120                if ( ! $item->redirect ) {
    123121                    printf(
    124122                        '<span class="dashicons dashicons-%1$s"></span>',
    … …  
    140138
    141139            if ( $result->success ) {
    142                 $message_class = 'success';
     140                $message_class = 'notice-success';
    143141                $messages = [
    144142                    esc_html__( 'Redirects are working.', 'multisite-blog-alias' )

  • multisite-blog-alias/trunk/include/BlogAlias/Admin/NetworkAdmin.php

    r3046426 r3206855  
    126126                </td>
    127127            </tr>
     128            <tr valign="top">
     129                <th scope="row">
     130                    <label for="blog_alias_redirect_wp_admin_opt">
     131                        <?php esc_html_e( 'Redirect wp-admin', 'multisite-blog-alias' ); ?>
     132                    </label>
     133                </th>
     134                <td>
     135                    <input type="checkbox" name="blog_alias_redirect_wp_admin" id="blog_alias_redirect_wp_admin_opt" value="1" <?php checked( get_site_option( 'blog_alias_redirect_wp_admin' ), 1, true ); ?> />
     136                    <label for="blog_alias_redirect_wp_admin_opt">
     137                        <?php esc_html_e( 'Redirect Admin Path', 'multisite-blog-alias' ); ?>
     138                    </label>
     139                    <p class="description">
     140                        <?php esc_html_e( 'If checked wp-login.php and wp-admin/ paths request path will be appended to the redirect URL.', 'multisite-blog-alias' ); ?>
     141                    </p>
     142                </td>
     143            </tr>
    128144        </table>
    129145        <?php
    … …  
    137153        check_admin_referer( 'siteoptions' );
    138154
    139         $with_path = 0;
     155        $with_path       = 0;
     156        $with_admin_path = 0;
    140157
    141158        if ( isset( $_POST['blog_alias_redirect_with_path'] ) ) {
    142159            $with_path = intval( $_POST['blog_alias_redirect_with_path'] );
    143160        }
     161        if ( isset( $_POST['blog_alias_redirect_wp_admin'] ) ) {
     162            $with_admin_path = intval( $_POST['blog_alias_redirect_wp_admin'] );
     163        }
    144164
    145165        update_site_option( 'blog_alias_redirect_with_path', $with_path );
     166        update_site_option( 'blog_alias_redirect_wp_admin', $with_admin_path );
    146167
    147168    }

  • multisite-blog-alias/trunk/include/version.php

    r3046426 r3206855  
    1 <?php return "1.2.0";
     1<?php return "1.2.1";

  • multisite-blog-alias/trunk/index.php

    r3046426 r3206855  
    66Description: Alias Domains for Blogs
    77Author: Jörn Lund
    8 Version: 1.2.0
     8Version: 1.2.1
    99Author URI: https://github.com/mcguffin
    1010License: GPL3

  • multisite-blog-alias/trunk/languages/multisite-blog-alias-cli.pot

    r3046426 r3206855  
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: Multisite Blog Alias 1.2.0\n"
     5"Project-Id-Version: Multisite Blog Alias 1.2.1\n"
    66"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/multisite-blog-alias\n"
    77"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    1010"Content-Type: text/plain; charset=UTF-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "POT-Creation-Date: 2024-03-06T15:20:57+00:00\n"
     12"POT-Creation-Date: 2024-12-12T10:05:48+00:00\n"
    1313"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    14 "X-Generator: WP-CLI 2.10.0\n"
     14"X-Generator: WP-CLI 2.11.0\n"
    1515"X-Domain: multisite-blog-alias-cli\n"
    1616

  • multisite-blog-alias/trunk/languages/multisite-blog-alias.pot

    r3046426 r3206855  
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: Multisite Blog Alias 1.2.0\n"
     5"Project-Id-Version: Multisite Blog Alias 1.2.1\n"
    66"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/multisite-blog-alias\n"
    77"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    1010"Content-Type: text/plain; charset=UTF-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "POT-Creation-Date: 2024-03-06T15:20:57+00:00\n"
     12"POT-Creation-Date: 2024-12-12T10:05:48+00:00\n"
    1313"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    14 "X-Generator: WP-CLI 2.10.0\n"
     14"X-Generator: WP-CLI 2.11.0\n"
    1515"X-Domain: multisite-blog-alias\n"
    1616
    … …  
    5050msgstr ""
    5151
    52 #: include/BlogAlias/Admin/Ajax.php:144
     52#: include/BlogAlias/Admin/Ajax.php:142
    5353msgid "Redirects are working."
    5454msgstr ""
    5555
    5656#. translators: lock symbol
    57 #: include/BlogAlias/Admin/Ajax.php:151
     57#: include/BlogAlias/Admin/Ajax.php:149
    5858msgid "However there are problems with your SSL-Certificates indicated by a red %s in the report above."
    5959msgstr ""
    6060
    61 #: include/BlogAlias/Admin/Ajax.php:156
     61#: include/BlogAlias/Admin/Ajax.php:154
    6262msgid "Some of the redirects (the gray ones) are not triggered by this system."
    6363msgstr ""
    … …  
    7777msgstr ""
    7878
    79 #: include/BlogAlias/Admin/NetworkAdmin.php:164
     79#: include/BlogAlias/Admin/NetworkAdmin.php:131
     80msgid "Redirect wp-admin"
     81msgstr ""
     82
     83#: include/BlogAlias/Admin/NetworkAdmin.php:137
     84msgid "Redirect Admin Path"
     85msgstr ""
     86
     87#: include/BlogAlias/Admin/NetworkAdmin.php:140
     88msgid "If checked wp-login.php and wp-admin/ paths request path will be appended to the redirect URL."
     89msgstr ""
     90
     91#: include/BlogAlias/Admin/NetworkAdmin.php:185
    8092msgid "Uninstall"
    8193msgstr ""
    8294
    83 #: include/BlogAlias/Admin/NetworkAdmin.php:177
     95#: include/BlogAlias/Admin/NetworkAdmin.php:198
    8496msgid "Sorry, you are not allowed to install plugins."
    8597msgstr ""
    8698
    87 #: include/BlogAlias/Admin/NetworkAdmin.php:194
     99#: include/BlogAlias/Admin/NetworkAdmin.php:215
    88100msgid "Multisite Blog Alias Setup"
    89101msgstr ""
    90102
    91 #: include/BlogAlias/Admin/NetworkAdmin.php:201
     103#: include/BlogAlias/Admin/NetworkAdmin.php:222
    92104msgid "The plugin is well configured. The instructions are kept for documentation purposes."
    93105msgstr ""
    94106
    95 #: include/BlogAlias/Admin/NetworkAdmin.php:209
     107#: include/BlogAlias/Admin/NetworkAdmin.php:230
    96108msgid "The plugin could not write to the filesystem."
    97109msgstr ""
    98110
    99 #: include/BlogAlias/Admin/NetworkAdmin.php:210
     111#: include/BlogAlias/Admin/NetworkAdmin.php:231
    100112msgid "Please change the following."
    101113msgstr ""
    102114
    103115#. translators: sunrise.php file location
    104 #: include/BlogAlias/Admin/NetworkAdmin.php:247
     116#: include/BlogAlias/Admin/NetworkAdmin.php:268
    105117msgid "Insert the following code into %s:"
    106118msgstr ""
    107119
    108120#. translators: sunrise.php file location
    109 #: include/BlogAlias/Admin/NetworkAdmin.php:253
     121#: include/BlogAlias/Admin/NetworkAdmin.php:274
    110122msgid "Create a file %s with the following code:"
    111123msgstr ""
    112124
    113 #: include/BlogAlias/Admin/NetworkAdmin.php:288
     125#: include/BlogAlias/Admin/NetworkAdmin.php:309
    114126msgid "Sorry, you are not allowed to run the uninstall procedere."
    115127msgstr ""
    116128
    117 #: include/BlogAlias/Admin/NetworkAdmin.php:309
     129#: include/BlogAlias/Admin/NetworkAdmin.php:330
    118130msgid "Uninstall Plugin?"
    119131msgstr ""
    120132
    121 #: include/BlogAlias/Admin/NetworkAdmin.php:312
     133#: include/BlogAlias/Admin/NetworkAdmin.php:333
    122134msgid "Uninstalling the plugin will remove the Blog Alias table from the database and deactivate the plugin."
    123135msgstr ""
    124136
    125137#. translators: number of domains being deleted on plugin uninstall
    126 #: include/BlogAlias/Admin/NetworkAdmin.php:321
     138#: include/BlogAlias/Admin/NetworkAdmin.php:342
    127139msgid "%d Alias Domain will be deleted."
    128140msgid_plural "%d Alias Domains will be deleted."
    … …  
    130142msgstr[1] ""
    131143
    132 #: include/BlogAlias/Admin/NetworkAdmin.php:329
     144#: include/BlogAlias/Admin/NetworkAdmin.php:350
    133145msgid "No, back to plugins"
    134146msgstr ""
    135147
    136 #: include/BlogAlias/Admin/NetworkAdmin.php:332
     148#: include/BlogAlias/Admin/NetworkAdmin.php:353
    137149msgid "Yes, Uninstall now!"
    138150msgstr ""
    139151
    140 #: include/BlogAlias/Admin/NetworkAdmin.php:491
     152#: include/BlogAlias/Admin/NetworkAdmin.php:512
    141153msgid "Alias Domains"
    142154msgstr ""
    143155
    144 #: include/BlogAlias/Admin/NetworkAdmin.php:588
     156#: include/BlogAlias/Admin/NetworkAdmin.php:609
    145157msgid "Not Configured:"
    146158msgstr ""
    147159
    148160#. Translators: link to setup page
    149 #: include/BlogAlias/Admin/NetworkAdmin.php:591
     161#: include/BlogAlias/Admin/NetworkAdmin.php:612
    150162msgid "Multisite Blog Alias is not configured. Please visit %s for instructions."
    151163msgstr ""
    152164
    153 #: include/BlogAlias/Admin/NetworkAdmin.php:595
     165#: include/BlogAlias/Admin/NetworkAdmin.php:616
    154166msgid "the setup page"
    155167msgstr ""
    156168
    157 #: include/BlogAlias/Admin/NetworkAdmin.php:604
     169#: include/BlogAlias/Admin/NetworkAdmin.php:625
    158170msgid "Alias created"
    159171msgstr ""
    160172
    161173#. translators: number of deleted entries
    162 #: include/BlogAlias/Admin/NetworkAdmin.php:609
     174#: include/BlogAlias/Admin/NetworkAdmin.php:630
    163175msgid "%d entry deleted"
    164176msgid_plural "%d entries deleted"
    … …  
    166178msgstr[1] ""
    167179
    168 #: include/BlogAlias/Admin/NetworkAdmin.php:624
     180#: include/BlogAlias/Admin/NetworkAdmin.php:645
    169181msgid "Notice:"
    170182msgstr ""
    171183
    172 #: include/BlogAlias/Admin/NetworkAdmin.php:625
     184#: include/BlogAlias/Admin/NetworkAdmin.php:646
    173185#: include/BlogAlias/Model/AliasDomains.php:333
    174186msgid "The domain matches the site URL of this blog."
    175187msgstr ""
    176188
    177 #: include/BlogAlias/Admin/NetworkAdmin.php:629
     189#: include/BlogAlias/Admin/NetworkAdmin.php:650
    178190msgid "Error:"
    179191msgstr ""
    180192
    181 #: include/BlogAlias/Admin/NetworkAdmin.php:684
     193#: include/BlogAlias/Admin/NetworkAdmin.php:705
    182194msgid "Add Domain Alias"
    183195msgstr ""
    184196
    185 #: include/BlogAlias/Admin/NetworkAdmin.php:697
     197#: include/BlogAlias/Admin/NetworkAdmin.php:718
    186198msgid "Add"
    187199msgstr ""
    188200
    189 #: include/BlogAlias/Admin/NetworkAdmin.php:705
     201#: include/BlogAlias/Admin/NetworkAdmin.php:726
    190202msgid "Domain Aliases"
    191203msgstr ""
    192204
    193 #: include/BlogAlias/Admin/NetworkAdmin.php:710
     205#: include/BlogAlias/Admin/NetworkAdmin.php:731
    194206msgid "– No Domain Aliases –"
    195207msgstr ""
    196208
    197 #: include/BlogAlias/Admin/NetworkAdmin.php:717
     209#: include/BlogAlias/Admin/NetworkAdmin.php:738
    198210msgid "Alias Domain"
    199211msgstr ""
    200212
    201 #: include/BlogAlias/Admin/NetworkAdmin.php:718
     213#: include/BlogAlias/Admin/NetworkAdmin.php:739
    202214msgid "Status"
    203215msgstr ""
    204216
    205 #: include/BlogAlias/Admin/NetworkAdmin.php:752
     217#: include/BlogAlias/Admin/NetworkAdmin.php:773
    206218msgid "Remove"
    207219msgstr ""
    208220
    209 #: include/BlogAlias/Admin/NetworkAdmin.php:767
     221#: include/BlogAlias/Admin/NetworkAdmin.php:788
    210222msgid "Check Status"
    211223msgstr ""
    212224
    213 #: include/BlogAlias/Admin/NetworkAdmin.php:770
     225#: include/BlogAlias/Admin/NetworkAdmin.php:791
    214226msgid "Remove All"
    215227msgstr ""

  • multisite-blog-alias/trunk/readme.txt

    r3046426 r3206855  
    55Requires at least: 4.8
    66Requires PHP: 5.6
    7 Tested up to: 6.5
    8 Stable tag: 1.2.0
     7Tested up to: 6.7
     8Stable tag: 1.2.1
    99License: GPLv3 or later
    1010License URI: http://www.gnu.org/licenses/gpl-3.0.html
    … …  
    147147== Changelog ==
    148148
     149= 1.2.1 =
     150 - New Option: Redirect /wp-admin/ and /wp-login.php
     151
    149152= 1.2.0 =
    150153 - Status Check: Test SSL status and show redirects

  • multisite-blog-alias/trunk/sunrise.php

    r3046426 r3206855  
    5454            : get_site_option( 'blog_alias_redirect_with_path' );
    5555
    56         if ( $add_path ) {
    57             $redirect = untrailingslashit( $site_url ) . $path;
    58         } else {
    59             $redirect = trailingslashit( $site_url );
     56        $add_admin_path = get_site_option( 'blog_alias_redirect_wp_admin' );
     57
     58        if ( $add_admin_path && preg_match( '/^\/wp-(admin\/|login\.php$)/', $_SERVER['REQUEST_URI'] ) ) {
     59            // REQUEST_URI, SCRIPT_NAME, SCRIPT_URI, PHP_SELF
     60            $path = $_SERVER['REQUEST_URI'];
     61        } else if ( ! $add_path ) {
     62            $path = '/';
    6063        }
     64
     65        $redirect = untrailingslashit( $site_url ) . $path;
    6166
    6267        http_response_code( 301 );
Note: See TracChangeset for help on using the changeset viewer.