From: Filipus K. <ch...@gm...> - 2017-11-25 17:59:11
|
Thank you Rivardo Please see inline remarks below. On 2017-11-22 19:44, rjsmelo--- via Tikiwiki-cvs wrote: > Revision: 64684 > http://sourceforge.net/p/tikiwiki/code/64684 > Author: rjsmelo > Date: 2017-11-23 00:44:13 +0000 (Thu, 23 Nov 2017) > Log Message: > ----------- > [ENH] Upgraade mPDF supported version to version 7, update slideshow to use the new version also. > > Modified Paths: > -------------- > trunk/admin/include_packages.php > trunk/lib/core/Tiki/Autoload.php > trunk/lib/core/Tiki/Package/ComposerCli.php > trunk/lib/core/Tiki/Package/ComposerManager.php > trunk/lib/core/Tiki/Package/ComposerPackages.yml > trunk/lib/pdflib.php > trunk/lib/prefs/print.php > trunk/templates/admin/include_packages.tpl > trunk/templates/admin/include_print.tpl > > [...] > > > > > @@ -375,6 +374,30 @@ > } > > /** > + * Update a package required version (from the package definition) > + * > + * @param ComposerPackage $package > + * @return bool This should document all possible values. > + */ > + public function updatePackage(ComposerPackage $package) { To respect our conventions, the curly brace should be on its own line. > + > + if (!$this->canExecuteComposer() || !$this->checkConfigExists()) { > + return false; > + } > + > + list($commandOutput, $errors) = $this->execComposer( > + ['require', $package->getName() . ':' . $package->getRequiredVersion(), '--update-no-dev', '-d', $this->workingPath, '--no-ansi', '--no-interaction'] > + ); > + > + $fileContent = file_get_contents($this->getComposerConfigFilePath()); > + > + return tr('= New composer.json file content') . ":\n\n" > + . $fileContent . "\n\n" > + . tr('= Composer execution output') . ":\n\n" > + . $commandOutput . "\n" . $errors; > + } > + > + /** > * Remove a package (from the package definition) > * > * @param ComposerPackage $package > > Modified: trunk/lib/core/Tiki/Package/ComposerManager.php > =================================================================== > --- trunk/lib/core/Tiki/Package/ComposerManager.php 2017-11-22 23:53:46 UTC (rev 64683) > +++ trunk/lib/core/Tiki/Package/ComposerManager.php 2017-11-23 00:44:13 UTC (rev 64684) > @@ -96,16 +96,19 @@ > $installedPackages = $this->composerWrapper->getListOfPackagesFromConfig(); > $packageDefinitions = $this->getAvailable(false); > > - $keyLookup = []; > + $packageListLookup = []; > foreach ($packageDefinitions as $package) { > $packageName = $this->normalizePackageName($package['name']); > - $keyLookup[$packageName] = $package['key']; > + $packageListLookup[$packageName] = $package; > } > + > if ($installedPackages !== false) { > foreach ($installedPackages as &$package) { > $packageName = $this->normalizePackageName($package['name']); > - if (isset($keyLookup[$packageName])) { > - $package['key'] = $keyLookup[$packageName]; > + if (isset($packageListLookup[$packageName])) { > + $package['key'] = $packageListLookup[$packageName]['key']; > + $package['requiredVersion'] = $packageListLookup[$packageName]['requiredVersion']; > + $package['upgradeVersion'] = $package['required'] != $package['requiredVersion']; > } else { > $package['key'] = ''; > } > @@ -182,7 +185,6 @@ > */ > public function installPackage($packageKey) > { > - > $externalPackage = $this->manageYaml('search', [], $packageKey); > > if (! $externalPackage) { > @@ -193,6 +195,23 @@ > } > > /** > + * Try to update a packages by the package key (corresponding to the class name) s/packages/package/ > + * > + * @param $packageKey > + * @return bool|string This should list all possible values and when they are returned. > + */ > + public function updatePackage($packageKey) > + { > + $externalPackage = $this->manageYaml('search', [], $packageKey); > + > + if (! $externalPackage) { > + return null; > + } > + > + return $this->composerWrapper->updatePackage($externalPackage); > + } > + > + /** > * Try to remove a packages by the package key (corresponding to the class name) > * > * @param $packageKey > [...] > > Modified: trunk/lib/pdflib.php > =================================================================== > --- trunk/lib/pdflib.php 2017-11-22 23:53:46 UTC (rev 64683) > +++ trunk/lib/pdflib.php 2017-11-23 00:44:13 UTC (rev 64684) > @@ -70,25 +70,10 @@ > } > } > } elseif ($printMode == self::MPDF) { > - self::setupMPDFPathConstants(); > - $path = $prefs['print_pdf_mpdf_path']; > - if (class_exists('mPDF')) { // Autoload will take care of loading the mpdf file > - if (! is_writable(_MPDF_TEMP_PATH) ||! is_writable(_MPDF_TTFONTDATAPATH)) { > - $this->error = tr( > - 'mPDF "%0" and "%1" directories must be writable', > - 'tmp', > - 'ttfontdata' > - ); > - } else { > - $this->mode = 'mpdf'; > - $this->location = $path; > - } > + if (class_exists('\\Mpdf\\Mpdf')) { > + $this->mode = 'mpdf'; > } else { > - if (! empty($path)) { > - $this->error = tr('mPDF not found in path "%0", and is not installed using packages.', $path); > - } else { > - $this->error = tr('The mPDF path has not been set, and is not installed using packages.'); > - } > + $this->error = tr('The package mPDF is not installed. You can install it using packages.'); This error message sounds strange. Perhaps "mPDF is not installed. You can install it by installing its package." ? > } > } > if ($this->error) { > @@ -238,42 +223,6 @@ > } > > /** > - * Setup mPDF Constants related with PATHS in teh filesystem > - * It sets the cache locations to a folder (mpdf) inside the filesystem cache > - * It sets a extra folder to load fonts > - */ > - public static function setupMPDFPathConstants() > - { > - // Set custom Fonts path > - if (! defined('_MPDF_SYSTEM_TTFONTS')) { > - define('_MPDF_SYSTEM_TTFONTS', TIKI_PATH . '/lib/pdf/fontdata/fontttf/'); > - } > - > - // set cache paths > - $cache = new CacheLibFileSystem(); > - $mPDFBaseCachePath = $cache->folder . '/mpdf/'; > - if (! is_dir($mPDFBaseCachePath)) { > - mkdir($mPDFBaseCachePath); > - chmod($mPDFBaseCachePath, 0777); > - } > - > - $constantsAndDirectories = [ > - '_MPDF_TEMP_PATH' => 'tmp/', > - '_MPDF_TTFONTDATAPATH' => 'ttfontdata/', > - ]; > - > - foreach ($constantsAndDirectories as $constant => $directory) { > - if (! is_dir($mPDFBaseCachePath . $directory)) { > - mkdir($mPDFBaseCachePath . $directory); > - chmod($mPDFBaseCachePath . $directory, 0777); > - } > - if (! defined($constant)) { > - define($constant, $mPDFBaseCachePath . $directory); > - } > - } > - } > - > - /** > * @param $url string - address of the item to print as PDF > * @return string - contents of the PDF > */ > @@ -308,12 +257,24 @@ > } > $this->_getImages($html, $tempImgArr); > > - $this->_parseHTML($html); > + $this->_parseHTML($html); > > - self::setupMPDFPathConstants(); > + $defaults = new \Mpdf\Config\ConfigVariables(); > + $defaultVariables = $defaults->getDefaults(); > + $mpdfConfig = [ > + 'fontDir' => array_merge([TIKI_PATH . '/lib/pdf/fontdata/fontttf/'], $defaultVariables['fontDir']), > + 'mode' => 'utf8', > + 'format' => $pdfSettings['pagesize'], > + 'margin_left' => $pdfSettings['margin_left'], > + 'margin_right' => $pdfSettings['margin_right'], > + 'margin_top' => $pdfSettings['margin_top'], > + 'margin_bottom' => $pdfSettings['margin_bottom'], > + 'margin_header' => $pdfSettings['margin_header'], > + 'margin_footer' => $pdfSettings['margin_footer'], > + 'orientation' => $pdfSettings['orientation'], > + ]; > + $mpdf = new \Mpdf\Mpdf($mpdfConfig); > > - $mpdf = new mPDF('utf-8', $pdfSettings['pagesize'], '', '', $pdfSettings['margin_left'], $pdfSettings['margin_right'], $pdfSettings['margin_top'], $pdfSettings['margin_bottom'], $pdfSettings['margin_header'], $pdfSettings['margin_footer'], $pdfSettings['orientation']); > - > //custom fonts add, currently fontawesome support is added, more fonts can be added in future > $custom_fontdata = [ > 'fontawesome' => [ > > Modified: trunk/lib/prefs/print.php > =================================================================== > --- trunk/lib/prefs/print.php 2017-11-22 23:53:46 UTC (rev 64683) > +++ trunk/lib/prefs/print.php 2017-11-23 00:44:13 UTC (rev 64684) > @@ -48,16 +48,6 @@ > 'dependencies' => ['auth_token_access'], > 'default' => '', > ], > - 'print_pdf_mpdf_path' => [ > - 'name' => tra('mPDF path'), > - 'description' => tra('Path to of the mPDF install.'), > - 'type' => 'text', > - 'size' => 50, > - 'help' => 'mPDF', > - 'dependencies' => ['auth_token_access'], > - 'default' => 'vendor/mpdf/mpdf', > - 'packages_required' => ['mpdf/mpdf' => 'mPDF'], > - ], > 'print_pdf_mpdf_printfriendly' => [ > 'name' => tra('Print Friendly PDF'), > 'description' => tra('Useful for dark themes, Enabling this option will change theme background color to white and text / headings color to black. If turned off, theme colors will be retained in pdf'), > @@ -75,6 +65,7 @@ > 'L' => tra('Landscape'), > ], > 'default' => 'P', > + 'packages_required' => array('mpdf/mpdf' => 'Mpdf\\Mpdf'), > ], > 'print_pdf_mpdf_size' => [ > 'name' => tra('PDF page size'), > > Modified: trunk/templates/admin/include_packages.tpl > =================================================================== > --- trunk/templates/admin/include_packages.tpl 2017-11-22 23:53:46 UTC (rev 64683) > +++ trunk/templates/admin/include_packages.tpl 2017-11-23 00:44:13 UTC (rev 64684) > @@ -23,12 +23,12 @@ > <th>{tr}Version Required{/tr}</th> > <th>{tr}Status{/tr} > <th>{tr}Version Installed{/tr}</th> > - <th>{tr}Remove{/tr}</th> > + <th>{tr}Action{/tr}</th> > </tr> > {foreach item=entry from=$composer_packages_installed} > <tr> > <td>{$entry.name}</td> > - <td>{$entry.required}</td> > + <td>{$entry.required} {if $entry.upgradeVersion}<span class="label label-warning">{tr}Update:{/tr} {$entry.requiredVersion}</span>{/if}</td> > <td> > {if $entry.status == 'installed'} > {icon name='success' iclass='tips' ititle="{tr}Status{/tr}:{tr}Installed{/tr}"} > @@ -43,6 +43,9 @@ > <form action="tiki-admin.php?page=packages&cookietab=1" method="post"> > <input type="hidden" name="redirect" value="0"> > {ticket} > + {if $entry.upgradeVersion} > + <button name="auto-update-package" value="{$entry.key}">{tr}Update{/tr}</button> > + {/if} > <button name="auto-remove-package" value="{$entry.key}">{tr}Remove{/tr}</button> > </form> > {else} > > Modified: trunk/templates/admin/include_print.tpl > =================================================================== > --- trunk/templates/admin/include_print.tpl 2017-11-22 23:53:46 UTC (rev 64683) > +++ trunk/templates/admin/include_print.tpl 2017-11-23 00:44:13 UTC (rev 64684) > @@ -15,10 +15,9 @@ > {preference name=print_pdf_webservice_url} > </div> > <div class="adminoptionboxchild print_pdf_from_url_childcontainer mpdf"> > - {preference name=print_pdf_mpdf_path} > - {preference name=print_pdf_mpdf_printfriendly} > {preference name=print_pdf_mpdf_orientation} > {preference name=print_pdf_mpdf_size} > + {preference name=print_pdf_mpdf_printfriendly} > {preference name=print_pdf_mpdf_toc} > {preference name=print_pdf_mpdf_toclinks} > {preference name=print_pdf_mpdf_tocheading} > @@ -44,8 +43,8 @@ > {preference name=print_pdf_mpdf_background_image} > {preference name=print_pdf_mpdf_coverpage_text_settings} > {preference name=print_pdf_mpdf_coverpage_image_settings} > - > > + > </div> > {preference name=allocate_memory_print_pdf} > {preference name=allocate_time_print_pdf} -- Filipus Klutiero http://www.philippecloutier.com |
From: <rj...@us...> - 2017-11-23 02:23:50
|
Revision: 64686 http://sourceforge.net/p/tikiwiki/code/64686 Author: rjsmelo Date: 2017-11-23 02:23:47 +0000 (Thu, 23 Nov 2017) Log Message: ----------- [NEW] Enable tiki admins to define a fallback URL, used when the URL can't be determined, for instance when running from command line / cron Modified Paths: -------------- trunk/lib/core/Tiki/Command/NotificationDigestCommand.php trunk/lib/prefs/global.php trunk/lib/setup/absolute_urls.php trunk/templates/admin/include_general.tpl Added Paths: ----------- trunk/lib/core/Tiki/Url.php Modified: trunk/lib/core/Tiki/Command/NotificationDigestCommand.php =================================================================== --- trunk/lib/core/Tiki/Command/NotificationDigestCommand.php 2017-11-23 02:23:19 UTC (rev 64685) +++ trunk/lib/core/Tiki/Command/NotificationDigestCommand.php 2017-11-23 02:23:47 UTC (rev 64686) @@ -22,7 +22,7 @@ ->setDescription('Send out email notification digests') ->addArgument( 'domain', - InputArgument::REQUIRED, + InputArgument::OPTIONAL, 'Domain name to use (cannot be obtained from the URL)' ) ->addArgument( @@ -74,6 +74,10 @@ $url_host = $input->getArgument('domain'); + if (empty($url_host) && isset($prefs['fallbackBaseUrl'])) { + $url_host = $prefs['fallbackBaseUrl']; + } + $list = \TikiDb::get()->fetchAll(" SELECT userId, login, email, IFNULL(p.value, ?) language FROM users_users u Added: trunk/lib/core/Tiki/Url.php =================================================================== --- trunk/lib/core/Tiki/Url.php (rev 0) +++ trunk/lib/core/Tiki/Url.php 2017-11-23 02:23:47 UTC (rev 64686) @@ -0,0 +1,102 @@ +<?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$ + +namespace Tiki; + +/** + * Class Url + */ +class Url +{ + /** + * Handle the fallback url pref, in case the info couldn't be guessed from the request (eg. when called from cli) + * + * @return bool|array false if didn't process, array with the values written otherwise + */ + public static function handleFallbackUrl() + { + global $prefs, $https_mode, $url_scheme, $url_host, $url_port, $url_path, $base_host, $base_url, $base_url_http, $base_url_https, $tikiroot; + + if (! empty($url_host) || empty($prefs['fallbackBaseUrl'])) { + return false; + } + + $values = static::parseFallbackUrl($prefs['fallbackBaseUrl']); + + if ($values == false) { + return false; + } + + $url_scheme = $values['url_scheme']; + $url_port = $values['url_port']; + $https_mode = $values['https_mode']; + $url_host = $values['url_host']; + $url_path = $values['url_path']; + $tikiroot = $values['tikiroot']; + $base_host = $values['base_host']; + $base_url = $values['base_url']; + $base_url_http = $values['base_url_http']; + $base_url_https = $values['base_url_https']; + + return $values; + } + + /** + * Parses the fallback url in the different values of the tiki url used when building urls + * + * @param string $url the URL to process + * @return bool|array false if url couldn't be parsed, array of values if successful + */ + public static function parseFallbackUrl($url) + { + global $prefs; + + if (empty($url)) { + return false; + } + + $parts = parse_url($url); + + if ($parts === false) { + return false; + } + + $options['url_scheme'] = 'http'; + $options['url_port'] = $prefs['http_port']; + $options['https_mode'] = false; + if (isset($parts['scheme']) && $parts['scheme'] == 'https') { + $options['url_scheme'] = 'https'; + $options['url_port'] = $prefs['https_port']; + $options['https_mode'] = true; + } + + $options['url_host'] = ''; + if (isset($parts['host'])) { + $options['url_host'] = $parts['host']; + } + + if (isset($parts['port'])) { + $options['url_port'] = $parts['port']; + if ($options['url_scheme'] == 'http') { + $prefs['http_port'] = $parts['port']; + } else { + $prefs['https_port'] = $parts['port']; + } + } + + $options['tikiroot'] = empty($parts['path']) ? '/' : $parts['path']; + $options['url_path'] = $options['tikiroot']; + + + $options['base_host'] = $options['url_scheme'] . '://' . $options['url_host'] . ((isset($parts['port'])) ? ':' . $parts['port'] : ''); + $options['base_url'] = $options['url_scheme'] . '://' . $options['url_host'] . ((isset($parts['port'])) ? ':' . $parts['port'] : '') . $options['url_path']; + $options['base_url_http'] = 'http://' . $options['url_host'] . (($prefs['http_port'] != '') ? ':' . $prefs['http_port'] : '') . $options['url_path']; + $options['base_url_https'] = 'https://' . $options['url_host'] . (($prefs['https_port'] != '') ? ':' . $prefs['https_port'] : '') . $options['url_path']; + + return $options; + } +} Property changes on: trunk/lib/core/Tiki/Url.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/lib/prefs/global.php =================================================================== --- trunk/lib/prefs/global.php 2017-11-23 02:23:19 UTC (rev 64685) +++ trunk/lib/prefs/global.php 2017-11-23 02:23:47 UTC (rev 64686) @@ -16,6 +16,14 @@ 'tags' => ['basic'], 'public' => true, ], + 'fallbackBaseUrl' => [ + 'name' => tra('Fallback for tiki base URL'), + 'description' => tra('The full URL to the Tiki base URL including protocol, domain and path (example: https://example.com/tiki/), used when the current URL can not be determined, example, when executing from the command line.'), + 'type' => 'text', + 'default' => '', + 'tags' => array('basic'), + 'public' => true, + ], 'validateUsers' => [ 'name' => tra('Validate new user registrations by email'), 'description' => tra('Tiki will send an email message to the user. The message contains a link that must be clicked to validate the registration. After clicking the link, the user will be validated. You can use this option to limit false registrations or fake email addresses.'), Modified: trunk/lib/setup/absolute_urls.php =================================================================== --- trunk/lib/setup/absolute_urls.php 2017-11-23 02:23:19 UTC (rev 64685) +++ trunk/lib/setup/absolute_urls.php 2017-11-23 02:23:47 UTC (rev 64686) @@ -174,3 +174,5 @@ // Show the 'Stay in SSL mode' checkbox only if we are already in HTTPS $show_stay_in_ssl_mode = $https_mode || $prefs['https_login'] == 'required' ? 'y' : 'n'; + +\Tiki\Url::handleFallbackUrl(); Modified: trunk/templates/admin/include_general.tpl =================================================================== --- trunk/templates/admin/include_general.tpl 2017-11-23 02:23:19 UTC (rev 64685) +++ trunk/templates/admin/include_general.tpl 2017-11-23 02:23:47 UTC (rev 64686) @@ -37,6 +37,7 @@ <fieldset> <legend>{tr}Site identity{/tr}</legend> {preference name=browsertitle} + {preference name=fallbackBaseUrl} {preference name=site_title_location} {preference name=site_title_breadcrumb} {remarksbox type="info" title="{tr}Themes{/tr}"} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Filipus K. <ch...@gm...> - 2017-11-25 15:45:44
|
Thanks Ricardo, "URL" and "CLI" are acronyms and should be fully uppercase. "Tiki" is a proper noun and should be capitalized. Please see inline remarks below. On 2017-11-22 21:23, rjsmelo--- via Tikiwiki-cvs wrote: > Revision: 64686 > http://sourceforge.net/p/tikiwiki/code/64686 > Author: rjsmelo > Date: 2017-11-23 02:23:47 +0000 (Thu, 23 Nov 2017) > Log Message: > ----------- > [NEW] Enable tiki admins to define a fallback URL, used when the URL can't be determined, for instance when running from command line / cron > > Modified Paths: > -------------- > trunk/lib/core/Tiki/Command/NotificationDigestCommand.php > trunk/lib/prefs/global.php > trunk/lib/setup/absolute_urls.php > trunk/templates/admin/include_general.tpl > > Added Paths: > ----------- > trunk/lib/core/Tiki/Url.php > > [...] > > Added: trunk/lib/core/Tiki/Url.php > =================================================================== > --- trunk/lib/core/Tiki/Url.php (rev 0) > +++ trunk/lib/core/Tiki/Url.php 2017-11-23 02:23:47 UTC (rev 64686) > @@ -0,0 +1,102 @@ > +<?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$ > + > +namespace Tiki; > + > +/** > + * Class Url > + */ > +class Url > +{ > + /** > + * Handle the fallback url pref, in case the info couldn't be guessed from the request (eg. when called from cli) "Handle the fallback url pref" is pretty vague. > + * > + * @return bool|array false if didn't process, array with the values written otherwise Please clarify "didn't process". > + */ > + public static function handleFallbackUrl() > + { > + global $prefs, $https_mode, $url_scheme, $url_host, $url_port, $url_path, $base_host, $base_url, $base_url_http, $base_url_https, $tikiroot; > + > + if (! empty($url_host) || empty($prefs['fallbackBaseUrl'])) { > + return false; > + } > + > + $values = static::parseFallbackUrl($prefs['fallbackBaseUrl']); > + > + if ($values == false) { > + return false; > + } > + > + $url_scheme = $values['url_scheme']; > + $url_port = $values['url_port']; > + $https_mode = $values['https_mode']; > + $url_host = $values['url_host']; > + $url_path = $values['url_path']; > + $tikiroot = $values['tikiroot']; > + $base_host = $values['base_host']; > + $base_url = $values['base_url']; > + $base_url_http = $values['base_url_http']; > + $base_url_https = $values['base_url_https']; > + > + return $values; > + } > + > + /** > + * Parses the fallback url in the different values of the tiki url used when building urls The description should describe not how a function works, but what its effects are. > + * > + * @param string $url the URL to process > + * @return bool|array false if url couldn't be parsed, array of values if successful > + */ > + public static function parseFallbackUrl($url) > + { > + global $prefs; > + > + if (empty($url)) { > + return false; > + } > + > + $parts = parse_url($url); > + > + if ($parts === false) { > + return false; > + } I think it would be best to throw exceptions if $url is not a URL. > + > + $options['url_scheme'] = 'http'; > + $options['url_port'] = $prefs['http_port']; > + $options['https_mode'] = false; > + if (isset($parts['scheme']) && $parts['scheme'] == 'https') { > + $options['url_scheme'] = 'https'; > + $options['url_port'] = $prefs['https_port']; > + $options['https_mode'] = true; > + } It would be clearer and more optimal to use an else. > + > + $options['url_host'] = ''; > + if (isset($parts['host'])) { > + $options['url_host'] = $parts['host']; > + } > + > + if (isset($parts['port'])) { > + $options['url_port'] = $parts['port']; > + if ($options['url_scheme'] == 'http') { > + $prefs['http_port'] = $parts['port']; > + } else { > + $prefs['https_port'] = $parts['port']; > + } > + } > + > + $options['tikiroot'] = empty($parts['path']) ? '/' : $parts['path']; > + $options['url_path'] = $options['tikiroot']; > + > + > + $options['base_host'] = $options['url_scheme'] . '://' . $options['url_host'] . ((isset($parts['port'])) ? ':' . $parts['port'] : ''); > + $options['base_url'] = $options['url_scheme'] . '://' . $options['url_host'] . ((isset($parts['port'])) ? ':' . $parts['port'] : '') . $options['url_path']; > + $options['base_url_http'] = 'http://' . $options['url_host'] . (($prefs['http_port'] != '') ? ':' . $prefs['http_port'] : '') . $options['url_path']; > + $options['base_url_https'] = 'https://' . $options['url_host'] . (($prefs['https_port'] != '') ? ':' . $prefs['https_port'] : '') . $options['url_path']; > + > + return $options; > + } > +} > > > Property changes on: trunk/lib/core/Tiki/Url.php > ___________________________________________________________________ > Added: svn:eol-style > ## -0,0 +1 ## > +native > \ No newline at end of property > Added: svn:keywords > ## -0,0 +1 ## > +Id > \ No newline at end of property > Modified: trunk/lib/prefs/global.php > =================================================================== > --- trunk/lib/prefs/global.php 2017-11-23 02:23:19 UTC (rev 64685) > +++ trunk/lib/prefs/global.php 2017-11-23 02:23:47 UTC (rev 64686) > @@ -16,6 +16,14 @@ > 'tags' => ['basic'], > 'public' => true, > ], > + 'fallbackBaseUrl' => [ > + 'name' => tra('Fallback for tiki base URL'), > + 'description' => tra('The full URL to the Tiki base URL including protocol, domain and path (example: https://example.com/tiki/), used when the current URL can not be determined, example, when executing from the command line.'), s/example,/for example/ There is surely something wrong in "The full URL to the Tiki base URL". > + 'type' => 'text', > + 'default' => '', > + 'tags' => array('basic'), > + 'public' => true, > + ], > 'validateUsers' => [ > 'name' => tra('Validate new user registrations by email'), > 'description' => tra('Tiki will send an email message to the user. The message contains a link that must be clicked to validate the registration. After clicking the link, the user will be validated. You can use this option to limit false registrations or fake email addresses.'), > > Modified: trunk/lib/setup/absolute_urls.php > =================================================================== > --- trunk/lib/setup/absolute_urls.php 2017-11-23 02:23:19 UTC (rev 64685) > +++ trunk/lib/setup/absolute_urls.php 2017-11-23 02:23:47 UTC (rev 64686) > @@ -174,3 +174,5 @@ > > // Show the 'Stay in SSL mode' checkbox only if we are already in HTTPS > $show_stay_in_ssl_mode = $https_mode || $prefs['https_login'] == 'required' ? 'y' : 'n'; > + > +\Tiki\Url::handleFallbackUrl(); > > Modified: trunk/templates/admin/include_general.tpl > =================================================================== > --- trunk/templates/admin/include_general.tpl 2017-11-23 02:23:19 UTC (rev 64685) > +++ trunk/templates/admin/include_general.tpl 2017-11-23 02:23:47 UTC (rev 64686) > @@ -37,6 +37,7 @@ > <fieldset> > <legend>{tr}Site identity{/tr}</legend> > {preference name=browsertitle} > + {preference name=fallbackBaseUrl} > {preference name=site_title_location} > {preference name=site_title_breadcrumb} > {remarksbox type="info" title="{tr}Themes{/tr}"} > -- Filipus Klutiero http://www.philippecloutier.com |
From: <lfa...@us...> - 2017-11-23 14:53:12
|
Revision: 64702 http://sourceforge.net/p/tikiwiki/code/64702 Author: lfagundes Date: 2017-11-23 14:53:09 +0000 (Thu, 23 Nov 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64696 to 64698 Modified Paths: -------------- trunk/tests/testfile.txt Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-11-23 14:50:11 UTC (rev 64701) +++ trunk 2017-11-23 14:53:09 UTC (rev 64702) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,6 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 +/branches/18.x:64697-64698 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/tests/testfile.txt =================================================================== --- trunk/tests/testfile.txt 2017-11-23 14:50:11 UTC (rev 64701) +++ trunk/tests/testfile.txt 2017-11-23 14:53:09 UTC (rev 64702) @@ -27,4 +27,5 @@ new lines on the end can also be tricky hello world! from mat :) testing -something \ No newline at end of file +something +asa testing after 18.x branch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2017-11-23 17:54:30
|
Revision: 64705 http://sourceforge.net/p/tikiwiki/code/64705 Author: jonnybradley Date: 2017-11-23 17:54:28 +0000 (Thu, 23 Nov 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64698 to 64704 Modified Paths: -------------- trunk/lib/parser/parserlib.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-11-23 17:51:28 UTC (rev 64704) +++ trunk 2017-11-23 17:54:28 UTC (rev 64705) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64698 +/branches/18.x:64697-64704 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/parser/parserlib.php =================================================================== --- trunk/lib/parser/parserlib.php 2017-11-23 17:51:28 UTC (rev 64704) +++ trunk/lib/parser/parserlib.php 2017-11-23 17:54:28 UTC (rev 64705) @@ -1137,7 +1137,7 @@ } else { $elem = 'span'; } - $elem_style = 'position:relative;display:inline-block'; + $elem_style = 'position:relative;display:inline-block;'; if (! $enabled) { $elem_style .= 'opacity:0.3;'; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <amn...@us...> - 2017-11-24 06:20:35
|
Revision: 64707 http://sourceforge.net/p/tikiwiki/code/64707 Author: amnabilal Date: 2017-11-24 06:20:32 +0000 (Fri, 24 Nov 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64704 to 64706 Modified Paths: -------------- trunk/lib/pdflib.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-11-24 06:02:32 UTC (rev 64706) +++ trunk 2017-11-24 06:20:32 UTC (rev 64707) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64704 +/branches/18.x:64697-64706 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/pdflib.php =================================================================== --- trunk/lib/pdflib.php 2017-11-24 06:02:32 UTC (rev 64706) +++ trunk/lib/pdflib.php 2017-11-24 06:20:32 UTC (rev 64707) @@ -318,7 +318,7 @@ } $pdfPages = $this->getPDFPages($html, $pdfSettings); - $cssStyles = str_replace([".tiki","opacity: 0;"], ["","fill: #fff;opacity:0.3;stroke:black"], '<style>' . $basecss . $themecss . $printcss . $pageCSS . $extcss . $this->bootstrapReplace() . '</style>'); //adding css styles with first page content + $cssStyles = str_replace([".tiki","opacity: 0;"], ["","fill: #fff;opacity:0.3;stroke:black"], '<style>' . $basecss . $themecss . $printcss . $pageCSS . $extcss . $this->bootstrapReplace() .$prefs["header_custom_css"]. '</style>'); //adding css styles with first page content //cover page checking if ($pdfSettings['coverpage_text_settings'] != '' || ($pdfSettings['coverpage_image_settings'] != '' && $pdfSettings['coverpage_image_settings'] != 'off')) { $coverPage = explode("|", $pdfSettings['coverpage_text_settings']); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2017-11-24 13:08:03
|
Revision: 64710 http://sourceforge.net/p/tikiwiki/code/64710 Author: luciash Date: 2017-11-24 13:08:00 +0000 (Fri, 24 Nov 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64706 to 64709 Modified Paths: -------------- trunk/lib/setup/twversion.class.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-11-24 13:03:09 UTC (rev 64709) +++ trunk 2017-11-24 13:08:00 UTC (rev 64710) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64706 +/branches/18.x:64697-64709 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/setup/twversion.class.php =================================================================== --- trunk/lib/setup/twversion.class.php 2017-11-24 13:03:09 UTC (rev 64709) +++ trunk/lib/setup/twversion.class.php 2017-11-24 13:08:00 UTC (rev 64710) @@ -269,13 +269,13 @@ return $star; } - // Determines the currently-running version of Tikiwiki. + // Determines the currently-running version of Tiki. function getVersion() { return $this->version; } - // Pulls the list of releases in the current branch of Tikiwiki from + // Pulls the list of releases in the current branch of Tiki from // a central site. private function pollVersion() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2017-11-24 15:32:31
|
Revision: 64712 http://sourceforge.net/p/tikiwiki/code/64712 Author: luciash Date: 2017-11-24 15:32:29 +0000 (Fri, 24 Nov 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64709 to 64711 Modified Paths: -------------- trunk/lib/setup/wiki.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-11-24 14:59:55 UTC (rev 64711) +++ trunk 2017-11-24 15:32:29 UTC (rev 64712) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64709 +/branches/18.x:64697-64711 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/setup/wiki.php =================================================================== --- trunk/lib/setup/wiki.php 2017-11-24 14:59:55 UTC (rev 64711) +++ trunk/lib/setup/wiki.php 2017-11-24 15:32:29 UTC (rev 64712) @@ -60,7 +60,7 @@ // If the HomePage does not exist, create it if ($check && ! empty($_REQUEST['page']) && ! $tikilib->page_exists($_REQUEST['page'])) { $homePageLang = $prefs['language']; - $profilesLink = 'tiki-admin.php?profile=&categories%5B%5D=15.x&categories%5B%5D=Featured+profiles' . + $profilesLink = 'tiki-admin.php?profile=&categories%5B%5D=18.x&categories%5B%5D=Featured+profiles' . '&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2'; // Default HomePage content This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2017-11-27 10:38:27
|
Revision: 64722 http://sourceforge.net/p/tikiwiki/code/64722 Author: kroky6 Date: 2017-11-27 10:38:24 +0000 (Mon, 27 Nov 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64711 to 64720 Modified Paths: -------------- trunk/doc/devtools/svnup.php trunk/lib/filegals/filegallib.php trunk/lib/wiki-plugins/wikiplugin_trackerlist.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-11-27 10:36:43 UTC (rev 64721) +++ trunk 2017-11-27 10:38:24 UTC (rev 64722) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64711 +/branches/18.x:64697-64720 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/doc/devtools/svnup.php =================================================================== --- trunk/doc/devtools/svnup.php 2017-11-27 10:36:43 UTC (rev 64721) +++ trunk/doc/devtools/svnup.php 2017-11-27 10:38:24 UTC (rev 64722) @@ -92,7 +92,20 @@ 'l', InputOption::VALUE_REQUIRED, 'Time delay commits by X number of days. Useful for avoiding newly introduced bugs in automated updates.' - ); + ) + ->addOption( + 'user', + 'u', + InputOption::VALUE_REQUIRED, + 'User account to run setup.sh with (for file permissions setting).' + ) + ->addOption( + 'group', + 'g', + InputOption::VALUE_REQUIRED, + 'User group to run setup.sh with (for file permissions setting).' + ) + ; } @@ -319,8 +332,17 @@ $progress->setMessage('Updating dependencies & setting file permissions'); $progress->advance(); $errors = ['', 'Please provide an existing command', 'you are behind a proxy', 'Composer failed', 'Wrong PHP version']; - $this->OutputErrors($logger, shell_exec('sh setup.sh -n fix 2>&1'), 'Problem running setup.sh', $errors, ! $input->getOption('no-db')); // 2>&1 suppresses all terminal output, but allows full capturing for logs & verbiage + $setupParams = ''; + if ($input->getOption('user')) { + $setupParams .= ' -u ' . $input->getOption('user'); + } + if ($input->getOption('group')) { + $setupParams .= ' -g ' . $input->getOption('group'); + } + + $this->OutputErrors($logger, shell_exec("sh setup.sh $setupParams -n fix 2>&1"), 'Problem running setup.sh', $errors, ! $input->getOption('no-db')); // 2>&1 suppresses all terminal output, but allows full capturing for logs & verbiage + if (! $input->getOption('no-db')) { // generate a secbb database so when database:update is run, it also gets updated. if (! $input->getOption('no-secdb')) { Modified: trunk/lib/filegals/filegallib.php =================================================================== --- trunk/lib/filegals/filegallib.php 2017-11-27 10:36:43 UTC (rev 64721) +++ trunk/lib/filegals/filegallib.php 2017-11-27 10:38:24 UTC (rev 64722) @@ -3394,7 +3394,7 @@ if (! $files) { throw new Exception('File not found'); } - return $files[0]; + return current($files); } Modified: trunk/lib/wiki-plugins/wikiplugin_trackerlist.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_trackerlist.php 2017-11-27 10:36:43 UTC (rev 64721) +++ trunk/lib/wiki-plugins/wikiplugin_trackerlist.php 2017-11-27 10:38:24 UTC (rev 64722) @@ -53,7 +53,7 @@ 'required' => false, 'name' => tra('Popup'), 'description' => tr('Colon-separated list of fields which will display in a tooltip on mouse over. - Example: %06:7%1. Note that this implies %0y%1 value for %0sort%1 param.', '<code>', '</code>'), + Example: %06:7%1. Setting this parameter implies %0y%1 value for %0sort%1 param.', '<code>', '</code>'), 'since' => '2.0', 'filter' => 'digits', 'separator' => ':', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2017-11-27 10:46:01
|
Revision: 64725 http://sourceforge.net/p/tikiwiki/code/64725 Author: kroky6 Date: 2017-11-27 10:45:59 +0000 (Mon, 27 Nov 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64720 to 64723 Modified Paths: -------------- trunk/templates/tiki-view_tracker_item.tpl trunk/tiki-view_tracker_item.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-11-27 10:44:21 UTC (rev 64724) +++ trunk 2017-11-27 10:45:59 UTC (rev 64725) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64720 +/branches/18.x:64697-64723 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/templates/tiki-view_tracker_item.tpl =================================================================== --- trunk/templates/tiki-view_tracker_item.tpl 2017-11-27 10:44:21 UTC (rev 64724) +++ trunk/templates/tiki-view_tracker_item.tpl 2017-11-27 10:45:59 UTC (rev 64725) @@ -158,7 +158,7 @@ {trackerfields mode=view trackerId=$trackerId itemId=$itemId fields=$fields itemId=$itemId viewItemPretty=$viewItemPretty.value} {* -------------------------------------------------- section with comments --- *} - {if $tracker_info.useComments eq 'y' and ($tiki_p_tracker_view_comments ne 'n' or $tiki_p_comment_tracker_items ne 'n' or $canViewComments) and $prefs.tracker_show_comments_below eq 'y'} + {if $tracker_info.useComments eq 'y' and ($tiki_p_tracker_view_comments ne 'n' or $tiki_p_comment_tracker_items ne 'n' or $canViewCommentsAsItemOwner) and $prefs.tracker_show_comments_below eq 'y'} <a id="Comments"></a> <div id="comment-container-below" class="well well-sm" data-target="{service controller=comment action=list type=trackeritem objectId=$itemId}"></div> {jq} @@ -172,7 +172,7 @@ {/tab} {* -------------------------------------------------- tab with comments --- *} - {if $tracker_info.useComments eq 'y' and ($tiki_p_tracker_view_comments ne 'n' or $tiki_p_comment_tracker_items ne 'n' or $canViewComments) and $prefs.tracker_show_comments_below ne 'y'} + {if $tracker_info.useComments eq 'y' and ($tiki_p_tracker_view_comments ne 'n' or $tiki_p_comment_tracker_items ne 'n' or $canViewCommentsAsItemOwner) and $prefs.tracker_show_comments_below ne 'y'} {tab name="{tr}Comments{/tr} (`$comCount`)" print=n} <div id="comment-container" data-target="{service controller=comment action=list type=trackeritem objectId=$itemId}"></div> Modified: trunk/tiki-view_tracker_item.php =================================================================== --- trunk/tiki-view_tracker_item.php 2017-11-27 10:44:21 UTC (rev 64724) +++ trunk/tiki-view_tracker_item.php 2017-11-27 10:45:59 UTC (rev 64725) @@ -624,7 +624,7 @@ if ($tracker_info['useComments'] == 'y') { $comCount = $trklib->get_item_nb_comments($itemId); $smarty->assign("comCount", $comCount); - $smarty->assign("canViewComments", $itemObject->canViewComments()); + $smarty->assign("canViewCommentsAsItemOwner", $itemObject->canViewComments()); } if ($tracker_info["useAttachments"] == 'y') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <po...@us...> - 2017-11-29 04:07:34
|
Revision: 64738 http://sourceforge.net/p/tikiwiki/code/64738 Author: pom2ter Date: 2017-11-29 04:07:31 +0000 (Wed, 29 Nov 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64723 to 64737 Modified Paths: -------------- trunk/lib/jquery_tiki/autoToc.js trunk/templates/trackerinput/showtikiorg.tpl Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-11-29 04:02:20 UTC (rev 64737) +++ trunk 2017-11-29 04:07:31 UTC (rev 64738) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64723 +/branches/18.x:64697-64737 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/jquery_tiki/autoToc.js =================================================================== --- trunk/lib/jquery_tiki/autoToc.js 2017-11-29 04:02:20 UTC (rev 64737) +++ trunk/lib/jquery_tiki/autoToc.js 2017-11-29 04:07:31 UTC (rev 64738) @@ -110,9 +110,10 @@ //change behaviour if header is fixed var fixed_height = 0; + var toc_offset = parseInt(jqueryTiki.autoToc_offset); if ($('#header_outer, #navbar-fixed-top').css('position') === 'fixed') { fixed_height = $('#header_outer, #navbar-fixed-top').height() + 10; - $('<style type="text/css">.affix{top:' + (jqueryTiki.autoToc_offset + fixed_height) + 'px;}</style>').appendTo('head'); + $('<style type="text/css">.affix{top:' + (toc_offset + fixed_height) + 'px;}</style>').appendTo('head'); $('#autotoc li a').click(function(e) { var href = $(this).attr('href'); anchorOffset = $(href).offset().top - fixed_height; @@ -129,13 +130,16 @@ }).resize(); // trigger the bootstrap affix and scrollspy - $page.scrollspy({ target: "#autotoc" , offset: (jqueryTiki.autoToc_offset + fixed_height)}); + $page.scrollspy({ + target: "#autotoc", + offset: (toc_offset + fixed_height) + }); function affix() { $("> .nav", "#autotoc").affix({ offset: { top: function () { - return (this.top = $('#page-data').offset().top - (jqueryTiki.autoToc_offset + fixed_height)) + return (this.top = $('#page-data').offset().top - (toc_offset + fixed_height)) }, bottom: function () { return (this.bottom = $(document).height() - $('#page-data').offset().top - $('#page-data').height() + 10) Modified: trunk/templates/trackerinput/showtikiorg.tpl =================================================================== --- trunk/templates/trackerinput/showtikiorg.tpl 2017-11-29 04:02:20 UTC (rev 64737) +++ trunk/templates/trackerinput/showtikiorg.tpl 2017-11-29 04:07:31 UTC (rev 64738) @@ -1,63 +1,64 @@ <div id="testingstatus" style="display:none">{$field.status|escape}</div> -<h5 id="showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" class="showactive{$field.fieldId}_{$item.itemId}" {if $field.status neq 'ACTIV'}style="display: none;"{/if}>This bug has been demonstrated on show.tiki.org</h5> -<h5 class="shownone{$field.fieldId}_{$item.itemId}" {if $field.status neq 'NONE'}style="display: none;"{/if}>Please demonstrate your bug on show.tiki.org</h5> +<h5 id="showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" class="showactive{$field.fieldId}_{$item.itemId}" {if $field.status neq 'ACTIV'}style="display: none;"{/if}>{tr}This bug has been demonstrated on show.tiki.org{/tr}</h5> +<h5 class="shownone{$field.fieldId}_{$item.itemId}" {if $field.status neq 'NONE'}style="display: none;"{/if}>{tr}Please demonstrate your bug on show.tiki.org{/tr}</h5> {if !$field.id} - {remarksbox type="info" title="Bug needs to be created first" close="n"} - <p>You will be able to demonstrate your bug on a show.tiki.org instance once it has been created.</p> + {remarksbox type="info" title="{tr}Bug needs to be created first{/tr}" close="n"} + <p>{tr}You will be able to demonstrate your bug on a show.tiki.org instance once it has been created.{/tr}</p> {/remarksbox} {else} <div class="showsnapshot{$field.fieldId}_{$item.itemId}" style="display: none;"> - {remarksbox type="error" title="Show.tiki.org snapshot creation is in progress" close="n"} - <p>Show.tiki.org snapshot creation is in progress... Please monitor <a class="snapshoturl{$field.fieldId}_{$item.itemId}" href="http://{$field.snapshoturl|escape}" target="_blank">http://{$field.snapshoturl|escape}</a> for progress. <strong>Note that if you get a popup asking for a username/password, please just enter "show" and "show".</strong></p> + {remarksbox type="error" title="{tr}Show.tiki.org snapshot creation is in progress{/tr}" close="n"} + <p>{tr _0="<a class=\"snapshoturl{$field.fieldId}_{$item.itemId}\" href=\"http://{$field.snapshoturl|escape}\" target=\"_blank\">http://{$field.snapshoturl|escape}</a>"}Show.tiki.org snapshot creation is in progress... Please monitor %0 for progress.{/tr} <strong>{tr}Note that if you get a popup asking for a username/password, please just enter "show" and "show".{/tr}</strong></p> {/remarksbox} </div> <div class="showresetok{$field.fieldId}_{$item.itemId}" style="display: none;"> - {remarksbox type="info" title="Password reset" close="n"} - <p>Password reset was successful</p> + {remarksbox type="info" title="{tr}Password reset{/tr}" close="n"} + <p>{tr}Password reset was successful{/tr}</p> {/remarksbox} </div> <div class="showresetnok{$field.fieldId}_{$item.itemId}" style="display: none;"> - {remarksbox type="error" title="Password reset" close="n"} - <p>Password reset failed</p> + {remarksbox type="error" title="{tr}Password reset{/tr}" close="n"} + <p>{tr}Password reset failed{/tr}</p> {/remarksbox} </div> <div class="showdestroy{$field.fieldId}_{$item.itemId}" style="display: none;"> - {remarksbox type="error" title="Show.tiki.org instance destruction in progress" close="n"} - <p>Show.tiki.org instance destruction is in progress... Please wait...</p> + {remarksbox type="error" title="{tr}Show.tiki.org instance destruction in progress{/tr}" close="n"} + <p>{tr}Show.tiki.org instance destruction is in progress... Please wait...{/tr}</p> {/remarksbox} </div> <div class="showinvalidkeys{$field.fieldId}_{$item.itemId}" {if $field.status neq 'INVKEYS'}style="display: none;"{/if}> - {remarksbox type="error" title="Show.tiki.org is not configured properly" close="n"} - <p>The public/private keys configured to connect to show.tiki.org were not accepted. Please make sure you are using RSA keys. Thanks.</p> + {remarksbox type="error" title="{tr}Show.tiki.org is not configured properly{/tr}" close="n"} + <p>{tr}The public/private keys configured to connect to show.tiki.org were not accepted. Please make sure you are using RSA keys. Thanks.{/tr}</p> {/remarksbox} </div> <div class="showdisconnected{$field.fieldId}_{$item.itemId}" {if $field.status neq 'DISCO'}style="display: none;"{/if}> - {remarksbox type="error" title="Show.tiki.org is currently unavailable" close="n"} - <p>Unable to connect to show.tiki.org. Please let us know of the problem so that we can do something about it. Thanks.</p> + {remarksbox type="error" title="{tr}Show.tiki.org is currently unavailable{/tr}" close="n"} + <p>{tr}Unable to connect to show.tiki.org. Please let us know of the problem so that we can do something about it. Thanks.{/tr}</p> {/remarksbox} </div> <div class="showmaint{$field.fieldId}_{$item.itemId}" {if $field.status neq 'MAINT'}style="display: none;"{/if}> - {remarksbox type="error" title="Show.tiki.org is under maintenance" close="n"} - <p>Show.tiki.org is currently under maintenance. Sorry for the inconvenience. {$field.maintreason|escape}</p> + {remarksbox type="error" title="{tr}Show.tiki.org is under maintenance{/tr}" close="n"} + <p>{tr}Show.tiki.org is currently under maintenance. Sorry for the inconvenience.{/tr} {$field.maintreason|escape}</p> {/remarksbox} </div> <div class="showfail{$field.fieldId}_{$item.itemId}" {if $field.status neq 'FAIL'}style="display: none;"{/if}> - {remarksbox type="error" title="Unable to get information from show.tiki.org" close="n"} - <p>Unable to get information from show.tiki.org. Please let us know of the problem so that we can do something about it. Thanks.</p> + {remarksbox type="error" title="{tr}Unable to get information from show.tiki.org{/tr}" close="n"} + <p>{tr}Unable to get information from show.tiki.org. Please let us know of the problem so that we can do something about it. Thanks.{/tr}</p> {/remarksbox} </div> <div class="showbuilding{$field.fieldId}_{$item.itemId}" {if $field.status neq 'BUILD'}style="display: none;"{/if}> - {remarksbox type="error" title="Instance is being created" close="n"} - <p>Show.tiki.org is in the progress of creating the new instance. Please continue waiting for a minute or two. If this continues on for more than 10 minutes, please let us know of the problem so that we can do something about it. Thanks.</p> + {remarksbox type="error" title="{tr}Instance is being created{/tr}" close="n"} + <p>{tr}Show.tiki.org is in the progress of creating the new instance. Please continue waiting for a minute or two. If this continues on for more than 10 minutes, please let us know of the problem so that we can do something about it. Thanks.{/tr}</p> {/remarksbox} </div> <div class="shownone{$field.fieldId}_{$item.itemId}" {if $field.status neq 'NONE'}style="display: none;"{/if}> - {remarksbox type="info" title="About show.tiki.org" close="n"} - <p>To help developers solve the bug, we kindly request that you demonstrate your bug on a show.tiki.org instance. To start, simply select a version and click on "Create show.tiki.org instance". Once the instance is ready (in a minute or two), as indicated in the status window below, you can then access that instance, login (the initial admin username/password is "admin") and configure the Tiki to demonstrate your bug. Priority will be given to bugs that have been demonstrated on show.tiki.org.</p> + {remarksbox type="info" title="{tr}About show.tiki.org{/tr}" close="n"} + <p>{tr}To help developers solve the bug, we kindly request that you demonstrate your bug on a show.tiki.org instance. To start, simply select a version and click on "Create show.tiki.org instance". Once the instance is ready (in a minute or two), as indicated in the status window below, you can then access that instance, login (the initial admin username/password is "admin") and configure the Tiki to demonstrate your bug. Priority will be given to bugs that have been demonstrated on show.tiki.org.{/tr}</p> {/remarksbox} - Version: + {tr}Version:{/tr} <select name="svntag" class="form-control"> <option selected="selected">trunk</option> + <option>18.x</option> <option>17.x</option> <option>16.x</option> <option>15.x</option> @@ -66,14 +67,14 @@ {button href="#showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" _onclick="showtikiorg_process{$field.fieldId}_{$item.itemId}('create');" _text="{tr}Create show.tiki.org instance{/tr}"} </div> <div class="showactive{$field.fieldId}_{$item.itemId}" {if $field.status neq 'ACTIV'}style="display: none;"{/if}> - {remarksbox type="info" title="Accessing the Tiki instance that demonstrates this bug" close="n"} - <p>The URL for the show.tiki.org instance that demonstrates this bug is at: <a class="showurl{$field.fieldId}_{$item.itemId}" href="http://{$field.showurl|escape}" target="_blank">http://{$field.showurl|escape}</a>. <strong>Note that if you get a popup asking for a username/password, please just enter "show" and "show". This is different from the initial login and password for a new Tiki which is "admin" and "admin".</strong></p> - <p>The install log is at <a class="showlogurl{$field.fieldId}_{$item.itemId}" href="http://{$field.showlogurl|escape}" target="_blank">http://{$field.showlogurl|escape}</a></p> - <p><strong>Note that if you see PHP errors or a Tiki claiming to be missing third party software, the instance creation is probably not finished. Please wait 1 minute and reload.</strong></p> + {remarksbox type="info" title="{tr}Accessing the Tiki instance that demonstrates this bug{/tr}" close="n"} + <p>{tr _0="<a class=\"showurl{$field.fieldId}_{$item.itemId}\" href=\"http://{$field.showurl|escape}\" target=\"_blank\">http://{$field.showurl|escape}</a>"}The URL for the show.tiki.org instance that demonstrates this bug is at: %0.{/tr} <strong>{tr}Note that if you get a popup asking for a username/password, please just enter "show" and "show". This is different from the initial login and password for a new Tiki which is "admin" and "admin".{/tr}</strong></p> + <p>{tr _0="<a class=\"showlogurl{$field.fieldId}_{$item.itemId}\" href=\"http://{$field.showlogurl|escape}\" target=\"_blank\">http://{$field.showlogurl|escape}</a>"}The install log is at %0{/tr}</p> + <p><strong>{tr}Note that if you see PHP errors or a Tiki claiming to be missing third party software, the instance creation is probably not finished. Please wait 1 minute and reload.{/tr}</strong></p> {/remarksbox} - {remarksbox type="info" title="Snapshots" close="n"} - <p>Snapshots are database dumps of the configuration that developers can download for debugging. Once you have reproduced your bug on the show.tiki.org instance, create a snapshot that can then be downloaded by developers for further investigation.</p> - <p>Snapshots can be accessed at: <a class="snapshoturl{$field.fieldId}_{$item.itemId}" href="http://{$field.snapshoturl|escape}" target="_blank">http://{$field.snapshoturl|escape}</a>. <strong>Note that if you get a popup asking for a username/password, please just enter "show" and "show".</strong></p> + {remarksbox type="info" title="{tr}Snapshots{/tr}" close="n"} + <p>{tr}Snapshots are database dumps of the configuration that developers can download for debugging. Once you have reproduced your bug on the show.tiki.org instance, create a snapshot that can then be downloaded by developers for further investigation.{/tr}</p> + <p>{tr _0="<a class=\"snapshoturl{$field.fieldId}_{$item.itemId}\" href=\"http://{$field.snapshoturl|escape}\" target=\"_blank\">http://{$field.snapshoturl|escape}</a>"}Snapshots can be accessed at: %0.{/tr} <strong>{tr}Note that if you get a popup asking for a username/password, please just enter "show" and "show".{/tr}</strong></p> {button href="#showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" _onclick="showtikiorg_process{$field.fieldId}_{$item.itemId}('snapshot');" _text="{tr}Create new snapshot{/tr}"} {/remarksbox} {if $field.canDestroy} @@ -80,13 +81,13 @@ {button href="#showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" _onclick="showtikiorg_process{$field.fieldId}_{$item.itemId}('destroy');" _text="{tr}Destroy this show.tiki.org instance{/tr}"} {button href="#showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" _onclick="showtikiorg_process{$field.fieldId}_{$item.itemId}('reset');" _text="{tr}Reset password to 12345{/tr}"} {/if} - <span class="buttonupdate{$field.fieldId}_{$item.itemId}" {if $field.version != 'trunk' && $field.version != '17.x' && $field.version != '16.x' && $field.version != '15.x' && $field.version != '12.x'}style="display: none;"{/if}> + <span class="buttonupdate{$field.fieldId}_{$item.itemId}" {if $field.version != 'trunk' && $field.version != '18.x' && $field.version != '17.x' && $field.version != '16.x' && $field.version != '15.x' && $field.version != '12.x'}style="display: none;"{/if}> {button href="#showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" _onclick="showtikiorg_process{$field.fieldId}_{$item.itemId}('update');" _text="{tr}SVN update{/tr}"} </span> </div> {if $field.debugmode} - {remarksbox type="info" title="Debug Mode Information" close="n"} + {remarksbox type="info" title="{tr}Debug Mode Information{/tr}" close="n"} <div class="showdebugoutput{$field.fieldId}_{$item.itemId}">-{$field.status|escape}- {$field.debugoutput|escape}</div> {button href="#showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" _onclick="showtikiorg_process{$field.fieldId}_{$item.itemId}('info');" _text="{tr}Get instance information and refresh cache{/tr}"} {/remarksbox} @@ -111,7 +112,7 @@ var debugoutput = data.debugoutput; //$('#testingstatus').html(data.status); $('.showdebugoutput{{$field.fieldId}}_{{$item.itemId}}').html(data.debugoutput); - if (data.version == '12.x' || data.version == '15.x' || data.version == '16.x' || data.version == '17.x' || data.version == 'trunk') { + if (data.version == '12.x' || data.version == '15.x' || data.version == '16.x' || data.version == '17.x' || data.version == '18.x' || data.version == 'trunk') { $('.buttonupdate{{$field.fieldId}}_{{$item.itemId}}').show(); } if (data.status == 'DISCO') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <po...@us...> - 2017-11-29 04:41:58
|
Revision: 64740 http://sourceforge.net/p/tikiwiki/code/64740 Author: pom2ter Date: 2017-11-29 04:41:55 +0000 (Wed, 29 Nov 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64737 to 64739 Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_include.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-11-29 04:41:10 UTC (rev 64739) +++ trunk 2017-11-29 04:41:55 UTC (rev 64740) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64737 +/branches/18.x:64697-64739 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/wiki-plugins/wikiplugin_include.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_include.php 2017-11-29 04:41:10 UTC (rev 64739) +++ trunk/lib/wiki-plugins/wikiplugin_include.php 2017-11-29 04:41:55 UTC (rev 64740) @@ -216,7 +216,7 @@ // append a "Read more" link at end of text if only a portion of page is being included if (isset($start) || isset($stop)) { - $text .= '<p><a href="tiki-index.php?page='.urlencode($page).'">'.tra("Read more...").'</a><p>'; + $text .= '<p><a href="tiki-index.php?page='.urlencode($page).'" class="btn btn-default">'.smarty_function_icon(['name' => 'align-left'], $smarty).' '.tra("Read more...").'</a><p>'; } // append an edit button if page_edit_icon does not equal 'n' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <amn...@us...> - 2017-11-29 07:04:31
|
Revision: 64742 http://sourceforge.net/p/tikiwiki/code/64742 Author: amnabilal Date: 2017-11-29 07:04:26 +0000 (Wed, 29 Nov 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64739 to 64741 Modified Paths: -------------- trunk/lib/pdflib.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-11-29 07:01:20 UTC (rev 64741) +++ trunk 2017-11-29 07:04:26 UTC (rev 64742) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64739 +/branches/18.x:64697-64741 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/pdflib.php =================================================================== --- trunk/lib/pdflib.php 2017-11-29 07:01:20 UTC (rev 64741) +++ trunk/lib/pdflib.php 2017-11-29 07:04:26 UTC (rev 64742) @@ -341,6 +341,7 @@ $mpdf->h2bookmarks = $pdfSettings['autobookmarks']; } $pageNo = 1; + $pdfLimit = ini_get('pcre.backtrack_limit'); //end of coverpage generation foreach ($pdfPages as $pdfPage) { if (strip_tags(trim($pdfPage['pageContent'])) != '') { @@ -382,8 +383,12 @@ if ($pdfPage['background'] != '') { $bgColor = "background-color:" . $pdfPage['background']; } - - $mpdf->WriteHTML('<html><body style="' . $bgColor . ';margin:0px;padding:0px;">' . $cssStyles . $pdfPage['pageContent'] . '</body></html>'); + $mpdf->WriteHTML('<html><body style="' . $bgColor . ';margin:0px;padding:0px;">' . $cssStyles); + //checking if page content is less than mPDF character limit, otherwise split it and loop to writeHTML + for($charLimit=0;$charLimit<=strlen($pdfPage['pageContent']);$charLimit+=$pdfLimit) { + $mpdf->WriteHTML(substr($pdfPage['pageContent'],$charLimit,$pdfLimit)); + } + $mpdf->WriteHTML('</body></html>'); $pageNo++; $cssStyles = ''; //set to blank after added with first page } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rob...@us...> - 2017-11-29 10:57:40
|
Revision: 64745 http://sourceforge.net/p/tikiwiki/code/64745 Author: robertokir Date: 2017-11-29 10:57:37 +0000 (Wed, 29 Nov 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64741 to 64744 Modified Paths: -------------- trunk/lib/search/report_string_in_db.php trunk/lib/wiki-plugins/wikiplugin_tracker.php trunk/templates/admin/include_search_report_string_in_db.tpl Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-11-29 10:48:36 UTC (rev 64744) +++ trunk 2017-11-29 10:57:37 UTC (rev 64745) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64741 +/branches/18.x:64697-64744 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/search/report_string_in_db.php =================================================================== --- trunk/lib/search/report_string_in_db.php 2017-11-29 10:48:36 UTC (rev 64744) +++ trunk/lib/search/report_string_in_db.php 2017-11-29 10:57:37 UTC (rev 64745) @@ -45,9 +45,10 @@ } $smarty->assign('tableData', $tableData); $smarty->assign('tableName', $table); + $smarty->assign('columnName', $column); } -/* +/** * return array (table, attribute, occurrence count) */ function searchAllDB($search) @@ -88,7 +89,7 @@ return $result; } -/* +/** * return array (table, occurrence count) */ function tableCount($searchResult) Modified: trunk/lib/wiki-plugins/wikiplugin_tracker.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_tracker.php 2017-11-29 10:48:36 UTC (rev 64744) +++ trunk/lib/wiki-plugins/wikiplugin_tracker.php 2017-11-29 10:57:37 UTC (rev 64745) @@ -185,7 +185,7 @@ 'required' => false, 'name' => tra('URL'), 'description' => tr('URL the user is sent to after the form is submitted. The string %0itemId%1 will - be replaced with %0itemId=xx%1 where %0xx%1 is the new (or current) itemId', '<code>', '</code>'), + be replaced with %0itemId=xx%1 where %0xx%1 is the new (or current) itemId. This parameter can be set in combination with Tabs using %0?cookietab=n%1 (where n is the tab number).', '<code>', '</code>'), 'since' => '1', 'filter' => 'url', 'separator' => ':', Modified: trunk/templates/admin/include_search_report_string_in_db.tpl =================================================================== --- trunk/templates/admin/include_search_report_string_in_db.tpl 2017-11-29 10:48:36 UTC (rev 64744) +++ trunk/templates/admin/include_search_report_string_in_db.tpl 2017-11-29 10:57:37 UTC (rev 64745) @@ -39,11 +39,11 @@ {/if} {if isset($tableHeaders)} - {remarksbox}{tr}Results for {/tr}<b>{$searchStringAgain|escape}</b> {tr}in table {/tr} <b>{$tableName}</b>:{/remarksbox} + {remarksbox}{tr}Results for {/tr}<b>{$searchStringAgain|escape}</b> {tr}in table {/tr} <b>{$tableName}</b>, {tr}column{/tr} <b>{$columnName}</b>:{/remarksbox} <table class="table"> <tr> {foreach from=$tableHeaders item=hdr} - <th>{$hdr}</th> + <th>{if $hdr eq $columnName}<em>{$hdr}</em>{else}{$hdr}{/if}</th> {/foreach} </tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lfa...@us...> - 2017-11-29 20:55:32
|
Revision: 64753 http://sourceforge.net/p/tikiwiki/code/64753 Author: lfagundes Date: 2017-11-29 20:55:29 +0000 (Wed, 29 Nov 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64744 to 64752 Modified Paths: -------------- trunk/admin/include_wiki.php trunk/lib/core/Tiki/Command/FilesCheckCommand.php trunk/lib/htmlparser/readme.eng.txt trunk/lib/objectlib.php trunk/lib/prefs/wiki.php trunk/lib/smarty_tiki/function.object_title.php trunk/lib/smarty_tiki/modifier.sefurl.php trunk/lib/wiki/wikilib.php trunk/lib/wiki-plugins/wikiplugin_backlinks.php trunk/lib/wiki-plugins/wikiplugin_include.php trunk/lib/wiki-plugins/wikiplugin_tracker.php trunk/templates/admin/include_wiki.tpl trunk/templates/tiki-wiki_topline.tpl Added Paths: ----------- trunk/installer/schema/20171129_backlinks_for_object_types_admin_options_tiki.sql Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-11-29 20:42:12 UTC (rev 64752) +++ trunk 2017-11-29 20:55:29 UTC (rev 64753) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64744 +/branches/18.x:64697-64752 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/admin/include_wiki.php =================================================================== --- trunk/admin/include_wiki.php 2017-11-29 20:42:12 UTC (rev 64752) +++ trunk/admin/include_wiki.php 2017-11-29 20:55:29 UTC (rev 64753) @@ -111,16 +111,6 @@ Feedback::success(tr('Process to remove pictures has completed.'), 'session'); } - if ((isset($_REQUEST['feature_backlinks']) && $_REQUEST['feature_backlinks'] == 'on' && $prefs['feature_backlinks'] == 'y') - || (empty($_REQUEST['feature_backlinks']) && $prefs['feature_backlinks'] == 'y') - ) { - $backlinksChange = true; - } - - if (isset($backlinksChange) && $backlinksChange) { - $wikilib = TikiLib::lib('wiki'); - $wikilib->refresh_backlinks(); - } } $smarty->assign('isDump', is_file($path)); Copied: trunk/installer/schema/20171129_backlinks_for_object_types_admin_options_tiki.sql (from rev 64752, branches/18.x/installer/schema/20171129_backlinks_for_object_types_admin_options_tiki.sql) =================================================================== --- trunk/installer/schema/20171129_backlinks_for_object_types_admin_options_tiki.sql (rev 0) +++ trunk/installer/schema/20171129_backlinks_for_object_types_admin_options_tiki.sql 2017-11-29 20:55:29 UTC (rev 64753) @@ -0,0 +1,8 @@ +REPLACE INTO `tiki_preferences` (name, value) values ('wiki_backlinks_show_forum_post', 'y'); +REPLACE INTO `tiki_preferences` (name, value) values ('wiki_backlinks_show_post', 'y'); +REPLACE INTO `tiki_preferences` (name, value) values ('wiki_backlinks_show_comment', 'y'); +REPLACE INTO `tiki_preferences` (name, value) values ('wiki_backlinks_show_article', 'y'); +REPLACE INTO `tiki_preferences` (name, value) values ('wiki_backlinks_show_trackeritem', 'y'); +REPLACE INTO `tiki_preferences` (name, value) values ('wiki_backlinks_show_tracker', 'n'); +REPLACE INTO `tiki_preferences` (name, value) values ('wiki_backlinks_show_trackerfield', 'n'); +REPLACE INTO `tiki_preferences` (name, value) values ('wiki_backlinks_show_calendar_event', 'y'); Modified: trunk/lib/core/Tiki/Command/FilesCheckCommand.php =================================================================== --- trunk/lib/core/Tiki/Command/FilesCheckCommand.php 2017-11-29 20:42:12 UTC (rev 64752) +++ trunk/lib/core/Tiki/Command/FilesCheckCommand.php 2017-11-29 20:55:29 UTC (rev 64753) @@ -76,7 +76,7 @@ if ($result['issueCount'] === 0) { $output->writeln('<info>' . tr('No Issues found') . '</info>'); } else { - $output->writeln('<error>' . tr('Found %0 Issues, details bellow:', $result['issueCount']) . '</error>'); + $output->writeln('<error>' . tr('Found %0 Issues, details below:', $result['issueCount']) . '</error>'); if (count($result['missing']) > 0) { $output->writeln('<info>' . tr('The following files are missing') . '</info>'); $table = new Table($output); Modified: trunk/lib/htmlparser/readme.eng.txt =================================================================== --- trunk/lib/htmlparser/readme.eng.txt 2017-11-29 20:42:12 UTC (rev 64752) +++ trunk/lib/htmlparser/readme.eng.txt 2017-11-29 20:55:29 UTC (rev 64753) @@ -9,7 +9,7 @@ Setup is very simple. You need copy all files into someone catalog on your web server and after this call http://..../testhtmlparser.php As result you will have start page of Russian PHPClub site which placed into the test.html file. -This page was formed by tag's tree after parse process. Bellow you can see +This page was formed by tag's tree after parse process. Below you can see printed tag's tree. All questions you can send to Modified: trunk/lib/objectlib.php =================================================================== --- trunk/lib/objectlib.php 2017-11-29 20:42:12 UTC (rev 64752) +++ trunk/lib/objectlib.php 2017-11-29 20:55:29 UTC (rev 64753) @@ -456,6 +456,12 @@ $info = TikiLib::lib('blog')->get_blog($object); return ['title' => $info['title']]; + case 'post': + case 'blog post': + case 'blogpost': + $info = TikiLib::lib('blog')->get_post($object); + return ['title' => $info['title']]; + case 'forum': $info = TikiLib::lib('comments')->get_forum($object); return ['title' => $info['name']]; @@ -585,6 +591,9 @@ case 'calendar': $info = TikiLib::lib('calendar')->get_calendar($id); return $info['name']; + case 'calendar event': + $info = TikiLib::lib('calendar')->get_item($id); + return $info['name']; } $title = $this->table('tiki_objects')->fetchOne( Modified: trunk/lib/prefs/wiki.php =================================================================== --- trunk/lib/prefs/wiki.php 2017-11-29 20:42:12 UTC (rev 64752) +++ trunk/lib/prefs/wiki.php 2017-11-29 20:55:29 UTC (rev 64753) @@ -595,6 +595,62 @@ 'default' => 0, 'units' => tra('characters'), ], + 'wiki_backlinks_show_post' => [ + 'name' => tra('Show blog posts'), + 'description' => tra('Blog posts linking to a wiki page are shown as backlinks'), + 'type' => 'flag', + 'default' => 'y', + 'dependencies' => [ 'feature_backlinks' ], + ], + 'wiki_backlinks_show_forum_post' => [ + 'name' => tra('Show forum posts'), + 'description' => tra('Forum posts linking to a wiki page are shown as backlinks'), + 'type' => 'flag', + 'default' => 'y', + 'dependencies' => [ 'feature_backlinks' ], + ], + 'wiki_backlinks_show_comment' => [ + 'name' => tra('Show comments'), + 'description' => tra('Comments linking to a wiki page are shown as backlinks'), + 'type' => 'flag', + 'default' => 'y', + 'dependencies' => [ 'feature_backlinks' ], + ], + 'wiki_backlinks_show_article' => [ + 'name' => tra('Show articles'), + 'description' => tra('Articles linking to a wiki page are shown as backlinks'), + 'type' => 'flag', + 'default' => 'y', + 'dependencies' => [ 'feature_backlinks' ], + ], + 'wiki_backlinks_show_trackeritem' => [ + 'name' => tra('Show tracker items'), + 'description' => tra('Tracker items linking to a wiki page are shown as backlinks'), + 'type' => 'flag', + 'default' => 'y', + 'dependencies' => [ 'feature_backlinks' ], + ], + 'wiki_backlinks_show_tracker' => [ + 'name' => tra('Show trackers'), + 'description' => tra('Trackers with a description linking to a wiki page are shown as backlinks'), + 'type' => 'flag', + 'default' => 'n', + 'dependencies' => [ 'feature_backlinks' ], + ], + 'wiki_backlinks_show_trackerfield' => [ + 'name' => tra('Show tracker fields'), + 'description' => tra('Tracker fields with a description linking to a wiki page are shown as backlinks'), + 'type' => 'flag', + 'default' => 'n', + 'dependencies' => [ 'feature_backlinks' ], + ], + 'wiki_backlinks_show_calendar_event' => [ + 'name' => tra('Show calendar events'), + 'description' => tra('Calendar events with a description linking to a wiki page are shown as backlinks'), + 'type' => 'flag', + 'default' => 'y', + 'dependencies' => [ 'feature_backlinks' ], + ], 'wiki_simple_ratings' => [ 'name' => tra('Simple wiki ratings'), 'description' => tra('Enable users to rate wiki pages based on a simple numeric scale.'), Modified: trunk/lib/smarty_tiki/function.object_title.php =================================================================== --- trunk/lib/smarty_tiki/function.object_title.php 2017-11-29 20:42:12 UTC (rev 64752) +++ trunk/lib/smarty_tiki/function.object_title.php 2017-11-29 20:55:29 UTC (rev 64753) @@ -20,6 +20,11 @@ if (isset($params['type'], $params['id'])) { $type = $params['type']; $object = $params['id']; + if (substr($type, -7) == 'comment') { + $type = substr($type, 0, strlen($type) - 8); + $info = TikiLib::lib('comments')->get_comment((int)$object); + $object = $info['object']; + } } else { list($type, $object) = explode(':', $params['identifier'], 2); } Modified: trunk/lib/smarty_tiki/modifier.sefurl.php =================================================================== --- trunk/lib/smarty_tiki/modifier.sefurl.php 2017-11-29 20:42:12 UTC (rev 64752) +++ trunk/lib/smarty_tiki/modifier.sefurl.php 2017-11-29 20:55:29 UTC (rev 64753) @@ -27,6 +27,7 @@ case 'wikipage': $type = 'wiki'; break; + case 'post': case 'blog post': $type = 'blogpost'; break; @@ -53,6 +54,10 @@ $href = $sefurl ? "cal$source" : "tiki-calendar.php?calIds[]=$source"; break; + case 'calendar event': + $href = $sefurl ? "calevent$source" : "tiki-calendar_edit_item.php?viewcalitemId=$source"; + break; + case 'gallery': $href = 'tiki-browse_gallery.php?galleryId=' . $source; break; @@ -92,6 +97,10 @@ $href = 'tiki-download_file.php?fileId=' . $source . '&draft'; break; + case 'trackeritemfield': + $type = 'trackeritem'; + $source = (int)explode(':', $source)[0]; + case 'tracker item': $type = 'trackeritem'; Modified: trunk/lib/wiki/wikilib.php =================================================================== --- trunk/lib/wiki/wikilib.php 2017-11-29 20:42:12 UTC (rev 64752) +++ trunk/lib/wiki/wikilib.php 2017-11-29 20:55:29 UTC (rev 64753) @@ -1297,15 +1297,35 @@ // Returns backlinks for a given page public function get_backlinks($page) { - global $user; - $query = "select `fromPage` from `tiki_links` where `toPage` = ? and `fromPage` not like 'objectlink:%'"; - // backlinks do not include links from non-page objects TODO: full feature allowing this with options + global $user, $prefs; + $query = "select `fromPage` from `tiki_links` where `toPage` = ?"; $result = $this->query($query, [ $page ]); $ret = []; while ($res = $result->fetchRow()) { - if ($this->user_has_perm_on_object($user, $res['fromPage'], 'wiki page', 'tiki_p_view')) { - $aux["fromPage"] = $res["fromPage"]; + $is_wiki_page = substr($res['fromPage'], 0, 11) != 'objectlink:'; + if ($is_wiki_page) { + $type = 'wiki page'; + $objectId = $res['fromPage']; + } else { + $objectlinkparts = explode(':', $res['fromPage']); + $type = $objectlinkparts[1]; + $objectId = substr($res['fromPage'], strlen($type) + 12); + if ($type == 'trackeritemfield') { + $feature = 'wiki_backlinks_show_trackeritem'; + } + elseif (substr($type, -7) == 'comment') { + $feature = 'wiki_backlinks_show_comment'; + } else { + $feature = 'wiki_backlinks_show_' . str_replace(" ", "_", $type); + } + if ($prefs[$feature] !== 'y') { + continue; + } + } + if ($this->user_has_perm_on_object($user, $objectId, $type, 'tiki_p_view')) { + $aux["type"] = $type; + $aux["objectId"] = $objectId; $ret[] = $aux; } } @@ -1539,30 +1559,6 @@ $this->query($query, [$new, $old]); } - public function refresh_backlinks() - { - global $prefs; - $tikilib = TikiLib::lib('tiki'); - $tikilib->query('delete from tiki_links', []); - - if ($prefs['feature_backlinks'] == 'n') { - return; - } - - $listpages = $tikilib->list_pageNames(); - - if ($listpages['cant']) { - foreach ($listpages['data'] as $from) { - $info = $tikilib->get_page_info($from['pageName']); - $pages = TikiLib::lib('parser')->get_pages($info['data'], true); - foreach ($pages as $to => $types) { - $tikilib->replace_link($from['pageName'], $to, $types); - //echo '<br />FROM:'.$from['pageName']." TO: $to "; print_r($types); - } - } - } - } - public function get_pages_contains($searchtext, $offset = 0, $maxRecords = -1, $sort_mode = 'pageName_asc', $categFilter = []) { $jail_bind = []; Modified: trunk/lib/wiki-plugins/wikiplugin_backlinks.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_backlinks.php 2017-11-29 20:42:12 UTC (rev 64752) +++ trunk/lib/wiki-plugins/wikiplugin_backlinks.php 2017-11-29 20:55:29 UTC (rev 64753) @@ -74,8 +74,8 @@ $aBackRequest = []; $aBackLinks = $wikilib->get_backlinks($page); foreach ($aBackLinks as $backlink) { - if (! in_array($backlink["fromPage"], $exclude)) { - $aBackRequest[] = $backlink["fromPage"]; + if ($backlink['type'] == 'wiki page' && ! in_array($backlink["objectId"], $exclude)) { + $aBackRequest[] = $backlink["objectId"]; } } if (isset($include_self) && $include_self) { Modified: trunk/lib/wiki-plugins/wikiplugin_include.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_include.php 2017-11-29 20:42:12 UTC (rev 64752) +++ trunk/lib/wiki-plugins/wikiplugin_include.php 2017-11-29 20:55:29 UTC (rev 64753) @@ -42,6 +42,13 @@ 'since' => '1', 'default' => '', ], + 'more' => [ + 'required' => false, + 'name' => tra('Read more'), + 'description' => tra('Put a "Read more..." link at the end of included content, linking to original page. Use "more=y"'), + 'since' => '18.0', + 'default' => 'n', + ], 'nopage_text' => [ 'required' => false, 'name' => tra('Nopage Text'), @@ -215,7 +222,7 @@ $parserlib->setOptions($old_options); // append a "Read more" link at end of text if only a portion of page is being included - if (isset($start) || isset($stop)) { + if (isset($more) && $more == 'y') { $text .= '<p><a href="tiki-index.php?page='.urlencode($page).'" class="btn btn-default">'.smarty_function_icon(['name' => 'align-left'], $smarty).' '.tra("Read more...").'</a><p>'; } Modified: trunk/lib/wiki-plugins/wikiplugin_tracker.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_tracker.php 2017-11-29 20:42:12 UTC (rev 64752) +++ trunk/lib/wiki-plugins/wikiplugin_tracker.php 2017-11-29 20:55:29 UTC (rev 64753) @@ -185,7 +185,7 @@ 'required' => false, 'name' => tra('URL'), 'description' => tr('URL the user is sent to after the form is submitted. The string %0itemId%1 will - be replaced with %0itemId=xx%1 where %0xx%1 is the new (or current) itemId. This parameter can be set in combination with Tabs using %0?cookietab=n%1 (where n is the tab number).', '<code>', '</code>'), + be replaced with %0itemId=xx%1 where %0xx%1 is the new (or current) itemId. This parameter can be set in combination with Tabs using %0?cookietab=n&itemId%1 (change n for the tab number).', '<code>', '</code>'), 'since' => '1', 'filter' => 'url', 'separator' => ':', Modified: trunk/templates/admin/include_wiki.tpl =================================================================== --- trunk/templates/admin/include_wiki.tpl 2017-11-29 20:42:12 UTC (rev 64752) +++ trunk/templates/admin/include_wiki.tpl 2017-11-29 20:55:29 UTC (rev 64753) @@ -161,6 +161,14 @@ {preference name=feature_backlinks} <div class="adminoptionboxchild" id="feature_backlinks_childcontainer"> {preference name=wiki_backlinks_name_len} + {preference name=wiki_backlinks_show_forum_post} + {preference name=wiki_backlinks_show_comment} + {preference name=wiki_backlinks_show_post} + {preference name=wiki_backlinks_show_article} + {preference name=wiki_backlinks_show_trackeritem} + {preference name=wiki_backlinks_show_tracker} + {preference name=wiki_backlinks_show_trackerfield} + {preference name=wiki_backlinks_show_calendar_event} <div class="col-sm-offset-4 col-md-8"> {permission_link addclass="timeout" mode=button permType=wiki textFilter=backlinks showDisabled=y} </div> Modified: trunk/templates/tiki-wiki_topline.tpl =================================================================== --- trunk/templates/tiki-wiki_topline.tpl 2017-11-29 20:42:12 UTC (rev 64752) +++ trunk/templates/tiki-wiki_topline.tpl 2017-11-29 20:55:29 UTC (rev 64753) @@ -71,8 +71,8 @@ <li class="divider"></li> <li role="presentation"> {section name=back loop=$backlinks} - <a role="menuitem" tabindex="-1" href="{$backlinks[back].fromPage|sefurl:'wiki'}" title="{$backlinks[back].fromPage|escape}"> - {if $prefs.wiki_backlinks_name_len ge '1'}{$backlinks[back].fromPage|truncate:$prefs.wiki_backlinks_name_len:"...":true|escape}{else}{$backlinks[back].fromPage|escape}{/if} + <a role="menuitem" tabindex="-1" href="{$backlinks[back].objectId|sefurl:$backlinks[back].type}" title="{object_title id=$backlinks[back].objectId type=$backlinks[back].type|escape}"> + {if $prefs.wiki_backlinks_name_len ge '1'}{object_title id=$backlinks[back].objectId type=$backlinks[back].type|truncate:$prefs.wiki_backlinks_name_len:"...":true|escape}{else}{object_title id=$backlinks[back].objectId type=$backlinks[back].type|escape}{/if} </a> {/section} </li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <drs...@us...> - 2017-12-01 00:42:15
|
Revision: 64763 http://sourceforge.net/p/tikiwiki/code/64763 Author: drsassafras Date: 2017-12-01 00:42:12 +0000 (Fri, 01 Dec 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64752 to 64762 Modified Paths: -------------- trunk/lib/prefs/wiki.php trunk/lib/smarty_tiki/modifier.sefurl.php trunk/lib/wiki-plugins/wikiplugin_include.php trunk/route.php trunk/templates/admin/include_wiki.tpl trunk/themes/base_files/css/tiki_base.css trunk/themes/base_files/less/tiki-modules.less trunk/themes/fivealiveHS/less/newsletter.less Added Paths: ----------- trunk/installer/schema/20171130_plugin_include_link_original_tiki.sql Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-11-30 18:41:42 UTC (rev 64762) +++ trunk 2017-12-01 00:42:12 UTC (rev 64763) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64752 +/branches/18.x:64697-64762 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Copied: trunk/installer/schema/20171130_plugin_include_link_original_tiki.sql (from rev 64762, branches/18.x/installer/schema/20171130_plugin_include_link_original_tiki.sql) =================================================================== --- trunk/installer/schema/20171130_plugin_include_link_original_tiki.sql (rev 0) +++ trunk/installer/schema/20171130_plugin_include_link_original_tiki.sql 2017-12-01 00:42:12 UTC (rev 64763) @@ -0,0 +1 @@ +INSERT INTO `tiki_preferences` (name, value) values ('wiki_plugin_include_link_original', 'n'); Modified: trunk/lib/prefs/wiki.php =================================================================== --- trunk/lib/prefs/wiki.php 2017-11-30 18:41:42 UTC (rev 64762) +++ trunk/lib/prefs/wiki.php 2017-12-01 00:42:12 UTC (rev 64763) @@ -759,5 +759,12 @@ 'type' => 'flag', 'default' => 'n', ], + 'wiki_plugin_include_link_original' => [ + 'name' => tr('Force link to included page'), + 'description' => tr('When only a portion of page is included, create a "See full page" link to included page. It has the same effect of putting "linkoriginal=y" parameter everytime Plugin Include is used.'), + 'type' => 'flag', + 'default' => 'n', + 'dependencies' => ['wikiplugin_include'], + ], ]; } Modified: trunk/lib/smarty_tiki/modifier.sefurl.php =================================================================== --- trunk/lib/smarty_tiki/modifier.sefurl.php 2017-11-30 18:41:42 UTC (rev 64762) +++ trunk/lib/smarty_tiki/modifier.sefurl.php 2017-12-01 00:42:12 UTC (rev 64763) @@ -47,6 +47,7 @@ $href = $sefurl ? "blog$source" : "tiki-view_blog.php?blogId=$source"; break; + case 'blog post': case 'blogpost': $href = $sefurl ? "blogpost$source" : "tiki-view_blog_post.php?postId=$source"; break; Modified: trunk/lib/wiki-plugins/wikiplugin_include.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_include.php 2017-11-30 18:41:42 UTC (rev 64762) +++ trunk/lib/wiki-plugins/wikiplugin_include.php 2017-12-01 00:42:12 UTC (rev 64763) @@ -42,10 +42,10 @@ 'since' => '1', 'default' => '', ], - 'more' => [ + 'linkoriginal' => [ 'required' => false, 'name' => tra('Read more'), - 'description' => tra('Put a "Read more..." link at the end of included content, linking to original page. Use "more=y"'), + 'description' => tra('Put a "See full page" link at the end of included content, linking to original page. Use "linkoriginal=y"'), 'since' => '18.0', 'default' => 'n', ], @@ -221,9 +221,14 @@ $text = $parserlib->parse_data($text, $options); $parserlib->setOptions($old_options); - // append a "Read more" link at end of text if only a portion of page is being included - if (isset($more) && $more == 'y') { - $text .= '<p><a href="tiki-index.php?page='.urlencode($page).'" class="btn btn-default">'.smarty_function_icon(['name' => 'align-left'], $smarty).' '.tra("Read more...").'</a><p>'; + // append a "See full page" link at end of text if only a portion of page is being included + if (($prefs['wiki_plugin_include_link_original'] == 'y' && (isset($start) || isset($stop))) || (isset($linkoriginal) && $linkoriginal == 'y')) { + $wikilib = TikiLib::lib('wiki'); + $text .= '<p><a href="'.$wikilib->sefurl($page).'" class="btn btn-default"'; + $text .= 'title="'.sprintf(tra('The text above comes from page "%s". Click to go to that page'), $page).'">'; + $text .= smarty_function_icon(['name' => 'align-left'], $smarty).' '; + $text .= tra('See full page'); + $text .= '</a><p>'; } // append an edit button if page_edit_icon does not equal 'n' Modified: trunk/route.php =================================================================== --- trunk/route.php 2017-11-30 18:41:42 UTC (rev 64762) +++ trunk/route.php 2017-12-01 00:42:12 UTC (rev 64763) @@ -90,6 +90,7 @@ tiki_route_attempt_prefix('file', 'tiki-list_file_gallery.php', 'galleryId'); tiki_route_attempt_prefix('forum', 'tiki-view_forum.php', 'forumId'); tiki_route_attempt_prefix('forumthread', 'tiki-view_forum_thread.php', 'comments_parentId'); + tiki_route_attempt_prefix('calevent', 'tiki-calendar_edit_item.php', 'viewcalitemId'); tiki_route_attempt_prefix('gallery', 'tiki-browse_gallery.php', 'galleryId'); tiki_route_attempt_prefix('img', 'show_image.php', 'id'); tiki_route_attempt_prefix('image', 'show_image.php', 'id'); Modified: trunk/templates/admin/include_wiki.tpl =================================================================== --- trunk/templates/admin/include_wiki.tpl 2017-11-30 18:41:42 UTC (rev 64762) +++ trunk/templates/admin/include_wiki.tpl 2017-12-01 00:42:12 UTC (rev 64763) @@ -26,6 +26,9 @@ <legend>{tr}Plugins{/tr}</legend> {preference name=wikiplugin_author} {preference name=wikiplugin_include} + <div class="adminoptionboxchild" id="wikiplugin_include_childcontainer"> + {preference name=wiki_plugin_include_link_original} + </div> {preference name=wikiplugin_transclude} {preference name=wikiplugin_randominclude} {preference name=wikiplugin_slideshow} Modified: trunk/themes/base_files/css/tiki_base.css =================================================================== --- trunk/themes/base_files/css/tiki_base.css 2017-11-30 18:41:42 UTC (rev 64762) +++ trunk/themes/base_files/css/tiki_base.css 2017-12-01 00:42:12 UTC (rev 64763) @@ -1492,6 +1492,10 @@ .siteloginbar_popup img { height: 24px; } +.siteloginbar_popup .list-unstyled li a { + padding-left: 0; + padding-right: 0; +} .navbar-form .siteloginbar_poppedup .form-control, .navbar-form .siteloginbar_poppedup .form-group.text-center { width: 100%; Modified: trunk/themes/base_files/less/tiki-modules.less =================================================================== --- trunk/themes/base_files/less/tiki-modules.less 2017-11-30 18:41:42 UTC (rev 64762) +++ trunk/themes/base_files/less/tiki-modules.less 2017-12-01 00:42:12 UTC (rev 64763) @@ -203,8 +203,14 @@ background: none !important; } -.siteloginbar_popup img { - height: 24px; +.siteloginbar_popup { + img { + height: 24px; + } + .list-unstyled li a { // Make left alignment of links even with inputs + padding-left: 0; + padding-right: 0; + } } .navbar-form .siteloginbar_poppedup .form-control, Modified: trunk/themes/fivealiveHS/less/newsletter.less =================================================================== --- trunk/themes/fivealiveHS/less/newsletter.less 2017-11-30 18:41:42 UTC (rev 64762) +++ trunk/themes/fivealiveHS/less/newsletter.less 2017-12-01 00:42:12 UTC (rev 64763) @@ -1,3 +1,3 @@ -/* theme newsletter stylesheet */ -@import "../../base_files/less/newsletter.less"; +/* theme newsletter stylesheet */ +@import "../../base_files/less/newsletter.less"; @import "bootstrap-variables.less"; \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <drs...@us...> - 2017-12-01 00:58:49
|
Revision: 64765 http://sourceforge.net/p/tikiwiki/code/64765 Author: drsassafras Date: 2017-12-01 00:58:46 +0000 (Fri, 01 Dec 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64762 to 64764 Modified Paths: -------------- trunk/img/flags/Anguilla.png trunk/img/flags/Australia.png trunk/img/flags/Congo_Democratic.png trunk/img/flags/Dominica.png trunk/img/flags/Heard_Island_and_McDonald_Islands.png trunk/img/flags/Jamaica.png trunk/img/flags/Nauru.png trunk/img/flags/Wales.png trunk/img/icons/large/blogs.png trunk/img/icons/large/debug48x48.png trunk/img/icons/large/gnome-settings-background48x48.png trunk/img/icons/large/maps48x48.png trunk/img/icons/large/stock_select-color_new.png trunk/img/icons/mime/large/avi.png trunk/img/icons/mime/large/mod.png trunk/img/icons/mime/large/py.png trunk/img/icons/mime/large/rar.png trunk/img/icons/mime/large/swf.png trunk/img/icons/mime/large/swfl.png trunk/img/icons/mime/large/tiff.png trunk/img/icons/mime/large/xbm.png trunk/img/icons/mime/vimeo.png trunk/img/smiles/icon_evil.gif trunk/img/spinner.gif trunk/img/tiki/Tiki_WCG_light.png trunk/img/tikihelp/ftv2pnode.gif trunk/lib/openlayers/theme/dark/zoom-panel.png trunk/themes/business/images/market.jpg trunk/themes/greenvalley/images/button_bck_hover.jpg trunk/themes/lighty/images/lighty.png trunk/themes/lighty/images/map.jpg trunk/themes/solar/images/solar.png Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-12-01 00:57:50 UTC (rev 64764) +++ trunk 2017-12-01 00:58:46 UTC (rev 64765) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64762 +/branches/18.x:64697-64764 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/img/flags/Anguilla.png =================================================================== (Binary files differ) Modified: trunk/img/flags/Australia.png =================================================================== (Binary files differ) Modified: trunk/img/flags/Congo_Democratic.png =================================================================== (Binary files differ) Modified: trunk/img/flags/Dominica.png =================================================================== (Binary files differ) Modified: trunk/img/flags/Heard_Island_and_McDonald_Islands.png =================================================================== (Binary files differ) Modified: trunk/img/flags/Jamaica.png =================================================================== (Binary files differ) Modified: trunk/img/flags/Nauru.png =================================================================== (Binary files differ) Modified: trunk/img/flags/Wales.png =================================================================== (Binary files differ) Modified: trunk/img/icons/large/blogs.png =================================================================== (Binary files differ) Modified: trunk/img/icons/large/debug48x48.png =================================================================== (Binary files differ) Modified: trunk/img/icons/large/gnome-settings-background48x48.png =================================================================== (Binary files differ) Modified: trunk/img/icons/large/maps48x48.png =================================================================== (Binary files differ) Modified: trunk/img/icons/large/stock_select-color_new.png =================================================================== (Binary files differ) Modified: trunk/img/icons/mime/large/avi.png =================================================================== (Binary files differ) Modified: trunk/img/icons/mime/large/mod.png =================================================================== (Binary files differ) Modified: trunk/img/icons/mime/large/py.png =================================================================== (Binary files differ) Modified: trunk/img/icons/mime/large/rar.png =================================================================== (Binary files differ) Modified: trunk/img/icons/mime/large/swf.png =================================================================== (Binary files differ) Modified: trunk/img/icons/mime/large/swfl.png =================================================================== (Binary files differ) Modified: trunk/img/icons/mime/large/tiff.png =================================================================== (Binary files differ) Modified: trunk/img/icons/mime/large/xbm.png =================================================================== (Binary files differ) Modified: trunk/img/icons/mime/vimeo.png =================================================================== (Binary files differ) Modified: trunk/img/smiles/icon_evil.gif =================================================================== (Binary files differ) Modified: trunk/img/spinner.gif =================================================================== (Binary files differ) Modified: trunk/img/tiki/Tiki_WCG_light.png =================================================================== (Binary files differ) Modified: trunk/img/tikihelp/ftv2pnode.gif =================================================================== (Binary files differ) Modified: trunk/lib/openlayers/theme/dark/zoom-panel.png =================================================================== (Binary files differ) Modified: trunk/themes/business/images/market.jpg =================================================================== (Binary files differ) Modified: trunk/themes/greenvalley/images/button_bck_hover.jpg =================================================================== (Binary files differ) Modified: trunk/themes/lighty/images/lighty.png =================================================================== (Binary files differ) Modified: trunk/themes/lighty/images/map.jpg =================================================================== (Binary files differ) Modified: trunk/themes/solar/images/solar.png =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <drs...@us...> - 2017-12-01 01:32:52
|
Revision: 64767 http://sourceforge.net/p/tikiwiki/code/64767 Author: drsassafras Date: 2017-12-01 01:32:49 +0000 (Fri, 01 Dec 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64764 to 64766 Modified Paths: -------------- trunk/lib/core/Search/Type/Json.php trunk/lib/smarty_tiki/function.object_type.php trunk/lib/wiki-plugins/wikiplugin_r.php trunk/lib/wiki-plugins/wikiplugin_rr.php trunk/themes/fivealiveHS/css/index.php trunk/themes/fivealiveHS/fonts/index.php trunk/themes/fivealiveHS/icons/index.php trunk/themes/fivealiveHS/images/index.php trunk/themes/fivealiveHS/js/index.php trunk/themes/fivealiveHS/less/index.php trunk/themes/fivealiveHS/options/akebi/css/index.php trunk/themes/fivealiveHS/options/akebi/icons/index.php trunk/themes/fivealiveHS/options/akebi/images/index.php trunk/themes/fivealiveHS/options/akebi/index.php trunk/themes/fivealiveHS/options/blueberry/css/index.php trunk/themes/fivealiveHS/options/blueberry/images/index.php trunk/themes/fivealiveHS/options/blueberry/index.php trunk/themes/fivealiveHS/options/grape/css/index.php trunk/themes/fivealiveHS/options/grape/images/index.php trunk/themes/fivealiveHS/options/grape/index.php trunk/themes/fivealiveHS/options/index.php trunk/themes/fivealiveHS/options/kiwi/css/index.php trunk/themes/fivealiveHS/options/kiwi/images/index.php trunk/themes/fivealiveHS/options/kiwi/index.php trunk/themes/fivealiveHS/options/lemon/css/index.php trunk/themes/fivealiveHS/options/lemon/images/index.php trunk/themes/fivealiveHS/options/lemon/index.php trunk/themes/fivealiveHS/options/orange/css/index.php trunk/themes/fivealiveHS/options/orange/images/index.php trunk/themes/fivealiveHS/options/orange/index.php trunk/themes/fivealiveHS/options/plum/css/index.php trunk/themes/fivealiveHS/options/plum/images/index.php trunk/themes/fivealiveHS/options/plum/index.php trunk/themes/fivealiveHS/options/raspberry/css/index.php trunk/themes/fivealiveHS/options/raspberry/images/index.php trunk/themes/fivealiveHS/options/raspberry/index.php trunk/themes/fivealiveHS/options/watermelon/css/index.php trunk/themes/fivealiveHS/options/watermelon/images/index.php trunk/themes/fivealiveHS/options/watermelon/index.php trunk/themes/fivealiveHS/templates/index.php trunk/themes/lighty/css/index.php trunk/themes/lighty/images/index.php trunk/themes/lighty/less/index.php trunk/themes/lighty/less/newsletter.less trunk/themes/lighty/templates/antibot.tpl trunk/themes/lighty/templates/blog_post_postbody_title.tpl trunk/themes/lighty/templates/blog_wrapper.tpl trunk/themes/lighty/templates/index.php trunk/themes/solar/css/index.php trunk/themes/solar/fonts/index.php trunk/themes/solar/icons/index.php trunk/themes/solar/images/index.php trunk/themes/solar/index.php trunk/themes/solar/less/index.php trunk/themes/solar/less/newsletter.less trunk/themes/solar/templates/index.php Property Changed: ---------------- trunk/ trunk/lib/core/Search/Type/Json.php trunk/lib/smarty_tiki/function.object_type.php trunk/lib/wiki-plugins/wikiplugin_pdfbookmark.php trunk/lib/wiki-plugins/wikiplugin_r.php trunk/lib/wiki-plugins/wikiplugin_rr.php trunk/themes/fivealiveHS/css/index.php trunk/themes/fivealiveHS/fonts/index.php trunk/themes/fivealiveHS/icons/index.php trunk/themes/fivealiveHS/images/index.php trunk/themes/fivealiveHS/js/index.php trunk/themes/fivealiveHS/less/bootstrap-variables.less trunk/themes/fivealiveHS/less/index.php trunk/themes/fivealiveHS/less/tiki-selectors.less trunk/themes/fivealiveHS/options/akebi/css/index.php trunk/themes/fivealiveHS/options/akebi/icons/index.php trunk/themes/fivealiveHS/options/akebi/images/index.php trunk/themes/fivealiveHS/options/akebi/index.php trunk/themes/fivealiveHS/options/blueberry/css/index.php trunk/themes/fivealiveHS/options/blueberry/images/index.php trunk/themes/fivealiveHS/options/blueberry/index.php trunk/themes/fivealiveHS/options/grape/css/index.php trunk/themes/fivealiveHS/options/grape/images/index.php trunk/themes/fivealiveHS/options/grape/index.php trunk/themes/fivealiveHS/options/index.php trunk/themes/fivealiveHS/options/kiwi/css/index.php trunk/themes/fivealiveHS/options/kiwi/images/index.php trunk/themes/fivealiveHS/options/kiwi/index.php trunk/themes/fivealiveHS/options/lemon/css/index.php trunk/themes/fivealiveHS/options/lemon/images/index.php trunk/themes/fivealiveHS/options/lemon/index.php trunk/themes/fivealiveHS/options/orange/css/index.php trunk/themes/fivealiveHS/options/orange/images/index.php trunk/themes/fivealiveHS/options/orange/index.php trunk/themes/fivealiveHS/options/plum/css/index.php trunk/themes/fivealiveHS/options/plum/images/index.php trunk/themes/fivealiveHS/options/plum/index.php trunk/themes/fivealiveHS/options/raspberry/css/index.php trunk/themes/fivealiveHS/options/raspberry/images/index.php trunk/themes/fivealiveHS/options/raspberry/index.php trunk/themes/fivealiveHS/options/watermelon/css/index.php trunk/themes/fivealiveHS/options/watermelon/images/index.php trunk/themes/fivealiveHS/options/watermelon/index.php trunk/themes/fivealiveHS/templates/index.php trunk/themes/lighty/css/index.php trunk/themes/lighty/images/index.php trunk/themes/lighty/less/index.php trunk/themes/lighty/less/newsletter.less trunk/themes/lighty/templates/antibot.tpl trunk/themes/lighty/templates/blog_post_postbody_title.tpl trunk/themes/lighty/templates/blog_wrapper.tpl trunk/themes/lighty/templates/index.php trunk/themes/solar/css/index.php trunk/themes/solar/fonts/index.php trunk/themes/solar/icons/index.php trunk/themes/solar/images/index.php trunk/themes/solar/index.php trunk/themes/solar/less/index.php trunk/themes/solar/less/newsletter.less trunk/themes/solar/less/solar.less trunk/themes/solar/templates/index.php Index: trunk =================================================================== --- trunk 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk 2017-12-01 01:32:49 UTC (rev 64767) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64764 +/branches/18.x:64697-64766 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/core/Search/Type/Json.php =================================================================== --- trunk/lib/core/Search/Type/Json.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/lib/core/Search/Type/Json.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: Object.php 62177 2017-04-10 06:06:43Z drsassafras $ +// $Id$ class Search_Type_Json implements Search_Type_Interface { Property changes on: trunk/lib/core/Search/Type/Json.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/lib/smarty_tiki/function.object_type.php =================================================================== --- trunk/lib/smarty_tiki/function.object_type.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/lib/smarty_tiki/function.object_type.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: function.object_title.php 57964 2016-03-17 20:04:05Z jonnybradley $ +// $Id$ //this script may only be included - so its better to die if called directly. if (strpos($_SERVER["SCRIPT_NAME"], basename(__FILE__)) !== false) { Property changes on: trunk/lib/smarty_tiki/function.object_type.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: trunk/lib/wiki-plugins/wikiplugin_pdfbookmark.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_pdfbookmark.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/lib/wiki-plugins/wikiplugin_pdfbookmark.php 2017-12-01 01:32:49 UTC (rev 64767) Property changes on: trunk/lib/wiki-plugins/wikiplugin_pdfbookmark.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/lib/wiki-plugins/wikiplugin_r.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_r.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/lib/wiki-plugins/wikiplugin_r.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: wikiplugin_rr.php 59285 2016-07-27 11:58:36Z xavidp $ +// $Id$ // // Initial inspiration from the R Plugin for Mediawiki (2006- Sigbert Klinke (si...@wi...), Markus Cozowicz, Michael Cassin) // Fully rewritten by the Tiki community for LGPL licencing compliance @@ -14,7 +14,7 @@ // Usage: // {R()}R code{R}. See documentation: http://doc.tiki.org/PluginR // -// $Id: wikiplugin_r.php 46110 2013-05-31 12:36:01Z xavidp $ +// $Id$ require_once('lib/wiki-plugins/wikiplugin_rr.php'); Property changes on: trunk/lib/wiki-plugins/wikiplugin_r.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/lib/wiki-plugins/wikiplugin_rr.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_rr.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/lib/wiki-plugins/wikiplugin_rr.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: wikiplugin_rr.php 59285 2016-07-27 11:58:36Z xavidp $ +// $Id$ // // Initial inspiration from the R Extension for Mediawiki (2006- Sigbert Klinke (si...@wi...), Markus Cozowicz, Michael Cassin) // Fully rewritten by the Tiki community for LGPL licencing compliance Property changes on: trunk/lib/wiki-plugins/wikiplugin_rr.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/css/index.php =================================================================== --- trunk/themes/fivealiveHS/css/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/css/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/css/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/fonts/index.php =================================================================== --- trunk/themes/fivealiveHS/fonts/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/fonts/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/fonts/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/icons/index.php =================================================================== --- trunk/themes/fivealiveHS/icons/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/icons/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/icons/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/images/index.php =================================================================== --- trunk/themes/fivealiveHS/images/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/images/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 51571 2014-06-03 14:36:41Z chibaguy $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/images/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/js/index.php =================================================================== --- trunk/themes/fivealiveHS/js/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/js/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/js/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: trunk/themes/fivealiveHS/less/bootstrap-variables.less =================================================================== --- trunk/themes/fivealiveHS/less/bootstrap-variables.less 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/less/bootstrap-variables.less 2017-12-01 01:32:49 UTC (rev 64767) Property changes on: trunk/themes/fivealiveHS/less/bootstrap-variables.less ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/less/index.php =================================================================== --- trunk/themes/fivealiveHS/less/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/less/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 51571 2014-06-03 14:36:41Z chibaguy $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/less/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: trunk/themes/fivealiveHS/less/tiki-selectors.less =================================================================== --- trunk/themes/fivealiveHS/less/tiki-selectors.less 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/less/tiki-selectors.less 2017-12-01 01:32:49 UTC (rev 64767) Property changes on: trunk/themes/fivealiveHS/less/tiki-selectors.less ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/akebi/css/index.php =================================================================== --- trunk/themes/fivealiveHS/options/akebi/css/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/akebi/css/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/akebi/css/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/akebi/icons/index.php =================================================================== --- trunk/themes/fivealiveHS/options/akebi/icons/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/akebi/icons/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/akebi/icons/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/akebi/images/index.php =================================================================== --- trunk/themes/fivealiveHS/options/akebi/images/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/akebi/images/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/akebi/images/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/akebi/index.php =================================================================== --- trunk/themes/fivealiveHS/options/akebi/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/akebi/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/akebi/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/blueberry/css/index.php =================================================================== --- trunk/themes/fivealiveHS/options/blueberry/css/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/blueberry/css/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/blueberry/css/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/blueberry/images/index.php =================================================================== --- trunk/themes/fivealiveHS/options/blueberry/images/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/blueberry/images/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/blueberry/images/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/blueberry/index.php =================================================================== --- trunk/themes/fivealiveHS/options/blueberry/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/blueberry/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/blueberry/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/grape/css/index.php =================================================================== --- trunk/themes/fivealiveHS/options/grape/css/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/grape/css/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/grape/css/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/grape/images/index.php =================================================================== --- trunk/themes/fivealiveHS/options/grape/images/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/grape/images/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/grape/images/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/grape/index.php =================================================================== --- trunk/themes/fivealiveHS/options/grape/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/grape/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/grape/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/index.php =================================================================== --- trunk/themes/fivealiveHS/options/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/kiwi/css/index.php =================================================================== --- trunk/themes/fivealiveHS/options/kiwi/css/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/kiwi/css/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/kiwi/css/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/kiwi/images/index.php =================================================================== --- trunk/themes/fivealiveHS/options/kiwi/images/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/kiwi/images/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/kiwi/images/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/kiwi/index.php =================================================================== --- trunk/themes/fivealiveHS/options/kiwi/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/kiwi/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/kiwi/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/lemon/css/index.php =================================================================== --- trunk/themes/fivealiveHS/options/lemon/css/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/lemon/css/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/lemon/css/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/lemon/images/index.php =================================================================== --- trunk/themes/fivealiveHS/options/lemon/images/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/lemon/images/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/lemon/images/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/lemon/index.php =================================================================== --- trunk/themes/fivealiveHS/options/lemon/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/lemon/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/lemon/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/orange/css/index.php =================================================================== --- trunk/themes/fivealiveHS/options/orange/css/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/orange/css/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/orange/css/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/orange/images/index.php =================================================================== --- trunk/themes/fivealiveHS/options/orange/images/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/orange/images/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/orange/images/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/orange/index.php =================================================================== --- trunk/themes/fivealiveHS/options/orange/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/orange/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/orange/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/plum/css/index.php =================================================================== --- trunk/themes/fivealiveHS/options/plum/css/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/plum/css/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/plum/css/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/plum/images/index.php =================================================================== --- trunk/themes/fivealiveHS/options/plum/images/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/plum/images/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/plum/images/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/plum/index.php =================================================================== --- trunk/themes/fivealiveHS/options/plum/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/plum/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/plum/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/raspberry/css/index.php =================================================================== --- trunk/themes/fivealiveHS/options/raspberry/css/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/raspberry/css/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/raspberry/css/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/raspberry/images/index.php =================================================================== --- trunk/themes/fivealiveHS/options/raspberry/images/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/raspberry/images/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/raspberry/images/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/raspberry/index.php =================================================================== --- trunk/themes/fivealiveHS/options/raspberry/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/raspberry/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/raspberry/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/watermelon/css/index.php =================================================================== --- trunk/themes/fivealiveHS/options/watermelon/css/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/watermelon/css/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/watermelon/css/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/watermelon/images/index.php =================================================================== --- trunk/themes/fivealiveHS/options/watermelon/images/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/watermelon/images/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/watermelon/images/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/options/watermelon/index.php =================================================================== --- trunk/themes/fivealiveHS/options/watermelon/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/options/watermelon/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/options/watermelon/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/fivealiveHS/templates/index.php =================================================================== --- trunk/themes/fivealiveHS/templates/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/fivealiveHS/templates/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 64627 2017-11-19 11:52:12Z rjsmelo $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/fivealiveHS/templates/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/lighty/css/index.php =================================================================== --- trunk/themes/lighty/css/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/lighty/css/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 57959 2016-03-17 20:00:24Z jonnybradley $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/lighty/css/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/lighty/images/index.php =================================================================== --- trunk/themes/lighty/images/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/lighty/images/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 57959 2016-03-17 20:00:24Z jonnybradley $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/lighty/images/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/lighty/less/index.php =================================================================== --- trunk/themes/lighty/less/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/lighty/less/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 57958 2016-03-17 19:59:37Z jonnybradley $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/lighty/less/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/lighty/less/newsletter.less =================================================================== --- trunk/themes/lighty/less/newsletter.less 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/lighty/less/newsletter.less 2017-12-01 01:32:49 UTC (rev 64767) @@ -1,4 +1,4 @@ -// $Id: newsletter.less 62883 2017-06-04 17:03:17Z drsassafras $ +// $Id$ /* Lighty theme newsletter stylesheet */ @web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700"; Property changes on: trunk/themes/lighty/less/newsletter.less ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/lighty/templates/antibot.tpl =================================================================== --- trunk/themes/lighty/templates/antibot.tpl 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/lighty/templates/antibot.tpl 2017-12-01 01:32:49 UTC (rev 64767) @@ -1,4 +1,4 @@ -{* $Id: antibot.tpl 59410 2016-08-10 02:11:50Z jyhem $ *} +{* $Id$ *} {if empty($user) || $user eq 'anonymous' || !empty($showantibot)} <style> .antibot.row { Property changes on: trunk/themes/lighty/templates/antibot.tpl ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/lighty/templates/blog_post_postbody_title.tpl =================================================================== --- trunk/themes/lighty/templates/blog_post_postbody_title.tpl 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/lighty/templates/blog_post_postbody_title.tpl 2017-12-01 01:32:49 UTC (rev 64767) @@ -1,4 +1,4 @@ -{* $Id: blog_post_postbody_title.tpl 59162 2016-07-12 12:29:24Z chibaguy $ *} +{* $Id$ *} <header class="clearfix panel-heading"> <div class="blog-postbody-title"> {if $blog_post_context eq 'view_blog'} Property changes on: trunk/themes/lighty/templates/blog_post_postbody_title.tpl ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/lighty/templates/blog_wrapper.tpl =================================================================== --- trunk/themes/lighty/templates/blog_wrapper.tpl 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/lighty/templates/blog_wrapper.tpl 2017-12-01 01:32:49 UTC (rev 64767) @@ -1,4 +1,4 @@ -{* $Id: blog_wrapper.tpl 58019 2016-03-20 15:17:21Z lindonb $ *} +{* $Id$ *} <div class="panel panel-default postbody clearfix"> <a id="postId{$post_info.postId}"></a> {include file='blog_post_postbody_title.tpl'} Property changes on: trunk/themes/lighty/templates/blog_wrapper.tpl ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/lighty/templates/index.php =================================================================== --- trunk/themes/lighty/templates/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/lighty/templates/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 57958 2016-03-17 19:59:37Z jonnybradley $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/lighty/templates/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/solar/css/index.php =================================================================== --- trunk/themes/solar/css/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/solar/css/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 57958 2016-03-17 19:59:37Z jonnybradley $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/solar/css/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/solar/fonts/index.php =================================================================== --- trunk/themes/solar/fonts/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/solar/fonts/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 57958 2016-03-17 19:59:37Z jonnybradley $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/solar/fonts/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/solar/icons/index.php =================================================================== --- trunk/themes/solar/icons/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/solar/icons/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 57958 2016-03-17 19:59:37Z jonnybradley $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/solar/icons/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/solar/images/index.php =================================================================== --- trunk/themes/solar/images/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/solar/images/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 57958 2016-03-17 19:59:37Z jonnybradley $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/solar/images/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/solar/index.php =================================================================== --- trunk/themes/solar/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/solar/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 57958 2016-03-17 19:59:37Z jonnybradley $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../tiki-index.php"); Property changes on: trunk/themes/solar/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/solar/less/index.php =================================================================== --- trunk/themes/solar/less/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/solar/less/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 57958 2016-03-17 19:59:37Z jonnybradley $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/solar/less/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/solar/less/newsletter.less =================================================================== --- trunk/themes/solar/less/newsletter.less 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/solar/less/newsletter.less 2017-12-01 01:32:49 UTC (rev 64767) @@ -1,4 +1,4 @@ -// $Id: newsletter.less 62883 2017-06-04 17:03:17Z drsassafras $ +// $Id$ /* Solar theme newsletter stylesheet */ @import "../../base_files/less/newsletter.less"; @import "variables.less"; \ No newline at end of file Property changes on: trunk/themes/solar/less/newsletter.less ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: trunk/themes/solar/less/solar.less =================================================================== --- trunk/themes/solar/less/solar.less 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/solar/less/solar.less 2017-12-01 01:32:49 UTC (rev 64767) Property changes on: trunk/themes/solar/less/solar.less ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/themes/solar/templates/index.php =================================================================== --- trunk/themes/solar/templates/index.php 2017-12-01 01:31:10 UTC (rev 64766) +++ trunk/themes/solar/templates/index.php 2017-12-01 01:32:49 UTC (rev 64767) @@ -3,7 +3,7 @@ // // 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: index.php 57958 2016-03-17 19:59:37Z jonnybradley $ +// $Id$ // This redirects to the sites root to prevent directory browsing header("location: ../../../tiki-index.php"); Property changes on: trunk/themes/solar/templates/index.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rj...@us...> - 2017-12-01 16:35:00
|
Revision: 64772 http://sourceforge.net/p/tikiwiki/code/64772 Author: rjsmelo Date: 2017-12-01 16:34:58 +0000 (Fri, 01 Dec 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64766 to 64771 Modified Paths: -------------- trunk/installer/schema/20171123_create_object_links_tiki.php trunk/vendor_bundled/composer.lock Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-12-01 16:32:53 UTC (rev 64771) +++ trunk 2017-12-01 16:34:58 UTC (rev 64772) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64766 +/branches/18.x:64697-64771 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/installer/schema/20171123_create_object_links_tiki.php =================================================================== --- trunk/installer/schema/20171123_create_object_links_tiki.php 2017-12-01 16:32:53 UTC (rev 64771) +++ trunk/installer/schema/20171123_create_object_links_tiki.php 2017-12-01 16:34:58 UTC (rev 64772) @@ -20,7 +20,7 @@ $linkhandle = "objectlink:$type:$objectId"; foreach ($pages as $page) { - $installer->query('REPLACE INTO `tiki_links` (`fromPage`, `toPage`) values (?, ?)', [$linkhandle, $page]); + $installer->query('REPLACE INTO `tiki_links` (`fromPage`, `toPage`) values (?, ?)', [$linkhandle, substr($page, 0, 160)]); } }; Modified: trunk/vendor_bundled/composer.lock =================================================================== --- trunk/vendor_bundled/composer.lock 2017-12-01 16:32:53 UTC (rev 64771) +++ trunk/vendor_bundled/composer.lock 2017-12-01 16:34:58 UTC (rev 64772) @@ -2487,12 +2487,12 @@ }, { "name": "pear/xml_rpc", - "version": "1.5.1", + "version": "1.5.5", "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/pear/xml_rpc/pear-xml_rpc-1.5.1.zip", + "url": "https://composer.tiki.org/dist/pear/xml_rpc/pear-xml_rpc-1.5.5.zip", "reference": null, - "shasum": "9d3e0e12a023107ac1b041bae82e08a4bb72e6d8" + "shasum": "964aa71c2d9d6b1757e957137c4794e75fbc4253" }, "type": "library" }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rj...@us...> - 2017-12-03 13:53:08
|
Revision: 64778 http://sourceforge.net/p/tikiwiki/code/64778 Author: rjsmelo Date: 2017-12-03 13:53:06 +0000 (Sun, 03 Dec 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64771 to 64777 Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_include.php trunk/lib/wiki-plugins/wikiplugin_tracker.php trunk/templates/tiki-check.tpl trunk/tiki-check.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-12-03 13:52:11 UTC (rev 64777) +++ trunk 2017-12-03 13:53:06 UTC (rev 64778) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64771 +/branches/18.x:64697-64777 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/wiki-plugins/wikiplugin_include.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_include.php 2017-12-03 13:52:11 UTC (rev 64777) +++ trunk/lib/wiki-plugins/wikiplugin_include.php 2017-12-03 13:53:06 UTC (rev 64778) @@ -20,7 +20,7 @@ 'page' => [ 'required' => true, 'name' => tra('Page Name'), - 'description' => tra('Wiki page name to include.'), + 'description' => tra('Wiki page name which content should be included.'), 'since' => '1', 'filter' => 'pagename', 'default' => '', @@ -29,8 +29,8 @@ 'start' => [ 'required' => false, 'name' => tra('Start'), - 'description' => tra('When only a portion of the page should be included, specify the marker from which - inclusion should start.'), + 'description' => tra('When only a portion of the page should be included, specify the text of the full line from which + inclusion should start (not included).'), 'since' => '1', 'default' => '', ], @@ -37,22 +37,26 @@ 'stop' => [ 'required' => false, 'name' => tra('Stop'), - 'description' => tra('When only a portion of the page should be included, specify the marker at which - inclusion should end.'), + 'description' => tra('When only a portion of the page should be included, specify the text of the full line from which + inclusion should end (not included).'), 'since' => '1', 'default' => '', ], 'linkoriginal' => [ 'required' => false, - 'name' => tra('Read more'), - 'description' => tra('Put a "See full page" link at the end of included content, linking to original page. Use "linkoriginal=y"'), + 'name' => tra('Read more button'), + 'description' => tra('Add a "Read more" link at the end of included content, linking to the original page.'), 'since' => '18.0', 'default' => 'n', + 'options' => [ + ['text' => tra('Yes'), 'value' => 'y'], + ['text' => tra('No'), 'value' => 'n'], + ], ], 'nopage_text' => [ 'required' => false, - 'name' => tra('Nopage Text'), - 'description' => tra('Text to show when no page is found.'), + 'name' => tra('Page not found'), + 'description' => tra('Text to show when the selected page to be included is found anymore.'), 'since' => '6.0', 'filter' => 'text', 'default' => '', @@ -59,8 +63,8 @@ ], 'pagedenied_text' => [ 'required' => false, - 'name' => tra('Page Denied Text'), - 'description' => tra('Text to show when the page exists but is denied to the user.'), + 'name' => tra('Permission text warning'), + 'description' => tra('Text to show when the page exists but the user has insufficient permissions to see it.'), 'since' => '6.0', 'filter' => 'text', 'default' => '', @@ -67,7 +71,7 @@ ], 'pagenotapproved_text' => [ 'required' => false, - 'name' => tra('Page Denied Text'), + 'name' => tra('None approved text warning'), 'description' => tra('Text to show when the page exists but no version is approved.'), 'since' => '18.0', 'filter' => 'text', @@ -76,7 +80,7 @@ 'page_edit_icon' => [ 'required' => false, 'name' => tra('Edit Icon'), - 'description' => tra('Option to show the edit icon for the included page (shown by default).'), + 'description' => tra('Option to show the edit icon for the included page (shown by default). Depend on the \"edit icons\" parameters and settings.'), 'since' => '12.1', 'default' => 'y', 'filter' => 'alpha', @@ -227,7 +231,7 @@ $text .= '<p><a href="'.$wikilib->sefurl($page).'" class="btn btn-default"'; $text .= 'title="'.sprintf(tra('The text above comes from page "%s". Click to go to that page'), $page).'">'; $text .= smarty_function_icon(['name' => 'align-left'], $smarty).' '; - $text .= tra('See full page'); + $text .= tra('Read more'); $text .= '</a><p>'; } Modified: trunk/lib/wiki-plugins/wikiplugin_tracker.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_tracker.php 2017-12-03 13:52:11 UTC (rev 64777) +++ trunk/lib/wiki-plugins/wikiplugin_tracker.php 2017-12-03 13:53:06 UTC (rev 64778) @@ -185,7 +185,7 @@ 'required' => false, 'name' => tra('URL'), 'description' => tr('URL the user is sent to after the form is submitted. The string %0itemId%1 will - be replaced with %0itemId=xx%1 where %0xx%1 is the new (or current) itemId. This parameter can be set in combination with Tabs using %0?cookietab=n&itemId%1 (change n for the tab number).', '<code>', '</code>'), + be replaced with %0itemId=xx%1 where %0xx%1 is the new (or current) itemId. This parameter can be set in combination with the TABS plugin using %0?cookietab=1&itemId%1 (change the the cookietab parameter\'s value depending on the tab you want the user to be sent to).', '<code>', '</code>'), 'since' => '1', 'filter' => 'url', 'separator' => ':', Modified: trunk/templates/tiki-check.tpl =================================================================== --- trunk/templates/tiki-check.tpl 2017-12-03 13:52:11 UTC (rev 64777) +++ trunk/templates/tiki-check.tpl 2017-12-03 13:53:06 UTC (rev 64778) @@ -366,8 +366,9 @@ <h2>{tr}PHP Info{/tr}</h2> {tr}For more detailed information about your PHP installation see <a href="tiki-phpinfo.php">Admin->phpinfo</a>{/tr}. +<a name="benchmark"></a> <h2>{tr}Benchmark PHP/MySQL{/tr}</h2> -<a href="tiki-check.php?benchmark=run" class="btn btn-primary btn-sm" style="margin-bottom: 10px;">{tr}Check{/tr}</a> +<a href="tiki-check.php?benchmark=run&ts={$smarty.now}#benchmark" class="btn btn-primary btn-sm" style="margin-bottom: 10px;">{tr}Check{/tr}</a> {if !empty($benchmark)} <br /> <div class="table-responsive"> Modified: trunk/tiki-check.php =================================================================== --- trunk/tiki-check.php 2017-12-03 13:52:11 UTC (rev 64777) +++ trunk/tiki-check.php 2017-12-03 13:53:06 UTC (rev 64778) @@ -2137,8 +2137,8 @@ $render .= '<a href="' . $_SERVER['SCRIPT_NAME'] . '?' . $_SERVER['QUERY_STRING'] . '&phpinfo=y">Append phpinfo();</a>'; } - $render .= '<h2>Benchmark PHP/MySQL</h2>'; - $render .= '<a href="tiki-check.php?benchmark=run" style="margin-bottom: 10px;">Check</a>'; + $render .= '<a name="benchmark"></a><h2>Benchmark PHP/MySQL</h2>'; + $render .= '<a href="tiki-check.php?benchmark=run&ts=' . time() . '#benchmark" style="margin-bottom: 10px;">Check</a>'; if (! empty($benchmark)) { renderTable($benchmark); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rj...@us...> - 2017-12-03 16:31:51
|
Revision: 64780 http://sourceforge.net/p/tikiwiki/code/64780 Author: rjsmelo Date: 2017-12-03 16:31:48 +0000 (Sun, 03 Dec 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64777 to 64779 Modified Paths: -------------- trunk/lib/core/Tiki/Sitemap/Generator.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-12-03 16:30:55 UTC (rev 64779) +++ trunk 2017-12-03 16:31:48 UTC (rev 64780) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64777 +/branches/18.x:64697-64779 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/core/Tiki/Sitemap/Generator.php =================================================================== --- trunk/lib/core/Tiki/Sitemap/Generator.php 2017-12-03 16:30:55 UTC (rev 64779) +++ trunk/lib/core/Tiki/Sitemap/Generator.php 2017-12-03 16:31:48 UTC (rev 64780) @@ -67,7 +67,7 @@ $perms->setGroups(['Anonymous']); // ensure that permissions are processed as Anonymous $user = null; - $sitemap = new Sitemap($baseUrl); + $sitemap = new Sitemap(rtrim($baseUrl, '/')); $sitemap->setPath($this->basePath . self::RELATIVE_PATH); $sitemap->setFilename(self::BASE_FILE_NAME); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rj...@us...> - 2017-12-03 17:19:06
|
Revision: 64782 http://sourceforge.net/p/tikiwiki/code/64782 Author: rjsmelo Date: 2017-12-03 17:19:03 +0000 (Sun, 03 Dec 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64779 to 64781 Modified Paths: -------------- trunk/lib/trackers/trackerlib.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-12-03 17:17:43 UTC (rev 64781) +++ trunk 2017-12-03 17:19:03 UTC (rev 64782) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64779 +/branches/18.x:64697-64781 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/trackers/trackerlib.php =================================================================== --- trunk/lib/trackers/trackerlib.php 2017-12-03 17:17:43 UTC (rev 64781) +++ trunk/lib/trackers/trackerlib.php 2017-12-03 17:19:03 UTC (rev 64782) @@ -1884,7 +1884,7 @@ // If this is a user tracker it needs to be detected right here before actual looping of fields happen $trackersync_user = $user; foreach ($ins_fields["data"] as $i => $array) { - if ($array['type'] == 'u' && isset($array['options_array'][0]) && $array['options_array'][0] == '1') { + if (isset($array['type']) && $array['type'] == 'u' && isset($array['options_array'][0]) && $array['options_array'][0] == '1') { if ($prefs['user_selector_realnames_tracker'] == 'y' && $array['type'] == 'u') { if (! $userlib->user_exists($array['value'])) { $finalusers = $userlib->find_best_user([$array['value']], '', 'login'); @@ -1995,7 +1995,7 @@ } else { $is_date = isset($array['type']) ? in_array($array["type"], ['f', 'j']) : false; - if ($currentItemId || $array['type'] !== 'q') { // autoincrement + if ($currentItemId || ( isset($array['type']) && $array['type'] !== 'q') ) { // autoincrement $this->modify_field($currentItemId, $fieldId, $value); if ($old_value != $value) { if ($is_date) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rj...@us...> - 2017-12-03 22:21:44
|
Revision: 64787 http://sourceforge.net/p/tikiwiki/code/64787 Author: rjsmelo Date: 2017-12-03 22:21:42 +0000 (Sun, 03 Dec 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64781 to 64786 Modified Paths: -------------- trunk/lib/core/Tiki/Command/PluginApproveRunCommand.php trunk/lib/core/Tiki/Command/PluginListRunCommand.php trunk/lib/wiki-plugins/wikiplugin_tracker.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-12-03 22:18:09 UTC (rev 64786) +++ trunk 2017-12-03 22:21:42 UTC (rev 64787) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64781 +/branches/18.x:64697-64786 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/core/Tiki/Command/PluginApproveRunCommand.php =================================================================== --- trunk/lib/core/Tiki/Command/PluginApproveRunCommand.php 2017-12-03 22:18:09 UTC (rev 64786) +++ trunk/lib/core/Tiki/Command/PluginApproveRunCommand.php 2017-12-03 22:21:42 UTC (rev 64787) @@ -54,7 +54,10 @@ $logger->debug(tr('Approving plugin %0', $fingerprint)); $parserLib->approve_selected_pending_plugings($fingerprint); } + } else { + $logger->warning(tr('You must either to use the option --all or provide a list of fingerprints to approve')); } + $logger->info(tr('Plugins approved with success')); } } Modified: trunk/lib/core/Tiki/Command/PluginListRunCommand.php =================================================================== --- trunk/lib/core/Tiki/Command/PluginListRunCommand.php 2017-12-03 22:18:09 UTC (rev 64786) +++ trunk/lib/core/Tiki/Command/PluginListRunCommand.php 2017-12-03 22:21:42 UTC (rev 64787) @@ -9,6 +9,7 @@ use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Logger\ConsoleLogger; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Helper\Table; @@ -33,15 +34,21 @@ protected function execute(InputInterface $input, OutputInterface $output) { + $logger = new ConsoleLogger($output); + $onlyPending = $input->getOption('pending'); $status = $onlyPending ? ['pending'] : ['accept', 'pending']; + $logger->debug(tr('Listing plugins in status: %0', implode(', ', $status))); + $parserLib = \TikiLib::lib('parser'); $pluginList = $parserLib->listPluginsByStatus($status); $pluginTotal = count($pluginList); + $logger->info(tr('Found %0 plugins', $pluginTotal)); + $table = new Table($output); $table->setHeaders(['Plugin', 'Location', 'Added by', 'Status']); $rows = []; @@ -62,6 +69,8 @@ } $table->setRows($rows); $table->render(); + } else { + $logger->warning(tr('No plugins found!')); } } } Modified: trunk/lib/wiki-plugins/wikiplugin_tracker.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_tracker.php 2017-12-03 22:18:09 UTC (rev 64786) +++ trunk/lib/wiki-plugins/wikiplugin_tracker.php 2017-12-03 22:21:42 UTC (rev 64787) @@ -185,7 +185,7 @@ 'required' => false, 'name' => tra('URL'), 'description' => tr('URL the user is sent to after the form is submitted. The string %0itemId%1 will - be replaced with %0itemId=xx%1 where %0xx%1 is the new (or current) itemId. This parameter can be set in combination with the TABS plugin using %0?cookietab=1&itemId%1 (change the the cookietab parameter\'s value depending on the tab you want the user to be sent to).', '<code>', '</code>'), + be replaced with %0itemId=xx%1 where %0xx%1 is the new (or current) itemId. This parameter can be set in combination with the TABS plugin using %0?cookietab=1&itemId%1 (change the cookietab parameter\'s value depending on the tab you want the user to be sent to).', '<code>', '</code>'), 'since' => '1', 'filter' => 'url', 'separator' => ':', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rj...@us...> - 2017-12-03 23:18:46
|
Revision: 64789 http://sourceforge.net/p/tikiwiki/code/64789 Author: rjsmelo Date: 2017-12-03 23:18:44 +0000 (Sun, 03 Dec 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64786 to 64788 Modified Paths: -------------- trunk/lib/core/Tiki/Command/PluginApproveRunCommand.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-12-03 23:18:09 UTC (rev 64788) +++ trunk 2017-12-03 23:18:44 UTC (rev 64789) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64786 +/branches/18.x:64697-64788 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/core/Tiki/Command/PluginApproveRunCommand.php =================================================================== --- trunk/lib/core/Tiki/Command/PluginApproveRunCommand.php 2017-12-03 23:18:09 UTC (rev 64788) +++ trunk/lib/core/Tiki/Command/PluginApproveRunCommand.php 2017-12-03 23:18:44 UTC (rev 64789) @@ -55,7 +55,7 @@ $parserLib->approve_selected_pending_plugings($fingerprint); } } else { - $logger->warning(tr('You must either to use the option --all or provide a list of fingerprints to approve')); + $logger->warning(tr('You must either use the option --all or provide a list of fingerprints to approve.')); } $logger->info(tr('Plugins approved with success')); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2017-12-04 13:33:51
|
Revision: 64792 http://sourceforge.net/p/tikiwiki/code/64792 Author: jonnybradley Date: 2017-12-04 13:33:49 +0000 (Mon, 04 Dec 2017) Log Message: ----------- [MRG] Automatic merge, branches/18.x 64788 to 64791 Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_tracker.php trunk/tiki-objectpermissions.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-12-04 13:31:37 UTC (rev 64791) +++ trunk 2017-12-04 13:33:49 UTC (rev 64792) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -3,7 +3,7 ## /branches/15.x/tiki-emulate_groups_switch.php:58771 /branches/16.x:59883-60406,60408,60410,60420,60428-61227 /branches/17.x:62032-62661,62664,62672-62877,62880-63976 -/branches/18.x:64697-64788 +/branches/18.x:64697-64791 /branches/experimental/composer-revamp:61694-61746 /branches/experimental/composer-web-install:62406-62815 /branches/experimental/h5p:60700-61930 \ No newline at end of property Modified: trunk/lib/wiki-plugins/wikiplugin_tracker.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_tracker.php 2017-12-04 13:31:37 UTC (rev 64791) +++ trunk/lib/wiki-plugins/wikiplugin_tracker.php 2017-12-04 13:33:49 UTC (rev 64792) @@ -185,7 +185,7 @@ 'required' => false, 'name' => tra('URL'), 'description' => tr('URL the user is sent to after the form is submitted. The string %0itemId%1 will - be replaced with %0itemId=xx%1 where %0xx%1 is the new (or current) itemId. This parameter can be set in combination with the TABS plugin using %0?cookietab=1&itemId%1 (change the cookietab parameter\'s value depending on the tab you want the user to be sent to).', '<code>', '</code>'), + be replaced with %0itemId=xx%1 where %0xx%1 is the new (or current) itemId. This parameter can be used in combination with the TABS plugin using %0?cookietab=1&itemId%1 (change the cookietab parameter\'s value depending on the tab you want the user to be sent to).', '<code>', '</code>'), 'since' => '1', 'filter' => 'url', 'separator' => ':', Modified: trunk/tiki-objectpermissions.php =================================================================== --- trunk/tiki-objectpermissions.php 2017-12-04 13:31:37 UTC (rev 64791) +++ trunk/tiki-objectpermissions.php 2017-12-04 13:33:49 UTC (rev 64792) @@ -412,15 +412,6 @@ } else { $show_disabled_features = 'n'; } - -if ($show_disabled_features == 'y') { - $_REQUEST['permType'] = 'global'; -} - -if ($show_disabled_features == 'n') { - $_REQUEST['permType'] = 'trackers'; -} - $smarty->assign('show_disabled_features', $show_disabled_features); // get "master" list of all perms This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |