Commit a8e076e8 authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/8.x 38847 to 38995

Conflicts occured during the merge.
Fixed as best as i could, authors please check (GoogleTranslateWrapperTest especially)

lib/smarty_tiki/function.query.php
lib/trackers/trackerlib.php
lib/wiki-plugins/wikiplugin_attach.php
lib/test/core/Multilingual/MachineTranslation/GoogleTranslateWrapperTest.php
styles/layout/layout.css
parents 10d0090a 8d7b5fd7
......@@ -110,6 +110,8 @@ if ($tiki_p_admin == 'y' && isset($_REQUEST['rebuild']) && $_REQUEST['rebuild']
if ($tiki_p_admin == 'y' && isset($_REQUEST['optimize']) && $_REQUEST['optimize'] == 'now') {
global $unifiedsearchlib; require_once 'lib/search/searchlib-unified.php';
@ini_set('max_execution_time', 0);
@ini_set('memory_limit', -1);
$stat = $unifiedsearchlib->getIndex()->optimize();
}
......
......@@ -11205,17 +11205,17 @@ $lang = array(
// "Importer log" => "Importer log",
// "Suggested .htaccess rules" => "Suggested .htaccess rules",
// "Locked by %0" => "Locked by %0",
"Tiki installer" => "Tiki telepítő",
"Tiki installer" => "Tiki telepítés",
"Welcome" => "Üdvözlet",
"Welcome to the Tiki installation and upgrade script" => "Üdvözlet a Tiki telepítő és frissítő szkriptjében",
"Use this script to install a new Tiki database or upgrade your existing database to release" => "Ezt a szkriptet új Tiki adatbázis telepítéséhez vagy egy létező adatbázis ezen legújabb kiadásra történő frissítéséhez használjuk:",
"For the latest information about this release, please read the" => "Pour les dernières informations concernant cette version, veuillez consulter les ",
"Use this script to install a new Tiki database or upgrade your existing database to release" => "Ezt a szkriptet új Tiki adatbázis telepítéséhez vagy egy létező adatbázis legújabb kiadásra történő frissítéséhez lehet felhasználni:",
"For the latest information about this release, please read the" => "Tiki kiadás részleteit lásd itt:",
"Release Notes" => "Kiadási megjegyzések",
"For complete documentation, please visit" => "Teljes dokumentációt lásd itt:",
"For more information about Tiki, please visit" => "További információk a TikiWikiről itt:",
"For more information about Tiki, please visit" => "További információk a Tikiről itt:",
"Select your language" => "Nyelv kiválasztása",
"Read the License" => "Licensz elolvasása",
"Tiki is software distributed under the LGPL license" => "A Tiki szoftver LGPL licensz alatt fut",
"Tiki is software distributed under the LGPL license" => "A Tiki szoftver LGPL licensz alatt használható",
"Review the System Requirements" => "Rendszerkövetelmények áttekintése",
"Review" => "Átnézés",
// "Before installing Tiki, <a href=\"http://doc.tiki.org/Requirements\" target=\"_blank\">review the documentation</a> and confirm that your system meets the minimum requirements" => "Before installing Tiki, <a href=\"http://doc.tiki.org/Requirements\" target=\"_blank\">review the documentation</a> and confirm that your system meets the minimum requirements",
......@@ -11285,10 +11285,10 @@ $lang = array(
// "Convert database and tables to UTF-8" => "Convert database and tables to UTF-8",
// "This will destroy your current database &quot;%0&quot;" => "This will destroy your current database &quot;%0&quot;",
"Reinstall the database" => "Az adatbázis újratelepítése",
// "Select database engine" => "Select database engine",
// "MyISAM" => "MyISAM",
// "InnoDB (experimental)" => "InnoDB (experimental)",
// "Reinstall" => "Reinstall",
"Select database engine" => "Adatbázis motore kiválasztása",
"MyISAM" => "MyISAM",
"InnoDB (experimental)" => "InnoDB (kísérleti)",
"Reinstall" => "Újratelepítés",
"Upgrade" => "Frissítés",
// "Warning: Category Permissions Will Not Be Upgraded" => "Warning: Category Permissions Will Not Be Upgraded",
// "Category permissions have been revamped since version 3. If you have been using category permissions, note that they may not work properly after upgrading to version 4 onwards, and it will be necessary to reconfigure them" => "Category permissions have been revamped since version 3. If you have been using category permissions, note that they may not work properly after upgrading to version 4 onwards, and it will be necessary to reconfigure them",
......@@ -11311,7 +11311,7 @@ $lang = array(
"Operations failed" => "Sikertelen műveletek",
"Display details" => "Részletek megjelenítése",
"During an upgrade, it is normal to have SQL failures resulting with <strong>Table already exists</strong> messages" => "Frissítés során normális ha <strong>Table already exists</strong> SQL hibaüzeneteket kapunk ",
// "Check all errors" => "Check all errors",
"Check all errors" => "Összes hiba kijelölése",
".htaccess File" => ".htaccess fájl",
// "We recommend enabling the <strong>.htaccess</strong> file for your Tiki" => "We recommend enabling the <strong>.htaccess</strong> file for your Tiki",
// "This will enable you to use SEFURLs (search engine friendly URLs) and help improve site security" => "This will enable you to use SEFURLs (search engine friendly URLs) and help improve site security",
......@@ -11369,7 +11369,7 @@ $lang = array(
"Reset the Database Connection" => "Adatbázis kapcsolat beállítása",
"Configure the General Settings" => "Általános beállítások",
"Tiki Icon" => "Tiki ikon",
// "Tiki Project Web Site" => "Tiki Project Web Site",
"Tiki Project Web Site" => "Tiki projekt weboldala",
"Documentation" => "Dokumentáció",
"Support Forums" => "Támogató fórumok",
// "Powered by Tiki Wiki CMS Groupware" => "Powered by Tiki Wiki CMS Groupware",
......@@ -11436,7 +11436,7 @@ $lang = array(
"Use Dates?" => "Dátumok használata?",
"Max Impressions" => "Max nézőszám",
"Impressions" => "Nézőszám",
"Max Clicks" => "Max Klikkek",
"Max Clicks" => "Max klikkek",
"Clicks" => "Kattintások",
"Create New Blog" => "Blog létrehozása",
"List all comments" => "Komment lista",
......@@ -209,6 +209,6 @@ class Perms_ResolverFactory_CategoryFactory implements Perms_ResolverFactory
}
private function cleanObject($name) {
return TikiLib::strtolower(trim($name));
return trim($name);
}
}
......@@ -67,8 +67,11 @@ class Tracker_Field_DateTime extends Tracker_Field_Abstract implements Tracker_F
'value' => $this->getValue($this->getOption(3) == 'blank' ? '' : TikiLib::lib('tiki')->now),
);
if (isset($requestData[$ins_id.'Month']) || isset($requestData[$ins_id.'Hour'])) {
if (isset($requestData[$ins_id.'Month']) || isset($requestData[$ins_id.'Day']) || isset($requestData[$ins_id.'Year']) || isset($requestData[$ins_id.'Hour']) || isset($requestData[$ins_id.'Minute'])) {
$data['value'] = TikiLib::lib('trk')->build_date($requestData, $this->getOption(0), $ins_id);
if (empty($data['value']) && (!empty($requestData[$ins_id.'Month']) || !empty($requestData[$ins_id.'Day']) || !empty($requestData[$ins_id.'Year']) || !empty($requestData[$ins_id.'Hour']) || !empty($requestData[$ins_id.'Minute']))) {
$data['error'] = 'y';
}
}
return $data;
......
......@@ -742,6 +742,7 @@ if ( \$('#$id') ) {
return $this->plugin_exists($info['implementation'], $include);
}
return false;
}
//*
......@@ -772,6 +773,8 @@ if ( \$('#$id') ) {
function plugin_alias_info( $name )
{
global $prefs;
if (empty($name))
return false;
$name = strtolower($name);
$prefName = "pluginalias_$name";
......
......@@ -50,7 +50,7 @@ class RankLib extends TikiLib
}
}
}
if ($prefs['feature_best_language'] != 'y' || !$res['lang'] || !in_array($res['pageName'], $pagesAdded)) {
if ($prefs['feature_best_language'] != 'y' || !$res['lang'] || empty($pagesAdded) || !in_array($res['pageName'], $pagesAdded)) {
$aux['name'] = $res['pageName'];
$aux['hits'] = $res['hits'];
$aux['href'] = 'tiki-index.php?page=' . urlencode($res['pageName']);
......
......@@ -13,8 +13,9 @@ $headerlib->add_js("var tiki_cookie_jar=new Array();");
if ( isset($_SESSION['tiki_cookie_jar']) ) {
$cookielist = array();
$smarty->loadPlugin('smarty_modifier_escape');
foreach ( $_SESSION['tiki_cookie_jar'] as $nn => $vv ) {
$cookielist[] = "$nn: '". addslashes($vv)."'";
$cookielist[] = "'" . smarty_modifier_escape($nn, 'javascript') . "': '". smarty_modifier_escape($vv, 'javascript')."'";
}
if ( count($cookielist) ) {
......
......@@ -55,10 +55,13 @@ function smarty_function_query($params, $smarty)
foreach ( $params as $param_name => $param_value ) {
// Arguments starting with an underscore are special and must not be included in URL
if ( $param_name[0] == '_' ) continue;
$list = explode(", ", $param_value);
if ( isset($_REQUEST[$param_name]) and in_array($_REQUEST[$param_name], $list) ) {
$query[$param_name] = $list[(array_search($_REQUEST[$param_name], $list)+1)%count($list)];
if ($param_name == 'page') {
$list = array($param_value);
} else {
$list = explode(",",$param_value);
}
if ( isset($_REQUEST[$param_name]) and in_array($_REQUEST[$param_name],$list) ) {
$query[$param_name] = $list[(array_search($_REQUEST[$param_name],$list)+1)%count($list)];
if ( $query[$param_name] === NULL or $query[$param_name] == 'NULL' ) {
unset($query[$param_name]);
}
......
......@@ -2562,6 +2562,7 @@ class TikiLib extends TikiDb_Bridge
$this->table('users_groups')->updateMultiple(array('groupHome' => null), array('groupHome' => $page));
$this->table('tiki_theme_control_objects')->deleteMultiple(array('name' => $page,'type' => 'wiki page'));
$this->table('tiki_copyrights')->deleteMultiple(array('page' => $page));
$this->remove_object('wiki page', $page);
......
......@@ -1913,6 +1913,9 @@ class TrackerLib extends TikiLib
if (isset($ins_fields)&&isset($ins_fields['data']))
foreach ($ins_fields['data'] as $f) {
if ($f['type'] == 'f' && isset($f['error']) && $f['isMandatory'] != 'y') {
$mandatory_fields[] = $f;
}
if ($f['type'] != 'q' and isset($f['isMandatory']) && $f['isMandatory'] == 'y') {
if ($f['type'] == 'e') {
......
......@@ -132,7 +132,7 @@ function wikiplugin_attach($data, $params)
global $mimeextensions;
global $wikilib; include_once('lib/wiki/wikilib.php');
global $tikilib;
global $user, $section;
global $user, $section, $section_class;
extract($params, EXTR_SKIP);
......@@ -162,7 +162,7 @@ function wikiplugin_attach($data, $params)
}
// See if we're being called from a wiki page.
if ( $section == 'wiki page' ) {
if(strstr($section_class, 'wiki_page')) {
$atts_item_name = $_REQUEST["page"];
$atts = $wikilib->list_wiki_attachments($atts_item_name, 0, -1, 'created_desc', '');
}
......
......@@ -311,6 +311,10 @@ class WikiLib extends TikiLib
$this->query($query, array( $newName, $oldName ));
}
// copyright
$query = "update tiki_copyrights set `page`=? where `page`=?";
$this->query($query, array( $newName, $oldName ) );
//breadcrumb
if (isset($_SESSION["breadCrumb"]) && in_array($oldName, $_SESSION["breadCrumb"])) {
$pos = array_search($oldName, $_SESSION["breadCrumb"]);
......
......@@ -59,5 +59,5 @@
{/if}
{if ! $parentId && $prefs.feature_wiki_paragraph_formatting eq 'y'}
<a id="note-editor-comment" href="" style="display:none;">{tr}Add Comment{/tr}</a>
<a id="note-editor-comment" href="#" style="display:none;">{tr}Add Comment{/tr}</a>
{/if}
......@@ -18,9 +18,17 @@
{if $prefs.metatag_author neq ''}
<meta name="author" content="{$prefs.metatag_author|escape}" />
{/if}
{if $prefs.metatag_pagedesc eq 'y' and $description neq ''}
{if $section eq "blogs"}
{if $blog_data.title eq ''}
<meta name="description" content="Blog listing" />
{elseif $postId eq ''}
<meta name="description" content="{$blog_data.title|escape}" />
{else}
<meta name="description" content="{$post_info.title|escape} - {$blog_data.title|escape}" />
{/if}
{elseif $prefs.metatag_pagedesc eq 'y' and $description ne ''}
<meta name="description" content="{$description|escape}" />
{elseif $prefs.metatag_description neq '' or (isset($description) and $description eq '')}
{elseif $prefs.metatag_description ne '' or (isset($description) and $description eq '')}
<meta name="description" content="{$prefs.metatag_description|escape}" />
{/if}
{if $prefs.metatag_geoposition neq ''}
......
......@@ -13,7 +13,7 @@
</div>
{/foreach}
{if isset($hiddenContributors)}
<a href="">{if $hiddenContributors eq 1}{tr}1 more contributor{/tr}{else}{tr}{$hiddenContributors} more contributors{/tr}{/if}</a>
<a href="#">{if $hiddenContributors eq 1}{tr}1 more contributor{/tr}{else}{tr}{$hiddenContributors} more contributors{/tr}{/if}</a>
{jq}
$('div.contributors').each(function() {
$(this).children('div:gt(4)').hide();
......
......@@ -8,7 +8,7 @@
</span>
{/if}
{if $p.warning}
<a href="" target="tikihelp" class="tikihelp" title="{tr}Warning:{/tr} {$p.warning|escape}">
<a href="#" target="tikihelp" class="tikihelp" title="{tr}Warning:{/tr} {$p.warning|escape}">
{icon _id=error alt=''}
</a>
{/if}
......
<span class="tips"{if !empty($category_data.description)} title="{$category_data.description|escape}"{/if}>
{if $category_data.children gt 0}
<a href=""#">{$category_data.name|escape}</a>
<a href="#">{$category_data.name|escape}</a>
{/if}
{if $category_data.canchange}
<input id="categ-{$category_data.categId|escape}" type="checkbox" name="cat_categories[]" value="{$category_data.categId|escape}"
......
......@@ -46,7 +46,7 @@
{if count($dirs) && $tiki_p_admin eq 'y'}
<h2>{tr}Directories to save{/tr}</h2>
<form method="post" action="{$smarty.server.PHP_SELF}">
<form method="post" action="{$smarty.server.PHP_SELF|escape}">
<p><label>{tr}Full Path to the Zip File:{/tr}<input type="text" name="zipPath" value="{$zipPath|escape}" /></label>
<input type="submit" name="zip" value="{tr}Generate a zip of those directories{/tr}" /></p>
{if $zipPath}
......
......@@ -58,9 +58,9 @@
{assign var=thiscustomfgcolor value=$infocals.$k.customfgcolor}
{assign var=thisinfocalsname value=$infocals.$k.name|escape}
{if count($checkedCals) > $maxCalsForButton}
<option style="background-color:#{$thiscustombgcolor};color:#{$thiscustomfgcolor};" onclick="toggle('filtercal')">{$thisinfocalsname}</option>
<option style="background:#{$thiscustombgcolor};color:#{$thiscustomfgcolor};" onclick="toggle('filtercal')">{$thisinfocalsname}</option>
{else}
{button href="#" _style="background-color:#$thiscustombgcolor;color:#$thiscustomfgcolor;border:1px solid #$thiscustomfgcolor;" _onclick="toggle('filtercal');return false;" _text="$thisinfocalsname"}
{button href="#" _style="background:#$thiscustombgcolor;color:#$thiscustomfgcolor;border:1px solid #$thiscustomfgcolor;" _onclick="toggle('filtercal');return false;" _text="$thisinfocalsname"}
{/if}
{/if}
{/foreach}
......
......@@ -26,9 +26,9 @@
<div>
{if !isset($noHistory)}
{if isset($show_all_versions) and $show_all_versions eq "n"}
{pagination_links cant=$ver_cant offset=$smarty.request.preview_idx offset_arg="preview_idx" itemname={tr}Session{/tr} show_numbers="n"}{/pagination_links}
{pagination_links cant=$ver_cant offset=$smarty.request.preview_idx offset_arg="preview_idx" itemname="{tr}Session{/tr}" show_numbers="n"}{/pagination_links}
{else}
{pagination_links cant=$ver_cant offset=$smarty.request.preview_idx offset_arg="preview_idx" itemname={tr}Version{/tr} show_numbers="n"}{/pagination_links}
{pagination_links cant=$ver_cant offset=$smarty.request.preview_idx offset_arg="preview_idx" itemname="{tr}Version{/tr}" show_numbers="n"}{/pagination_links}
{/if}
{/if}
</div>
......
......@@ -110,7 +110,7 @@
</table>
{else}
{include file='tracker_pretty_item.tpl' item=$item_info fields=$ins_fields wiki=$tracker_info.viewItemPretty}
{include file='tracker_pretty_item.tpl' item=$item_info fields=$fields wiki=$tracker_info.viewItemPretty}
{/if}
{/tab}
......
......@@ -37,7 +37,7 @@
{tr}at{/tr}
{/if}
{if $field.options_array[0] ne 'd'}
{if $field.isMandatory ne 'y' and (isset($field.options_array[3]) and ($field.options_array[3] eq 'blank' or $field.options_array[3] eq 'empty'))or (isset($inExportForm) and $inExportForm eq 'y')}
{if (isset($field.options_array[3]) and ($field.options_array[3] eq 'blank' or $field.options_array[3] eq 'empty'))or (isset($inExportForm) and $inExportForm eq 'y')}
{html_select_time prefix=$field.ins_id time=$time display_seconds=false all_empty=" " use_24_hours=$use_24hr_clock}
{else}
{html_select_time prefix=$field.ins_id time=$time display_seconds=false use_24_hours=$use_24hr_clock}
......
......@@ -142,17 +142,12 @@ if ( $cdn_pref ) {
exit;
}
}
$cookie_path = '';
if (isset($_SERVER["REQUEST_URI"])) {
$cookie_path = str_replace("\\", "/", dirname($_SERVER["REQUEST_URI"]));
if ($cookie_path != '/') {
$cookie_path .= '/';
}
ini_set('session.cookie_path', str_replace("\\", "/", $cookie_path));
ini_set('session.cookie_path', str_replace("\\", "/", $tikiroot));
if ( $start_session ) {
// enabing silent sessions mean a session is only started when a cookie is presented
$session_params = session_get_cookie_params();
session_set_cookie_params($session_params['lifetime'], $cookie_path);
session_set_cookie_params($session_params['lifetime'], $tikiroot);
unset($session_params);
try {
......
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