From: Lisa Marie Maginnis Date: Thu, 1 May 2014 21:04:18 +0000 (-0400) Subject: Our changes X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8a74303e7967689d4ab13c9dcfdb25c5e9be6564;p=civicrm-core.git Our changes --- diff --git a/CRM/ACL/BAO/Cache.php b/CRM/ACL/BAO/Cache.php index eac03d8b10..2bcce46abd 100644 --- a/CRM/ACL/BAO/Cache.php +++ b/CRM/ACL/BAO/Cache.php @@ -64,9 +64,13 @@ SELECT acl_id "; $params = [1 => [$id, 'Integer']]; - if ($id == 0) { - $query .= " OR contact_id IS NULL"; - } +## this is related to RT#765026 +# Something is occasionally inserting records in civicrm_acl_cache with id null. That causes i +# for our anonymous visitors who want to sign petitions. +# Removed. Ward, 2012-07-20 +# if ($id == 0) { +# $query .= " OR contact_id IS NULL"; +# } $dao = CRM_Core_DAO::executeQuery($query, $params); diff --git a/CRM/Contact/Task.php b/CRM/Contact/Task.php index 4a6989bd07..a0ff7b5b74 100644 --- a/CRM/Contact/Task.php +++ b/CRM/Contact/Task.php @@ -34,7 +34,8 @@ class CRM_Contact_Task extends CRM_Core_Task { RESTORE = 108, COMMUNICATION_PREFS = 109, INDIVIDUAL_CONTACTS = 110, - ADD_TO_CASE = 111; + ADD_TO_CASE = 111, + LATEX_LETTER = 112; /** * @var string @@ -150,6 +151,11 @@ class CRM_Contact_Task extends CRM_Core_Task { 'url' => 'civicrm/task/alter-contact-preference', 'icon' => 'fa-check-square-o', ], + self::LATEX_LETTER => [ + 'title' => ts('Print Latex PDF Letter for Contacts'), + 'class' => 'CRM_Contact_Form_Task_LatexPDF', + 'result' => TRUE, + ], self::RESTORE => [ 'title' => ts('Restore contacts from trash'), 'class' => 'CRM_Contact_Form_Task_Delete', diff --git a/CRM/Contribute/Task.php b/CRM/Contribute/Task.php index 3fa495d852..307f8212b7 100644 --- a/CRM/Contribute/Task.php +++ b/CRM/Contribute/Task.php @@ -29,7 +29,8 @@ class CRM_Contribute_Task extends CRM_Core_Task { UPDATE_STATUS = 401, PDF_RECEIPT = 402, PDF_THANKYOU = 403, - PDF_INVOICE = 404; + PDF_INVOICE = 404, + LATEX_TEST = 405; /** * @var string @@ -121,6 +122,11 @@ class CRM_Contribute_Task extends CRM_Core_Task { 'result' => FALSE, 'weight' => 80, ], + self::LATEX_TEST => [ + 'title' => ts('Latex Letters for Contributions'), + 'class' => 'CRM_Contribute_Form_Task_PDFLatex', + 'result' => FALSE, + ], ]; //CRM-4418, check for delete diff --git a/CRM/Import/Parser.php b/CRM/Import/Parser.php index 7d327675e0..2e474bf14e 100644 --- a/CRM/Import/Parser.php +++ b/CRM/Import/Parser.php @@ -33,7 +33,7 @@ abstract class CRM_Import_Parser implements UserJobInterface { /** * Settings */ - const MAX_WARNINGS = 25, DEFAULT_TIMEOUT = 30; + const MAX_ERRORS = 10000, MAX_WARNINGS = 25, DEFAULT_TIMEOUT = 30; /** * Return codes diff --git a/CRM/Utils/PDF/Utils.php b/CRM/Utils/PDF/Utils.php index 400988f31e..75d9b88ab6 100644 --- a/CRM/Utils/PDF/Utils.php +++ b/CRM/Utils/PDF/Utils.php @@ -18,8 +18,96 @@ use Dompdf\Options; * @package CRM * @copyright CiviCRM LLC https://civicrm.org/licensing */ + class CRM_Utils_PDF_Utils { + public static function latex2pdf(&$text, $fileName = 'civicrm.pdf', $output = FALSE, $pdfFormat = NULL) { + /* FIXME: get $paper_size, $orientation, $margins */ + + if (is_array($text)) { + $pages = &$text; + } + else { + $pages = array($text); + } + + + $head='\documentclass[11pt]{letter} +\usepackage{url} +\usepackage{ucs} +\usepackage{graphicx} +\usepackage[T1]{fontenc} +\usepackage{fullpage} + +\newcommand{\fsfclosing}[1]{\par\nobreak\vspace{\parskip} + \stopbreaks + \noindent + \ifx\@empty\fromaddress\else + \hspace*{\longindentation}\fi + \parbox{\indentedwidth}{\raggedright + \ignorespaces #1\\\\[1\medskipamount] + \hspace*{-0.25in}\includegraphics[scale=1.0]{sigjohns.pdf} + \\\\ + + \ifx\@empty\fromsig + \fromname + \else \fromsig \fi\strut} + \par} +\medskipamount=\parskip + +%% This line might be necessary, but it was not able to find utf8.def on my +%% machine. +\usepackage[utf8x]{inputenc} +\pagestyle{empty} +\tolerance=8000 +\address{\vspace{0.05in}} +\signature{John Sullivan \\\\ Executive Director} +\usepackage[ +top = 0.4in, +bottom = 0.9in, +left = 0.8in, +right = 0.8in]{geometry} +\begin{document} +'; + $footer=' +\end{document}'; + + $latex = $head; + foreach ($pages as $page) { + $latex.=$page; + } + $latex.=$footer; + + $descriptorspec = array( + 0 => array("pipe", "r"), + 1 => array("pipe", "w") + ); + + + + $process = proc_open("/usr/local/bin/pdflatex_wrapper.sh", $descriptorspec, $pipes); + + + if (is_resource($process)) { + fwrite($pipes[0], $latex); + fclose($pipes[0]); + + $pdf = stream_get_contents($pipes[1]); + fclose($pipes[1]); + } else { + CRM_Core_Error::debug_log_message("ERROR creating PDF. Check /tmp/pdflatex_*"); + } + + if ($output) { + return $pdf; + } + else { + header('Content-Type: application/pdf'); + header('Content-Disposition: attachment; filename="' . $fileName . '"'); + echo $pdf; + } + } + /** * @param array $text * List of HTML snippets. diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php index 898f0aae13..e7a3459538 100644 --- a/CRM/Utils/Token.php +++ b/CRM/Utils/Token.php @@ -559,7 +559,7 @@ class CRM_Utils_Token { $str ); - $str = preg_replace('/\\\\|\{(\s*)?\}/', ' ', $str); + //$str = preg_replace('/\\\\|\{(\s*)?\}/', ' ', $str); //WHY you do this? return $str; } @@ -777,7 +777,7 @@ class CRM_Utils_Token { * @param string $str ref to the string that will be scanned and modified */ public static function unescapeTokens(&$str) { - $str = preg_replace('/\\\\|\{(\{\w+\.\w+\})\}/', '\\1', $str); + //$str = preg_replace('/\\\\|\{(\{\w+\.\w+\})\}/', '\\1', $str); } /** diff --git a/api/v3/Contact.php b/api/v3/Contact.php index d3e35192ef..199ce517db 100644 --- a/api/v3/Contact.php +++ b/api/v3/Contact.php @@ -145,6 +145,15 @@ function _civicrm_api3_contact_create_spec(&$params) { $params['gender_id']['api.aliases'] = ['gender']; } +/** + * Added by Ward; basic filter-able contribution list + * use filter.receive_date_high etc + * 2013-07-02 + */ +function civicrm_api3_contact_list($params) { + return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params); +} + /** * Retrieve one or more contacts, given a set of search params. * diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php index 8f95f781fe..f707358f7c 100644 --- a/api/v3/Contribution.php +++ b/api/v3/Contribution.php @@ -233,6 +233,15 @@ function _civicrm_api3_contribution_delete_spec(&$params) { $params['id']['api.aliases'] = ['contribution_id']; } +/** + * Added by Ward; basic filter-able contribution list + * use filter.receive_date_high etc + * 2013-07-02 + */ +function civicrm_api3_contribution_list($params) { + return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params); +} + /** * Retrieve a set of contributions. *