Commit 34b68fd3 authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/15.x 58784 to 58793

Conflicts fixed in templates/header.tpl
parent bd632b51
......@@ -1761,6 +1761,7 @@ installer/schema/20160325_menu_42_list_pages_tiki.sql -text
installer/schema/20160420_correct_blogpost_encoding_tiki.sql -text
installer/schema/20160519_calendar_events_action_log_tiki.sql -text
installer/schema/20160527_menu_item_payment_tiki.sql -text
installer/schema/20160604_remove_unwanted_files_tiki.php -text
installer/schema/999999991_decode_pages_sources_tiki.php -text
installer/schema/99999999_image_plugins_kill_tiki.php -text
installer/schema/index.php -text
......
<?php
// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id: 20150508_perspectives_style_to_theme_tiki.php 57954 2016-03-17 19:34:29Z jyhem $
if (strpos($_SERVER["SCRIPT_NAME"], basename(__FILE__)) !== false) {
header("location: index.php");
exit;
}
/**
* @param $installer
*/
function upgrade_20160604_remove_unwanted_files_tiki($installer)
{
$files = array(
'vendo/player/mp3/template_default/compileTemplateDefault.bat',
'vendor/player/mp3/template_default/compileTemplateDefault.sh',
'vendor/player/mp3/template_default/TemplateDefault.as',
'vendor/player/mp3/template_default/test.mp3',
'vendor/player/flv/flv_stream.php',
'vendor/player/flv/template_default/compileTemplateDefault.bat',
'vendor/player/flv/template_default/compileTemplateDefault.sh',
'vendor/player/flv/template_default/rorobong.jpg',
'vendor/player/flv/template_default/TemplateDefault.as',
'vendor/jcapture-applet/jcapture-applet/applet.php',
);
foreach ($files as $file) {
if (is_writable($file)) {
unlink($file);
}
}
}
......@@ -58,6 +58,7 @@ class CleanVendors
$fs->remove($vendors . 'codemirror/codemirror/mode/tiki');
self::removeMultiple($vendors . 'cwspear/bootstrap-hover-dropdown', ['bootstrap-hover-dropdown.min.js', 'demo.html']);
$fs->remove($vendors . 'jcapture-applet/jcapture-applet/src');
$fs->remove($vendors . 'jcapture-applet/jcapture-applet/applet.php');
$fs->remove($vendors . 'jquery/jquery-s5/lib/dompdf/www');
self::removeMultiple($vendors . 'jquery/jquery-sheet', ['jquery-1.10.2.min.js', 'jquery-ui', 'parser.php', 'parser/formula/formula.php']);
self::removeMultiple($vendors . 'jquery/jquery-timepicker-addon',
......
......@@ -121,7 +121,7 @@ class Spreadsheet_Excel_Reader
0x2c => '$%1.2f', //"$#,##0.00;($#,##0.00)",
0x30 => '%1.0f'); //"##0.0E0";
function Spreadsheet_Excel_Reader(){
function __construct(){
$this->_ole = new R_OLE();
}
......
......@@ -41,7 +41,7 @@ class R_OLE
var $data = '';
function R_OLE(){
function __construct(){
}
......
......@@ -247,7 +247,7 @@ class Spreadsheet_Excel_Writer_Format extends PEAR
* @param integer $index the XF index for the format.
* @param array $properties array with properties to be set on initialization.
*/
function Spreadsheet_Excel_Writer_Format($BIFF_version, $index = 0, $properties = array())
function __construct($BIFF_version, $index = 0, $properties = array())
{
$this->_xf_index = $index;
$this->_BIFF_version = $BIFF_version;
......
......@@ -196,7 +196,7 @@ class TikiSheet
/** TikiSheet
* Initializes the data container.
*/
function TikiSheet() {
function __construct() {
$this->dataGrid = array();
$this->calcGrid = array();
$this->cellInfo = array();
......@@ -1122,7 +1122,7 @@ class TikiSheetSimpleArrayHandler extends TikiSheetDataHandler
{
public $values = array();
function TikiSheetSimpleArrayHandler( $simpleArray = array() )
function __construct( $simpleArray = array() )
{
$this->values = $simpleArray['values'];
$this->name = $simpleArray['name'];
......
......@@ -62,7 +62,11 @@ if (isset($_REQUEST['filter'])) {
}
if (!isset($_REQUEST["priority"])) $_REQUEST["priority"] = '';
if (!isset($_REQUEST["flag"])) $_REQUEST["flag"] = '';
if (!isset($_REQUEST["flagval"])) $_REQUEST["flagval"] = '';
if (!isset($_REQUEST["flagval"])) {
$_REQUEST["flagval"] = '';
} else {
$_REQUEST["flagval"] = $_REQUEST["flagval"] === 'y' ? 'y' : 'n';
}
if (!isset($_REQUEST["sort_mode"])) {
$sort_mode = 'date_desc';
} else {
......
......@@ -77,8 +77,8 @@
{/if}
{* --- SocialNetwork:site_name --- *}
<meta content="{if !empty($prefs.socialnetworks_facebook_site_name)}{$prefs.socialnetworks_facebook_site_name}{else}{$prefs.browsertitle|tr_if|escape}{/if}" property="og:site_name">
<meta content="{if !empty($prefs.socialnetworks_twitter_site)}{$prefs.socialnetworks_twitter_site}{else}{$prefs.browsertitle|tr_if|escape}{/if}" name="twitter:site">
<meta content="{if not empty($prefs.socialnetworks_facebook_site_name)}{$prefs.socialnetworks_facebook_site_name}{else}{$prefs.browsertitle|tr_if|escape}{/if}" property="og:site_name">
<meta content="{if not empty($prefs.socialnetworks_twitter_site)}{$prefs.socialnetworks_twitter_site}{else}{$prefs.browsertitle|tr_if|escape}{/if}" name="twitter:site">
{* --- tiki block --- *}
......@@ -210,8 +210,8 @@
{elseif $mid eq 'tiki-view_blog_post.tpl'}
{* --- Article --- *}
{elseif $mid eq 'tiki-read_article.tpl'}
<meta content="{if !empty($prefs.socialnetworks_facebook_site_image)}{$prefs.socialnetworks_facebook_site_image}{else}{$base_url_canonical}{if $hasImage eq 'y'}article_image.php?image_type=article&amp;id={$articleId}{else}article_image.php?image_type=topic&amp;id={$topicId}{/if}{/if}" property="og:image">
<meta content="{if !empty($prefs.socialnetworks_twitter_site_image)}{$prefs.socialnetworks_twitter_site_image}{else}{$base_url_canonical}{if $hasImage eq 'y'}article_image.php?image_type=article&amp;id={$articleId}{else}article_image.php?image_type=topic&amp;id={$topicId}{/if}{/if}" name="twitter:image">
<meta content="{if not empty($prefs.socialnetworks_facebook_site_image)}{$prefs.socialnetworks_facebook_site_image}{else}{$base_url_canonical}{if $hasImage eq 'y'}article_image.php?image_type=article&amp;id={$articleId}{else}article_image.php?image_type=topic&amp;id={$topicId}{/if}{/if}" property="og:image">
<meta content="{if not empty($prefs.socialnetworks_twitter_site_image)}{$prefs.socialnetworks_twitter_site_image}{else}{$base_url_canonical}{if $hasImage eq 'y'}article_image.php?image_type=article&amp;id={$articleId}{else}article_image.php?image_type=topic&amp;id={$topicId}{/if}{/if}" name="twitter:image">
{/if}
{/if}
......
......@@ -77,7 +77,7 @@
<form name="fgalformid" id="fgalform" method="post" action="{if !empty($filegals_manager)}{query _type='relative' filegals_manager=$filegals_manager|escape}{else}{query _type='relative'}{/if}" enctype="multipart/form-data">
<input type="hidden" name="galleryId" value="{$gal_info.galleryId|escape}">
<input type="hidden" name="find" value="{$find|escape}">
{if !empty($smarty.request.show_details)}<input type="hidden" name="show_details" value="{$smarty.request.show_details}">{/if}
{if !empty($show_details)}<input type="hidden" name="show_details" value="{$show_details}">{/if}
{if $prefs.fgal_asynchronous_indexing eq 'y'}<input type="hidden" name="fast" value="y">{/if}
{if !empty($sort_mode)}<input type="hidden" name="sort_mode" value="{$sort_mode|escape}">{/if}
......
......@@ -71,6 +71,18 @@ if (!isset( $_REQUEST['sheetId'] )) {
// }}}1
$valid_graphs = array( 'PieChartGraphic', 'MultilineGraphic', 'MultibarGraphic', 'BarStackGraphic' );
$valid_renderers = array( 'PNG', 'JPEG', 'PDF', 'PS' );
if ( ! empty($_REQUEST['graphic']) && ! in_array($_REQUEST['graphic'], $valid_graphs) ) {
$smarty->assign('msg', tra('Unknown Graphic.'));
$smarty->display('error.tpl');
die;
}
if ( ! empty($_REQUEST['renderer']) && ! in_array($_REQUEST['renderer'], $valid_renderers) ) {
$smarty->assign('msg', tra('Unknown Renderer.'));
$smarty->display('error.tpl');
die;
}
$smarty->assign('sheetId', $_REQUEST["sheetId"]);
......@@ -84,13 +96,9 @@ $smarty->assign('page_mode', 'form');
$sheetId = $_REQUEST['sheetId'];
if ( isset($_REQUEST['title']) ) {
if ( !in_array($_REQUEST['graphic'], $valid_graphs) )
die( 'Unknown Graphic.' );
$cache_file = 'temp/cache/tsge_' . md5($_SERVER['REQUEST_URI']);
if ( !isset($_REQUEST['renderer']) )
$_REQUEST['renderer'] = null;
switch( $_REQUEST['renderer'] )
{
case 'PNG':
......@@ -185,7 +193,7 @@ if ( isset($_REQUEST['title']) ) {
$smarty->assign('mode', 'param');
$smarty->assign('series', $series);
$smarty->assign('graph', $graph);
$smarty->assign('renderer', $_GET['renderer']);
$smarty->assign('renderer', $_REQUEST['renderer']);
$handler = new TikiSheetDatabaseHandler($sheetId);
$grid = new TikiSheet($_REQUEST['sheetId']);
......
......@@ -947,7 +947,7 @@ if (isset($_GET['slideshow'])) {
$smarty->assign('thumbnail_size', $prefs['fgal_thumb_max_size']);
if (isset($_REQUEST['show_details'])) {
$show_details = $_REQUEST['show_details'];
$show_details = $_REQUEST['show_details'] === 'y' ? 'y' : 'n';
setCookieSection('show_details', $show_details);
} else {
$show_details = getCookie('show_details', null, 'n');
......
......@@ -229,7 +229,7 @@ if ( $prefs['javascript_enabled'] != 'y' or ! $isUpload ) {
$smarty->assign('mid', 'tiki-upload_file.tpl');
if ( ! empty( $_REQUEST['filegals_manager'] ) ) {
$smarty->assign('filegals_manager', $_REQUEST['filegals_manager']);
$smarty->assign('insertion_syntax', isset($_REQUEST['insertion_syntax']) ? $_REQUEST['insertion_syntax'] : '');
$smarty->assign('insertion_syntax', $jitRequest->insertion_syntax->word());
$smarty->display("tiki_full.tpl");
} else {
$smarty->display("tiki.tpl");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment