OSDN Git Service

BugTrack/2247 External link cushion page
[pukiwiki/pukiwiki.git] / lib / html.php
index e77baf3..3ba8c3f 100644 (file)
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone.
 // html.php
 // Copyright
-//   2002-2017 PukiWiki Development Team
+//   2002-2018 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -17,6 +17,7 @@ function catbody($title, $page, $body)
        global $javascript, $nofollow;
        global $_LANG, $_LINK, $_IMAGE;
        global $auth_type, $auth_user;
+       global $html_meta_referrer_policy;
 
        global $pkwk_dtd;     // XHTML 1.1, XHTML1.0, HTML 4.01 Transitional...
        global $page_title;   // Title of this site
@@ -46,7 +47,7 @@ function catbody($title, $page, $body)
 
        $_page  = isset($vars['page']) ? $vars['page'] : '';
        $r_page = pagename_urlencode($_page);
-
+       $is_edit_preview = isset($vars['preview']);
        // Canonical URL
        $canonical_url = get_page_uri($_page, PKWK_URI_ABSOLUTE);
 
@@ -80,7 +81,8 @@ function catbody($title, $page, $body)
                        break;
                case AUTH_TYPE_EXTERNAL:
                case AUTH_TYPE_SAML:
-                       $login_link = get_auth_external_login_url($_page, $_LINK['reload']);
+                       $login_link = get_auth_external_login_url($_page,
+                               get_page_uri($_page, PKWK_URI_ROOT));
                        break;
        }
        $_LINK['login']    = htmlsc($login_link);
@@ -185,7 +187,7 @@ function catbody($title, $page, $body)
                }
        }
        // Embed Scripting data
-       $html_scripting_data = get_html_scripting_data();
+       $html_scripting_data = get_html_scripting_data($_page, $is_edit_preview);
 
        // Compat: 'HTML convert time' without time about MenuBar and skin
        $taketime = elapsedtime();
@@ -215,10 +217,16 @@ function _decorate_Nth_word($matches)
 
 /**
  * Get data used by JavaScript modules
+ *
+ * @param $page page name
+ * @param $in_editing true if preview in editing
  */
-function get_html_scripting_data()
+function get_html_scripting_data($page, $in_editing)
 {
        global $ticket_link_sites, $plugin;
+       global $external_link_cushion_page, $external_link_cushion;
+       global $topicpath_title;
+       global $ticket_jira_default_site;
        if (!isset($ticket_link_sites) || !is_array($ticket_link_sites)) {
                return '';
        }
@@ -239,15 +247,24 @@ EOS;
                'base_uri_pathname' => get_base_uri(PKWK_URI_ROOT),
                'base_uri_absolute' => get_base_uri(PKWK_URI_ABSOLUTE)
        );
-       $props_json = htmlsc(json_encode($props, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+       $h_props = htmlsc_json($props);
        $site_props = <<<EOS
-<div data-key="site-props" data-value="$props_json"></div>
+<input type="hidden" class="site-props" value="$h_props" />
 EOS;
        $h_plugin = htmlsc($plugin);
        $plugin_prop = <<<EOS
 <input type="hidden" class="plugin-name" value="$h_plugin" />
 EOS;
-
+       // Page name
+       $h_page_name = htmlsc($page);
+       $page_name_data = <<<EOS
+<input type="hidden" class="page-name" value="$h_page_name" />
+EOS;
+       // Page is editing (preview)
+       $in_editing_value = ($plugin === 'edit' && $in_editing) ? 'true' : 'false';
+       $page_edit_data = <<<EOS
+<input type="hidden" class="page-in-edit" value="$in_editing_value" />
+EOS;
        // AutoTicketLink
        $filtered_ticket_link_sites = array();
        foreach ($ticket_link_sites as $s) {
@@ -256,16 +273,55 @@ EOS;
                }
                array_push($filtered_ticket_link_sites, $s);
        }
-       $h_ticket_link_sites = htmlsc(json_encode($filtered_ticket_link_sites,
-               JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+       $h_ticket_link_sites = htmlsc_json($filtered_ticket_link_sites);
        $ticketlink_data = <<<EOS
 <input type="hidden" class="ticketlink-def" value="$h_ticket_link_sites" />
 EOS;
+       // AutoTicketLink - JIRA
+       $ticket_jira_projects = get_ticketlink_jira_projects();
+       $ticketlink_jira_data = '';
+       if (count($ticket_jira_projects) > 0) {
+               $h_ticket_jira_projects = htmlsc_json($ticket_jira_projects);
+               $ticketlink_jira_data = <<<EOS
+<input type="hidden" class="ticketlink-jira-def" value="$h_ticket_jira_projects" />
+EOS;
+       }
+       $ticketlink_jira_default_data = '';
+       if (isset($ticket_jira_default_site) && is_array($ticket_jira_default_site)) {
+               $h_ticket_jira_default_site = htmlsc_json($ticket_jira_default_site);
+               $ticketlink_jira_default_data = <<<EOS
+<input type="hidden" class="ticketlink-jira-default-def" value="$h_ticket_jira_default_site" />
+EOS;
+       }
+       // External link cushion page
+       $external_link_cushion_data = '';
+       if ($external_link_cushion_page) {
+               $h_cushion = htmlsc_json($external_link_cushion);
+               $external_link_cushion_data = <<<EOS
+<input type="hidden" class="external-link-cushion" value="$h_cushion" />
+EOS;
+       }
+       // Topicpath title
+       $topicpath_data = '';
+       if ($topicpath_title && exist_plugin('topicpath')) {
+               $parents = plugin_topicpath_parent_links($page);
+               $h_topicpath = htmlsc(json_encode($parents,
+               JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+               $topicpath_data = <<<EOS
+<input type="hidden" class="topicpath-links" value="$h_topicpath" />
+EOS;
+       }
        $data = <<<EOS
 <div id="pukiwiki-site-properties" style="display:none;">
 $site_props
 $plugin_prop
+$page_name_data
+$page_edit_data
 $ticketlink_data
+$ticketlink_jira_data
+$ticketlink_jira_default_data
+$external_link_cushion_data
+$topicpath_data
 </div>
 EOS;
        return $data;
@@ -274,20 +330,17 @@ EOS;
 // Show 'edit' form
 function edit_form($page, $postdata, $digest = FALSE, $b_template = TRUE)
 {
-       global $vars, $rows, $cols, $hr, $function_freeze;
+       global $vars, $rows, $cols;
        global $_btn_preview, $_btn_repreview, $_btn_update, $_btn_cancel, $_msg_help;
-       global $whatsnew, $_btn_template, $_btn_load, $load_template_func;
+       global $_btn_template, $_btn_load, $load_template_func;
        global $notimeupdate;
-       global $_title_list, $_label_template_pages;
        global $_msg_edit_cancel_confirm, $_msg_edit_unloadbefore_message;
        global $rule_page;
 
        $script = get_base_uri();
        // Newly generate $digest or not
        if ($digest === FALSE) $digest = md5(join('', get_source($page)));
-
        $refer = $template = '';
-
        // Add plugin
        $addtag = $add_top = '';
        if(isset($vars['add'])) {
@@ -300,57 +353,22 @@ function edit_form($page, $postdata, $digest = FALSE, $b_template = TRUE)
                                '<span class="small">' . $_btn_addtop . '</span>' .
                        '</label>';
        }
-
        if($load_template_func && $b_template) {
-               $tpage_names = array(); // Pages marked as template
-               $template_page = ':config/Templates';
-               $page_max = 100;
-               foreach(get_source($template_page) as $_templates) {
-                       $m = array();
-                       if (! preg_match('#\-\s*\[\[([^\[\]]+)\]\]#', $_templates, $m)) continue;
-                       $tpage = preg_replace('#^./#', "$template_page/", $m[1]);
-                       if (! is_page($tpage)) continue;
-                       $tpage_names[] = $tpage;
-               }
-               $page_names = array();
-               foreach(get_existpages() as $_page) {
-                       if ($_page == $whatsnew || check_non_list($_page) ||
-                               !is_page_readable($_page))
-                               continue;
-                       if (preg_match('/template/i', $_page)) {
-                               $tpage_names[] = $_page;
-                       } else {
-                               if (count($page_names) >= $page_max) continue;
-                               $page_names[] = $_page;
-                       }
-               }
-               $tpage_names2 = array_values(array_unique($tpage_names));
-               natcasesort($tpage_names2);
-               natcasesort($page_names);
+               $template_page_list = get_template_page_list();
                $tpages = array(); // Template pages
-               $npages = array(); // Normal pages
-               foreach($tpage_names2 as $p) {
+               foreach($template_page_list as $p) {
                        $ps = htmlsc($p);
                        $tpages[] = '   <option value="' . $ps . '">' . $ps . '</option>';
                }
-               foreach($page_names as $p) {
-                       $ps = htmlsc($p);
-                       $npages[] = '   <option value="' . $ps . '">' . $ps . '</option>';
-               }
-               if (count($page_names) === $page_max) {
-                       $npages[] = '   <option value="">...</option>';
+               if (count($template_page_list) > 0) {
+                       $s_tpages = join("\n", $tpages);
+               } else {
+                       $s_tpages = '   <option value="">(no template pages)</option>';
                }
-               $s_tpages  = join("\n", $tpages);
-               $s_npages  = join("\n", $npages);
                $template = <<<EOD
   <select name="template_page">
    <option value="">-- $_btn_template --</option>
-   <optgroup label="$_label_template_pages">
 $s_tpages
-   </optgroup>
-   <optgroup label="$_title_list">
-$s_npages
-   </optgroup>
   </select>
   <input type="submit" name="template" value="$_btn_load" accesskey="r" />
   <br />
@@ -424,6 +442,47 @@ EOD;
        return $body;
 }
 
+/**
+ * Get template page list.
+ */
+function get_template_page_list()
+{
+       global $whatsnew;
+       $tpage_names = array(); // Pages marked as template
+       $template_page = ':config/Templates';
+       $page_max = 100;
+       foreach(get_source($template_page) as $_templates) {
+               $m = array();
+               if (! preg_match('#\-\s*\[\[([^\[\]]+)\]\]#', $_templates, $m)) continue;
+               $tpage = preg_replace('#^./#', "$template_page/", $m[1]);
+               if (! is_page($tpage)) continue;
+               $tpage_names[] = $tpage;
+       }
+       $page_names = array();
+       $page_list = get_existpages();
+       if (count($page_list) > $page_max) {
+               // Extract only template name pages
+               $target_pages = array();
+               foreach ($page_list as $_page) {
+                       if (preg_match('/template/i', $_page)) {
+                               $target_pages[] = $_page;
+                       }
+               }
+       } else {
+               $target_pages = $page_list;
+       }
+       foreach ($target_pages as $_page) {
+               if ($_page == $whatsnew || check_non_list($_page) ||
+                       !is_page_readable($_page)) {
+                       continue;
+               }
+               $tpage_names[] = $_page;
+       }
+       $tempalte_page_list = array_values(array_unique($tpage_names));
+       natcasesort($tempalte_page_list);
+       return $tempalte_page_list;
+}
+
 // Related pages
 function make_related($page, $tag = '')
 {
@@ -594,8 +653,11 @@ function pkwk_headers_sent()
 // Output common HTTP headers
 function pkwk_common_headers()
 {
+       global $http_response_custom_headers;
        if (! PKWK_OPTIMISE) pkwk_headers_sent();
-
+       foreach ($http_response_custom_headers as $header) {
+               header($header);
+       }
        if(defined('PKWK_ZLIB_LOADABLE_MODULE')) {
                $matches = array();
                if(ini_get('zlib.output_compression') &&