Thread: Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[64684] trunk (Page 393)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Thread: Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[64684] trunk (Page 393)

The Free / Libre / Open Source Web App with the most built-in features

tikiwiki-cvs