Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin
This commit is contained in:
Hugues Peccatte
commit
0a7ff32c28
10
ChangeLog
10
ChangeLog
@ -79,10 +79,12 @@ phpMyAdmin - ChangeLog
|
||||
+ rfe Support virtual columns in MySQL 5.7.5+
|
||||
+ rfe #1517 Support for virtual/persistent columns in MariaDB
|
||||
- bug #4984 Undefined <feature>work upon upgrade to new version
|
||||
- issue #1817 Creating configuration storage tables fail in MySQL 5.7
|
||||
- issue #6118 Parser does not handle nested selects
|
||||
- issue #5437 Support SELECT ... FROM DUAL
|
||||
- issue #4962 Support UNION
|
||||
- issue #1817 Creating configuration storage tables fail in MySQL 5.7
|
||||
- issue #6118 Parser does not handle nested selects
|
||||
- issue #5437 Support SELECT ... FROM DUAL
|
||||
- issue #4962 Support UNION
|
||||
- issue #11322 Missing null checkbox when grid editing a null cell
|
||||
+ Upgrade TCPDF to version 6.2.9
|
||||
|
||||
4.4.13.0 (not yet released)
|
||||
- issue #1808 "Improve table structure" generates invalid SQL
|
||||
|
||||
@ -571,6 +571,7 @@ var AJAX = {
|
||||
}
|
||||
}
|
||||
request.push("call_done=1");
|
||||
request.push("v=" + encodeURIComponent(PMA_commonParams.get('PMA_VERSION')));
|
||||
// Download the composite js file, if necessary
|
||||
if (needRequest) {
|
||||
this.appendScript("js/get_scripts.js.php?" + request.join("&"));
|
||||
|
||||
@ -1056,10 +1056,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
|
||||
datepicker_div.css({'top': 0, 'left': 0, 'position': 'relative'});
|
||||
$(g.cEdit).append(datepicker_div);
|
||||
|
||||
if (is_null){
|
||||
$(g.cEdit).find('.edit_area').hide();
|
||||
}
|
||||
|
||||
// cancel any click on the datepicker element
|
||||
$editArea.find('> *').click(function (e) {
|
||||
e.stopPropagation();
|
||||
@ -1073,7 +1069,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
|
||||
$editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
|
||||
}
|
||||
}
|
||||
if ($editArea.children().length > 0 && !is_null) {
|
||||
if ($editArea.children().length > 0) {
|
||||
$editArea.show();
|
||||
}
|
||||
}
|
||||
|
||||
@ -264,7 +264,7 @@ function edit(type)
|
||||
*
|
||||
**/
|
||||
|
||||
function history(ncolumn_name, nobj, ntab, nobj_no, ntype)
|
||||
function history_obj(ncolumn_name, nobj, ntab, nobj_no, ntype)
|
||||
{
|
||||
var and_or;
|
||||
var obj;
|
||||
|
||||
@ -1829,26 +1829,26 @@ function add_object()
|
||||
}
|
||||
p = document.getElementById('Query');
|
||||
where_obj = new where(rel.value, p.value);//make where object
|
||||
history_array.push(new history(col_name, where_obj, tab_name, h_tabs[downer + '.' + tab_name], "Where"));
|
||||
history_array.push(new history_obj(col_name, where_obj, tab_name, h_tabs[downer + '.' + tab_name], "Where"));
|
||||
sum = sum + 1;
|
||||
rel.value = '--';
|
||||
p.value = "";
|
||||
}
|
||||
if (document.getElementById('new_name').value !== "") {
|
||||
var rename_obj = new rename(document.getElementById('new_name').value);//make Rename object
|
||||
history_array.push(new history(col_name, rename_obj, tab_name, h_tabs[downer + '.' + tab_name], "Rename"));
|
||||
history_array.push(new history_obj(col_name, rename_obj, tab_name, h_tabs[downer + '.' + tab_name], "Rename"));
|
||||
sum = sum + 1;
|
||||
document.getElementById('new_name').value = "";
|
||||
}
|
||||
if (document.getElementById('operator').value != '---') {
|
||||
var aggregate_obj = new aggregate(document.getElementById('operator').value);
|
||||
history_array.push(new history(col_name, aggregate_obj, tab_name, h_tabs[downer + '.' + tab_name], "Aggregate"));
|
||||
history_array.push(new history_obj(col_name, aggregate_obj, tab_name, h_tabs[downer + '.' + tab_name], "Aggregate"));
|
||||
sum = sum + 1;
|
||||
document.getElementById('operator').value = '---';
|
||||
//make aggregate operator
|
||||
}
|
||||
if (document.getElementById('groupby').checked === true) {
|
||||
history_array.push(new history(col_name, 'GroupBy', tab_name, h_tabs[downer + '.' + tab_name], "GroupBy"));
|
||||
history_array.push(new history_obj(col_name, 'GroupBy', tab_name, h_tabs[downer + '.' + tab_name], "GroupBy"));
|
||||
sum = sum + 1;
|
||||
document.getElementById('groupby').checked = false;
|
||||
//make groupby
|
||||
@ -1865,7 +1865,7 @@ function add_object()
|
||||
p.value,
|
||||
document.getElementById('h_operator').value
|
||||
);//make where object
|
||||
history_array.push(new history(col_name, where_obj, tab_name, h_tabs[downer + '.' + tab_name], "Having"));
|
||||
history_array.push(new history_obj(col_name, where_obj, tab_name, h_tabs[downer + '.' + tab_name], "Having"));
|
||||
sum = sum + 1;
|
||||
document.getElementById('h_rel_opt').value = '--';
|
||||
document.getElementById('h_operator').value = '---';
|
||||
@ -1873,7 +1873,7 @@ function add_object()
|
||||
}
|
||||
if (document.getElementById('orderby').value != '---') {
|
||||
var oderby_obj = new orderby(document.getElementById('orderby').value);
|
||||
history_array.push(new history(col_name, oderby_obj, tab_name, h_tabs[downer + '.' + tab_name], "OrderBy"));
|
||||
history_array.push(new history_obj(col_name, oderby_obj, tab_name, h_tabs[downer + '.' + tab_name], "OrderBy"));
|
||||
sum = sum + 1;
|
||||
document.getElementById('orderby').value = '---';
|
||||
//make orderby
|
||||
|
||||
@ -257,6 +257,7 @@ class PMA_Header
|
||||
'confirm' => $GLOBALS['cfg']['Confirm'],
|
||||
'LoginCookieValidity' => $GLOBALS['cfg']['LoginCookieValidity'],
|
||||
'logged_in' => isset($GLOBALS['userlink']) ? true : false,
|
||||
'PMA_VERSION' => PMA_VERSION
|
||||
);
|
||||
if (isset($GLOBALS['cfg']['Server'])
|
||||
&& isset($GLOBALS['cfg']['Server']['auth_type'])
|
||||
@ -649,27 +650,28 @@ class PMA_Header
|
||||
$basedir = defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : '';
|
||||
$theme_id = $GLOBALS['PMA_Config']->getThemeUniqueValue();
|
||||
$theme_path = $GLOBALS['pmaThemePath'];
|
||||
$v = self::getVersionParameter();
|
||||
|
||||
if ($this->_isPrintView) {
|
||||
$retval .= '<link rel="stylesheet" type="text/css" href="'
|
||||
. $basedir . 'print.css" />';
|
||||
. $basedir . 'print.css?' . $v . '" />';
|
||||
} else {
|
||||
// load jQuery's CSS prior to our theme's CSS, to let the theme
|
||||
// override jQuery's CSS
|
||||
$retval .= '<link rel="stylesheet" type="text/css" href="'
|
||||
. $theme_path . '/jquery/jquery-ui-1.11.2.css" />';
|
||||
$retval .= '<link rel="stylesheet" type="text/css" href="'
|
||||
. $basedir . 'js/codemirror/lib/codemirror.css" />';
|
||||
. $basedir . 'js/codemirror/lib/codemirror.css?' . $v . '" />';
|
||||
$retval .= '<link rel="stylesheet" type="text/css" href="'
|
||||
. $basedir . 'js/codemirror/addon/hint/show-hint.css" />';
|
||||
. $basedir . 'js/codemirror/addon/hint/show-hint.css?' . $v . '" />';
|
||||
$retval .= '<link rel="stylesheet" type="text/css" href="'
|
||||
. $basedir . 'js/codemirror/addon/lint/lint.css" />';
|
||||
. $basedir . 'js/codemirror/addon/lint/lint.css?' . $v . '" />';
|
||||
$retval .= '<link rel="stylesheet" type="text/css" href="'
|
||||
. $basedir . 'phpmyadmin.css.php?'
|
||||
. 'nocache=' . $theme_id . $GLOBALS['text_dir'] . '" />';
|
||||
// load Print view's CSS last, so that it overrides all other CSS while 'printing'
|
||||
$retval .= '<link rel="stylesheet" type="text/css" href="'
|
||||
. $theme_path . '/css/printview.css" />';
|
||||
. $theme_path . '/css/printview.css?' . $v . '" />';
|
||||
}
|
||||
|
||||
return $retval;
|
||||
@ -777,5 +779,16 @@ class PMA_Header
|
||||
}
|
||||
return $retval;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the phpMyAdmin version to be appended to the url to avoid caching
|
||||
* between versions
|
||||
*
|
||||
* @return string urlenocded pma version as a parameter
|
||||
*/
|
||||
public static function getVersionParameter()
|
||||
{
|
||||
return "v=" . urlencode(PMA_VERSION);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -53,15 +53,18 @@ class PMA_Scripts
|
||||
$first_dynamic_scripts = "";
|
||||
$dynamic_scripts = "";
|
||||
$scripts = array();
|
||||
$separator = PMA_URL_getArgSeparator();
|
||||
foreach ($files as $value) {
|
||||
if (/*overload*/mb_strpos($value['filename'], "?") !== false) {
|
||||
$file_name = $value['filename'] . $separator
|
||||
. PMA_Header::getVersionParameter();
|
||||
if ($value['before_statics'] === true) {
|
||||
$first_dynamic_scripts
|
||||
.= "<script data-cfasync='false' type='text/javascript' src='js/"
|
||||
. $value['filename'] . "'></script>";
|
||||
. $file_name . "'></script>";
|
||||
} else {
|
||||
$dynamic_scripts .= "<script data-cfasync='false' type='text/javascript' src='js/"
|
||||
. $value['filename'] . "'></script>";
|
||||
. $file_name . "'></script>";
|
||||
}
|
||||
continue;
|
||||
}
|
||||
@ -81,8 +84,8 @@ class PMA_Scripts
|
||||
$scripts[] = "scripts%5B%5D=" . $value['filename'];
|
||||
}
|
||||
}
|
||||
$separator = PMA_URL_getArgSeparator();
|
||||
$url = 'js/get_scripts.js.php?' . implode($separator, $scripts);
|
||||
$url = 'js/get_scripts.js.php?' . implode($separator, $scripts)
|
||||
. $separator . PMA_Header::getVersionParameter();
|
||||
|
||||
$static_scripts = sprintf(
|
||||
'<script data-cfasync="false" type="text/javascript" src="%s"></script>',
|
||||
|
||||
@ -42,28 +42,28 @@ class PMA_NavigationTree
|
||||
private $_pos;
|
||||
|
||||
/**
|
||||
* @var int The names of the type of items that are being paginated on
|
||||
* the second level of the navigation tree. These may be
|
||||
* tables, views, functions, procedures or events.
|
||||
* @var array The names of the type of items that are being paginated on
|
||||
* the second level of the navigation tree. These may be
|
||||
* tables, views, functions, procedures or events.
|
||||
*/
|
||||
private $_pos2_name = array();
|
||||
|
||||
/**
|
||||
* @var int The positions of nodes in the lists of tables, views,
|
||||
* routines or events used for pagination
|
||||
* @var array The positions of nodes in the lists of tables, views,
|
||||
* routines or events used for pagination
|
||||
*/
|
||||
private $_pos2_value = array();
|
||||
|
||||
/**
|
||||
* @var int The names of the type of items that are being paginated
|
||||
* on the second level of the navigation tree.
|
||||
* These may be columns or indexes
|
||||
* @var array The names of the type of items that are being paginated
|
||||
* on the second level of the navigation tree.
|
||||
* These may be columns or indexes
|
||||
*/
|
||||
private $_pos3_name = array();
|
||||
|
||||
/**
|
||||
* @var int The positions of nodes in the lists of columns or indexes
|
||||
* used for pagination
|
||||
* @var array The positions of nodes in the lists of columns or indexes
|
||||
* used for pagination
|
||||
*/
|
||||
private $_pos3_value = array();
|
||||
|
||||
@ -82,8 +82,8 @@ class PMA_NavigationTree
|
||||
private $_searchClause2 = '';
|
||||
|
||||
/**
|
||||
* @var string Whether a warning was raised for large item groups
|
||||
* which can affect performance.
|
||||
* @var bool Whether a warning was raised for large item groups
|
||||
* which can affect performance.
|
||||
*/
|
||||
private $_largeGroupWarning = false;
|
||||
|
||||
@ -1086,7 +1086,7 @@ class PMA_NavigationTree
|
||||
'indexes'
|
||||
);
|
||||
$parent = $node->parents(false, true);
|
||||
$isNewView = $parent[0]->real_name == 'views' && $node->isNew == true;
|
||||
$isNewView = $parent[0]->real_name == 'views' && $node->isNew === true;
|
||||
if ($parent[0]->type == Node::CONTAINER
|
||||
&& (in_array($parent[0]->real_name, $haveAjax) || $isNewView)
|
||||
) {
|
||||
|
||||
@ -101,7 +101,7 @@ class Node
|
||||
public $classes = '';
|
||||
|
||||
/**
|
||||
* @var string Whether this node is a link for creating new objects
|
||||
* @var bool Whether this node is a link for creating new objects
|
||||
*/
|
||||
public $isNew = false;
|
||||
|
||||
|
||||
@ -8,11 +8,11 @@ http://sourceforge.net/donate/index.php?group_id=128076
|
||||
------------------------------------------------------------
|
||||
|
||||
Name: TCPDF
|
||||
Version: 6.2.3
|
||||
Release date: 2014-12-18
|
||||
Version: 6.2.9
|
||||
Release date: 2015-06-18
|
||||
Author: Nicola Asuni
|
||||
|
||||
Copyright (c) 2002-2014:
|
||||
Copyright (c) 2002-2015:
|
||||
Nicola Asuni
|
||||
Tecnick.com LTD
|
||||
www.tecnick.com
|
||||
@ -34,7 +34,7 @@ Main Features:
|
||||
* font subsetting;
|
||||
* methods to publish some XHTML + CSS code, Javascript and Forms;
|
||||
* images, graphic (geometric figures) and transformation methods;
|
||||
* supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http: www.imagemagick.org/www/formats.html)
|
||||
* supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/script/formats.php)
|
||||
* 1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extension, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, Datamatrix, QR-Code, PDF417;
|
||||
* JPEG and PNG ICC profiles, Grayscale, RGB, CMYK, Spot Colors and Transparencies;
|
||||
* automatic page header and footer management;
|
||||
|
||||
@ -160,6 +160,14 @@ class TCPDF_IMAGES {
|
||||
* @public static
|
||||
*/
|
||||
public static function _parsejpeg($file) {
|
||||
// check if is a local file
|
||||
if (!@file_exists($file)) {
|
||||
// try to encode spaces on filename
|
||||
$tfile = str_replace(' ', '%20', $file);
|
||||
if (@file_exists($tfile)) {
|
||||
$file = $tfile;
|
||||
}
|
||||
}
|
||||
$a = getimagesize($file);
|
||||
if (empty($a)) {
|
||||
//Missing or incorrect image file
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
<?php
|
||||
//============================================================+
|
||||
// File name : tcpdf_static.php
|
||||
// Version : 1.1.0
|
||||
// Version : 1.1.3
|
||||
// Begin : 2002-08-03
|
||||
// Last Update : 2014-12-10
|
||||
// Last Update : 2015-04-28
|
||||
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
|
||||
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
|
||||
// -------------------------------------------------------------------
|
||||
// Copyright (C) 2002-2014 Nicola Asuni - Tecnick.com LTD
|
||||
// Copyright (C) 2002-2015 Nicola Asuni - Tecnick.com LTD
|
||||
//
|
||||
// This file is part of TCPDF software library.
|
||||
//
|
||||
@ -38,7 +38,7 @@
|
||||
* This is a PHP class that contains static methods for the TCPDF class.<br>
|
||||
* @package com.tecnick.tcpdf
|
||||
* @author Nicola Asuni
|
||||
* @version 1.1.0
|
||||
* @version 1.1.2
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -46,7 +46,7 @@
|
||||
* Static methods used by the TCPDF class.
|
||||
* @package com.tecnick.tcpdf
|
||||
* @brief PHP class for generating PDF documents without requiring external extensions.
|
||||
* @version 1.1.0
|
||||
* @version 1.1.1
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
*/
|
||||
class TCPDF_STATIC {
|
||||
@ -55,7 +55,7 @@ class TCPDF_STATIC {
|
||||
* Current TCPDF version.
|
||||
* @private static
|
||||
*/
|
||||
private static $tcpdf_version = '6.2.3';
|
||||
private static $tcpdf_version = '6.2.9';
|
||||
|
||||
/**
|
||||
* String alias for total number of pages.
|
||||
@ -2434,8 +2434,8 @@ class TCPDF_STATIC {
|
||||
public static function fopenLocal($filename, $mode) {
|
||||
if (strpos($filename, '://') === false) {
|
||||
$filename = 'file://'.$filename;
|
||||
} elseif (strpos($filename, 'file://') !== 0) {
|
||||
$this->Error('Unsupported file protocol');
|
||||
} elseif (stream_is_local($filename) !== true) {
|
||||
return false;
|
||||
}
|
||||
return fopen($filename, $mode);
|
||||
}
|
||||
@ -2480,7 +2480,7 @@ class TCPDF_STATIC {
|
||||
}
|
||||
$urldata = @parse_url($url);
|
||||
if (!isset($urldata['query']) OR (strlen($urldata['query']) <= 0)) {
|
||||
if (strpos($url, K_PATH_URL) === 0) {
|
||||
if (K_PATH_URL AND (strpos($url, K_PATH_URL) === 0)) {
|
||||
// convert URL to full server path
|
||||
$tmp = str_replace(K_PATH_URL, K_PATH_MAIN, $url);
|
||||
$tmp = htmlspecialchars_decode(urldecode($tmp));
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
<?php
|
||||
//============================================================+
|
||||
// File name : tcpdf.php
|
||||
// Version : 6.2.3
|
||||
// Version : 6.2.9
|
||||
// Begin : 2002-08-03
|
||||
// Last Update : 2014-12-18
|
||||
// Last Update : 2015-06-18
|
||||
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
|
||||
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
|
||||
// -------------------------------------------------------------------
|
||||
// Copyright (C) 2002-2014 Nicola Asuni - Tecnick.com LTD
|
||||
// Copyright (C) 2002-2015 Nicola Asuni - Tecnick.com LTD
|
||||
//
|
||||
// This file is part of TCPDF software library.
|
||||
//
|
||||
@ -104,7 +104,7 @@
|
||||
* Tools to encode your unicode fonts are on fonts/utils directory.</p>
|
||||
* @package com.tecnick.tcpdf
|
||||
* @author Nicola Asuni
|
||||
* @version 6.2.3
|
||||
* @version 6.2.8
|
||||
*/
|
||||
|
||||
// TCPDF configuration
|
||||
@ -128,7 +128,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.php');
|
||||
* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
|
||||
* @package com.tecnick.tcpdf
|
||||
* @brief PHP class for generating PDF documents without requiring external extensions.
|
||||
* @version 6.2.3
|
||||
* @version 6.2.8
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
*/
|
||||
class TCPDF {
|
||||
@ -5748,7 +5748,7 @@ class TCPDF {
|
||||
* @param $autopadding (boolean) if true, uses internal padding and automatically adjust it to account for line width.
|
||||
* @param $maxh (float) maximum height. It should be >= $h and less then remaining space to the bottom of the page, or 0 for disable this feature. This feature works only when $ishtml=false.
|
||||
* @param $valign (string) Vertical alignment of text (requires $maxh = $h > 0). Possible values are:<ul><li>T: TOP</li><li>M: middle</li><li>B: bottom</li></ul>. This feature works only when $ishtml=false and the cell must fit in a single page.
|
||||
* @param $fitcell (boolean) if true attempt to fit all the text within the cell by reducing the font size (do not work in HTML mode). $maxh must be greater than 0 and wqual to $h.
|
||||
* @param $fitcell (boolean) if true attempt to fit all the text within the cell by reducing the font size (do not work in HTML mode). $maxh must be greater than 0 and equal to $h.
|
||||
* @return int Return the number of cells or 1 for html mode.
|
||||
* @public
|
||||
* @since 1.3
|
||||
@ -6819,10 +6819,10 @@ class TCPDF {
|
||||
if ($this->state != 2) {
|
||||
return;
|
||||
}
|
||||
if ($x === '') {
|
||||
if (strcmp($x, '') === 0) {
|
||||
$x = $this->x;
|
||||
}
|
||||
if ($y === '') {
|
||||
if (strcmp($y, '') === 0) {
|
||||
$y = $this->y;
|
||||
}
|
||||
// check page for no-write regions and adapt page margins if necessary
|
||||
@ -7026,6 +7026,7 @@ class TCPDF {
|
||||
AND (($info === 'pngalpha') OR (isset($info['trns']) AND !empty($info['trns'])))) {
|
||||
return $this->ImagePngAlpha($file, $x, $y, $pixw, $pixh, $w, $h, 'PNG', $link, $align, $resize, $dpi, $palign, $filehash);
|
||||
}
|
||||
$info = false;
|
||||
}
|
||||
if (($info === false) AND function_exists($gdfunction)) {
|
||||
try {
|
||||
@ -9537,13 +9538,13 @@ class TCPDF {
|
||||
$dcdate = TCPDF_STATIC::getFormattedDate($this->doc_creation_timestamp);
|
||||
$doccreationdate = substr($dcdate, 0, 4).'-'.substr($dcdate, 4, 2).'-'.substr($dcdate, 6, 2);
|
||||
$doccreationdate .= 'T'.substr($dcdate, 8, 2).':'.substr($dcdate, 10, 2).':'.substr($dcdate, 12, 2);
|
||||
$doccreationdate .= '+'.substr($dcdate, 15, 2).':'.substr($dcdate, 18, 2);
|
||||
$doccreationdate .= substr($dcdate, 14, 3).':'.substr($dcdate, 18, 2);
|
||||
$doccreationdate = TCPDF_STATIC::_escapeXML($doccreationdate);
|
||||
// convert doc modification date format
|
||||
$dmdate = TCPDF_STATIC::getFormattedDate($this->doc_modification_timestamp);
|
||||
$docmoddate = substr($dmdate, 0, 4).'-'.substr($dmdate, 4, 2).'-'.substr($dmdate, 6, 2);
|
||||
$docmoddate .= 'T'.substr($dmdate, 8, 2).':'.substr($dmdate, 10, 2).':'.substr($dmdate, 12, 2);
|
||||
$docmoddate .= '+'.substr($dmdate, 15, 2).':'.substr($dmdate, 18, 2);
|
||||
$docmoddate .= substr($dmdate, 14, 3).':'.substr($dmdate, 18, 2);
|
||||
$docmoddate = TCPDF_STATIC::_escapeXML($docmoddate);
|
||||
$xmp .= "\t\t".'<rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">'."\n";
|
||||
$xmp .= "\t\t\t".'<xmp:CreateDate>'.$doccreationdate.'</xmp:CreateDate>'."\n";
|
||||
@ -10362,7 +10363,7 @@ class TCPDF {
|
||||
* @public
|
||||
*/
|
||||
public function addHtmlLink($url, $name, $fill=false, $firstline=false, $color='', $style=-1, $firstblock=false) {
|
||||
if (isset($url[1]) AND ($url[0] == '#')) {
|
||||
if (isset($url[1]) AND ($url[0] == '#') AND is_numeric($url[1])) {
|
||||
// convert url to internal link
|
||||
$lnkdata = explode(',', $url);
|
||||
if (isset($lnkdata[0]) ) {
|
||||
@ -18175,7 +18176,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
|
||||
// inherit column width
|
||||
$cellw = 0;
|
||||
for ($i = 0; $i < $colspan; ++$i) {
|
||||
$cellw += $table_colwidths[($colid + $i)];
|
||||
$cellw += (isset($table_colwidths[($colid + $i)]) ? $table_colwidths[($colid + $i)] : 0);
|
||||
}
|
||||
}
|
||||
$cellw += (($colspan - 1) * $cellspacing['H']);
|
||||
@ -18649,7 +18650,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
|
||||
$this->lispacer = $prev_lispacer;
|
||||
if ($ln AND (!($cell AND ($dom[$key-1]['value'] == 'table')))) {
|
||||
$this->Ln($this->lasth);
|
||||
if ($this->y < $maxbottomliney) {
|
||||
if (($this->y < $maxbottomliney) AND ($startlinepage == $this->page)) {
|
||||
$this->y = $maxbottomliney;
|
||||
}
|
||||
}
|
||||
@ -19427,8 +19428,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
|
||||
$prev_page = $this->page;
|
||||
$this->setPage($dom[($dom[$key]['parent'])]['endpage']);
|
||||
if ($this->num_columns > 1) {
|
||||
if ((($this->current_column == 0) AND ($dom[($dom[$key]['parent'])]['endcolumn'] == ($this->num_columns - 1)))
|
||||
OR (($this->current_column == $dom[($dom[$key]['parent'])]['endcolumn']) AND ($prev_page < $this->page))) {
|
||||
if (($prev_page < $this->page)
|
||||
AND ((($this->current_column == 0) AND ($dom[($dom[$key]['parent'])]['endcolumn'] == ($this->num_columns - 1)))
|
||||
OR ($this->current_column == $dom[($dom[$key]['parent'])]['endcolumn']))) {
|
||||
// page jump
|
||||
$this->selectColumn(0);
|
||||
$dom[($dom[$key]['parent'])]['endcolumn'] = 0;
|
||||
|
||||
92
po/de.po
92
po/de.po
@ -4,10 +4,10 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2015-07-23 03:54-0700\n"
|
||||
"PO-Revision-Date: 2015-07-20 05:04+0200\n"
|
||||
"PO-Revision-Date: 2015-07-27 03:36+0200\n"
|
||||
"Last-Translator: Hauke Henningsen <sqrt@entless.org>\n"
|
||||
"Language-Team: German <https://hosted.weblate.org/projects/phpmyadmin/master/"
|
||||
"de/>\n"
|
||||
"Language-Team: German "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/de/>\n"
|
||||
"Language: de\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -3952,11 +3952,13 @@ msgstr ""
|
||||
msgid ""
|
||||
"Linting is disabled for this query because it exceeds the maximum length."
|
||||
msgstr ""
|
||||
"Der Linter ist für diese Anfrage nicht verfügbar, da sie die zulässige "
|
||||
"Maximallänge überschreitet."
|
||||
|
||||
#: libraries/Linter.class.php:147
|
||||
#, php-format
|
||||
msgid "%1$s (near <code>%2$s</code>)"
|
||||
msgstr ""
|
||||
msgstr "%1$s (bei <code>%2$s</code>)"
|
||||
|
||||
#: libraries/Menu.class.php:199 libraries/ServerStatusData.class.php:430
|
||||
#: libraries/config/messages.inc.php:823
|
||||
@ -12555,19 +12557,17 @@ msgstr ""
|
||||
"anderem Hostnamen."
|
||||
|
||||
#: libraries/server_privileges.lib.php:1503
|
||||
#, fuzzy
|
||||
#| msgid "User name:"
|
||||
msgid "Host name:"
|
||||
msgstr "Benutzername:"
|
||||
msgstr "Hostname:"
|
||||
|
||||
#: libraries/server_privileges.lib.php:1508
|
||||
#: libraries/server_privileges.lib.php:1610
|
||||
#: libraries/server_privileges.lib.php:2242
|
||||
#: libraries/server_privileges.lib.php:3203
|
||||
#, fuzzy
|
||||
#| msgid "Log name"
|
||||
msgid "Host name"
|
||||
msgstr "Protokoll"
|
||||
msgstr "Hostname"
|
||||
|
||||
#: libraries/server_privileges.lib.php:1645
|
||||
msgid "Do not change the password"
|
||||
@ -13988,154 +13988,144 @@ msgid "This is a read-only variable and can not be edited"
|
||||
msgstr "Diese Variable kann nicht verändert werden"
|
||||
|
||||
#: libraries/sql-parser/src/Components/AlterOperation.php:191
|
||||
#, fuzzy
|
||||
#| msgid "Iconic table operations"
|
||||
msgid "Unrecognized alter operation."
|
||||
msgstr "Tabellenbearbeitung mittels Icons"
|
||||
msgstr "Unerkannte ALTER-Operation."
|
||||
|
||||
#: libraries/sql-parser/src/Components/Array2d.php:90
|
||||
#, php-format
|
||||
msgid "%1$d values were expected, but found %2$d."
|
||||
msgstr ""
|
||||
msgstr "%1$d Werte erwartet, aber %2$d gefunden."
|
||||
|
||||
#: libraries/sql-parser/src/Components/Array2d.php:113
|
||||
msgid "An opening bracket followed by a set of values was expected."
|
||||
msgstr ""
|
||||
"Eine öffnende Klammer, gefolgt von einer Liste von Werten, wurde erwartet."
|
||||
|
||||
#: libraries/sql-parser/src/Components/ArrayObj.php:101
|
||||
#: libraries/sql-parser/src/Components/FieldDefinition.php:202
|
||||
msgid "An opening bracket was expected."
|
||||
msgstr ""
|
||||
msgstr "Eine öffnende Klammer wurde erwartet."
|
||||
|
||||
#: libraries/sql-parser/src/Components/ArrayObj.php:118
|
||||
msgid "A comma or a closing bracket was expected"
|
||||
msgstr ""
|
||||
msgstr "Ein Komma oder eine schließende Klammer wurde erwartet"
|
||||
|
||||
#: libraries/sql-parser/src/Components/DataType.php:125
|
||||
msgid "Unrecognized data type."
|
||||
msgstr ""
|
||||
msgstr "Unerkannter Datentyp."
|
||||
|
||||
#: libraries/sql-parser/src/Components/Expression.php:222
|
||||
msgid "Unexpected closing bracket."
|
||||
msgstr ""
|
||||
msgstr "Unerwartete schließende Klammer."
|
||||
|
||||
#: libraries/sql-parser/src/Components/Expression.php:243
|
||||
#: libraries/sql-parser/src/Components/Expression.php:280
|
||||
#: libraries/sql-parser/src/Components/Expression.php:300
|
||||
msgid "An alias was previously found."
|
||||
msgstr ""
|
||||
msgstr "Ein Alias wurde zuvor gefunden."
|
||||
|
||||
#: libraries/sql-parser/src/Components/Expression.php:254
|
||||
msgid "Unexpected dot."
|
||||
msgstr ""
|
||||
msgstr "Unerwarteter Punkt."
|
||||
|
||||
#: libraries/sql-parser/src/Components/Expression.php:324
|
||||
#, fuzzy
|
||||
#| msgid "No tables selected."
|
||||
msgid "An alias was expected."
|
||||
msgstr "Keine Tabellen ausgewählt."
|
||||
msgstr "Ein Alias wurde erwartet."
|
||||
|
||||
#: libraries/sql-parser/src/Components/ExpressionArray.php:93
|
||||
#, fuzzy
|
||||
#| msgid "No versions selected."
|
||||
msgid "An expression was expected."
|
||||
msgstr "Keine Versionen ausgewählt."
|
||||
msgstr "Ein Ausdruck wurde erwartet."
|
||||
|
||||
#: libraries/sql-parser/src/Components/FieldDefinition.php:255
|
||||
msgid "A closing bracket was expected."
|
||||
msgstr ""
|
||||
msgstr "Eine schließende Klammer wurde erwartet."
|
||||
|
||||
#: libraries/sql-parser/src/Components/Limit.php:90
|
||||
#: libraries/sql-parser/src/Components/Limit.php:112
|
||||
msgid "An offset was expected."
|
||||
msgstr ""
|
||||
msgstr "Ein Offset wurde erwartet."
|
||||
|
||||
#: libraries/sql-parser/src/Components/OptionsArray.php:142
|
||||
#, php-format
|
||||
msgid "This option conflicts with \"%1$s\"."
|
||||
msgstr ""
|
||||
msgstr "Diese Option widerspricht „%1$s“."
|
||||
|
||||
#: libraries/sql-parser/src/Components/RenameOperation.php:102
|
||||
#, fuzzy
|
||||
#| msgid "The number of tables that are open."
|
||||
msgid "The old name of the table was expected."
|
||||
msgstr "Anzahl der geöffneten Tabellen."
|
||||
msgstr "Der ursprüngliche Tabellenname wurde erwartet."
|
||||
|
||||
#: libraries/sql-parser/src/Components/RenameOperation.php:112
|
||||
msgid "Keyword \"TO\" was expected."
|
||||
msgstr ""
|
||||
msgstr "Schlüsselwort „TO“ wurde erwartet."
|
||||
|
||||
#: libraries/sql-parser/src/Components/RenameOperation.php:129
|
||||
#, fuzzy
|
||||
#| msgid "The number of tables that are open."
|
||||
msgid "The new name of the table was expected."
|
||||
msgstr "Anzahl der geöffneten Tabellen."
|
||||
msgstr "Der neue Tabellenname wurde erwartet."
|
||||
|
||||
#: libraries/sql-parser/src/Components/RenameOperation.php:147
|
||||
#, fuzzy
|
||||
#| msgid "Template was deleted."
|
||||
msgid "A rename operation was expected."
|
||||
msgstr "Vorlage wurde gelöscht."
|
||||
msgstr "Eine Umbenennungsoperation wurde erwartet."
|
||||
|
||||
#: libraries/sql-parser/src/Lexer.php:252
|
||||
#, fuzzy
|
||||
#| msgid "Unexpected characters on line %s."
|
||||
msgid "Unexpected character."
|
||||
msgstr "Unerwartete Zeichen in Zeile %s."
|
||||
msgstr "Unerwartetes Zeichen."
|
||||
|
||||
#: libraries/sql-parser/src/Lexer.php:280
|
||||
msgid "Expected whitespace(s) before delimiter."
|
||||
msgstr ""
|
||||
msgstr "Erwartete Whitespace vor dem Trennzeichen."
|
||||
|
||||
#: libraries/sql-parser/src/Lexer.php:298
|
||||
msgid "Expected delimiter."
|
||||
msgstr ""
|
||||
msgstr "Erwartete Trennzeichen."
|
||||
|
||||
#: libraries/sql-parser/src/Lexer.php:688
|
||||
#, fuzzy, php-format
|
||||
#, php-format
|
||||
#| msgid "Event %1$s has been created."
|
||||
msgid "Ending quote %1$s was expected."
|
||||
msgstr "Ereignis %1$s wurde erzeugt."
|
||||
msgstr "Schließendes Anführungszeichen %1$s wurde erzeugt."
|
||||
|
||||
#: libraries/sql-parser/src/Lexer.php:721
|
||||
#, fuzzy
|
||||
#| msgid "Table name template"
|
||||
msgid "Variable name was expected."
|
||||
msgstr "Schablone für Tabellennamen"
|
||||
msgstr "Variablenname wurde erwartet."
|
||||
|
||||
#: libraries/sql-parser/src/Parser.php:355
|
||||
#, fuzzy
|
||||
#| msgid "at beginning of table"
|
||||
msgid "Unexpected beginning of statement."
|
||||
msgstr "am Tabellenanfang"
|
||||
msgstr "Unerwarteter Statement-Anfang."
|
||||
|
||||
#: libraries/sql-parser/src/Parser.php:370
|
||||
msgid "Unrecognized statement type."
|
||||
msgstr ""
|
||||
msgstr "Unerkannte Statement-Typ."
|
||||
|
||||
#: libraries/sql-parser/src/Statement.php:201
|
||||
#, fuzzy
|
||||
#| msgid "Unexpected characters on line %s."
|
||||
msgid "Unexpected token."
|
||||
msgstr "Unerwartete Zeichen in Zeile %s."
|
||||
msgstr "Unerwartetes Zeichen."
|
||||
|
||||
#: libraries/sql-parser/src/Statement.php:251
|
||||
msgid "Unrecognized keyword."
|
||||
msgstr ""
|
||||
msgstr "Unerkanntes Schlüsselwort."
|
||||
|
||||
#: libraries/sql-parser/src/Statements/CreateStatement.php:293
|
||||
#, fuzzy
|
||||
#| msgid "The number of tables that are open."
|
||||
msgid "The name of the entity was expected."
|
||||
msgstr "Anzahl der geöffneten Tabellen."
|
||||
msgstr "Der Name der Entität wurde erwartet."
|
||||
|
||||
#: libraries/sql-parser/src/Statements/CreateStatement.php:310
|
||||
msgid "At least one field definition was expected."
|
||||
msgstr ""
|
||||
msgstr "Mindestens eine Felddefinition wurde erwartet."
|
||||
|
||||
#: libraries/sql-parser/src/Statements/CreateStatement.php:329
|
||||
msgid "A \"RETURNS\" keyword was expected."
|
||||
msgstr ""
|
||||
msgstr "Ein „RETURNS“-Schlüsselwort wurde erwartet."
|
||||
|
||||
#: libraries/sql.lib.php:284
|
||||
msgid "Detailed profile"
|
||||
@ -14230,10 +14220,10 @@ msgid "Run SQL query/queries on database %s"
|
||||
msgstr "SQL-Befehl(e) in Datenbank %s ausführen"
|
||||
|
||||
#: libraries/sql_query_form.lib.php:179
|
||||
#, fuzzy, php-format
|
||||
#, php-format
|
||||
#| msgid "Run SQL query/queries on database %s"
|
||||
msgid "Run SQL query/queries on table %s"
|
||||
msgstr "SQL-Befehl(e) in Datenbank %s ausführen"
|
||||
msgstr "SQL-Befehl(e) in Tabelle %s ausführen"
|
||||
|
||||
#: libraries/sql_query_form.lib.php:255
|
||||
msgid "Get auto-saved query"
|
||||
|
||||
13
po/fr.po
13
po/fr.po
@ -4,7 +4,7 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2015-07-23 03:54-0700\n"
|
||||
"PO-Revision-Date: 2015-07-26 13:21+0200\n"
|
||||
"PO-Revision-Date: 2015-07-27 14:47+0200\n"
|
||||
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
|
||||
"Language-Team: French "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/fr/>\n"
|
||||
@ -13969,27 +13969,26 @@ msgstr "Une expression était attendue."
|
||||
|
||||
#: libraries/sql-parser/src/Components/FieldDefinition.php:255
|
||||
msgid "A closing bracket was expected."
|
||||
msgstr ""
|
||||
msgstr "Une parenthèse droite était attendue."
|
||||
|
||||
#: libraries/sql-parser/src/Components/Limit.php:90
|
||||
#: libraries/sql-parser/src/Components/Limit.php:112
|
||||
msgid "An offset was expected."
|
||||
msgstr ""
|
||||
msgstr "Un décalage était prévu."
|
||||
|
||||
#: libraries/sql-parser/src/Components/OptionsArray.php:142
|
||||
#, php-format
|
||||
msgid "This option conflicts with \"%1$s\"."
|
||||
msgstr ""
|
||||
msgstr "Cette option entre en conflit avec « %1$s »."
|
||||
|
||||
#: libraries/sql-parser/src/Components/RenameOperation.php:102
|
||||
#, fuzzy
|
||||
#| msgid "The number of tables that are open."
|
||||
msgid "The old name of the table was expected."
|
||||
msgstr "Le nombre de tables qui sont ouvertes."
|
||||
msgstr "L'ancien nom de la table était attendu."
|
||||
|
||||
#: libraries/sql-parser/src/Components/RenameOperation.php:112
|
||||
msgid "Keyword \"TO\" was expected."
|
||||
msgstr ""
|
||||
msgstr "Le mot clé « TO » était attendu."
|
||||
|
||||
#: libraries/sql-parser/src/Components/RenameOperation.php:129
|
||||
#, fuzzy
|
||||
|
||||
@ -81,7 +81,7 @@ class PMA_Scripts_Test extends PHPUnit_Framework_TestCase
|
||||
$this->assertEquals(
|
||||
'<script data-cfasync="false" type="text/javascript" '
|
||||
. 'src="js/get_scripts.js.php?'
|
||||
. 'scripts%5B%5D=common.js"></script>',
|
||||
. 'scripts%5B%5D=common.js&v=' . PMA_VERSION . '"></script>',
|
||||
$this->_callPrivateFunction(
|
||||
'_includeFiles',
|
||||
array(
|
||||
@ -111,7 +111,7 @@ class PMA_Scripts_Test extends PHPUnit_Framework_TestCase
|
||||
$this->assertRegExp(
|
||||
'@<script data-cfasync="false" type="text/javascript" '
|
||||
. 'src="js/get_scripts.js.php\\?'
|
||||
. 'scripts%5B%5D=common.js"></script>'
|
||||
. 'scripts%5B%5D=common.js&v=' . PMA_VERSION . '"></script>'
|
||||
. '<script data-cfasync="false" type="text/'
|
||||
. 'javascript">// <!\\[CDATA\\[' . "\n"
|
||||
. 'AJAX.scriptHandler.add\\("common.js",1\\);' . "\n"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
